X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=b9b4cd387de985b9a3359ca78bc23ed6d1b31068;hb=f6043d1be8b3d04a06b0f1af55523da04c635028;hp=02be56b4393be41479467a02d3c7910a99f982f2;hpb=182f5dd46097dc11b3643dc2376b4dd6a4fa42c7;p=xonotic%2Fdarkplaces.git diff --git a/sys_win.c b/sys_win.c index 02be56b4..b9b4cd38 100644 --- a/sys_win.c +++ b/sys_win.c @@ -50,7 +50,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; @@ -108,7 +108,7 @@ void Sys_PrintToTerminal(const char *text) DWORD dummy; extern HANDLE houtput; if (cls.state == ca_dedicated) - WriteFile(houtput, text, strlen (text), &dummy, NULL); + WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL); } /* @@ -157,7 +157,12 @@ double Sys_DoubleTime (void) LARGE_INTEGER PerformanceCount; if (!QueryPerformanceFrequency (&PerformanceFreq)) - Sys_Error ("No hardware timer available"); + { + Con_Printf ("No hardware timer available\n"); + // fall back to timeGetTime + Cvar_SetValueQuick(&sys_usetimegettime, true); + return Sys_DoubleTime(); + } QueryPerformanceCounter (&PerformanceCount); #ifdef __BORLANDC__ @@ -191,7 +196,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; @@ -293,6 +298,8 @@ char *Sys_GetClipboardData (void) void Sys_InitConsole (void) { + int t; + // initialize the windows dedicated server console if needed tevent = CreateEvent(NULL, false, false, NULL); @@ -309,6 +316,9 @@ void Sys_InitConsole (void) hinput = GetStdHandle (STD_INPUT_HANDLE); houtput = GetStdHandle (STD_OUTPUT_HANDLE); +#ifdef WIN64 +#define atoi _atoi64 +#endif // give QHOST a chance to hook into the console if ((t = COM_CheckParm ("-HFILE")) > 0) { @@ -362,7 +372,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin { double frameoldtime, framenewtime; MEMORYSTATUS lpBuffer; - int t; /* previous instances do not exist in Win32 */ if (hPrevInstance)