Changeset 13286 in vbox

Timestamp:

Oct 15, 2008 1:33:59 PM (16 years ago)

Author:

vboxsync

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

37948

Message:

win NetFlt Vista64-related fixes, UI/config fixes

Location:

trunk/src/VBox

Files:

• Devices/Network/DrvIntNet.cpp (modified) (1 diff)
• Main/ConsoleImpl2.cpp (modified) (1 diff)
• Main/HostImpl.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Network/DrvIntNet.cpp

@@ -925 +925 @@
     }
 # endif
-
     if(OpenReq.enmTrunkType == kIntNetTrunkType_NetFlt)
     {
         char szBindName[INTNET_MAX_TRUNK_NAME];
-        size_t cBindName = INTNET_MAX_TRUNK_NAME;
-
-        rc = drvIntNetWinIfNameToBindName(OpenReq.szTrunk, szBindName, cBindName);
+        int cBindName = INTNET_MAX_TRUNK_NAME;
+
+        rc = drvIntNetWinIfGuidToBindName(OpenReq.szTrunk, szBindName, cBindName);
         if (RT_FAILURE(rc))
         {
+            Assert(0);
             return rc;
         }

trunk/src/VBox/Main/ConsoleImpl2.cpp

@@ -1266 +1266 @@
                     if (!SUCCEEDED(rc))
                     {
+                        AssertBreakpoint();
                         return VMSetError(pVM, VERR_INTERNAL_ERROR, RT_SRC_POS,
                                           N_("Inexistent host networking interface, name '%ls'"),
                                           HifName.raw());
                     }
-                    const char *pszTrunk = pszHifName;
+
+                    Guid hostIFGuid;
+                    hrc = hostInterface->COMGETTER(Id)(hostIFGuid.asOutParam());    H();
+                    char szDriverGUID[RTUUID_STR_LENGTH];
+                    strcpy(szDriverGUID , hostIFGuid.toString().raw());
+                    const char *pszTrunk = szDriverGUID;
 # else
 #  error "PORTME (VBOX_WITH_NETFLT)"

trunk/src/VBox/Main/HostImpl.cpp

@@ -834 +834 @@
 {
     LPWSTR              lpszName;
-    GUID                lpszIfGuid;
+    GUID                IfGuid;
     HRESULT hr;
     int rc = VERR_GENERAL_FAILURE;
 
     hr = pncc->GetDisplayName( &lpszName );
+    Assert(hr == S_OK);
     if(hr == S_OK)
     {
         size_t cUnicodeName = wcslen(lpszName) + 1;
-        size_t cbAnsiName = cUnicodeName * 2;
-        char * pAnsiName = (char *)alloca(cbAnsiName);
-        if(pAnsiName)
-        {
-            if(WideCharToMultiByte(CP_ACP, 0, lpszName, cUnicodeName, pAnsiName,
-                    cbAnsiName, NULL, NULL))
-            {
-                hr = pncc->GetInstanceGuid(&lpszIfGuid);
+        size_t uniLen = (cUnicodeName * 2 + sizeof (OLECHAR) - 1) / sizeof (OLECHAR);
+        Bstr name (uniLen + 1 /* extra zero */);
+        wcscpy((wchar_t *) name.mutableRaw(), lpszName);
+
+                hr = pncc->GetInstanceGuid(&IfGuid);
+                Assert(hr == S_OK);
                 if (hr == S_OK)
                 {
@@ -856 +855 @@
                     iface.createObject();
                     /* remove the curly bracket at the end */
-                    if (SUCCEEDED (iface->init (pAnsiName, Guid (lpszIfGuid))))
+                    if (SUCCEEDED (iface->init (name, Guid (IfGuid))))
                     {
                         pPist->push_back (iface);
                         rc = VINF_SUCCESS;
                     }
+                    else
+                    {
+                        Assert(0);
+                    }
                 }
-            }
-        }
         CoTaskMemFree(lpszName);
     }
@@ -1228 +1229 @@
                        &pNc,
                        &lpszApp );
+    Assert(hr == S_OK);
     if(hr == S_OK)
     {
         /* for now we just get all miniports the MS_TCPIP protocol binds to */
         hr = pNc->FindComponent(L"MS_TCPIP", &pTcpIpNcc);
+        Assert(hr == S_OK);
         if(hr == S_OK)
         {
             hr = vboxNetCfgWinGetBindingPathEnum(pTcpIpNcc, EBP_BELOW, &pEnumBp);
+            Assert(hr == S_OK);
             if ( hr == S_OK )
             {
                 hr = vboxNetCfgWinGetFirstBindingPath(pEnumBp, &pBp);
+                Assert(hr == S_OK || hr == S_FALSE);
                 while( hr == S_OK )
                 {
                     hr = vboxNetCfgWinGetBindingInterfaceEnum(pBp, &pEnumBi);
+                    Assert(hr == S_OK);
                     if ( hr == S_OK )
                     {
                         hr = vboxNetCfgWinGetFirstBindingInterface(pEnumBi, &pBi);
+                        Assert(hr == S_OK);
                         while(hr == S_OK)
                         {
                             hr = pBi->GetLowerComponent( &pMpNcc );
+                            Assert(hr == S_OK);
                             if(hr == S_OK)
                             {