X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=e5655b653768b125371f396bd8e60ec9b8c82fb5;hp=8715a6078292f530dc1284c3b1e4837b59c61973;hb=ae200d7042383b4cb57a86a449105106c3bc1ab0;hpb=ea7c24e1fb41f3b1df984ac0eed6881c9fde16f5

diff --git a/sys_win.c b/sys_win.c
index 8715a607..e5655b65 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -19,8 +19,6 @@ 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 "errno.h"
@@ -28,13 +26,16 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "conproc.h"
 #include "direct.h"
 
-#define CONSOLE_ERROR_TIMEOUT	60.0	// # of seconds to wait on Sys_Error running
-										//  dedicated before exiting
-#define PAUSE_SLEEP		50				// sleep time on pause or minimization
-#define NOT_FOCUS_SLEEP	20				// sleep time when not focus
+cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
+
+// # 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;
-qboolean	ActiveApp, Minimized;
 
 static qboolean		sc_return_on_enter = false;
 HANDLE				hinput, houtput;
@@ -44,127 +45,28 @@ static HANDLE	hFile;
 static HANDLE	heventParent;
 static HANDLE	heventChild;
 
+
 /*
 ===============================================================================
 
-QFile IO
+DLL MANAGEMENT
 
 ===============================================================================
 */
 
-// 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)
+dllhandle_t Sys_LoadLibrary (const char* name)
 {
-	Qclose (sys_handles[handle]);
-	sys_handles[handle] = NULL;
+	return LoadLibrary (name);
 }
 
-void Sys_FileSeek (int handle, int position)
+void Sys_UnloadLibrary (dllhandle_t handle)
 {
-	Qseek (sys_handles[handle], position, SEEK_SET);
+	FreeLibrary (handle);
 }
 
-int Sys_FileRead (int handle, void *dest, int count)
+void* Sys_GetProcAddress (dllhandle_t handle, const char* name)
 {
-	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);
+	return (void *)GetProcAddress (handle, name);
 }
 
 
@@ -176,7 +78,9 @@ SYSTEM IO
 ===============================================================================
 */
 
-void Sys_Error (char *error, ...)
+void SleepUntilInput (int time);
+
+void Sys_Error (const char *error, ...)
 {
 	va_list		argptr;
 	char		text[1024], text2[1024];
@@ -215,8 +119,7 @@ void Sys_Error (char *error, ...)
 		sc_return_on_enter = true;	// so Enter will get us out of here
 
 		while (!Sys_ConsoleInput () && ((Sys_DoubleTime () - starttime) < CONSOLE_ERROR_TIMEOUT))
-		{
-		}
+			SleepUntilInput(1);
 	}
 	else
 	{
@@ -225,13 +128,11 @@ void Sys_Error (char *error, ...)
 		if (!in_sys_error0)
 		{
 			in_sys_error0 = 1;
-			VID_SetDefaultMode ();
+			VID_Shutdown();
 			MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 		}
 		else
-		{
 			MessageBox(NULL, text, "Double Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
-		}
 	}
 
 	if (!in_sys_error1)
@@ -252,7 +153,6 @@ void Sys_Error (char *error, ...)
 
 void Sys_Quit (void)
 {
-
 	Host_Shutdown();
 
 	if (tevent)
@@ -275,92 +175,74 @@ Sys_DoubleTime
 */
 double Sys_DoubleTime (void)
 {
-	// 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:
-	// none known
 	static int first = true;
-	static double oldtime = 0.0, basetime = 0.0, old = 0.0;
-	double newtime, now;
-
-	now = (double) timeGetTime () + basetime;
-
-	if (first)
+	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)
 	{
-		first = false;
-		basetime = now;
-		now = 0;
-	}
+		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;
+		}
 
-	if (now < old)
-	{
-		// wrapped
-		basetime += (65536.0 * 65536.0);
-		now += (65536.0 * 65536.0);
+		newtime = (double) timeGetTime () / 1000.0;
 	}
-	old = now;
-
-	newtime = now / 1000.0;
-
-	if (newtime < oldtime)
-		Sys_Error("Sys_DoubleTime: time running backwards??\n");
-
-	oldtime = newtime;
-
-	return newtime;
-#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)
-	static int first = true;
-	static double oldtime = 0.0, basetime = 0.0, timescale = 0.0;
-	double newtime;
-	LARGE_INTEGER PerformanceFreq;
-	LARGE_INTEGER PerformanceCount;
-
-	if (first)
+	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__
+		#ifdef __BORLANDC__
 		timescale = 1.0 / ((double) PerformanceFreq.u.LowPart + (double) PerformanceFreq.u.HighPart * 65536.0 * 65536.0);
-#else
+		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);
-#endif	
+		newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale;
+		#endif
 	}
 
-	QueryPerformanceCounter (&PerformanceCount);
-
-#ifdef __BORLANDC__
-	newtime = ((double) PerformanceCount.u.LowPart + (double) PerformanceCount.u.HighPart * 65536.0 * 65536.0) * timescale - basetime;
-#else
-	newtime = ((double) PerformanceCount.LowPart + (double) PerformanceCount.HighPart * 65536.0 * 65536.0) * timescale - basetime;
-#endif	
-
 	if (first)
 	{
 		first = false;
-		basetime = newtime;
-		newtime = 0;
+		oldtime = newtime;
 	}
 
 	if (newtime < oldtime)
