X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=sys_win.c;h=f86b03e054f1315cdbcd8611a1c0580d9ed41f0a;hp=8353408b5a7b8e9d43a81562f6ba676d6d99295d;hb=003e8052f6708f2197fa69c9c759185d3a07eb4d;hpb=7305ab0695a23466c3554c8670c3b8a38bbc54a9

diff --git a/sys_win.c b/sys_win.c
index 8353408b..f86b03e0 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,185 +19,24 @@ 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"
 
-#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
-
-int			starttime;
-qboolean	ActiveApp, Minimized;
+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)"};
 
-qboolean			isDedicated;
-static qboolean		sc_return_on_enter = false;
 HANDLE				hinput, houtput;
 
-static char			*tracking_tag = "Clams & Mooses";
-
 static HANDLE	tevent;
 static HANDLE	hFile;
 static HANDLE	heventParent;
 static HANDLE	heventChild;
 
-volatile int					sys_checksum;
-
-
-/*
-================
-Sys_PageIn
-================
-*/
-/*
-void Sys_PageIn (void *ptr, int size)
-{
-	byte	*x;
-	int		m, n;
-
-// touch all the memory to make sure it's there. The 16-page skip is to
-// keep Win 95 from thinking we're trying to page ourselves in (we are
-// doing that, of course, but there's no reason we shouldn't)
-	x = (byte *)ptr;
-
-	for (n=0 ; n<4 ; n++)
-	{
-		for (m=0 ; m<(size - 16 * 0x1000) ; m += 4)
-		{
-			sys_checksum += *(int *)&x[m];
-			sys_checksum += *(int *)&x[m + 16 * 0x1000];
-		}
-	}
-}
-*/
-
-
-/*
-===============================================================================
-
-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;
-}
-
-/*
-================
-filelength
-================
-*/
-int 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 = filelength(f);
-	}
-
-	return retval;
-}
-
-int Sys_FileOpenWrite (char *path)
-{
-	QFile	*f;
-	int		i;
-
-	i = findhandle ();
-
-	f = Qopen(path, "wb");
-	if (!f)
-		Host_Error ("Error opening %s: %s", path,strerror(errno));
-	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 (dest, 1, count, sys_handles[handle]);
-}
-
-int Sys_FileWrite (int handle, void *data, int count)
-{
-	return Qwrite (data, 1, count, sys_handles[handle]);
-}
-
-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);
-}
-
 
 /*
 ===============================================================================
@@ -207,65 +46,32 @@ SYSTEM IO
 ===============================================================================
 */
 
-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 (isDedicated)
-	{
-		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);
-
+	Con_Printf ("Quake Error: %s\n", text);
 
-		starttime = Sys_DoubleTime ();
-		sc_return_on_enter = true;	// so Enter will get us out of here
-
-		while (!Sys_ConsoleInput () &&
-				((Sys_DoubleTime () - starttime) < CONSOLE_ERROR_TIMEOUT))
-		{
-		}
+	// 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)
@@ -278,45 +84,32 @@ void Sys_Error (char *error, ...)
 	if (!in_sys_error2)
 	{
 		in_sys_error2 = 1;
-		DeinitConProc ();
+		Sys_Shutdown ();
 	}
 
 	exit (1);
 }
 
-void Sys_Printf (char *fmt, ...)
+void Sys_Shutdown (void)
 {
-	va_list		argptr;
-	char		text[1024];
-	DWORD		dummy;
-	
-	if (isDedicated)
-	{
-		va_start (argptr,fmt);
-		vsprintf (text, fmt, argptr);
-		va_end (argptr);
-
-		WriteFile(houtput, text, strlen (text), &dummy, NULL);	
-	}
-}
-
-void Sys_Quit (void)
-{
-
-	Host_Shutdown();
-
 	if (tevent)
 		CloseHandle (tevent);
 
-	if (isDedicated)
+	if (cls.state == ca_dedicated)
 		FreeConsole ();
 
 // shut down QHOST hooks if necessary
 	DeinitConProc ();
-
-	exit (0);
 }
 
+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);
+}
 
 /*
 ================
@@ -325,104 +118,91 @@ 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");
+		{
+			Con_Printf ("No hardware timer available\n");
+			// fall back to timeGetTime
+			Cvar_SetValueQuick(&sys_usetimegettime, true);
+			return Sys_DoubleTime();
+		}
+		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;
 }
 
 
 char *Sys_ConsoleInput (void)
 {
-	static char	text[256];
-	static int		len;
-	INPUT_RECORD	recs[1024];
-	int		dummy;
-	int		ch, numread, numevents;
+	static char text[MAX_INPUTLINE];
+	static int len;
+	INPUT_RECORD recs[1024];
+	int ch;
+	DWORD numread, numevents, dummy;
 
-	if (!isDedicated)
+	if (cls.state != ca_dedicated)
 		return NULL;
 
 
@@ -449,7 +229,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)
 						{
@@ -457,18 +237,11 @@ 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;
 
 					case '\b':
-						WriteFile(houtput, "\b \b", 3, &dummy, NULL);	
+						WriteFile(houtput, "\b \b", 3, &dummy, NULL);
 						if (len)
 						{
 							len--;
@@ -478,7 +251,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;
 						}
@@ -493,219 +266,193 @@ char *Sys_ConsoleInput (void)
 	return NULL;
 }
 
-void Sys_Sleep (void)
+void Sys_Sleep(int microseconds)
 {
-	Sleep (1);
+	if (microseconds < 1000)
+		microseconds = 1000;
+	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 = GlobalLock (hClipboardData)) != 0)
+			{
+				size_t allocsize;
+				allocsize = GlobalSize (hClipboardData) + 1;
+				data = Z_Malloc (allocsize);
+				strlcpy (data, cliptext, allocsize);
+				GlobalUnlock (hClipboardData);
+			}
+		}
+		CloseClipboard ();
+	}
+	return data;
+}
 
-void Sys_SendKeyEvents (void)
+void Sys_InitConsole (void)
 {
-    MSG        msg;
+	int t;
 
-	while (PeekMessage (&msg, NULL, 0, 0, PM_NOREMOVE))
+	// initialize the windows dedicated server console if needed
+	tevent = CreateEvent(NULL, false, false, NULL);
+
+	if (!tevent)
+		Sys_Error ("Couldn't create event");
+
+	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))
+		{
+		    AllocConsole ();
+		    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 ();
 
-      	TranslateMessage (&msg);
-      	DispatchMessage (&msg);
+#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]);
+		}
+
+		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);
 	}
+
+// because sound is off until we become active
+	S_BlockSound ();
 }
 
+void Sys_Init_Commands (void)
+{
+	Cvar_RegisterVariable(&sys_usetimegettime);
+}
 
 /*
 ==============================================================================
 
- WINDOWS CRAP
+WINDOWS CRAP
 
 ==============================================================================
 */
 
 
