X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=d571dd2a4ba9173659d2f818ec8728140c561326;hp=5bd55f902cf5babb09e16b5d8c93caa14ade9318;hb=fd76022fd416890dfec824c9ac7d95ea61cdbcbd;hpb=e9c7b3e739719a2f84c2d583b6a6faf3661dbad0

diff --git a/sys_win.c b/sys_win.c
index 5bd55f90..d571dd2a 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -20,30 +20,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // sys_win.c -- Win32 system interface code
 
 #include "quakedef.h"
-#include "winquake.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"
 
-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)"};
 
-// # of seconds to wait on Sys_Error running dedicated before exiting
-#define CONSOLE_ERROR_TIMEOUT	60.0
-// sleep time on pause or minimization
-#define PAUSE_SLEEP		50
-// sleep time when not focus
-#define NOT_FOCUS_SLEEP	20
-
-int			starttime;
-
-static qboolean		sc_return_on_enter = false;
 HANDLE				hinput, houtput;
 
+#ifdef QHOST
 static HANDLE	tevent;
 static HANDLE	hFile;
 static HANDLE	heventParent;
 static HANDLE	heventChild;
+#endif
+
 
 /*
 ===============================================================================
@@ -53,61 +50,32 @@ SYSTEM IO
 ===============================================================================
 */
 
