Changeset 33396 in vbox for trunk

Timestamp:

Oct 24, 2010 4:21:10 PM (14 years ago)

Author:

vboxsync

Message:

Main: Some OS/2 build fixes.

Location:

trunk/src/VBox/Main

Files:

• MachineImpl.cpp (modified) (1 diff)
• VirtualBoxImpl.cpp (modified) (5 diffs)
• cbinding/VBoxXPCOMCGlue.c (modified) (1 diff)
• xml/Settings.cpp (modified) (1 diff)

trunk/src/VBox/Main/MachineImpl.cpp

@@ -9788 +9788 @@
                                 aMachine->mData->mUuid.raw());
     mIPCSemName = ipcSem;
-    APIRET arc = ::DosCreateMutexSem((PSZ)ipcSem.raw(), &mIPCSem, 0, FALSE);
+    APIRET arc = ::DosCreateMutexSem((PSZ)ipcSem.c_str(), &mIPCSem, 0, FALSE);
     ComAssertMsgRet(arc == NO_ERROR,
                     ("Cannot create IPC mutex '%s', arc=%ld",
-                     ipcSem.raw(), arc),
+                     ipcSem.c_str(), arc),
                     E_FAIL);
 #elif defined(VBOX_WITH_SYS_V_IPC_SESSION_WATCHER)

trunk/src/VBox/Main/VirtualBoxImpl.cpp

@@ -1139 +1139 @@
         /** @todo: account for version in the URL */
         if (aUrl != NULL)
-            Utf8Str(firmwareDesc[i].url).cloneTo(aUrl);
+        {
+            Utf8Str strUrl(firmwareDesc[i].url);
+            strUrl.cloneTo(aUrl);
+        }
         *aResult = FALSE;
 
@@ -3958 +3961 @@
                         if (semId >= 0 && semId < cnt)
                         {
-#ifdef DEBUG
+#if 0//def DEBUG
                             {
                                 AutoReadLock machineLock(machines[semId] COMMA_LOCKVAL_SRC_POS);
@@ -3987 +3990 @@
                                 if (i >= 0 && i < cnt)
                                 {
-#ifdef DEBUG
+#if 0//def DEBUG
                                     {
                                         AutoReadLock machineLock(machines[semId] COMMA_LOCKVAL_SRC_POS);
@@ -4028 +4031 @@
                     machines.clear();
 
-                    for (MachinesOList::iterator it = that->m->llMachines.begin();
-                         it != that->m->llMachines.end(); ++ it)
+                    for (MachinesOList::iterator it = that->m->allMachines.begin();
+                         it != that->m->allMachines.end(); ++ it)
                     {
                         /// @todo handle situations with more than 64 objects
@@ -4066 +4069 @@
                     spawnedMachines.clear();
 
-                    for (MachinesOList::iterator it = that->m->llMachines.begin();
-                         it != that->m->llMachines.end(); ++ it)
+                    for (MachinesOList::iterator it = that->m->allMachines.begin();
+                         it != that->m->allMachines.end(); ++ it)
                     {
                         if ((*it)->isSessionSpawning())

trunk/src/VBox/Main/cbinding/VBoxXPCOMCGlue.c

@@ -206 +206 @@
     if (tryLoadOne("/usr/local/lib/virtualbox", 1) == 0)
         return 0;
+#elif defined(__OS2__)
+    if (tryLoadOne("C:/Apps/VirtualBox", 1) == 0)
+        return 0;
 #else
 # error "port me"

trunk/src/VBox/Main/xml/Settings.cpp

@@ -4208 +4208 @@
     return AudioDriverType_CoreAudio;
 #elif defined(RT_OS_OS2)
-    return AudioDriverType_MMP;
+    return AudioDriverType_MMPM;
 #elif defined(RT_OS_FREEBSD)
     return AudioDriverType_OSS;