-/*
-==================
-WinMain
-==================
-*/
-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			time, oldtime, newtime/*, timediff*/;
-	MEMORYSTATUS	lpBuffer;
-	static	char	cwd[1024];
-	int				t;
+	MEMORYSTATUS lpBuffer;
 
-    /* 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;
 
 	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 && *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;
-
-	COM_InitArgv (host_parms.argc, host_parms.argv);
-
-	host_parms.argc = com_argc;
-	host_parms.argv = com_argv;
-
-	isDedicated = (COM_CheckParm ("-dedicated") != 0);
-
-// take the greater of all the available memory or half the total memory,
-// but at least 8 Mb and no more than 16 Mb, unless they explicitly
-// request otherwise
-	/*
-	host_parms.memsize = lpBuffer.dwAvailPhys;
-
-	if (host_parms.memsize < MINIMUM_WIN_MEMORY)
-		host_parms.memsize = MINIMUM_WIN_MEMORY;
-
-	if (host_parms.memsize < (lpBuffer.dwTotalPhys >> 1))
-		host_parms.memsize = lpBuffer.dwTotalPhys >> 1;
-
-	if (host_parms.memsize > MAXIMUM_WIN_MEMORY)
-		host_parms.memsize = MAXIMUM_WIN_MEMORY;
-	*/
-
-//	Sys_PageIn (parms.membase, parms.memsize);
-
-	tevent = CreateEvent(NULL, false, false, NULL);
-
-	if (!tevent)
-		Sys_Error ("Couldn't create event");
-
-	if (isDedicated)
-	{
-		if (!AllocConsole ())
+		else
 		{
-			Sys_Error ("Couldn't create dedicated server console");
+			// unquoted word
+			argv[com_argc] = lpCmdLine;
+			com_argc++;
+			while (*lpCmdLine && *lpCmdLine > ' ')
+				lpCmdLine++;
 		}
 
-		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)
-		{
-			if (t < com_argc)
-				hFile = (HANDLE)atoi (com_argv[t+1]);
-		}
-			
-		if ((t = COM_CheckParm ("-HPARENT")) > 0)
-		{
-			if (t < com_argc)
-				heventParent = (HANDLE)atoi (com_argv[t+1]);
-		}
-			
-		if ((t = COM_CheckParm ("-HCHILD")) > 0)
+		if (*lpCmdLine)
 		{
-			if (t < com_argc)
-				heventChild = (HANDLE)atoi (com_argv[t+1]);
+			*lpCmdLine = 0;
+			lpCmdLine++;
 		}
-
-		InitConProc (hFile, heventParent, heventChild);
 	}
 
-// because sound is off until we become active
-	S_BlockSound ();
+	Host_Main();
 
-#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
+	/* return success of application */
+	return true;
+}
 
-	Sys_Printf ("Host_Init\n");
-	Host_Init ();
+int main (int argc, const char* argv[])
+{
+	MEMORYSTATUS lpBuffer;
 
-	oldtime = Sys_DoubleTime ();
+	global_hInstance = GetModuleHandle (0);
 
-    /* main window message loop */
-	while (1)
-	{
-		if (!isDedicated)
-		{
-		// yield the CPU for a little while when paused, minimized, or not the focus
-			if ((cl.paused && (!ActiveApp && !DDActive)) || Minimized)
-			{
-				SleepUntilInput (PAUSE_SLEEP);
-				scr_skipupdate = 1;		// no point in bothering to draw
-			}
-			else if (!ActiveApp && !DDActive)
-			{
-				SleepUntilInput (NOT_FOCUS_SLEEP);
-			}
+	lpBuffer.dwLength = sizeof(MEMORYSTATUS);
+	GlobalMemoryStatus (&lpBuffer);
 
-			newtime = Sys_DoubleTime ();
-			time = newtime - oldtime;
-		}
+	program_name[sizeof(program_name)-1] = 0;
+	GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
 
-		Host_Frame (time);
-		oldtime = newtime;
-	}
+	com_argc = argc;
+	com_argv = argv;
 
-    /* return success of application */
-    return true;
-}
+	Host_Main();
 
+	return true;
+}