make WinMain commandline parser handle quoted strings

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index a0c2ed038163f53e885f419c443863de79f2f220..4114fdcd12743a8cfa07e0212c4c5c59fb6a0059 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -20,12 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // sys_win.c -- Win32 system interface code
 
 #include "quakedef.h"
-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
 #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"};
 
 // # of seconds to wait on Sys_Error running dedicated before exiting
@@ -35,8 +38,6 @@ cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 // sleep time when not focus
 #define NOT_FOCUS_SLEEP        20
 
-int                    starttime;
-
 static qboolean                sc_return_on_enter = false;
 HANDLE                         hinput, houtput;
 
@@ -45,6 +46,7 @@ static HANDLE hFile;
 static HANDLE  heventParent;
 static HANDLE  heventChild;
 
+
 /*
 ===============================================================================
 
@@ -58,57 +60,22 @@ void SleepUntilInput (int time);
 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[1024];
        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);
+       vsnprintf (text, sizeof (text), error, argptr);
        va_end (argptr);
 
-       if (cls.state == ca_dedicated)
+       // close video so the message box is visible, unless we already tried that
+       if (!in_sys_error0 && 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
-
-               while (!Sys_ConsoleInput () && ((Sys_DoubleTime () - starttime) < CONSOLE_ERROR_TIMEOUT))
-                       SleepUntilInput(1);
-       }
-       else
-       {
-       // 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_error0 = 1;
+               VID_Shutdown();
        }
+       MessageBox(NULL, text, "Quake Error", MB_OK | MB_SETFOREGROUND | MB_ICONSTOP);
 
        if (!in_sys_error1)
        {
@@ -142,6 +109,13 @@ void Sys_Quit (void)
        exit (0);
 }
 
+void Sys_PrintToTerminal(const char *text)
+{
+       DWORD dummy;
+       extern HANDLE houtput;
+       if (cls.state == ca_dedicated)
+               WriteFile(houtput, text, strlen (text), &dummy, NULL);
+}
 
 /*
 ================
@@ -300,9 +274,11 @@ char *Sys_ConsoleInput (void)
        return NULL;
 }
 
-void Sys_Sleep (void)
+void Sys_Sleep(int milliseconds)
 {
-       Sleep (1);
+       if (milliseconds < 1)
+               milliseconds = 1;
+       Sleep(milliseconds);
 }
 
 
@@ -345,15 +321,13 @@ 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 frameoldtime, framenewtime;
        MEMORYSTATUS lpBuffer;
-//     static char cwd[1024];
        int t;
 
        /* previous instances do not exist in Win32 */
@@ -361,47 +335,55 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                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.basedir = ".";
-#if CACHEENABLE
-       host_parms.cachedir = ".";
-#endif
-
        com_argc = 1;
-       argv[0] = empty_string;
+       program_name[sizeof(program_name)-1] = 0;
+       GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
+       argv[0] = program_name;
 
+       // 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 <= 32)
                        lpCmdLine++;
 
                if (*lpCmdLine)
                {
-                       argv[com_argc] = lpCmdLine;
-                       com_argc++;
+                       if (*lpCmdLine == '\"')
+                       {
+                               // quoted string
+                               argv[com_argc] = lpCmdLine;
+                               com_argc++;
+
+                               while (*lpCmdLine && (*lpCmdLine != '\"'))
+                                       lpCmdLine++;
 
-                       while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
-                               lpCmdLine++;
+                               if (*lpCmdLine)
+                               {
+                                       *lpCmdLine = 0;
+                                       lpCmdLine++;
+                               }
 
-                       if (*lpCmdLine)
+                               if (*lpCmdLine == '\"')
+                                       lpCmdLine++;
+                       }
+                       else
                        {
-                               *lpCmdLine = 0;
-                               lpCmdLine++;
+                               // unquoted word
+                               argv[com_argc] = lpCmdLine;
+                               com_argc++;
+
+                               while (*lpCmdLine && *lpCmdLine > 32)
+                                       lpCmdLine++;
+
+                               if (*lpCmdLine)
+                               {
+                                       *lpCmdLine = 0;
+                                       lpCmdLine++;
+                               }
                        }
                }
        }
@@ -456,7 +438,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        Sys_Shared_LateInit();
 
        frameoldtime = Sys_DoubleTime ();
-
+       
        /* main window message loop */
        while (1)
        {