Changeset 95142 in vbox for trunk/src/VBox/Main

Timestamp:

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

Author:

vboxsync

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

151633

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) (3 diffs)

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

@@ -87 +87 @@
 #define CHECK_ERROR_L(iface, method) \
     do { \
-        rc = iface->method; \
+        hrc = iface->method; \
         if (FAILED(rc)) \
             RTPrintf("warning: %s->%s failed on line %u with hrc=%Rhrc\n", #iface, #method, __LINE__, rc);\
@@ -100 +100 @@
 static int tstStartVM(IVirtualBox *pVBox, ISession *pSession, Bstr machineID, bool fSkipUnlock)
 {
-    HRESULT rc;
+    HRESULT hrc;
     ComPtr<IProgress> progress;
     ComPtr<IMachine> machine;
     Bstr machineName;
 
-    rc = TST_COM_EXPR(pVBox->FindMachine(machineID.raw(), machine.asOutParam()));
-    if(SUCCEEDED(rc))
-        rc = TST_COM_EXPR(machine->COMGETTER(Name)(machineName.asOutParam()));
-    if(SUCCEEDED(rc))
-    {
-        rc = machine->LaunchVMProcess(pSession, Bstr("headless").raw(),
+    hrc = TST_COM_EXPR(pVBox->FindMachine(machineID.raw(), machine.asOutParam()));
+    if(SUCCEEDED(hrc))
+        hrc = TST_COM_EXPR(machine->COMGETTER(Name)(machineName.asOutParam()));
+    if(SUCCEEDED(hrc))
+    {
+        hrc = machine->LaunchVMProcess(pSession, Bstr("headless").raw(),
                                       ComSafeArrayNullInParam(), progress.asOutParam());
     }
-    if (SUCCEEDED(rc) && !progress.isNull())
+    if (SUCCEEDED(hrc) && !progress.isNull())
     {
         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))
@@ -142 +142 @@
             RTPrintf("Session unlock skipped.\n");
     }
-    return rc;
+    return hrc;
 }