Changeset 95141 in vbox for trunk

Timestamp:

May 31, 2022 9:31:45 AM (3 years ago)

Author:

vboxsync

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

151632

Message:

Frontends + Main: Adjust to the new rules wrt. to rc -> hrc,vrc usage. This also fixes quite a few bugs wrt shadow variables, wrong return values and output error translations / exit codes. Also see @todos added [more stuff, build fix] ​bugref:10223

Location:

trunk/src/VBox

Files:

• Frontends/VBoxBalloonCtrl/VBoxModAPIMonitor.cpp (modified) (10 diffs)
• Frontends/VBoxBalloonCtrl/VBoxModBallooning.cpp (modified) (10 diffs)
• Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp (modified) (8 diffs)
• Frontends/VBoxSDL/VBoxSDL.cpp (modified) (52 diffs)
• ImageMounter/vboximg-mount/vboximgMedia.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModAPIMonitor.cpp

@@ -194 +194 @@
         return VINF_SUCCESS; /* Nothing to do. */
 
-    HRESULT rc;
+    HRESULT hrc;
     ComPtr <IMachine> machine;
     CHECK_ERROR_RET(g_pVirtualBox, FindMachine(strUuid.raw(),
@@ -248 +248 @@
                         /* First pause so we don't trigger a live save which needs more time/resources. */
                         bool fPaused = false;
-                        rc = console->Pause();
-                        if (FAILED(rc))
+                        hrc = console->Pause();
+                        if (FAILED(hrc))
                         {
                             bool fError = true;
-                            if (rc == VBOX_E_INVALID_VM_STATE)
+                            if (hrc == VBOX_E_INVALID_VM_STATE)
                             {
                                 /* Check if we are already paused. */
                                 CHECK_ERROR_BREAK(console, COMGETTER(State)(&machineState));
                                 /* The error code was lost by the previous instruction. */
-                                rc = VBOX_E_INVALID_VM_STATE;
+                                hrc = VBOX_E_INVALID_VM_STATE;
                                 if (machineState != MachineState_Paused)
                                 {
@@ -274 +274 @@
 
                         CHECK_ERROR(sessionMachine, SaveState(progress.asOutParam()));
-                        if (SUCCEEDED(rc))
+                        if (SUCCEEDED(hrc))
                         {
                             progress->WaitForCompletion(cMsTimeout);
@@ -281 +281 @@
                         }
 
-                        if (SUCCEEDED(rc))
+                        if (SUCCEEDED(hrc))
                         {
                             serviceLogVerbose(("apimon: State of machine \"%ls\" saved, powering off ...\n", strUuid.raw()));
@@ -314 +314 @@
 
 
-    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_COM_IPRT_ERROR;
+    return SUCCEEDED(hrc) ? VINF_SUCCESS : VERR_COM_IPRT_ERROR;
 }
 
@@ -458 +458 @@
 static DECLCALLBACK(int) VBoxModAPIMonitorInit(void)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     do
@@ -518 +518 @@
     } while (0);
 
-    if (SUCCEEDED(rc))
+    if (SUCCEEDED(hrc))
     {
         g_uAPIMonIslnLastBeatMS = 0;
     }
 
-    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_COM_IPRT_ERROR; /** @todo Find a better rc! */
+    return SUCCEEDED(hrc) ? VINF_SUCCESS : VERR_COM_IPRT_ERROR; /** @todo Find a better rc! */
 }
 
@@ -536 +536 @@
 
     int vrc = VINF_SUCCESS;
-    HRESULT rc;
+    HRESULT hrc;
 
 #ifdef DEBUG
@@ -548 +548 @@
         CHECK_ERROR_BREAK(g_pVirtualBox, GetExtraData(Bstr("Watchdog/APIMonitor/Heartbeat").raw(),
                                                       strHeartbeat.asOutParam()));
-        if (   SUCCEEDED(rc)
+        if (   SUCCEEDED(hrc)
             && !strHeartbeat.isEmpty()
             && g_strAPIMonIslnLastBeat.compare(strHeartbeat, Bstr::CaseSensitive))
@@ -571 +571 @@
     } while (0);
 
-    if (FAILED(rc))
+    if (FAILED(hrc))
         vrc = VERR_COM_IPRT_ERROR;
 

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxModBallooning.cpp

@@ -189 +189 @@
 
     Bstr strValue;
-    HRESULT hr = g_pVirtualBox->GetExtraData(Bstr("VBoxInternal/Guest/BalloonSizeMax").raw(),
-                                             strValue.asOutParam());
-    if (   SUCCEEDED(hr)
+    HRESULT hrc = g_pVirtualBox->GetExtraData(Bstr("VBoxInternal/Guest/BalloonSizeMax").raw(),
+                                              strValue.asOutParam());
+    if (   SUCCEEDED(hrc)
         && strValue.isNotEmpty())
     {
@@ -254 +254 @@
 
     Bstr strValue;
-    HRESULT hr = rptrMachine->GetExtraData(Bstr("VBoxInternal2/Watchdog/BalloonCtrl/BalloonSizeMax").raw(),
-                                           strValue.asOutParam());
-    if (   SUCCEEDED(hr)
+    HRESULT hrc = rptrMachine->GetExtraData(Bstr("VBoxInternal2/Watchdog/BalloonCtrl/BalloonSizeMax").raw(),
+                                            strValue.asOutParam());
+    if (   SUCCEEDED(hrc)
         && strValue.isNotEmpty())
     {
@@ -265 +265 @@
     else
     {
-        hr = rptrMachine->GetExtraData(Bstr("VBoxInternal/Guest/BalloonSizeMax").raw(),
-                                       strValue.asOutParam());
-        if (   SUCCEEDED(hr)
+        hrc = rptrMachine->GetExtraData(Bstr("VBoxInternal/Guest/BalloonSizeMax").raw(),
+                                        strValue.asOutParam());
+        if (   SUCCEEDED(hrc)
             && strValue.isNotEmpty())
         {
@@ -276 +276 @@
     }
 
-    if (   FAILED(hr)
+    if (   FAILED(hrc)
         || strValue.isEmpty())
     {
@@ -303 +303 @@
 
     Bstr strValue;
-    HRESULT hr = g_pVirtualBox->GetExtraData(Bstr("VBoxInternal/Guest/BalloonEnabled").raw(),
-                                             strValue.asOutParam());
-    if (   SUCCEEDED(hr)
+    HRESULT hrc = g_pVirtualBox->GetExtraData(Bstr("VBoxInternal/Guest/BalloonEnabled").raw(),
+                                              strValue.asOutParam());
+    if (   SUCCEEDED(hrc)
         && strValue.isNotEmpty())
     {
@@ -313 +313 @@
     else
     {
-        hr = rptrMachine->GetExtraData(Bstr("VBoxInternal2/Watchdog/BalloonCtrl/BalloonEnabled").raw(),
-                                       strValue.asOutParam());
-        if (SUCCEEDED(hr))
+        hrc = rptrMachine->GetExtraData(Bstr("VBoxInternal2/Watchdog/BalloonCtrl/BalloonEnabled").raw(),
+                                        strValue.asOutParam());
+        if (SUCCEEDED(hrc))
         {
             if (g_fVerbose)
@@ -379 +379 @@
         strMetricNames.cloneTo(&metricNames[0]);
 
-        HRESULT rc = m.queryInterfaceTo(&metricObjects[0]);
+        HRESULT hrc = m.queryInterfaceTo(&metricObjects[0]);
 
 #ifdef VBOX_WATCHDOG_GLOBAL_PERFCOL
@@ -397 +397 @@
                                              ComSafeArrayAsOutParam(metricAffected)));
 #endif
-        if (FAILED(rc))
+        if (FAILED(hrc))
             vrc = VERR_COM_IPRT_ERROR; /** @todo Find better rc! */
 
@@ -515 +515 @@
 
     /* Open a session for the VM. */
-    HRESULT rc;
+    HRESULT hrc;
     CHECK_ERROR_RET(pMachine->machine, LockMachine(g_pSession, LockType_Shared), VERR_ACCESS_DENIED);
 
@@ -525 +525 @@
 
         ComPtr <IGuest> guest;
-        rc = console->COMGETTER(Guest)(guest.asOutParam());
-        if (SUCCEEDED(rc))
+        hrc = console->COMGETTER(Guest)(guest.asOutParam());
+        if (SUCCEEDED(hrc))
             CHECK_ERROR_BREAK(guest, COMSETTER(MemoryBalloonSize)((LONG)cMbBalloonCur));
         else
             serviceLog("Error: Unable to set new balloon size %RU32 for machine '%ls', rc=%Rhrc\n",
-                       cMbBalloonCur, pMachine->strName.raw(), rc);
-        if (FAILED(rc))
+                       cMbBalloonCur, pMachine->strName.raw(), hrc);
+        if (FAILED(hrc))
             vrc = VERR_COM_IPRT_ERROR;
 

trunk/src/VBox/Frontends/VBoxBalloonCtrl/VBoxWatchdog.cpp

@@ -189 +189 @@
                     Bstr uuid;
                     BOOL fRegistered;
-                    HRESULT hr = pEvent->COMGETTER(Registered)(&fRegistered);
-                    if (SUCCEEDED(hr))
-                        hr = pEvent->COMGETTER(MachineId)(uuid.asOutParam());
-
-                    if (SUCCEEDED(hr))
+                    HRESULT hrc = pEvent->COMGETTER(Registered)(&fRegistered);
+                    if (SUCCEEDED(hrc))
+                        hrc = pEvent->COMGETTER(MachineId)(uuid.asOutParam());
+
+                    if (SUCCEEDED(hrc))
                     {
                         int rc = RTCritSectEnter(&g_csMachines);
@@ -218 +218 @@
                     Bstr uuid;
 
-                    HRESULT hr = pEvent->COMGETTER(State)(&machineState);
-                    if (SUCCEEDED(hr))
-                        hr = pEvent->COMGETTER(MachineId)(uuid.asOutParam());
-
-                    if (SUCCEEDED(hr))
+                    HRESULT hrc = pEvent->COMGETTER(State)(&machineState);
+                    if (SUCCEEDED(hrc))
+                        hrc = pEvent->COMGETTER(MachineId)(uuid.asOutParam());
+
+                    if (SUCCEEDED(hrc))
                     {
                         int rc = RTCritSectEnter(&g_csMachines);
@@ -349 +349 @@
 static int machineAdd(const Bstr &strUuid)
 {
-    HRESULT rc;
+    HRESULT hrc;
 
     /** @todo Add exception handling! */
@@ -423 +423 @@
                 if (RT_FAILURE(rc2))
                     serviceLog("OnMachineRegistered: Module '%s' reported an error: %Rrc\n",
-                               g_aModules[j].pDesc->pszName, rc);
+                               g_aModules[j].pDesc->pszName, hrc);
                 /* Keep going. */
             }
@@ -431 +431 @@
     /** @todo Add std exception handling! */
 
-    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_COM_IPRT_ERROR; /** @todo Find a better error! */
+    return SUCCEEDED(hrc) ? VINF_SUCCESS : VERR_COM_IPRT_ERROR; /** @todo Find a better error! */
 }
 
@@ -696 +696 @@
 static RTEXITCODE watchdogMain(/*HandlerArg *a */)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
 
     do
@@ -797 +797 @@
 
         if (RT_FAILURE(vrc))
-            rc = VBOX_E_IPRT_ERROR;
+            hrc = VBOX_E_IPRT_ERROR;
 
     } while (0);
 
-    return SUCCEEDED(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
+    return SUCCEEDED(hrc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;
 }
 
@@ -934 +934 @@
      * Setup VirtualBox + session interfaces.
      */
-    HRESULT rc = g_pVirtualBoxClient->COMGETTER(VirtualBox)(g_pVirtualBox.asOutParam());
-    if (SUCCEEDED(rc))
-    {
-        rc = g_pSession.createInprocObject(CLSID_Session);
-        if (FAILED(rc))
-            RTMsgError("Failed to create a session object (rc=%Rhrc)!", rc);
+    HRESULT hrc = g_pVirtualBoxClient->COMGETTER(VirtualBox)(g_pVirtualBox.asOutParam());
+    if (SUCCEEDED(hrc))
+    {
+        hrc = g_pSession.createInprocObject(CLSID_Session);
+        if (FAILED(hrc))
+            RTMsgError("Failed to create a session object (rc=%Rhrc)!", hrc);
     }
     else
-        RTMsgError("Failed to get VirtualBox object (rc=%Rhrc)!", rc);
-
-    if (FAILED(rc))
+        RTMsgError("Failed to get VirtualBox object (rc=%Rhrc)!", hrc);
+
+    if (FAILED(hrc))
         return VERR_COM_OBJECT_NOT_FOUND;
 

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

@@ -869 +869 @@
     }
 
-    HRESULT rc;
+    HRESULT hrc;
     int vrc;
     Guid uuidVM;
@@ -1386 +1386 @@
     }
 
-    rc = com::Initialize();
+    hrc = com::Initialize();
 #ifdef VBOX_WITH_XPCOM
-    if (rc == NS_ERROR_FILE_ACCESS_DENIED)
+    if (hrc == NS_ERROR_FILE_ACCESS_DENIED)
     {
         char szHome[RTPATH_MAX] = "";
@@ -1396 +1396 @@
     }
 #endif
-    if (FAILED(rc))
-    {
-        RTPrintf("Error: COM initialization failed (rc=%Rhrc)!\n", rc);
+    if (FAILED(hrc))
+    {
+        RTPrintf("Error: COM initialization failed (rc=%Rhrc)!\n", hrc);
         return 1;
     }
@@ -1418 +1418 @@
     ComPtr<IGraphicsAdapter> pGraphicsAdapter;
 
-    rc = pVirtualBoxClient.createInprocObject(CLSID_VirtualBoxClient);
-    if (FAILED(rc))
+    hrc = pVirtualBoxClient.createInprocObject(CLSID_VirtualBoxClient);
+    if (FAILED(hrc))
     {
         com::ErrorInfo info;
@@ -1426 +1426 @@
                        info.getText().raw(), info.getComponent().raw());
         else
-            RTPrintf("Failed to create VirtualBoxClient object! No error information available (rc=%Rhrc).\n", rc);
+            RTPrintf("Failed to create VirtualBoxClient object! No error information available (rc=%Rhrc).\n", hrc);
         goto leave;
     }
 
-    rc = pVirtualBoxClient->COMGETTER(VirtualBox)(pVirtualBox.asOutParam());
-    if (FAILED(rc))
-    {
-        RTPrintf("Failed to get VirtualBox object (rc=%Rhrc)!\n", rc);
+    hrc = pVirtualBoxClient->COMGETTER(VirtualBox)(pVirtualBox.asOutParam());
+    if (FAILED(hrc))
+    {
+        RTPrintf("Failed to get VirtualBox object (rc=%Rhrc)!\n", hrc);
         goto leave;
     }
-    rc = pVirtualBoxClient->COMGETTER(Session)(pSession.asOutParam());
-    if (FAILED(rc))
-    {
-        RTPrintf("Failed to get session object (rc=%Rhrc)!\n", rc);
+    hrc = pVirtualBoxClient->COMGETTER(Session)(pSession.asOutParam());
+    if (FAILED(hrc))
+    {
+        RTPrintf("Failed to get session object (rc=%Rhrc)!\n", hrc);
         goto leave;
     }
@@ -1446 +1446 @@
     {
         CHECK_ERROR(pVirtualBox, SetSettingsSecret(Bstr(pcszSettingsPw).raw()));
-        if (FAILED(rc))
+        if (FAILED(hrc))
             goto leave;
     }
@@ -1461 +1461 @@
     if (uuidVM.isValid())
     {
-        rc = pVirtualBox->FindMachine(uuidVM.toUtf16().raw(), pMachine.asOutParam());
-        if (FAILED(rc) || !pMachine)
+        hrc = pVirtualBox->FindMachine(uuidVM.toUtf16().raw(), pMachine.asOutParam());
+        if (FAILED(hrc) || !pMachine)
         {
             RTPrintf("Error: machine with the given ID not found!\n");
@@ -1473 +1473 @@
          * Do we have a name but no UUID?
          */
-        rc = pVirtualBox->FindMachine(Bstr(vmName).raw(), pMachine.asOutParam());
-        if ((rc == S_OK) && pMachine)
+        hrc = pVirtualBox->FindMachine(Bstr(vmName).raw(), pMachine.asOutParam());
+        if ((hrc == S_OK) && pMachine)
         {
             Bstr bstrId;
@@ -1492 +1492 @@
     AssertReleaseRC(vrc);
 
-    rc = pVirtualBoxClient->CheckMachineError(pMachine);
-    if (FAILED(rc))
+    hrc = pVirtualBoxClient->CheckMachineError(pMachine);
+    if (FAILED(hrc))
     {
         com::ErrorInfo info;
@@ -1500 +1500 @@
                        info.getText().raw(), info.getComponent().raw());
         else
-            RTPrintf("Failed to check for VM errors! No error information available (rc=%Rhrc).\n", rc);
+            RTPrintf("Failed to check for VM errors! No error information available (rc=%Rhrc).\n", hrc);
         goto leave;
     }
@@ -1520 +1520 @@
         {
             ComPtr<IProgress> progress;
-            rc = pMachine->LaunchVMProcess(pSession, Bstr("headless").raw(), ComSafeArrayNullInParam(), progress.asOutParam());
-            if (SUCCEEDED(rc) && !progress.isNull())
+            hrc = pMachine->LaunchVMProcess(pSession, Bstr("headless").raw(), ComSafeArrayNullInParam(), progress.asOutParam());
+            if (SUCCEEDED(hrc) && !progress.isNull())
             {
                 RTPrintf("Waiting for VM to power on...\n");
-                rc = progress->WaitForCompletion(-1);
-                if (SUCCEEDED(rc))
+                hrc = progress->WaitForCompletion(-1);
+                if (SUCCEEDED(hrc))
                 {
                     BOOL completed = true;
-                    rc = progress->COMGETTER(Completed)(&completed);
-                    if (SUCCEEDED(rc))
+                    hrc = progress->COMGETTER(Completed)(&completed);
+                    if (SUCCEEDED(hrc))
                     {
                         LONG iRc;
-                        rc = progress->COMGETTER(ResultCode)(&iRc);
-                        if (SUCCEEDED(rc))
+                        hrc = progress->COMGETTER(ResultCode)(&iRc);
+                        if (SUCCEEDED(hrc))
                         {
                             if (FAILED(iRc))
@@ -1554 +1554 @@
             }
         }
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             RTPrintf("Error: failed to power up VM! No error text available.\n");
@@ -1560 +1560 @@
         }
 
-        rc = pMachine->LockMachine(pSession, LockType_Shared);
+        hrc = pMachine->LockMachine(pSession, LockType_Shared);
     }
     else
     {
         pSession->COMSETTER(Name)(Bstr("GUI/SDL").raw());
-        rc = pMachine->LockMachine(pSession, LockType_VM);
-    }
-
-    if (FAILED(rc))
+        hrc = pMachine->LockMachine(pSession, LockType_VM);
+    }
+
+    if (FAILED(hrc))
     {
         com::ErrorInfo info;
@@ -1694 +1694 @@
             ComPtr<IHost> pHost;
             CHECK_ERROR_BREAK(pVirtualBox, COMGETTER(Host)(pHost.asOutParam()));
-            rc = pHost->FindHostFloppyDrive(bstrFdaFile.raw(),
+            hrc = pHost->FindHostFloppyDrive(bstrFdaFile.raw(),
                                             pMedium.asOutParam());
-            if (FAILED(rc))
+            if (FAILED(hrc))
             {
                 /* try to find an existing one */
-                rc = pVirtualBox->OpenMedium(bstrFdaFile.raw(),
+                hrc = pVirtualBox->OpenMedium(bstrFdaFile.raw(),
                                              DeviceType_Floppy,
                                              AccessMode_ReadWrite,
                                              FALSE /* fForceNewUuid */,
                                              pMedium.asOutParam());
-                if (FAILED(rc))
+                if (FAILED(hrc))
                 {
                     /* try to add to the list */
@@ -1756 +1756 @@
     }
     while (0);
-    if (FAILED(rc))
+    if (FAILED(hrc))
         goto leave;
 
@@ -1779 +1779 @@
             ComPtr<IHost> pHost;
             CHECK_ERROR_BREAK(pVirtualBox, COMGETTER(Host)(pHost.asOutParam()));
-            rc = pHost->FindHostDVDDrive(bstrCdromFile.raw(), pMedium.asOutParam());
-            if (FAILED(rc))
+            hrc = pHost->FindHostDVDDrive(bstrCdromFile.raw(), pMedium.asOutParam());
+            if (FAILED(hrc))
             {
                 /* try to find an existing one */
-                rc = pVirtualBox->OpenMedium(bstrCdromFile.raw(),
+                hrc = pVirtualBox->OpenMedium(bstrCdromFile.raw(),
                                             DeviceType_DVD,
                                             AccessMode_ReadWrite,
                                             FALSE /* fForceNewUuid */,
                                             pMedium.asOutParam());
-                if (FAILED(rc))
+                if (FAILED(hrc))
                 {
                     /* try to add to the list */
@@ -1840 +1840 @@
     }
     while (0);
-    if (FAILED(rc))
+    if (FAILED(hrc))
         goto leave;
 
@@ -1867 +1867 @@
             ComPtr<ISnapshot> pCurrentSnapshot;
             CHECK_ERROR(gpMachine, COMGETTER(CurrentSnapshot)(pCurrentSnapshot.asOutParam()));
-            if (FAILED(rc))
+            if (FAILED(hrc))
                 goto leave;
 
             CHECK_ERROR(gpMachine, RestoreSnapshot(pCurrentSnapshot, gpProgress.asOutParam()));
-            rc = gpProgress->WaitForCompletion(-1);
+            hrc = gpProgress->WaitForCompletion(-1);
         }
     }
@@ -1891 +1891 @@
     if (bootDevice != DeviceType_Null)
     {
-        rc = gpMachine->SetBootOrder(1, bootDevice);
-        if (rc != S_OK)
+        hrc = gpMachine->SetBootOrder(1, bootDevice);
+        if (hrc != S_OK)
         {
             RTPrintf("Error: could not set boot device, using default.\n");
@@ -1901 +1901 @@
     if (memorySize)
     {
-        rc = gpMachine->COMSETTER(MemorySize)(memorySize);
-        if (rc != S_OK)
+        hrc = gpMachine->COMSETTER(MemorySize)(memorySize);
+        if (hrc != S_OK)
         {
             ULONG ramSize = 0;
@@ -1910 +1910 @@
     }
 
-    rc = gpMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
-    if (rc != S_OK)
+    hrc = gpMachine->COMGETTER(GraphicsAdapter)(pGraphicsAdapter.asOutParam());
+    if (hrc != S_OK)
     {
         RTPrintf("Error: could not get graphics adapter object\n");
@@ -1919 +1919 @@
     if (vramSize)
     {
-        rc = pGraphicsAdapter->COMSETTER(VRAMSize)(vramSize);
-        if (rc != S_OK)
+        hrc = pGraphicsAdapter->COMSETTER(VRAMSize)(vramSize);
+        if (hrc != S_OK)
         {
             pGraphicsAdapter->COMGETTER(VRAMSize)((ULONG*)&vramSize);
@@ -1951 +1951 @@
         // create our SDL framebuffer instance
         gpFramebuffer[i].createObject();
-        rc = gpFramebuffer[i]->init(i, fFullscreen, fResizable, fShowSDLConfig, false,
+        hrc = gpFramebuffer[i]->init(i, fFullscreen, fResizable, fShowSDLConfig, false,
                                     fixedWidth, fixedHeight, fixedBPP, fSeparate);
-        if (FAILED(rc))
+        if (FAILED(hrc))
         {
             RTPrintf("Error: could not create framebuffer object!\n");
@@ -2031 +2031 @@
     {
         // register our framebuffer
-        rc = gpDisplay->AttachFramebuffer(i, gpFramebuffer[i], gaFramebufferId[i].asOutParam());
-        if (FAILED(rc))
+        hrc = gpDisplay->AttachFramebuffer(i, gpFramebuffer[i], gaFramebufferId[i].asOutParam());
+        if (FAILED(hrc))
         {
             RTPrintf("Error: could not register framebuffer object!\n");
@@ -2040 +2040 @@
         LONG xOrigin, yOrigin;
         GuestMonitorStatus_T monitorStatus;
-        rc = gpDisplay->GetScreenResolution(i, &dummy, &dummy, &dummy, &xOrigin, &yOrigin, &monitorStatus);
+        hrc = gpDisplay->GetScreenResolution(i, &dummy, &dummy, &dummy, &xOrigin, &yOrigin, &monitorStatus);
         gpFramebuffer[i]->setOrigin(xOrigin, yOrigin);
     }
@@ -2091 +2091 @@
     if (pszPortVRDP)
     {
-        rc = gpMachine->COMGETTER(VRDEServer)(gpVRDEServer.asOutParam());
-        AssertMsg((rc == S_OK) && gpVRDEServer, ("Could not get VRDP Server! rc = 0x%x\n", rc));
+        hrc = gpMachine->COMGETTER(VRDEServer)(gpVRDEServer.asOutParam());
+        AssertMsg((hrc == S_OK) && gpVRDEServer, ("Could not get VRDP Server! rc = 0x%x\n", hrc));
         if (gpVRDEServer)
         {
@@ -2098 +2098 @@
             if (strcmp(pszPortVRDP, "0"))
             {
-                rc = gpVRDEServer->SetVRDEProperty(Bstr("TCP/Ports").raw(), Bstr(pszPortVRDP).raw());
-                if (rc != S_OK)
+                hrc = gpVRDEServer->SetVRDEProperty(Bstr("TCP/Ports").raw(), Bstr(pszPortVRDP).raw());
+                if (hrc != S_OK)
                 {
-                    RTPrintf("Error: could not set VRDP port! rc = 0x%x\n", rc);
+                    RTPrintf("Error: could not set VRDP port! rc = 0x%x\n", hrc);
                     goto leave;
                 }
             }
             // now enable VRDP
-            rc = gpVRDEServer->COMSETTER(Enabled)(TRUE);
-            if (rc != S_OK)
-            {
-                RTPrintf("Error: could not enable VRDP server! rc = 0x%x\n", rc);
+            hrc = gpVRDEServer->COMSETTER(Enabled)(TRUE);
+            if (hrc != S_OK)
+            {
+                RTPrintf("Error: could not enable VRDP server! rc = 0x%x\n", hrc);
                 goto leave;
             }
@@ -2115 +2115 @@
     }
 
-    rc = E_FAIL;
+    hrc = E_FAIL;
 #ifdef VBOXSDL_ADVANCED_OPTIONS
     if (u32WarpDrive != 0)
@@ -2188 +2188 @@
     {
         LogFlow(("Powering up the VM...\n"));
-        rc = gpConsole->PowerUp(gpProgress.asOutParam());
-        if (rc != S_OK)
+        hrc = gpConsole->PowerUp(gpProgress.asOutParam());
+        if (hrc != S_OK)
         {
             com::ErrorInfo info(gpConsole, COM_IIDOF(IConsole));
@@ -2228 +2228 @@
     do
     {
-        rc = gpMachine->COMGETTER(State)(&machineState);
-        if (    rc == S_OK
+        hrc = gpMachine->COMGETTER(State)(&machineState);
+        if (    hrc == S_OK
             &&  (   machineState == MachineState_Starting
                  || machineState == MachineState_Restoring
@@ -2280 +2280 @@
                         ULONG dummy;
                         GuestMonitorStatus_T monitorStatus;
-                        rc = gpDisplay->GetScreenResolution(event.user.code, &dummy, &dummy, &dummy, &xOrigin, &yOrigin, &monitorStatus);
+                        hrc = gpDisplay->GetScreenResolution(event.user.code, &dummy, &dummy, &dummy, &xOrigin, &yOrigin, &monitorStatus);
                         gpFramebuffer[event.user.code]->setOrigin(xOrigin, yOrigin);
                         break;
@@ -2325 +2325 @@
         }
         eventQ->processEventQueue(0);
-    } while (   rc == S_OK
+    } while (   hrc == S_OK
              && (   machineState == MachineState_Starting
                  || machineState == MachineState_Restoring
@@ -2347 +2347 @@
             PrintError("Failed to power up VM", info.getText().raw());
         else
-            RTPrintf("Error: failed to power up VM! No error text available (rc = 0x%x state = %d)\n", rc, machineState);
+            RTPrintf("Error: failed to power up VM! No error text available (rc = 0x%x state = %d)\n", hrc, machineState);
         goto leave;
     }
@@ -2355 +2355 @@
     pConsoleListener->getWrapped()->ignorePowerOffEvents(false);
 
-    rc = gpConsole->COMGETTER(Keyboard)(gpKeyboard.asOutParam());
+    hrc = gpConsole->COMGETTER(Keyboard)(gpKeyboard.asOutParam());
     if (!gpKeyboard)
     {
@@ -2841 +2841 @@
                 ULONG dummy;
                 GuestMonitorStatus_T monitorStatus;
-                rc = gpDisplay->GetScreenResolution(event.user.code, &dummy, &dummy, &dummy, &xOrigin, &yOrigin, &monitorStatus);
+                hrc = gpDisplay->GetScreenResolution(event.user.code, &dummy, &dummy, &dummy, &xOrigin, &yOrigin, &monitorStatus);
                 gpFramebuffer[event.user.code]->setOrigin(xOrigin, yOrigin);
                 break;
@@ -2937 +2937 @@
 
     if (gpVRDEServer)
-        rc = gpVRDEServer->COMSETTER(Enabled)(FALSE);
+        hrc = gpVRDEServer->COMSETTER(Enabled)(FALSE);
 
     /*
@@ -2968 +2968 @@
             CHECK_ERROR_BREAK(pProgress, COMGETTER(Completed)(&completed));
             ASSERT(completed);
-            LONG hrc;
-            CHECK_ERROR_BREAK(pProgress, COMGETTER(ResultCode)(&hrc));
-            if (FAILED(hrc))
+            LONG hrc2;
+            CHECK_ERROR_BREAK(pProgress, COMGETTER(ResultCode)(&hrc2));
+            if (FAILED(hrc2))
             {
                 com::ErrorInfo info;
@@ -2977 +2977 @@
                                info.getText().raw(), info.getComponent().raw());
                 else
-                    RTPrintf("Failed to power down virtual machine! No error information available (rc = 0x%x).\n", hrc);
+                    RTPrintf("Failed to power down virtual machine! No error information available (rc=%Rhrc).\n", hrc2);
                 break;
             }
@@ -3001 +3001 @@
         && machineState != MachineState_AbortedSaved)
     {
-        rc = gpMachine->DiscardSettings();
-        AssertMsg(SUCCEEDED(rc), ("DiscardSettings %Rhrc, machineState %d\n", rc, machineState));
+        hrc = gpMachine->DiscardSettings();
+        AssertMsg(SUCCEEDED(hrc), ("DiscardSettings %Rhrc, machineState %d\n", hrc, machineState));
     }
 
@@ -3008 +3008 @@
     if (sessionOpened)
     {
-        rc = pSession->UnlockMachine();
-        AssertComRC(rc);
+        hrc = pSession->UnlockMachine();
+        AssertComRC(hrc);
     }
 
@@ -3121 +3121 @@
     LogFlow(("Returning from main()!\n"));
     RTLogFlush(NULL);
-    return FAILED(rc) ? 1 : 0;
+    return FAILED(hrc) ? 1 : 0;
 }
 
@@ -4125 +4125 @@
     UpdateTitlebar(TITLEBAR_SAVE);
     gpProgress = NULL;
-    HRESULT rc = gpMachine->SaveState(gpProgress.asOutParam());
-    if (FAILED(rc))
-    {
-        RTPrintf("Error saving state! rc = 0x%x\n", rc);
+    HRESULT hrc = gpMachine->SaveState(gpProgress.asOutParam());
+    if (FAILED(hrc))
+    {
+        RTPrintf("Error saving state! rc=%Rhrc\n", hrc);
         return;
     }
@@ -4142 +4142 @@
     {
         BOOL fCompleted = false;
-        rc = gpProgress->COMGETTER(Completed)(&fCompleted);
-        if (FAILED(rc) || fCompleted)
+        hrc = gpProgress->COMGETTER(Completed)(&fCompleted);
+        if (FAILED(hrc) || fCompleted)
             break;
         ULONG cPercentNow;
-        rc = gpProgress->COMGETTER(Percent)(&cPercentNow);
-        if (FAILED(rc))
+        hrc = gpProgress->COMGETTER(Percent)(&cPercentNow);
+        if (FAILED(hrc))
             break;
         if (cPercentNow != cPercent)
@@ -4156 +4156 @@
 
         /* wait */
-        rc = gpProgress->WaitForCompletion(100);
-        if (FAILED(rc))
+        hrc = gpProgress->WaitForCompletion(100);
+        if (FAILED(hrc))
             break;
         /// @todo process gui events.
@@ -4174 +4174 @@
          */
         BOOL fCompleted = false;
-        rc = gpProgress->COMGETTER(Completed)(&fCompleted);
-        if (FAILED(rc) || fCompleted)
+        hrc = gpProgress->COMGETTER(Completed)(&fCompleted);
+        if (FAILED(hrc) || fCompleted)
             break;
         ULONG cPercentNow;
-        rc = gpProgress->COMGETTER(Percent)(&cPercentNow);
-        if (FAILED(rc))
+        hrc = gpProgress->COMGETTER(Percent)(&cPercentNow);
+        if (FAILED(hrc))
             break;
         if (cPercentNow != cPercent)
@@ -4238 +4238 @@
      */
     LONG lrc;
-    rc = gpProgress->COMGETTER(ResultCode)(&lrc);
-    if (FAILED(rc))
+    hrc = gpProgress->COMGETTER(ResultCode)(&lrc);
+    if (FAILED(hrc))
         lrc = ~0;
     if (!lrc)
@@ -4324 +4324 @@
             {
                 ULONG cPercentNow;
-                HRESULT rc = gpProgress->COMGETTER(Percent)(&cPercentNow);
-                if (SUCCEEDED(rc))
+                HRESULT hrc = gpProgress->COMGETTER(Percent)(&cPercentNow);
+                if (SUCCEEDED(hrc))
                     RTStrPrintf(szTitle + strlen(szTitle), sizeof(szTitle) - strlen(szTitle),
                                 " - Restoring %d%%...", (int)cPercentNow);
@@ -4335 +4335 @@
             {
                 ULONG cPercentNow;
-                HRESULT rc = gpProgress->COMGETTER(Percent)(&cPercentNow);
-                if (SUCCEEDED(rc))
+                HRESULT hrc = gpProgress->COMGETTER(Percent)(&cPercentNow);
+                if (SUCCEEDED(hrc))
                     RTStrPrintf(szTitle + strlen(szTitle), sizeof(szTitle) - strlen(szTitle),
                                 " - Teleporting %d%%...", (int)cPercentNow);
@@ -4873 +4873 @@
             RTStrPrintf(pszSnapshotName, sizeof(pszSnapshotName), "Snapshot %d", cSnapshots + 1);
             gpProgress = NULL;
-            HRESULT rc;
+            HRESULT hrc;
             Bstr snapId;
             CHECK_ERROR(gpMachine, TakeSnapshot(Bstr(pszSnapshotName).raw(),
@@ -4879 +4879 @@
                                                 TRUE, snapId.asOutParam(),
                                                 gpProgress.asOutParam()));
-            if (FAILED(rc))
-            {
-                RTPrintf("Error taking snapshot! rc = 0x%x\n", rc);
+            if (FAILED(hrc))
+            {
+                RTPrintf("Error taking snapshot! rc=%Rhrc\n", hrc);
                 /* continue operation */
                 return VINF_SUCCESS;
@@ -4893 +4893 @@
             {
                 BOOL fCompleted = false;
-                rc = gpProgress->COMGETTER(Completed)(&fCompleted);
-                if (FAILED(rc) || fCompleted)
+                hrc = gpProgress->COMGETTER(Completed)(&fCompleted);
+                if (FAILED(hrc) || fCompleted)
                     break;
                 ULONG cPercentNow;
-                rc = gpProgress->COMGETTER(Percent)(&cPercentNow);
-                if (FAILED(rc))
+                hrc = gpProgress->COMGETTER(Percent)(&cPercentNow);
+                if (FAILED(hrc))
                     break;
                 if (cPercentNow != cPercent)
@@ -4907 +4907 @@
 
                 /* wait */
-                rc = gpProgress->WaitForCompletion(100);
-                if (FAILED(rc))
+                hrc = gpProgress->WaitForCompletion(100);
+                if (FAILED(hrc))
                     break;
                 /// @todo process gui events.

trunk/src/VBox/ImageMounter/vboximg-mount/vboximgMedia.cpp

@@ -316 +316 @@
 vboximgListVMs(IVirtualBox *pVirtualBox)
 {
-    HRESULT rc = 0;
+    HRESULT hrc = 0;
     com::SafeIfaceArray<IMachine> pMachines;
     CHECK_ERROR(pVirtualBox, COMGETTER(Machines)(ComSafeArrayAsOutParam(pMachines)));
@@ -372 +372 @@
                         }
                     }
-                    rc = listMedia(pVirtualBox, pMachine,
+                    hrc = listMedia(pVirtualBox, pMachine,
                             RTStrDup(CSTR(machineName)), RTStrDup(CSTR(machineUuid)));
                     RTPrintf("\n");
@@ -379 +379 @@
         }
     }
-    return rc;
-}
+    return hrc;
+}