X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=8ae3bbe9d239a791189e0a74d078917c33941b09;hp=f12930d04b9d6624a99cc944c53cc0b0e4a6e499;hb=9becec9419d9a20c7d373b14e1106d5f0ce78494;hpb=23584f3da85dd0508907690d60c7ab9ec61d8003 diff --git a/sys_win.c b/sys_win.c index f12930d0..8ae3bbe9 100644 --- a/sys_win.c +++ b/sys_win.c @@ -19,18 +19,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // sys_win.c -- Win32 system interface code -#include "quakedef.h" #include #include +#include #ifdef SUPPORTDIRECTX #include #endif -#include "errno.h" + +#include "qtypes.h" + +#include "quakedef.h" +#include #include "resource.h" #include "conproc.h" -#include "direct.h" - -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; @@ -41,6 +42,7 @@ static HANDLE heventParent; static HANDLE heventChild; #endif +sys_t sys; /* =============================================================================== @@ -63,7 +65,7 @@ void Sys_Error (const char *error, ...) dpvsnprintf (text, sizeof (text), error, argptr); va_end (argptr); - Con_Printf ("Quake Error: %s\n", text); + Con_Printf(CON_ERROR "Engine Error: %s\n", text); // close video so the message box is visible, unless we already tried that if (!in_sys_error0 && cls.state != ca_dedicated) @@ -75,13 +77,13 @@ void Sys_Error (const char *error, ...) if (!in_sys_error3 && cls.state != ca_dedicated) { in_sys_error3 = true; - MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP); + MessageBox(NULL, text, "Engine Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP); } if (!in_sys_error1) { in_sys_error1 = 1; - Host_Shutdown (); + //Host_Shutdown (); } // shut down QHOST hooks if necessary @@ -119,89 +121,6 @@ void Sys_PrintToTerminal(const char *text) WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL); } -/* -================ -Sys_DoubleTime -================ -*/ -double Sys_DoubleTime (void) -{ - static int first = true; - static double oldtime = 0.0, curtime = 0.0; - double newtime; - // LordHavoc: note to people modifying this code, DWORD is specifically defined as an unsigned 32bit number, therefore the 65536.0 * 65536.0 is fine. - if (sys_usetimegettime.integer) - { - static int firsttimegettime = true; - // timeGetTime - // platform: - // Windows 95/98/ME/NT/2000/XP - // features: - // reasonable accuracy (millisecond) - // issues: - // wraps around every 47 days or so (but this is non-fatal to us, odd times are rejected, only causes a one frame stutter) - - // make sure the timer is high precision, otherwise different versions of windows have varying accuracy - if (firsttimegettime) - { - timeBeginPeriod (1); - firsttimegettime = false; - } - - newtime = (double) timeGetTime () / 1000.0; - } - else - { - // QueryPerformanceCounter - // platform: - // Windows 95/98/ME/NT/2000/XP - // features: - // very accurate (CPU cycles) - // known issues: - // does not necessarily match realtime too well (tends to get faster and faster in win98) - // wraps around occasionally on some platforms (depends on CPU speed and probably other unknown factors) - double timescale; - LARGE_INTEGER PerformanceFreq; - LARGE_INTEGER PerformanceCount; - - if (!QueryPerformanceFrequency (&PerformanceFreq)) - { - Con_Printf ("No hardware timer available\n"); - // fall back to timeGetTime - Cvar_SetValueQuick(&sys_usetimegettime, true); - return Sys_DoubleTime(); - } - QueryPerformanceCounter (&PerformanceCount); - - #ifdef __BORLANDC__ - timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0); - newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale; - #else - timescale = 1.0 / ((double) PerformanceFreq.LowPart + (double) PerformanceFreq.HighPart * 65536.0 * 65536.0); - newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale; - #endif - } - - if (first) - { - first = false; - oldtime = newtime; - } - - if (newtime < oldtime) - { - // warn if it's significant - 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 - curtime += newtime - oldtime; - oldtime = newtime; - - return curtime; -} - - char *Sys_ConsoleInput (void) { static char text[MAX_INPUTLINE]; @@ -216,25 +135,16 @@ char *Sys_ConsoleInput (void) for ( ;; ) { if (!GetNumberOfConsoleInputEvents (hinput, &numevents)) - { - 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)) - { - cls.state = ca_disconnected; Sys_Error ("Error reading console input (error code %x)", (unsigned int)GetLastError()); - } if (numread != 1) - { - cls.state = ca_disconnected; Sys_Error ("Couldn't read console input (error code %x)", (unsigned int)GetLastError()); - } if (recs[0].EventType == KEY_EVENT) { @@ -265,7 +175,7 @@ char *Sys_ConsoleInput (void) break; default: - if (ch >= ' ') + if (ch >= (int) (unsigned char) ' ') { WriteFile(houtput, &ch, 1, &dummy, NULL); text[len] = ch; @@ -282,11 +192,6 @@ char *Sys_ConsoleInput (void) return NULL; } -void Sys_Sleep(int microseconds) -{ - Sleep(microseconds / 1000); -} - char *Sys_GetClipboardData (void) { char *data = NULL; @@ -298,11 +203,11 @@ char *Sys_GetClipboardData (void) if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0) { - if ((cliptext = GlobalLock (hClipboardData)) != 0) + if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0) { size_t allocsize; allocsize = GlobalSize (hClipboardData) + 1; - data = Z_Malloc (allocsize); + data = (char *)Z_Malloc (allocsize); strlcpy (data, cliptext, allocsize); GlobalUnlock (hClipboardData); } @@ -327,11 +232,11 @@ void Sys_InitConsole (void) houtput = GetStdHandle (STD_OUTPUT_HANDLE); hinput = GetStdHandle (STD_INPUT_HANDLE); - // LordHavoc: can't check cls.state because it hasn't been initialized yet + // LadyHavoc: can't check cls.state because it hasn't been initialized yet // if (cls.state == ca_dedicated) - if (COM_CheckParm("-dedicated")) + if (Sys_CheckParm("-dedicated")) { - //if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) // LordHavoc: on Windows XP this is never 0 or invalid, but hinput is invalid + //if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) // LadyHavoc: 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()); @@ -347,22 +252,22 @@ void Sys_InitConsole (void) #define atoi _atoi64 #endif // give QHOST a chance to hook into the console - if ((t = COM_CheckParm ("-HFILE")) > 0) + if ((t = Sys_CheckParm ("-HFILE")) > 0) { - if (t < com_argc) - hFile = (HANDLE)atoi (com_argv[t+1]); + if (t < sys.argc) + hFile = (HANDLE)atoi (sys.argv[t+1]); } - if ((t = COM_CheckParm ("-HPARENT")) > 0) + if ((t = Sys_CheckParm ("-HPARENT")) > 0) { - if (t < com_argc) - heventParent = (HANDLE)atoi (com_argv[t+1]); + if (t < sys.argc) + heventParent = (HANDLE)atoi (sys.argv[t+1]); } - if ((t = COM_CheckParm ("-HCHILD")) > 0) + if ((t = Sys_CheckParm ("-HCHILD")) > 0) { - if (t < com_argc) - heventChild = (HANDLE)atoi (com_argv[t+1]); + if (t < sys.argc) + heventChild = (HANDLE)atoi (sys.argv[t+1]); } InitConProc (hFile, heventParent, heventChild); @@ -373,11 +278,6 @@ void Sys_InitConsole (void) S_BlockSound (); } -void Sys_Init_Commands (void) -{ - Cvar_RegisterVariable(&sys_usetimegettime); -} - /* ============================================================================== @@ -412,14 +312,14 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin program_name[sizeof(program_name)-1] = 0; GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1); - com_argc = 1; - com_argv = argv; + sys.argc = 1; + sys.argv = argv; argv[0] = program_name; // FIXME: this tokenizer is rather redundent, call a more general one - while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS)) + while (*lpCmdLine && (sys.argc < MAX_NUM_ARGVS)) { - while (*lpCmdLine && *lpCmdLine <= ' ') + while (*lpCmdLine && ISWHITESPACE(*lpCmdLine)) lpCmdLine++; if (!*lpCmdLine) @@ -429,17 +329,17 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin { // quoted string lpCmdLine++; - argv[com_argc] = lpCmdLine; - com_argc++; + argv[sys.argc] = lpCmdLine; + sys.argc++; while (*lpCmdLine && (*lpCmdLine != '\"')) lpCmdLine++; } else { // unquoted word - argv[com_argc] = lpCmdLine; - com_argc++; - while (*lpCmdLine && *lpCmdLine > ' ') + argv[sys.argc] = lpCmdLine; + sys.argc++; + while (*lpCmdLine && !ISWHITESPACE(*lpCmdLine)) lpCmdLine++; } @@ -450,12 +350,21 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin } } + Sys_ProvideSelfFD(); + + // used by everything + Memory_Init(); + Host_Main(); + Sys_Quit(0); + /* return success of application */ return true; } +#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; @@ -468,10 +377,22 @@ int main (int argc, const char* argv[]) program_name[sizeof(program_name)-1] = 0; GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1); - com_argc = argc; - com_argv = argv; + sys.argc = argc; + sys.argv = argv; Host_Main(); return true; } +#endif + +qbool sys_supportsdlgetticks = false; +unsigned int Sys_SDL_GetTicks (void) +{ + Sys_Error("Called Sys_SDL_GetTicks on non-SDL target"); + return 0; +} +void Sys_SDL_Delay (unsigned int milliseconds) +{ + Sys_Error("Called Sys_SDL_Delay on non-SDL target"); +}