Changeset 95143 in vbox

Timestamp:

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

Author:

vboxsync

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

File:

• trunk/src/VBox/Main/testcase/tstVBoxMultipleVM.cpp (modified) (19 diffs)

trunk/src/VBox/Main/testcase/tstVBoxMultipleVM.cpp

@@ -88 +88 @@
     do { \
         hrc = iface->method; \
-        if (FAILED(rc)) \
-            RTPrintf("warning: %s->%s failed on line %u with hrc=%Rhrc\n", #iface, #method, __LINE__, rc);\
+        if (FAILED(hrc)) \
+            RTPrintf("warning: %s->%s failed on line %u with hrc=%Rhrc\n", #iface, #method, __LINE__, hrc);\
     } while (0)
 
@@ -149 +149 @@
 {
     ComPtr<IMachine> machine;
-    HRESULT rc = TST_COM_EXPR(pVBox->FindMachine(machineID.raw(), machine.asOutParam()));
-    if (SUCCEEDED(rc))
+    HRESULT hrc = TST_COM_EXPR(pVBox->FindMachine(machineID.raw(), machine.asOutParam()));
+    if (SUCCEEDED(hrc))
     {
         Bstr machineName;
-        rc = TST_COM_EXPR(machine->COMGETTER(Name)(machineName.asOutParam()));
-        if (SUCCEEDED(rc))
+        hrc = TST_COM_EXPR(machine->COMGETTER(Name)(machineName.asOutParam()));
+        if (SUCCEEDED(hrc))
         {
             MachineState_T machineState;
-            rc = TST_COM_EXPR(machine->COMGETTER(State)(&machineState));
+            hrc = TST_COM_EXPR(machine->COMGETTER(State)(&machineState));
             // check that machine is in running state
-            if (   SUCCEEDED(rc)
+            if (   SUCCEEDED(hrc)
                 && (   machineState == MachineState_Running
                     || machineState == MachineState_Paused))
@@ -166 +166 @@
                 ComPtr<IProgress> progress;
 
-                rc = TST_COM_EXPR(machine->LockMachine(pSession, LockType_Shared));
-                if(SUCCEEDED(rc))
+                hrc = TST_COM_EXPR(machine->LockMachine(pSession, LockType_Shared));
+                if(SUCCEEDED(hrc))
                     TST_COM_EXPR(pSession->COMGETTER(Console)(console.asOutParam()));
-                if(SUCCEEDED(rc))
-                    rc = console->PowerDown(progress.asOutParam());
-                if (SUCCEEDED(rc) && !progress.isNull())
+                if(SUCCEEDED(hrc))
+                    hrc = console->PowerDown(progress.asOutParam());
+                if (SUCCEEDED(hrc) && !progress.isNull())
                 {
                     //RTPrintf("Stopping VM %ls...\n", machineName.raw());
                     CHECK_ERROR_L(progress, WaitForCompletion(-1));
-                    if (SUCCEEDED(rc))
+                    if (SUCCEEDED(hrc))
                     {
                         BOOL completed = true;
                         CHECK_ERROR_L(progress, COMGETTER(Completed)(&completed));
-                        if (SUCCEEDED(rc))
+                        if (SUCCEEDED(hrc))
                         {
                             //ASSERT(completed);
                             LONG iRc;
                             CHECK_ERROR_L(progress, COMGETTER(ResultCode)(&iRc));
-                            if (SUCCEEDED(rc))
+                            if (SUCCEEDED(hrc))
                             {
                                 if (FAILED(iRc))
@@ -190 +190 @@
                                     ProgressErrorInfo info(progress);
                                     RTPrintf("Stop VM %ls failed. Warning: %ls.\n", machineName.raw(), info.getText().raw());
-                                    rc = iRc;
+                                    hrc = iRc;
                                 }
                                 else
@@ -207 +207 @@
         }
     }
-    return rc;
+    return hrc;
 }
 
@@ -219 +219 @@
 {
     com::SafeIfaceArray<IMachine> machines;
-    HRESULT rc = TST_COM_EXPR(pVBox->COMGETTER(Machines)(ComSafeArrayAsOutParam(machines)));
-    if (SUCCEEDED(rc))
+    HRESULT hrc = TST_COM_EXPR(pVBox->COMGETTER(Machines)(ComSafeArrayAsOutParam(machines)));
+    if (SUCCEEDED(hrc))
     {
 
@@ -233 +233 @@
                 Bstr machineName;
                 CHECK_ERROR_L(machines[idx], COMGETTER(Id)(bstrId.asOutParam()));
-                if (SUCCEEDED(rc))
+                if (SUCCEEDED(hrc))
                     CHECK_ERROR_L(machines[idx], COMGETTER(Name)(machineName.asOutParam()));
-                if (SUCCEEDED(rc))
+                if (SUCCEEDED(hrc))
                 {
                     if (Utf8Str(machineName).startsWith("umtvm"))
@@ -249 +249 @@
     }
 
-    return rc;
+    return hrc;
 }
 
@@ -255 +255 @@
 static int tstMachinesPack(IVirtualBox *pVBox, uint32_t maxPackSize, uint32_t percentage)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     TMachinesList machinesList;
     bool alwaysUnlock = false;
@@ -277 +277 @@
     {
         ComPtr<ISession> session;
-        rc = session.createInprocObject(CLSID_Session);
-        if (SUCCEEDED(rc))
-        {
-            rc = tstStartVM(pVBox, session, *it, !(alwaysUnlock || g_Counter++ % percN));
+        hrc = session.createInprocObject(CLSID_Session);
+        if (SUCCEEDED(hrc))
+        {
+            hrc = tstStartVM(pVBox, session, *it, !(alwaysUnlock || g_Counter++ % percN));
         }
         RTSemEventSignal(g_PingEevent);
@@ -291 +291 @@
     {
         ComPtr<ISession> session;
-        rc = session.createInprocObject(CLSID_Session);
-        if (SUCCEEDED(rc))
+        hrc = session.createInprocObject(CLSID_Session);
+        if (SUCCEEDED(hrc))
         {
             // stop machines, skip session unlock of given % of machines
-            rc = tstStopVM(pVBox, session, *it, !(alwaysUnlock || g_Counter++ % percN));
+            hrc = tstStopVM(pVBox, session, *it, !(alwaysUnlock || g_Counter++ % percN));
         }
         RTSemEventSignal(g_PingEevent);
         RTThreadSleep(100);
     }
-    return rc;
+    return hrc;
 }
 
@@ -314 +314 @@
 static int tstCreateMachines(IVirtualBox *pVBox)
 {
-    HRESULT rc = S_OK;
+    HRESULT hrc = S_OK;
     // create machines for the test
     for (uint32_t i = 0; i < g_Args.numberMachines; i++)
@@ -332 +332 @@
                                          NULL,                          /* Create flags */
                                          ptrMachine.asOutParam()));
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
         {
             CHECK_ERROR_L(pVBox, RegisterMachine(ptrMachine));
@@ -341 +341 @@
         RTThreadSleep(100);
     }
-    return rc;
+    return hrc;
 }
 
@@ -347 +347 @@
 static int tstClean(IVirtualBox *pVBox, IVirtualBoxClient *pClient)
 {
-    NOREF(pClient);
-    HRESULT rc = S_OK;
+    RT_NOREF(pClient);
+    HRESULT hrc = S_OK;
 
     // stop all machines created for the test
@@ -364 +364 @@
 
         // try to stop it again if it was not stopped
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
         {
             MachineState_T machineState;
             CHECK_ERROR_L(machine, COMGETTER(State)(&machineState));
-            if (   SUCCEEDED(rc)
+            if (   SUCCEEDED(hrc)
                 && (   machineState == MachineState_Running
                     || machineState == MachineState_Paused) )
             {
-                rc = session.createInprocObject(CLSID_Session);
-                if (SUCCEEDED(rc))
+                hrc = session.createInprocObject(CLSID_Session);
+                if (SUCCEEDED(hrc))
                     tstStopVM(pVBox, session, machineName, FALSE);
             }
         }
 
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             CHECK_ERROR_L(machine, Unregister(CleanupMode_DetachAllReturnHardDisksOnly, ComSafeArrayAsOutParam(media)));
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             CHECK_ERROR_L(machine, DeleteConfig(ComSafeArrayAsInParam(media), progress.asOutParam()));
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             CHECK_ERROR_L(progress, WaitForCompletion(-1));
-        if (SUCCEEDED(rc))
+        if (SUCCEEDED(hrc))
             RTPrintf("Machine '%ls' deleted.\n", machineName.raw());
     }
-    return rc;
+    return hrc;
 }
 
@@ -399 +399 @@
     uint32_t percentage = args->percentsUnlok;
 
-    HRESULT rc = com::Initialize();
-    if (SUCCEEDED(rc))
+    HRESULT hrc = com::Initialize();
+    if (SUCCEEDED(hrc))
     {
         ComPtr<IVirtualBoxClient> ptrVBoxClient;
         ComPtr<IVirtualBox> ptrVBox;
 
-        rc = TST_COM_EXPR(ptrVBoxClient.createInprocObject(CLSID_VirtualBoxClient));
-        if (SUCCEEDED(rc))
-            rc = TST_COM_EXPR(ptrVBoxClient->COMGETTER(VirtualBox)(ptrVBox.asOutParam()));
-        if (SUCCEEDED(rc))
+        hrc = TST_COM_EXPR(ptrVBoxClient.createInprocObject(CLSID_VirtualBoxClient));
+        if (SUCCEEDED(hrc))
+            hrc = TST_COM_EXPR(ptrVBoxClient->COMGETTER(VirtualBox)(ptrVBox.asOutParam()));
+        if (SUCCEEDED(hrc))
         {
             RTPrintf("Creating machines...\n");
@@ -415 +415 @@
             while (g_RunTest)
             {
-                rc = tstMachinesPack(ptrVBox, maxPackSize, percentage);
+                hrc = tstMachinesPack(ptrVBox, maxPackSize, percentage);
             }
 
@@ -430 +430 @@
         com::Shutdown();
     }
-    return rc;
+    return hrc;
 }