Changeset 85265 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Jul 12, 2020 1:01:36 AM (5 years ago)

Author:

vboxsync

Message:

Main/NetIf-win.cpp: createObject status should be checked and removed weird 'if (FAILED(rc)) return rc;' following immediately after SUCCEEDED(rc). Use vboxStatusCodeFromCOM for status code conversion. bugref:9790

File:

• trunk/src/VBox/Main/src-server/win/NetIf-win.cpp (modified) (7 diffs)

trunk/src/VBox/Main/src-server/win/NetIf-win.cpp

@@ -46 +46 @@
 #include "ProgressImpl.h"
 #include "VirtualBoxImpl.h"
+#include "Global.h"
 #include "netif.h"
 #include "ThreadTask.h"
@@ -1154 +1155 @@
     /* create a progress object */
     ComObjPtr<Progress> progress;
-    progress.createObject();
+    HRESULT hrc = progress.createObject();
+    AssertComRCReturn(hrc, Global::vboxStatusCodeFromCOM(hrc));
 
     ComPtr<IHost> host;
-    HRESULT rc = pVirtualBox->COMGETTER(Host)(host.asOutParam());
-    if (SUCCEEDED(rc))
-    {
-        rc = progress->init(pVirtualBox, host,
-                            Bstr(_T("Creating host only network interface")).raw(),
-                            FALSE /* aCancelable */);
-        if (SUCCEEDED(rc))
-        {
-            if (FAILED(rc)) return rc;
+    hrc = pVirtualBox->COMGETTER(Host)(host.asOutParam());
+    if (SUCCEEDED(hrc))
+    {
+        hrc = progress->init(pVirtualBox, host,
+                             Bstr(_T("Creating host only network interface")).raw(),
+                             FALSE /* aCancelable */);
+        if (SUCCEEDED(hrc))
+        {
             progress.queryInterfaceTo(aProgress);
 
@@ -1181 +1182 @@
             d->ptrVBox = pVirtualBox;
 
-            rc = pVirtualBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
-                                                     netIfNetworkInterfaceHelperClient,
-                                                     static_cast<void *>(d),
-                                                     progress);
+            hrc = pVirtualBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
+                                                      netIfNetworkInterfaceHelperClient,
+                                                      static_cast<void *>(d),
+                                                      progress);
             /* d is now owned by netIfNetworkInterfaceHelperClient(), no need to delete one here */
 
@@ -1190 +1191 @@
     }
 
-    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
+    return Global::vboxStatusCodeFromCOM(hrc);
 #endif
 }
@@ -1202 +1203 @@
     /* create a progress object */
     ComObjPtr<Progress> progress;
-    progress.createObject();
+    HRESULT hrc = progress.createObject();
+    AssertComRCReturn(hrc, Global::vboxStatusCodeFromCOM(hrc));
+
     ComPtr<IHost> host;
-    HRESULT rc = pVirtualBox->COMGETTER(Host)(host.asOutParam());
-    if (SUCCEEDED(rc))
-    {
-        rc = progress->init(pVirtualBox, host,
-                           Bstr(_T("Removing host network interface")).raw(),
-                           FALSE /* aCancelable */);
-        if (SUCCEEDED(rc))
-        {
-            if (FAILED(rc)) return rc;
+    hrc = pVirtualBox->COMGETTER(Host)(host.asOutParam());
+    if (SUCCEEDED(hrc))
+    {
+        hrc = progress->init(pVirtualBox, host,
+                             Bstr(_T("Removing host network interface")).raw(),
+                             FALSE /* aCancelable */);
+        if (SUCCEEDED(hrc))
+        {
             progress.queryInterfaceTo(aProgress);
 
@@ -1221 +1223 @@
             d->guid = aId;
 
-            rc = pVirtualBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
-                                                     netIfNetworkInterfaceHelperClient,
-                                                     static_cast<void *>(d),
-                                                     progress);
+            hrc = pVirtualBox->i_startSVCHelperClient(IsUACEnabled() == TRUE /* aPrivileged */,
+                                                      netIfNetworkInterfaceHelperClient,
+                                                      static_cast<void *>(d),
+                                                      progress);
             /* d is now owned by netIfNetworkInterfaceHelperClient(), no need to delete one here */
 
@@ -1230 +1232 @@
     }
 
-    return SUCCEEDED(rc) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
+    return Global::vboxStatusCodeFromCOM(hrc);
 #endif
 }