X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=6a33662590836c7ac6dacc6d72577874f4631541;hp=dee6bc51c618064dde845be98bc64287948415c3;hb=fc5fe8b95af8c3e314abe62dc0727e5bd2efa04a;hpb=2e83f8e2e245189d6f1bf28a45dc42b8f480b12d

diff --git a/sys_win.c b/sys_win.c
index dee6bc51..6a336625 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -19,25 +19,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // sys_win.c -- Win32 system interface code
 
-#define WIN32_USETIMEGETTIME 0
-
 #include "quakedef.h"
-#include "winquake.h"
+#include <windows.h>
+#include <mmsystem.h>
+#include <dsound.h>
 #include "errno.h"
 #include "resource.h"
 #include "conproc.h"
 #include "direct.h"
 
-// # 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;
+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)"};
 
-static qboolean		sc_return_on_enter = false;
 HANDLE				hinput, houtput;
 
 static HANDLE	tevent;
@@ -45,129 +37,6 @@ static HANDLE	hFile;
 static HANDLE	heventParent;
 static HANDLE	heventChild;
 
-/*
-===============================================================================
-
-QFile IO
-
-===============================================================================
-*/
-
-// LordHavoc: 256 pak files (was 10)
-#define	MAX_HANDLES		256
-QFile	*sys_handles[MAX_HANDLES];
-
-int		findhandle (void)
-{
-	int		i;
-
-	for (i=1 ; i<MAX_HANDLES ; i++)
-		if (!sys_handles[i])
-			return i;
-	Sys_Error ("out of handles");
-	return -1;
-}
-
-/*
-================
-Sys_FileLength
-================
-*/
-int Sys_FileLength (QFile *f)
-{
-	int		pos;
-	int		end;
-
-	pos = Qtell (f);
-	Qseek (f, 0, SEEK_END);
-	end = Qtell (f);
-	Qseek (f, pos, SEEK_SET);
-
-	return end;
-}
-
-int Sys_FileOpenRead (char *path, int *hndl)
-{
-	QFile	*f;
-	int		i, retval;
-
-	i = findhandle ();
-
-	f = Qopen(path, "rbz");
-
-	if (!f)
-	{
-		*hndl = -1;
-		retval = -1;
-	}
-	else
-	{
-		sys_handles[i] = f;
-		*hndl = i;
-		retval = Sys_FileLength(f);
-	}
-
-	return retval;
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-	QFile	*f;
-	int		i;
-
-	i = findhandle ();
-
-	f = Qopen(path, "wb");
-	if (!f)
-	{
-		Con_Printf("Sys_FileOpenWrite: Error opening %s: %s", path, strerror(errno));
-		return 0;
-	}
-	sys_handles[i] = f;
-
-	return i;
-}
-
-void Sys_FileClose (int handle)
-{
-	Qclose (sys_handles[handle]);
-	sys_handles[handle] = NULL;
-}
-
-void Sys_FileSeek (int handle, int position)
-{
-	Qseek (sys_handles[handle], position, SEEK_SET);
-}
-
-int Sys_FileRead (int handle, void *dest, int count)
-{
-	return Qread (sys_handles[handle], dest, count);
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-	return Qwrite (sys_handles[handle], data, count);
-}
-
-int	Sys_FileTime (char *path)
-{
-	QFile	*f;
-
-	f = Qopen(path, "rb");
-	if (f)
-	{
-		Qclose(f);
-		return 1;
-	}
-
-	return -1;
-}
-
-void Sys_mkdir (char *path)
-{
-	_mkdir (path);
-}
-
 
 /*
 ===============================================================================
@@ -177,61 +46,32 @@ SYSTEM IO
 ===============================================================================
 */
 
-void SleepUntilInput (int time);
-
-void Sys_Error (char *error, ...)
+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)
@@ -244,16 +84,14 @@ void Sys_Error (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();
-
 	if (tevent)
 		CloseHandle (tevent);
 
@@ -262,10 +100,15 @@ void Sys_Quit (void)
 
 // shut down QHOST hooks if necessary
 	DeinitConProc ();
-
-	exit (0);
 }
 
+void Sys_PrintToTerminal(const char *text)
+{
+	DWORD dummy;
+	extern HANDLE houtput;
+	if (cls.state == ca_dedicated)
+		WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL);
+}
 
 /*
 ================
@@ -278,45 +121,57 @@ double Sys_DoubleTime (void)
 	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 WIN32_USETIMEGETTIME
-	// timeGetTime
-	// platform:
-	// Windows 95/98/ME/NT/2000
-	// 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 (first)
-		timeBeginPeriod (1);
-
-	newtime = (double) timeGetTime () / 1000.0;
-#else
-	// QueryPerformanceCounter
-	// platform:
-	// Windows 95/98/ME/NT/2000
-	// 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)
-	static double timescale = 0.0;
-	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
-#endif
+	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)
 	{
@@ -325,7 +180,11 @@ double Sys_DoubleTime (void)
 	}
 
 	if (newtime < oldtime)
-		Con_Printf("Sys_DoubleTime: time stepped backwards (went from %f to %f, difference %f)\n", oldtime, newtime, 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;
@@ -336,7 +195,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;
@@ -377,13 +236,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;
 
@@ -413,116 +265,43 @@ char *Sys_ConsoleInput (void)
 	return NULL;
 }
 
-void Sys_Sleep (void)
-{
-	Sleep (1);
-}
-
-
-void Sys_SendKeyEvents (void)
+void Sys_Sleep(int microseconds)
 {
-	MSG msg;
-
-	while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
-	{
-	// we always update if there are any event, even if we're paused
-		scr_skipupdate = 0;
-
-		if (!GetMessage (&msg, NULL, 0, 0))
-			Sys_Quit ();
-
-		TranslateMessage (&msg);
-		DispatchMessage (&msg);
-	}
+	if (microseconds < 1000)
+		microseconds = 1000;
+	Sleep(microseconds / 1000);
 }
 
-
-/*
-==============================================================================
-
-WINDOWS CRAP
-
-==============================================================================
-*/
-
-
-void SleepUntilInput (int time)
+char *Sys_GetClipboardData (void)
 {
-	MsgWaitForMultipleObjects(1, &tevent, false, time, QS_ALLINPUT);
-}
+	char *data = NULL;
+	char *cliptext;
 
