Fixed compilation for win64 native

bochs/CHANGES

@@ -13,6 +13,8 @@ Changes after 2.4.5 release:
   - Updated/Fixed instrumentation callbacks
 
 - Configure and compile
+  - Bochs now can be compiled as native Windows x86-64 application
+    (tested with Mingw gcc 4.5.1 and Microsoft Visual Studio Express 2010)
   - Added ability to configure CPUID stepping through .bochsrc.
     The default stepping value is 3.
   - Added ability to disable MONITOR/MWAIT support through .bochsrc
@@ -23,7 +25,8 @@ Changes after 2.4.5 release:
     - 32-bit physical address for 386/486 guests
     - 36-bit physical address for PSE-36 enabled Pentium guest
     - 40-bit physical address for PAE enabled P6 or later guests
-  - Update config.guess/config.sub scripts to May 2010 revisions.
+  - Updated config.guess/config.sub scripts to May 2010 revisions.
+  - Updated Visual Studio 2008 project files in build/win32/vs2008ex-workspace.zip
   - Added Bochs compilation timestamp after Bochs version string.
 
 - GUI and display libraries (Volker)

bochs/build/win32/bochs.win32.manifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
 <assemblyIdentity
-    version="2.4.2.0"
+    version="2.4.5.0"
     processorArchitecture="X86"
     name="Bochs.Bochs.Bochs"
     type="win32"

bochs/build/win32/bochs.win64.manifest

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="2.4.5.0"
+    processorArchitecture="X86"
+    name="Bochs.Bochs.Bochs"
+    type="win32"
+/>
+<description>Quartus</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="amd64"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>

bochs/gui/win32dialog.h

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////
-// $Id: win32dialog.h,v 1.21 2011-01-12 18:18:48 sshwarts Exp $
+// $Id: win32dialog.h,v 1.22 2011-02-11 14:23:30 sshwarts Exp $
 /////////////////////////////////////////////////////////////////////////
 //
 //  Copyright (C) 2009  The Bochs Project
@@ -23,28 +23,15 @@
 
 #include "config.h"
 
-#ifndef _WIN64
-
+// Compilation for WIN64 native require minimum 0x0500
 #ifndef _WIN32_IE
-#define _WIN32_IE 0x0400	/* Force a minimum "OS level" for commctrl.h */
-#endif
-#if _WIN32_IE < 0x0400
-#undef _WIN32_IE
-#define _WIN32_IE 0x0400
-#endif
-
-#else
-
-#ifndef _WIN32_IE
-#define _WIN32_IE 0x0500	/* WIN64 requirements are higher */
+#define _WIN32_IE 0x0500  /* Force a minimum "OS level" for commctrl.h */
 #endif
 #if _WIN32_IE < 0x0500
 #undef _WIN32_IE
 #define _WIN32_IE 0x0500
 #endif
 
-#endif
-
 extern "C" {
 #include <assert.h>
 #include <stdio.h>

bochs/win32res.rc

@@ -5,8 +5,13 @@
 ICON_BOCHS ICON build\win32\nsis\logo.ico
 1 ICON build\win32\nsis\bochs.ico
 
-// Manifest for WinXP & Win2003
-1 24 build\win32\bochs.manifest
+#ifndef _WIN64
+// Manifest for 32-bit Windows
+1 24 build\win32\bochs.win32.manifest
+#else
+// Manifest for 64-bit Windows
+1 24 build\win32\bochs.win64.manifest
+#endif
 
 ASK_DLG DIALOG 30, 30, 200, 100
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU