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

Timestamp:

Mar 12, 2009 6:19:03 PM (16 years ago)

Author:

vboxsync

Message:

NetAdp/win: make the network connection be named properly

File:

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

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

@@ -1265 +1265 @@
 }
 
-extern "C" HRESULT RenameConnection (PCWSTR GuidString, PCWSTR NewName)
+static HRESULT netIfRenameConnection (PCWSTR GuidString, PCWSTR NewName)
 {
     typedef HRESULT (WINAPI *lpHrRenameConnection) (const GUID *, PCWSTR);
@@ -1304 +1304 @@
     return S_OK;
 }
+#define VBOX_CONNECTION_NAME L"Virtualbox Host-Only Network"
+static HRESULT netIfGenConnectionName (PCWSTR DevName, WCHAR *pBuf, PULONG pcbBuf)
+{
+    WCHAR * pSuffix = wcsrchr( DevName, L'#' );
+    ULONG cbSize = sizeof(VBOX_CONNECTION_NAME);
+    ULONG cbSufSize = 0;
+
+    if(pSuffix)
+    {
+        cbSize += wcslen(pSuffix) * 2;
+    }
+
+    if(*pcbBuf < cbSize)
+    {
+        *pcbBuf = cbSize;
+        return E_FAIL;
+    }
+
+    wcscpy(pBuf, VBOX_CONNECTION_NAME);
+    if(pSuffix)
+    {
+        wcscat(pBuf, pSuffix);
+    }
+
+    return S_OK;
+}
 
 #define DRIVERHWID _T("sun_VBoxNetAdp")
@@ -1606 +1632 @@
                     Bstr str(name);
                     str.detachTo(pName);
+                    WCHAR ConnectoinName[128];
+                    ULONG cbBuf = sizeof(ConnectoinName);
+
+                    /* return back the bracket */
+                    pCfgGuidString [_tcslen (pCfgGuidString)] = '}';
+
+                    hr = netIfGenConnectionName (name, ConnectoinName, &cbBuf);
+                    if(hr == S_OK)
+                    {
+                        hr = netIfRenameConnection (pCfgGuidString, ConnectoinName);
+                    }
 
                     CoTaskMemFree (name);