Changeset 17713 in vbox for trunk/src/VBox/Main/win

Timestamp:

Mar 11, 2009 5:30:58 PM (16 years ago)

Author:

vboxsync

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

44225

Message:

NetIf/win: dhcp enabled property implementation

File:

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

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

@@ -478 +478 @@
             if(SUCCEEDED(hr))
             {
-            }
-        }
+                VARIANT varReturnValue;
+                hr = pOutParams->Get(bstr_t(L"ReturnValue"), 0,
+                    &varReturnValue, NULL, 0);
+                Assert(SUCCEEDED(hr));
+                if(SUCCEEDED(hr))
+                {
+//                    Assert(varReturnValue.vt == VT_UINT);
+                    int winEr = varReturnValue.uintVal;
+                    switch(winEr)
+                    {
+                    case 0:
+                        hr = S_OK;
+                        break;
+                    default:
+                        hr = HRESULT_FROM_WIN32( winEr );
+                        break;
+                    }
+                }
+            }        }
         SysFreeString(ClassName);
     }
@@ -534 +551 @@
             if(SUCCEEDED(hr))
             {
+                VARIANT varReturnValue;
+                hr = pOutParams->Get(bstr_t(L"ReturnValue"), 0,
+                    &varReturnValue, NULL, 0);
+                Assert(SUCCEEDED(hr));
+                if(SUCCEEDED(hr))
+                {
+//                    Assert(varReturnValue.vt == VT_UINT);
+                    int winEr = varReturnValue.uintVal;
+                    switch(winEr)
+                    {
+                    case 0:
+                        hr = S_OK;
+                        break;
+                    default:
+                        hr = HRESULT_FROM_WIN32( winEr );
+                        break;
+                    }
+                }
             }
         }
@@ -548 +583 @@
 }
 
-static int collectNetIfInfo(Bstr &strName, PNETIFINFO pInfo)
+static int netIfWinIsDhcpEnabled(const Guid &guid, BOOL *pEnabled)
+{
+    HRESULT hr;
+        ComPtr <IWbemServices> pSvc;
+        hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
+        if(SUCCEEDED(hr))
+        {
+            ComPtr <IWbemClassObject> pAdapterConfig;
+            hr = netIfWinFindAdapterClassById(pSvc, guid, pAdapterConfig.asOutParam());
+            if(SUCCEEDED(hr))
+            {
+                VARIANT vtEnabled;
+                hr = pAdapterConfig->Get(L"DHCPEnabled", 0, &vtEnabled, 0, 0);
+                if(SUCCEEDED(hr))
+                {
+                    *pEnabled = vtEnabled.boolVal;
+                }
+            }
+        }
+
+    return SUCCEEDED(hr) ? VINF_SUCCESS : VERR_GENERAL_FAILURE;
+}
+
+static int collectNetIfInfo(Bstr &strName, Guid &guid, PNETIFINFO pInfo)
 {
     DWORD dwRc;
+    int rc = VINF_SUCCESS;
     /*
      * Most of the hosts probably have less than 10 adapters,
@@ -642 +701 @@
             RTStrFree(pszUuid);
         }
+
+        BOOL bEnabled;
+        rc  = netIfWinIsDhcpEnabled(guid, &bEnabled);
+        Assert(RT_SUCCESS(rc));
+        if(RT_SUCCESS(rc))
+        {
+            pInfo->bDhcpEnabled = bEnabled;
+        }
     }
     RTMemFree(pAddresses);
@@ -647 +714 @@
     return VINF_SUCCESS;
 }
-
-//static HRESULT netIfWinUpdateConfig(HostNetworkInterface * pIf)
-//{
-//    NETIFINFO Info;
-//    memset(&Info, 0, sizeof(Info));
-//    GUID guid;
-//    HRESULT hr = pIf->COMGETTER(Id) (&guid);
-//    if(SUCCEEDED(hr))
-//    {
-//        Info.Uuid = (RTUUID)*(RTUUID*)&guid;
-//        BSTR name;
-//        hr = pIf->COMGETTER(Name) (&name);
-//        Assert(hr == S_OK);
-//        if(hr == S_OK)
-//        {
-//            int rc = collectNetIfInfo(Bstr(name), &Info);
-//            if (RT_SUCCESS(rc))
-//            {
-//                hr = pIf->updateConfig(&Info);
-//            }
-//            else
-//            {
-//                Log(("netIfWinUpdateConfig: collectNetIfInfo() -> %Vrc\n", rc));
-//                hr = E_FAIL;
-//            }
-//        }
-//    }
-//
-//    return hr;
-//}
 
 static int netIfEnableStaticIpConfig(const Guid &guid, ULONG ip, ULONG mask)
@@ -2068 +2105 @@
             memset(&Info, 0, sizeof(Info));
             Info.Uuid = *(Guid(IfGuid).raw());
-            rc = collectNetIfInfo(name, &Info);
+            rc = collectNetIfInfo(name, Guid(IfGuid), &Info);
             if (RT_FAILURE(rc))
             {
@@ -2171 +2208 @@
     Bstr name;
     HRESULT hr = pIf->COMGETTER(Name)(name.asOutParam());
-    if(SUCCEEDED(hr))
-    {
-        return collectNetIfInfo(name, pInfo);
+    if(hr == S_OK)
+    {
+        GUID                IfGuid;
+        hr = pIf->COMGETTER(Id)(&IfGuid);
+        Assert(hr == S_OK);
+        if (hr == S_OK)
+        {
+            return collectNetIfInfo(name, Guid(IfGuid), pInfo);
+        }
     }
     return VERR_GENERAL_FAILURE;