-
-/*
-==================
-WinMain
-==================
-*/
-HINSTANCE	global_hInstance;
-int			global_nCmdShow;
-char		*argv[MAX_NUM_ARGVS];
-static char	*empty_string = "";
-
-int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
-{
-	double			frameoldtime, framenewtime;
-	MEMORYSTATUS	lpBuffer;
-	static	char	cwd[1024];
-	int				t;
-
-	/* 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;
-
-	host_parms.argc = 1;
-	argv[0] = empty_string;
-
-	while (*lpCmdLine && (host_parms.argc < MAX_NUM_ARGVS))
+	if (OpenClipboard (NULL) != 0)
 	{
-		while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
-			lpCmdLine++;
+		HANDLE hClipboardData;
 
-		if (*lpCmdLine)
+		if ((hClipboardData = GetClipboardData (CF_TEXT)) != 0)
 		{
-			argv[host_parms.argc] = lpCmdLine;
-			host_parms.argc++;
-
-			while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
-				lpCmdLine++;
-
-			if (*lpCmdLine)
+			if ((cliptext = GlobalLock (hClipboardData)) != 0)
 			{
-				*lpCmdLine = 0;
-				lpCmdLine++;
+				size_t allocsize;
+				allocsize = GlobalSize (hClipboardData) + 1;
+				data = Z_Malloc (allocsize);
+				strlcpy (data, cliptext, allocsize);
+				GlobalUnlock (hClipboardData);
 			}
-
 		}
+		CloseClipboard ();
 	}
+	return data;
+}
 
-	host_parms.argv = argv;
-
-	COM_InitArgv (host_parms.argc, host_parms.argv);
-
-	host_parms.argc = com_argc;
-	host_parms.argv = com_argv;
-
-	Sys_Shared_EarlyInit();
+void Sys_InitConsole (void)
+{
+	int t;
 
+	// initialize the windows dedicated server console if needed
 	tevent = CreateEvent(NULL, false, false, NULL);
 
 	if (!tevent)
@@ -538,6 +317,9 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 		hinput = GetStdHandle (STD_INPUT_HANDLE);
 		houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
+#ifdef _WIN64
+#define atoi _atoi64
+#endif
 	// give QHOST a chance to hook into the console
 		if ((t = COM_CheckParm ("-HFILE")) > 0)
 		{
@@ -562,34 +344,87 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 
 // because sound is off until we become active
 	S_BlockSound ();
+}
+
+void Sys_Init_Commands (void)
+{
+	Cvar_RegisterVariable(&sys_usetimegettime);
+}
+
+/*
+==============================================================================
+
+WINDOWS CRAP
+
+==============================================================================
+*/
+
+
+/*
+==================
+WinMain
+==================
+*/
+HINSTANCE	global_hInstance;
+const char	*argv[MAX_NUM_ARGVS];
+char		program_name[MAX_OSPATH];
+
+int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+{
+	MEMORYSTATUS lpBuffer;
 
-	Host_Init ();
+	/* previous instances do not exist in Win32 */
+	if (hPrevInstance)
+		return 0;
 
-	Sys_Shared_LateInit();
+	global_hInstance = hInstance;
+
+	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)
+	com_argc = 1;
+	com_argv = argv;
+	argv[0] = program_name;
+
+	// FIXME: this tokenizer is rather redundent, call a more general one
+	while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
 	{
-		if (cls.state != ca_dedicated)
+		while (*lpCmdLine && *lpCmdLine <= ' ')
+			lpCmdLine++;
+
+		if (!*lpCmdLine)
+			break;
+
+		if (*lpCmdLine == '\"')
 		{
-		// 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);
+			// quoted string
+			lpCmdLine++;
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
+			while (*lpCmdLine && (*lpCmdLine != '\"'))
+				lpCmdLine++;
+		}
+		else
+		{
+			// unquoted word
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
+			while (*lpCmdLine && *lpCmdLine > ' ')
+				lpCmdLine++;
 		}
 
-		framenewtime = Sys_DoubleTime ();
-		Host_Frame (framenewtime - frameoldtime);
-		frameoldtime = framenewtime;
+		if (*lpCmdLine)
+		{
+			*lpCmdLine = 0;
+			lpCmdLine++;
+		}
 	}
 
+	Host_Main();
+
 	/* return success of application */
 	return true;
 }
-