Changeset 13835 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 5, 2008 2:34:43 AM (16 years ago)

Author:

vboxsync

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

38826

Message:

s/VBOX_SUCCESS/RT_SUCCESS/g s/VBOX_FAILURE/RT_FAILURE/g - VBOX_SUCCESS and VBOX_FAILURE have *NOT* been retired (because old habbits die hard) just sligtly deprecated.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxBFE/DisplayImpl.cpp (modified) (2 diffs)
• VBoxBFE/HGCM.cpp (modified) (49 diffs)
• VBoxBFE/HGCMObjects.cpp (modified) (6 diffs)
• VBoxBFE/HGCMThread.cpp (modified) (12 diffs)
• VBoxBFE/HostUSBImpl.cpp (modified) (5 diffs)
• VBoxBFE/KeyboardImpl.cpp (modified) (4 diffs)
• VBoxBFE/MachineDebuggerImpl.cpp (modified) (4 diffs)
• VBoxBFE/MouseImpl.cpp (modified) (3 diffs)
• VBoxBFE/SDLConsole.cpp (modified) (2 diffs)
• VBoxBFE/StatusImpl.cpp (modified) (4 diffs)
• VBoxBFE/USBProxyService.cpp (modified) (2 diffs)
• VBoxBFE/USBProxyServiceLinux.cpp (modified) (17 diffs)
• VBoxBFE/VBoxBFE.cpp (modified) (19 diffs)
• VBoxBFE/VMControl.cpp (modified) (8 diffs)
• VBoxBFE/VMMDevInterface.cpp (modified) (2 diffs)
• VBoxBFE/VirtualBoxBase.h (modified) (3 diffs)
• VBoxFB/VBoxFB.cpp (modified) (1 diff)
• VBoxManage/VBoxInternalManage.cpp (modified) (33 diffs)
• VBoxManage/VBoxManage.cpp (modified) (11 diffs)
• VBoxSDL/Helper.cpp (modified) (1 diff)
• VBoxSDL/VBoxSDL.cpp (modified) (6 diffs)
• VirtualBox/src/VBoxConsoleView.cpp (modified) (2 diffs)
• VirtualBox/src/VBoxConsoleWnd.cpp (modified) (1 diff)
• VirtualBox4/src/VBoxGlobal.cpp (modified) (1 diff)

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

@@ -380 +380 @@
     int rcVBox = VMR3ReqCallVoid(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
                                  (PFNRT)VMDisplay::doInvalidateAndUpdate, 1, mpDrv);
-    if (VBOX_SUCCESS(rcVBox))
+    if (RT_SUCCESS(rcVBox))
         VMR3ReqFree(pReq);
 
-    if (VBOX_FAILURE(rcVBox))
+    if (RT_FAILURE(rcVBox))
         rc = E_FAIL;
 
@@ -1258 +1258 @@
     void *pv;
     rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Vrc\n", rc));

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

@@ -131 +131 @@
         static DECLCALLBACK(void) svcHlpCallComplete (VBOXHGCMCALLHANDLE callHandle, int32_t rc);
         static DECLCALLBACK(void) svcHlpDisconnectClient (void *pvInstance, uint32_t u32ClientId);
-        
+
     public:
 
@@ -312 +312 @@
     rc = loadLibrary (m_pszSvcLibrary, &m_hLdrMod);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         LogFlowFunc(("successfully loaded the library.\n"));
@@ -320 +320 @@
         rc = RTLdrGetSymbol (m_hLdrMod, VBOX_HGCM_SVCLOAD_NAME, (void**)&m_pfnLoad);
 
-        if (VBOX_FAILURE (rc) || !m_pfnLoad)
+        if (RT_FAILURE (rc) || !m_pfnLoad)
         {
             Log(("HGCMService::loadServiceDLL: Error resolving the service entry point %s, rc = %d, m_pfnLoad = %p\n", VBOX_HGCM_SVCLOAD_NAME, rc, m_pfnLoad));
 
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 /* m_pfnLoad was NULL */
@@ -331 +331 @@
         }
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             memset (&m_fntable, 0, sizeof (m_fntable));
@@ -343 +343 @@
             LogFlowFunc(("m_pfnLoad rc = %Vrc\n", rc));
 
