X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=3b48f18d0eebfe9ba0af6f9e7d92af02d85a1786;hb=e24277377e64376fe6a8bbbdfad73f614f3909bf;hp=f86b03e054f1315cdbcd8611a1c0580d9ed41f0a;hpb=a78de7811569ca3b15000f0b9376d15d7be9948d;p=xonotic%2Fdarkplaces.git diff --git a/sys_win.c b/sys_win.c index f86b03e0..3b48f18d 100644 --- a/sys_win.c +++ b/sys_win.c @@ -19,23 +19,28 @@ 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 "qtypes.h" + +#include "quakedef.h" #include "errno.h" #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; +#ifdef QHOST static HANDLE tevent; static HANDLE hFile; static HANDLE heventParent; static HANDLE heventChild; +#endif /* @@ -92,14 +97,18 @@ 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) @@ -111,89 +120,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]; @@ -205,20 +131,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 +183,7 @@ char *Sys_ConsoleInput (void) break; default: - if (ch >= ' ') + if (ch >= (int) (unsigned char) ' ') { WriteFile(houtput, &ch, 1, &dummy, NULL); text[len] = ch; @@ -266,13 +200,6 @@ char *Sys_ConsoleInput (void) return NULL; } -void Sys_Sleep(int microseconds) -{ - if (microseconds < 1000) - microseconds = 1000; - Sleep(microseconds / 1000); -} - char *Sys_GetClipboardData (void) { char *data = NULL; @@ -284,11 +211,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); } @@ -300,6 +227,7 @@ char *Sys_GetClipboardData (void) void Sys_InitConsole (void) { +#ifdef QHOST int t; // initialize the windows dedicated server console if needed @@ -307,6 +235,7 @@ void Sys_InitConsole (void) if (!tevent) Sys_Error ("Couldn't create event"); +#endif houtput = GetStdHandle (STD_OUTPUT_HANDLE); hinput = GetStdHandle (STD_INPUT_HANDLE); @@ -315,16 +244,18 @@ void Sys_InitConsole (void) // if (cls.state == ca_dedicated) if (COM_CheckParm("-dedicated")) { - if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) + //if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) // LordHavoc: on Windows XP this is never 0 or invalid, but hinput is invalid { - AllocConsole (); - houtput = GetStdHandle (STD_OUTPUT_HANDLE); - hinput = GetStdHandle (STD_INPUT_HANDLE); + 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"); +#ifdef QHOST #ifdef _WIN64 #define atoi _atoi64 #endif @@ -348,17 +279,13 @@ void Sys_InitConsole (void) } InitConProc (hFile, heventParent, heventChild); +#endif } // because sound is off until we become active S_BlockSound (); } -void Sys_Init_Commands (void) -{ - Cvar_RegisterVariable(&sys_usetimegettime); -} - /* ============================================================================== @@ -400,7 +327,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) @@ -420,7 +347,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++; } @@ -431,12 +358,16 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin } } + Sys_ProvideSelfFD(); + Host_Main(); /* 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; @@ -456,3 +387,15 @@ int main (int argc, const char* argv[]) return true; } +#endif + +qboolean 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"); +}