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

Timestamp:

Mar 11, 2009 1:46:23 PM (16 years ago)

Author:

vboxsync

Message:

NetIf/win fixes

File:

• trunk/src/VBox/Main/win/NetIfList-win.cpp (modified) (8 diffs)

trunk/src/VBox/Main/win/NetIfList-win.cpp

@@ -231 +231 @@
         )
 {
-    HRESULT hres;
+    HRESULT hres = S_OK;
     // Step 6: --------------------------------------------------
     // Use the IWbemServices pointer to make requests of WMI ----
 
-    IWbemClassObject* pInParamsDefinition = NULL;
-    hres = pClass->GetMethod(MethodName, 0,
-        &pInParamsDefinition, NULL);
+    ComPtr<IWbemClassObject> pInParamsDefinition;
+    ComPtr<IWbemClassObject> pClassInstance;
+
+    if(cArgs)
+    {
+        hres = pClass->GetMethod(MethodName, 0,
+            pInParamsDefinition.asOutParam(), NULL);
+        if(SUCCEEDED(hres))
+        {
+            hres = pInParamsDefinition->SpawnInstance(0, pClassInstance.asOutParam());
+
+            if(SUCCEEDED(hres))
+            {
+                for(UINT i = 0; i < cArgs; i++)
+                {
+                    // Store the value for the in parameters
+                    hres = pClassInstance->Put(pArgNames[i], 0,
+                        pArgs[i], 0);
+                    if(FAILED(hres))
+                    {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
     if(SUCCEEDED(hres))
     {
-        IWbemClassObject* pClassInstance = NULL;
-        hres = pInParamsDefinition->SpawnInstance(0, &pClassInstance);
-
+        IWbemClassObject* pOutParams = NULL;
+        hres = pSvc->ExecMethod(ObjPath, MethodName, 0,
+                        NULL, pClassInstance, &pOutParams, NULL);
         if(SUCCEEDED(hres))
         {
-            for(UINT i = 0; i < cArgs; i++)
-            {
-                // Store the value for the in parameters
-                hres = pClassInstance->Put(pArgNames[i], 0,
-                    pArgs[i], 0);
-                if(FAILED(hres))
-                {
-                    break;
-                }
-            }
-
-            if(SUCCEEDED(hres))
-            {
-                IWbemClassObject* pOutParams = NULL;
-                hres = pSvc->ExecMethod(ObjPath, MethodName, 0,
-                        NULL, pClassInstance, &pOutParams, NULL);
-                if(SUCCEEDED(hres))
-                {
-                    *ppOutParams = pOutParams;
-                }
-            }
-
-            pClassInstance->Release();
-        }
-
-        pInParamsDefinition->Release();
+            *ppOutParams = pOutParams;
+        }
     }
 
@@ -396 +396 @@
                 if(SUCCEEDED(hr))
                 {
-                    Assert(varReturnValue.vt == VT_UINT);
+//                    Assert(varReturnValue.vt == VT_UINT);
                     int winEr = varReturnValue.uintVal;
                     switch(winEr)
@@ -2288 +2288 @@
             ComObjPtr <Progress> progress;
             progress.createObject();
-            ComPtr<IHost> host;
-            HRESULT rc = vBox->COMGETTER(Host)(host.asOutParam());
-            if(SUCCEEDED(rc))
-            {
-                rc = progress->init (vBox, host,
+//            ComPtr<IHost> host;
+//            HRESULT rc = vBox->COMGETTER(Host)(host.asOutParam());
+//            if(SUCCEEDED(rc))
+            {
+                rc = progress->init (vBox, (IHostNetworkInterface*)pIf,
                                     Bstr ("Enabling Dynamic Ip Configuration"),
                                     FALSE /* aCancelable */);
@@ -2321 +2321 @@
                         /* d is now owned by netIfNetworkInterfaceHelperClient(), so release it */
                         d.release();
+
+                        progress->WaitForCompletion(-1);
                     }
                 }
@@ -2344 +2346 @@
             ComObjPtr <Progress> progress;
             progress.createObject();
-            ComPtr<IHost> host;
-            HRESULT rc = vBox->COMGETTER(Host)(host.asOutParam());
-            if(SUCCEEDED(rc))
-            {
-                rc = progress->init (vBox, host,
+//            ComPtr<IHost> host;
+//            HRESULT rc = vBox->COMGETTER(Host)(host.asOutParam());
+//            if(SUCCEEDED(rc))
+            {
+                rc = progress->init (vBox, (IHostNetworkInterface*)pIf,
                                     Bstr ("Enabling Dynamic Ip Configuration"),
                                     FALSE /* aCancelable */);
@@ -2377 +2379 @@
                         /* d is now owned by netIfNetworkInterfaceHelperClient(), so release it */
                         d.release();
+
+                        progress->WaitForCompletion(-1);
                     }
                 }
@@ -2400 +2404 @@
             ComObjPtr <Progress> progress;
             progress.createObject();
-            ComPtr<IHost> host;
-            HRESULT rc = vBox->COMGETTER(Host)(host.asOutParam());
-            if(SUCCEEDED(rc))
-            {
-                rc = progress->init (vBox, host,
+//            ComPtr<IHost> host;
+//            HRESULT rc = vBox->COMGETTER(Host)(host.asOutParam());
+//            if(SUCCEEDED(rc))
+            {
+                rc = progress->init (vBox, (IHostNetworkInterface*)pIf,
                                     Bstr ("Enabling Dynamic Ip Configuration"),
                                     FALSE /* aCancelable */);
@@ -2431 +2435 @@
                         /* d is now owned by netIfNetworkInterfaceHelperClient(), so release it */
                         d.release();
+
+                        progress->WaitForCompletion(-1);
                     }
                 }