-            if (VBOX_SUCCESS (rc))
+            if (RT_SUCCESS (rc))
             {
                 if (   m_fntable.pfnUnload == NULL
@@ -369 +369 @@
     }
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         unloadServiceDLL ();
@@ -532 +532 @@
         int rc = hgcmMsgGet (ThreadHandle, &pMsgCore);
 
-        if (VBOX_FAILURE (rc))
+        if (RT_FAILURE (rc))
         {
             /* The error means some serious unrecoverable problem in the hgcmMsg/hgcmThread layer. */
@@ -703 +703 @@
                     }
 
-                    if (VBOX_SUCCESS (rc))
+                    if (RT_SUCCESS (rc))
                     {
                         pSvc->m_hExtension = pMsg->handle;
@@ -773 +773 @@
 {
      HGCMService *pService = static_cast <HGCMService *> (pvInstance);
-     
+
      if (pService)
      {
@@ -809 +809 @@
     int rc = hgcmThreadCreate (&m_thread, achThreadName, hgcmServiceThread, this);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         m_pszSvcName    = RTStrDup (pszServiceName);
@@ -835 +835 @@
             rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_LOAD, hgcmMessageAllocSvc);
 
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 rc = hgcmMsgSend (hMsg);
@@ -842 +842 @@
     }
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         instanceDestroy ();
@@ -858 +858 @@
     int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_UNLOAD, hgcmMessageAllocSvc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = hgcmMsgSend (hMsg);
 
-        if (VBOX_SUCCESS (rc))
+        if (RT_SUCCESS (rc))
         {
             hgcmThreadWait (m_thread);
@@ -882 +882 @@
     int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_SAVESTATE, hgcmMessageAllocSvc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         HGCMMsgLoadSaveStateClient *pMsg = (HGCMMsgLoadSaveStateClient *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -906 +906 @@
     int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_LOADSTATE, hgcmMessageAllocSvc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         HGCMMsgLoadSaveStateClient *pMsg = (HGCMMsgLoadSaveStateClient *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -941 +941 @@
     int rc = HGCMService::ResolveService (&pSvc, pszServiceName);
 
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         /* The service is already loaded. */
@@ -961 +961 @@
             rc = pSvc->instanceCreate (pszServiceLibrary, pszServiceName);
 
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 /* Insert the just created service to list for future references. */
@@ -1252 +1252 @@
         uint32_t cClients;
         rc = SSMR3GetU32(pSSM, &cClients);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
         {
             pSvc->ReleaseService ();
@@ -1264 +1264 @@
             uint32_t u32ClientId;
             rc = SSMR3GetU32(pSSM, &u32ClientId);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 pSvc->ReleaseService ();
@@ -1273 +1273 @@
             /* Connect the client. */
             rc = pSvc->CreateAndConnectClient (NULL, u32ClientId);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 pSvc->ReleaseService ();
@@ -1282 +1282 @@
             /* Call the service, so the operation is executed by the service thread. */
             rc = pSvc->loadClientState (u32ClientId, pSSM);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 pSvc->ReleaseService ();
@@ -1334 +1334 @@
     int rc = pClient->Init (this);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Call the service. */
@@ -1341 +1341 @@
         rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_CONNECT, hgcmMessageAllocSvc);
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             HGCMMsgSvcConnect *pMsg = (HGCMMsgSvcConnect *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -1352 +1352 @@
             rc = hgcmMsgSend (hMsg);
 
-            if (VBOX_SUCCESS (rc))
+            if (RT_SUCCESS (rc))
             {
                 /* Add the client Id to the array. */
@@ -1368 +1368 @@
     }
 
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         hgcmObjDeleteHandle (handle);
@@ -1404 +1404 @@
         rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_DISCONNECT, hgcmMessageAllocSvc);
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             HGCMMsgSvcDisconnect *pMsg = (HGCMMsgSvcDisconnect *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -1417 +1417 @@
     }
 
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         /* Remove the client id from the array in any case. */
@@ -1458 +1458 @@
     int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_REGEXT, hgcmMessageAllocSvc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         HGCMMsgSvcRegisterExtension *pMsg = (HGCMMsgSvcRegisterExtension *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -1482 +1482 @@
     int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_UNREGEXT, hgcmMessageAllocSvc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         HGCMMsgSvcUnregisterExtension *pMsg = (HGCMMsgSvcUnregisterExtension *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -1515 +1515 @@
     int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_GUESTCALL, hgcmMessageAllocSvc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         HGCMMsgCall *pMsg = (HGCMMsgCall *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -1557 +1557 @@
     int rc = hgcmMsgAlloc (m_thread, &hMsg, SVC_MSG_HOSTCALL, hgcmMessageAllocSvc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         HGCMMsgHostCallSvc *pMsg = (HGCMMsgHostCallSvc *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -1702 +1702 @@
         int rc = hgcmMsgGet (ThreadHandle, &pMsgCore);
 
-        if (VBOX_FAILURE (rc))
+        if (RT_FAILURE (rc))
         {
             /* The error means some serious unrecoverable problem in the hgcmMsg/hgcmThread layer. */
@@ -1725 +1725 @@
                 rc = HGCMService::ResolveService (&pService, pMsg->pszServiceName);
 
-                if (VBOX_SUCCESS (rc))
+                if (RT_SUCCESS (rc))
                 {
                     /* Call the service instance method. */
@@ -1780 +1780 @@
                 rc = HGCMService::ResolveService (&pService, pMsg->pszServiceName);
 
-                if (VBOX_SUCCESS (rc))
+                if (RT_SUCCESS (rc))
                 {
                     rc = pService->HostCall (pMsg->u32Function, pMsg->cParms, pMsg->paParms);
@@ -1845 +1845 @@
                     rc = HGCMService::ResolveService (&pService, handle->pszServiceName);
 
-                    if (VBOX_SUCCESS (rc))
+                    if (RT_SUCCESS (rc))
                     {
                         pService->RegisterExtension (handle, pMsg->pfnExtension, pMsg->pvExtension);
@@ -1852 +1852 @@
                     }
 
-                    if (VBOX_FAILURE (rc))
+                    if (RT_FAILURE (rc))
                     {
                         RTMemFree (handle);
@@ -1872 +1872 @@
                 rc = HGCMService::ResolveService (&pService, pMsg->handle->pszServiceName);
 
-                if (VBOX_SUCCESS (rc))
+                if (RT_SUCCESS (rc))
                 {
                     pService->UnregisterExtension (pMsg->handle);
@@ -1933 +1933 @@
     int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_LOAD, hgcmMainMessageAlloc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Initialize the message. Since the message is synchronous, use the supplied pointers. */
@@ -1975 +1975 @@
     int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_REGEXT, hgcmMainMessageAlloc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Initialize the message. Since the message is synchronous, use the supplied pointers. */
@@ -2004 +2004 @@
     int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_UNREGEXT, hgcmMainMessageAlloc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Initialize the message. */
@@ -2047 +2047 @@
     int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_CONNECT, hgcmMainMessageAlloc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Initialize the message. Since 'pszServiceName' and 'pu32ClientId'
@@ -2094 +2094 @@
     int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_DISCONNECT, hgcmMainMessageAlloc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Initialize the message. */
@@ -2128 +2128 @@
     int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, u32MsgId, hgcmMainMessageAlloc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         HGCMMsgMainLoadSaveState *pMsg = (HGCMMsgMainLoadSaveState *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -2239 +2239 @@
     int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_HOSTCALL, hgcmMainMessageAlloc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         HGCMMsgMainHostCall *pMsg = (HGCMMsgMainHostCall *)hgcmObjReference (hMsg, HGCMOBJ_MSG);
@@ -2269 +2269 @@
     int rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_RESET, hgcmMainMessageAlloc);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = hgcmMsgSend (hMsg);
@@ -2284 +2284 @@
     int rc = hgcmThreadInit ();
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /*
@@ -2292 +2292 @@
         rc = hgcmThreadCreate (&g_hgcmThread, "MainHGCMthread", hgcmThread, NULL);
 
-        if (VBOX_FAILURE (rc))
+        if (RT_FAILURE (rc))
         {
             LogRel(("Failed to start HGCM thread. HGCM services will be unavailable!!! rc = %Vrc\n", rc));
@@ -2312 +2312 @@
     int rc = HGCMHostReset ();
 
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         /* Send the quit message to the main hgcmThread. */
@@ -2319 +2319 @@
         rc = hgcmMsgAlloc (g_hgcmThread, &hMsg, HGCM_MSG_QUIT, hgcmMainMessageAlloc);
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             rc = hgcmMsgSend (hMsg);
 
-            if (VBOX_SUCCESS (rc))
+            if (RT_SUCCESS (rc))
             {
                 /* Wait for the thread termination. */

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

@@ -88 +88 @@
     int rc = hgcmObjEnter ();
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         ObjectAVLCore *pCore = &pObject->Core;
 
         /* Generate a new handle value. */
-        
+
         uint32_t volatile *pu32HandleCountSource = pObject->Type () == HGCMOBJ_CLIENT?
                                                        &g_u32ClientHandleCount:
@@ -102 +102 @@
         for (;;)
         {
-            uint32_t Key; 
-            
+            uint32_t Key;
+
             if (u32HandleIn == 0)
             {
@@ -158 +158 @@
             /* Store returned handle. */
             handle = Key;
-            
+
             Log(("Object key inserted 0x%08X\n", Key));
 
@@ -196 +196 @@
         rc = hgcmObjEnter ();
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             ObjectAVLCore *pCore = (ObjectAVLCore *)RTAvlULRemove (&g_pTree, handle);
@@ -233 +233 @@
     int rc = hgcmObjEnter ();
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         ObjectAVLCore *pCore = (ObjectAVLCore *)RTAvlULGet (&g_pTree, handle);
 
         Assert(!pCore || (pCore->pSelf && pCore->pSelf->Type() == enmObjType));
-        if (    pCore 
+        if (    pCore
             &&  pCore->pSelf
             &&  pCore->pSelf->Type() == enmObjType)
@@ -283 +283 @@
     int rc = hgcmObjEnter ();
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         if (g_u32ClientHandleCount <= u32ClientHandleCount)

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

@@ -209 +209 @@
 }
 
-HGCMThread::HGCMThread () 
+HGCMThread::HGCMThread ()
     :
     HGCMObject(HGCMOBJ_THREAD),
@@ -275 +275 @@
     rc = RTSemEventMultiCreate (&m_eventThread);
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = RTSemEventMultiCreate (&m_eventSend);
 
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             rc = RTCritSectInit (&m_critsect);
 
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 m_pfnThread = pfnThread;
@@ -296 +296 @@
                                      pszThreadName);
 
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
                     /* Wait until the thread is ready. */
                     rc = RTThreadUserWait (thread, 30000);
                     AssertRC (rc);
-                    Assert (!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || VBOX_FAILURE (rc));
+                    Assert (!(m_fu32ThreadFlags & HGCMMSG_TF_INITIALIZING) || RT_FAILURE (rc));
                 }
                 else
@@ -335 +335 @@
 
 #ifdef LOG_ENABLED
-    if (VBOX_FAILURE (rc))
+    if (RT_FAILURE (rc))
     {
         Log(("HGCMThread::MsgPost: FAILURE: could not obtain worker thread mutex, rc = %Vrc!!!\n", rc));
@@ -358 +358 @@
     bool fFromFreeList = false;
 
-    if (!pmsg && VBOX_SUCCESS(rc))
+    if (!pmsg && RT_SUCCESS(rc))
     {
         /* We have to allocate a new memory block. */
@@ -369 +369 @@
     }
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Initialize just allocated message core */
@@ -402 +402 @@
     rc = Enter ();
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         pMsg->m_pfnCallback = pfnCallback;
@@ -476 +476 @@
             rc = Enter ();
 
-            if (VBOX_FAILURE (rc))
+            if (RT_FAILURE (rc))
             {
                 break;
@@ -558 +558 @@
     rc = Enter ();
 
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         /* Remove the message from the InProcess queue. */
@@ -596 +596 @@
         if (fWaited)
         {
-            /* If message is being waited, then it is referenced by the waiter and the pointer 
+            /* If message is being waited, then it is referenced by the waiter and the pointer
              * if valid even after hgcmObjDeleteHandle.
              */
@@ -638 +638 @@
     }
 
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         *pHandle = handle;
@@ -739 +739 @@
     int rc = hgcmMsgPostInternal (hMsg, pfnCallback, false);
 
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         rc = VINF_HGCM_ASYNC_EXECUTE;

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

@@ -213 +213 @@
     PPDMIBASE pBase;
     int vrc = PDMR3QueryLun (mpVM, "usb-ohci", 0, 0, &pBase);
-    if (VBOX_FAILURE (vrc))
+    if (RT_FAILURE (vrc))
         return setError (E_FAIL, tr ("VM doesn't have a USB controller"));
     /*
@@ -248 +248 @@
                        5, pRhConfig, &Uuid, fRemote,
                        Address.c_str(), pvRemote);
-    if (VBOX_SUCCESS (vrc))
+    if (RT_SUCCESS (vrc))
         vrc = pReq->iStatus;
     VMR3ReqFree (pReq);
-    if (VBOX_SUCCESS (vrc))
+    if (RT_SUCCESS (vrc))
         hostDevice->setCaptured();
     else
@@ -295 +295 @@
         PPDMIBASE pBase;
         vrc = PDMR3QueryLun (mpVM, "usb-ohci", 0, 0, &pBase);
-        if (VBOX_SUCCESS (vrc))
+        if (RT_SUCCESS (vrc))
         {
             PVUSBIRHCONFIG pRhConfig = (PVUSBIRHCONFIG)pBase->pfnQueryInterface (pBase, PDMINTERFACE_VUSB_RH_CONFIG);
@@ -305 +305 @@
             vrc = VMR3ReqCall (mpVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)pRhConfig->pfnDestroyProxyDevice,
                                2, pRhConfig, &Uuid);
-            if (VBOX_SUCCESS (vrc))
+            if (RT_SUCCESS (vrc))
                 vrc = pReq->iStatus;
             VMR3ReqFree (pReq);
@@ -316 +316 @@
         vrc = VINF_SUCCESS;
     }
-    if (VBOX_SUCCESS (vrc))
+    if (RT_SUCCESS (vrc))
         return S_OK;
     Log (("Console::AttachUSBDevice: Failed to detach the device from the USB controller, vrc=%Vrc.\n", vrc));

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

@@ -90 +90 @@
 
     int rcVBox = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)scancode);
-    if (VBOX_FAILURE (rcVBox))
+    if (RT_FAILURE (rcVBox))
         return E_FAIL;
 
@@ -116 +116 @@
     int rcVBox = VINF_SUCCESS;
 
-    for (uint32_t i = 0; (i < keys.size()) && VBOX_SUCCESS(rcVBox); i++)
+    for (uint32_t i = 0; (i < keys.size()) && RT_SUCCESS(rcVBox); i++)
     {
         rcVBox = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, (uint8_t)keys[i]);
     }
 
-    if (VBOX_FAILURE (rcVBox))
+    if (RT_FAILURE (rcVBox))
         return E_FAIL;
 
@@ -141 +141 @@
 {
     static com::SafeArray<LONG> cadSequence(6);
-    
+
     cadSequence[0] = 0x1d; // Ctrl down
     cadSequence[1] = 0x38; // Alt down
@@ -255 +255 @@
     void *pv;
     rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Vrc\n", rc));

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

@@ -140 +140 @@
     int rcVBox = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
                              (PFNRT)EMR3RawSetMode, 2, pVM, rawModeFlag);
-    if (VBOX_SUCCESS(rcVBox))
+    if (RT_SUCCESS(rcVBox))
     {
         rcVBox = pReq->iStatus;
@@ -146 +146 @@
     }
 
-    if (VBOX_SUCCESS(rcVBox))
+    if (RT_SUCCESS(rcVBox))
         return S_OK;
 
@@ -200 +200 @@
     int rcVBox = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
                              (PFNRT)EMR3RawSetMode, 2, pVM, rawModeFlag);
-    if (VBOX_SUCCESS(rcVBox))
+    if (RT_SUCCESS(rcVBox))
     {
         rcVBox = pReq->iStatus;
@@ -206 +206 @@
     }
 
-    if (VBOX_SUCCESS(rcVBox))
+    if (RT_SUCCESS(rcVBox))
         return S_OK;
 

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

@@ -110 +110 @@
 
     int vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, dx, dy, dz, fButtons);
-    if (VBOX_FAILURE (vrc))
+    if (RT_FAILURE (vrc))
         return E_FAIL;
 
@@ -167 +167 @@
 
         vrc = mpDrv->pUpPort->pfnPutEvent(mpDrv->pUpPort, 1, 1, dz, fButtons);
-        if (VBOX_FAILURE (vrc))
+        if (RT_FAILURE (vrc))
             return E_FAIL;
     }
@@ -262 +262 @@
     void *pv;
     rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Vrc\n", rc));

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

@@ -201 +201 @@
                             break;
                         }
-                        if (VBOX_SUCCESS(rc))
+                        if (RT_SUCCESS(rc))
                         {
                             return CONEVENT_QUIT;
@@ -240 +240 @@
                     {
                         int rc = handleHostKey(&ev->key);
-                        if (VBOX_SUCCESS(rc) && rc != VINF_SUCCESS)
+                        if (RT_SUCCESS(rc) && rc != VINF_SUCCESS)
                         {
                             return CONEVENT_QUIT;

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

@@ -75 +75 @@
         PPDMLED pLed;
         int rc = pData->pLedPorts->pfnQueryStatusLed(pData->pLedPorts, iLUN, &pLed);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             pLed = NULL;
         ASMAtomicXchgPtr((void * volatile *)&pData->papLeds[iLUN - pData->iFirstLUN], pLed);
@@ -164 +164 @@
      */
     rc = CFGMR3QueryPtr(pCfgHandle, "papLeds", (void **)&pData->papLeds);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: Failed to query the \"papLeds\" value! rc=%Vrc\n", rc));
@@ -173 +173 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pData->iFirstLUN = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: Failed to query the \"First\" value! rc=%Vrc\n", rc));
@@ -182 +182 @@
     if (rc == VERR_CFGM_VALUE_NOT_FOUND)
         pData->iLastLUN = 0;
-    else if (VBOX_FAILURE(rc))
+    else if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: Failed to query the \"Last\" value! rc=%Vrc\n", rc));

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

@@ -85 +85 @@
                              0, RTTHREADTYPE_INFREQUENT_POLLER, RTTHREADFLAGS_WAITABLE, "USBPROXY");
         AssertRC (rc);
-        if (VBOX_SUCCESS (rc))
+        if (RT_SUCCESS (rc))
             LogFlow (("USBProxyService::start: started mThread=%RTthrd\n", mThread));
         else
@@ -117 +117 @@
         if (rc == VERR_INVALID_HANDLE)
             rc = VINF_SUCCESS;
-        if (VBOX_SUCCESS (rc))
+        if (RT_SUCCESS (rc))
         {
             LogFlowMember (("USBProxyService::stop: stopped mThread=%RTthrd\n", mThread));

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

@@ -102 +102 @@
     {
         rc = RTFileOpen (&mFile, pszDevices, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE);
-        if (VBOX_SUCCESS (rc))
+        if (RT_SUCCESS (rc))
         {
             /*
@@ -124 +124 @@
                              */
                             rc = start();
-                            if (VBOX_SUCCESS (rc))
+                            if (RT_SUCCESS (rc))
                             {
                                 RTStrFree (pszDevices);
@@ -269 +269 @@
 {
     int rc = RTFileWrite (mWakeupPipeW, "Wakeup!", sizeof("Wakeup!") - 1, NULL);
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
         fsync (mWakeupPipeW);
     return rc;
@@ -378 +378 @@
         {
             int rc = usbReadSkipSuffix (&pszNext);
-            if (VBOX_FAILURE (rc))
+            if (RT_FAILURE (rc))
                 return rc;
         }
@@ -467 +467 @@
          */
         int rc = usbReadSkipSuffix (&pszNext);
-        if (VBOX_FAILURE (rc))
+        if (RT_FAILURE (rc))
             return rc;
         *ppszNext = pszNext;
@@ -575 +575 @@
         rewind (mStream);
         int rc = VINF_SUCCESS;
-        while (     VBOX_SUCCESS (rc)
+        while (     RT_SUCCESS (rc)
                &&   fgets (szLine, sizeof (szLine), mStream))
         {
@@ -662 +662 @@
 
                     /* parse the line. */
-                    while (*psz && VBOX_SUCCESS (rc))
+                    while (*psz && RT_SUCCESS (rc))
                     {
                         if (PREFIX ("Bus="))
@@ -708 +708 @@
                  */
                 case 'D':
-                    while (*psz && VBOX_SUCCESS (rc))
+                    while (*psz && RT_SUCCESS (rc))
                     {
                         if (PREFIX ("Ver="))
@@ -737 +737 @@
                  */
                 case 'P':
-                    while (*psz && VBOX_SUCCESS (rc))
+                    while (*psz && RT_SUCCESS (rc))
                     {
                         if (PREFIX ("Vendor="))
@@ -763 +763 @@
                     {
                         rc = usbReadStr (pszValue, &Dev.pszSerialNumber);
-                        if (VBOX_SUCCESS (rc))
+                        if (RT_SUCCESS (rc))
                             Dev.u64SerialHash = calcSerialHash (pszValue);
                     }
@@ -781 +781 @@
                     USBCONFIG Cfg = {0};
                     Cfg.fActive = psz[-2] == '*';
-                    while (*psz && VBOX_SUCCESS (rc))
+                    while (*psz && RT_SUCCESS (rc))
                     {
                         if (PREFIX ("#Ifs="))
@@ -795 +795 @@
                         psz = RTStrStripL (psz);
                     }
-                    if (VBOX_SUCCESS (rc))
+                    if (RT_SUCCESS (rc))
                     {
                         if (iCfg < Dev.bNumConfigurations)
@@ -847 +847 @@
                     USBINTERFACE If = {0};
                     bool fIfAdopted = false;
-                    while (*psz && VBOX_SUCCESS (rc))
+                    while (*psz && RT_SUCCESS (rc))
                     {
                         if (PREFIX ("If#="))
@@ -878 +878 @@
                         psz = RTStrStripL (psz);
                     }
-                    if (VBOX_SUCCESS (rc))
+                    if (RT_SUCCESS (rc))
                     {
                         if (pCfg && If.bInterfaceNumber < pCfg->bNumInterfaces)
@@ -953 +953 @@
                 {
                     USBENDPOINT Ep = {0};
-                    while (*psz && VBOX_SUCCESS (rc))
+                    while (*psz && RT_SUCCESS (rc))
                     {
                         if (PREFIX ("Ad="))
@@ -967 +967 @@
                         psz = RTStrStripL (psz);
                     }
-                    if (VBOX_SUCCESS (rc))
+                    if (RT_SUCCESS (rc))
                     {
                         if (pIf && iEp < pIf->bNumEndpoints)
@@ -1040 +1040 @@
          * Success?
          */
-        if (VBOX_FAILURE (rc))
+        if (RT_FAILURE (rc))
         {
             LogFlow (("USBProxyServiceLinux::getDevices: rc=%Vrc\n", rc));

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

@@ -243 +243 @@
     uint32_t n;
     int rc = RTStrToUInt32Ex(&pszArg[cchRoot], NULL, 10, &n);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("Error: invalid network device option (rc=%Vrc): %s\n", rc, pszArg);
@@ -491 +491 @@
                 return SyntaxError("missing argument for memory size!\n");
             rc = RTStrToUInt32Ex(argv[curArg], NULL, 0, &g_u32MemorySizeMB);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return SyntaxError("bad memory size: %s (error %Vrc)\n",
                                    argv[curArg], rc);
@@ -502 +502 @@
             rc = RTStrToUInt32Ex(argv[curArg], NULL, 0, &uVRAMMB);
             g_u32VRamSize = uVRAMMB * _1M;
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return SyntaxError("bad video ram size: %s (error %Vrc)\n",
                                    argv[curArg], rc);
@@ -708 +708 @@
                 return SyntaxError("missing argument for %s!\n", pszArg);
             rc = RTStrToInt32Ex(argv[curArg], NULL, 0, &g_aNetDevs[i].fd);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return SyntaxError("bad tap file descriptor: %s (error %VRc)\n", argv[curArg], rc);
             g_aNetDevs[i].fHaveFd = true;
@@ -721 +721 @@
             {
                 rc = RTStrToInt32Ex(argv[curArg], NULL, 0, &portVRDP);
-                if (VBOX_FAILURE(rc))
+                if (RT_FAILURE(rc))
                     return SyntaxError("cannot vrpd port: %s (%VRc)\n", argv[curArg], rc);
                 if (portVRDP < 0 || portVRDP >= 0x10000)
@@ -816 +816 @@
     RTTHREAD thread;
     rc = RTThreadCreate(&thread, VMPowerUpThread, 0, 0, RTTHREADTYPE_MAIN_WORKER, 0, "PowerUp");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("Error: Thread creation failed with %d\n", rc);
@@ -982 +982 @@
 
     RTLogFlush(NULL);
-    return VBOX_FAILURE (rc) ? 1 : 0;
+    return RT_FAILURE (rc) ? 1 : 0;
 }
 
@@ -1014 +1014 @@
      */
     int rc = RTR3Init();
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return FatalError("RTR3Init failed rc=%Vrc\n", rc);
 
@@ -1087 +1087 @@
 {
     /** @todo accessing shared resource without any kind of synchronization */
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
         szError[0] = '\0';
     else
@@ -1140 +1140 @@
                             "VBOX_RELEASE_LOG", ELEMENTS(s_apszGroups), s_apszGroups,
                             RTLOGDEST_FILE, szError, sizeof(szError), "./VBoxBFE.log");
-        if (VBOX_SUCCESS(rc2))
+        if (RT_SUCCESS(rc2))
         {
             /* some introductory information */
@@ -1168 +1168 @@
      */
     rc = VMR3Create(1, setVMErrorCallback, NULL, vboxbfeConfigConstructor, NULL, &pVM);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("Error: VM creation failed with %Vrc.\n", rc);
@@ -1179 +1179 @@
      */
     rc = VMR3AtStateRegister(pVM, vmstateChangeCallback, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("Error: VMR3AtStateRegister failed with %Vrc.\n", rc);
@@ -1264 +1264 @@
      * Power on the VM (i.e. start executing).
      */
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         PVMREQ pReq;
@@ -1277 +1277 @@
                              (PFNRT)VMR3Load, 4, pVM, g_pszStateFile, &callProgressInfo, NULL);
             endProgressInfo();
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 VMR3ReqFree(pReq);
                 rc = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT,
                                  (PFNRT)VMR3Resume, 1, pVM);
-                if (VBOX_SUCCESS(rc))
+                if (RT_SUCCESS(rc))
                 {
                     rc = pReq->iStatus;
@@ -1295 +1295 @@
         {
             rc = VMR3ReqCall(pVM, VMREQDEST_ANY, &pReq, RT_INDEFINITE_WAIT, (PFNRT)VMR3PowerOn, 1, pVM);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 rc = pReq->iStatus;
@@ -1309 +1309 @@
      * On failure destroy the VM.
      */
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         goto failure;
 
@@ -1342 +1342 @@
     rc = pCallbacks->pfnRegister(pCallbacks, &Mouse::DrvReg);
     AssertRC(rc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &Keyboard::DrvReg);
     AssertRC(rc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
     rc = pCallbacks->pfnRegister(pCallbacks, &VMDisplay::DrvReg);
     AssertRC(rc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     rc = pCallbacks->pfnRegister(pCallbacks, &VMMDev::DrvReg);
     AssertRC(rc);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
     rc = pCallbacks->pfnRegister(pCallbacks, &VMStatus::DrvReg);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
 
@@ -1377 +1377 @@
     int rc;
 
-#define UPDATE_RC() do { if (VBOX_FAILURE(rc) && VBOX_SUCCESS(rcAll)) rcAll = rc; } while (0)
+#define UPDATE_RC() do { if (RT_FAILURE(rc) && RT_SUCCESS(rcAll)) rcAll = rc; } while (0)
 
     /*
@@ -1807 +1807 @@
                                     RTFILE_O_READWRITE | RTFILE_O_OPEN |
                                     RTFILE_O_DENY_NONE | RTFILE_O_INHERIT);
-                    if (VBOX_FAILURE(rc))
+                    if (RT_FAILURE(rc))
                     {
                         FatalError("Failed to open /dev/net/tun: %Vrc\n", rc);

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

@@ -66 +66 @@
                              (PFNRT)VMR3Suspend, 1, pVM);
     AssertRC(rcVBox);
-    if (VBOX_SUCCESS(rcVBox))
+    if (RT_SUCCESS(rcVBox))
     {
         rcVBox = pReq->iStatus;
@@ -87 +87 @@
                              (PFNRT)VMR3Resume, 1, pVM);
     AssertRC(rcVBox);
-    if (VBOX_SUCCESS(rcVBox))
+    if (RT_SUCCESS(rcVBox))
     {
         rcVBox = pReq->iStatus;
@@ -105 +105 @@
                              (PFNRT)VMR3Reset, 1, pVM);
     AssertRC(rcVBox);
-    if (VBOX_SUCCESS(rcVBox))
+    if (RT_SUCCESS(rcVBox))
     {
         rcVBox = pReq->iStatus;
@@ -122 +122 @@
     PPDMIBASE pBase;
     int vrc = PDMR3QueryDeviceLun (pVM, "acpi", 0, 0, &pBase);
-    if (VBOX_SUCCESS (vrc))
+    if (RT_SUCCESS (vrc))
     {
         Assert (pBase);
@@ -140 +140 @@
     PPDMIBASE pBase;
     int vrc = PDMR3QueryDeviceLun (pVM, "acpi", 0, 0, &pBase);
-    if (VBOX_SUCCESS (vrc))
+    if (RT_SUCCESS (vrc))
     {
         Assert (pBase);
@@ -163 +163 @@
                      (PFNRT)VMR3Save, 4, pVM, g_pszStateFile, &callProgressInfo, NULL);
     endProgressInfo();
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         rc = pReq->iStatus;
@@ -196 +196 @@
                          (PFNRT)VMR3Suspend, 1, pVM);
         AssertRC(rc);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             rc = pReq->iStatus;
@@ -206 +206 @@
     rc = RTThreadCreate(&thread, VMSaveThread, (void*)pfnQuit, 0,
                         RTTHREADTYPE_MAIN_WORKER, 0, "Save");
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("Error: Thread creation failed with %d\n", rc);

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

@@ -466 +466 @@
     void *pv;
     rc = CFGMR3QueryPtr(pCfgHandle, "Object", &pv);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         AssertMsgFailed(("Configuration error: No/bad \"Object\" value! rc=%Vrc\n", rc));
@@ -479 +479 @@
     {
         rc = pData->pVMMDev->hgcmLoadService (VBOXSHAREDFOLDERS_DLL, "VBoxSharedFolders");
-        pData->pVMMDev->fSharedFolderActive = VBOX_SUCCESS(rc);
-        if (VBOX_SUCCESS(rc))
+        pData->pVMMDev->fSharedFolderActive = RT_SUCCESS(rc);
+        if (RT_SUCCESS(rc))
             LogRel(("Shared Folders service loaded.\n"));
         else

trunk/src/VBox/Frontends/VBoxBFE/VirtualBoxBase.h

@@ -128 +128 @@
 #define ComAssertMsgRC(vrc, msg)    AssertMsgRC (vrc, msg)
 #else
-#define ComAssertMsgRC(vrc, msg)    ComAssertMsg (VBOX_SUCCESS (vrc), msg)
+#define ComAssertMsgRC(vrc, msg)    ComAssertMsg (RT_SUCCESS (vrc), msg)
 #endif
 
@@ -183 +183 @@
 /** Special version of ComAssertRC that returns ret if vrc does not succeed */
 #define ComAssertRCRet(vrc, ret)            \
-    do { ComAssertRC (vrc); if (!VBOX_SUCCESS (vrc)) return (ret); } while (0)
+    do { ComAssertRC (vrc); if (!RT_SUCCESS (vrc)) return (ret); } while (0)
 /** Special version of ComAssertMsgRC that returns ret if vrc does not succeed */
 #define ComAssertMsgRCRet(vrc, msg, ret)    \
-    do { ComAssertMsgRC (vrc, msg); if (!VBOX_SUCCESS (vrc)) return (ret); } while (0)
+    do { ComAssertMsgRC (vrc, msg); if (!RT_SUCCESS (vrc)) return (ret); } while (0)
 /** Special version of ComAssertFailed that returns ret */
 #define ComAssertFailedRet(ret)             \
@@ -206 +206 @@
 /** Special version of ComAssertRC that evaulates eval and breaks if vrc does not succeed */
 #define ComAssertRCBreak(vrc, eval)               \
-    if (1)  { ComAssertRC (vrc); if (!VBOX_SUCCESS (vrc)) { eval; break; } } else do {} while (0)
+    if (1)  { ComAssertRC (vrc); if (!RT_SUCCESS (vrc)) { eval; break; } } else do {} while (0)
 /** Special version of ComAssertMsgRC that evaulates eval and breaks if vrc does not succeed */
 #define ComAssertMsgRCBreak(vrc, msg, eval)       \
-    if (1)  { ComAssertMsgRC (vrc, msg); if (!VBOX_SUCCESS (vrc)) { eval; break; } } else do {} while (0)
+    if (1)  { ComAssertMsgRC (vrc, msg); if (!RT_SUCCESS (vrc)) { eval; break; } } else do {} while (0)
 /** Special version of ComAssertFailed that vaulates eval and breaks */
 #define ComAssertFailedBreak(eval)              \

trunk/src/VBox/Frontends/VBoxFB/VBoxFB.cpp

@@ -84 +84 @@
             {
                 // UUID as string, parse it
-                if (!VBOX_SUCCESS(RTUuidFromStr((PRTUUID)&uuid, optarg)))
+                if (!RT_SUCCESS(RTUuidFromStr((PRTUUID)&uuid, optarg)))
                 {
                     printf("Error, invalid UUID format given!\n");

trunk/src/VBox/Frontends/VBoxManage/VBoxInternalManage.cpp

@@ -423 +423 @@
     {
         int rc = RTStrToInt64Ex(argv[2], NULL, 0, &offDelta);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return errorArgument(argv[0], "Failed to read delta '%s', rc=%Vrc\n", argv[2], rc);
     }
@@ -435 +435 @@
     {
         int rc = RTStrToUInt64Ex(argv[4], NULL, 0, &ModuleAddress);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return errorArgument(argv[0], "Failed to read module address '%s', rc=%Vrc\n", argv[4], rc);
     }
@@ -443 +443 @@
     {
         int rc = RTStrToUInt64Ex(argv[5], NULL, 0, &ModuleSize);
-        if (VBOX_FAILURE(rc))
+        if (RT_FAILURE(rc))
             return errorArgument(argv[0], "Failed to read module size '%s', rc=%Vrc\n", argv[5], rc);
     }
@@ -480 +480 @@
     /* just try it */
     int rc = VDISetImageUUIDs(argv[0], uuid.raw(), NULL, NULL, NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("Error while setting a new UUID: %Vrc (%d)\n", rc, rc);
@@ -509 +509 @@
     memset(pPart->aPartitions, '\0', sizeof(pPart->aPartitions));
     rc = RTFileReadAt(File, 0, &aBuffer, sizeof(aBuffer), NULL);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
         return rc;
     if (aBuffer[510] != 0x55 || aBuffer[511] != 0xaa)
@@ -561 +561 @@
         {
             rc = RTFileReadAt(File, (uStart + uOffset) * 512, &aBuffer, sizeof(aBuffer), NULL);
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
                 return rc;
 
@@ -704 +704 @@
     RTFILE RawFile;
     int vrc = RTFileOpen(&RawFile, rawdisk.raw(), RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
     {
         RTPrintf("Error opening the raw disk: %Vrc\n", vrc);
@@ -712 +712 @@
     HOSTPARTITIONS partitions;
     vrc = partRead(RawFile, &partitions);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
         return vrc;
 
@@ -821 +821 @@
     RTFILE RawFile;
     int vrc = RTFileOpen(&RawFile, rawdisk.raw(), RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
     {
         RTPrintf("Error opening the raw disk '%s': %Vrc\n", rawdisk.raw(), vrc);
@@ -964 +964 @@
      * creating the VMDK, so no real harm done. */
     vrc = RTFileGetSize(RawFile, &cbSize);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
     {
         RTPrintf("Error getting the size of the raw disk '%s': %Vrc\n", rawdisk.raw(), vrc);
@@ -1000 +1000 @@
         {
             vrc = RTStrToUInt32Ex(p, &pszNext, 0, &u32);
-            if (VBOX_FAILURE(vrc))
+            if (RT_FAILURE(vrc))
             {
                 RTPrintf("Incorrect value in partitions parameter\n");
@@ -1018 +1018 @@
 
         vrc = partRead(RawFile, &partitions);
-        if (VBOX_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
         {
             RTPrintf("Error reading the partition information from '%s'\n", rawdisk.raw());
@@ -1059 +1059 @@
                     vrc = RTStrAPrintf(&pszRawName, "%s%u", rawdisk.raw(),
                                        partitions.aPartitions[i].uIndex);
-                    if (VBOX_FAILURE(vrc))
+                    if (RT_FAILURE(vrc))
                     {
                         RTPrintf("Error creating reference to individual partition %u, rc=%Vrc\n",
@@ -1120 +1120 @@
                 }
                 vrc = RTFileReadAt(RawFile, partitions.aPartitions[i].uPartDataStart * 512, pPartData, (size_t)RawDescriptor.pPartitions[i].cbPartitionData, NULL);
-                if (VBOX_FAILURE(vrc))
+                if (RT_FAILURE(vrc))
                 {
                     RTPrintf("Cannot read partition data from raw device '%s': %Vrc\n", rawdisk.raw(), vrc);
@@ -1131 +1131 @@
                     RTFILE MBRFile;
                     vrc = RTFileOpen(&MBRFile, pszMBRFilename, RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
-                    if (VBOX_FAILURE(vrc))
+                    if (RT_FAILURE(vrc))
                     {
                         RTPrintf("Cannot open replacement MBR file '%s' specified with -mbr: %Vrc\n", pszMBRFilename, vrc);
@@ -1138 +1138 @@
                     vrc = RTFileReadAt(MBRFile, 0, pPartData, 0x1be, NULL);
                     RTFileClose(MBRFile);
-                    if (VBOX_FAILURE(vrc))
+                    if (RT_FAILURE(vrc))
                     {
                         RTPrintf("Cannot read replacement MBR file '%s': %Vrc\n", pszMBRFilename, vrc);
@@ -1162 +1162 @@
 
     vrc = VDCreate(&vdInterfaceError, &pDisk);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
     {
         RTPrintf("Error while creating the virtual disk container: %Vrc\n", vrc);
@@ -1181 +1181 @@
                        VD_VMDK_IMAGE_FLAGS_RAWDISK, (char *)&RawDescriptor,
                                &PCHS, &LCHS, NULL, VD_OPEN_FLAGS_NORMAL, NULL, NULL);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
     {
         RTPrintf("Error while creating the raw disk VMDK: %Vrc\n", vrc);
@@ -1218 +1218 @@
 out:
     RTPrintf("The raw disk vmdk file was not created\n");
-    return VBOX_SUCCESS(vrc) ? 0 : 1;
+    return RT_SUCCESS(vrc) ? 0 : 1;
 }
 
@@ -1271 +1271 @@
 
     vrc = VDCreate(&vdInterfaceError, &pDisk);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
     {
         RTPrintf("Error while creating the virtual disk container: %Vrc\n", vrc);
@@ -1279 +1279 @@
     {
         vrc = VDOpen(pDisk, "VMDK", Utf8Str(src).raw(), VD_OPEN_FLAGS_NORMAL, NULL);
-        if (VBOX_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
         {
             RTPrintf("Error while opening the source image: %Vrc\n", vrc);
@@ -1286 +1286 @@
         {
             vrc = VDCopy(pDisk, 0, pDisk, "VMDK", Utf8Str(dst).raw(), true, 0, NULL, NULL, NULL);
-            if (VBOX_FAILURE(vrc))
+            if (RT_FAILURE(vrc))
             {
                 RTPrintf("Error while renaming the image: %Vrc\n", vrc);
@@ -1352 +1352 @@
 
     vrc = VDCreate(&vdInterfaceError, &pDisk);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
     {
         RTPrintf("Error while creating the virtual disk container: %Vrc\n", vrc);
@@ -1365 +1365 @@
     else
         vrc = RTFileOpen(&outFile, Utf8Str(dst).raw(), RTFILE_O_OPEN | RTFILE_O_CREATE | RTFILE_O_WRITE | RTFILE_O_DENY_ALL);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
     {
         VDCloseAll(pDisk);
@@ -1376 +1376 @@
         char *pszFormat = NULL;
         vrc = VDGetFormat(Utf8Str(src).raw(), &pszFormat);
-        if (VBOX_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
         {
             VDCloseAll(pDisk);
@@ -1391 +1391 @@
     }
     vrc = VDOpen(pDisk, Utf8Str(srcformat).raw(), Utf8Str(src).raw(), VD_OPEN_FLAGS_READONLY, NULL);
-    if (VBOX_FAILURE(vrc))
+    if (RT_FAILURE(vrc))
     {
         VDCloseAll(pDisk);
@@ -1415 +1415 @@
             size_t cb = cbSize - offFile >= (uint64_t)cbBuf ? cbBuf : (size_t)(cbSize - offFile);
             vrc = VDRead(pDisk, offFile, pvBuf, cb);
-            if (VBOX_FAILURE(vrc))
+            if (RT_FAILURE(vrc))
                 break;
             vrc = RTFileWrite(outFile, pvBuf, cb, NULL);
-            if (VBOX_FAILURE(vrc))
+            if (RT_FAILURE(vrc))
                 break;
             offFile += cb;
         }
-        if (VBOX_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
         {
             VDCloseAll(pDisk);
@@ -1522 +1522 @@
             char *pszFormat = NULL;
             vrc = VDGetFormat(Utf8Str(src).raw(), &pszFormat);
-            if (VBOX_FAILURE(vrc))
+            if (RT_FAILURE(vrc))
             {
                 RTPrintf("No file format specified and autodetect failed - please specify format: %Vrc\n", vrc);
@@ -1532 +1532 @@
 
         vrc = VDCreate(&vdInterfaceError, &pSrcDisk);
-        if (VBOX_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
         {
             RTPrintf("Error while creating the source virtual disk container: %Vrc\n", vrc);
@@ -1540 +1540 @@
         /* Open the input image */
         vrc = VDOpen(pSrcDisk, Utf8Str(srcformat).raw(), Utf8Str(src).raw(), VD_OPEN_FLAGS_READONLY, NULL);
-        if (VBOX_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
         {
             RTPrintf("Error while opening the source image: %Vrc\n", vrc);
@@ -1551 +1551 @@
 
         vrc = VDCreate(&vdInterfaceError, &pDstDisk);
-        if (VBOX_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
         {
             RTPrintf("Error while creating the destination virtual disk container: %Vrc\n", vrc);
@@ -1563 +1563 @@
         vrc = VDCopy(pSrcDisk, VD_LAST_IMAGE, pDstDisk, Utf8Str(dstformat).raw(),
                      Utf8Str(dst).raw(), false, 0, NULL, NULL, NULL);
-        if (VBOX_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
         {
             RTPrintf("Error while copying the image: %Vrc\n", vrc);
@@ -1576 +1576 @@
         VDCloseAll(pSrcDisk);
 
-    return VBOX_SUCCESS(vrc) ? 0 : 1;
+    return RT_SUCCESS(vrc) ? 0 : 1;
 }
 

trunk/src/VBox/Frontends/VBoxManage/VBoxManage.cpp

@@ -3349 +3349 @@
         RTPrintf("Shrinking '%lS': 0%%", fileName.raw());
         int vrc = VDIShrinkImage(Utf8Str(fileName).raw(), hardDiskProgressCallback, &uProcent);
-        if (VBOX_FAILURE(vrc))
+        if (RT_FAILURE(vrc))
         {
             RTPrintf("Error while shrinking hard disk image: %Vrc\n", vrc);
@@ -3439 +3439 @@
     else
         rc = RTFileOpen(&File, argv[arg], RTFILE_O_OPEN | RTFILE_O_READ | RTFILE_O_DENY_WRITE);
-    if (VBOX_FAILURE(rc))
+    if (RT_FAILURE(rc))
     {
         RTPrintf("File=\"%s\" open error: %Rrf\n", argv[arg], rc);
@@ -3451 +3451 @@
     else
         rc = RTFileGetSize(File, &cbFile);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         RTPrintf("Creating %s image with size %RU64 bytes (%RU64MB)...\n", (enmImgType == VDI_IMAGE_TYPE_FIXED) ? "fixed" : "dynamic", cbFile, (cbFile + _1M - 1) / _1M);
@@ -3460 +3460 @@
                                 cbFile,
                                 pszComment, NULL, NULL);
-        if (VBOX_SUCCESS(rc))
+        if (RT_SUCCESS(rc))
         {
             PVDIDISK pVdi = VDIDiskCreate();
             rc = VDIDiskOpenImage(pVdi, argv[arg + 1], VDI_OPEN_FLAGS_NORMAL);
-            if (VBOX_SUCCESS(rc))
+            if (RT_SUCCESS(rc))
             {
                 /* alloc work buffer. */
@@ -3478 +3478 @@
                             cbBuffer : (size_t) (cbFile - offFile);
                         rc = RTFileRead(File, pvBuf, cbToRead, &cbRead);
-                        if (VBOX_FAILURE(rc) || !cbRead)
+                        if (RT_FAILURE(rc) || !cbRead)
                             break;
                         rc = VDIDiskWrite(pVdi, offFile, pvBuf, cbRead);
-                        if (VBOX_FAILURE(rc))
+                        if (RT_FAILURE(rc))
                             break;
                         offFile += cbRead;
@@ -3494 +3494 @@
             }
 
-            if (VBOX_FAILURE(rc))
+            if (RT_FAILURE(rc))
             {
                 /* delete image on error */
@@ -3561 +3561 @@
             char *pszNext;
             int rc = RTStrToUInt64Ex(argv[i], &pszNext, 0, &lun);
-            if (VBOX_FAILURE(rc) || *pszNext != '\0' || lun >= 16384)
+            if (RT_FAILURE(rc) || *pszNext != '\0' || lun >= 16384)
                 return errorArgument("Invalid LUN number '%s'", argv[i]);
             if (lun <= 255)
@@ -3581 +3581 @@
             char *pszNext;
             int rc = RTStrToUInt64Ex(argv[i], &pszNext, 0, &lun);
-            if (VBOX_FAILURE(rc) || *pszNext != '\0')
+            if (RT_FAILURE(rc) || *pszNext != '\0')
                 return errorArgument("Invalid encoded LUN number '%s'", argv[i]);
         }
@@ -3684 +3684 @@
                 return errorArgument("Missing argument to '%s'", argv[i]);
             i++;
-            if (VBOX_FAILURE(RTUuidFromStr(&id, argv[i])))
+            if (RT_FAILURE(RTUuidFromStr(&id, argv[i])))
                 return errorArgument("Invalid UUID format %s\n", argv[i]);
         }
@@ -3742 +3742 @@
     char *pszNext;
     int rc = RTStrToUInt32Ex(psz, &pszNext, 10, &u32);
-    if (    VBOX_SUCCESS(rc)
+    if (    RT_SUCCESS(rc)
         &&  *pszNext == '\0'
         &&  u32 >= 1
@@ -4799 +4799 @@
                     /* 2nd try: try with the real name, important on Linux+libhal */
                     char szPathReal[RTPATH_MAX];
-                    if (VBOX_FAILURE(RTPathReal(dvd + 5, szPathReal, sizeof(szPathReal))))
+                    if (RT_FAILURE(RTPathReal(dvd + 5, szPathReal, sizeof(szPathReal))))
                     {
                         errorArgument("Invalid host DVD drive name");

trunk/src/VBox/Frontends/VBoxSDL/Helper.cpp

@@ -129 +129 @@
 {
     int rc = RTSemEventCreate(&g_EventSemXPCOMQueueThread);
-    if (VBOX_SUCCESS(rc))
+    if (RT_SUCCESS(rc))
     {
         RTTHREAD Thread;

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -1214 +1214 @@
             }
             // first check if a UUID was supplied
-            if (VBOX_FAILURE(RTUuidFromStr(uuid.ptr(), argv[curArg])))
+            if (RT_FAILURE(RTUuidFromStr(uuid.ptr(), argv[curArg])))
             {
                 LogFlow(("invalid UUID format, assuming it's a VM name\n"));
@@ -1953 +1953 @@
         int rcVBox;
         rcVBox = RTLdrLoad(LIBSDL_TTF_NAME, &gLibrarySDL_ttf);
-        if (VBOX_SUCCESS(rcVBox))
+        if (RT_SUCCESS(rcVBox))
             rcVBox = RTLdrGetSymbol(gLibrarySDL_ttf, "TTF_Init", (void**)&pTTF_Init);
-        if (VBOX_SUCCESS(rcVBox))
+        if (RT_SUCCESS(rcVBox))
             rcVBox = RTLdrGetSymbol(gLibrarySDL_ttf, "TTF_OpenFont", (void**)&pTTF_OpenFont);
-        if (VBOX_SUCCESS(rcVBox))
+        if (RT_SUCCESS(rcVBox))
             rcVBox = RTLdrGetSymbol(gLibrarySDL_ttf, "TTF_RenderUTF8_Solid", (void**)&pTTF_RenderUTF8_Solid);
-        if (VBOX_SUCCESS(rcVBox))
+        if (RT_SUCCESS(rcVBox))
         {
             /* silently ignore errors here */
             rcVBox = RTLdrGetSymbol(gLibrarySDL_ttf, "TTF_RenderUTF8_Blended", (void**)&pTTF_RenderUTF8_Blended);
-            if (VBOX_FAILURE(rcVBox))
+            if (RT_FAILURE(rcVBox))
                 pTTF_RenderUTF8_Blended = NULL;
             rcVBox = VINF_SUCCESS;
         }
-        if (VBOX_SUCCESS(rcVBox))
+        if (RT_SUCCESS(rcVBox))
             rcVBox = RTLdrGetSymbol(gLibrarySDL_ttf, "TTF_CloseFont", (void**)&pTTF_CloseFont);
-        if (VBOX_SUCCESS(rcVBox))
+        if (RT_SUCCESS(rcVBox))
             rcVBox = RTLdrGetSymbol(gLibrarySDL_ttf, "TTF_Quit", (void**)&pTTF_Quit);
-        if (VBOX_SUCCESS(rcVBox))
+        if (RT_SUCCESS(rcVBox))
             rcVBox = gpFrameBuffer->initSecureLabel(SECURE_LABEL_HEIGHT, secureLabelFontFile, secureLabelPointSize, secureLabelFontOffs);
-        if (VBOX_FAILURE(rcVBox))
+        if (RT_FAILURE(rcVBox))
         {
             RTPrintf("Error: could not initialize secure labeling: rc = %Vrc\n", rcVBox);
@@ -2463 +2463 @@
                                 break;
                             }
-                            if (VBOX_SUCCESS(rc))
+                            if (RT_SUCCESS(rc))
                                 goto leave;
                         }
@@ -2500 +2500 @@
                         {
                             int rc = HandleHostKey(&event.key);
-                            if (VBOX_SUCCESS(rc) && rc != VINF_SUCCESS)
+                            if (RT_SUCCESS(rc) && rc != VINF_SUCCESS)
                                 goto leave;
                         }
@@ -2931 +2931 @@
      */
     int rcRT = RTR3InitAndSUPLib();
-    if (VBOX_FAILURE(rcRT))
+    if (RT_FAILURE(rcRT))
     {
         RTPrintf("Error: RTR3Init failed rcRC=%d\n", rcRT);
@@ -4821 +4821 @@
         int rc = gConsole->GetPowerButtonHandled(&fHandled);
         LogRel(("QuitTimer: rc=%d handled=%d\n", rc, fHandled));
-        if (VBOX_FAILURE(rc) || !fHandled)
+        if (RT_FAILURE(rc) || !fHandled)
         {
             /* event was not handled, power down the guest */

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

@@ -3485 +3485 @@
                                  srcAndMaskPtr, srcShapePtr, &mDarwinCursor);
         AssertRC (rc);
-        if (VBOX_SUCCESS (rc))
+        if (RT_SUCCESS (rc))
         {
             /** @todo check current mouse coordinates. */
@@ -3491 +3491 @@
             AssertRC (rc);
         }
-        ok = VBOX_SUCCESS (rc);
+        ok = RT_SUCCESS (rc);
         NOREF (srcShapePtrScan);
 

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

@@ -3462 +3462 @@
         return true;
     int rc = DBGGuiCreate (csession.raw(), &dbg_gui);
-    if (VBOX_SUCCESS (rc))
+    if (RT_SUCCESS (rc))
     {
         dbgAdjustRelativePos();

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

@@ -4710 +4710 @@
      /* Ask for all supported backends */
      rc = VDBackendInfo (RT_ELEMENTS(aVDInfo), aVDInfo, &cEntries);
-     if (VBOX_SUCCESS (rc))
+     if (RT_SUCCESS (rc))
      {
          for (unsigned i=0; i < cEntries; i++)