Changeset 70798 in vbox for trunk/src/VBox/HostDrivers/VBoxNetFlt

Timestamp:

Jan 29, 2018 7:38:48 PM (7 years ago)

Author:

vboxsync

Message:

NetFlt/Win: (bugref: 8325) Fix PPPOE issue by registering VBoxNetFltNobj manually.

File:

• trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp (modified) (2 diffs)

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp

@@ -31 +31 @@
 #include <VBoxNetFltNobjT_i.c>
 
+#include <Olectl.h>
+
 //# define VBOXNETFLTNOTIFY_DEBUG_BIND
 
@@ -584 +586 @@
 }
 
+/*
+ * ATL::CComModule does not suport server registration/unregistration methods,
+ * so we need to do it manually. Since this is the only place we do registraton
+ * manually, we do it the quick-and-dirty way.
+ */
+
+/* Someday we may want to log errors. */
+class AdHocRegError
+{
+public:
+    AdHocRegError(LSTATUS rc) { RT_NOREF1(rc); };
+};
+
+/* A simple wrapper on Windows registry functions. */
+class AdHocRegKey
+{
+public:
+    AdHocRegKey(HKEY hKey) : m_hKey(hKey) {};
+    AdHocRegKey(LPCWSTR pcwszName, HKEY hParent = HKEY_CLASSES_ROOT);
+    ~AdHocRegKey() { RegCloseKey(m_hKey); };
+
+    AdHocRegKey *create(LPCWSTR pcwszSubkey, LPCWSTR pcwszDefaultValue = NULL);
+    void remove(LPCWSTR pcwszSubkey);
+    void setValue(LPCWSTR pcwszName, LPCWSTR pcwszValue);
+    HKEY getKey(void) { return m_hKey; };
+private:
+    HKEY m_hKey;
+};
+
+AdHocRegKey::AdHocRegKey(LPCWSTR pcwszName, HKEY hParent)
+{
+    LSTATUS rc = RegOpenKeyExW(hParent, pcwszName, 0, KEY_ALL_ACCESS, &m_hKey);
+    if (rc != ERROR_SUCCESS)
+        throw AdHocRegError(rc);
+}
+
+void AdHocRegKey::remove(LPCWSTR pcwszSubkey)
+{
+    LSTATUS rc;
+    WCHAR wszName[256];
+    DWORD dwName;
+
+    /* Remove all subkeys of subkey first */
+    AdHocRegKey *subkey = new AdHocRegKey(pcwszSubkey, m_hKey);
+    for (;;)
+    {
+        /* Always ask for the first subkey, because we remove it before calling RegEnumKeyEx again */
+        dwName = 255;
+        rc = RegEnumKeyExW(subkey->getKey(), 0, wszName, &dwName, NULL, NULL, NULL, NULL);
+        if (rc != ERROR_SUCCESS)
+            break;
+        subkey->remove(wszName);
+    }
+    delete subkey;
+
+    /* Remove the subkey itself */
+    rc = RegDeleteKeyW(m_hKey, pcwszSubkey);
+    if (rc != ERROR_SUCCESS)
+        throw AdHocRegError(rc);
+}
+
+AdHocRegKey *AdHocRegKey::create(LPCWSTR pcwszSubkey, LPCWSTR pcwszDefaultValue)
+{
+    HKEY hSubkey;
+    LSTATUS rc = RegCreateKeyExW(m_hKey, pcwszSubkey,
+                                 0 /*Reserved*/, NULL /*pszClass*/, 0 /*fOptions*/,
+                                 KEY_ALL_ACCESS, NULL /*pSecAttr*/, &hSubkey, NULL /*pdwDisposition*/);
+    if (rc != ERROR_SUCCESS)
+        throw AdHocRegError(rc);
+    AdHocRegKey *pSubkey = new AdHocRegKey(hSubkey);
+    if (pcwszDefaultValue)
+        pSubkey->setValue(NULL, pcwszDefaultValue);
+    return pSubkey;
+}
+
+void AdHocRegKey::setValue(LPCWSTR pcwszName, LPCWSTR pcwszValue)
+{
+    LSTATUS rc = RegSetValueExW(m_hKey, pcwszName, 0, REG_SZ, (const BYTE *)pcwszValue,
+                                (wcslen(pcwszValue) + 1) * sizeof(WCHAR));
+    if (rc != ERROR_SUCCESS)
+        throw AdHocRegError(rc);
+}
+
+/*
+ * Auxiliary class that facilitates automatic destruction of AdHocRegKey objects
+ * allocated in heap. No reference counting here!
+ */
+class AdHocRegKeyPtr
+{
+public:
+    AdHocRegKeyPtr(AdHocRegKey *pKey) : m_pKey(pKey) {};
+    ~AdHocRegKeyPtr() { delete m_pKey; };
+
+    AdHocRegKey *create(LPCWSTR pcwszSubkey, LPCWSTR pcwszDefaultValue = NULL)
+        { return m_pKey->create(pcwszSubkey, pcwszDefaultValue); };
+    void remove(LPCWSTR pcwszSubkey)
+        { return m_pKey->remove(pcwszSubkey); };
+    void setValue(LPCWSTR pcwszName, LPCWSTR pcwszValue)
+        { return m_pKey->setValue(pcwszName, pcwszValue); };
+private:
+    AdHocRegKey *m_pKey;
+    /* Prevent copying, since we do not support reference counting */
+    AdHocRegKeyPtr(const AdHocRegKeyPtr&);
+    AdHocRegKeyPtr& operator=(const AdHocRegKeyPtr&);
+};
+
+
 STDAPI DllRegisterServer()
 {
-// this is a "just in case" conditional, which is not defined
-#ifdef VBOX_FORCE_REGISTER_SERVER
-    return _Module.RegisterServer(TRUE);
-#else
+    WCHAR wszModule[MAX_PATH + 1];
+    if (GetModuleFileNameW(GetModuleHandleW(L"VBoxNetFltNobj"), wszModule, MAX_PATH) == 0)
+        return SELFREG_E_CLASS;
+
+    try {
+        AdHocRegKey keyCLSID(L"CLSID");
+        AdHocRegKeyPtr pkeyNobjClass(keyCLSID.create(L"{f374d1a0-bf08-4bdc-9cb2-c15ddaeef955}",
+                                                     L"VirtualBox Bridged Networking Driver Notify Object v1.1"));
+        AdHocRegKeyPtr pkeyNobjSrv(pkeyNobjClass.create(L"InProcServer32", wszModule));
+        pkeyNobjSrv.setValue(L"ThreadingModel", L"Both");
+    }
+    catch (AdHocRegError)
+    {
+        return SELFREG_E_CLASS;
+    }
+
+    try {
+        AdHocRegKey keyTypeLib(L"TypeLib");
+        AdHocRegKeyPtr pkeyNobjLib(keyTypeLib.create(L"{2A0C94D1-40E1-439C-8FE8-24107CAB0840}\\1.1",
+                                                     L"VirtualBox Bridged Networking Driver Notify Object v1.1 Type Library"));
+        AdHocRegKeyPtr pkeyNobjLib0(pkeyNobjLib.create(L"0\\win64", wszModule));
+        AdHocRegKeyPtr pkeyNobjLibFlags(pkeyNobjLib.create(L"FLAGS", L"0"));
+        if (GetSystemDirectoryW(wszModule, MAX_PATH) == 0)
+            return SELFREG_E_TYPELIB;
+        AdHocRegKeyPtr pkeyNobjLibHelpDir(pkeyNobjLib.create(L"HELPDIR", wszModule));
+    }
+    catch (AdHocRegError)
+    {
+        return SELFREG_E_CLASS;
+    }
+
     return S_OK;
-#endif
 }
 
 STDAPI DllUnregisterServer()
 {
-// this is a "just in case" conditional, which is not defined
-#ifdef VBOX_FORCE_REGISTER_SERVER
-    return _Module.UnregisterServer(TRUE);
-#else
+    try {
+        AdHocRegKey keyTypeLib(L"TypeLib");
+        keyTypeLib.remove(L"{2A0C94D1-40E1-439C-8FE8-24107CAB0840}");
+    }
+    catch (AdHocRegError) { return SELFREG_E_TYPELIB; }
+    
+    try {
+        AdHocRegKey keyCLSID(L"CLSID");
+        keyCLSID.remove(L"{f374d1a0-bf08-4bdc-9cb2-c15ddaeef955}");
+    }
+    catch (AdHocRegError) { return SELFREG_E_CLASS; }
+
     return S_OK;
-#endif
-}
+}