X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=sys_win.c;h=5431221a12d0848455ab2614b45fd8a100577993;hb=99baef80f7deed1618656b844cf7ed4e6214faa6;hp=c5fdb0c35581bb9dfcb381ad0e66180b27e7b7a8;hpb=8bf0a0e63b2c9998aa79491da2f31fd6d73dd49c;p=xonotic%2Fdarkplaces.git

diff --git a/sys_win.c b/sys_win.c
index c5fdb0c3..5431221a 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -22,22 +22,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #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", "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
 
 
 /*
@@ -94,21 +96,26 @@ void Sys_Error (const char *error, ...)
 
 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)
+
+	if ((houtput != 0) && (houtput != INVALID_HANDLE_VALUE))
 		WriteFile(houtput, text, (DWORD) strlen(text), &dummy, NULL);
 }
 
@@ -187,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;
@@ -206,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)
 		{
@@ -267,11 +286,9 @@ char *Sys_ConsoleInput (void)
 	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)
@@ -287,8 +304,10 @@ 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);
 			}
 		}
@@ -299,6 +318,7 @@ char *Sys_GetClipboardData (void)
 
 void Sys_InitConsole (void)
 {
+#ifdef QHOST
 	int t;
 
 	// initialize the windows dedicated server console if needed
@@ -306,17 +326,27 @@ void Sys_InitConsole (void)
 
 	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
@@ -340,6 +370,7 @@ void Sys_InitConsole (void)
 		}
 
 		InitConProc (hFile, heventParent, heventChild);
+#endif
 	}
 
 // because sound is off until we become active
@@ -371,7 +402,6 @@ char		program_name[MAX_OSPATH];
 
 int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
-	double frameoldtime, framenewtime;
 	MEMORYSTATUS lpBuffer;
 
 	/* previous instances do not exist in Win32 */
@@ -424,18 +454,28 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
 		}
 	}
 
-	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;
 }