Changeset 7233 in vbox

Timestamp:

Mar 3, 2008 12:25:32 PM (17 years ago)

Author:

vboxsync

Message:

Renamed OSType to VBOXOSTYPE to fix the clash with some mac os x typedef.

Location:

trunk

Files:

• include/VBox/VBoxGuest.h (modified) (1 diff)
• include/VBox/ostypes.h (modified) (1 diff)
• src/VBox/Additions/WINNT/VBoxGuest/Helper.cpp (modified) (1 diff)
• src/VBox/Additions/common/VBoxGuest/VBoxGuest-os2.cpp (modified) (2 diffs)
• src/VBox/Additions/linux/module/vboxmod.c (modified) (1 diff)
• src/VBox/Frontends/VBoxBFE/SDLConsole.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox4/include/VBoxConsoleView.h (modified) (1 diff)
• src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp (modified) (1 diff)
• src/VBox/Main/GuestOSTypeImpl.cpp (modified) (2 diffs)
• src/VBox/Main/VirtualBoxImpl.cpp (modified) (2 diffs)
• src/VBox/Main/include/GuestOSTypeImpl.h (modified) (2 diffs)

trunk/include/VBox/VBoxGuest.h

@@ -359 +359 @@
     uint32_t additionsVersion;
     /** guest OS type */
-    OSType osType;
+    VBOXOSTYPE osType;
     /** @todo */
 } VBoxGuestInfo;

trunk/include/VBox/ostypes.h

@@ -32 +32 @@
 
 /**
- * Global list of guest operating system types. They are grouped
- * into families. A family identifer is always has mod 0x10000 == 0.
- * New entries can be added, however other components might depend
- * on the values (e.g. the Qt GUI) so if possible, the values should
- * stay the same.
- * 
- * @todo This typedef crashes with a core Mac OS X typedef, please rename it.
+ * Global list of guest operating system types.
+ *
+ * They are grouped into families. A family identifer is always has
+ * mod 0x10000 == 0. New entries can be added, however other components
+ * depend on the values (e.g. the Qt GUI and guest additions) so the
+ * existing values MUST stay the same.
  */
-typedef enum
+typedef enum VBOXOSTYPE
 {
-    OSTypeUnknown   = 0,
-    OSTypeDOS       = 0x10000,
-    OSTypeWin31     = 0x15000,
-    OSTypeWin9x     = 0x20000,
-    OSTypeWin95     = 0x21000,
-    OSTypeWin98     = 0x22000,
-    OSTypeWinMe     = 0x23000,
-    OSTypeWinNT     = 0x30000,
-    OSTypeWinNT4    = 0x31000,
-    OSTypeWin2k     = 0x32000,
-    OSTypeWinXP     = 0x33000,
-    OSTypeWin2k3    = 0x34000,
-    OSTypeWinVista  = 0x35000,
-    OSTypeOS2       = 0x40000,
-    OSTypeOS2Warp3  = 0x41000,
-    OSTypeOS2Warp4  = 0x42000,
-    OSTypeOS2Warp45 = 0x43000,
-    OSTypeLinux     = 0x50000,
-    OSTypeLinux22   = 0x51000,
-    OSTypeLinux24   = 0x52000,
-    OSTypeLinux26   = 0x53000,
-    OSTypeFreeBSD   = 0x60000,
-    OSTypeOpenBSD   = 0x61000,
-    OSTypeNetBSD    = 0x62000,
-    OSTypeNetware   = 0x70000,
-    OSTypeSolaris   = 0x80000,
-    OSTypeL4        = 0x90000
-} OSType, VBOXOSTYPE;
+    VBOXOSTYPE_Unknown   = 0,
+    VBOXOSTYPE_DOS       = 0x10000,
+    VBOXOSTYPE_Win31     = 0x15000,
+    VBOXOSTYPE_Win9x     = 0x20000,
+    VBOXOSTYPE_Win95     = 0x21000,
+    VBOXOSTYPE_Win98     = 0x22000,
+    VBOXOSTYPE_WinMe     = 0x23000,
+    VBOXOSTYPE_WinNT     = 0x30000,
+    VBOXOSTYPE_WinNT4    = 0x31000,
+    VBOXOSTYPE_Win2k     = 0x32000,
+    VBOXOSTYPE_WinXP     = 0x33000,
+    VBOXOSTYPE_Win2k3    = 0x34000,
+    VBOXOSTYPE_WinVista  = 0x35000,
+    VBOXOSTYPE_OS2       = 0x40000,
+    VBOXOSTYPE_OS2Warp3  = 0x41000,
+    VBOXOSTYPE_OS2Warp4  = 0x42000,
+    VBOXOSTYPE_OS2Warp45 = 0x43000,
+    VBOXOSTYPE_Linux     = 0x50000,
+    VBOXOSTYPE_Linux22   = 0x51000,
+    VBOXOSTYPE_Linux24   = 0x52000,
+    VBOXOSTYPE_Linux26   = 0x53000,
+    VBOXOSTYPE_FreeBSD   = 0x60000,
+    VBOXOSTYPE_OpenBSD   = 0x61000,
+    VBOXOSTYPE_NetBSD    = 0x62000,
+    VBOXOSTYPE_Netware   = 0x70000,
+    VBOXOSTYPE_Solaris   = 0x80000,
+    VBOXOSTYPE_L4        = 0x90000,
+    /** The usual 32-bit hack. */
+    VBOXOSTYPE_32BIT_HACK = 0x7fffffff
+} VBOXOSTYPE;
 
 __END_DECLS