-void SleepUntilInput (int time);
-
 void Sys_Error (const char *error, ...)
 {
 	va_list		argptr;
-	char		text[1024], text2[1024];
-	char		*text3 = "Press Enter to exit\n";
-	char		*text4 = "***********************************\n";
-	char		*text5 = "\n";
-	DWORD		dummy;
-	double		starttime;
+	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;
 
-	if (!in_sys_error3)
-		in_sys_error3 = 1;
-
 	va_start (argptr, error);
-	vsprintf (text, error, argptr);
+	dpvsnprintf (text, sizeof (text), error, argptr);
 	va_end (argptr);
 
-	if (cls.state == ca_dedicated)
-	{
-		va_start (argptr, error);
-		vsprintf (text, error, argptr);
-		va_end (argptr);
-
-		sprintf (text2, "ERROR: %s\n", text);
-		WriteFile (houtput, text5, strlen (text5), &dummy, NULL);
-		WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-		WriteFile (houtput, text2, strlen (text2), &dummy, NULL);
-		WriteFile (houtput, text3, strlen (text3), &dummy, NULL);
-		WriteFile (houtput, text4, strlen (text4), &dummy, NULL);
-
-
-		starttime = Sys_DoubleTime ();
-		sc_return_on_enter = true;	// so Enter will get us out of here
+	Con_Printf ("Quake Error: %s\n", text);
 
-		while (!Sys_ConsoleInput () && ((Sys_DoubleTime () - starttime) < CONSOLE_ERROR_TIMEOUT))
-			SleepUntilInput(1);
+	// close video so the message box is visible, unless we already tried that
+	if (!in_sys_error0 && cls.state != ca_dedicated)
+	{
+		in_sys_error0 = 1;
+		VID_Shutdown();
 	}
-	else
+
+	if (!in_sys_error3 && cls.state != ca_dedicated)
 	{
-	// switch to windowed so the message box is visible, unless we already
-	// tried that and failed
-		if (!in_sys_error0)
-		{
-			in_sys_error0 = 1;
-			VID_SetDefaultMode ();
-			MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
-		}
-		else
-			MessageBox(NULL, text, "Double Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
+		in_sys_error3 = true;
+		MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 	}
 
 	if (!in_sys_error1)
@@ -120,28 +88,36 @@ void Sys_Error (const char *error, ...)
 	if (!in_sys_error2)
 	{
 		in_sys_error2 = 1;
-		DeinitConProc ();
+		Sys_Shutdown ();
 	}
 
 	exit (1);
 }
 
-void Sys_Quit (void)
+void Sys_Shutdown (void)
 {
-	Host_Shutdown();
-
+#ifdef QHOST
 	if (tevent)
 		CloseHandle (tevent);
+#endif
 
 	if (cls.state == ca_dedicated)
 		FreeConsole ();
 
+#ifdef QHOST
 // shut down QHOST hooks if necessary
 	DeinitConProc ();
-
-	exit (0);
+#endif
 }
 
+void Sys_PrintToTerminal(const char *text)
+{
+	DWORD dummy;
+	extern HANDLE houtput;
+
+	if ((houtput != 0) && (houtput != INVALID_HANDLE_VALUE))
+		WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL);
+}
 
 /*
 ================
@@ -189,7 +165,12 @@ double Sys_DoubleTime (void)
 		LARGE_INTEGER PerformanceCount;
 
 		if (!QueryPerformanceFrequency (&PerformanceFreq))
-			Sys_Error ("No hardware timer available");
+		{
+			Con_Printf ("No hardware timer available\n");
+			// fall back to timeGetTime
+			Cvar_SetValueQuick(&sys_usetimegettime, true);
+			return Sys_DoubleTime();
+		}
 		QueryPerformanceCounter (&PerformanceCount);
 
 		#ifdef __BORLANDC__
@@ -213,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;
@@ -223,7 +208,7 @@ double Sys_DoubleTime (void)
 
 char *Sys_ConsoleInput (void)
 {
-	static char text[256];
+	static char text[MAX_INPUTLINE];
 	static int len;
 	INPUT_RECORD recs[1024];
 	int ch;
@@ -232,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)
 		{
@@ -264,13 +257,6 @@ char *Sys_ConsoleInput (void)
 							len = 0;
 							return text;
 						}
-						else if (sc_return_on_enter)
-						{
-						// special case to allow exiting from the error handler on Enter
-							text[0] = '\r';
-							len = 0;
-							return text;
-						}
 
 						break;
 
@@ -283,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;
@@ -300,29 +286,101 @@ char *Sys_ConsoleInput (void)
 	return NULL;
 }
 
-void Sys_Sleep (void)
+void Sys_Sleep(int microseconds)
 {
-	Sleep (1);
+	Sleep(microseconds / 1000);
 }
 
+char *Sys_GetClipboardData (void)
+{
+	char *data = NULL;
+	char *cliptext;
+
+	if (OpenClipboard (NULL) != 0)
+	{
+		HANDLE hClipboardData;
+
+		if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
+		{
+			if ((cliptext = (char *)GlobalLock (hClipboardData)) != 0)
+			{
+				size_t allocsize;
+				allocsize = GlobalSize (hClipboardData) + 1;
+				data = (char *)Z_Malloc (allocsize);
+				strlcpy (data, cliptext, allocsize);
+				GlobalUnlock (hClipboardData);
+			}
+		}
+		CloseClipboard ();
+	}
+	return data;
+}
 
-void Sys_SendKeyEvents (void)
+void Sys_InitConsole (void)
 {
-	MSG msg;
+#ifdef QHOST
+	int t;
+
+	// initialize the windows dedicated server console if needed
+	tevent = CreateEvent(NULL, false, false, NULL);
 
-	while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
+	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"))
 	{
-	// we always update if there are any event, even if we're paused
-		scr_skipupdate = 0;
+		//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");
+
 
-		if (!GetMessage (&msg, NULL, 0, 0))
-			Sys_Quit ();
+#ifdef QHOST
+#ifdef _WIN64
+#define atoi _atoi64
+#endif
+	// 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]);
+		}
 
-		TranslateMessage (&msg);
-		DispatchMessage (&msg);
+		if ((t = COM_CheckParm ("-HPARENT")) > 0)
+		{
+			if (t < com_argc)
+				heventParent = (HANDLE)atoi (com_argv[t+1]);
+		}
+
+		if ((t = COM_CheckParm ("-HCHILD")) > 0)
+		{
+			if (t < com_argc)
+				heventChild = (HANDLE)atoi (com_argv[t+1]);
+		}
+
+		InitConProc (hFile, heventParent, heventChild);
+#endif
 	}
+
+// because sound is off until we become active
+	S_BlockSound ();
 }
 
+void Sys_Init_Commands (void)
+{
+	Cvar_RegisterVariable(&sys_usetimegettime);
+}
 
 /*
 ==============================================================================
@@ -333,145 +391,95 @@ WINDOWS CRAP
 */
 
 
-void SleepUntilInput (int time)
-{
-	MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT);
-}
-
-
 /*
 ==================
 WinMain
 ==================
 */
 HINSTANCE	global_hInstance;
-int			global_nCmdShow;
-char		*argv[MAX_NUM_ARGVS];
-static char	*empty_string = "";
+const char	*argv[MAX_NUM_ARGVS];
+char		program_name[MAX_OSPATH];
 
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-	double			frameoldtime, framenewtime;
-	MEMORYSTATUS	lpBuffer;
-	static	char	cwd[1024];
-	int				t;
+	MEMORYSTATUS lpBuffer;
 
 	/* previous instances do not exist in Win32 */
 	if (hPrevInstance)
 		return 0;
 
 	global_hInstance = hInstance;
