#include "quakedef.h"
#include <windows.h>
+#include <mmsystem.h>
+#ifdef SUPPORTDIRECTX
#include <dsound.h>
+#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"};
+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
/*
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;
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);
+
+ if ((houtput != 0) && (houtput != INVALID_HANDLE_VALUE))
+ WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL);
}
/*
if (!QueryPerformanceFrequency (&PerformanceFreq))
{
- Con_Printf ("No hardware timer available");
+ Con_Printf ("No hardware timer available\n");
// fall back to timeGetTime
Cvar_SetValueQuick(&sys_usetimegettime, true);
return Sys_DoubleTime();
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;
char *Sys_ConsoleInput (void)
{
- static char text[256];
+ static char text[MAX_INPUTLINE];
static int len;
INPUT_RECORD recs[1024];
int ch;
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)
{
break;
default:
- if (ch >= ' ')
+ if (ch >= (int) (unsigned char) ' ')
{
WriteFile(houtput, &ch, 1, &dummy, NULL);
text[len] = ch;
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)
{
if ((cliptext = GlobalLock (hClipboardData)) != 0)
{
- data = malloc (GlobalSize(hClipboardData)+1);
- strcpy (data, cliptext);
+ size_t allocsize;
+ allocsize = GlobalSize (hClipboardData) + 1;
+ data = Z_Malloc (allocsize);
+ strlcpy (data, cliptext, allocsize);
GlobalUnlock (hClipboardData);
}
}
void Sys_InitConsole (void)
{
+#ifdef QHOST
int t;
// initialize the windows dedicated server console if needed
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 QHOST
+#ifdef _WIN64
+#define atoi _atoi64
+#endif
// give QHOST a chance to hook into the console
if ((t = COM_CheckParm ("-HFILE")) > 0)
{
}
InitConProc (hFile, heventParent, heventChild);
+#endif
}
// because sound is off until we become active
int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
{
- double frameoldtime, framenewtime;
MEMORYSTATUS lpBuffer;
/* previous instances do not exist in Win32 */
// 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)
// unquoted word
argv[com_argc] = lpCmdLine;
com_argc++;
- while (*lpCmdLine && *lpCmdLine > ' ')
+ while (*lpCmdLine && !ISWHITESPACE(*lpCmdLine))
lpCmdLine++;
}
}
}
- 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;
- }
+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;
}
projects / xonotic / darkplaces.git / blobdiff