trunk/src/VBox/Additions/WINNT/VBoxGuest/Helper.cpp

@@ -201 +201 @@
         {
             case WINNT4:
-                req->guestInfo.osType = OSTypeWinNT4;
+                req->guestInfo.osType = VBOXOSTYPE_WinNT4;
                 break;
             case WIN2K:
-                req->guestInfo.osType = OSTypeWin2k;
+                req->guestInfo.osType = VBOXOSTYPE_Win2k;
                 break;
             case WINXP:
-                req->guestInfo.osType = OSTypeWinXP;
+                req->guestInfo.osType = VBOXOSTYPE_WinXP;
                 break;
             case WIN2K3:
-                req->guestInfo.osType = OSTypeWin2k3;
+                req->guestInfo.osType = VBOXOSTYPE_Win2k3;
                 break;
             case WINVISTA:
-                req->guestInfo.osType = OSTypeWinVista;
+                req->guestInfo.osType = VBOXOSTYPE_WinVista;
                 break;
             default:
                 /* we don't know, therefore NT family */
-                req->guestInfo.osType = OSTypeWinNT;
+                req->guestInfo.osType = VBOXOSTYPE_WinNT;
                 break;
         }

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

@@ -335 +335 @@
 static VBOXOSTYPE vboxGuestOS2DetectVersion(void)
 {
-    VBOXOSTYPE enmOSType = OSTypeOS2;
+    VBOXOSTYPE enmOSType = VBOXOSTYPE_OS2;
 
 #if 0 /** @todo dig up the version stuff from GIS later and verify that the numbers are actually decimal. */
@@ -342 +342 @@
     {
         if (uMinor >= 30 && uMinor < 40)
-            enmOSType = OSTypeOS2Warp3;
+            enmOSType = VBOXOSTYPE_OS2Warp3;
         else if (uMinor >= 40 && uMinor < 45)
-            enmOSType = OSTypeOS2Warp4;
+            enmOSType = VBOXOSTYPE_OS2Warp4;
         else if (uMinor >= 45 && uMinor < 50)
-            enmOSType = OSTypeOS2Warp45;
+            enmOSType = VBOXOSTYPE_OS2Warp45;
     }
 #endif

trunk/src/VBox/Additions/linux/module/vboxmod.c

@@ -874 +874 @@
     infoReq->guestInfo.additionsVersion = VMMDEV_VERSION;
 #if LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 0)
-    infoReq->guestInfo.osType = OSTypeLinux26;
+    infoReq->guestInfo.osType = VBOXOSTYPE_Linux26;
 #else
-    infoReq->guestInfo.osType = OSTypeLinux24;
+    infoReq->guestInfo.osType = VBOXOSTYPE_Linux24;
 #endif
     rcVBox = VbglGRPerform(&infoReq->header);

trunk/src/VBox/Frontends/VBoxBFE/SDLConsole.cpp

@@ -23 +23 @@
 #ifdef RT_OS_DARWIN
 # include <Carbon/Carbon.h>
-# define OSType VBoxOSType
 # undef PAGE_SIZE
 # undef PAGE_SHIFT

trunk/src/VBox/Frontends/VirtualBox/include/VBoxConsoleView.h

@@ -40 +40 @@
 # include <Carbon/Carbon.h>
 # include "DarwinCursor.h"
-/** @todo remove this hack when somebody get around fixing the conflicting typedef/enum OSType. */
-# define OSType VBoxOSType
 #endif
 

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -3596 +3596 @@
      *       succeeded. */
     ICInstance icInstance;
-    OSType psiSignature = 'psi ';
+    VBOXOSTYPE psiSignature = 'psi ';
     OSStatus error = ::ICStart (&icInstance, psiSignature);
     if (error == noErr)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleView.h

@@ -45 +45 @@
 # include <Carbon/Carbon.h>
 # include "DarwinCursor.h"
-/** @todo remove this hack when somebody get around fixing the conflicting typedef/enum OSType. */
-# define OSType VBoxOSType
 #endif
 

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp

@@ -3602 +3602 @@
      *       succeeded. */
     ICInstance icInstance;
-    OSType psiSignature = 'psi ';
+    VBOXOSTYPE psiSignature = 'psi ';
     OSStatus error = ::ICStart (&icInstance, psiSignature);
     if (error == noErr)

trunk/src/VBox/Main/GuestOSTypeImpl.cpp

@@ -24 +24 @@
 
 GuestOSType::GuestOSType()
-    : mOSType (OSTypeUnknown)
+    : mOSType (VBOXOSTYPE_Unknown)
     , mRAMSize (0), mVRAMSize (0)
     , mHDDSize (0), mMonitorCount (0)
@@ -58 +58 @@
  * @param aHDDSize     recommended HDD size in megabytes
  */
-HRESULT GuestOSType::init (const char *aId, const char *aDescription, OSType aOSType,
+HRESULT GuestOSType::init (const char *aId, const char *aDescription, VBOXOSTYPE aOSType,
                            uint32_t aRAMSize, uint32_t aVRAMSize, uint32_t aHDDSize)
 {

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -4316 +4316 @@
         const char    *id;          // utf-8
         const char    *description; // utf-8
-        const OSType   osType;
+        const VBOXOSTYPE osType;
         const uint32_t recommendedRAM;
         const uint32_t recommendedVRAM;
@@ -4326 +4326 @@
          * NOTE2: please use powers of 2 when specifying the size of harddisks since
          *        '2GB' looks better than '1.95GB' (= 2000MB) */
-        { "unknown",    tr ("Other/Unknown"),  OSTypeUnknown,     64,   4,  2 * _1K },
-        { "dos",        "DOS",                 OSTypeDOS,         32,   4,      512 },
-        { "win31",      "Windows 3.1",         OSTypeWin31,       32,   4,  1 * _1K },
-        { "win95",      "Windows 95",          OSTypeWin95,       64,   4,  2 * _1K },
-        { "win98",      "Windows 98",          OSTypeWin98,       64,   4,  2 * _1K },
-        { "winme",      "Windows Me",          OSTypeWinMe,       64,   4,  4 * _1K },
-        { "winnt4",     "Windows NT 4",        OSTypeWinNT4,     128,   4,  2 * _1K },
-        { "win2k",      "Windows 2000",        OSTypeWin2k,      168,   4,  4 * _1K },
-        { "winxp",      "Windows XP",          OSTypeWinXP,      192,   4, 10 * _1K },
-        { "win2k3",     "Windows Server 2003", OSTypeWin2k3,     256,   4, 20 * _1K },
-        { "winvista",   "Windows Vista",       OSTypeWinVista,   512,   4, 20 * _1K },
-        { "os2warp3",   "OS/2 Warp 3",         OSTypeOS2Warp3,    48,   4,  1 * _1K },
-        { "os2warp4",   "OS/2 Warp 4",         OSTypeOS2Warp4,    64,   4,  2 * _1K },
-        { "os2warp45",  "OS/2 Warp 4.5",       OSTypeOS2Warp45,   96,   4,  2 * _1K },
-        { "linux22",    "Linux 2.2",           OSTypeLinux22,     64,   4,  2 * _1K },
-        { "linux24",    "Linux 2.4",           OSTypeLinux24,    128,   4,  4 * _1K },
-        { "linux26",    "Linux 2.6",           OSTypeLinux26,    256,   4,  8 * _1K },
-        { "freebsd",    "FreeBSD",             OSTypeFreeBSD,     64,   4,  2 * _1K },
-        { "openbsd",    "OpenBSD",             OSTypeOpenBSD,     64,   4,  2 * _1K },
-        { "netbsd",     "NetBSD",              OSTypeNetBSD,      64,   4,  2 * _1K },
-        { "netware",    "Netware",             OSTypeNetware,    128,   4,  4 * _1K },
-        { "solaris",    "Solaris",             OSTypeSolaris,    128,   4,  8 * _1K },
-        { "l4",         "L4",                  OSTypeL4,          64,   4,  2 * _1K }
+        { "unknown",    tr ("Other/Unknown"),  VBOXOSTYPE_Unknown,     64,   4,  2 * _1K },
+        { "dos",        "DOS",                 VBOXOSTYPE_DOS,         32,   4,      512 },
+        { "win31",      "Windows 3.1",         VBOXOSTYPE_Win31,       32,   4,  1 * _1K },
+        { "win95",      "Windows 95",          VBOXOSTYPE_Win95,       64,   4,  2 * _1K },
+        { "win98",      "Windows 98",          VBOXOSTYPE_Win98,       64,   4,  2 * _1K },
+        { "winme",      "Windows Me",          VBOXOSTYPE_WinMe,       64,   4,  4 * _1K },
+        { "winnt4",     "Windows NT 4",        VBOXOSTYPE_WinNT4,     128,   4,  2 * _1K },
+        { "win2k",      "Windows 2000",        VBOXOSTYPE_Win2k,      168,   4,  4 * _1K },
+        { "winxp",      "Windows XP",          VBOXOSTYPE_WinXP,      192,   4, 10 * _1K },
+        { "win2k3",     "Windows Server 2003", VBOXOSTYPE_Win2k3,     256,   4, 20 * _1K },
+        { "winvista",   "Windows Vista",       VBOXOSTYPE_WinVista,   512,   4, 20 * _1K },
+        { "os2warp3",   "OS/2 Warp 3",         VBOXOSTYPE_OS2Warp3,    48,   4,  1 * _1K },
+        { "os2warp4",   "OS/2 Warp 4",         VBOXOSTYPE_OS2Warp4,    64,   4,  2 * _1K },
+        { "os2warp45",  "OS/2 Warp 4.5",       VBOXOSTYPE_OS2Warp45,   96,   4,  2 * _1K },
+        { "linux22",    "Linux 2.2",           VBOXOSTYPE_Linux22,     64,   4,  2 * _1K },
+        { "linux24",    "Linux 2.4",           VBOXOSTYPE_Linux24,    128,   4,  4 * _1K },
+        { "linux26",    "Linux 2.6",           VBOXOSTYPE_Linux26,    256,   4,  8 * _1K },
+        { "freebsd",    "FreeBSD",             VBOXOSTYPE_FreeBSD,     64,   4,  2 * _1K },
+        { "openbsd",    "OpenBSD",             VBOXOSTYPE_OpenBSD,     64,   4,  2 * _1K },
+        { "netbsd",     "NetBSD",              VBOXOSTYPE_NetBSD,      64,   4,  2 * _1K },
+        { "netware",    "Netware",             VBOXOSTYPE_Netware,    128,   4,  4 * _1K },
+        { "solaris",    "Solaris",             VBOXOSTYPE_Solaris,    128,   4,  8 * _1K },
+        { "l4",         "L4",                  VBOXOSTYPE_L4,          64,   4,  2 * _1K }
     };
 

trunk/src/VBox/Main/include/GuestOSTypeImpl.h

@@ -51 +51 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init (const char *aId, const char *aDescription, OSType aOSType,
+    HRESULT init (const char *aId, const char *aDescription, VBOXOSTYPE aOSType,
                   uint32_t aRAMSize, uint32_t aVRAMSize, uint32_t aHDDSize);
     void uninit();
@@ -72 +72 @@
     const Bstr mID;
     const Bstr mDescription;
-    const OSType mOSType;
+    const VBOXOSTYPE mOSType;
     const uint32_t mRAMSize;
     const uint32_t mVRAMSize;