pixman: fix qemu_default_pixman_format (32bpp non-native endian)

[qemu.git] / os-win32.c

diff --git a/os-win32.c b/os-win32.c
index 8523d8d0c4bc3b7a90ae3a5e9b76f5ca4352134a..5f95caac1590a24efb6b208161c034c0c79674a4 100644 (file)
--- a/os-win32.c
+++ b/os-win32.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 #include <windows.h>
  * THE SOFTWARE.
  */
 #include <windows.h>

+#include <mmsystem.h>

 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <signal.h>


@@ -30,7 +31,7 @@
 #include <errno.h>
 #include <sys/time.h>
 #include "config-host.h"
 #include <errno.h>
 #include <sys/time.h>
 #include "config-host.h"

-#include "sysemu.h"
+#include "sysemu/sysemu.h"

 #include "qemu-options.h"
 
 /***********************************************************/
 #include "qemu-options.h"
 
 /***********************************************************/


@@ -57,54 +58,35 @@ int setenv(const char *name, const char *value, int overwrite)
 
 static BOOL WINAPI qemu_ctrl_handler(DWORD type)
 {
 
 static BOOL WINAPI qemu_ctrl_handler(DWORD type)
 {

-    exit(STATUS_CONTROL_C_EXIT);
+    qemu_system_shutdown_request();
+    /* Windows 7 kills application when the function returns.
+       Sleep here to give QEMU a try for closing.
+       Sleep period is 10000ms because Windows kills the program
+       after 10 seconds anyway. */
+    Sleep(10000);
+

     return TRUE;
 }
 
     return TRUE;
 }
 

-void os_setup_early_signal_handling(void)
+static TIMECAPS mm_tc;
+
+static void os_undo_timer_resolution(void)

 {
 {

-    /* Note: cpu_interrupt() is currently not SMP safe, so we force
-       QEMU to run on a single CPU */
-    HANDLE h;
-    DWORD_PTR mask, smask;
-    int i;
+    timeEndPeriod(mm_tc.wPeriodMin);
+}

 
 

+void os_setup_early_signal_handling(void)
+{

     SetConsoleCtrlHandler(qemu_ctrl_handler, TRUE);
     SetConsoleCtrlHandler(qemu_ctrl_handler, TRUE);

-
-    h = GetCurrentProcess();
-    if (GetProcessAffinityMask(h, &mask, &smask)) {
-        for(i = 0; i < 32; i++) {
-            if (mask & (1 << i))
-                break;
-        }
-        if (i != 32) {
-            mask = 1 << i;
-            SetProcessAffinityMask(h, mask);
-        }
-    }
+    timeGetDevCaps(&mm_tc, sizeof(mm_tc));
+    timeBeginPeriod(mm_tc.wPeriodMin);
+    atexit(os_undo_timer_resolution);

 }
 
 /* Look for support files in the same directory as the executable.  */
 }
 
 /* Look for support files in the same directory as the executable.  */

-char *os_find_datadir(const char *argv0)
+char *os_find_datadir(void)

 {
 {

-    char *p;
-    char buf[MAX_PATH];
-    DWORD len;
-
-    len = GetModuleFileName(NULL, buf, sizeof(buf) - 1);
-    if (len == 0) {
-        return NULL;
-    }
-
-    buf[len] = 0;
-    p = buf + len - 1;
-    while (p != buf && *p != '\\')
-        p--;
-    *p = 0;
-    if (access(buf, R_OK) == 0) {
-        return g_strdup(buf);
-    }
-    return NULL;
+    return qemu_get_exec_dir();

 }
 
 void os_set_line_buffering(void)
 }
 
 void os_set_line_buffering(void)


@@ -151,8 +133,3 @@ int qemu_create_pidfile(const char *filename)
     }
     return 0;
 }
     }
     return 0;
 }

-
-int qemu_get_thread_id(void)
-{
-    return GetCurrentThreadId();
-}