Changeset 48641 in vbox

Timestamp:

Sep 23, 2013 4:08:45 PM (11 years ago)

Author:

vboxsync

Message:

VBoxNetCfg: rename host-only connection before removing adapter (#6740)

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp

@@ -397 +397 @@
 }
 
+/*
+ * Forward declarations of functions used in vboxNetCfgWinRemoveAllNetDevicesOfIdCallback.
+ */
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGenHostonlyConnectionName(PCWSTR DevName, WCHAR *pBuf, PULONG pcbBuf);
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRenameConnection (LPWSTR pGuid, PCWSTR NewName);
+
 static BOOL vboxNetCfgWinRemoveAllNetDevicesOfIdCallback(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pContext)
 {
     HRESULT hr = S_OK;
     SP_REMOVEDEVICE_PARAMS rmdParams;
+    WCHAR pWCfgGuidString[50] = {L''};
 
     rmdParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
@@ -411 +418 @@
         if (SetupDiSetSelectedDevice (hDevInfo, pDev))
         {
+            /* Figure out NetCfgInstanceId */
+            HKEY hkey = SetupDiOpenDevRegKey(hDevInfo,
+                                             pDev,
+                                             DICS_FLAG_GLOBAL,
+                                             0,
+                                             DIREG_DRV,
+                                             KEY_READ);
+            if (hkey == INVALID_HANDLE_VALUE)
+                NonStandardLogFlow(("SetupDiOpenDevRegKey failed (0x%08X)", GetLastError()));
+            else
+            {
+                DWORD cbSize = sizeof(pWCfgGuidString);
+                DWORD dwValueType;
+                DWORD ret = RegQueryValueExW (hkey, L"NetCfgInstanceId", NULL,
+                                              &dwValueType, (LPBYTE) pWCfgGuidString, &cbSize);
+                if (ret == ERROR_SUCCESS)
+                {
+                    /* Figure out device name */
+                    WCHAR DevName[256], TempName[256];
+                    ULONG cbName = sizeof(TempName);
+                    if (SetupDiGetDeviceRegistryPropertyW(hDevInfo, pDev,
+                                               SPDRP_FRIENDLYNAME , /* IN DWORD Property,*/
+                                               NULL, /*OUT PDWORD PropertyRegDataType, OPTIONAL*/
+                                               (PBYTE)DevName, /*OUT PBYTE PropertyBuffer,*/
+                                               sizeof(DevName), /* IN DWORD PropertyBufferSize,*/
+                                               NULL /*OUT PDWORD RequiredSize OPTIONAL*/))
+                    {
+                        /*
+                         * Rename the connection before removing the device. This will
+                         * hopefully prevent an error when we will be attempting
+                         * to rename a newly created connection (see @bugref{6740}).
+                         */
+                        HRESULT hr_tmp = VBoxNetCfgWinGenHostonlyConnectionName(DevName, TempName, &cbName);
+                        wcscat_s(TempName, sizeof(TempName), L" removed");
+                        if (SUCCEEDED(hr))
+                            hr_tmp = VBoxNetCfgWinRenameConnection(pWCfgGuidString, TempName);
+                        //NonStandardLogFlow(("VBoxNetCfgWinRenameConnection(%S,%S) => 0x%x\n", pWCfgGuidString, TempName, hr_tmp));
+                    }
+                    else
+                    {
+                        NonStandardLogFlow(("Failed to get 'friendly name' property for %S\n", pWCfgGuidString));
+                    }
+                }
+                else
+                {
+                    NonStandardLogFlow(("RegQueryValueExW(L\"NetCfgInstanceId\") failed with %d\n", ret));
+                }
+
+                RegCloseKey (hkey);
+            }
+
             if (SetupDiCallClassInstaller(DIF_REMOVE,hDevInfo,pDev))
             {