audit of fullscreengrab in VID_SetMouse, getting rid of unnecessary

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index 0da7f23685caca1e9c91fc8b8ea5a1a21187af91..f12930d04b9d6624a99cc944c53cc0b0e4a6e499 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -22,7 +22,9 @@ 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"
@@ -32,10 +34,12 @@ cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1", "use windows
 
 HANDLE                         hinput, houtput;
 
+#ifdef QHOST
 static HANDLE  tevent;
 static HANDLE  hFile;
 static HANDLE  heventParent;
 static HANDLE  heventChild;
+#endif
 
 
 /*
@@ -92,14 +96,18 @@ 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)
@@ -205,20 +213,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)
                {
@@ -268,8 +284,6 @@ char *Sys_ConsoleInput (void)
 
 void Sys_Sleep(int microseconds)
 {
-       if (microseconds < 1000)
-               microseconds = 1000;
        Sleep(microseconds / 1000);
 }
 
@@ -300,6 +314,7 @@ char *Sys_GetClipboardData (void)
 
 void Sys_InitConsole (void)
 {
+#ifdef QHOST
        int t;
 
        // initialize the windows dedicated server console if needed
@@ -307,23 +322,27 @@ void Sys_InitConsole (void)
 
        if (!tevent)
                Sys_Error ("Couldn't create event");
+#endif
 
        houtput = GetStdHandle (STD_OUTPUT_HANDLE);
-       if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE))
-       {
-           AllocConsole ();
-           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 ((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");
 
 
+#ifdef QHOST
 #ifdef _WIN64
 #define atoi _atoi64
 #endif
@@ -347,6 +366,7 @@ void Sys_InitConsole (void)
                }
 
                InitConProc (hFile, heventParent, heventChild);
+#endif
        }
 
 // because sound is off until we become active