X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=d571dd2a4ba9173659d2f818ec8728140c561326;hp=d3da31c087af20c990d4bfd87f6a19a7b2b37e5e;hb=861475e4f10eb1f592a5c64aff3b57eab4d11edb;hpb=d159736a199e4043ed98cde48f6d5716ec40845c diff --git a/sys_win.c b/sys_win.c index d3da31c0..d571dd2a 100644 --- a/sys_win.c +++ b/sys_win.c @@ -21,22 +21,25 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" #include +#include +#ifdef SUPPORTDIRECTX #include +#endif #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", "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; +#ifdef QHOST static HANDLE tevent; static HANDLE hFile; static HANDLE heventParent; static HANDLE heventChild; +#endif /* @@ -93,21 +96,26 @@ void Sys_Error (const char *error, ...) void Sys_Shutdown (void) { +#ifdef QHOST if (tevent) CloseHandle (tevent); +#endif if (cls.state == ca_dedicated) FreeConsole (); +#ifdef QHOST // shut down QHOST hooks if necessary DeinitConProc (); +#endif } void Sys_PrintToTerminal(const char *text) { DWORD dummy; extern HANDLE houtput; - if (cls.state == ca_dedicated) + + if ((houtput != 0) && (houtput != INVALID_HANDLE_VALUE)) WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL); } @@ -186,6 +194,10 @@ double Sys_DoubleTime (void) if (newtime - oldtime < -0.01) Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime); } + else if (newtime > oldtime + 1800) + { + Con_Printf("Sys_DoubleTime: time stepped forward (went from %f to %f, difference %f)\n", oldtime, newtime, newtime - oldtime); + } else curtime += newtime - oldtime; oldtime = newtime; @@ -205,20 +217,28 @@ char *Sys_ConsoleInput (void) if (cls.state != ca_dedicated) return NULL; - for ( ;; ) { if (!GetNumberOfConsoleInputEvents (hinput, &numevents)) - Sys_Error ("Error getting # of console events"); + { + cls.state = ca_disconnected; + Sys_Error ("Error getting # of console events (error code %x)", (unsigned int)GetLastError()); + } if (numevents <= 0) break; if (!ReadConsoleInput(hinput, recs, 1, &numread)) - Sys_Error ("Error reading console input"); + { + cls.state = ca_disconnected; + Sys_Error ("Error reading console input (error code %x)", (unsigned int)GetLastError()); + } if (numread != 1) - Sys_Error ("Couldn't read console input"); + { + cls.state = ca_disconnected; + Sys_Error ("Couldn't read console input (error code %x)", (unsigned int)GetLastError()); + } if (recs[0].EventType == KEY_EVENT) { @@ -249,7 +269,7 @@ char *Sys_ConsoleInput (void) break; default: - if (ch >= ' ') + if (ch >= (int) (unsigned char) ' ') { WriteFile(houtput, &ch, 1, &dummy, NULL); text[len] = ch; @@ -266,11 +286,9 @@ char *Sys_ConsoleInput (void) return NULL; } -void Sys_Sleep(int milliseconds) +void Sys_Sleep(int microseconds) { - if (milliseconds < 1) - milliseconds = 1; - Sleep(milliseconds); + Sleep(microseconds / 1000); } char *Sys_GetClipboardData (void) @@ -284,10 +302,12 @@ char *Sys_GetClipboardData (void) if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0) { - if ((cliptext = GlobalLock (hClipboardData)) != 0) + if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0) { - data = malloc (GlobalSize(hClipboardData)+1); - strcpy (data, cliptext); + size_t allocsize; + allocsize = GlobalSize (hClipboardData) + 1; + data = (char *)Z_Malloc (allocsize); + strlcpy (data, cliptext, allocsize); GlobalUnlock (hClipboardData); } } @@ -298,6 +318,7 @@ char *Sys_GetClipboardData (void) void Sys_InitConsole (void) { +#ifdef QHOST int t; // initialize the windows dedicated server console if needed @@ -305,18 +326,28 @@ void Sys_InitConsole (void) if (!tevent) Sys_Error ("Couldn't create event"); +#endif + + houtput = GetStdHandle (STD_OUTPUT_HANDLE); + hinput = GetStdHandle (STD_INPUT_HANDLE); // LordHavoc: can't check cls.state because it hasn't been initialized yet // if (cls.state == ca_dedicated) if (COM_CheckParm("-dedicated")) { - if (!AllocConsole ()) + //if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) // LordHavoc: on Windows XP this is never 0 or invalid, but hinput is invalid + { + if (!AllocConsole ()) + Sys_Error ("Couldn't create dedicated server console (error code %x)", (unsigned int)GetLastError()); + houtput = GetStdHandle (STD_OUTPUT_HANDLE); + hinput = GetStdHandle (STD_INPUT_HANDLE); + } + if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) Sys_Error ("Couldn't create dedicated server console"); - hinput = GetStdHandle (STD_INPUT_HANDLE); - houtput = GetStdHandle (STD_OUTPUT_HANDLE); -#ifdef WIN64 +#ifdef QHOST +#ifdef _WIN64 #define atoi _atoi64 #endif // give QHOST a chance to hook into the console @@ -339,6 +370,7 @@ void Sys_InitConsole (void) } InitConProc (hFile, heventParent, heventChild); +#endif } // because sound is off until we become active @@ -370,7 +402,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 */ @@ -392,7 +423,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin // FIXME: this tokenizer is rather redundent, call a more general one while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS)) { - while (*lpCmdLine && *lpCmdLine <= ' ') + while (*lpCmdLine && ISWHITESPACE(*lpCmdLine)) lpCmdLine++; if (!*lpCmdLine) @@ -412,7 +443,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin // unquoted word argv[com_argc] = lpCmdLine; com_argc++; - while (*lpCmdLine && *lpCmdLine > ' ') + while (*lpCmdLine && !ISWHITESPACE(*lpCmdLine)) lpCmdLine++; } @@ -423,18 +454,32 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin } } - Host_Init (); + Host_Main(); - frameoldtime = Sys_DoubleTime (); + /* return success of application */ + return true; +} - /* main window message loop */ - while (1) - { - framenewtime = Sys_DoubleTime (); - Host_Frame (framenewtime - frameoldtime); - frameoldtime = framenewtime; - } +#if 0 +// unused, this file is only used when building windows client and vid_wgl provides WinMain() instead +int main (int argc, const char* argv[]) +{ + MEMORYSTATUS lpBuffer; + + global_hInstance = GetModuleHandle (0); + + lpBuffer.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus (&lpBuffer); + + program_name[sizeof(program_name)-1] = 0; + GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1); + + com_argc = argc; + com_argv = argv; + + Host_Main(); - /* return success of application */ return true; } +#endif +