-		Sys_Error("Sys_DoubleTime: time running backwards??\n");
-
+	{
+		// 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 newtime;
-#endif
+	return curtime;
 }
 
 
@@ -399,7 +281,7 @@ char *Sys_ConsoleInput (void)
 				switch (ch)
 				{
 					case '\r':
-						WriteFile(houtput, "\r\n", 2, &dummy, NULL);	
+						WriteFile(houtput, "\r\n", 2, &dummy, NULL);
 
 						if (len)
 						{
@@ -418,7 +300,7 @@ char *Sys_ConsoleInput (void)
 						break;
 
 					case '\b':
-						WriteFile(houtput, "\b \b", 3, &dummy, NULL);	
+						WriteFile(houtput, "\b \b", 3, &dummy, NULL);
 						if (len)
 						{
 							len--;
@@ -428,7 +310,7 @@ char *Sys_ConsoleInput (void)
 					default:
 						if (ch >= ' ')
 						{
-							WriteFile(houtput, &ch, 1, &dummy, NULL);	
+							WriteFile(houtput, &ch, 1, &dummy, NULL);
 							text[len] = ch;
 							len = (len + 1) & 0xff;
 						}
@@ -451,7 +333,7 @@ void Sys_Sleep (void)
 
 void Sys_SendKeyEvents (void)
 {
-    MSG        msg;
+	MSG msg;
 
 	while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
 	{
@@ -461,8 +343,8 @@ void Sys_SendKeyEvents (void)
 		if (!GetMessage (&msg, NULL, 0, 0))
 			Sys_Quit ();
 
-      	TranslateMessage (&msg);
-      	DispatchMessage (&msg);
+		TranslateMessage (&msg);
+		DispatchMessage (&msg);
 	}
 }
 
@@ -470,7 +352,7 @@ void Sys_SendKeyEvents (void)
 /*
 ==============================================================================
 
- WINDOWS CRAP
+WINDOWS CRAP
 
 ==============================================================================
 */
@@ -489,19 +371,18 @@ 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			oldtime, newtime;
-	MEMORYSTATUS	lpBuffer;
-	static	char	cwd[1024];
-	int				t;
+	double frameoldtime, framenewtime;
+	MEMORYSTATUS lpBuffer;
+	int t;
 
-    /* previous instances do not exist in Win32 */
-    if (hPrevInstance)
-        return 0;
+	/* previous instances do not exist in Win32 */
+	if (hPrevInstance)
+		return 0;
 
 	global_hInstance = hInstance;
 	global_nCmdShow = nCmdShow;
@@ -509,28 +390,20 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 	lpBuffer.dwLength = sizeof(MEMORYSTATUS);
 	GlobalMemoryStatus (&lpBuffer);
 
-	if (!GetCurrentDirectory (sizeof(cwd), cwd))
-		Sys_Error ("Couldn't determine current directory");
+	com_argc = 1;
+	program_name[sizeof(program_name)-1] = 0;
+	GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
+	argv[0] = program_name;
 
-	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))
+	while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
 	{
 		while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
 			lpCmdLine++;
 
 		if (*lpCmdLine)
 		{
-			argv[host_parms.argc] = lpCmdLine;
-			host_parms.argc++;
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
 
 			while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
 				lpCmdLine++;
@@ -540,19 +413,14 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 				*lpCmdLine = 0;
 				lpCmdLine++;
 			}
-
 		}
 	}
-
-	host_parms.argv = argv;
-
-	COM_InitArgv (host_parms.argc, host_parms.argv);
-
-	host_parms.argc = com_argc;
-	host_parms.argv = com_argv;
+	com_argv = argv;
 
 	Sys_Shared_EarlyInit();
 
+	Cvar_RegisterVariable(&sys_usetimegettime);
+
 	tevent = CreateEvent(NULL, false, false, NULL);
 
 	if (!tevent)
@@ -593,42 +461,33 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 // because sound is off until we become active
 	S_BlockSound ();
 
-#if WIN32_USETIMEGETTIME
-	// make sure the timer is high precision, otherwise NT gets 18ms resolution
-	// LordHavoc:
-	// Windows 2000 Advanced Server (and possibly other versions)
-	// apparently have a broken timer, because it runs at more like 10x speed
-	// if this isn't used, heh
-	timeBeginPeriod (1);
-#endif
-
 	Host_Init ();
 
 	Sys_Shared_LateInit();
 
-	oldtime = Sys_DoubleTime ();
+	frameoldtime = Sys_DoubleTime ();
 
-    /* main window message loop */
+	/* 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 && !ActiveApp) || Minimized)
+			if ((cl.paused && !vid_activewindow) || vid_hidden)
 			{
 				SleepUntilInput (PAUSE_SLEEP);
 				scr_skipupdate = 1;		// no point in bothering to draw
 			}
-			else if (!ActiveApp)
+			else if (!vid_activewindow)
 				SleepUntilInput (NOT_FOCUS_SLEEP);
 		}
 
-		newtime = Sys_DoubleTime ();
-		Host_Frame (newtime - oldtime);
-		oldtime = newtime;
+		framenewtime = Sys_DoubleTime ();
+		Host_Frame (framenewtime - frameoldtime);
+		frameoldtime = framenewtime;
 	}
 
-    /* return success of application */
-    return true;
+	/* return success of application */
+	return true;
 }