X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=6a33662590836c7ac6dacc6d72577874f4631541;hb=83d7542f1b0b73ed08ed5c8082e084cf65cef1f6;hp=c0ae22af3006c3230409385a0cc0dbb763e418b1;hpb=30334016020f54bb93999010bed118f5605b06bd;p=xonotic%2Fdarkplaces.git

diff --git a/sys_win.c b/sys_win.c
index c0ae22af..6a336625 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -21,15 +21,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "quakedef.h"
 #include <windows.h>
+#include <mmsystem.h>
 #include <dsound.h>
 #include "errno.h"
 #include "resource.h"
 #include "conproc.h"
 #include "direct.h"
 
-extern void S_BlockSound (void);
-
-cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows timeGetTime function (which has issues on some motherboards) for timing rather than QueryPerformanceCounter timer (which has issues on multicore/multiprocessor machines and processors which are designed to conserve power)"};
 
 HANDLE				hinput, houtput;
 
@@ -50,7 +49,7 @@ SYSTEM IO
 void Sys_Error (const char *error, ...)
 {
 	va_list		argptr;
-	char		text[1024];
+	char		text[MAX_INPUTLINE];
 	static int	in_sys_error0 = 0;
 	static int	in_sys_error1 = 0;
 	static int	in_sys_error2 = 0;
@@ -158,7 +157,7 @@ double Sys_DoubleTime (void)
 
 		if (!QueryPerformanceFrequency (&PerformanceFreq))
 		{
-			Con_Printf ("No hardware timer available");
+			Con_Printf ("No hardware timer available\n");
 			// fall back to timeGetTime
 			Cvar_SetValueQuick(&sys_usetimegettime, true);
 			return Sys_DoubleTime();
@@ -196,7 +195,7 @@ double Sys_DoubleTime (void)
 
 char *Sys_ConsoleInput (void)
 {
-	static char text[256];
+	static char text[MAX_INPUTLINE];
 	static int len;
 	INPUT_RECORD recs[1024];
 	int ch;
@@ -266,11 +265,11 @@ char *Sys_ConsoleInput (void)
 	return NULL;
 }
 
-void Sys_Sleep(int milliseconds)
+void Sys_Sleep(int microseconds)
 {
-	if (milliseconds < 1)
-		milliseconds = 1;
-	Sleep(milliseconds);
+	if (microseconds < 1000)
+		microseconds = 1000;
+	Sleep(microseconds / 1000);
 }
 
 char *Sys_GetClipboardData (void)
@@ -286,8 +285,10 @@ char *Sys_GetClipboardData (void)
 		{
 			if ((cliptext = GlobalLock (hClipboardData)) != 0)
 			{
-				data = malloc (GlobalSize(hClipboardData)+1);
-				strcpy (data, cliptext);
+				size_t allocsize;
+				allocsize = GlobalSize (hClipboardData) + 1;
+				data = Z_Malloc (allocsize);
+				strlcpy (data, cliptext, allocsize);
 				GlobalUnlock (hClipboardData);
 			}
 		}
@@ -316,7 +317,7 @@ void Sys_InitConsole (void)
 		hinput = GetStdHandle (STD_INPUT_HANDLE);
 		houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
-#ifdef WIN64
+#ifdef _WIN64
 #define atoi _atoi64
 #endif
 	// give QHOST a chance to hook into the console
@@ -370,7 +371,6 @@ char		program_name[MAX_OSPATH];
 
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-	double frameoldtime, framenewtime;
 	MEMORYSTATUS lpBuffer;
 
 	/* previous instances do not exist in Win32 */
@@ -423,17 +423,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 		}
 	}
 
-	Host_Init ();
-
-	frameoldtime = Sys_DoubleTime ();
-
-	/* main window message loop */
-	while (1)
-	{
-		framenewtime = Sys_DoubleTime ();
-		Host_Frame (framenewtime - frameoldtime);
-		frameoldtime = framenewtime;
-	}
+	Host_Main();
 
 	/* return success of application */
 	return true;