go back to block counting, looks like we now know what's broken with waveOut

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index 6addcdfa5fb747c2c3e23b35fe693e7b3ddf2445..a4c740c990dd0233f11004b9c88ff09e52723c43 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"
@@ -106,7 +108,8 @@ 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);
 }
 
@@ -265,11 +268,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)
@@ -307,15 +308,22 @@ void Sys_InitConsole (void)
        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"))
        {
-               if (!AllocConsole ())
+               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");
 
-               hinput = GetStdHandle (STD_INPUT_HANDLE);
-               houtput = GetStdHandle (STD_OUTPUT_HANDLE);
 
 #ifdef _WIN64
 #define atoi _atoi64
@@ -428,3 +436,23 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        /* return success of application */
        return true;
 }
+
+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 true;
+}