Changeset 34521 in vbox

Timestamp:

Nov 30, 2010 2:35:40 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68311

Message:

VBoxGuest: Report 64-bit OS types (only linux got this right earlier).

Location:

trunk

Files:

• include/VBox/ostypes.h (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp (modified) (1 diff)

trunk/include/VBox/ostypes.h

@@ -113 +113 @@
     VBOXOSTYPE_MacOS_x64        = 0xB0100,
     VBOXOSTYPE_JRockitVE        = 0xC0000,
+/** The bit number which indicates 64-bit or 32-bit. */
+#define VBOXOSTYPE_x64_BIT       8
+    /** The mask which indicates 64-bit. */
+    VBOXOSTYPE_x64            = 1 << VBOXOSTYPE_x64_BIT,
     /** The usual 32-bit hack. */
     VBOXOSTYPE_32BIT_HACK = 0x7fffffff
 } VBOXOSTYPE;
+
 
 /**

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-freebsd.c

@@ -548 +548 @@
             rc = VBoxGuestInitDevExt(&g_DevExt, pState->uIOPortBase,
                                      pState->pMMIOBase, pState->VMMDevMemSize,
-                                     VBOXOSTYPE_FreeBSD, VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
+#if ARCH_BITS == 64
+                                     VBOXOSTYPE_FreeBSD_x64,
+#else
+                                     VBOXOSTYPE_FreeBSD,
+#endif
+                                     VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
             if (RT_SUCCESS(rc))
             {

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -306 +306 @@
                                  * Call the common device extension initializer.
                                  */
-                                rc = VBoxGuestInitDevExt(&g_DevExt, g_uIOPortBase, g_pMMIOBase,
-                                                         g_cbMMIO, VBOXOSTYPE_Solaris,
+                                rc = VBoxGuestInitDevExt(&g_DevExt, g_uIOPortBase, g_pMMIOBase, g_cbMMIO,
+#if ARCH_BITS == 64
+                                                         VBOXOSTYPE_Solaris_x64,
+#else
+                                                         VBOXOSTYPE_Solaris,
+#endif
                                                          VMMDEV_EVENT_MOUSE_POSITION_CHANGED);
                                 if (RT_SUCCESS(rc))

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp

@@ -1133 +1133 @@
 VBOXOSTYPE vboxguestwinVersionToOSType(winVersion_t winVer)
 {
+    VBOXOSTYPE enmOsType;
     switch (winVer)
     {
         case WINNT4:
-            return VBOXOSTYPE_WinNT4;
+            enmOsType = VBOXOSTYPE_WinNT4;
+            break;
 
         case WIN2K:
-            return VBOXOSTYPE_Win2k;
+            enmOsType = VBOXOSTYPE_Win2k;
+            break;
 
         case WINXP:
-            return VBOXOSTYPE_WinXP;
+            enmOsType = VBOXOSTYPE_WinXP;
+            break;
 
         case WIN2K3:
-            return VBOXOSTYPE_Win2k3;
+            enmOsType = VBOXOSTYPE_Win2k3;
+            break;
 
         case WINVISTA:
-            return VBOXOSTYPE_WinVista;
+            enmOsType = VBOXOSTYPE_WinVista;
+            break;
 
         case WIN7:
-            return VBOXOSTYPE_Win7;
+            enmOsType = VBOXOSTYPE_Win7;
+            break;
 
         default:
+            /* We don't know, therefore NT family. */
+            enmOsType = VBOXOSTYPE_WinNT;
             break;
     }
-
-    /* We don't know, therefore NT family. */
-    return VBOXOSTYPE_WinNT;
+#if ARCH_BITS == 64
+    enmOsType += VBOXOSTYPE_x64;
+#endif
+    return enmOsType;
 }