-	global_nCmdShow = nCmdShow;
 
 	lpBuffer.dwLength = sizeof(MEMORYSTATUS);
 	GlobalMemoryStatus (&lpBuffer);
 
-	if (!GetCurrentDirectory (sizeof(cwd), cwd))
-		Sys_Error ("Couldn't determine current directory");
-
-	if (cwd[strlen(cwd)-1] == '/')
-		cwd[strlen(cwd)-1] = 0;
-
-	memset(&host_parms, 0, sizeof(host_parms));
-
-	host_parms.basedir = cwd;
+	program_name[sizeof(program_name)-1] = 0;
+	GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
 
-	host_parms.argc = 1;
-	argv[0] = empty_string;
+	com_argc = 1;
+	com_argv = argv;
+	argv[0] = program_name;
 
-	while (*lpCmdLine && (host_parms.argc < MAX_NUM_ARGVS))
+	// FIXME: this tokenizer is rather redundent, call a more general one
+	while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
 	{
-		while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
+		while (*lpCmdLine && ISWHITESPACE(*lpCmdLine))
 			lpCmdLine++;
 
-		if (*lpCmdLine)
-		{
-			argv[host_parms.argc] = lpCmdLine;
-			host_parms.argc++;
-
-			while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
-				lpCmdLine++;
+		if (!*lpCmdLine)
+			break;
 
-			if (*lpCmdLine)
-			{
-				*lpCmdLine = 0;
+		if (*lpCmdLine == '\"')
+		{
+			// quoted string
+			lpCmdLine++;
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
+			while (*lpCmdLine && (*lpCmdLine != '\"'))
 				lpCmdLine++;
-			}
 		}
-	}
-	host_parms.argv = argv;
-
-	Sys_Shared_EarlyInit();
-
-	Cvar_RegisterVariable(&sys_usetimegettime);
-
-	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);
-
-	// give QHOST a chance to hook into the console
-		if ((t = COM_CheckParm ("-HFILE")) > 0)
+		else
 		{
-			if (t < com_argc)
-				hFile = (HANDLE)atoi (com_argv[t+1]);
+			// unquoted word
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
+			while (*lpCmdLine && !ISWHITESPACE(*lpCmdLine))
+				lpCmdLine++;
 		}
 
-		if ((t = COM_CheckParm ("-HPARENT")) > 0)
+		if (*lpCmdLine)
 		{
-			if (t < com_argc)
-				heventParent = (HANDLE)atoi (com_argv[t+1]);
+			*lpCmdLine = 0;
+			lpCmdLine++;
 		}
+	}
 
-		if ((t = COM_CheckParm ("-HCHILD")) > 0)
-		{
-			if (t < com_argc)
-				heventChild = (HANDLE)atoi (com_argv[t+1]);
-		}
+	Host_Main();
 
-		InitConProc (hFile, heventParent, heventChild);
-	}
+	/* return success of application */
+	return true;
+}
 
-// because sound is off until we become active
-	S_BlockSound ();
+#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;
 
-	Host_Init ();
+	global_hInstance = GetModuleHandle (0);
 
-	Sys_Shared_LateInit();
+	lpBuffer.dwLength = sizeof(MEMORYSTATUS);
+	GlobalMemoryStatus (&lpBuffer);
 
-	frameoldtime = Sys_DoubleTime ();
+	program_name[sizeof(program_name)-1] = 0;
+	GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
 
-	/* main window message loop */
-	while (1)
-	{
-		if (cls.state != ca_dedicated)
-		{
-		// yield the CPU for a little while when paused, minimized, or not the focus
-			if ((cl.paused && !vid_activewindow) || vid_hidden)
-			{
-				SleepUntilInput (PAUSE_SLEEP);
-				scr_skipupdate = 1;		// no point in bothering to draw
-			}
-			else if (!vid_activewindow)
-				SleepUntilInput (NOT_FOCUS_SLEEP);
-		}
+	com_argc = argc;
+	com_argv = argv;
 
-		framenewtime = Sys_DoubleTime ();
-		Host_Frame (framenewtime - frameoldtime);
-		frameoldtime = framenewtime;
-	}
+	Host_Main();
 
-	/* return success of application */
 	return true;
 }
+#endif