X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=8ae3bbe9d239a791189e0a74d078917c33941b09;hp=36ab6e59efef73a816815bf92803ee93bc75e97e;hb=bfd441930916e7a29200ea42d5d8edfcc2baa806;hpb=6a667cee0a53a21a1e617efb004b44a458d5b58f diff --git a/sys_win.c b/sys_win.c index 36ab6e59..8ae3bbe9 100644 --- a/sys_win.c +++ b/sys_win.c @@ -19,25 +19,30 @@ 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 -#include "errno.h" -#include "resource.h" -#include "conproc.h" -#include "direct.h" +#endif -extern void S_BlockSound (void); +#include "qtypes.h" -cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"}; +#include "quakedef.h" +#include +#include "resource.h" +#include "conproc.h" HANDLE hinput, houtput; +#ifdef QHOST static HANDLE tevent; static HANDLE hFile; static HANDLE heventParent; static HANDLE heventChild; +#endif +sys_t sys; /* =============================================================================== @@ -50,17 +55,17 @@ 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; static int in_sys_error3 = 0; va_start (argptr, error); - vsnprintf (text, sizeof (text), error, argptr); + 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) @@ -72,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 @@ -93,105 +98,32 @@ 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) - WriteFile(houtput, text, 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)) - Sys_Error ("No hardware timer available"); - 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; + if ((houtput != 0) && (houtput != INVALID_HANDLE_VALUE)) + WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL); } - char *Sys_ConsoleInput (void) { - static char text[256]; + static char text[MAX_INPUTLINE]; static int len; INPUT_RECORD recs[1024]; int ch; @@ -200,20 +132,19 @@ char *Sys_ConsoleInput (void) if (cls.state != ca_dedicated) return NULL; - for ( ;; ) { if (!GetNumberOfConsoleInputEvents (hinput, &numevents)) - Sys_Error ("Error getting # of console events"); + 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"); + Sys_Error ("Error reading console input (error code %x)", (unsigned int)GetLastError()); if (numread != 1) - Sys_Error ("Couldn't read console input"); + Sys_Error ("Couldn't read console input (error code %x)", (unsigned int)GetLastError()); if (recs[0].EventType == KEY_EVENT) { @@ -244,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; @@ -261,13 +192,6 @@ char *Sys_ConsoleInput (void) return NULL; } -void Sys_Sleep(int milliseconds) -{ - if (milliseconds < 1) - milliseconds = 1; - Sleep(milliseconds); -} - char *Sys_GetClipboardData (void) { char *data = NULL; @@ -279,10 +203,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); } } @@ -291,6 +217,67 @@ char *Sys_GetClipboardData (void) return data; } +void Sys_InitConsole (void) +{ +#ifdef QHOST + int t; + + // initialize the windows dedicated server console if needed + tevent = CreateEvent(NULL, false, false, NULL); + + if (!tevent) + Sys_Error ("Couldn't create event"); +#endif + + houtput = GetStdHandle (STD_OUTPUT_HANDLE); + hinput = GetStdHandle (STD_INPUT_HANDLE); + + // LadyHavoc: can't check cls.state because it hasn't been initialized yet + // if (cls.state == ca_dedicated) + if (Sys_CheckParm("-dedicated")) + { + //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()); + 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 + // give QHOST a chance to hook into the console + if ((t = Sys_CheckParm ("-HFILE")) > 0) + { + if (t < sys.argc) + hFile = (HANDLE)atoi (sys.argv[t+1]); + } + + if ((t = Sys_CheckParm ("-HPARENT")) > 0) + { + if (t < sys.argc) + heventParent = (HANDLE)atoi (sys.argv[t+1]); + } + + if ((t = Sys_CheckParm ("-HCHILD")) > 0) + { + if (t < sys.argc) + heventChild = (HANDLE)atoi (sys.argv[t+1]); + } + + InitConProc (hFile, heventParent, heventChild); +#endif + } + +// because sound is off until we become active + S_BlockSound (); +} + /* ============================================================================== @@ -311,9 +298,7 @@ char program_name[MAX_OSPATH]; int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { - double frameoldtime, framenewtime; MEMORYSTATUS lpBuffer; - int t; /* previous instances do not exist in Win32 */ if (hPrevInstance) @@ -327,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) @@ -344,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++; } @@ -365,64 +350,49 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin } } - Sys_Shared_EarlyInit(); + Sys_ProvideSelfFD(); - Cvar_RegisterVariable(&sys_usetimegettime); + // used by everything + Memory_Init(); - tevent = CreateEvent(NULL, false, false, NULL); - - if (!tevent) - Sys_Error ("Couldn't create event"); - - // LordHavoc: can't check cls.state because it hasn't been initialized yet - // if (cls.state == ca_dedicated) - if (COM_CheckParm("-dedicated")) - { - if (!AllocConsole ()) - Sys_Error ("Couldn't create dedicated server console"); - - hinput = GetStdHandle (STD_INPUT_HANDLE); - houtput = GetStdHandle (STD_OUTPUT_HANDLE); + Host_Main(); - // give QHOST a chance to hook into the console - if ((t = COM_CheckParm ("-HFILE")) > 0) - { - if (t < com_argc) - hFile = (HANDLE)atoi (com_argv[t+1]); - } + Sys_Quit(0); - if ((t = COM_CheckParm ("-HPARENT")) > 0) - { - if (t < com_argc) - heventParent = (HANDLE)atoi (com_argv[t+1]); - } + /* return success of application */ + return true; +} - if ((t = COM_CheckParm ("-HCHILD")) > 0) - { - if (t < com_argc) - heventChild = (HANDLE)atoi (com_argv[t+1]); - } +#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; - InitConProc (hFile, heventParent, heventChild); - } + global_hInstance = GetModuleHandle (0); -// because sound is off until we become active - S_BlockSound (); + lpBuffer.dwLength = sizeof(MEMORYSTATUS); + GlobalMemoryStatus (&lpBuffer); - Host_Init (); + program_name[sizeof(program_name)-1] = 0; + GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1); - Sys_Shared_LateInit(); + sys.argc = argc; + sys.argv = argv; - 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; } +#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"); +}