Changeset 96572 in vbox for trunk/src/VBox

Timestamp:

Sep 1, 2022 8:36:22 PM (2 years ago)

Author:

vboxsync

Message:

HostDrives,Installer/win: Reworked the windows installer related code for no-CRT mode, where applicable, and changed the XxxxInstall.exe/XxxxUninstall.exe utilities to link against VBoxRT.dll instead of being statically linked. Lot's of cleanup. The change is uncomfortably large, but difficult to detangle these things. bugref:10261

Location:

trunk/src/VBox

Files:

• Devices/Makefile.kmk (modified) (3 diffs)
• HostDrivers/VBoxNetFlt/Makefile.kmk (modified) (3 diffs)
• HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (133 diffs)
• HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.cpp (modified) (19 diffs)
• HostDrivers/VBoxNetFlt/win/nobj/VBoxNetFltNobj.h (modified) (1 diff)
• HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp (modified) (15 diffs)
• HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp (modified) (4 diffs)
• HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp (modified) (2 diffs)
• HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp (modified) (3 diffs)
• HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp (modified) (7 diffs)
• HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp (modified) (7 diffs)
• HostDrivers/VBoxUSB/win/Install/USBInstall.cpp (modified) (5 diffs)
• HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp (modified) (4 diffs)
• HostDrivers/VBoxUSB/win/Makefile.kmk (modified) (1 diff)
• HostDrivers/VBoxUSB/win/Makefile.kup (deleted)
• HostDrivers/VBoxUSB/win/testcase/USBTest.cpp (modified) (13 diffs)
• HostDrivers/win/Makefile.kmk (modified) (1 diff)
• HostDrivers/win/cfg/VBoxDrvCfg.cpp (modified) (17 diffs)
• Installer/win/InstallHelper/Makefile.kmk (modified) (1 diff)
• Installer/win/InstallHelper/VBoxCommon.cpp (modified) (3 diffs)
• Installer/win/InstallHelper/VBoxCommon.h (modified) (1 diff)
• Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (101 diffs)
• Installer/win/Makefile.kmk (modified) (4 diffs)
• Main/Makefile.kmk (modified) (2 diffs)

trunk/src/VBox/Devices/Makefile.kmk

@@ -112 +112 @@
  ifdef VBOX_WITH_VSCSI_SSC
   VBoxDDU_SOURCES        += Storage/VSCSI/VSCSILunSsc.cpp
-  VBoxDDU_DEFS           += VBOX_WITH_VSCSI_SSC
+  VBoxDDU_DEFS            += VBOX_WITH_VSCSI_SSC
  endif
  VBoxDDU_LIBS             = \
@@ -126 +126 @@
         $(PATH_STAGE_LIB)/USBLib$(VBOX_SUFF_LIB)
   VBoxDDU_LIBS.win       += \
-        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB)
+        $(PATH_STAGE_LIB)/VBoxDrvCfgDll$(VBOX_SUFF_LIB)
  endif
  VBoxDDU_LDFLAGS.darwin   = -install_name $(VBOX_DYLD_EXECUTABLE_PATH)/VBoxDDU.dylib
@@ -909 +909 @@
 
  ifdef VBOX_WITH_NETFLT
-  VBoxDD_LIBS.win       += $(PATH_STAGE_LIB)/WinNetConfig.lib
+  VBoxDD_LIBS.win       += $(PATH_STAGE_LIB)/WinNetConfigDll$(VBOX_SUFF_LIB)
  endif
 

trunk/src/VBox/HostDrivers/VBoxNetFlt/Makefile.kmk

@@ -243 +243 @@
  # WinNetConfig - static library with host network interface config API (for the installer)
  #
- LIBRARIES.win += WinNetConfig
- WinNetConfig_TEMPLATE = VBoxR3StaticDllNoAsan
- WinNetConfig_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
- WinNetConfig_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
- WinNetConfig_INCS.win = $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)
- WinNetConfig_SOURCES  = win/cfg/VBoxNetCfg.cpp
-
- #
- # WinNetConfigNonStatic - static library with host network interface config API
- #
- LIBRARIES.win += WinNetConfigNonStatic
- WinNetConfigNonStatic_TEMPLATE = VBoxR3Dll
- WinNetConfigNonStatic_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
- WinNetConfigNonStatic_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
- WinNetConfigNonStatic_INCS.win = $(PATH_TOOL_$(VBOX_VCC_TOOL)_INC)
- WinNetConfigNonStatic_SOURCES  = win/cfg/VBoxNetCfg.cpp
+ LIBRARIES.win += WinNetConfigSharedStatic
+ WinNetConfigSharedStatic_TEMPLATE = VBoxR3StaticDllNoAsan
+ WinNetConfigSharedStatic_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
+ WinNetConfigSharedStatic_DEFS     = _UNICODE UNICODE
+ WinNetConfigSharedStatic_SOURCES  = \
+        win/cfg/VBoxNetCfg.cpp \
+       ../../Main/glue/string.cpp
+
+ # Version for DLLs:
+ LIBRARIES.win += WinNetConfigDll
+ WinNetConfigDll_TEMPLATE = VBoxR3Dll
+ WinNetConfigDll_EXTENDS  = WinNetConfigSharedStatic
+
+ # Version for EXEs:
+ LIBRARIES.win += WinNetConfigExe
+ WinNetConfigExe_TEMPLATE = VBOXR3EXE
+ WinNetConfigExe_EXTENDS  = WinNetConfigSharedStatic
 
 
@@ -265 +266 @@
  #
  TEMPLATE_VBoxNetFltR3 = Template for NetFltInstall, NetFltUninstall, NetAdpInstall, NetAdpUninstall, ++
- TEMPLATE_VBoxNetFltR3_EXTENDS  = VBOXR3STATIC
- TEMPLATE_VBoxNetFltR3_SDKS     = $(TEMPLATE_VBOXR3STATIC_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL VBOX_WIN_NEWDEV
- TEMPLATE_VBoxNetFltR3_CXXFLAGS = $(TEMPLATE_VBOXR3STATIC_CXXFLAGS) -Gz
- TEMPLATE_VBoxNetFltR3_CFLAGS   = $(TEMPLATE_VBOXR3STATIC_CFLAGS) -Gz
- TEMPLATE_VBoxNetFltR3_LIBS     = $(TEMPLATE_VBOXR3STATIC_LIBS) \
-        $(WinNetConfig_1_TARGET) \
-        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
+ TEMPLATE_VBoxNetFltR3_EXTENDS  = VBOXR3EXE
+ TEMPLATE_VBoxNetFltR3_SDKS     = $(TEMPLATE_VBOXR3EXE_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_NTDLL VBOX_WIN_NEWDEV
+ TEMPLATE_VBoxNetFltR3_LIBS     = $(TEMPLATE_VBOXR3EXE_LIBS) \
+        $(WinNetConfigExe_1_TARGET) \
+        $(PATH_STAGE_LIB)/VBoxDrvCfgExe$(VBOX_SUFF_LIB) \
+       $(LIB_RUNTIME) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib
@@ -343 +343 @@
  endif
  VBoxNetFltNobj_SDKS       = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
- VBoxNetFltNobj_DEFS       = _WIN32_WINNT=0x0500 WIN32 _ATL_STATIC_REGISTRY
+ VBoxNetFltNobj_DEFS       = WIN32 _ATL_STATIC_REGISTRY
  VBoxNetFltNobj_INCS       = \
         $(VBoxNetFltNobj_0_OUTDIR)

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

@@ -3 +3 @@
  * VBoxNetCfg.cpp - Network Configuration API.
  */
+
 /*
  * Copyright (C) 2011-2022 Oracle and/or its affiliates.
@@ -33 +34 @@
  * SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
  */
+
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
+#define _WIN32_DCOM
+
 #include "VBox/VBoxNetCfg-win.h"
 #include "VBox/VBoxDrvCfg-win.h"
 
-#define _WIN32_DCOM
-
 #include <devguid.h>
-#include <stdio.h>
 #include <regstr.h>
 #include <iprt/win/shlobj.h>
 #include <cfgmgr32.h>
-#include <tchar.h>
 #include <iprt/win/objbase.h>
 
-#include <crtdbg.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include <Wbemidl.h>
-#include <comutil.h>
 
 #include <iprt/win/winsock2.h>
@@ -59 +58 @@
 #include <iprt/win/iphlpapi.h>
 
-#include <set>
-
+#include <iprt/asm.h>
+#include <iprt/assertcompile.h>
+#include <iprt/mem.h>
+#include <iprt/list.h>
+#include <iprt/rand.h>
+#include <iprt/string.h>
+#include <iprt/utf16.h>
+#include <VBox/com/string.h>
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #ifndef Assert   /** @todo r=bird: where would this be defined? */
 //# ifdef DEBUG
@@ -70 +80 @@
 # define AssertMsg(expr, msg) do{}while (0)
 #endif
+
+#define NonStandardLog              DoLogging
+#define NonStandardLogFlow(x)       DoLogging x
+
+#define SetErrBreak(strAndArgs) \
+    if (1) { \
+        hrc = E_FAIL; \
+        NonStandardLog strAndArgs; \
+        bstrError.printfNoThrow strAndArgs; \
+        break; \
+    } else do {} while (0)
+
+
+#define VBOXNETCFGWIN_NETADP_ID_SZ  "sun_VBoxNetAdp"
+#define VBOXNETCFGWIN_NETADP_ID_WSZ RT_CONCAT(L,VBOXNETCFGWIN_NETADP_ID_SZ)
+#define DRIVERHWID                  VBOXNETCFGWIN_NETADP_ID_WSZ
+
+/* We assume the following name matches the device description in vboxnetadp6.inf */
+#define HOSTONLY_ADAPTER_NAME_SZ    "VirtualBox Host-Only Ethernet Adapter"
+#define HOSTONLY_ADAPTER_NAME_WSZ   RT_CONCAT(L,HOSTONLY_ADAPTER_NAME_SZ)
+
+#define VBOX_CONNECTION_NAME_SZ     "VirtualBox Host-Only Network"
+#define VBOX_CONNECTION_NAME_WSZ    RT_CONCAT(L,VBOX_CONNECTION_NAME_SZ)
+
+#define VBOXNETCFGWIN_NETLWF_ID     L"oracle_VBoxNetLwf"
+
+
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 static PFNVBOXNETCFGLOGGER volatile g_pfnLogger = NULL;
 
-static void DoLogging(const char *pszString, ...);
-#define NonStandardLog DoLogging
-#define NonStandardLogFlow(x) DoLogging x
-
-#define DbgLog                              /** @todo r=bird: What does this do? */
-
-#define VBOX_NETCFG_LOCK_TIME_OUT     5000  /** @todo r=bird: What does this do? */
-
-#define VBOXNETCFGWIN_NETADP_ID L"sun_VBoxNetAdp"
-
 /*
-* Wrappers for HelpAPI functions
-*/
+ * Wrappers for HelpAPI functions
+ */
 typedef void FNINITIALIZEIPINTERFACEENTRY( _Inout_ PMIB_IPINTERFACE_ROW row);
 typedef FNINITIALIZEIPINTERFACEENTRY *PFNINITIALIZEIPINTERFACEENTRY;
@@ -94 +125 @@
 typedef FNSETIPINTERFACEENTRY *PFNSETIPINTERFACEENTRY;
 
-static  PFNINITIALIZEIPINTERFACEENTRY   g_pfnInitializeIpInterfaceEntry = NULL;
-static  PFNGETIPINTERFACEENTRY          g_pfnGetIpInterfaceEntry        = NULL;
-static  PFNSETIPINTERFACEENTRY          g_pfnSetIpInterfaceEntry        = NULL;
-
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+static PFNINITIALIZEIPINTERFACEENTRY    g_pfnInitializeIpInterfaceEntry = NULL;
+static PFNGETIPINTERFACEENTRY           g_pfnGetIpInterfaceEntry        = NULL;
+static PFNSETIPINTERFACEENTRY           g_pfnSetIpInterfaceEntry        = NULL;
+
+static void DoLogging(const char *pszString, ...);
 
 /*
-* Forward declaration for using vboxNetCfgWinSetupMetric()
-*/
-HRESULT vboxNetCfgWinSetupMetric(IN NET_LUID* pLuid);
-HRESULT vboxNetCfgWinGetInterfaceLUID(IN HKEY hKey, OUT NET_LUID* pLUID);
-
-
-/*
- * For some weird reason we do not want to use IPRT here, hence the following
- * function provides a replacement for BstrFmt.
+ * Forward declaration for using vboxNetCfgWinSetupMetric()
  */
-static bstr_t bstr_printf(const char *cszFmt, ...)
-{
-    char szBuffer[4096];
-    szBuffer[sizeof(szBuffer) - 1] = 0; /* Make sure the string will be null-terminated */
-    va_list va;
-    va_start(va, cszFmt);
-    _vsnprintf(szBuffer, sizeof(szBuffer) - 1, cszFmt, va);
-    va_end(va);
-    return bstr_t(szBuffer);
-}
+static HRESULT vboxNetCfgWinSetupMetric(IN NET_LUID *pLuid);
+static HRESULT vboxNetCfgWinGetInterfaceLUID(IN HKEY hKey, OUT NET_LUID *pLUID);
+
+
 
 static HRESULT vboxNetCfgWinINetCfgLock(IN INetCfg *pNetCfg,
@@ -127 +149 @@
 {
     INetCfgLock *pLock;
-    HRESULT hr = pNetCfg->QueryInterface(IID_INetCfgLock, (PVOID*)&pLock);
+    HRESULT hr = pNetCfg->QueryInterface(IID_INetCfgLock, (PVOID *)&pLock);
     if (FAILED(hr))
     {
-        NonStandardLogFlow(("QueryInterface failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("QueryInterface failed: %Rhrc\n", hr));
         return hr;
     }
@@ -136 +158 @@
     hr = pLock->AcquireWriteLock(cmsTimeout, pszwClientDescription, ppszwClientDescription);
     if (hr == S_FALSE)
-    {
         NonStandardLogFlow(("Write lock busy\n"));
-    }
     else if (FAILED(hr))
-    {
-        NonStandardLogFlow(("AcquireWriteLock failed, hr (0x%x)\n", hr));
-    }
+        NonStandardLogFlow(("AcquireWriteLock failed: %Rhrc\n", hr));
 
     pLock->Release();
@@ -151 +169 @@
 {
     INetCfgLock *pLock;
-    HRESULT hr = pNetCfg->QueryInterface(IID_INetCfgLock, (PVOID*)&pLock);
+    HRESULT hr = pNetCfg->QueryInterface(IID_INetCfgLock, (PVOID *)&pLock);
     if (FAILED(hr))
     {
-        NonStandardLogFlow(("QueryInterface failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("QueryInterface failed: %Rhrc\n", hr));
         return hr;
     }
@@ -160 +178 @@
     hr = pLock->ReleaseWriteLock();
     if (FAILED(hr))
-        NonStandardLogFlow(("ReleaseWriteLock failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("ReleaseWriteLock failed: %Rhrc\n", hr));
 
     pLock->Release();
@@ -172 +190 @@
                                                       OUT LPWSTR *ppszwClientDescription)
 {
-    INetCfg *pNetCfg;
-    HRESULT hr = CoCreateInstance(CLSID_CNetCfg, NULL, CLSCTX_INPROC_SERVER, IID_INetCfg, (PVOID*)&pNetCfg);
+    INetCfg *pNetCfg = NULL;
+    HRESULT hr = CoCreateInstance(CLSID_CNetCfg, NULL, CLSCTX_INPROC_SERVER, IID_INetCfg, (PVOID *)&pNetCfg);
     if (FAILED(hr))
     {
-        NonStandardLogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("CoCreateInstance failed: %Rhrc\n", hr));
         return hr;
     }
@@ -198 +216 @@
             return S_OK;
         }
-        else
-            NonStandardLogFlow(("Initialize failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("Initialize failed: %Rhrc\n", hr));
     }
 
@@ -217 +234 @@
     if (FAILED(hr))
     {
-        NonStandardLogFlow(("Uninitialize failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("Uninitialize failed: %Rhrc\n", hr));
         /* Try to release the write lock below. */
     }
@@ -225 +242 @@
         HRESULT hr2 = vboxNetCfgWinINetCfgUnlock(pNetCfg);
         if (FAILED(hr2))
-            NonStandardLogFlow(("vboxNetCfgWinINetCfgUnlock failed, hr (0x%x)\n", hr2));
+            NonStandardLogFlow(("vboxNetCfgWinINetCfgUnlock failed: %Rhrc\n", hr2));
         if (SUCCEEDED(hr))
             hr = hr2;
@@ -241 +258 @@
     if (FAILED(hr))
     {
-        NonStandardLogFlow(("Reset failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("Reset failed: %Rhrc\n", hr));
         return hr;
     }
 
-    INetCfgComponent *pNcc;
+    INetCfgComponent *pNcc = NULL;
     while ((hr = pEnumNcc->Next(1, &pNcc, NULL)) == S_OK)
     {
-        ULONG uComponentStatus;
+        ULONG uComponentStatus = 0;
         hr = pNcc->GetDeviceStatus(&uComponentStatus);
         if (SUCCEEDED(hr))
@@ -267 +284 @@
                 }
                 else
-                    NonStandardLogFlow(("GetInstanceGuid failed, hr (0x%x)\n", hr));
+                    NonStandardLogFlow(("GetInstanceGuid failed: %Rhrc\n", hr));
             }
         }
@@ -281 +298 @@
                                                             OUT INetCfgComponent **ppncc)
 {
-    IEnumNetCfgComponent *pEnumNcc;
+    IEnumNetCfgComponent *pEnumNcc = NULL;
     HRESULT hr = pNc->EnumComponents(pguidClass, &pEnumNcc);
-
     if (SUCCEEDED(hr))
     {
         hr = vboxNetCfgWinGetComponentByGuidEnum(pEnumNcc, pComponentGuid, ppncc);
         if (hr == S_FALSE)
-        {
             NonStandardLogFlow(("Component not found\n"));
-        }
         else if (FAILED(hr))
-        {
-            NonStandardLogFlow(("vboxNetCfgWinGetComponentByGuidEnum failed, hr (0x%x)\n", hr));
-        }
+            NonStandardLogFlow(("vboxNetCfgWinGetComponentByGuidEnum failed: %Rhrc\n", hr));
         pEnumNcc->Release();
     }
     else
-        NonStandardLogFlow(("EnumComponents failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("EnumComponents failed: %Rhrc\n", hr));
     return hr;
 }
@@ -304 +316 @@
 static HRESULT vboxNetCfgWinQueryInstaller(IN INetCfg *pNetCfg, IN const GUID *pguidClass, INetCfgClassSetup **ppSetup)
 {
-    HRESULT hr = pNetCfg->QueryNetCfgClass(pguidClass, IID_INetCfgClassSetup, (void**)ppSetup);
+    HRESULT hr = pNetCfg->QueryNetCfgClass(pguidClass, IID_INetCfgClassSetup, (void **)ppSetup);
     if (FAILED(hr))
-        NonStandardLogFlow(("QueryNetCfgClass failed, hr (0x%x)\n", hr));
-    return hr;
-}
-
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinInstallComponent(IN INetCfg *pNetCfg, IN LPCWSTR pszwComponentId, IN const GUID *pguidClass,
-                                                          OUT INetCfgComponent **ppComponent)
+        NonStandardLogFlow(("QueryNetCfgClass failed: %Rhrc\n", hr));
+    return hr;
+}
+
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinInstallComponent(IN INetCfg *pNetCfg, IN LPCWSTR pszwComponentId,
+                                                          IN const GUID *pguidClass, OUT INetCfgComponent **ppComponent)
 {
     INetCfgClassSetup *pSetup;
@@ -317 +329 @@
     if (FAILED(hr))
     {
-        NonStandardLogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("vboxNetCfgWinQueryInstaller failed: %Rhrc\n", hr));
         return hr;
     }
 
     OBO_TOKEN Token;
-    ZeroMemory(&Token, sizeof (Token));
+    RT_ZERO(Token);
     Token.Type = OBO_USER;
-    INetCfgComponent* pTempComponent = NULL;
-
+
+    INetCfgComponent *pTempComponent = NULL;
     hr = pSetup->Install(pszwComponentId, &Token,
                          0,    /* IN DWORD dwSetupFlags */
@@ -336 +348 @@
         if (pTempComponent != NULL)
         {
-            HKEY hkey = (HKEY)INVALID_HANDLE_VALUE;
-            HRESULT res;
-
             /*
-            *   Set default metric value of interface to fix multicast issue
-            *   See @bugref{6379} for details.
-            */
-            res = pTempComponent->OpenParamKey(&hkey);
+             *   Set default metric value of interface to fix multicast issue
+             *   See @bugref{6379} for details.
+             */
+            HKEY    hKey = (HKEY)INVALID_HANDLE_VALUE;
+            HRESULT hrc2 = pTempComponent->OpenParamKey(&hKey);
 
             /* Set default metric value for host-only interface only */
-            if (   SUCCEEDED(res)
-                && hkey != INVALID_HANDLE_VALUE
-                && wcsnicmp(pszwComponentId, VBOXNETCFGWIN_NETADP_ID, 256) == 0)
+            if (   SUCCEEDED(hrc2)
+                && hKey != (HKEY)INVALID_HANDLE_VALUE
+                /* Original was weird: && wcsnicmp(pszwComponentId, VBOXNETCFGWIN_NETADP_ID_WSZ, 256) == 0) */
+                && RTUtf16ICmpAscii(pszwComponentId, VBOXNETCFGWIN_NETADP_ID_SZ) == 0)
             {
                 NET_LUID luid;
-                res = vboxNetCfgWinGetInterfaceLUID(hkey, &luid);
+                hrc2 = vboxNetCfgWinGetInterfaceLUID(hKey, &luid);
 
                 /* Close the key as soon as possible. See @bugref{7973}. */
-                RegCloseKey (hkey);
-                hkey = (HKEY)INVALID_HANDLE_VALUE;
-
-                if (FAILED(res))
+                RegCloseKey(hKey);
+                hKey = (HKEY)INVALID_HANDLE_VALUE;
+
+                if (FAILED(hrc2))
                 {
                     /*
@@ -363 +374 @@
                      *   So we will not break installation process due to this error.
                      */
-                    NonStandardLogFlow(("VBoxNetCfgWinInstallComponent Warning! "
-                                        "vboxNetCfgWinGetInterfaceLUID failed, default metric "
-                                        "for new interface will not be set, hr (0x%x)\n", res));
+                    NonStandardLogFlow(("VBoxNetCfgWinInstallComponent Warning! vboxNetCfgWinGetInterfaceLUID failed, default metric for new interface will not be set: %Rhrc\n", hrc2));
                 }
                 else
                 {
-                    res = vboxNetCfgWinSetupMetric(&luid);
-                    if (FAILED(res))
+                    hrc2 = vboxNetCfgWinSetupMetric(&luid);
+                    if (FAILED(hrc2))
                     {
                         /*
@@ -376 +385 @@
                          *   So we will not break installation process due to this error.
                          */
-                        NonStandardLogFlow(("VBoxNetCfgWinInstallComponent Warning! "
-                                            "vboxNetCfgWinSetupMetric failed, default metric "
-                                            "for new interface will not be set, hr (0x%x)\n", res));
+                        NonStandardLogFlow(("VBoxNetCfgWinInstallComponent Warning! vboxNetCfgWinSetupMetric failed, default metric for new interface will not be set: %Rhrc\n", hrc2));
                     }
                 }
             }
-            if (hkey != INVALID_HANDLE_VALUE)
-            {
-                RegCloseKey (hkey);
-                hkey = (HKEY)INVALID_HANDLE_VALUE;
-            }
+            if (hKey != (HKEY)INVALID_HANDLE_VALUE)
+                RegCloseKey(hKey);
             if (ppComponent != NULL)
                 *ppComponent = pTempComponent;
@@ -394 +398 @@
 
         /* ignore the apply failure */
-        HRESULT tmpHr = pNetCfg->Apply();
-        Assert(tmpHr == S_OK);
-        if (tmpHr != S_OK)
-            NonStandardLogFlow(("Apply failed, hr (0x%x)\n", tmpHr));
+        HRESULT hrc3 = pNetCfg->Apply();
+        Assert(hrc3 == S_OK);
+        if (hrc3 != S_OK)
+            NonStandardLogFlow(("Apply failed: %Rhrc\n", hrc3));
     }
     else
-        NonStandardLogFlow(("Install failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("Install failed: %Rhrc\n", hr));
 
     pSetup->Release();
@@ -407 +411 @@
 
 static HRESULT vboxNetCfgWinInstallInfAndComponent(IN INetCfg *pNetCfg, IN LPCWSTR pszwComponentId, IN const GUID *pguidClass,
-                                                   IN LPCWSTR const *apInfPaths, IN UINT cInfPaths,
+                                                   IN LPCWSTR const *apwszInfPaths, IN UINT cInfPaths,
                                                    OUT INetCfgComponent **ppComponent)
 {
-    HRESULT hr = S_OK;
-    UINT cFilesProcessed = 0;
-
     NonStandardLogFlow(("Installing %u INF files ...\n", cInfPaths));
 
+    HRESULT hr              = S_OK;
+    UINT    cFilesProcessed = 0;
     for (; cFilesProcessed < cInfPaths; cFilesProcessed++)
     {
-        NonStandardLogFlow(("Installing INF file \"%ws\" ...\n", apInfPaths[cFilesProcessed]));
-        hr = VBoxDrvCfgInfInstall(apInfPaths[cFilesProcessed]);
+        NonStandardLogFlow(("Installing INF file \"%ls\" ...\n", apwszInfPaths[cFilesProcessed]));
+        hr = VBoxDrvCfgInfInstall(apwszInfPaths[cFilesProcessed]);
         if (FAILED(hr))
         {
-            NonStandardLogFlow(("VBoxNetCfgWinInfInstall failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("VBoxNetCfgWinInfInstall failed: %Rhrc\n", hr));
             break;
         }
@@ -430 +433 @@
         hr = VBoxNetCfgWinInstallComponent(pNetCfg, pszwComponentId, pguidClass, ppComponent);
         if (FAILED(hr))
-            NonStandardLogFlow(("VBoxNetCfgWinInstallComponent failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("VBoxNetCfgWinInstallComponent failed: %Rhrc\n", hr));
     }
 
@@ -439 +442 @@
         do
         {
-            HRESULT hr2 = VBoxDrvCfgInfUninstall(apInfPaths[cFilesProcessed], 0);
+            HRESULT hr2 = VBoxDrvCfgInfUninstall(apwszInfPaths[cFilesProcessed], 0);
             if (FAILED(hr2))
-                NonStandardLogFlow(("VBoxDrvCfgInfUninstall failed, hr (0x%x)\n", hr2));
+                NonStandardLogFlow(("VBoxDrvCfgInfUninstall failed: %Rhrc\n", hr2));
                 /* Keep going. */
             if (!cFilesProcessed)
@@ -459 +462 @@
     if (FAILED(hr))
     {
-        NonStandardLogFlow(("GetClassGuid failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("GetClassGuid failed: %Rhrc\n", hr));
         return hr;
     }
@@ -467 +470 @@
     if (FAILED(hr))
     {
-        NonStandardLogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("vboxNetCfgWinQueryInstaller failed: %Rhrc\n", hr));
         return hr;
     }
 
     OBO_TOKEN Token;
-    ZeroMemory(&Token, sizeof(Token));
+    RT_ZERO(Token);
     Token.Type = OBO_USER;
 
@@ -480 +483 @@
         hr = pNetCfg->Apply();
         if (FAILED(hr))
-            NonStandardLogFlow(("Apply failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("Apply failed: %Rhrc\n", hr));
     }
     else
-        NonStandardLogFlow(("DeInstall failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("DeInstall failed: %Rhrc\n", hr));
 
     if (pSetup)
@@ -490 +493 @@
 }
 
-typedef BOOL (*VBOXNETCFGWIN_NETCFGENUM_CALLBACK) (IN INetCfg *pNetCfg, IN INetCfgComponent *pNetCfgComponent, PVOID pContext);
+typedef BOOL (*PFN_VBOXNETCFGWIN_NETCFGENUM_CALLBACK_T)(IN INetCfg *pNetCfg, IN INetCfgComponent *pNetCfgComponent,
+                                                        PVOID pvContext);
 
 static HRESULT vboxNetCfgWinEnumNetCfgComponents(IN INetCfg *pNetCfg,
                                                  IN const GUID *pguidClass,
-                                                 VBOXNETCFGWIN_NETCFGENUM_CALLBACK callback,
+                                                 PFN_VBOXNETCFGWIN_NETCFGENUM_CALLBACK_T pfnCallback,
                                                  PVOID pContext)
 {
-    IEnumNetCfgComponent *pEnumComponent;
+    IEnumNetCfgComponent *pEnumComponent = NULL;
     HRESULT hr = pNetCfg->EnumComponents(pguidClass, &pEnumComponent);
     if (SUCCEEDED(hr))
@@ -503 +507 @@
         INetCfgComponent *pNetCfgComponent;
         hr = pEnumComponent->Reset();
-        do
+        for (;;)
         {
             hr = pEnumComponent->Next(1, &pNetCfgComponent, NULL);
@@ -514 +518 @@
                 if (pNetCfgComponent)
                 {
-                    if (pContext)
-                        fResult = callback(pNetCfg, pNetCfgComponent, pContext);
+                    fResult = pfnCallback(pNetCfg, pNetCfgComponent, pContext);
                     pNetCfgComponent->Release();
                 }
@@ -525 +528 @@
             {
                 if (hr == S_FALSE)
-                {
-                    hr = S_OK;
-                }
+                    hr = S_OK; /* no more components */
                 else
-                    NonStandardLogFlow(("Next failed, hr (0x%x)\n", hr));
+                    NonStandardLogFlow(("Next failed: %Rhrc\n", hr));
                 break;
             }
-        } while (true);
+        }
         pEnumComponent->Release();
     }
@@ -538 +539 @@
 }
 
-/*
- * 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);
-
+/** PFNVBOXNETCFGWINNETENUMCALLBACK */
 static BOOL vboxNetCfgWinRemoveAllNetDevicesOfIdCallback(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pvContext)
 {
     RT_NOREF1(pvContext);
+
     SP_REMOVEDEVICE_PARAMS rmdParams;
-    memset(&rmdParams, 0, sizeof(SP_REMOVEDEVICE_PARAMS));
+    RT_ZERO(rmdParams);
     rmdParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
     rmdParams.ClassInstallHeader.InstallFunction = DIF_REMOVE;
@@ -567 +564 @@
                                              KEY_READ);
             if (hKey == INVALID_HANDLE_VALUE)
-            {
-                NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiOpenDevRegKey failed with error %ld\n",
+                NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiOpenDevRegKey failed with error %u\n",
                                     GetLastError()));
-            }
             else
             {
                 WCHAR wszCfgGuidString[50] = { L'' };
-                DWORD cbSize = sizeof(wszCfgGuidString);
-                DWORD dwValueType;
-                DWORD ret = RegQueryValueExW(hKey, L"NetCfgInstanceId", NULL,
-                                             &dwValueType, (LPBYTE)wszCfgGuidString, &cbSize);
-                if (ret == ERROR_SUCCESS)
-                {
-                    NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: Processing device ID \"%S\"\n",
-                                        wszCfgGuidString));
-
-                    /* Figure out device name. */
-                    WCHAR wszDevName[256], wszTempName[256];
-                    ULONG cbName = sizeof(wszTempName);
-
-                    if (SetupDiGetDeviceRegistryPropertyW(hDevInfo, pDev,
-                                                          SPDRP_FRIENDLYNAME, /* IN  DWORD Property,*/
-                                                          NULL,               /* OUT PDWORD PropertyRegDataType, OPTIONAL*/
-                                                          (PBYTE)wszDevName,  /* OUT PBYTE PropertyBuffer,*/
-                                                          sizeof(wszDevName), /* IN  DWORD PropertyBufferSize,*/
-                                                          NULL                /* OUT PDWORD RequiredSize OPTIONAL*/))
+                DWORD cbSize = sizeof(wszCfgGuidString) - sizeof(WCHAR); /* make sure we get a terminated string back */
+                DWORD dwValueType = 0;
+                LSTATUS lrc = RegQueryValueExW(hKey, L"NetCfgInstanceId", NULL, &dwValueType, (LPBYTE)wszCfgGuidString, &cbSize);
+                if (lrc == ERROR_SUCCESS)
+                {
+                    /** @todo r=bird: original didn't check the type here, just assumed it was a
+                     * valid zero terminated string. (zero term handled by -sizeof(WHCAR) above now). */
+                    if (dwValueType == REG_SZ || dwValueType == REG_EXPAND_SZ || dwValueType == REG_EXPAND_SZ)
                     {
-                        /*
-                         * 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 = VBoxNetCfgWinGenHostonlyConnectionName(wszDevName, wszTempName, &cbName);
-                        wcscat_s(wszTempName, sizeof(wszTempName), L" removed");
-                        if (SUCCEEDED(hr))
-                            hr = VBoxNetCfgWinRenameConnection(wszCfgGuidString, wszTempName);
-                        //NonStandardLogFlow(("VBoxNetCfgWinRenameConnection(%S,%S) => 0x%x\n", pWCfgGuidString, TempName, hr_tmp));
+                        NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: Processing device ID \"%ls\"\n",
+                                            wszCfgGuidString));
+
+                        /* Figure out device name. */
+                        WCHAR wszDevName[256 + 1] = {0};
+                        if (SetupDiGetDeviceRegistryPropertyW(hDevInfo, pDev, SPDRP_FRIENDLYNAME, NULL, (PBYTE)wszDevName,
+                                                              sizeof(wszDevName) - sizeof(WCHAR) /* yes, in bytes */, NULL))
+                        {
+                            /*
+                             * 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}).
+                             */
+                            WCHAR wszNewName[RT_ELEMENTS(wszDevName) + 128 /* ensure sufficient buffer */];
+                            HRESULT hr = VBoxNetCfgWinGenHostonlyConnectionName(wszDevName, wszNewName,
+                                                                                RT_ELEMENTS(wszNewName) - 10 /*removed++*/,
+                                                                                NULL);
+                            RTUtf16CatAscii(wszNewName, sizeof(wszNewName), " removed");
+                            if (SUCCEEDED(hr))
+                                hr = VBoxNetCfgWinRenameConnection(wszCfgGuidString, wszNewName);
+                            //NonStandardLogFlow(("VBoxNetCfgWinRenameConnection(%S,%S) => 0x%x\n", wszCfgGuidString, TempName, hr_tmp));
+                        }
+                        else
+                            NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: Failed to get friendly name for device \"%ls\"\n",
+                                                wszCfgGuidString));
                     }
                     else
-                    {
-                        NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: Failed to get friendly name for device \"%S\"\n",
-                                            wszCfgGuidString));
-                    }
+                        NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: Friendly name for \"%S\" isn't a string: %d\n",
+                                            wszCfgGuidString, dwValueType
                 }
                 else
-                {
-                    NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: Querying instance ID failed with %d\n",
-                                        ret));
-                }
+                    NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: Querying instance ID failed with %u (%#x)\n",
+                                        lrc, lrc));
 
                 RegCloseKey(hKey);
@@ -623 +618 @@
             if (SetupDiCallClassInstaller(DIF_REMOVE, hDevInfo, pDev))
             {
-                SP_DEVINSTALL_PARAMS devParams;
-                memset(&devParams, 0, sizeof(SP_DEVINSTALL_PARAMS));
-                devParams.cbSize = sizeof(devParams);
-
-                if (SetupDiGetDeviceInstallParams(hDevInfo, pDev, &devParams))
-                {
-                    if (   (devParams.Flags & DI_NEEDRESTART)
-                        || (devParams.Flags & DI_NEEDREBOOT))
-                    {
+                SP_DEVINSTALL_PARAMS_W DevParams = { sizeof(DevParams) };
+                if (SetupDiGetDeviceInstallParams(hDevInfo, pDev, &DevParams))
+                {
+                    if (   (DevParams.Flags & DI_NEEDRESTART)
+                        || (DevParams.Flags & DI_NEEDREBOOT))
                         NonStandardLog(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: A reboot is required\n"));
-                    }
                 }
                 else
-                    NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiGetDeviceInstallParams failed with %ld\n",
+                    NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiGetDeviceInstallParams failed with %u\n",
                                         GetLastError()));
             }
             else
-                NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiCallClassInstaller failed with %ld\n",
+                NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiCallClassInstaller failed with %u\n",
                                     GetLastError()));
         }
         else
-            NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiSetSelectedDevice failed with %ld\n",
+            NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiSetSelectedDevice failed with %u\n",
                                 GetLastError()));
     }
     else
-        NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiSetClassInstallParams failed with %ld\n",
+        NonStandardLogFlow(("vboxNetCfgWinRemoveAllNetDevicesOfIdCallback: SetupDiSetClassInstallParams failed with %u\n",
                             GetLastError()));
 
@@ -657 +647 @@
 typedef struct VBOXNECTFGWINPROPCHANGE
 {
-    VBOXNECTFGWINPROPCHANGE_TYPE enmPcType;
+    VBOXNECTFGWINPROPCHANGE_TYPE_T enmPcType;
     HRESULT hr;
-} VBOXNECTFGWINPROPCHANGE ,*PVBOXNECTFGWINPROPCHANGE;
+} VBOXNECTFGWINPROPCHANGE, *PVBOXNECTFGWINPROPCHANGE;
 
 static BOOL vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pContext)
@@ -666 +656 @@
 
     SP_PROPCHANGE_PARAMS PcParams;
-    memset (&PcParams, 0, sizeof (PcParams));
+    RT_ZERO(PcParams);
     PcParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
     PcParams.ClassInstallHeader.InstallFunction = DIF_PROPERTYCHANGE;
     PcParams.Scope = DICS_FLAG_GLOBAL;
 
-    switch(pPc->enmPcType)
+    switch (pPc->enmPcType)
     {
         case VBOXNECTFGWINPROPCHANGE_TYPE_DISABLE:
@@ -687 +677 @@
     }
 
-    if (SetupDiSetClassInstallParams(hDevInfo, pDev, &PcParams.ClassInstallHeader, sizeof(PcParams)))
+    if (SetupDiSetClassInstallParamsW(hDevInfo, pDev, &PcParams.ClassInstallHeader, sizeof(PcParams)))
     {
         if (SetupDiSetSelectedDevice(hDevInfo, pDev))
@@ -693 +683 @@
             if (SetupDiCallClassInstaller(DIF_PROPERTYCHANGE, hDevInfo, pDev))
             {
-                SP_DEVINSTALL_PARAMS devParams;
-                devParams.cbSize = sizeof(devParams);
-                if (SetupDiGetDeviceInstallParams(hDevInfo,pDev,&devParams))
-                {
-                    if (   (devParams.Flags & DI_NEEDRESTART)
-                        || (devParams.Flags & DI_NEEDREBOOT))
-                    {
+                SP_DEVINSTALL_PARAMS_W DevParams = { sizeof(DevParams) };
+                if (SetupDiGetDeviceInstallParamsW(hDevInfo, pDev, &DevParams))
+                {
+                    if (   (DevParams.Flags & DI_NEEDRESTART)
+                        || (DevParams.Flags & DI_NEEDREBOOT))
                         NonStandardLog(("vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback: A reboot is required\n"));
-                    }
                 }
                 else
-                    NonStandardLogFlow(("vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback: SetupDiGetDeviceInstallParams failed with %ld\n",
+                    NonStandardLogFlow(("vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback: SetupDiGetDeviceInstallParams failed with %u\n",
                                         GetLastError()));
             }
             else
-                NonStandardLogFlow(("vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback: SetupDiCallClassInstaller failed with %ld\n",
+                NonStandardLogFlow(("vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback: SetupDiCallClassInstaller failed with %u\n",
                                     GetLastError()));
         }
         else
-            NonStandardLogFlow(("SetupDiSetSelectedDevice failed with %ld\n", GetLastError()));
+            NonStandardLogFlow(("SetupDiSetSelectedDevice failed with %u\n", GetLastError()));
     }
     else
-        NonStandardLogFlow(("SetupDiSetClassInstallParams failed with %ld\n", GetLastError()));
+        NonStandardLogFlow(("SetupDiSetClassInstallParams failed with %u\n", GetLastError()));
 
     /* Continue enumeration. */
@@ -722 +709 @@
 
 typedef BOOL (*PFNVBOXNETCFGWINNETENUMCALLBACK)(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pContext);
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnumNetDevices(LPCWSTR pwszPnPId,
-                                                        PFNVBOXNETCFGWINNETENUMCALLBACK pfnCallback, PVOID pvContext)
-{
-    NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Searching for: %S\n", pwszPnPId));
+
+static HRESULT vboxNetCfgWinEnumNetDevices(LPCWSTR pwszPnPId, PFNVBOXNETCFGWINNETENUMCALLBACK pfnCallback, PVOID pvContext)
+{
+    NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Searching for: %ls\n", pwszPnPId));
 
     HRESULT hr;
@@ -737 +724 @@
     if (hDevInfo != INVALID_HANDLE_VALUE)
     {
-        DWORD winEr = NO_ERROR;
-
-        DWORD dwDevId = 0;
-        size_t cPnPId = wcslen(pwszPnPId);
-
-        PBYTE pBuffer = NULL;
-
+        size_t const cwcPnPId = RTUtf16Len(pwszPnPId);
+        DWORD        winEr    = NO_ERROR;
+        DWORD        dwDevId  = 0;
+        DWORD        cbBuffer = 0;
+        PBYTE        pbBuffer = NULL;
         for (;;)
         {
@@ -754 +739 @@
                 winEr = GetLastError();
                 if (winEr == ERROR_NO_MORE_ITEMS)
-                    winEr = ERROR_SUCCESS;
+                    winEr = NO_ERROR;
                 break;
             }
 
-            NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Enumerating device %ld ... \n", dwDevId));
+            NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Enumerating device %u ... \n", dwDevId));
             dwDevId++;
 
-            if (pBuffer)
-                free(pBuffer);
-            pBuffer = NULL;
-            DWORD cbBuffer = 0;
             DWORD cbRequired = 0;
-
+            SetLastError(0);
             if (!SetupDiGetDeviceRegistryPropertyW(hDevInfo, &Dev,
                                                    SPDRP_HARDWAREID, /* IN DWORD Property */
                                                    NULL,             /* OUT PDWORD PropertyRegDataType OPTIONAL */
-                                                   pBuffer,          /* OUT PBYTE PropertyBuffer */
+                                                   pbBuffer,         /* OUT PBYTE PropertyBuffer */
                                                    cbBuffer,         /* IN DWORD PropertyBufferSize */
                                                    &cbRequired       /* OUT PDWORD RequiredSize OPTIONAL */))
@@ -777 +758 @@
                 if (winEr != ERROR_INSUFFICIENT_BUFFER)
                 {
-                    NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: SetupDiGetDeviceRegistryPropertyW (1) failed with %ld\n", winEr));
+                    if (winEr == ERROR_INVALID_DATA)
+                    {
+                        NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: SetupDiGetDeviceRegistryPropertyW (1) failed with ERROR_INVALID_DATA - ignoring, skipping to next device\n"));
+                        continue;
+                    }
+                    NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: SetupDiGetDeviceRegistryPropertyW (1) failed with %u\n", winEr));
                     break;
                 }
-
-                pBuffer = (PBYTE)malloc(cbRequired);
-                if (!pBuffer)
-                {
-                    NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Out of memory allocating %ld bytes\n",
-                                        cbRequired));
+                winEr = NO_ERROR;
+
+                cbBuffer = RT_ALIGN_32(cbRequired, 64);
+                void *pvNew = RTMemRealloc(pbBuffer, cbBuffer);
+                if (pvNew)
+                    pbBuffer = (PBYTE)pvNew;
+                else
+                {
+                    NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Out of memory allocating %u bytes\n", cbBuffer));
                     winEr = ERROR_OUTOFMEMORY;
                     break;
                 }
 
-                cbBuffer = cbRequired;
-
-                if (!SetupDiGetDeviceRegistryPropertyW(hDevInfo,&Dev,
+                if (!SetupDiGetDeviceRegistryPropertyW(hDevInfo, &Dev,
                                                        SPDRP_HARDWAREID, /* IN DWORD Property */
                                                        NULL,             /* OUT PDWORD PropertyRegDataType, OPTIONAL */
-                                                       pBuffer,          /* OUT PBYTE PropertyBuffer */
+                                                       pbBuffer,         /* OUT PBYTE PropertyBuffer */
                                                        cbBuffer,         /* IN DWORD PropertyBufferSize */
                                                        &cbRequired       /* OUT PDWORD RequiredSize OPTIONAL */))
                 {
                     winEr = GetLastError();
-                    NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: SetupDiGetDeviceRegistryPropertyW (2) failed with %ld\n",
+                    NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: SetupDiGetDeviceRegistryPropertyW (2) failed with %u\n",
                                         winEr));
                     break;
@@ -806 +793 @@
             }
 
-            PWSTR pCurId = (PWSTR)pBuffer;
-            size_t cCurId = wcslen(pCurId);
-
-            NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Device %ld: %S\n", dwDevId, pCurId));
-
-            if (cCurId >= cPnPId)
-            {
-                NonStandardLogFlow(("!wcsnicmp(pCurId = (%S), pwszPnPId = (%S), cPnPId = (%d))\n", pCurId, pwszPnPId, cPnPId));
-
-                pCurId += cCurId - cPnPId;
-                if (!wcsnicmp(pCurId, pwszPnPId, cPnPId))
+            PWSTR  pwszCurId = (PWSTR)pbBuffer;
+            size_t cwcCurId  = RTUtf16Len(pwszCurId);
+
+            NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Device %u: %ls\n", dwDevId, pwszCurId));
+
+            if (cwcCurId >= cwcPnPId)
+            {
+                NonStandardLogFlow(("!RTUtf16NICmp(pwszCurId = (%ls), pwszPnPId = (%ls), cwcPnPId = (%d))\n", pwszCurId, pwszPnPId, cwcPnPId));
+
+                pwszCurId += cwcCurId - cwcPnPId;
+                if (!RTUtf16NICmp(pwszCurId, pwszPnPId, cwcPnPId))
                 {
                     if (!pfnCallback(hDevInfo, &Dev, pvContext))
@@ -824 +811 @@
         }
 
-        NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Found %ld devices total\n", dwDevId));
-
-        if (pBuffer)
-            free(pBuffer);
+        NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: Found %u devices total\n", dwDevId));
+
+        if (pbBuffer)
+            RTMemFree(pbBuffer);
 
         hr = HRESULT_FROM_WIN32(winEr);
@@ -836 +823 @@
     {
         DWORD winEr = GetLastError();
-        NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: SetupDiGetClassDevsExW failed with %ld\n", winEr));
+        NonStandardLogFlow(("VBoxNetCfgWinEnumNetDevices: SetupDiGetClassDevsExW failed with %u\n", winEr));
         hr = HRESULT_FROM_WIN32(winEr);
     }
@@ -844 +831 @@
 }
 
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRemoveAllNetDevicesOfId(IN LPCWSTR lpszPnPId)
-{
-    return VBoxNetCfgWinEnumNetDevices(lpszPnPId, vboxNetCfgWinRemoveAllNetDevicesOfIdCallback, NULL);
-}
-
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinPropChangeAllNetDevicesOfId(IN LPCWSTR lpszPnPId, VBOXNECTFGWINPROPCHANGE_TYPE enmPcType)
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRemoveAllNetDevicesOfId(IN LPCWSTR pwszPnPId)
+{
+    return vboxNetCfgWinEnumNetDevices(pwszPnPId, vboxNetCfgWinRemoveAllNetDevicesOfIdCallback, NULL);
+}
+
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinPropChangeAllNetDevicesOfId(IN LPCWSTR pwszPnPId, VBOXNECTFGWINPROPCHANGE_TYPE_T enmPcType)
 {
     VBOXNECTFGWINPROPCHANGE Pc;
     Pc.enmPcType = enmPcType;
     Pc.hr = S_OK;
-    NonStandardLogFlow(("Calling VBoxNetCfgWinEnumNetDevices with lpszPnPId =(%S) and vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback\n", lpszPnPId));
-
-    HRESULT hr = VBoxNetCfgWinEnumNetDevices(lpszPnPId, vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback, &Pc);
+    NonStandardLogFlow(("Calling VBoxNetCfgWinEnumNetDevices with pwszPnPId (= %ls) and vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback\n", pwszPnPId));
+
+    HRESULT hr = vboxNetCfgWinEnumNetDevices(pwszPnPId, vboxNetCfgWinPropChangeAllNetDevicesOfIdCallback, &Pc);
     if (!SUCCEEDED(hr))
     {
@@ -872 +859 @@
 }
 
-/*
- * logging
- */
+
+
+/*********************************************************************************************************************************
+*   Logging                                                                                                                      *
+*********************************************************************************************************************************/
+
 static void DoLogging(const char *pszString, ...)
 {
@@ -880 +870 @@
     if (pfnLogger)
     {
-        char szBuffer[4096] = {0};
+        char szBuffer[4096];
         va_list va;
         va_start(va, pszString);
-        _vsnprintf(szBuffer, RT_ELEMENTS(szBuffer), pszString, va);
+        RTStrPrintfV(szBuffer, RT_ELEMENTS(szBuffer), pszString, va);
         va_end(va);
 
@@ -895 +885 @@
 }
 
-/*
- * IP configuration API
- */
+
+
+/*********************************************************************************************************************************
+*   IP configuration API                                                                                                         *
+*********************************************************************************************************************************/
 /* network settings config */
+#if 1 /** @todo r=bird: Can't we replace this with VBox/com/ptr.h? */
 /**
  *  Strong referencing operators. Used as a second argument to ComPtr<>/ComObjPtr<>.
  */
-template <class C>
+template<class C>
 class ComStrongRef
 {
 protected:
 
-    static void addref (C *p) { p->AddRef(); }
-    static void release (C *p) { p->Release(); }
+    static void addref(C *p)  { p->AddRef(); }
+    static void release(C *p) { p->Release(); }
 };
 
@@ -915 +908 @@
  *  Base template for smart COM pointers. Not intended to be used directly.
  */
-template <class C, template <class> class RefOps = ComStrongRef>
-class ComPtrBase : protected RefOps <C>
+template<class C, template<class> class RefOps = ComStrongRef>
+class ComPtrBase : protected RefOps<C>
 {
 public:
 
     /* special template to disable AddRef()/Release() */
-    template <class I>
+    template<class I>
     class NoAddRefRelease : public I
     {
@@ -938 +931 @@
 protected:
 
-    ComPtrBase () : p (NULL) {}
-    ComPtrBase (const ComPtrBase &that) : p (that.p) { addref(); }
-    ComPtrBase (C *that_p) : p (that_p) { addref(); }
+    ComPtrBase() : p(NULL) {}
+    ComPtrBase(const ComPtrBase &that) : p(that.p) { addref(); }
+    ComPtrBase(C *that_p) : p(that_p)              { addref(); }
 
     ~ComPtrBase() { release(); }
 
-    ComPtrBase &operator= (const ComPtrBase &that)
-    {
-        safe_assign (that.p);
+    ComPtrBase &operator=(const ComPtrBase &that)
+    {
+        safe_assign(that.p);
         return *this;
     }
 
-    ComPtrBase &operator= (C *that_p)
-    {
-        safe_assign (that_p);
+    ComPtrBase &operator=(C *that_p)
+    {
+        safe_assign(that_p);
         return *this;
     }
@@ -969 +962 @@
     }
 
-    bool operator! () const { return isNull(); }
-
-    bool operator< (C* that_p) const { return p < that_p; }
-    bool operator== (C* that_p) const { return p == that_p; }
-
-    template <class I>
-    bool equalsTo (I *aThat) const
-    {
-        return ComPtrEquals (p, aThat);
-    }
-
-    template <class OC>
-    bool equalsTo (const ComPtrBase <OC> &oc) const
-    {
-        return equalsTo ((OC *) oc);
+    bool operator!() const              { return isNull(); }
+
+    bool operator<(C* that_p) const     { return p < that_p; }
+    bool operator==(C* that_p) const    { return p == that_p; }
+
+    template<class I>
+    bool equalsTo(I *aThat) const
+    {
+        return ComPtrEquals(p, aThat);
+    }
+
+    template<class OC>
+    bool equalsTo(const ComPtrBase<OC> &oc) const
+    {
+        return equalsTo((OC *) oc);
     }
 
     /** Intended to pass instances as in parameters to interface methods */
-    operator C* () const { return p; }
+    operator C *() const { return p; }
 
     /**
@@ -993 +986 @@
      *  pointer).
      */
-    NoAddRefRelease <C> *operator-> () const
+    NoAddRefRelease<C> *operator->() const
     {
         AssertMsg (p, ("Managed pointer must not be null\n"));
@@ -999 +992 @@
     }
 
-    template <class I>
-    HRESULT queryInterfaceTo (I **pp) const
+    template<class I>
+    HRESULT queryInterfaceTo(I **pp) const
     {
         if (pp)
         {
             if (p)
-            {
-                return p->QueryInterface (COM_IIDOF (I), (void **) pp);
-            }
-            else
-            {
-                *pp = NULL;
-                return S_OK;
-            }
-        }
-
+                return p->QueryInterface(COM_IIDOF(I), (void **)pp);
+            *pp = NULL;
+            return S_OK;
+        }
         return E_INVALIDARG;
     }
@@ -1030 +1017 @@
     {
         if (p)
-            RefOps <C>::addref (p);
+            RefOps<C>::addref(p);
     }
 
@@ -1036 +1023 @@
     {
         if (p)
-            RefOps <C>::release (p);
-    }
-
-    void safe_assign (C *that_p)
+            RefOps<C>::release(p);
+    }
+
+    void safe_assign(C *that_p)
     {
         /* be aware of self-assignment */
         if (that_p)
-            RefOps <C>::addref (that_p);
+            RefOps<C>::addref(that_p);
         release();
         p = that_p;
@@ -1057 +1044 @@
  *  @param I    COM interface class
  */
-template <class I, template <class> class RefOps = ComStrongRef>
-class ComPtr : public ComPtrBase <I, RefOps>
-{
-    typedef ComPtrBase <I, RefOps> Base;
+template<class I, template<class> class RefOps = ComStrongRef>
+class ComPtr : public ComPtrBase<I, RefOps>
+{
+    typedef ComPtrBase<I, RefOps> Base;
 
 public:
 
-    ComPtr () : Base() {}
-    ComPtr (const ComPtr &that) : Base(that) {}
-    ComPtr &operator= (const ComPtr &that)
-    {
-        Base::operator= (that);
+    ComPtr() : Base() {}
+    ComPtr(const ComPtr &that) : Base(that) {}
+    ComPtr&operator= (const ComPtr &that)
+    {
+        Base::operator=(that);
         return *this;
     }
 
-    template <class OI>
-    ComPtr (OI *that_p) : Base () { operator= (that_p); }
+    template<class OI>
+    ComPtr(OI *that_p) : Base () { operator=(that_p); }
 
     /* specialization for I */
-    ComPtr (I *that_p) : Base (that_p) {}
+    ComPtr(I *that_p) : Base (that_p) {}
 
     template <class OC>
-    ComPtr (const ComPtr <OC, RefOps> &oc) : Base () { operator= ((OC *) oc); }
-
-    template <class OI>
-    ComPtr &operator= (OI *that_p)
+    ComPtr(const ComPtr<OC, RefOps> &oc) : Base() { operator=((OC *) oc); }
+
+    template<class OI>
+    ComPtr &operator=(OI *that_p)
     {
         if (that_p)
-            that_p->QueryInterface (COM_IIDOF (I), (void **) Base::asOutParam());
+            that_p->QueryInterface(COM_IIDOF(I), (void **)Base::asOutParam());
         else
             Base::setNull();
@@ -1094 +1081 @@
     ComPtr &operator=(I *that_p)
     {
-        Base::operator= (that_p);
+        Base::operator=(that_p);
         return *this;
     }
 
-    template <class OC>
-    ComPtr &operator= (const ComPtr <OC, RefOps> &oc)
-    {
-        return operator= ((OC *) oc);
+    template<class OC>
+    ComPtr &operator=(const ComPtr<OC, RefOps> &oc)
+    {
+        return operator=((OC *) oc);
     }
 };
-
-static HRESULT netIfWinFindAdapterClassById(IWbemServices * pSvc, const GUID * pGuid, IWbemClassObject **pAdapterConfig)
+#endif
+
+static HRESULT netIfWinFindAdapterClassById(IWbemServices *pSvc, const GUID *pGuid, IWbemClassObject **pAdapterConfig)
 {
     HRESULT hr;
-    WCHAR wszQuery[256];
+
     WCHAR wszGuid[50];
-
-    int length = StringFromGUID2(*pGuid, wszGuid, RT_ELEMENTS(wszGuid));
-    if (length)
-    {
-        swprintf(wszQuery, L"SELECT * FROM Win32_NetworkAdapterConfiguration WHERE SettingID = \"%s\"", wszGuid);
+    int cwcGuid = StringFromGUID2(*pGuid, wszGuid, RT_ELEMENTS(wszGuid));
+    if (cwcGuid)
+    {
+        com::BstrFmt bstrQuery("SELECT * FROM Win32_NetworkAdapterConfiguration WHERE SettingID = \"%ls\"", wszGuid);
         IEnumWbemClassObject* pEnumerator = NULL;
-        hr = pSvc->ExecQuery(bstr_t("WQL"), bstr_t(wszQuery), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
+        hr = pSvc->ExecQuery(com::Bstr("WQL").raw(), bstrQuery.raw(), WBEM_FLAG_FORWARD_ONLY | WBEM_FLAG_RETURN_IMMEDIATELY,
                              NULL, &pEnumerator);
         if (SUCCEEDED(hr))
@@ -1122 +1109 @@
             if (pEnumerator)
             {
-                IWbemClassObject *pclsObj;
+                IWbemClassObject *pclsObj = NULL;
                 ULONG uReturn = 0;
                 hr = pEnumerator->Next(WBEM_INFINITE, 1, &pclsObj, &uReturn);
@@ -1136 +1123 @@
                         return S_OK;
                     }
-
                     hr = E_FAIL;
                 }
-
                 pEnumerator->Release();
             }
@@ -1154 +1139 @@
     {
         DWORD winEr = GetLastError();
-        hr = HRESULT_FROM_WIN32( winEr );
+        hr = HRESULT_FROM_WIN32(winEr);
         if (SUCCEEDED(hr))
             hr = E_FAIL;
@@ -1164 +1149 @@
 }
 
-static HRESULT netIfWinIsHostOnly(IWbemClassObject * pAdapterConfig, BOOL * pbIsHostOnly)
+static HRESULT netIfWinIsHostOnly(IWbemClassObject *pAdapterConfig, BOOL *pfIsHostOnly)
 {
     VARIANT vtServiceName;
@@ -1172 +1157 @@
     if (SUCCEEDED(hr))
     {
-        *pbIsHostOnly = bstr_t(vtServiceName.bstrVal) == bstr_t("VBoxNetAdp");
+        *pfIsHostOnly = RTUtf16CmpAscii(vtServiceName.bstrVal, "VBoxNetAdp") == 0;
 
         VariantClear(&vtServiceName);
@@ -1182 +1167 @@
 static HRESULT netIfWinGetIpSettings(IWbemClassObject * pAdapterConfig, ULONG *pIpv4, ULONG *pMaskv4)
 {
+    *pIpv4   = 0;
+    *pMaskv4 = 0;
+
     VARIANT vtIp;
-    HRESULT hr;
     VariantInit(&vtIp);
-
-    *pIpv4 = 0;
-    *pMaskv4 = 0;
-
-    hr = pAdapterConfig->Get(L"IPAddress", 0, &vtIp, 0, 0);
+    HRESULT hr = pAdapterConfig->Get(L"IPAddress", 0, &vtIp, 0, 0);
     if (SUCCEEDED(hr))
     {
@@ -1201 +1184 @@
                 if (vtMask.vt == (VT_ARRAY | VT_BSTR))
                 {
-                    SAFEARRAY * pIpArray = vtIp.parray;
-                    SAFEARRAY * pMaskArray = vtMask.parray;
+                    SAFEARRAY *pIpArray   = vtIp.parray;
+                    SAFEARRAY *pMaskArray = vtMask.parray;
                     if (pIpArray && pMaskArray)
                     {
-                        BSTR pCurIp;
-                        BSTR pCurMask;
+                        BSTR pBstrCurIp;
+                        BSTR pBstrCurMask;
                         for (LONG i = 0;
-                            SafeArrayGetElement(pIpArray, &i, (PVOID)&pCurIp) == S_OK
-                            && SafeArrayGetElement(pMaskArray, &i, (PVOID)&pCurMask) == S_OK;
-                            i++)
+                                SafeArrayGetElement(pIpArray,  &i,  (PVOID)&pBstrCurIp)   == S_OK
+                             && SafeArrayGetElement(pMaskArray, &i, (PVOID)&pBstrCurMask) == S_OK;
+                             i++)
                         {
-                            bstr_t ip(pCurIp);
-
-                            ULONG Ipv4 = inet_addr((char*)(ip));
+                            com::Utf8Str strIp(pBstrCurIp);
+                            ULONG Ipv4 = inet_addr(strIp.c_str());
                             if (Ipv4 != INADDR_NONE)
                             {
                                 *pIpv4 = Ipv4;
-                                bstr_t mask(pCurMask);
-                                *pMaskv4 = inet_addr((char*)(mask));
+
+                                com::Utf8Str strMask(pBstrCurMask);
+                                *pMaskv4 = inet_addr(strMask.c_str());
                                 break;
                             }
@@ -1225 +1208 @@
                     }
                 }
-                else
-                {
-                    *pIpv4 = 0;
-                    *pMaskv4 = 0;
-                }
-
                 VariantClear(&vtMask);
             }
         }
-        else
-        {
-            *pIpv4 = 0;
-            *pMaskv4 = 0;
-        }
-
         VariantClear(&vtIp);
     }
@@ -1308 +1279 @@
     ULONG i;
     *pFound = false;
-    ComPtr <IWbemClassObject> pAdapterConfig;
+    ComPtr<IWbemClassObject> pAdapterConfig;
     for (i = 0;
             (hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam())) == S_OK
@@ -1324 +1295 @@
 #endif /* unused */
 
-static HRESULT netIfWinCreateIWbemServices(IWbemServices ** ppSvc)
+static HRESULT netIfWinCreateIWbemServices(IWbemServices **ppSvc)
 {
     IWbemLocator *pLoc = NULL;
-    HRESULT hr = CoCreateInstance(CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID *) &pLoc);
+    HRESULT hr = CoCreateInstance(CLSID_WbemLocator, 0, CLSCTX_INPROC_SERVER, IID_IWbemLocator, (LPVOID *)&pLoc);
     if (SUCCEEDED(hr))
     {
         IWbemServices *pSvc = NULL;
-        hr = pLoc->ConnectServer(bstr_t(L"ROOT\\CIMV2"), /* [in] const BSTR strNetworkResource */
-                NULL, /* [in] const BSTR strUser */
-                NULL, /* [in] const BSTR strPassword */
-                0,    /* [in] const BSTR strLocale */
-                NULL, /* [in] LONG lSecurityFlags */
-                0,    /* [in] const BSTR strAuthority */
-                0,    /* [in] IWbemContext* pCtx */
-                &pSvc /* [out] IWbemServices** ppNamespace */);
+        hr = pLoc->ConnectServer(com::Bstr(L"ROOT\\CIMV2").raw(), /* [in] const BSTR strNetworkResource */
+                                 NULL, /* [in] const BSTR strUser */
+                                 NULL, /* [in] const BSTR strPassword */
+                                 0,    /* [in] const BSTR strLocale */
+                                 NULL, /* [in] LONG lSecurityFlags */
+                                 0,    /* [in] const BSTR strAuthority */
+                                 0,    /* [in] IWbemContext* pCtx */
+                                 &pSvc /* [out] IWbemServices** ppNamespace */);
         if (SUCCEEDED(hr))
         {
             hr = CoSetProxyBlanket(pSvc, /* IUnknown * pProxy */
-                    RPC_C_AUTHN_WINNT, /* DWORD dwAuthnSvc */
-                    RPC_C_AUTHZ_NONE, /* DWORD dwAuthzSvc */
-                    NULL, /* WCHAR * pServerPrincName */
-                    RPC_C_AUTHN_LEVEL_CALL, /* DWORD dwAuthnLevel */
-                    RPC_C_IMP_LEVEL_IMPERSONATE, /* DWORD dwImpLevel */
-                    NULL, /* RPC_AUTH_IDENTITY_HANDLE pAuthInfo */
-                    EOAC_NONE /* DWORD dwCapabilities */
-                    );
+                                   RPC_C_AUTHN_WINNT, /* DWORD dwAuthnSvc */
+                                   RPC_C_AUTHZ_NONE, /* DWORD dwAuthzSvc */
+                                   NULL, /* WCHAR * pServerPrincName */
+                                   RPC_C_AUTHN_LEVEL_CALL, /* DWORD dwAuthnLevel */
+                                   RPC_C_IMP_LEVEL_IMPERSONATE, /* DWORD dwImpLevel */
+                                   NULL, /* RPC_AUTH_IDENTITY_HANDLE pAuthInfo */
+                                   EOAC_NONE /* DWORD dwCapabilities */
+                                   );
             if (SUCCEEDED(hr))
             {
@@ -1357 +1328 @@
                 return hr;
             }
-            else
-                NonStandardLogFlow(("CoSetProxyBlanket failed, hr (0x%x)\n", hr));
-
+
+            NonStandardLogFlow(("CoSetProxyBlanket failed: %Rhrc\n", hr));
             pSvc->Release();
         }
         else
-            NonStandardLogFlow(("ConnectServer failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("ConnectServer failed: %Rhrc\n", hr));
         pLoc->Release();
     }
     else
-        NonStandardLogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr));
-    return hr;
-}
-
-static HRESULT netIfWinAdapterConfigPath(IWbemClassObject *pObj, BSTR * pStr)
+        NonStandardLogFlow(("CoCreateInstance failed: %Rhrc\n", hr));
+    return hr;
+}
+
+static HRESULT netIfWinAdapterConfigPath(IWbemClassObject *pObj, com::Bstr *pRet)
 {
     VARIANT index;
+    VariantInit(&index);
     HRESULT hr = pObj->Get(L"Index", 0, &index, 0, 0);
     if (SUCCEEDED(hr))
-    {
-        WCHAR strIndex[8];
-        swprintf(strIndex, L"%u", index.uintVal);
-        *pStr = (bstr_t(L"Win32_NetworkAdapterConfiguration.Index='") + strIndex + "'").copy();
-    }
+        hr = pRet->printfNoThrow("Win32_NetworkAdapterConfiguration.Index='%u'", index.uintVal);
     else
-        NonStandardLogFlow(("Get failed, hr (0x%x)\n", hr));
-    return hr;
-}
-
-static HRESULT netIfExecMethod(IWbemServices * pSvc, IWbemClassObject *pClass, BSTR ObjPath,
-        BSTR MethodName, LPWSTR *pArgNames, LPVARIANT *pArgs, UINT cArgs,
-        IWbemClassObject** ppOutParams
-        )
-{
-    HRESULT hr = S_OK;
-    ComPtr<IWbemClassObject> pInParamsDefinition;
-    ComPtr<IWbemClassObject> pClassInstance;
-
-    if (cArgs)
-    {
-        hr = pClass->GetMethod(MethodName, 0, pInParamsDefinition.asOutParam(), NULL);
+    {
+        pRet->setNull();
+        NonStandardLogFlow(("Get failed: %Rhrc\n", hr));
+    }
+    return hr;
+}
+
+static HRESULT netIfExecMethod(IWbemServices * pSvc, IWbemClassObject *pClass, com::Bstr const &rObjPath,
+                               const char *pszMethodName, LPWSTR *papwszArgNames, LPVARIANT *pArgs, UINT cArgs,
+                               IWbemClassObject **ppOutParams)
+{
+    *ppOutParams = NULL;
+    com::Bstr bstrMethodName;
+    HRESULT hr = bstrMethodName.assignEx(pszMethodName);
+    if (SUCCEEDED(hr))
+    {
+        ComPtr<IWbemClassObject> pInParamsDefinition;
+        ComPtr<IWbemClassObject> pClassInstance;
+        if (cArgs)
+        {
+            hr = pClass->GetMethod(bstrMethodName.raw(), 0, pInParamsDefinition.asOutParam(), NULL);
+            if (SUCCEEDED(hr))
+            {
+                hr = pInParamsDefinition->SpawnInstance(0, pClassInstance.asOutParam());
+                if (SUCCEEDED(hr))
+                {
+                    for (UINT i = 0; i < cArgs; i++)
+                    {
+                        hr = pClassInstance->Put(papwszArgNames[i], 0, pArgs[i], 0);
+                        if (FAILED(hr))
+                            break;
+                    }
+                }
+            }
+        }
+
         if (SUCCEEDED(hr))
         {
-            hr = pInParamsDefinition->SpawnInstance(0, pClassInstance.asOutParam());
+            IWbemClassObject *pOutParams = NULL;
+            hr = pSvc->ExecMethod(rObjPath.raw(), bstrMethodName.raw(), 0, NULL, pClassInstance, &pOutParams, NULL);
             if (SUCCEEDED(hr))
-            {
-                for (UINT i = 0; i < cArgs; i++)
-                {
-                    hr = pClassInstance->Put(pArgNames[i], 0,
-                        pArgs[i], 0);
-                    if (FAILED(hr))
-                        break;
-                }
-            }
-        }
-    }
-
-    if (SUCCEEDED(hr))
-    {
-        IWbemClassObject* pOutParams = NULL;
-        hr = pSvc->ExecMethod(ObjPath, MethodName, 0, NULL, pClassInstance, &pOutParams, NULL);
+                *ppOutParams = pOutParams;
+        }
+    }
+
+    return hr;
+}
+
+static HRESULT netIfWinCreateIpArray(SAFEARRAY **ppArray, in_addr const *paIps, UINT cIps)
+{
+    HRESULT    hr = S_OK;
+    SAFEARRAY *pIpArray = SafeArrayCreateVector(VT_BSTR, 0, cIps);
+    if (pIpArray)
+    {
+        for (UINT i = 0; i < cIps; i++)
+        {
+            com::Bstr bstrVal;
+            hr = bstrVal.printfNoThrow("%RTnaipv4", paIps[i].s_addr);
+            if (SUCCEEDED(hr))
+            {
+                Assert(bstrVal.equals(inet_ntoa(paIps[i])));
+
+                BSTR pRawVal;
+                hr = bstrVal.detachToEx(&pRawVal);
+                if (SUCCEEDED(hr))
+                {
+                    LONG aIndex[1] = { (LONG)i };
+                    hr = SafeArrayPutElement(pIpArray, aIndex, pRawVal);
+                    if (SUCCEEDED(hr))
+                        continue;
+                    SysFreeString(pRawVal);
+                }
+            }
+            break;
+        }
+
         if (SUCCEEDED(hr))
-        {
-            *ppOutParams = pOutParams;
-        }
-    }
-
-    return hr;
-}
-
-static HRESULT netIfWinCreateIpArray(SAFEARRAY **ppArray, in_addr* aIp, UINT cIp)
-{
-    HRESULT hr = S_OK; /* MSC maybe used uninitialized */
-    SAFEARRAY * pIpArray = SafeArrayCreateVector(VT_BSTR, 0, cIp);
-    if (pIpArray)
-    {
-        for (UINT i = 0; i < cIp; i++)
-        {
-            char* addr = inet_ntoa(aIp[i]);
-            BSTR val = bstr_t(addr).copy();
-            long aIndex[1];
-            aIndex[0] = i;
-            hr = SafeArrayPutElement(pIpArray, aIndex, val);
-            if (FAILED(hr))
-            {
-                SysFreeString(val);
-                SafeArrayDestroy(pIpArray);
-                break;
-            }
-        }
-
-        if (SUCCEEDED(hr))
-        {
             *ppArray = pIpArray;
-        }
+        else
+            SafeArrayDestroy(pIpArray);
     }
     else
         hr = HRESULT_FROM_WIN32(GetLastError());
-
     return hr;
 }
@@ -1466 +1442 @@
     if (pIpArray)
     {
-        BSTR val = bstr_t(Ip, false).copy();
+        BSTR val = com::Bstr(Ip, false).copy();
         long aIndex[1];
         aIndex[0] = 0;
@@ -1489 +1465 @@
 
 
-static HRESULT netIfWinCreateIpArrayVariantV4(VARIANT * pIpAddresses, in_addr* aIp, UINT cIp)
-{
-    HRESULT hr;
+static HRESULT netIfWinCreateIpArrayVariantV4(VARIANT *pIpAddresses, in_addr const *paIps, UINT cIps)
+{
     VariantInit(pIpAddresses);
     pIpAddresses->vt = VT_ARRAY | VT_BSTR;
+
     SAFEARRAY *pIpArray;
-    hr = netIfWinCreateIpArray(&pIpArray, aIp, cIp);
+    HRESULT hr = netIfWinCreateIpArray(&pIpArray, paIps, cIps);
     if (SUCCEEDED(hr))
-    {
         pIpAddresses->parray = pIpArray;
-    }
     return hr;
 }
@@ -1519 +1493 @@
 #endif
 
-static HRESULT netIfWinEnableStatic(IWbemServices *pSvc, const GUID *pGuid, BSTR ObjPath, VARIANT *pIp, VARIANT *pMask)
+static HRESULT netIfWinEnableStatic(IWbemServices *pSvc, const GUID *pGuid, com::Bstr &rObjPath, VARIANT *pIp, VARIANT *pMask)
+{
+    com::Bstr bstrClassName;
+    HRESULT hr = bstrClassName.assignEx("Win32_NetworkAdapterConfiguration");
+    if (SUCCEEDED(hr))
+    {
+        ComPtr<IWbemClassObject> pClass;
+        hr = pSvc->GetObject(bstrClassName.raw(), 0, NULL, pClass.asOutParam(), NULL);
+        if (SUCCEEDED(hr))
+        {
+            LPWSTR argNames[] = {L"IPAddress", L"SubnetMask"};
+            LPVARIANT  args[] = {         pIp,        pMask };
+
+            ComPtr<IWbemClassObject> pOutParams;
+            hr = netIfExecMethod(pSvc, pClass, rObjPath.raw(), "EnableStatic", argNames, args,
+                                 2, pOutParams.asOutParam());
+            if (SUCCEEDED(hr))
+            {
+                com::Bstr bstrReturnValue;
+                hr = bstrReturnValue.assignEx("ReturnValue");
+                if (SUCCEEDED(hr))
+                {
+                    VARIANT varReturnValue;
+                    VariantInit(&varReturnValue);
+                    hr = pOutParams->Get(bstrReturnValue.raw(), 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;
+                                //bool bFound;
+                                //HRESULT tmpHr = netIfWinWaitIpSettings(pSvc, pGuid, pIp->parray, pMask->parray, 180, &bFound);
+                                NOREF(pGuid);
+                                break;
+                            }
+                            default:
+                                hr = HRESULT_FROM_WIN32( winEr );
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return hr;
+}
+
+
+static HRESULT netIfWinEnableStaticV4(IWbemServices *pSvc, const GUID *pGuid, com::Bstr &rObjPath,
+                                      in_addr const *paIps, in_addr const *paMasks, UINT cIpAndMasks)
+{
+    VARIANT ipAddresses;
+    HRESULT hr = netIfWinCreateIpArrayVariantV4(&ipAddresses, paIps, cIpAndMasks);
+    if (SUCCEEDED(hr))
+    {
+        VARIANT ipMasks;
+        hr = netIfWinCreateIpArrayVariantV4(&ipMasks, paMasks, cIpAndMasks);
+        if (SUCCEEDED(hr))
+        {
+            hr = netIfWinEnableStatic(pSvc, pGuid, rObjPath, &ipAddresses, &ipMasks);
+            VariantClear(&ipMasks);
+        }
+        VariantClear(&ipAddresses);
+    }
+    return hr;
+}
+
+#if 0 /* unused */
+
+static HRESULT netIfWinEnableStaticV4V6(IWbemServices * pSvc, const GUID * pGuid, BSTR ObjPath, BSTR Ip, BSTR Mask)
+{
+    VARIANT ipAddresses;
+    HRESULT hr = netIfWinCreateIpArrayVariantV4V6(&ipAddresses, Ip);
+    if (SUCCEEDED(hr))
+    {
+        VARIANT ipMasks;
+        hr = netIfWinCreateIpArrayVariantV4V6(&ipMasks, Mask);
+        if (SUCCEEDED(hr))
+        {
+            hr = netIfWinEnableStatic(pSvc, pGuid, ObjPath, &ipAddresses, &ipMasks);
+            VariantClear(&ipMasks);
+        }
+        VariantClear(&ipAddresses);
+    }
+    return hr;
+}
+
+/* win API allows to set gw metrics as well, we are not setting them */
+static HRESULT netIfWinSetGateways(IWbemServices * pSvc, BSTR ObjPath, VARIANT * pGw)
 {
     ComPtr<IWbemClassObject> pClass;
@@ -1529 +1596 @@
         if (SUCCEEDED(hr))
         {
-            LPWSTR argNames[] = {L"IPAddress", L"SubnetMask"};
-            LPVARIANT args[] = {pIp, pMask};
-            ComPtr<IWbemClassObject> pOutParams;
-
-            hr = netIfExecMethod(pSvc, pClass, ObjPath, bstr_t(L"EnableStatic"), argNames, args, 2, pOutParams.asOutParam());
-            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;
-//                            bool bFound;
-//                            HRESULT tmpHr = netIfWinWaitIpSettings(pSvc, pGuid, pIp->parray, pMask->parray, 180, &bFound);
-                            NOREF(pGuid);
-                            break;
-                        }
-                        default:
-                            hr = HRESULT_FROM_WIN32( winEr );
-                            break;
-                    }
-                }
-            }
-        }
-        SysFreeString(ClassName);
-    }
-    else
-        hr = HRESULT_FROM_WIN32(GetLastError());
-
-    return hr;
-}
-
-
-static HRESULT netIfWinEnableStaticV4(IWbemServices * pSvc, const GUID * pGuid, BSTR ObjPath, in_addr* aIp, in_addr * aMask, UINT cIp)
-{
-    VARIANT ipAddresses;
-    HRESULT hr = netIfWinCreateIpArrayVariantV4(&ipAddresses, aIp, cIp);
-    if (SUCCEEDED(hr))
-    {
-        VARIANT ipMasks;
-        hr = netIfWinCreateIpArrayVariantV4(&ipMasks, aMask, cIp);
-        if (SUCCEEDED(hr))
-        {
-            hr = netIfWinEnableStatic(pSvc, pGuid, ObjPath, &ipAddresses, &ipMasks);
-            VariantClear(&ipMasks);
-        }
-        VariantClear(&ipAddresses);
-    }
-    return hr;
-}
-
-#if 0 /* unused */
-
-static HRESULT netIfWinEnableStaticV4V6(IWbemServices * pSvc, const GUID * pGuid, BSTR ObjPath, BSTR Ip, BSTR Mask)
-{
-    VARIANT ipAddresses;
-    HRESULT hr = netIfWinCreateIpArrayVariantV4V6(&ipAddresses, Ip);
-    if (SUCCEEDED(hr))
-    {
-        VARIANT ipMasks;
-        hr = netIfWinCreateIpArrayVariantV4V6(&ipMasks, Mask);
-        if (SUCCEEDED(hr))
-        {
-            hr = netIfWinEnableStatic(pSvc, pGuid, ObjPath, &ipAddresses, &ipMasks);
-            VariantClear(&ipMasks);
-        }
-        VariantClear(&ipAddresses);
-    }
-    return hr;
-}
-
-/* win API allows to set gw metrics as well, we are not setting them */
-static HRESULT netIfWinSetGateways(IWbemServices * pSvc, BSTR ObjPath, VARIANT * pGw)
-{
-    ComPtr<IWbemClassObject> pClass;
-    BSTR ClassName = SysAllocString(L"Win32_NetworkAdapterConfiguration");
-    HRESULT hr;
-    if (ClassName)
-    {
-        hr = pSvc->GetObject(ClassName, 0, NULL, pClass.asOutParam(), NULL);
-        if (SUCCEEDED(hr))
-        {
             LPWSTR argNames[] = {L"DefaultIPGateway"};
             LPVARIANT args[] = {pGw};
             ComPtr<IWbemClassObject> pOutParams;
 
-            hr = netIfExecMethod(pSvc, pClass, ObjPath, bstr_t(L"SetGateways"), argNames, args, 1, pOutParams.asOutParam());
+            hr = netIfExecMethod(pSvc, pClass, ObjPath, com::Bstr(L"SetGateways"), argNames, args, 1, pOutParams.asOutParam());
             if (SUCCEEDED(hr))
             {
                 VARIANT varReturnValue;
-                hr = pOutParams->Get(bstr_t(L"ReturnValue"), 0, &varReturnValue, NULL, 0);
+                hr = pOutParams->Get(com::Bstr(L"ReturnValue"), 0, &varReturnValue, NULL, 0);
                 Assert(SUCCEEDED(hr));
                 if (SUCCEEDED(hr))
@@ -1681 +1658 @@
 #endif /* unused */
 
-static HRESULT netIfWinEnableDHCP(IWbemServices * pSvc, BSTR ObjPath)
-{
-    ComPtr<IWbemClassObject> pClass;
-    BSTR ClassName = SysAllocString(L"Win32_NetworkAdapterConfiguration");
-    HRESULT hr;
-    if (ClassName)
-    {
-        hr = pSvc->GetObject(ClassName, 0, NULL, pClass.asOutParam(), NULL);
+static HRESULT netIfWinEnableDHCP(IWbemServices * pSvc, const com::Bstr &rObjPath)
+{
+    com::Bstr bstrClassName;
+    HRESULT hr = bstrClassName.assignEx("Win32_NetworkAdapterConfiguration");
+    if (SUCCEEDED(hr))
+    {
+        ComPtr<IWbemClassObject> pClass;
+        hr = pSvc->GetObject(bstrClassName.raw(), 0, NULL, pClass.asOutParam(), NULL);
         if (SUCCEEDED(hr))
         {
             ComPtr<IWbemClassObject> pOutParams;
-
-            hr = netIfExecMethod(pSvc, pClass, ObjPath, bstr_t(L"EnableDHCP"), NULL, NULL, 0, pOutParams.asOutParam());
+            hr = netIfExecMethod(pSvc, pClass, rObjPath, "EnableDHCP", NULL, NULL, 0, pOutParams.asOutParam());
             if (SUCCEEDED(hr))
             {
-                VARIANT varReturnValue;
-                hr = pOutParams->Get(bstr_t(L"ReturnValue"), 0,
-                    &varReturnValue, NULL, 0);
-                Assert(SUCCEEDED(hr));
+                com::Bstr bstrReturnValue;
+                hr = bstrReturnValue.assignEx("ReturnValue");
                 if (SUCCEEDED(hr))
                 {
-//                    Assert(varReturnValue.vt == VT_UINT);
-                    int winEr = varReturnValue.uintVal;
-                    switch (winEr)
+                    VARIANT varReturnValue;
+                    VariantInit(&varReturnValue);
+                    hr = pOutParams->Get(bstrReturnValue.raw(), 0, &varReturnValue, NULL, 0);
+                    Assert(SUCCEEDED(hr));
+                    if (SUCCEEDED(hr))
                     {
-                    case 0:
-                        hr = S_OK;
-                        break;
-                    default:
-                        hr = HRESULT_FROM_WIN32( winEr );
-                        break;
+                        //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);
-    }
-    else
-        hr = HRESULT_FROM_WIN32(GetLastError());
-
-    return hr;
-}
-
-static HRESULT netIfWinDhcpRediscover(IWbemServices * pSvc, BSTR ObjPath)
-{
-    ComPtr<IWbemClassObject> pClass;
-    BSTR ClassName = SysAllocString(L"Win32_NetworkAdapterConfiguration");
-    HRESULT hr;
-    if (ClassName)
-    {
-        hr = pSvc->GetObject(ClassName, 0, NULL, pClass.asOutParam(), NULL);
+    }
+    return hr;
+}
+
+static HRESULT netIfWinDhcpRediscover(IWbemServices * pSvc, const com::Bstr &rObjPath)
+{
+    com::Bstr bstrClassName;
+    HRESULT hr = bstrClassName.assignEx("Win32_NetworkAdapterConfiguration");
+    if (SUCCEEDED(hr))
+    {
+        ComPtr<IWbemClassObject> pClass;
+        hr = pSvc->GetObject(bstrClassName.raw(), 0, NULL, pClass.asOutParam(), NULL);
         if (SUCCEEDED(hr))
         {
             ComPtr<IWbemClassObject> pOutParams;
-
-            hr = netIfExecMethod(pSvc, pClass, ObjPath, bstr_t(L"ReleaseDHCPLease"), NULL, NULL, 0, pOutParams.asOutParam());
+            hr = netIfExecMethod(pSvc, pClass, rObjPath, "ReleaseDHCPLease", NULL, NULL, 0, pOutParams.asOutParam());
             if (SUCCEEDED(hr))
             {
-                VARIANT varReturnValue;
-                hr = pOutParams->Get(bstr_t(L"ReturnValue"), 0, &varReturnValue, NULL, 0);
-                Assert(SUCCEEDED(hr));
+                com::Bstr bstrReturnValue;
+                hr = bstrReturnValue.assignEx("ReturnValue");
                 if (SUCCEEDED(hr))
                 {
-//                    Assert(varReturnValue.vt == VT_UINT);
-                    int winEr = varReturnValue.uintVal;
-                    if (winEr == 0)
+                    VARIANT varReturnValue;
+                    VariantInit(&varReturnValue);
+                    hr = pOutParams->Get(bstrReturnValue.raw(), 0, &varReturnValue, NULL, 0);
+                    Assert(SUCCEEDED(hr));
+                    if (SUCCEEDED(hr))
                     {
-                        hr = netIfExecMethod(pSvc, pClass, ObjPath, bstr_t(L"RenewDHCPLease"), NULL, NULL, 0, pOutParams.asOutParam());
-                        if (SUCCEEDED(hr))
+                        //Assert(varReturnValue.vt == VT_UINT);
+                        int winEr = varReturnValue.uintVal;
+                        if (winEr == 0)
                         {
-                            hr = pOutParams->Get(bstr_t(L"ReturnValue"), 0, &varReturnValue, NULL, 0);
-                            Assert(SUCCEEDED(hr));
+                            hr = netIfExecMethod(pSvc, pClass, rObjPath, "RenewDHCPLease", NULL, NULL, 0, pOutParams.asOutParam());
                             if (SUCCEEDED(hr))
                             {
-            //                    Assert(varReturnValue.vt == VT_UINT);
-                                winEr = varReturnValue.uintVal;
-                                if (winEr == 0)
-                                    hr = S_OK;
-                                else
-                                    hr = HRESULT_FROM_WIN32( winEr );
+                                hr = pOutParams->Get(bstrReturnValue.raw(), 0, &varReturnValue, NULL, 0);
+                                Assert(SUCCEEDED(hr));
+                                if (SUCCEEDED(hr))
+                                {
+                                    //Assert(varReturnValue.vt == VT_UINT);
+                                    winEr = varReturnValue.uintVal;
+                                    if (winEr == 0)
+                                        hr = S_OK;
+                                    else
+                                        hr = HRESULT_FROM_WIN32( winEr );
+                                }
                             }
                         }
+                        else
+                            hr = HRESULT_FROM_WIN32( winEr );
                     }
-                    else
-                        hr = HRESULT_FROM_WIN32( winEr );
-                }
-            }
-        }
-        SysFreeString(ClassName);
-    }
-    else
-        hr = HRESULT_FROM_WIN32(GetLastError());
-
-    return hr;
-}
-
-static HRESULT vboxNetCfgWinIsDhcpEnabled(IWbemClassObject * pAdapterConfig, BOOL *pEnabled)
+                }
+            }
+        }
+    }
+
+    return hr;
+}
+
+static HRESULT vboxNetCfgWinIsDhcpEnabled(IWbemClassObject *pAdapterConfig, BOOL *pfEnabled)
 {
     VARIANT vtEnabled;
+    VariantInit(&vtEnabled);
     HRESULT hr = pAdapterConfig->Get(L"DHCPEnabled", 0, &vtEnabled, 0, 0);
     if (SUCCEEDED(hr))
-        *pEnabled = vtEnabled.boolVal;
-    return hr;
-}
-
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGetAdapterSettings(IN const GUID * pGuid, OUT PADAPTER_SETTINGS pSettings)
-{
-    HRESULT hr;
-    ComPtr <IWbemServices> pSvc;
-    hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
+        *pfEnabled = vtEnabled.boolVal;
+    else
+        *pfEnabled = FALSE;
+    return hr;
+}
+
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGetAdapterSettings(IN const GUID *pGuid, OUT PADAPTER_SETTINGS pSettings)
+{
+    ComPtr<IWbemServices> pSvc;
+    HRESULT hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
     if (SUCCEEDED(hr))
     {
@@ -1808 +1789 @@
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinIsDhcpEnabled(const GUID * pGuid, BOOL *pEnabled)
 {
-    HRESULT hr;
-    ComPtr <IWbemServices> pSvc;
-    hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
+    ComPtr<IWbemServices> pSvc;
+    HRESULT hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
     if (SUCCEEDED(hr))
     {
@@ -1838 +1818 @@
         if (SUCCEEDED(hr))
         {
-            BOOL bIsHostOnly;
-            hr = netIfWinIsHostOnly(pAdapterConfig, &bIsHostOnly);
+            BOOL fIsHostOnly;
+            hr = netIfWinIsHostOnly(pAdapterConfig, &fIsHostOnly);
             if (SUCCEEDED(hr))
             {
-                if (bIsHostOnly)
+                if (fIsHostOnly)
                 {
                     in_addr aIp[1];
                     in_addr aMask[1];
-                    aIp[0].S_un.S_addr = ip;
+                    aIp[0].S_un.S_addr   = ip;
                     aMask[0].S_un.S_addr = mask;
 
-                    BSTR ObjPath;
-                    hr = netIfWinAdapterConfigPath(pAdapterConfig, &ObjPath);
+                    com::Bstr bstrObjPath;
+                    hr = netIfWinAdapterConfigPath(pAdapterConfig, &bstrObjPath);
                     if (SUCCEEDED(hr))
                     {
-                        hr = netIfWinEnableStaticV4(pSvc, pGuid, ObjPath, aIp, aMask, ip != 0 ? 1 : 0);
+                        hr = netIfWinEnableStaticV4(pSvc, pGuid, bstrObjPath, aIp, aMask, ip != 0 ? 1 : 0);
                         if (SUCCEEDED(hr))
                         {
@@ -1859 +1839 @@
                             in_addr aGw[1];
                             aGw[0].S_un.S_addr = gw;
-                            hr = netIfWinSetGatewaysV4(pSvc, ObjPath, aGw, 1);
+                            hr = netIfWinSetGatewaysV4(pSvc, bstrObjPath, aGw, 1);
                             if (SUCCEEDED(hr))
 #endif
@@ -1865 +1845 @@
                             }
                         }
-                        SysFreeString(ObjPath);
                     }
                 }
@@ -1876 +1855 @@
     }
 
-    NonStandardLogFlow(("VBoxNetCfgWinEnableStaticIpConfig: returns 0x%x\n", hr));
+    NonStandardLogFlow(("VBoxNetCfgWinEnableStaticIpConfig: returns %Rhrc\n", hr));
     return hr;
 }
@@ -1884 +1863 @@
 {
     HRESULT hr;
-        ComPtr <IWbemServices> pSvc;
+        ComPtr<IWbemServices> pSvc;
         hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
         if (SUCCEEDED(hr))
@@ -1931 +1910 @@
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinEnableDynamicIpConfig(IN const GUID *pGuid)
 {
-    HRESULT hr;
-        ComPtr <IWbemServices> pSvc;
-        hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
-        if (SUCCEEDED(hr))
-        {
-            ComPtr<IWbemClassObject> pAdapterConfig;
-            hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam());
-            if (SUCCEEDED(hr))
-            {
-                BOOL bIsHostOnly;
-                hr = netIfWinIsHostOnly(pAdapterConfig, &bIsHostOnly);
-                if (SUCCEEDED(hr))
-                {
-                    if (bIsHostOnly)
-                    {
-                        BSTR ObjPath;
-                        hr = netIfWinAdapterConfigPath(pAdapterConfig, &ObjPath);
-                        if (SUCCEEDED(hr))
-                        {
-                            hr = netIfWinEnableDHCP(pSvc, ObjPath);
-                            if (SUCCEEDED(hr))
-                            {
-//                              hr = netIfWinUpdateConfig(pIf);
-                            }
-                            SysFreeString(ObjPath);
-                        }
-                    }
-                    else
-                    {
-                        hr = E_FAIL;
-                    }
-                }
-            }
-        }
-
-
-    return hr;
-}
-
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinDhcpRediscover(IN const GUID *pGuid)
-{
-    HRESULT hr;
-    ComPtr <IWbemServices> pSvc;
-    hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
+    ComPtr<IWbemServices> pSvc;
+    HRESULT hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
     if (SUCCEEDED(hr))
     {
@@ -1981 +1918 @@
         if (SUCCEEDED(hr))
         {
-            BOOL bIsHostOnly;
-            hr = netIfWinIsHostOnly(pAdapterConfig, &bIsHostOnly);
+            BOOL fIsHostOnly;
+            hr = netIfWinIsHostOnly(pAdapterConfig, &fIsHostOnly);
             if (SUCCEEDED(hr))
             {
-                if (bIsHostOnly)
-                {
-                    BSTR ObjPath;
-                    hr = netIfWinAdapterConfigPath(pAdapterConfig, &ObjPath);
+                if (fIsHostOnly)
+                {
+                    com::Bstr bstrObjPath;
+                    hr = netIfWinAdapterConfigPath(pAdapterConfig, &bstrObjPath);
                     if (SUCCEEDED(hr))
                     {
-                        hr = netIfWinDhcpRediscover(pSvc, ObjPath);
+                        hr = netIfWinEnableDHCP(pSvc, bstrObjPath);
                         if (SUCCEEDED(hr))
                         {
                             //hr = netIfWinUpdateConfig(pIf);
                         }
-                        SysFreeString(ObjPath);
                     }
                 }
                 else
-                {
                     hr = E_FAIL;
-                }
-            }
-        }
-    }
-
-
-    return hr;
-}
-
-static const char *vboxNetCfgWinAddrToStr(char *pszBuf, LPSOCKADDR pAddr)
+            }
+        }
+    }
+    return hr;
+}
+
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinDhcpRediscover(IN const GUID *pGuid)
+{
+    ComPtr<IWbemServices> pSvc;
+    HRESULT hr = netIfWinCreateIWbemServices(pSvc.asOutParam());
+    if (SUCCEEDED(hr))
+    {
+        ComPtr<IWbemClassObject> pAdapterConfig;
+        hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam());
+        if (SUCCEEDED(hr))
+        {
+            BOOL fIsHostOnly;
+            hr = netIfWinIsHostOnly(pAdapterConfig, &fIsHostOnly);
+            if (SUCCEEDED(hr))
+            {
+                if (fIsHostOnly)
+                {
+                    com::Bstr bstrObjPath;
+                    hr = netIfWinAdapterConfigPath(pAdapterConfig, &bstrObjPath);
+                    if (SUCCEEDED(hr))
+                    {
+                        hr = netIfWinDhcpRediscover(pSvc, bstrObjPath);
+                        if (SUCCEEDED(hr))
+                        {
+                            //hr = netIfWinUpdateConfig(pIf);
+                        }
+                    }
+                }
+                else
+                    hr = E_FAIL;
+            }
+        }
+    }
+
+
+    return hr;
+}
+
+static const char *vboxNetCfgWinAddrToStr(char *pszBuf, size_t cbBuf, LPSOCKADDR pAddr)
 {
     switch (pAddr->sa_family)
     {
         case AF_INET:
-            sprintf(pszBuf, "%d.%d.%d.%d",
-                    ((PSOCKADDR_IN)pAddr)->sin_addr.S_un.S_un_b.s_b1,
-                    ((PSOCKADDR_IN)pAddr)->sin_addr.S_un.S_un_b.s_b2,
-                    ((PSOCKADDR_IN)pAddr)->sin_addr.S_un.S_un_b.s_b3,
-                    ((PSOCKADDR_IN)pAddr)->sin_addr.S_un.S_un_b.s_b4);
+            RTStrPrintf(pszBuf, cbBuf, "%d.%d.%d.%d",
+                        ((PSOCKADDR_IN)pAddr)->sin_addr.S_un.S_un_b.s_b1,
+                        ((PSOCKADDR_IN)pAddr)->sin_addr.S_un.S_un_b.s_b2,
+                        ((PSOCKADDR_IN)pAddr)->sin_addr.S_un.S_un_b.s_b3,
+                        ((PSOCKADDR_IN)pAddr)->sin_addr.S_un.S_un_b.s_b4);
             break;
         case AF_INET6:
-            sprintf(pszBuf, "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
-                 ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[0], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[1],
-                 ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[2], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[3],
-                 ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[4], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[5],
-                 ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[6], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[7],
-                 ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[8], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[9],
-                 ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[10], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[11],
-                 ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[12], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[13],
-                 ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[14], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[15]);
+            RTStrPrintf(pszBuf, cbBuf, "%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x",
+                        ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[0], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[1],
+                        ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[2], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[3],
+                        ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[4], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[5],
+                        ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[6], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[7],
+                        ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[8], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[9],
+                        ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[10], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[11],
+                        ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[12], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[13],
+                        ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[14], ((PSOCKADDR_IN6)pAddr)->sin6_addr.s6_addr[15]);
             break;
         default:
-            strcpy(pszBuf, "unknown");
+            RTStrCopy(pszBuf, cbBuf, "unknown");
             break;
     }
@@ -2047 +2016 @@
     for (pAdapter = pAddresses; pAdapter; pAdapter = pAdapter->Next)
     {
-        char szBuf[80];
-
         NonStandardLogFlow(("+- Enumerating adapter '%ls' %s\n", pAdapter->FriendlyName, pAdapter->AdapterName));
         for (PIP_ADAPTER_PREFIX pPrefix = pAdapter->FirstPrefix; pPrefix; pPrefix = pPrefix->Next)
         {
-            const char *pcszAddress = vboxNetCfgWinAddrToStr(szBuf, pPrefix->Address.lpSockaddr);
+            char szBuf[80];
+            const char *pcszAddress = vboxNetCfgWinAddrToStr(szBuf, sizeof(szBuf), pPrefix->Address.lpSockaddr);
+
             /* We are concerned with IPv4 only, ignore the rest. */
             if (pPrefix->Address.lpSockaddr->sa_family != AF_INET)
@@ -2059 +2028 @@
                 continue;
             }
+
             /* Ignore invalid prefixes as well as host addresses. */
             if (pPrefix->PrefixLength < 1 || pPrefix->PrefixLength > 31)
@@ -2065 +2035 @@
                 continue;
             }
+
             /* Ignore multicast and beyond. */
             ULONG ip = ((struct sockaddr_in *)pPrefix->Address.lpSockaddr)->sin_addr.s_addr;
@@ -2072 +2043 @@
                 continue;
             }
+
             ULONG mask = htonl((~(((ULONG)~0) >> pPrefix->PrefixLength)));
             bool fContinue = pfnCallback(ip, mask, pContext);
@@ -2079 +2051 @@
                 return;
             }
-            else
-                NonStandardLogFlow(("| +- %s %d: no conflict, moving on\n", pcszAddress, pPrefix->PrefixLength));
+
+            NonStandardLogFlow(("| +- %s %d: no conflict, moving on\n", pcszAddress, pPrefix->PrefixLength));
         }
     }
@@ -2088 +2060 @@
 {
     ULONG Prefix;
-    bool bConflict;
+    bool fConflict;
 }IPPROBE_CONTEXT, *PIPPROBE_CONTEXT;
 
-#define IPPROBE_INIT(_pContext, _addr) \
-    ((_pContext)->bConflict = false, \
-     (_pContext)->Prefix = _addr)
-
-#define IPPROBE_INIT_STR(_pContext, _straddr) \
-    IPROBE_INIT(_pContext, inet_addr(_straddr))
+#define IPPROBE_INIT(a_pContext, a_addr) \
+    do { (a_pContext)->fConflict = false; (a_pContext)->Prefix = (a_addr); } while (0)
+
+#define IPPROBE_INIT_STR(a_pContext, a_straddr) \
+    IPROBE_INIT(a_pContext, inet_addr(_straddr))
 
 static bool vboxNetCfgWinIpProbeCallback (ULONG ip, ULONG mask, PVOID pContext)
@@ -2104 +2075 @@
     if ((ip & mask) == (pProbe->Prefix & mask))
     {
-        pProbe->bConflict = true;
+        pProbe->fConflict = true;
         return false;
     }
@@ -2113 +2084 @@
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGenHostOnlyNetworkNetworkIp(OUT PULONG pNetIp, OUT PULONG pNetMask)
 {
-    DWORD dwRc;
     HRESULT hr = S_OK;
+
+    *pNetIp   = 0;
+    *pNetMask = 0;
+
     /*
      * MSDN recommends to pre-allocate a 15KB buffer.
      */
-    ULONG uBufLen = 15 * 1024;
-    PIP_ADAPTER_ADDRESSES pAddresses = (PIP_ADAPTER_ADDRESSES)malloc(uBufLen);
-    if (!pAddresses)
-        return HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
-    dwRc = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, pAddresses, &uBufLen);
+    ULONG                 cbBuf       = 15 * _1K;
+    PIP_ADAPTER_ADDRESSES paAddresses = (PIP_ADAPTER_ADDRESSES)RTMemAllocZ(cbBuf);
+    if (!paAddresses)
+        return E_OUTOFMEMORY;
+    DWORD dwRc = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, paAddresses, &cbBuf);
     if (dwRc == ERROR_BUFFER_OVERFLOW)
     {
         /* Impressive! More than 10 adapters! Get more memory and try again. */
-        free(pAddresses);
-        pAddresses = (PIP_ADAPTER_ADDRESSES)malloc(uBufLen);
-        if (!pAddresses)
-            return HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
-        dwRc = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, pAddresses, &uBufLen);
+        RTMemFree(paAddresses);
+        paAddresses = (PIP_ADAPTER_ADDRESSES)RTMemAllocZ(cbBuf);
+        if (!paAddresses)
+            return E_OUTOFMEMORY;
+        dwRc = GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_PREFIX, NULL, paAddresses, &cbBuf);
     }
     if (dwRc == NO_ERROR)
     {
-        IPPROBE_CONTEXT Context;
         const ULONG ip192168 = inet_addr("192.168.0.0");
-        srand(GetTickCount());
-
-        *pNetIp = 0;
-        *pNetMask = 0;
-
-        for (int i = 0; i < 255; i++)
-        {
-            ULONG ipProbe = rand()*255/RAND_MAX;
+        for (int i = 0; i < 384; i++)
+        {
+#if 0
+            ULONG ipProbe = rand()*255 / RAND_MAX;
+#else
+            uint32_t ipProbe = RTRandU32Ex(0, 255);
+#endif
             ipProbe = ip192168 | (ipProbe << 16);
-            unsigned char *a = (unsigned char *)&ipProbe;
-            NonStandardLogFlow(("probing %d.%d.%d.%d\n", a[0], a[1], a[2], a[3]));
+            NonStandardLogFlow(("probing %RTnaipv4\n", ipProbe));
+
+            IPPROBE_CONTEXT Context;
             IPPROBE_INIT(&Context, ipProbe);
-            vboxNetCfgWinEnumIpConfig(pAddresses, vboxNetCfgWinIpProbeCallback, &Context);
-            if (!Context.bConflict)
-            {
-                NonStandardLogFlow(("found unused net %d.%d.%d.%d\n", a[0], a[1], a[2], a[3]));
+            vboxNetCfgWinEnumIpConfig(paAddresses, vboxNetCfgWinIpProbeCallback, &Context);
+            if (!Context.fConflict)
+            {
+                NonStandardLogFlow(("found unused net %RTnaipv4\n", ipProbe));
                 *pNetIp = ipProbe;
                 *pNetMask = inet_addr("255.255.255.0");
@@ -2161 +2134 @@
     }
     else
-        NonStandardLogFlow(("GetAdaptersAddresses err (%d)\n", dwRc));
-
-    if (pAddresses)
-        free(pAddresses);
+        NonStandardLogFlow(("GetAdaptersAddresses err (%u)\n", dwRc));
+
+    RTMemFree(paAddresses);
 
     if (dwRc != NO_ERROR)
-    {
         hr = HRESULT_FROM_WIN32(dwRc);
-    }
-
     return hr;
 }
@@ -2189 +2158 @@
 
         hr = VBoxNetCfgWinUninstallComponent(pNc, pNcc);
-        NonStandardLogFlow(("NetFlt component uninstallation ended with hr (0x%x)\n", hr));
+        NonStandardLogFlow(("NetFlt component uninstallation ended with hr (%Rhrc)\n", hr));
 
         pNcc->Release();
     }
     else if (hr == S_FALSE)
-    {
         NonStandardLog("NetFlt is not installed currently\n");
-    }
     else
-    {
-        NonStandardLogFlow(("FindComponent failed, hr (0x%x)\n", hr));
-    }
+        NonStandardLogFlow(("FindComponent failed: %Rhrc\n", hr));
 
     VBoxDrvCfgInfUninstallAllF(L"NetService", VBOXNETCFGWIN_NETFLT_ID, InfRmFlags);
@@ -2213 +2178 @@
 }
 
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetFltInstall(IN INetCfg *pNc,
-                                                       IN LPCWSTR const *apInfFullPaths, IN UINT cInfFullPaths)
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetFltInstall(IN INetCfg *pNc, IN LPCWSTR const *pwszInfFullPath, IN UINT cInfFullPaths)
 {
     HRESULT hr = vboxNetCfgWinNetFltUninstall(pNc, SUOI_FORCEDELETE);
@@ -2222 +2186 @@
         hr = vboxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETFLT_ID,
                                                  &GUID_DEVCLASS_NETSERVICE,
-                                                 apInfFullPaths,
+                                                 pwszInfFullPath,
                                                  cInfFullPaths,
                                                  NULL);
@@ -2245 +2209 @@
 
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetAdpInstall(IN INetCfg *pNc,
-                                                       IN LPCWSTR const pInfFullPath)
+                                                       IN LPCWSTR const pwszInfFullPath)
 {
     NonStandardLog("NetAdp will be installed ...\n");
-    HRESULT hr = vboxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETADP_ID,
-                                             &GUID_DEVCLASS_NET,
-                                             &pInfFullPath,
-                                             1,
-                                             NULL);
-    return hr;
-}
-
-#define VBOXNETCFGWIN_NETLWF_ID    L"oracle_VBoxNetLwf"
+    HRESULT hr = vboxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETADP_ID_WSZ,
+                                                     &GUID_DEVCLASS_NET,
+                                                     &pwszInfFullPath,
+                                                     1,
+                                                     NULL);
+    return hr;
+}
+
 
 static HRESULT vboxNetCfgWinNetLwfUninstall(IN INetCfg *pNc, DWORD InfRmFlags)
@@ -2277 +2240 @@
     else
     {
-        NonStandardLogFlow(("FindComponent failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("FindComponent failed: %Rhrc\n", hr));
         hr = S_OK;
     }
@@ -2299 +2262 @@
      * See @bugref{7899}.
      */
-    HKEY hNetKey;
-    DWORD dwMaxNumFilters = 0;
-    DWORD cbMaxNumFilters = sizeof(dwMaxNumFilters);
-    LONG hr = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
-                           _T("SYSTEM\\CurrentControlSet\\Control\\Network"),
-                           0, KEY_QUERY_VALUE | KEY_SET_VALUE, &hNetKey);
-    if (SUCCEEDED(hr))
-    {
-        hr = RegQueryValueEx(hNetKey, _T("MaxNumFilters"), NULL, NULL,
-                             (LPBYTE)&dwMaxNumFilters, &cbMaxNumFilters);
-        if (SUCCEEDED(hr) && cbMaxNumFilters == sizeof(dwMaxNumFilters) && dwMaxNumFilters == 8)
+    /** @todo r=bird: This code was mixing HRESULT and LSTATUS, checking the return
+     * codes using SUCCEEDED(lrc) instead of lrc == ERROR_SUCCESS.  So, it might
+     * have misbehaved on bogus registry content, but worked fine on sane values. */
+    HKEY hKeyNet = NULL;
+    LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SYSTEM\\CurrentControlSet\\Control\\Network", 0,
+                                KEY_QUERY_VALUE | KEY_SET_VALUE, &hKeyNet);
+    if (lrc == ERROR_SUCCESS)
+    {
+        DWORD dwMaxNumFilters = 0;
+        DWORD cbMaxNumFilters = sizeof(dwMaxNumFilters);
+        lrc = RegQueryValueExW(hKeyNet, L"MaxNumFilters", NULL, NULL, (LPBYTE)&dwMaxNumFilters, &cbMaxNumFilters);
+        if (lrc == ERROR_SUCCESS && cbMaxNumFilters == sizeof(dwMaxNumFilters) && dwMaxNumFilters == 8)
         {
             dwMaxNumFilters = 14;
-            hr = RegSetValueEx(hNetKey, _T("MaxNumFilters"), 0, REG_DWORD,
-                             (LPBYTE)&dwMaxNumFilters, sizeof(dwMaxNumFilters));
-            if (SUCCEEDED(hr))
+            lrc = RegSetValueExW(hKeyNet, L"MaxNumFilters", 0, REG_DWORD, (LPBYTE)&dwMaxNumFilters, sizeof(dwMaxNumFilters));
+            if (lrc == ERROR_SUCCESS)
                 NonStandardLog("Adjusted the installed filter limit to 14...\n");
             else
-                NonStandardLog("Failed to set MaxNumFilters, error code 0x%x\n", hr);
-        }
-        RegCloseKey(hNetKey);
+                NonStandardLog("Failed to set MaxNumFilters, error code %d\n", lrc);
+        }
+        RegCloseKey(hKeyNet);
     }
     else
-    {
-        NonStandardLog("Failed to open network key, error code 0x%x\n", hr);
-    }
-
-}
-
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetLwfInstall(IN INetCfg *pNc,
-                                                       IN LPCWSTR const pInfFullPath)
+        NonStandardLog("Failed to open network key, error code %d\n", lrc);
+
+}
+
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetLwfInstall(IN INetCfg *pNc, IN LPCWSTR const pwszInfFullPath)
 {
     HRESULT hr = vboxNetCfgWinNetLwfUninstall(pNc, SUOI_FORCEDELETE);
@@ -2338 +2298 @@
         hr = vboxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETLWF_ID,
                                                  &GUID_DEVCLASS_NETSERVICE,
-                                                 &pInfFullPath,
+                                                 &pwszInfFullPath,
                                                  1,
                                                  NULL);
@@ -2345 +2305 @@
 }
 
-#define VBOX_CONNECTION_NAME L"VirtualBox Host-Only Network"
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGenHostonlyConnectionName(PCWSTR DevName, WCHAR *pBuf, PULONG pcbBuf)
-{
-    const WCHAR * pSuffix = wcsrchr( DevName, L'#' );
-    ULONG cbSize = sizeof(VBOX_CONNECTION_NAME);
-
-    if (pSuffix)
-    {
-        cbSize += (ULONG)wcslen(pSuffix) * 2;
-        cbSize += 2; /* for space */
-    }
-
-    if (*pcbBuf < cbSize)
-    {
-        *pcbBuf = cbSize;
-        return E_FAIL;
-    }
-
-    wcscpy(pBuf, VBOX_CONNECTION_NAME);
-    if (pSuffix)
-    {
-        wcscat(pBuf, L" ");
-        wcscat(pBuf, pSuffix);
-    }
-
-    return S_OK;
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGenHostonlyConnectionName(IN PCWSTR pwszDevName, OUT WCHAR *pwszBuf,
+                                                                   IN ULONG cwcBuf, OUT PULONG pcwcNeeded)
+{
+    /* Look for a suffix that we need to preserve. */
+    size_t const cwcDevName = RTUtf16Len(pwszDevName);
+    size_t       offSuffix  = cwcDevName;
+    while (offSuffix > 0 && pwszDevName[offSuffix - 1] != '#')
+        offSuffix--;
+    size_t const cwcSuffix  = pwszDevName[offSuffix] != '#' ? 0 : cwcDevName - offSuffix;
+
+    /* Calculate required buffer size: */
+    size_t cwcNeeded = sizeof(VBOX_CONNECTION_NAME_WSZ) / sizeof(wchar_t) /* includes terminator */
+                     + !!cwcSuffix /*space*/ + cwcSuffix;
+    if (pcwcNeeded)
+        *pcwcNeeded = (ULONG)cwcNeeded;
+
+    if (cwcNeeded <= cwcBuf)
+    {
+        memcpy(pwszBuf, VBOX_CONNECTION_NAME_WSZ, sizeof(VBOX_CONNECTION_NAME_WSZ));
+        if (cwcSuffix > 0)
+        {
+            size_t offDst = sizeof(VBOX_CONNECTION_NAME_WSZ) / sizeof(wchar_t) - 1;
+            pwszBuf[offDst++] = ' ';
+            memcpy(&pwszBuf[offDst], &pwszDevName[offSuffix], cwcSuffix * sizeof(wchar_t));
+            pwszBuf[offDst + cwcSuffix] = '\0';
+        }
+        return S_OK;
+    }
+    return E_FAIL;
 }
 
 static BOOL vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority(IN INetCfg *pNc, IN INetCfgComponent *pNcc, PVOID pContext)
 {
+    GUID * const pGuid = (GUID*)pContext;
     RT_NOREF1(pNc);
-    INetCfgComponentBindings *pNetCfgBindings;
-    GUID *pGuid = (GUID*)pContext;
 
     /* Get component's binding. */
-    HRESULT hr = pNcc->QueryInterface(IID_INetCfgComponentBindings, (PVOID*)&pNetCfgBindings);
+    INetCfgComponentBindings *pNetCfgBindings = NULL;
+    HRESULT hr = pNcc->QueryInterface(IID_INetCfgComponentBindings, (PVOID *)&pNetCfgBindings);
     if (SUCCEEDED(hr))
     {
         /* Get binding path enumerator reference. */
-        IEnumNetCfgBindingPath *pEnumNetCfgBindPath;
+        IEnumNetCfgBindingPath *pEnumNetCfgBindPath = NULL;
         hr = pNetCfgBindings->EnumBindingPaths(EBP_BELOW, &pEnumNetCfgBindPath);
         if (SUCCEEDED(hr))
         {
-            bool bFoundIface = false;
+            bool fFoundIface = false;
             hr = pEnumNetCfgBindPath->Reset();
             do
             {
-                INetCfgBindingPath *pNetCfgBindPath;
+                INetCfgBindingPath *pNetCfgBindPath = NULL;
                 hr = pEnumNetCfgBindPath->Next(1, &pNetCfgBindPath, NULL);
                 if (hr == S_OK)
@@ -2422 +2385 @@
                                             hr = pNetCfgBindings->MoveAfter(pNetCfgBindPath, NULL);
                                             if (FAILED(hr))
-                                                NonStandardLogFlow(("Unable to move interface, hr (0x%x)\n", hr));
-                                            bFoundIface = true;
+                                                NonStandardLogFlow(("Unable to move interface: %Rhrc\n", hr));
+                                            fFoundIface = true;
+
                                             /*
                                              * Enable binding paths for host-only adapters bound to bridged filter
@@ -2429 +2393 @@
                                              */
                                             HRESULT hr2;
-                                            LPWSTR pwszHwId = NULL;
+                                            LPWSTR  pwszHwId = NULL;
                                             if ((hr2 = pNcc->GetId(&pwszHwId)) != S_OK)
-                                                NonStandardLogFlow(("Failed to get HW ID, hr (0x%x)\n", hr2));
-                                            else if (_wcsnicmp(pwszHwId, VBOXNETCFGWIN_NETLWF_ID,
-                                                               sizeof(VBOXNETCFGWIN_NETLWF_ID)/2))
-                                                NonStandardLogFlow(("Ignoring component %ls\n", pwszHwId));
-                                            else if ((hr2 = pNetCfgBindPath->IsEnabled()) != S_FALSE)
-                                                NonStandardLogFlow(("Already enabled binding path, hr (0x%x)\n", hr2));
-                                            else if ((hr2 = pNetCfgBindPath->Enable(TRUE)) != S_OK)
-                                                NonStandardLogFlow(("Failed to enable binding path, hr (0x%x)\n", hr2));
+                                                NonStandardLogFlow(("Failed to get HW ID: %Rhrc\n", hr2));
                                             else
-                                                NonStandardLogFlow(("Enabled binding path\n"));
-                                            if (pwszHwId)
+                                            {
+                                                /** @todo r=bird: Original was:
+                                                 *    _wcsnicmp(pwszHwId, VBOXNETCFGWIN_NETLWF_ID, sizeof(VBOXNETCFGWIN_NETLWF_ID)/2)
+                                                 * which is the same as _wcsicmp. Not sure if this was accidental, but it's not the
+                                                 * only one in this code area (VBoxNetFltNobj.cpp had some too IIRC). */
+                                                if (RTUtf16ICmp(pwszHwId, VBOXNETCFGWIN_NETLWF_ID) != 0)
+                                                    NonStandardLogFlow(("Ignoring component %ls\n", pwszHwId));
+                                                else if ((hr2 = pNetCfgBindPath->IsEnabled()) != S_FALSE)
+                                                    NonStandardLogFlow(("Already enabled binding path: %Rhrc\n", hr2));
+                                                else if ((hr2 = pNetCfgBindPath->Enable(TRUE)) != S_OK)
+                                                    NonStandardLogFlow(("Failed to enable binding path: %Rhrc\n", hr2));
+                                                else
+                                                    NonStandardLogFlow(("Enabled binding path\n"));
                                                 CoTaskMemFree(pwszHwId);
+                                            }
                                         }
                                     }
@@ -2448 +2417 @@
                                 }
                                 else
-                                    NonStandardLogFlow(("GetLowerComponent failed, hr (0x%x)\n", hr));
+                                    NonStandardLogFlow(("GetLowerComponent failed: %Rhrc\n", hr));
                                 pNetCfgBindIfce->Release();
                             }
@@ -2456 +2425 @@
                                     hr = S_OK;
                                 else
-                                    NonStandardLogFlow(("Next binding interface failed, hr (0x%x)\n", hr));
+                                    NonStandardLogFlow(("Next binding interface failed: %Rhrc\n", hr));
                                 break;
                             }
-                        } while (!bFoundIface);
+                        } while (!fFoundIface);
                         pEnumNetCfgBindIface->Release();
                     }
                     else
-                        NonStandardLogFlow(("EnumBindingInterfaces failed, hr (0x%x)\n", hr));
+                        NonStandardLogFlow(("EnumBindingInterfaces failed: %Rhrc\n", hr));
                     pNetCfgBindPath->Release();
                 }
@@ -2471 +2440 @@
                         hr = S_OK;
                     else
-                        NonStandardLogFlow(("Next bind path failed, hr (0x%x)\n", hr));
+                        NonStandardLogFlow(("Next bind path failed: %Rhrc\n", hr));
                     break;
                 }
-            } while (!bFoundIface);
+            } while (!fFoundIface);
             pEnumNetCfgBindPath->Release();
         }
         else
-            NonStandardLogFlow(("EnumBindingPaths failed, hr (0x%x)\n", hr));
+            NonStandardLogFlow(("EnumBindingPaths failed: %Rhrc\n", hr));
         pNetCfgBindings->Release();
     }
     else
-        NonStandardLogFlow(("QueryInterface for IID_INetCfgComponentBindings failed, hr (0x%x)\n", hr));
+        NonStandardLogFlow(("QueryInterface for IID_INetCfgComponentBindings failed: %Rhrc\n", hr));
     return TRUE;
 }
 
-static UINT WINAPI vboxNetCfgWinPspFileCallback(
-        PVOID Context,
-        UINT Notification,
-        UINT_PTR Param1,
-        UINT_PTR Param2
-    )
+/** Callback for SetupDiSetDeviceInstallParams used  by
+ *  vboxNetCfgWinCreateHostOnlyNetworkInterface */
+static UINT WINAPI vboxNetCfgWinPspFileCallback(PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2)
 {
     switch (Notification)
@@ -2499 +2465 @@
             return TRUE;
     }
-    return SetupDefaultQueueCallback(Context, Notification, Param1, Param2);
-}
-
-/* The original source of the VBoxNetAdp adapter creation/destruction code has the following copyright */
+    return SetupDefaultQueueCallbackW(Context, Notification, Param1, Param2);
+}
+
+
+
+
+/* The original source of the VBoxNetAdp adapter creation/destruction code has the following copyright: */
 /*
    Copyright 2004 by the Massachusetts Institute of Technology
@@ -2530 +2499 @@
  *  Use the IShellFolder API to rename the connection.
  */
-static HRESULT rename_shellfolder (PCWSTR wGuid, PCWSTR wNewName)
-{
+static HRESULT rename_shellfolder(PCWSTR pwszGuid, PCWSTR pwszNewName)
+{
+    /* Build the display name in the form "::{GUID}". Do this first in case it overflows. */
+    WCHAR wszAdapterGuid[MAX_PATH + 2] = {0};
+    ssize_t cwc = RTUtf16Printf(wszAdapterGuid, RT_ELEMENTS(wszAdapterGuid), "::%ls", pwszGuid);
+    if (cwc < 0)
+        return E_INVALIDARG;
+
     /* This is the GUID for the network connections folder. It is constant.
      * {7007ACC7-3202-11D1-AAD2-00805FC1270E} */
@@ -2540 +2515 @@
     };
 
-    LPITEMIDLIST pidl = NULL;
+    /* Create an instance of the network connections folder. */
     IShellFolder *pShellFolder = NULL;
-    HRESULT hr;
-
-    /* Build the display name in the form "::{GUID}". */
-    if (wcslen(wGuid) >= MAX_PATH)
-        return E_INVALIDARG;
-    WCHAR szAdapterGuid[MAX_PATH + 2] = {0};
-    swprintf(szAdapterGuid, L"::%ls", wGuid);
-
-    /* Create an instance of the network connections folder. */
-    hr = CoCreateInstance(MY_CLSID_NetworkConnections, NULL,
-                          CLSCTX_INPROC_SERVER, IID_IShellFolder,
-                          reinterpret_cast<LPVOID *>(&pShellFolder));
-    /* Parse the display name. */
-    if (SUCCEEDED (hr))
-    {
-        hr = pShellFolder->ParseDisplayName (NULL, NULL, szAdapterGuid, NULL,
-                                             &pidl, NULL);
-    }
-    if (SUCCEEDED (hr))
-    {
-        hr = pShellFolder->SetNameOf (NULL, pidl, wNewName, SHGDN_NORMAL,
-                                      &pidl);
-    }
-
-    CoTaskMemFree (pidl);
-
-    if (pShellFolder)
+    HRESULT hr = CoCreateInstance(MY_CLSID_NetworkConnections, NULL, CLSCTX_INPROC_SERVER, IID_IShellFolder,
+                                  reinterpret_cast<LPVOID *>(&pShellFolder));
+    if (SUCCEEDED(hr))
+    {
+        /* Parse the display name. */
+        LPITEMIDLIST pidl = NULL;
+        hr = pShellFolder->ParseDisplayName(NULL, NULL, wszAdapterGuid, NULL, &pidl, NULL);
+        if (SUCCEEDED(hr))
+            hr = pShellFolder->SetNameOf(NULL, pidl, pwszNewName, SHGDN_NORMAL, &pidl);
+        CoTaskMemFree(pidl);
         pShellFolder->Release();
-
+    }
     return hr;
 }
@@ -2578 +2536 @@
  *
  * @returns Module handle or NULL
- * @param   pszName             The DLL name.
+ * @param   pwszName            The DLL name.
  */
-static HMODULE loadSystemDll(const char *pszName)
-{
-    char   szPath[MAX_PATH];
-    UINT   cchPath = GetSystemDirectoryA(szPath, sizeof(szPath));
-    size_t cbName  = strlen(pszName) + 1;
-    if (cchPath + 1 + cbName > sizeof(szPath))
+static HMODULE loadSystemDll(const wchar_t *pwszName)
+{
+    WCHAR  wszPath[MAX_PATH];
+    UINT   cwcPath = GetSystemDirectoryW(wszPath, RT_ELEMENTS(wszPath));
+    size_t cwcName = RTUtf16Len(pwszName) + 1;
+    if (cwcPath + 1 + cwcName > RT_ELEMENTS(wszPath))
         return NULL;
-    szPath[cchPath] = '\\';
-    memcpy(&szPath[cchPath + 1], pszName, cbName);
-    return LoadLibraryA(szPath);
-}
-
-static bool vboxNetCfgWinDetectStaleConnection(PCWSTR pName)
-{
-    HKEY hkeyConnection, hkeyAdapter, hkeyAdapters;
-    WCHAR wszAdaptersKeyName[] = L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}";
-    WCHAR wszAdapterSubKeyName[MAX_PATH];
-    LSTATUS status = RegOpenKeyEx(HKEY_LOCAL_MACHINE, wszAdaptersKeyName, 0, KEY_ALL_ACCESS, &hkeyAdapters);
-    if (status != ERROR_SUCCESS)
+
+    wszPath[cwcPath++] = '\\';
+    memcpy(&wszPath[cwcPath], pwszName, cwcName * sizeof(wszPath[0]));
+    return LoadLibraryW(wszPath);
+}
+
+static bool vboxNetCfgWinDetectStaleConnection(PCWSTR pwszName)
+{
+    HKEY    hKeyAdapters = NULL;
+    LSTATUS lrc = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                               L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}",
+                               0 /*ulOptions*/, KEY_ALL_ACCESS, &hKeyAdapters);
+    if (lrc != ERROR_SUCCESS)
         return false;
 
@@ -2604 +2563 @@
     for (DWORD i = 0; !fFailureImminent; ++i)
     {
-        DWORD cbName = MAX_PATH;
-        status = RegEnumKeyEx(hkeyAdapters, i, wszAdapterSubKeyName, &cbName, NULL, NULL, NULL, NULL);
-        // if (status == ERROR_NO_MORE_ITEMS)
-        //     break;
-        if (status != ERROR_SUCCESS)
+        WCHAR wszAdapterSubKeyName[MAX_PATH];
+        DWORD cwcAdapterSubKeyName = MAX_PATH;
+        lrc = RegEnumKeyEx(hKeyAdapters, i, wszAdapterSubKeyName, &cwcAdapterSubKeyName, NULL, NULL, NULL, NULL);
+        if (lrc != ERROR_SUCCESS)
             break;
 
-        status = RegOpenKeyEx(hkeyAdapters, wszAdapterSubKeyName, 0, KEY_ALL_ACCESS, &hkeyAdapter);
-        if (status == ERROR_SUCCESS)
-        {
-            status = RegOpenKeyEx(hkeyAdapter, L"Connection", 0, KEY_ALL_ACCESS, &hkeyConnection);
-            if (status == ERROR_SUCCESS)
-            {
-                WCHAR wszName[MAX_PATH];
-                cbName = MAX_PATH;
-                status = RegQueryValueEx(hkeyConnection, L"Name", NULL, NULL, (LPBYTE)wszName, &cbName);
-                if (status == ERROR_SUCCESS)
-                    if (wcsicmp(wszName, pName) == 0)
+        HKEY hKeyAdapter = NULL;
+        lrc = RegOpenKeyEx(hKeyAdapters, wszAdapterSubKeyName, 0, KEY_ALL_ACCESS, &hKeyAdapter);
+        if (lrc == ERROR_SUCCESS)
+        {
+            HKEY hKeyConnection = NULL;
+            lrc = RegOpenKeyEx(hKeyAdapter, L"Connection", 0, KEY_ALL_ACCESS, &hKeyConnection);
+            if (lrc == ERROR_SUCCESS)
+            {
+                WCHAR wszCurName[MAX_PATH + 1];
+                DWORD cbCurName = sizeof(wszCurName) - sizeof(WCHAR);
+                DWORD dwType    = REG_SZ;
+                lrc = RegQueryValueEx(hKeyConnection, L"Name", NULL, NULL, (LPBYTE)wszCurName, &cbCurName);
+                if (   lrc == ERROR_SUCCESS
+                    /** @todo r=bird: The original code didn't do any value type checks, thus allowing all SZ types. */
+                    && (dwType == REG_SZ || dwType == REG_EXPAND_SZ || dwType == REG_MULTI_SZ))
+                {
+                    wszCurName[MAX_PATH] = '\0'; /* returned values doesn't necessarily need to be terminated */
+
+                    if (RTUtf16ICmp(pwszName, pwszName) == 0)
                         fFailureImminent = true;
-                RegCloseKey(hkeyConnection);
-            }
-            RegCloseKey(hkeyAdapter);
-        }
-    }
-    RegCloseKey(hkeyAdapters);
+                }
+                RegCloseKey(hKeyConnection);
+            }
+            RegCloseKey(hKeyAdapter);
+        }
+    }
+    RegCloseKey(hKeyAdapters);
 
     return fFailureImminent;
 }
 
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRenameConnection (LPWSTR pGuid, PCWSTR NewName)
-{
-    typedef HRESULT (WINAPI *lpHrRenameConnection) (const GUID *, PCWSTR);
-    lpHrRenameConnection RenameConnectionFunc = NULL;
-    HRESULT status;
-
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRenameConnection(LPWSTR pwszGuid, PCWSTR NewName)
+{
     /*
      * Before attempting to rename the connection, check if there is a stale
@@ -2646 +2609 @@
     if (vboxNetCfgWinDetectStaleConnection(NewName))
         return S_OK;
+
     /* First try the IShellFolder interface, which was unimplemented
      * for the network connections folder before XP. */
-    status = rename_shellfolder (pGuid, NewName);
-    if (status == E_NOTIMPL)
+    HRESULT hrc = rename_shellfolder(pwszGuid, NewName);
+    if (hrc == E_NOTIMPL)
     {
 /** @todo that code doesn't seem to work! */
@@ -2655 +2619 @@
          * Try the (undocumented) HrRenameConnection API in the netshell
          * library. */
-        CLSID clsid;
-        HINSTANCE hNetShell;
-        status = CLSIDFromString ((LPOLESTR) pGuid, &clsid);
-        if (FAILED(status))
+        CLSID     clsid;
+        hrc = CLSIDFromString((LPOLESTR)pwszGuid, &clsid);
+        if (FAILED(hrc))
             return E_FAIL;
-        hNetShell = loadSystemDll("netshell.dll");
+
+        HINSTANCE hNetShell = loadSystemDll(L"netshell.dll");
         if (hNetShell == NULL)
             return E_FAIL;
-        RenameConnectionFunc =
-          (lpHrRenameConnection) GetProcAddress (hNetShell,
-                                                 "HrRenameConnection");
-        if (RenameConnectionFunc == NULL)
-        {
-            FreeLibrary (hNetShell);
-            return E_FAIL;
-        }
-        status = RenameConnectionFunc (&clsid, NewName);
-        FreeLibrary (hNetShell);
-    }
-    if (FAILED (status))
-        return status;
-
+
+        typedef HRESULT (WINAPI *PFNHRRENAMECONNECTION)(const GUID *, PCWSTR);
+        PFNHRRENAMECONNECTION pfnRenameConnection = (PFNHRRENAMECONNECTION)GetProcAddress(hNetShell, "HrRenameConnection");
+        if (pfnRenameConnection != NULL)
+            hrc = pfnRenameConnection(&clsid, NewName);
+        else
+            hrc = E_FAIL;
+
+        FreeLibrary(hNetShell);
+    }
+    if (FAILED(hrc))
+        return hrc;
     return S_OK;
 }
 
-#define DRIVERHWID _T("sun_VBoxNetAdp")
-
-#define SetErrBreak(strAndArgs) \
-    if (1) { \
-        hrc = E_FAIL; \
-        NonStandardLog strAndArgs; \
-        bstrError = bstr_printf strAndArgs; \
-        break; \
-    } else do {} while (0)
-
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRemoveHostOnlyNetworkInterface(IN const GUID *pGUID, OUT BSTR *pErrMsg)
+
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRemoveHostOnlyNetworkInterface(IN const GUID *pGUID, OUT BSTR *pBstrErrMsg)
 {
     HRESULT hrc = S_OK;
-    bstr_t bstrError;
-
-    do
-    {
-        TCHAR lszPnPInstanceId [512] = {0};
-
-        /* We have to find the device instance ID through a registry search */
-
-        HKEY hkeyNetwork = 0;
-        HKEY hkeyConnection = 0;
-
-        do
-        {
-            WCHAR strRegLocation [256];
+    com::Bstr bstrError;
+
+    do /* break non-loop */
+    {
+        WCHAR wszPnPInstanceId[512] = {0};
+
+        /*
+         * We have to find the device instance ID through a registry search
+         */
+        HKEY hkeyNetwork    = NULL;
+        HKEY hkeyConnection = NULL;
+        do /* another non-loop for breaking out of */
+        {
             WCHAR wszGuid[50];
-
-            int length = StringFromGUID2(*pGUID, wszGuid, RT_ELEMENTS(wszGuid));
-            if (!length)
+            int cwcGuid = StringFromGUID2(*pGUID, wszGuid, RT_ELEMENTS(wszGuid));
+            if (!cwcGuid)
                 SetErrBreak(("Failed to create a Guid string"));
 
-            swprintf (strRegLocation,
-                     L"SYSTEM\\CurrentControlSet\\Control\\Network\\"
-                     L"{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s",
-                     wszGuid);
-
-            LONG status;
-            status = RegOpenKeyExW (HKEY_LOCAL_MACHINE, strRegLocation, 0,
-                                    KEY_READ, &hkeyNetwork);
-            if ((status != ERROR_SUCCESS) || !hkeyNetwork)
-                SetErrBreak (("Host interface network is not found in registry (%S) [1]",
-                    strRegLocation));
-
-            status = RegOpenKeyExW (hkeyNetwork, L"Connection", 0,
-                                    KEY_READ, &hkeyConnection);
-            if ((status != ERROR_SUCCESS) || !hkeyConnection)
-                SetErrBreak (("Host interface network is not found in registry (%S) [2]",
-                    strRegLocation));
-
-            DWORD len = sizeof (lszPnPInstanceId);
-            DWORD dwKeyType;
-            status = RegQueryValueExW (hkeyConnection, L"PnPInstanceID", NULL,
-                                       &dwKeyType, (LPBYTE) lszPnPInstanceId, &len);
-            if ((status != ERROR_SUCCESS) || (dwKeyType != REG_SZ))
-                SetErrBreak (("Host interface network is not found in registry (%S) [3]",
-                    strRegLocation));
-        }
-        while (0);
+            WCHAR wszRegLocation[128 + RT_ELEMENTS(wszGuid)];
+            RTUtf16Printf(wszRegLocation, RT_ELEMENTS(wszRegLocation),
+                          "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%ls", wszGuid);
+
+            LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegLocation, 0, KEY_READ, &hkeyNetwork);
+            if (lrc != ERROR_SUCCESS || !hkeyNetwork)
+                SetErrBreak(("Host interface network is not found in registry (%S): lrc=%u [1]", wszRegLocation, lrc));
+
+            lrc = RegOpenKeyExW(hkeyNetwork, L"Connection", 0, KEY_READ, &hkeyConnection);
+            if (lrc != ERROR_SUCCESS || !hkeyConnection)
+                SetErrBreak(("Host interface network is not found in registry (%S): lrc=%u [2]", wszRegLocation, lrc));
+
+            DWORD cbValue = sizeof(wszPnPInstanceId) - sizeof(WCHAR);
+            DWORD dwType  = ~0U;
+            lrc = RegQueryValueExW(hkeyConnection, L"PnPInstanceID", NULL, &dwType, (LPBYTE)wszPnPInstanceId, &cbValue);
+            if (lrc != ERROR_SUCCESS || dwType != REG_SZ)
+                SetErrBreak(("Host interface network is not found in registry (%S): lrc=%u, dwType=%u [3]",
+                             wszRegLocation, lrc, dwType));
+        } while (0);
 
         if (hkeyConnection)
-            RegCloseKey (hkeyConnection);
+            RegCloseKey(hkeyConnection);
         if (hkeyNetwork)
-            RegCloseKey (hkeyNetwork);
-
-        if (FAILED (hrc))
+            RegCloseKey(hkeyNetwork);
+        if (FAILED(hrc))
             break;
 
@@ -2753 +2695 @@
          * wait until we encounter the right device instance ID
          */
-
         HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE;
-
-        do
-        {
-            BOOL ok;
+        do /* break-only, not-a-loop */
+        {
+            BOOL  ok;
+
+            /* initialize the structure size */
+            SP_DEVINFO_DATA DeviceInfoData = { sizeof(DeviceInfoData) };
+
+            /* copy the net class GUID */
             GUID netGuid;
-            SP_DEVINFO_DATA DeviceInfoData;
-            DWORD index = 0;
-            BOOL found = FALSE;
-            DWORD size = 0;
-
-            /* initialize the structure size */
-            DeviceInfoData.cbSize = sizeof (SP_DEVINFO_DATA);
-
-            /* copy the net class GUID */
-            memcpy(&netGuid, &GUID_DEVCLASS_NET, sizeof (GUID_DEVCLASS_NET));
+            memcpy(&netGuid, &GUID_DEVCLASS_NET, sizeof(GUID_DEVCLASS_NET));
 
             /* return a device info set contains all installed devices of the Net class */
             hDeviceInfo = SetupDiGetClassDevs(&netGuid, NULL, NULL, DIGCF_PRESENT);
-
             if (hDeviceInfo == INVALID_HANDLE_VALUE)
                 SetErrBreak(("SetupDiGetClassDevs failed (0x%08X)", GetLastError()));
 
-            /* enumerate the driver info list */
-            while (TRUE)
-            {
-                TCHAR *deviceHwid;
-
-                ok = SetupDiEnumDeviceInfo(hDeviceInfo, index, &DeviceInfoData);
-
-                if (!ok)
+            /* Enumerate the driver info list. */
+            bool fFound = false;
+            for (DWORD index = 0; !fFound; index++)
+            {
+                if (!SetupDiEnumDeviceInfo(hDeviceInfo, index, &DeviceInfoData))
                 {
                     if (GetLastError() == ERROR_NO_MORE_ITEMS)
                         break;
-                    else
-                    {
-                        index++;
-                        continue;
-                    }
+                    continue;
                 }
 
                 /* try to get the hardware ID registry property */
-                ok = SetupDiGetDeviceRegistryProperty(hDeviceInfo,
+                DWORD cbValue = 0;
+                if (SetupDiGetDeviceRegistryPropertyW(hDeviceInfo,
                                                       &DeviceInfoData,
                                                       SPDRP_HARDWAREID,
@@ -2802 +2731 @@
                                                       NULL,
                                                       0,
-                                                      &size);
-                if (!ok)
-                {
-                    if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
-                    {
-                        index++;
-                        continue;
-                    }
-
-                    deviceHwid = (TCHAR *) malloc(size);
-                    ok = SetupDiGetDeviceRegistryProperty(hDeviceInfo,
-                                                          &DeviceInfoData,
-                                                          SPDRP_HARDWAREID,
-                                                          NULL,
-                                                          (PBYTE)deviceHwid,
-                                                          size,
-                                                          NULL);
-                    if (!ok)
-                    {
-                        free(deviceHwid);
-                        deviceHwid = NULL;
-                        index++;
-                        continue;
-                    }
-                }
-                else
-                {
-                    /* something is wrong.  This shouldn't have worked with a NULL buffer */
-                    index++;
+                                                      &cbValue))
+                    continue; /* Something is wrong.  This shouldn't have worked with a NULL buffer! */
+                if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
                     continue;
-                }
-
-                for (TCHAR *t = deviceHwid;
-                     t && *t && t < &deviceHwid[size / sizeof(TCHAR)];
-                     t += _tcslen(t) + 1)
-                {
-                    if (!_tcsicmp(DRIVERHWID, t))
-                    {
-                          /* get the device instance ID */
-                          TCHAR devId[MAX_DEVICE_ID_LEN];
-                          if (CM_Get_Device_ID(DeviceInfoData.DevInst,
-                                               devId, MAX_DEVICE_ID_LEN, 0) == CR_SUCCESS)
-                          {
-                              /* compare to what we determined before */
-                              if (wcscmp(devId, lszPnPInstanceId) == 0)
-                              {
-                                  found = TRUE;
-                                  break;
-                              }
-                          }
-                    }
-                }
-
-                if (deviceHwid)
-                {
-                    free (deviceHwid);
-                    deviceHwid = NULL;
-                }
-
-                if (found)
+
+                WCHAR *pwszzDeviceHwId = (WCHAR *)RTMemAllocZ(cbValue + sizeof(WCHAR) * 2);
+                if (!pwszzDeviceHwId)
                     break;
-
-                index++;
-            }
-
-            if (found == FALSE)
-                SetErrBreak (("Host Interface Network driver not found (0x%08X)",
-                              GetLastError()));
-
-            ok = SetupDiSetSelectedDevice (hDeviceInfo, &DeviceInfoData);
+                if (SetupDiGetDeviceRegistryPropertyW(hDeviceInfo,
+                                                      &DeviceInfoData,
+                                                      SPDRP_HARDWAREID,
+                                                      NULL,
+                                                      (PBYTE)pwszzDeviceHwId,
+                                                      cbValue,
+                                                      &cbValue))
+                {
+                    /* search the string list. */
+                    for (WCHAR *pwszCurHwId = pwszzDeviceHwId;
+                         (uintptr_t)pwszCurHwId - (uintptr_t)pwszzDeviceHwId < cbValue && *pwszCurHwId != L'\0';
+                         pwszCurHwId += RTUtf16Len(pwszCurHwId) + 1)
+                        if (RTUtf16ICmp(DRIVERHWID, pwszCurHwId) == 0)
+                        {
+                            /* get the device instance ID */
+                            WCHAR wszDevId[MAX_DEVICE_ID_LEN];
+                            if (CM_Get_Device_IDW(DeviceInfoData.DevInst, wszDevId, MAX_DEVICE_ID_LEN, 0) == CR_SUCCESS)
+                            {
+                                /* compare to what we determined before */
+                                if (RTUtf16Cmp(wszDevId, wszPnPInstanceId) == 0)
+                                {
+                                    fFound = true;
+                                    break;
+                                }
+                            }
+                        }
+                }
+                RTMemFree(pwszzDeviceHwId);
+            }
+
+            if (!fFound)
+                SetErrBreak(("Host Interface Network driver not found (0x%08X)", GetLastError()));
+
+            ok = SetupDiSetSelectedDevice(hDeviceInfo, &DeviceInfoData);
             if (!ok)
-                SetErrBreak (("SetupDiSetSelectedDevice failed (0x%08X)",
-                              GetLastError()));
-
-            ok = SetupDiCallClassInstaller (DIF_REMOVE, hDeviceInfo, &DeviceInfoData);
+                SetErrBreak(("SetupDiSetSelectedDevice failed (0x%08X)", GetLastError()));
+
+            ok = SetupDiCallClassInstaller(DIF_REMOVE, hDeviceInfo, &DeviceInfoData);
             if (!ok)
-                SetErrBreak (("SetupDiCallClassInstaller (DIF_REMOVE) failed (0x%08X)",
-                              GetLastError()));
-        }
-        while (0);
+                SetErrBreak(("SetupDiCallClassInstaller (DIF_REMOVE) failed (0x%08X)", GetLastError()));
+        } while (0);
 
         /* clean up the device info set */
         if (hDeviceInfo != INVALID_HANDLE_VALUE)
             SetupDiDestroyDeviceInfoList (hDeviceInfo);
-
-        if (FAILED (hrc))
-            break;
-    }
-    while (0);
-
-    if (pErrMsg && bstrError.length())
-        *pErrMsg = bstrError.Detach();
-
+    } while (0);
+
+    if (pBstrErrMsg)
+    {
+        *pBstrErrMsg = NULL;
+        if (bstrError.isNotEmpty())
+            bstrError.detachToEx(pBstrErrMsg);
+    }
     return hrc;
 }
 
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinUpdateHostOnlyNetworkInterface(LPCWSTR pcsxwInf, BOOL *pbRebootRequired, LPCWSTR pcsxwId)
-{
-    return VBoxDrvCfgDrvUpdate(pcsxwId, pcsxwInf, pbRebootRequired);
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinUpdateHostOnlyNetworkInterface(LPCWSTR pcsxwInf, BOOL *pfRebootRequired, LPCWSTR pcsxwId)
+{
+    return VBoxDrvCfgDrvUpdate(pcsxwId, pcsxwInf, pfRebootRequired);
 }
 
@@ -2907 +2804 @@
     switch (dwState)
     {
-        case SERVICE_STOPPED: return "is not running";
-        case SERVICE_STOP_PENDING: return "is stopping";
-        case SERVICE_CONTINUE_PENDING: return "continue is pending";
-        case SERVICE_PAUSE_PENDING: return "pause is pending";
-        case SERVICE_PAUSED: return "is paused";
-        case SERVICE_RUNNING: return "is running";
-        case SERVICE_START_PENDING: return "is starting";
+        case SERVICE_STOPPED:           return "is not running";
+        case SERVICE_STOP_PENDING:      return "is stopping";
+        case SERVICE_CONTINUE_PENDING:  return "continue is pending";
+        case SERVICE_PAUSE_PENDING:     return "pause is pending";
+        case SERVICE_PAUSED:            return "is paused";
+        case SERVICE_RUNNING:           return "is running";
+        case SERVICE_START_PENDING:     return "is starting";
     }
     return "state is invalid";
@@ -2941 +2838 @@
 }
 
-typedef struct {
+typedef struct
+{
     BSTR bstrName;
     GUID *pGuid;
@@ -2963 +2861 @@
 }
 
-/* We assume the following name matches the device description in vboxnetadp6.inf */
-#define HOSTONLY_ADAPTER_NAME "VirtualBox Host-Only Ethernet Adapter"
-
-/*
+/**
  * Enumerate all host-only adapters collecting their names into a set, then
  * come up with the next available name by taking the first unoccupied index.
  */
-static HRESULT vboxNetCfgWinNextAvailableDevName(bstr_t& bstrName)
-{
-    SP_DEVINFO_DATA DeviceInfoData;
-    /* initialize the structure size */
-    DeviceInfoData.cbSize = sizeof (SP_DEVINFO_DATA);
-
-    HDEVINFO DeviceInfoSet = SetupDiGetClassDevs(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT);
-    if (DeviceInfoSet == INVALID_HANDLE_VALUE)
-        return GetLastError();
-
-    DWORD i;
-    std::set<bstr_t> aExistingNames;
-    for (i = 0; SetupDiEnumDeviceInfo(DeviceInfoSet, i, &DeviceInfoData); ++i)
+static HRESULT vboxNetCfgWinNextAvailableDevName(com::Bstr *pbstrName)
+{
+    SP_DEVINFO_DATA DeviceInfoData = { sizeof(SP_DEVINFO_DATA) };
+    HDEVINFO hDeviceInfoSet = SetupDiGetClassDevsW(&GUID_DEVCLASS_NET, NULL, NULL, DIGCF_PRESENT);
+    if (hDeviceInfoSet == INVALID_HANDLE_VALUE)
+        return HRESULT_FROM_WIN32(GetLastError());
+
+    typedef struct VBOXDEVNAMEENTRY
+    {
+        RTLISTNODE  ListEntry;
+        WCHAR       wszDevName[64];
+        WCHAR       wcZeroParanoia;
+    } VBOXDEVNAMEENTRY;
+
+#if 0
+    /*
+     * Build a list of names starting with HOSTONLY_ADAPTER_NAME_WSZ belonging to our device.
+     */
+    RTLISTANCHOR Head; /* VBOXDEVNAMEENTRY */
+    RTListInit(&Head);
+    HRESULT      hrc = S_OK;
+#else
+    /*
+     * Build a bitmap of in-use index values of devices starting with HOSTONLY_ADAPTER_NAME_WSZ.
+     * Reserving 0 for one w/o a suffix, and marking 1 as unusable.
+     */
+    uint64_t bmIndexes[_32K / 64]; /* 4KB - 32767 device should be sufficient. */
+    RT_ZERO(bmIndexes);
+    ASMBitSet(&bmIndexes, 1);
+#endif
+    for (DWORD i = 0; SetupDiEnumDeviceInfo(hDeviceInfoSet, i, &DeviceInfoData); ++i)
     {
         /* Should be more than enough for both our device id and our device name, we do not care about the rest */
-        WCHAR wszDevName[64];
-        if (!SetupDiGetDeviceRegistryProperty(DeviceInfoSet, &DeviceInfoData, SPDRP_HARDWAREID,
-                                              NULL, (PBYTE)wszDevName, sizeof(wszDevName), NULL))
+        VBOXDEVNAMEENTRY Entry = { { 0, 0 }, L"", 0 }; /* (initialize it to avoid the wrath of asan) */
+        if (!SetupDiGetDeviceRegistryPropertyW(hDeviceInfoSet, &DeviceInfoData, SPDRP_HARDWAREID,
+                                               NULL, (PBYTE)Entry.wszDevName, sizeof(Entry.wszDevName), NULL))
             continue;
+
         /* Ignore everything except our host-only adapters */
-        if (_wcsicmp(wszDevName, DRIVERHWID))
-            continue;
-        if (   SetupDiGetDeviceRegistryProperty(DeviceInfoSet, &DeviceInfoData, SPDRP_FRIENDLYNAME,
-                                                NULL, (PBYTE)wszDevName, sizeof(wszDevName), NULL)
-            || SetupDiGetDeviceRegistryProperty(DeviceInfoSet, &DeviceInfoData, SPDRP_DEVICEDESC,
-                                                NULL, (PBYTE)wszDevName, sizeof(wszDevName), NULL))
-            aExistingNames.insert(bstr_t(wszDevName));
-    }
-    /* Try the name without index first */
-    bstrName = HOSTONLY_ADAPTER_NAME;
-    if (aExistingNames.find(bstrName) != aExistingNames.end())
-    {
-        WCHAR wszSuffix[16];
-        /* Try indexed names until we find unused one */
-        for (i = 2;; ++i)
-        {
-            wsprintf(wszSuffix, L" #%u", i);
-            if (aExistingNames.find(bstrName + wszSuffix) == aExistingNames.end())
-            {
-                bstrName += wszSuffix;
+        if (RTUtf16ICmp(Entry.wszDevName, DRIVERHWID) == 0)
+        {
+            if (   SetupDiGetDeviceRegistryPropertyW(hDeviceInfoSet, &DeviceInfoData, SPDRP_FRIENDLYNAME,
+                                                     NULL, (PBYTE)Entry.wszDevName, sizeof(Entry.wszDevName), NULL)
+                || SetupDiGetDeviceRegistryPropertyW(hDeviceInfoSet, &DeviceInfoData, SPDRP_DEVICEDESC,
+                                                     NULL, (PBYTE)Entry.wszDevName, sizeof(Entry.wszDevName), NULL))
+            {
+                /* We can ignore any host-only adapter with a non-standard name. */
+                if (RTUtf16NICmp(Entry.wszDevName, HOSTONLY_ADAPTER_NAME_WSZ,
+                                 RT_ELEMENTS(HOSTONLY_ADAPTER_NAME_WSZ) - 1) == 0)
+                {
+#if 0
+                    VBOXDEVNAMEENTRY *pEntry = (VBOXDEVNAMEENTRY *)RTMemDup(&Entry, sizeof(Entry));
+                    if (pEntry)
+                        RTListAppend(&Head, &pEntry->ListEntry);
+                    else
+                    {
+                        hrc = E_OUTOFMEMORY;
+                        break;
+                    }
+#else
+                    WCHAR const *pwc = &Entry.wszDevName[RT_ELEMENTS(HOSTONLY_ADAPTER_NAME_WSZ) - 1];
+
+                    /* skip leading space */
+                    WCHAR wc = *pwc;
+                    while (wc == L' ' || wc == L'\t' || wc == L'\n' || wc == L'\r')
+                        wc = *++pwc;
+
+                    /* If end of string, use index 0. */
+                    if (wc == L'\0')
+                        ASMBitSet(bmIndexes, 0);
+
+                    /* Hash and digit? */
+                    else if (wc == L'#')
+                    {
+                        wc = *++pwc;
+                        while (wc == L' ' || wc == L'\t' || wc == L'\n' || wc == L'\r') /* just in case */
+                            wc = *++pwc;
+                        if (wc >= L'0' && wc <= L'9')
+                        {
+                            /* Convert what we can to a number and mark it as allocated in the bitmap. */
+                            uint64_t uIndex = wc - L'0';
+                            while ((wc = *++pwc) >= L'0' && wc <= L'9')
+                                uIndex = uIndex * 10 + wc - L'0';
+                            if (uIndex < sizeof(bmIndexes) * 8 && uIndex > 0)
+                                ASMBitSet(bmIndexes, (int32_t)uIndex);
+                        }
+                    }
+#endif
+                }
+            }
+        }
+    }
+#if 0
+    if (SUCCEEDED(hrc))
+    {
+        /*
+         * First try a name w/o an index, then try index #2 and up.
+         *
+         * Note! We have to use ASCII/UTF-8 strings here as Bstr will confuse WCHAR
+         *       with BSTR/OLECHAR strings and use SysAllocString to duplicate it .
+         */
+        char         szName[sizeof(HOSTONLY_ADAPTER_NAME_SZ " #4294967296") + 32] = HOSTONLY_ADAPTER_NAME_SZ;
+        size_t const cchBase = sizeof(HOSTONLY_ADAPTER_NAME_SZ) - 1;
+        for (DWORD idx = 2;; idx++)
+        {
+            bool              fFound = false;
+            VBOXDEVNAMEENTRY *pCur;
+            RTListForEach(&Head, pCur, VBOXDEVNAMEENTRY, ListEntry)
+            {
+                fFound = RTUtf16ICmpAscii(pCur->wszDevName, szName) == 0;
+                if (fFound)
+                {
+                    hrc = pbstrName->assignEx(szName);
+                    break;
+                }
+            }
+            if (fFound)
                 break;
-            }
-        }
-    }
-
-    if (DeviceInfoSet)
-        SetupDiDestroyDeviceInfoList(DeviceInfoSet);
-    return S_OK;
-}
-
-static HRESULT vboxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWSTR pInfPath, IN bool bIsInfPathFile, IN BSTR bstrDesiredName,
-                                                           OUT GUID *pGuid, OUT BSTR *lppszName, OUT BSTR *pErrMsg)
-{
-    HRESULT hrc = S_OK;
-
-    HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE;
-    SP_DEVINFO_DATA DeviceInfoData;
-    PVOID pQueueCallbackContext = NULL;
-    DWORD ret = 0;
-    BOOL registered = FALSE;
-    BOOL destroyList = FALSE;
-    WCHAR pWCfgGuidString [50];
-    WCHAR DevName[256];
-    HKEY hkey = (HKEY)INVALID_HANDLE_VALUE;
-    bstr_t bstrError;
-    bstr_t bstrNewInterfaceName;
-
-    if (SysStringLen(bstrDesiredName) != 0)
-        bstrNewInterfaceName = bstrDesiredName;
+            RTStrPrintf(&szName[cchBase], sizeof(szName) - cchBase, " #%u", idx);
+        }
+    }
+
+    VBOXDEVNAMEENTRY *pFirst;
+    while ((pFirst = RTListRemoveFirst(&Head, VBOXDEVNAMEENTRY, ListEntry)) != NULL)
+        RTMemFree(pFirst);
+
+#else
+    /*
+     * Find an unused index value and format the corresponding name.
+     */
+    HRESULT hrc;
+    int32_t iBit = ASMBitFirstClear(bmIndexes, sizeof(bmIndexes) * 8);
+    if (iBit >= 0)
+    {
+        if (iBit == 0)
+            hrc = pbstrName->assignEx(HOSTONLY_ADAPTER_NAME_SZ); /* Not _WSZ! */
+        else
+            hrc = pbstrName->printfNoThrow(HOSTONLY_ADAPTER_NAME_SZ " #%u", iBit);
+    }
     else
     {
-        hrc = vboxNetCfgWinNextAvailableDevName(bstrNewInterfaceName);
+        NonStandardLogFlow(("vboxNetCfgWinNextAvailableDevName: no unused index in the first 32K!\n"));
+        hrc = E_FAIL;
+    }
+#endif
+
+    if (hDeviceInfoSet)
+        SetupDiDestroyDeviceInfoList(hDeviceInfoSet);
+    return hrc;
+}
+
+static HRESULT vboxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWSTR pwszInfPath, IN bool fIsInfPathFile,
+                                                           IN BSTR pBstrDesiredName,
+                                                           OUT GUID *pGuid, OUT BSTR *pBstrName, OUT BSTR *pBstrErrMsg)
+{
+    com::Bstr bstrError;
+
+    /* Determine the interface name. We make a copy of the input here for
+       renaming reasons, see futher down. */
+    com::Bstr bstrNewInterfaceName;
+    HRESULT   hrc;
+    if (SysStringLen(pBstrDesiredName) != 0)
+        hrc = bstrNewInterfaceName.assignEx(pBstrDesiredName);
+    else
+    {
+        hrc = vboxNetCfgWinNextAvailableDevName(&bstrNewInterfaceName);
         if (FAILED(hrc))
             NonStandardLogFlow(("vboxNetCfgWinNextAvailableDevName failed with 0x%x\n", hrc));
     }
-
-    do
-    {
-        BOOL found = FALSE;
+    if (FAILED(hrc))
+        return hrc;
+
+    WCHAR           wszCfgGuidString[50]  = {0};
+    WCHAR           wszDevName[256 + 1]   = {0};
+    SP_DEVINFO_DATA DeviceInfoData        = { sizeof(DeviceInfoData) };
+    HDEVINFO        hDeviceInfo           = INVALID_HANDLE_VALUE;
+    PVOID           pQueueCallbackContext = NULL;
+    BOOL            fRegistered           = FALSE;
+    BOOL            destroyList           = FALSE;
+    HKEY            hkey                  = (HKEY)INVALID_HANDLE_VALUE;
+    LSTATUS         lrcRet                = ERROR_SUCCESS; /* the */
+
+    do /* non-loop, for breaking. */
+    {
+        /* copy the net class GUID */
         GUID netGuid;
-        SP_DRVINFO_DATA DriverInfoData;
-        SP_DEVINSTALL_PARAMS DeviceInstallParams;
-        TCHAR className [MAX_PATH];
-        DWORD index = 0;
-        PSP_DRVINFO_DETAIL_DATA pDriverInfoDetail;
-        /* for our purposes, 2k buffer is more
-         * than enough to obtain the hardware ID
-         * of the VBoxNetAdp driver. */
-        DWORD detailBuf [2048];
-
-        DWORD cbSize;
-        DWORD dwValueType;
-
-        /* initialize the structure size */
-        DeviceInfoData.cbSize = sizeof (SP_DEVINFO_DATA);
-        DriverInfoData.cbSize = sizeof (SP_DRVINFO_DATA);
-
-        /* copy the net class GUID */
         memcpy(&netGuid, &GUID_DEVCLASS_NET, sizeof(GUID_DEVCLASS_NET));
 
-        /* create an empty device info set associated with the net class GUID */
+        /* Create an empty device info set associated with the net class GUID: */
         hDeviceInfo = SetupDiCreateDeviceInfoList(&netGuid, NULL);
         if (hDeviceInfo == INVALID_HANDLE_VALUE)
-            SetErrBreak (("SetupDiCreateDeviceInfoList failed (0x%08X)",
-                          GetLastError()));
-
-        /* get the class name from GUID */
-        BOOL fResult = SetupDiClassNameFromGuid (&netGuid, className, MAX_PATH, NULL);
-        if (!fResult)
-            SetErrBreak (("SetupDiClassNameFromGuid failed (0x%08X)",
-                          GetLastError()));
-
-        /* create a device info element and add the new device instance
-         * key to registry */
-        fResult = SetupDiCreateDeviceInfo (hDeviceInfo, className, &netGuid, NULL, NULL,
-                                     DICD_GENERATE_ID, &DeviceInfoData);
-        if (!fResult)
-            SetErrBreak (("SetupDiCreateDeviceInfo failed (0x%08X)",
-                          GetLastError()));
-
-        /* select the newly created device info to be the currently
-           selected member */
-        fResult = SetupDiSetSelectedDevice (hDeviceInfo, &DeviceInfoData);
-        if (!fResult)
-            SetErrBreak (("SetupDiSetSelectedDevice failed (0x%08X)",
-                          GetLastError()));
-
-        if (pInfPath)
+            SetErrBreak(("SetupDiCreateDeviceInfoList failed (%Rwc)", GetLastError()));
+
+        /* Translate the GUID to a class name: */
+        WCHAR wszClassName[MAX_PATH];
+        if (!SetupDiClassNameFromGuid(&netGuid, wszClassName, MAX_PATH, NULL))
+            SetErrBreak(("SetupDiClassNameFromGuid failed (%Rwc)", GetLastError()));
+
+        /* Create a device info element and add the new device instance key to registry: */
+        if (!SetupDiCreateDeviceInfo(hDeviceInfo, wszClassName, &netGuid, NULL, NULL, DICD_GENERATE_ID, &DeviceInfoData))
+            SetErrBreak(("SetupDiCreateDeviceInfo failed (%Rwc)", GetLastError()));
+
+        /* Select the newly created device info to be the currently selected member: */
+        if (!SetupDiSetSelectedDevice(hDeviceInfo, &DeviceInfoData))
+            SetErrBreak(("SetupDiSetSelectedDevice failed (%Rwc)", GetLastError()));
+
+        SP_DEVINSTALL_PARAMS DeviceInstallParams;
+        if (pwszInfPath)
         {
             /* get the device install parameters and disable filecopy */
             DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
-            fResult = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
-                                                &DeviceInstallParams);
-            if (fResult)
+            if (SetupDiGetDeviceInstallParams(hDeviceInfo, &DeviceInfoData, &DeviceInstallParams))
             {
                 memset(DeviceInstallParams.DriverPath, 0, sizeof(DeviceInstallParams.DriverPath));
-                size_t pathLenght = wcslen(pInfPath) + 1/* null terminator */;
+                size_t pathLenght = wcslen(pwszInfPath) + 1/* null terminator */;
                 if (pathLenght < sizeof(DeviceInstallParams.DriverPath)/sizeof(DeviceInstallParams.DriverPath[0]))
                 {
-                    memcpy(DeviceInstallParams.DriverPath, pInfPath, pathLenght*sizeof(DeviceInstallParams.DriverPath[0]));
-
-                    if (bIsInfPathFile)
+                    memcpy(DeviceInstallParams.DriverPath, pwszInfPath, pathLenght*sizeof(DeviceInstallParams.DriverPath[0]));
+
+                    if (fIsInfPathFile)
+                        DeviceInstallParams.Flags |= DI_ENUMSINGLEINF;
+
+                    if (!SetupDiSetDeviceInstallParams(hDeviceInfo, &DeviceInfoData, &DeviceInstallParams))
                     {
-                        DeviceInstallParams.Flags |= DI_ENUMSINGLEINF;
-                    }
-
-                    fResult = SetupDiSetDeviceInstallParams(hDeviceInfo, &DeviceInfoData,
-                                                       &DeviceInstallParams);
-                    if (!fResult)
-                    {
-                        DWORD winEr = GetLastError();
-                        NonStandardLogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr));
+                        NonStandardLogFlow(("SetupDiSetDeviceInstallParams failed (%Rwc)\n", GetLastError()));
                         break;
                     }
@@ -3132 +3100 @@
             }
             else
-            {
-                DWORD winEr = GetLastError();
-                NonStandardLogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr));
-            }
+                NonStandardLogFlow(("SetupDiGetDeviceInstallParams failed (%Rwc)\n", GetLastError()));
         }
 
         /* build a list of class drivers */
-        fResult = SetupDiBuildDriverInfoList (hDeviceInfo, &DeviceInfoData,
-                                              SPDIT_CLASSDRIVER);
-        if (!fResult)
-            SetErrBreak (("SetupDiBuildDriverInfoList failed (0x%08X)",
-                          GetLastError()));
+        if (!SetupDiBuildDriverInfoList(hDeviceInfo, &DeviceInfoData, SPDIT_CLASSDRIVER))
+            SetErrBreak(("SetupDiBuildDriverInfoList failed (%Rwc)", GetLastError()));
 
         destroyList = TRUE;
 
-        /* enumerate the driver info list */
-        while (TRUE)
-        {
-            BOOL fRet = SetupDiEnumDriverInfo(hDeviceInfo, &DeviceInfoData, SPDIT_CLASSDRIVER, index, &DriverInfoData);
-
-            /* if the function failed and GetLastError() returns
-             * ERROR_NO_MORE_ITEMS, then we have reached the end of the
-             * list.  Otherwise there was something wrong with this
-             * particular driver. */
-            if (!fRet)
+        /*
+         * Enumerate the driver info list.
+         */
+        /* For our purposes, 2k buffer is more than enough to obtain the
+           hardware ID of the VBoxNetAdp driver. */ /** @todo r=bird: The buffer isn't 2KB, it's 8KB, but whatever. */
+        DWORD           detailBuf[2048];
+        SP_DRVINFO_DATA DriverInfoData = { sizeof(DriverInfoData) };
+        bool            fFound         = false;
+        for (DWORD index = 0; !fFound; index++)
+        {
+            /* If the function fails with last error set to ERROR_NO_MORE_ITEMS,
+               then we have reached the end of the list.  Otherwise there was
+               something wrong with this particular driver. */
+            if (!SetupDiEnumDriverInfo(hDeviceInfo, &DeviceInfoData, SPDIT_CLASSDRIVER, index, &DriverInfoData))
             {
                 if (GetLastError() == ERROR_NO_MORE_ITEMS)
                     break;
-                index++;
                 continue;
             }
-
-            pDriverInfoDetail = (PSP_DRVINFO_DETAIL_DATA) detailBuf;
-            pDriverInfoDetail->cbSize = sizeof(SP_DRVINFO_DETAIL_DATA);
 
             /* if we successfully find the hardware ID and it turns out to
              * be the one for the loopback driver, then we are done. */
-            if (SetupDiGetDriverInfoDetail (hDeviceInfo,
+            PSP_DRVINFO_DETAIL_DATA_W pDriverInfoDetail = (PSP_DRVINFO_DETAIL_DATA_W)detailBuf;
+            pDriverInfoDetail->cbSize = sizeof(SP_DRVINFO_DETAIL_DATA);
+            DWORD cbValue = 0;
+            if (SetupDiGetDriverInfoDetailW(hDeviceInfo,
                                             &DeviceInfoData,
                                             &DriverInfoData,
                                             pDriverInfoDetail,
-                                            sizeof (detailBuf),
-                                            NULL))
-            {
-                TCHAR * t;
-
-                /* pDriverInfoDetail->HardwareID is a MULTISZ string.  Go through the
-                 * whole list and see if there is a match somewhere. */
-                t = pDriverInfoDetail->HardwareID;
-                while (t && *t && t < (TCHAR *) &detailBuf [RT_ELEMENTS(detailBuf)])
-                {
-                    if (!_tcsicmp(t, DRIVERHWID))
+                                            sizeof(detailBuf) - sizeof(detailBuf[0]),
+                                            &cbValue))
+            {
+                /* Sure that the HardwareID string list is properly zero terminated (paranoia). */
+                detailBuf[RT_ELEMENTS(detailBuf) - 1] = 0; AssertCompile(sizeof(detailBuf[0]) == sizeof(WCHAR) * 2);
+
+                /* pDriverInfoDetail->HardwareID is a MULTISZ string.  Go through the whole
+                   list and see if there is a match somewhere: */
+                for (WCHAR *pwszCurHwId = pDriverInfoDetail->HardwareID;
+                     (uintptr_t)pwszCurHwId - (uintptr_t)pDriverInfoDetail < cbValue && *pwszCurHwId != L'\0';
+                     pwszCurHwId += RTUtf16Len(pwszCurHwId) + 1)
+                    if (RTUtf16ICmp(DRIVERHWID, pwszCurHwId) == 0)
+                    {
+                        fFound = true;
                         break;
-
-                    t += _tcslen(t) + 1;
-                }
-
-                if (t && *t && t < (TCHAR *) &detailBuf [RT_ELEMENTS(detailBuf)])
-                {
-                    found = TRUE;
-                    break;
-                }
-            }
-
-            index ++;
-        }
-
-        if (!found)
+                    }
+            }
+        }
+
+        if (!fFound)
             SetErrBreak(("Could not find Host Interface Networking driver! Please reinstall"));
 
         /* set the loopback driver to be the currently selected */
-        fResult = SetupDiSetSelectedDriver (hDeviceInfo, &DeviceInfoData,
-                                       &DriverInfoData);
-        if (!fResult)
-            SetErrBreak(("SetupDiSetSelectedDriver failed (0x%08X)",
-                         GetLastError()));
+        if (!SetupDiSetSelectedDriver(hDeviceInfo, &DeviceInfoData, &DriverInfoData))
+            SetErrBreak(("SetupDiSetSelectedDriver failed (%u)", GetLastError()));
 
         /* register the phantom device to prepare for install */
-        fResult = SetupDiCallClassInstaller (DIF_REGISTERDEVICE, hDeviceInfo,
-                                             &DeviceInfoData);
-        if (!fResult)
-        {
-            DWORD err = GetLastError();
-            SetErrBreak (("SetupDiCallClassInstaller failed (0x%08X)",
-                          err));
-        }
+        if (!SetupDiCallClassInstaller(DIF_REGISTERDEVICE, hDeviceInfo, &DeviceInfoData))
+            SetErrBreak(("SetupDiCallClassInstaller failed (%u)", GetLastError()));
 
         /* registered, but remove if errors occur in the following code */
-        registered = TRUE;
+        fRegistered = TRUE;
 
         /* ask the installer if we can install the device */
-        fResult = SetupDiCallClassInstaller (DIF_ALLOW_INSTALL, hDeviceInfo,
-                                             &DeviceInfoData);
-        if (!fResult)
+        if (!SetupDiCallClassInstaller(DIF_ALLOW_INSTALL, hDeviceInfo, &DeviceInfoData))
         {
             if (GetLastError() != ERROR_DI_DO_DEFAULT)
-                SetErrBreak (("SetupDiCallClassInstaller (DIF_ALLOW_INSTALL) failed (0x%08X)",
-                              GetLastError()));
+                SetErrBreak(("SetupDiCallClassInstaller (DIF_ALLOW_INSTALL) failed (%u)", GetLastError()));
             /* that's fine */
         }
@@ -3235 +3181 @@
         /* get the device install parameters and disable filecopy */
         DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
-        fResult = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
-                                                 &DeviceInstallParams);
-        if (fResult)
+        if (SetupDiGetDeviceInstallParams(hDeviceInfo, &DeviceInfoData, &DeviceInstallParams))
         {
             pQueueCallbackContext = SetupInitDefaultQueueCallback(NULL);
@@ -3244 +3188 @@
                 DeviceInstallParams.InstallMsgHandlerContext = pQueueCallbackContext;
                 DeviceInstallParams.InstallMsgHandler = (PSP_FILE_CALLBACK)vboxNetCfgWinPspFileCallback;
-                fResult = SetupDiSetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
-                                                    &DeviceInstallParams);
-                if (!fResult)
+                if (!SetupDiSetDeviceInstallParamsW(hDeviceInfo, &DeviceInfoData, &DeviceInstallParams))
                 {
                     DWORD winEr = GetLastError();
-                    NonStandardLogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr));
-                }
-                Assert(fResult);
+                    NonStandardLogFlow(("SetupDiSetDeviceInstallParamsW failed, winEr (%d)\n", winEr));
+                    Assert(0);
+                }
             }
             else
@@ -3266 +3208 @@
 
         /* install the files first */
-        fResult = SetupDiCallClassInstaller (DIF_INSTALLDEVICEFILES, hDeviceInfo,
-                                        &DeviceInfoData);
-        if (!fResult)
-            SetErrBreak (("SetupDiCallClassInstaller (DIF_INSTALLDEVICEFILES) failed (0x%08X)",
-                          GetLastError()));
+        if (!SetupDiCallClassInstaller(DIF_INSTALLDEVICEFILES, hDeviceInfo, &DeviceInfoData))
+            SetErrBreak(("SetupDiCallClassInstaller (DIF_INSTALLDEVICEFILES) failed (%Rwc)", GetLastError()));
+
         /* get the device install parameters and disable filecopy */
         DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
-        fResult = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
-                                            &DeviceInstallParams);
-        if (fResult)
+        if (SetupDiGetDeviceInstallParams(hDeviceInfo, &DeviceInfoData, &DeviceInstallParams))
         {
             DeviceInstallParams.Flags |= DI_NOFILECOPY;
-            fResult = SetupDiSetDeviceInstallParams(hDeviceInfo, &DeviceInfoData,
-                                                    &DeviceInstallParams);
-            if (!fResult)
-                SetErrBreak (("SetupDiSetDeviceInstallParams failed (0x%08X)",
-                              GetLastError()));
-        }
+            if (!SetupDiSetDeviceInstallParamsW(hDeviceInfo, &DeviceInfoData, &DeviceInstallParams))
+                SetErrBreak(("SetupDiSetDeviceInstallParamsW failed (%Rwc)", GetLastError()));
+        }
+        /** @todo r=bird: Why isn't SetupDiGetDeviceInstallParams failure fatal here? */
 
         /*
          * Register any device-specific co-installers for this device,
          */
-        fResult = SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS,
-                                            hDeviceInfo,
-                                            &DeviceInfoData);
-        if (!fResult)
-            SetErrBreak (("SetupDiCallClassInstaller (DIF_REGISTER_COINSTALLERS) failed (0x%08X)",
-                          GetLastError()));
+        if (!SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS, hDeviceInfo, &DeviceInfoData))
+            SetErrBreak(("SetupDiCallClassInstaller (DIF_REGISTER_COINSTALLERS) failed (%Rwc)", GetLastError()));
 
         /*
@@ -3299 +3231 @@
          * and then do the real install
          */
-        fResult = SetupDiCallClassInstaller(DIF_INSTALLINTERFACES,
-                                            hDeviceInfo,
-                                            &DeviceInfoData);
-        if (!fResult)
-            SetErrBreak (("SetupDiCallClassInstaller (DIF_INSTALLINTERFACES) failed (0x%08X)",
-                          GetLastError()));
-
-        fResult = SetupDiCallClassInstaller(DIF_INSTALLDEVICE,
-                                            hDeviceInfo,
-                                            &DeviceInfoData);
-        if (!fResult)
-            SetErrBreak (("SetupDiCallClassInstaller (DIF_INSTALLDEVICE) failed (0x%08X)",
-                          GetLastError()));
-
-        /* Query the instance ID; on Windows 10, the registry key may take a short
+        if (!SetupDiCallClassInstaller(DIF_INSTALLINTERFACES, hDeviceInfo, &DeviceInfoData))
+            SetErrBreak(("SetupDiCallClassInstaller (DIF_INSTALLINTERFACES) failed (%Rwc)", GetLastError()));
+
+        if (!SetupDiCallClassInstaller(DIF_INSTALLDEVICE, hDeviceInfo, &DeviceInfoData))
+            SetErrBreak(("SetupDiCallClassInstaller (DIF_INSTALLDEVICE) failed (%Rwc)", GetLastError()));
+
+        /*
+         * Query the instance ID; on Windows 10, the registry key may take a short
          * while to appear. Microsoft recommends waiting for up to 5 seconds, but
          * we want to be on the safe side, so let's wait for 20 seconds. Waiting
@@ -3324 +3249 @@
 
             /* Figure out NetCfgInstanceId */
-            hkey = SetupDiOpenDevRegKey(hDeviceInfo,
-                                        &DeviceInfoData,
-                                        DICS_FLAG_GLOBAL,
-                                        0,
-                                        DIREG_DRV,
-                                        KEY_READ);
+            hkey = SetupDiOpenDevRegKey(hDeviceInfo, &DeviceInfoData, DICS_FLAG_GLOBAL, 0, DIREG_DRV, KEY_READ);
             if (hkey == INVALID_HANDLE_VALUE)
                 break;
 
-            cbSize = sizeof(pWCfgGuidString);
-            ret = RegQueryValueExW (hkey, L"NetCfgInstanceId", NULL,
-                                   &dwValueType, (LPBYTE) pWCfgGuidString, &cbSize);
+            DWORD cbSize       = sizeof(wszCfgGuidString);
+            DWORD dwValueType = 0;
+            lrcRet = RegQueryValueExW(hkey, L"NetCfgInstanceId", NULL, &dwValueType, (LPBYTE)wszCfgGuidString, &cbSize);
             /* As long as the return code is FILE_NOT_FOUND, sleep and retry. */
-            if (ret != ERROR_FILE_NOT_FOUND)
+            if (lrcRet != ERROR_FILE_NOT_FOUND)
                 break;
 
-            RegCloseKey (hkey);
+            RegCloseKey(hkey);
             hkey = (HKEY)INVALID_HANDLE_VALUE;
         }
 
-        if (ret == ERROR_FILE_NOT_FOUND)
+        if (lrcRet == ERROR_FILE_NOT_FOUND)
         {
             hrc = E_ABORT;
@@ -3351 +3271 @@
 
         /*
-         * We need to check 'hkey' after we check 'ret' to distinguish the case
+         * We need to check 'hkey' after we check 'lrcRet' to distinguish the case
          * of failed SetupDiOpenDevRegKey from the case when we timed out.
          */
         if (hkey == INVALID_HANDLE_VALUE)
-            SetErrBreak(("SetupDiOpenDevRegKey failed (0x%08X)", GetLastError()));
-
-        if (ret != ERROR_SUCCESS)
-            SetErrBreak(("Querying NetCfgInstanceId failed (0x%08X)", ret));
+            SetErrBreak(("SetupDiOpenDevRegKey failed (%Rwc)", GetLastError()));
+
+        if (lrcRet != ERROR_SUCCESS)
+            SetErrBreak(("Querying NetCfgInstanceId failed (%Rwc)", lrcRet));
 
         NET_LUID luid;
-        HRESULT hSMRes = vboxNetCfgWinGetInterfaceLUID(hkey, &luid);
+        HRESULT hrcSMRes = vboxNetCfgWinGetInterfaceLUID(hkey, &luid);
 
         /* Close the key as soon as possible. See @bugref{7973}. */
-        RegCloseKey (hkey);
+        RegCloseKey(hkey);
         hkey = (HKEY)INVALID_HANDLE_VALUE;
 
-        if (FAILED(hSMRes))
+        if (FAILED(hrcSMRes))
         {
             /*
-            *   The setting of Metric is not very important functionality,
-            *   So we will not break installation process due to this error.
-            */
-            NonStandardLogFlow(("vboxNetCfgWinCreateHostOnlyNetworkInterface Warning! "
-                                "vboxNetCfgWinGetInterfaceLUID failed, default metric "
-                                "for new interface will not be set, hr (0x%x)\n", hSMRes));
+             * The setting of Metric is not very important functionality,
+             * So we will not break installation process due to this error.
+             */
+            NonStandardLogFlow(("vboxNetCfgWinCreateHostOnlyNetworkInterface: Warning! "
+                                "vboxNetCfgWinGetInterfaceLUID failed, default metric for new interface will not be set: %Rhrc\n",
+                                hrcSMRes));
         }
         else
         {
             /*
-             *   Set default metric value of interface to fix multicast issue
-             *   See @bugref{6379} for details.
+             * Set default metric value of interface to fix multicast issue
+             * See @bugref{6379} for details.
              */
-            hSMRes = vboxNetCfgWinSetupMetric(&luid);
-            if (FAILED(hSMRes))
+            hrcSMRes = vboxNetCfgWinSetupMetric(&luid);
+            if (FAILED(hrcSMRes))
             {
                 /*
-                 *   The setting of Metric is not very important functionality,
-                 *   So we will not break installation process due to this error.
+                 * The setting of Metric is not very important functionality,
+                 * So we will not break installation process due to this error.
                  */
-                NonStandardLogFlow(("vboxNetCfgWinCreateHostOnlyNetworkInterface Warning! "
-                                    "vboxNetCfgWinSetupMetric failed, default metric "
-                                    "for new interface will not be set, hr (0x%x)\n", hSMRes));
-            }
-        }
-
+                NonStandardLogFlow(("vboxNetCfgWinCreateHostOnlyNetworkInterface: Warning! "
+                                    "vboxNetCfgWinSetupMetric failed, default metric for new interface will not be set: %Rhrc\n",
+                                    hrcSMRes));
+            }
+        }
 
         /*
@@ -3404 +3323 @@
                                                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*/))
-        {
-            int err = GetLastError();
-            if (err != ERROR_INVALID_DATA)
-            {
-                SetErrBreak (("SetupDiGetDeviceRegistryProperty failed (0x%08X)",
-                              err));
-            }
-
+                                               (PBYTE)wszDevName, /*OUT PBYTE PropertyBuffer,*/
+                                               sizeof(wszDevName) - sizeof(WCHAR), /* IN DWORD PropertyBufferSize,*/
+                                               NULL /*OUT PDWORD RequiredSize OPTIONAL*/ ))
+        {
+            DWORD dwErr = GetLastError();
+            if (dwErr != ERROR_INVALID_DATA)
+                SetErrBreak(("SetupDiGetDeviceRegistryProperty failed (%Rwc)", dwErr));
+
+            RT_ZERO(wszDevName);
             if (!SetupDiGetDeviceRegistryPropertyW(hDeviceInfo, &DeviceInfoData,
-                              SPDRP_DEVICEDESC, /* IN DWORD Property,*/
-                              NULL, /*OUT PDWORD PropertyRegDataType, OPTIONAL*/
-                              (PBYTE)DevName, /*OUT PBYTE PropertyBuffer,*/
-                              sizeof(DevName), /* IN DWORD PropertyBufferSize,*/
-                              NULL /*OUT PDWORD RequiredSize OPTIONAL*/
-                            ))
-            {
-                err = GetLastError();
-                SetErrBreak (("SetupDiGetDeviceRegistryProperty failed (0x%08X)",
-                                              err));
-            }
-        }
+                                                   SPDRP_DEVICEDESC, /* IN DWORD Property,*/
+                                                   NULL, /*OUT PDWORD PropertyRegDataType, OPTIONAL*/
+                                                   (PBYTE)wszDevName, /*OUT PBYTE PropertyBuffer,*/
+                                                   sizeof(wszDevName) - sizeof(WCHAR), /* IN DWORD PropertyBufferSize,*/
+                                                   NULL /*OUT PDWORD RequiredSize OPTIONAL*/ ))
+                SetErrBreak(("SetupDiGetDeviceRegistryProperty failed (%Rwc)", GetLastError()));
+        }
+
         /* No need to rename the device if the names match. */
-        if (!wcscmp(bstrNewInterfaceName.GetBSTR(), DevName))
-            bstrNewInterfaceName.Assign(NULL);
+        if (RTUtf16Cmp(bstrNewInterfaceName.raw(), wszDevName) == 0)
+            bstrNewInterfaceName.setNull();
+
 #ifdef VBOXNETCFG_DELAYEDRENAME
-        /* Re-use DevName for device instance id retrieval. */
-        if (!SetupDiGetDeviceInstanceId(hDeviceInfo, &DeviceInfoData, DevName, RT_ELEMENTS(DevName), &cbSize))
-            SetErrBreak (("SetupDiGetDeviceInstanceId failed (0x%08X)",
-                          GetLastError()));
+        /* Re-use wszDevName for device instance id retrieval. */
+        DWORD cwcReturned = 0;
+        RT_ZERO(wszDevName);
+        if (!SetupDiGetDeviceInstanceIdW(hDeviceInfo, &DeviceInfoData, wszDevName, RT_ELEMENTS(wszDevName) - 1, &cwcReturned))
+            SetErrBreak(("SetupDiGetDeviceInstanceId failed (%Rwc)", GetLastError()));
 #endif /* VBOXNETCFG_DELAYEDRENAME */
-    }
-    while (0);
+    } while (0);
 
     /*
-     * cleanup
+     * Cleanup.
      */
     if (hkey != INVALID_HANDLE_VALUE)
-        RegCloseKey (hkey);
+        RegCloseKey(hkey);
 
     if (pQueueCallbackContext)
@@ -3452 +3366 @@
     {
         /* an error has occurred, but the device is registered, we must remove it */
-        if (ret != 0 && registered)
+        if (lrcRet != ERROR_SUCCESS && fRegistered)
             SetupDiCallClassInstaller(DIF_REMOVE, hDeviceInfo, &DeviceInfoData);
 
@@ -3458 +3372 @@
 
         /* destroy the driver info list */
+#if 0
+        /* I've remove this, as I was consistently getting crashes in
+         * SetupDiDestroyDeviceInfoList otherwise during MSI installation
+         * (W10 build 19044, VBox r153431 + nocrt changes).
+         *
+         * Some details from windbg:
+         *
+         * (175e8.1596c): Access violation - code c0000005 (first chance)
+         * First chance exceptions are reported before any exception handling.
+         * This exception may be expected and handled.
+         * SETUPAPI!DereferenceClassDriverList+0x4e:
+         * 00007ffa`83e2a42a 834008ff        add     dword ptr [rax+8],0FFFFFFFFh ds:00000000`00000008=????????
+         * 0:006> k
+         *  # Child-SP          RetAddr           Call Site
+         * 00 0000007e`ccd7c070 00007ffa`83e2a287 SETUPAPI!DereferenceClassDriverList+0x4e
+         * 01 0000007e`ccd7c0a0 00007ffa`56b96bd3 SETUPAPI!SetupDiDestroyDriverInfoList+0x117
+         * 02 0000007e`ccd7c0f0 00007ffa`56b982a3 MSIF170!vboxNetCfgWinCreateHostOnlyNetworkInterface+0xb23 [E:\vbox\svn\trunk\src\VBox\HostDrivers\VBoxNetFlt\win\cfg\VBoxNetCfg.cpp @ 3378]
+         * 03 0000007e`ccd7ef10 00007ffa`56b92cb8 MSIF170!VBoxNetCfgWinCreateHostOnlyNetworkInterface+0x53 [E:\vbox\svn\trunk\src\VBox\HostDrivers\VBoxNetFlt\win\cfg\VBoxNetCfg.cpp @ 3479]
+         * 04 0000007e`ccd7efc0 00007ffa`610f59d3 MSIF170!_createHostOnlyInterface+0x218 [E:\vbox\svn\trunk\src\VBox\Installer\win\InstallHelper\VBoxInstallHelper.cpp @ 1453]
+         * 05 0000007e`ccd7f260 00007ffa`610d80ac msi!CallCustomDllEntrypoint+0x2b
+         * 06 0000007e`ccd7f2d0 00007ffa`84567034 msi!CMsiCustomAction::CustomActionThread+0x34c
+         * 07 0000007e`ccd7f8c0 00007ffa`849a2651 KERNEL32!BaseThreadInitThunk+0x14
+         * 08 0000007e`ccd7f8f0 00000000`00000000 ntdll!RtlUserThreadStart+0x21
+         * 0:006> r
+         * rax=0000000000000000 rbx=0000025f4f03af90 rcx=00007ffa83f23b40
+         * rdx=0000025f4f03af90 rsi=0000025f5108be50 rdi=0000025f4f066f10
+         * rip=00007ffa83e2a42a rsp=0000007eccd7c070 rbp=00007ffa83f23000
+         *  r8=0000007eccd7c0a8  r9=0000007eccd7c1f0 r10=0000000000000000
+         * r11=0000007eccd7c020 r12=0000007eccd7c3d0 r13=00007ffa83f23000
+         * r14=0000000000000000 r15=0000025f4f03af90
+         * iopl=0         nv up ei pl nz na po nc
+         * cs=0033  ss=002b  ds=002b  es=002b  fs=0053  gs=002b             efl=00010206
+         * SETUPAPI!DereferenceClassDriverList+0x4e:
+         * 00007ffa`83e2a42a 834008ff        add     dword ptr [rax+8],0FFFFFFFFh ds:00000000`00000008=????????
+         *
+         */
         if (destroyList)
-            SetupDiDestroyDriverInfoList(hDeviceInfo, &DeviceInfoData,
-                                         SPDIT_CLASSDRIVER);
+            SetupDiDestroyDriverInfoList(hDeviceInfo, &DeviceInfoData, SPDIT_CLASSDRIVER);
+#else
+        RT_NOREF(destroyList);
+#endif
+
         /* clean up the device info set */
-        SetupDiDestroyDeviceInfoList (hDeviceInfo);
-    }
-
-    /* return the network connection GUID on success */
+        SetupDiDestroyDeviceInfoList(hDeviceInfo);
+    }
+
+    /*
+     * Return the network connection GUID on success.
+     */
     if (SUCCEEDED(hrc))
     {
-        HRESULT hr;
-        INetCfg *pNetCfg = NULL;
-        LPWSTR lpszApp = NULL;
-
+        /** @todo r=bird: Some please explain this mess. It's not just returning a
+         *        GUID here, it's a bit more than that. */
         RENAMING_CONTEXT context;
         context.hr = E_FAIL;
@@ -3477 +3430 @@
         if (pGuid)
         {
-            hrc = CLSIDFromString(pWCfgGuidString, (LPCLSID)pGuid);
+            hrc = CLSIDFromString(wszCfgGuidString, (LPCLSID)pGuid);
             if (FAILED(hrc))
                 NonStandardLogFlow(("CLSIDFromString failed, hrc (0x%x)\n", hrc));
         }
 
-        hr = VBoxNetCfgWinQueryINetCfg(&pNetCfg, TRUE, L"VirtualBox Host-Only Creation",
-                                       30 * 1000, /* on Vista we often get 6to4svc.dll holding the lock, wait for 30 sec.  */
-                                       /** @todo special handling for 6to4svc.dll ???, i.e. several retrieves */
-                                       &lpszApp);
-        if (hr == S_OK)
-        {
-            if (!!bstrNewInterfaceName)
+        INetCfg *pNetCfg = NULL;
+        LPWSTR   pwszApp = NULL;
+        HRESULT hrc2 = VBoxNetCfgWinQueryINetCfg(&pNetCfg, TRUE, L"VirtualBox Host-Only Creation",
+                                                 30 * 1000, /* on Vista we often get 6to4svc.dll holding the lock, wait for 30 sec.  */
+                                                 /** @todo special handling for 6to4svc.dll ???, i.e. several retrieves */
+                                                 &pwszApp);
+        if (hrc2 == S_OK)
+        {
+            if (bstrNewInterfaceName.isNotEmpty())
             {
                 /* The assigned name does not match the desired one, rename the device */
-                context.bstrName = bstrNewInterfaceName.GetBSTR();
-                context.pGuid = pGuid;
-                hr = vboxNetCfgWinEnumNetCfgComponents(pNetCfg,
-                                                       &GUID_DEVCLASS_NET,
-                                                       vboxNetCfgWinRenameHostOnlyNetworkInterface,
-                                                       &context);
-            }
-            if (SUCCEEDED(hr))
-                hr = vboxNetCfgWinEnumNetCfgComponents(pNetCfg,
-                                                       &GUID_DEVCLASS_NETSERVICE,
-                                                       vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority,
-                                                       pGuid);
-            if (SUCCEEDED(hr))
-                hr = vboxNetCfgWinEnumNetCfgComponents(pNetCfg,
-                                                       &GUID_DEVCLASS_NETTRANS,
-                                                       vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority,
-                                                       pGuid);
-            if (SUCCEEDED(hr))
-                hr = vboxNetCfgWinEnumNetCfgComponents(pNetCfg,
-                                                       &GUID_DEVCLASS_NETCLIENT,
-                                                       vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority,
-                                                       pGuid);
-            if (SUCCEEDED(hr))
-            {
-                hr = pNetCfg->Apply();
-            }
+                context.bstrName = bstrNewInterfaceName.raw();
+                context.pGuid    = pGuid;
+                hrc2 = vboxNetCfgWinEnumNetCfgComponents(pNetCfg, &GUID_DEVCLASS_NET,
+                                                         vboxNetCfgWinRenameHostOnlyNetworkInterface, &context);
+            }
+            if (SUCCEEDED(hrc2))
+                hrc2 = vboxNetCfgWinEnumNetCfgComponents(pNetCfg, &GUID_DEVCLASS_NETSERVICE,
+                                                         vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority, pGuid);
+            if (SUCCEEDED(hrc2))
+                hrc2 = vboxNetCfgWinEnumNetCfgComponents(pNetCfg, &GUID_DEVCLASS_NETTRANS,
+                                                         vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority, pGuid);
+            if (SUCCEEDED(hrc2))
+                hrc2 = vboxNetCfgWinEnumNetCfgComponents(pNetCfg, &GUID_DEVCLASS_NETCLIENT,
+                                                         vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority, pGuid);
+            if (SUCCEEDED(hrc2))
+                hrc2 = pNetCfg->Apply();
             else
-                NonStandardLogFlow(("Enumeration failed, hr 0x%x\n", hr));
+                NonStandardLogFlow(("Enumeration failed, hrc2=%Rhrc\n", hrc2));
+
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
         }
-        else if (hr == NETCFG_E_NO_WRITE_LOCK && lpszApp)
-        {
-            NonStandardLogFlow(("Application %ws is holding the lock, failed\n", lpszApp));
-            CoTaskMemFree(lpszApp);
+        else if (hrc2 == NETCFG_E_NO_WRITE_LOCK && pwszApp)
+        {
+            NonStandardLogFlow(("Application '%ls' is holding the lock, failed\n", pwszApp));
+            CoTaskMemFree(pwszApp);
+            pwszApp = NULL;
         }
         else
-            NonStandardLogFlow(("VBoxNetCfgWinQueryINetCfg failed, hr 0x%x\n", hr));
+            NonStandardLogFlow(("VBoxNetCfgWinQueryINetCfg failed, hrc2=%Rhrc\n", hrc2));
 
 #ifndef VBOXNETCFG_DELAYEDRENAME
-        if (SUCCEEDED(hr) && SUCCEEDED(context.hr))
-        {
-            /* The device has been successfully renamed, replace the name now. */
-            wcscpy_s(DevName, RT_ELEMENTS(DevName), bstrDesiredName);
-        }
-
-        WCHAR ConnectionName[128];
-        ULONG cbName = sizeof(ConnectionName);
-
-        hr = VBoxNetCfgWinGenHostonlyConnectionName(DevName, ConnectionName, &cbName);
-        if (SUCCEEDED(hr))
-            hr = VBoxNetCfgWinRenameConnection(pWCfgGuidString, ConnectionName);
+        /* If the device has been successfully renamed, replace the name now. */
+        if (SUCCEEDED(hrc2) && SUCCEEDED(context.hr))
+            RTUtf16Copy(wszDevName, RT_ELEMENTS(wszDevName), pBstrDesiredName);
+
+        WCHAR wszConnectionName[128];
+        hrc2 = VBoxNetCfgWinGenHostonlyConnectionName(wszDevName, wszConnectionName, RT_ELEMENTS(wszConnectionName), NULL);
+        if (SUCCEEDED(hrc2))
+            hrc2 = VBoxNetCfgWinRenameConnection(wszCfgGuidString, wszConnectionName);
 #endif
-        if (lppszName)
-        {
-            *lppszName = SysAllocString((const OLECHAR *) DevName);
-            if (!*lppszName)
+
+        /*
+         * Now, return the network connection GUID/name.
+         */
+        if (pBstrName)
+        {
+            *pBstrName = SysAllocString((const OLECHAR *)wszDevName);
+            if (!*pBstrName)
             {
                 NonStandardLogFlow(("SysAllocString failed\n"));
-                hrc = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
-            }
-        }
-    }
-
-    if (pErrMsg && bstrError.length())
-        *pErrMsg = bstrError.Detach();
-
+                hrc = E_OUTOFMEMORY;
+            }
+        }
+    }
+
+    if (pBstrErrMsg)
+    {
+        *pBstrErrMsg = NULL;
+        if (bstrError.isNotEmpty())
+            bstrError.detachToEx(pBstrErrMsg);
+    }
     return hrc;
 }
 
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWSTR pInfPath, IN bool bIsInfPathFile, IN BSTR pwsDesiredName,
-                                                                        OUT GUID *pGuid, OUT BSTR *lppszName, OUT BSTR *pErrMsg)
-{
-    HRESULT hrc = vboxNetCfgWinCreateHostOnlyNetworkInterface(pInfPath, bIsInfPathFile, pwsDesiredName, pGuid, lppszName, pErrMsg);
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWSTR pwszInfPath, IN bool fIsInfPathFile,
+                                                                        IN BSTR pwszDesiredName, OUT GUID *pGuid,
+                                                                        OUT BSTR *pBstrName, OUT BSTR *pBstrErrMsg)
+{
+    HRESULT hrc = vboxNetCfgWinCreateHostOnlyNetworkInterface(pwszInfPath, fIsInfPathFile, pwszDesiredName,
+                                                              pGuid, pBstrName, pBstrErrMsg);
     if (hrc == E_ABORT)
     {
         NonStandardLogFlow(("Timed out while waiting for NetCfgInstanceId, try again immediately...\n"));
+
         /*
          * This is the first time we fail to obtain NetCfgInstanceId, let us
@@ -3575 +3528 @@
          * See @bugref{7973} for details.
          */
-        hrc = vboxNetCfgWinCreateHostOnlyNetworkInterface(pInfPath, bIsInfPathFile, pwsDesiredName, pGuid, lppszName, pErrMsg);
+        hrc = vboxNetCfgWinCreateHostOnlyNetworkInterface(pwszInfPath, fIsInfPathFile, pwszDesiredName,
+                                                          pGuid, pBstrName, pBstrErrMsg);
         if (hrc == E_ABORT)
         {
             NonStandardLogFlow(("Timed out again while waiting for NetCfgInstanceId, try again after a while...\n"));
+
             /*
              * This is the second time we fail to obtain NetCfgInstanceId, let us
@@ -3585 +3540 @@
              * conditions. See @bugref{7973} for details.
              */
-
-            SC_HANDLE hSCM = NULL;
-            SC_HANDLE hService = NULL;
-
-            hSCM = OpenSCManager(NULL, NULL, GENERIC_READ);
+            SC_HANDLE hSCM = OpenSCManagerW(NULL, NULL, GENERIC_READ);
             if (hSCM)
             {
-                hService = OpenService(hSCM, _T("NetSetupSvc"), GENERIC_READ);
+                SC_HANDLE hService = OpenServiceW(hSCM, L"NetSetupSvc", GENERIC_READ);
                 if (hService)
                 {
@@ -3598 +3549 @@
                         Sleep(1000);
                     CloseServiceHandle(hService);
-                    hrc = vboxNetCfgWinCreateHostOnlyNetworkInterface(pInfPath, bIsInfPathFile, pwsDesiredName, pGuid, lppszName, pErrMsg);
+                    hrc = vboxNetCfgWinCreateHostOnlyNetworkInterface(pwszInfPath, fIsInfPathFile, pwszDesiredName,
+                                                                      pGuid, pBstrName, pBstrErrMsg);
                 }
                 else
-                    NonStandardLogFlow(("OpenService failed (0x%x)\n", GetLastError()));
+                    NonStandardLogFlow(("OpenService failed (%Rwc)\n", GetLastError()));
                 CloseServiceHandle(hSCM);
             }
             else
-                NonStandardLogFlow(("OpenSCManager failed (0x%x)", GetLastError()));
+                NonStandardLogFlow(("OpenSCManager failed (%Rwc)", GetLastError()));
+
             /* Give up and report the error. */
             if (hrc == E_ABORT)
             {
-                if (pErrMsg)
-                {
-                    bstr_t bstrError = bstr_printf("Querying NetCfgInstanceId failed (0x%08X)", ERROR_FILE_NOT_FOUND);
-                    *pErrMsg = bstrError.Detach();
+                if (pBstrErrMsg)
+                {
+                    com::Bstr bstrError;
+                    bstrError.printfNoThrow("Querying NetCfgInstanceId failed (ERROR_FILE_NOT_FOUND)");
+                    bstrError.detachToEx(pBstrErrMsg);
                 }
                 hrc = E_FAIL;
@@ -3621 +3575 @@
 }
 
-
-HRESULT vboxLoadIpHelpFunctions(HINSTANCE& pIpHlpInstance)
-{
-    Assert(pIpHlpInstance != NULL);
-
-    pIpHlpInstance = loadSystemDll("Iphlpapi.dll");
-    if (pIpHlpInstance == NULL)
-        return E_FAIL;
-
-    g_pfnInitializeIpInterfaceEntry =
-        (PFNINITIALIZEIPINTERFACEENTRY)GetProcAddress(pIpHlpInstance, "InitializeIpInterfaceEntry");
-    Assert(g_pfnInitializeIpInterfaceEntry);
-
-    if (g_pfnInitializeIpInterfaceEntry)
-    {
-        g_pfnGetIpInterfaceEntry =
-            (PFNGETIPINTERFACEENTRY)GetProcAddress(pIpHlpInstance, "GetIpInterfaceEntry");
-        Assert(g_pfnGetIpInterfaceEntry);
-    }
-
-    if (g_pfnGetIpInterfaceEntry)
-    {
-        g_pfnSetIpInterfaceEntry =
-            (PFNSETIPINTERFACEENTRY)GetProcAddress(pIpHlpInstance, "SetIpInterfaceEntry");
-        Assert(g_pfnSetIpInterfaceEntry);
-    }
-
-    if (g_pfnInitializeIpInterfaceEntry == NULL)
-    {
-        FreeLibrary(pIpHlpInstance);
-        pIpHlpInstance = NULL;
-        return E_FAIL;
-    }
-
-    return S_OK;
-}
-
-
-HRESULT vboxNetCfgWinGetLoopbackMetric(OUT int* Metric)
-{
-    HRESULT rc = S_OK;
-    MIB_IPINTERFACE_ROW row;
-
+static HRESULT vboxNetCfgWinGetLoopbackMetric(OUT DWORD *Metric)
+{
     Assert(g_pfnInitializeIpInterfaceEntry != NULL);
     Assert(g_pfnGetIpInterfaceEntry != NULL);
 
+    MIB_IPINTERFACE_ROW row;
+    RT_ZERO(row); /* paranoia */
     g_pfnInitializeIpInterfaceEntry(&row);
+
     row.Family = AF_INET;
     row.InterfaceLuid.Info.IfType = IF_TYPE_SOFTWARE_LOOPBACK;
 
-    rc = g_pfnGetIpInterfaceEntry(&row);
-    if (rc != NO_ERROR)
-        return HRESULT_FROM_WIN32(rc);
-
-    *Metric = row.Metric;
-
-    return rc;
-}
-
-
-HRESULT vboxNetCfgWinSetInterfaceMetric(
-    IN NET_LUID* pInterfaceLuid,
-    IN DWORD metric)
-{
-    MIB_IPINTERFACE_ROW newRow;
-
+    NETIO_STATUS dwErr = g_pfnGetIpInterfaceEntry(&row);
+    if (dwErr == NO_ERROR)
+    {
+        *Metric = row.Metric;
+        return S_OK;
+    }
+    return HRESULT_FROM_WIN32(dwErr);
+}
+
+static HRESULT vboxNetCfgWinSetInterfaceMetric(IN NET_LUID *pInterfaceLuid, IN DWORD metric)
+{
     Assert(g_pfnInitializeIpInterfaceEntry != NULL);
     Assert(g_pfnSetIpInterfaceEntry != NULL);
 
+    MIB_IPINTERFACE_ROW newRow;
+    RT_ZERO(newRow); /* paranoia */
     g_pfnInitializeIpInterfaceEntry(&newRow);
+
     // identificate the interface to change
     newRow.InterfaceLuid = *pInterfaceLuid;
     newRow.Family = AF_INET;
+
     // changed settings
     newRow.UseAutomaticMetric = false;
@@ -3699 +3614 @@
 
     // change settings
-    return HRESULT_FROM_WIN32(g_pfnSetIpInterfaceEntry(&newRow));
-}
-
-
-HRESULT vboxNetCfgWinGetInterfaceLUID(IN HKEY hKey, OUT NET_LUID* pLUID)
-{
-    HRESULT res = S_OK;
-    DWORD luidIndex = 0;
-    DWORD ifType = 0;
-    DWORD cbSize = sizeof(luidIndex);
-    DWORD dwValueType = REG_DWORD;
-
+    NETIO_STATUS dwErr = g_pfnSetIpInterfaceEntry(&newRow);
+    if (dwErr == NO_ERROR)
+        return S_OK;
+    return HRESULT_FROM_WIN32(dwErr);
+}
+
+static HRESULT vboxNetCfgWinSetupMetric(IN NET_LUID* pLuid)
+{
+    HRESULT  hrc  = E_FAIL;
+    HMODULE  hmod = loadSystemDll(L"Iphlpapi.dll");
+    if (hmod)
+    {
+        g_pfnInitializeIpInterfaceEntry = (PFNINITIALIZEIPINTERFACEENTRY)GetProcAddress(hmod, "InitializeIpInterfaceEntry");
+        g_pfnGetIpInterfaceEntry        = (PFNGETIPINTERFACEENTRY)       GetProcAddress(hmod, "GetIpInterfaceEntry");
+        g_pfnSetIpInterfaceEntry        = (PFNSETIPINTERFACEENTRY)       GetProcAddress(hmod, "SetIpInterfaceEntry");
+        Assert(g_pfnInitializeIpInterfaceEntry);
+        Assert(g_pfnGetIpInterfaceEntry);
+        Assert(g_pfnSetIpInterfaceEntry);
+
+        if (   g_pfnInitializeIpInterfaceEntry
+            && g_pfnGetIpInterfaceEntry
+            && g_pfnSetIpInterfaceEntry)
+        {
+            DWORD loopbackMetric = 0;
+            hrc = vboxNetCfgWinGetLoopbackMetric(&loopbackMetric);
+            if (SUCCEEDED(hrc))
+                hrc = vboxNetCfgWinSetInterfaceMetric(pLuid, loopbackMetric - 1);
+        }
+
+        g_pfnInitializeIpInterfaceEntry = NULL;
+        g_pfnSetIpInterfaceEntry        = NULL;
+        g_pfnGetIpInterfaceEntry        = NULL;
+
+        FreeLibrary(hmod);
+    }
+    return hrc;
+}
+
+static HRESULT vboxNetCfgWinGetInterfaceLUID(IN HKEY hKey, OUT NET_LUID *pLUID)
+{
     if (pLUID == NULL)
         return E_INVALIDARG;
 
-    res = RegQueryValueExW(hKey, L"NetLuidIndex", NULL,
-        &dwValueType, (LPBYTE)&luidIndex, &cbSize);
-    if (res != 0)
-        return HRESULT_FROM_WIN32(res);
-
-    cbSize = sizeof(ifType);
-    dwValueType = REG_DWORD;
-    res = RegQueryValueExW(hKey, L"*IfType", NULL,
-        &dwValueType, (LPBYTE)&ifType, &cbSize);
-    if (res != 0)
-        return HRESULT_FROM_WIN32(res);
-
-    ZeroMemory(pLUID, sizeof(NET_LUID));
-    pLUID->Info.IfType = ifType;
-    pLUID->Info.NetLuidIndex = luidIndex;
-
-    return res;
-}
-
-
-HRESULT vboxNetCfgWinSetupMetric(IN NET_LUID* pLuid)
-{
-    HINSTANCE hModule = NULL;
-    HRESULT rc = vboxLoadIpHelpFunctions(hModule);
-    if (SUCCEEDED(rc))
-    {
-        int loopbackMetric;
-        rc = vboxNetCfgWinGetLoopbackMetric(&loopbackMetric);
-        if (SUCCEEDED(rc))
-            rc = vboxNetCfgWinSetInterfaceMetric(pLuid, loopbackMetric - 1);
-    }
-
-    g_pfnInitializeIpInterfaceEntry = NULL;
-    g_pfnSetIpInterfaceEntry = NULL;
-    g_pfnGetIpInterfaceEntry = NULL;
-
-    FreeLibrary(hModule);
-    return rc;
-}
+    DWORD dwLuidIndex = 0;
+    DWORD cbSize      = sizeof(dwLuidIndex);
+    DWORD dwValueType = REG_DWORD; /** @todo r=bird: This is output only. No checked after the call. So, only for debugging? */
+    LSTATUS lrc = RegQueryValueExW(hKey, L"NetLuidIndex", NULL, &dwValueType, (LPBYTE)&dwLuidIndex, &cbSize);
+    if (lrc == ERROR_SUCCESS)
+    {
+        DWORD dwIfType = 0;
+        cbSize         = sizeof(dwIfType);
+        dwValueType    = REG_DWORD; /** @todo r=bird: This is output only. No checked after the call. So, only for debugging? */
+        lrc = RegQueryValueExW(hKey, L"*IfType", NULL, &dwValueType, (LPBYTE)&dwIfType, &cbSize);
+        if (lrc == ERROR_SUCCESS)
+        {
+            RT_ZERO(*pLUID);
+            pLUID->Info.IfType       = dwIfType;
+            pLUID->Info.NetLuidIndex = dwLuidIndex;
+            return S_OK;
+        }
+    }
+
+    RT_ZERO(*pLUID);
+    return HRESULT_FROM_WIN32(lrc);
+}
+
+
 #ifdef VBOXNETCFG_DELAYEDRENAME
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinRenameHostOnlyConnection(IN const GUID *pGuid, IN LPCWSTR pwszId, OUT BSTR *pDevName)
 {
-    HRESULT hr = S_OK;
-    WCHAR wszDevName[256];
-    WCHAR wszConnectionNewName[128];
-    ULONG cbName = sizeof(wszConnectionNewName);
-
+    if (pDevName)
+        *pDevName = NULL;
+
+    HRESULT  hr = S_OK; /** @todo r=bird: ODD return status for SetupDiCreateDeviceInfoList failures! */
     HDEVINFO hDevInfo = SetupDiCreateDeviceInfoList(&GUID_DEVCLASS_NET, NULL);
     if (hDevInfo != INVALID_HANDLE_VALUE)
     {
-        SP_DEVINFO_DATA DevInfoData;
-
-        DevInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
+        SP_DEVINFO_DATA DevInfoData = { sizeof(SP_DEVINFO_DATA) };
         if (SetupDiOpenDeviceInfo(hDevInfo, pwszId, NULL, 0, &DevInfoData))
         {
+            WCHAR wszDevName[256 + 1] = {0};
             DWORD err = ERROR_SUCCESS;
-            if (!SetupDiGetDeviceRegistryPropertyW(hDevInfo, &DevInfoData,
-                                                   SPDRP_FRIENDLYNAME, NULL,
-                                                   (PBYTE)wszDevName, RT_ELEMENTS(wszDevName), NULL))
+            if (!SetupDiGetDeviceRegistryPropertyW(hDevInfo, &DevInfoData, SPDRP_FRIENDLYNAME, NULL /*PropertyRegDataType*/,
+                                                   (PBYTE)wszDevName, sizeof(wszDevName) - sizeof(WCHAR) /*yes, bytes*/,
+                                                   NULL /*RequiredSize*/))
             {
                 err = GetLastError();
                 if (err == ERROR_INVALID_DATA)
                 {
-                    err = SetupDiGetDeviceRegistryPropertyW(hDevInfo, &DevInfoData,
-                                                            SPDRP_DEVICEDESC, NULL,
-                                                            (PBYTE)wszDevName, RT_ELEMENTS(wszDevName), NULL)
-                        ? ERROR_SUCCESS
-                        : GetLastError();
+                    RT_ZERO(wszDevName);
+                    if (SetupDiGetDeviceRegistryPropertyW(hDevInfo, &DevInfoData, SPDRP_DEVICEDESC, NULL /*PropertyRegDataType*/,
+                                                          (PBYTE)wszDevName, sizeof(wszDevName) - sizeof(WCHAR) /*yes, bytes*/,
+                                                          NULL /*RequiredSize*/))
+                        err = ERROR_SUCCESS;
+                    else
+                        err = GetLastError();
                 }
             }
             if (err == ERROR_SUCCESS)
             {
-                hr = VBoxNetCfgWinGenHostonlyConnectionName(wszDevName, wszConnectionNewName, &cbName);
+                WCHAR wszConnectionNewName[128] = {0};
+                hr = VBoxNetCfgWinGenHostonlyConnectionName(wszDevName, wszConnectionNewName,
+                                                            RT_ELEMENTS(wszConnectionNewName), NULL);
                 if (SUCCEEDED(hr))
                 {

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

@@ -2 +2 @@
 /** @file
  * VBoxNetFltNobj.cpp - Notify Object for Bridged Networking Driver.
+ *
  * Used to filter Bridged Networking Driver bindings
  */
+
 /*
  * Copyright (C) 2011-2022 Oracle and/or its affiliates.
@@ -34 +36 @@
  * SPDX-License-Identifier: GPL-3.0-only OR CDDL-1.0
  */
+
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include "VBoxNetFltNobj.h"
 #include <iprt/win/ntddndis.h>
-#include <assert.h>
-#include <stdio.h>
+#include <iprt/win/windows.h>
+#include <winreg.h>
+#include <Olectl.h>
 
 #include <VBoxNetFltNobjT_i.c>
 
-#include <Olectl.h>
-
+#include <iprt/assert.h>
+#include <iprt/utf16.h>
+#include <iprt/string.h>
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 //# define VBOXNETFLTNOTIFY_DEBUG_BIND
 
 #ifdef DEBUG
-# define NonStandardAssert(a) assert(a)
-# define NonStandardAssertBreakpoint() assert(0)
+# define NonStandardAssert(a)           Assert(a)
+# define NonStandardAssertBreakpoint()  AssertFailed()
 #else
 # define NonStandardAssert(a) do{}while (0)
@@ -53 +67 @@
 #endif
 
-VBoxNetFltNobj::VBoxNetFltNobj() :
-    mpNetCfg(NULL),
-    mpNetCfgComponent(NULL),
-    mbInstalling(FALSE)
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
+static HMODULE g_hModSelf = (HMODULE)~(uintptr_t)0;
+
+
+VBoxNetFltNobj::VBoxNetFltNobj()
+    : mpNetCfg(NULL)
+    , mpNetCfgComponent(NULL)
+    , mbInstalling(FALSE)
 {
 }
@@ -126 +147 @@
 static HRESULT vboxNetFltWinQueryInstanceKey(IN INetCfgComponent *pComponent, OUT PHKEY phKey)
 {
-    LPWSTR pPnpId;
-    HRESULT hr = pComponent->GetPnpDevNodeId(&pPnpId);
-    if (hr == S_OK)
-    {
-        WCHAR KeyName[MAX_PATH];
-        wcscpy(KeyName, L"SYSTEM\\CurrentControlSet\\Enum\\");
-        wcscat(KeyName,pPnpId);
-
-        LONG winEr = RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyName,
-          0, /*__reserved DWORD ulOptions*/
-          KEY_READ, /*__in REGSAM samDesired*/
-          phKey);
-
-        if (winEr != ERROR_SUCCESS)
-        {
-            hr = HRESULT_FROM_WIN32(winEr);
+    LPWSTR pwszPnpId;
+    HRESULT hrc = pComponent->GetPnpDevNodeId(&pwszPnpId);
+    if (hrc == S_OK)
+    {
+        WCHAR wszKeyName[MAX_PATH];
+        RTUtf16Copy(wszKeyName, MAX_PATH, L"SYSTEM\\CurrentControlSet\\Enum\\");
+        int rc = RTUtf16Cat(wszKeyName, MAX_PATH, pwszPnpId);
+        if (RT_SUCCESS(rc))
+        {
+            LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszKeyName, 0 /*ulOptions*/, KEY_READ, phKey);
+            if (lrc != ERROR_SUCCESS)
+            {
+                hrc = HRESULT_FROM_WIN32(lrc);
+                NonStandardAssertBreakpoint();
+            }
+        }
+        else
+            AssertRCStmt(rc, hrc = ERROR_BUFFER_OVERFLOW);
+
+        CoTaskMemFree(pwszPnpId);
+    }
+    else
+        NonStandardAssertBreakpoint();
+    return hrc;
+}
+
+static HRESULT vboxNetFltWinQueryDriverKey(IN HKEY InstanceKey, OUT PHKEY phKey)
+{
+    HRESULT hrc = S_OK;
+
+    WCHAR   wszValue[MAX_PATH];
+    DWORD   cbValue = sizeof(wszValue) - sizeof(WCHAR);
+    DWORD   dwType  = REG_SZ;
+    LSTATUS lrc = RegQueryValueExW(InstanceKey, L"Driver", NULL /*lpReserved*/, &dwType, (LPBYTE)wszValue, &cbValue);
+    if (lrc == ERROR_SUCCESS)
+    {
+        if (dwType == REG_SZ)
+        {
+            wszValue[RT_ELEMENTS(wszValue) - 1] = '\0'; /* registry strings does not need to be zero terminated. */
+
+            WCHAR wszKeyName[MAX_PATH];
+            RTUtf16Copy(wszKeyName, MAX_PATH, L"SYSTEM\\CurrentControlSet\\Control\\Class\\");
+            int rc = RTUtf16Cat(wszKeyName, MAX_PATH, wszValue);
+            if (RT_SUCCESS(rc))
+            {
+                lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszKeyName, 0 /*ulOptions*/, KEY_READ, phKey);
+                if (lrc != ERROR_SUCCESS)
+                {
+                    hrc = HRESULT_FROM_WIN32(lrc);
+                    NonStandardAssertBreakpoint();
+                }
+            }
+            else
+                AssertRCStmt(rc, hrc = ERROR_BUFFER_OVERFLOW);
+        }
+        else
+        {
+            hrc = HRESULT_FROM_WIN32(ERROR_DATATYPE_MISMATCH);
             NonStandardAssertBreakpoint();
         }
-
-        CoTaskMemFree(pPnpId);
     }
     else
     {
-        NonStandardAssertBreakpoint();
-    }
-
-    return hr;
-}
-
-static HRESULT vboxNetFltWinQueryDriverKey(IN HKEY InstanceKey, OUT PHKEY phKey)
-{
-    DWORD Type = REG_SZ;
-    WCHAR Value[MAX_PATH];
-    DWORD cbValue = sizeof(Value);
-    HRESULT hr = S_OK;
-    LONG winEr = RegQueryValueExW(InstanceKey,
-            L"Driver", /*__in_opt LPCTSTR lpValueName*/
-            0, /*__reserved LPDWORD lpReserved*/
-            &Type, /*__out_opt LPDWORD lpType*/
-            (LPBYTE)Value, /*__out_opt LPBYTE lpData*/
-            &cbValue/*__inout_opt LPDWORD lpcbData*/
-            );
-
-    if (winEr == ERROR_SUCCESS)
-    {
-        WCHAR KeyName[MAX_PATH];
-        wcscpy(KeyName, L"SYSTEM\\CurrentControlSet\\Control\\Class\\");
-        wcscat(KeyName,Value);
-
-        winEr = RegOpenKeyExW(HKEY_LOCAL_MACHINE, KeyName,
-          0, /*__reserved DWORD ulOptions*/
-          KEY_READ, /*__in REGSAM samDesired*/
-          phKey);
-
-        if (winEr != ERROR_SUCCESS)
-        {
-            hr = HRESULT_FROM_WIN32(winEr);
+        hrc = HRESULT_FROM_WIN32(lrc);
+        NonStandardAssertBreakpoint();
+    }
+
+    return hrc;
+}
+
+static HRESULT vboxNetFltWinQueryDriverKey(IN INetCfgComponent *pComponent, OUT PHKEY phKey)
+{
+    HKEY    hKeyInstance = NULL;
+    HRESULT hrc = vboxNetFltWinQueryInstanceKey(pComponent, &hKeyInstance);
+    if (hrc == S_OK)
+    {
+        hrc = vboxNetFltWinQueryDriverKey(hKeyInstance, phKey);
+        if (hrc != S_OK)
             NonStandardAssertBreakpoint();
-        }
+        RegCloseKey(hKeyInstance);
     }
     else
-    {
-        hr = HRESULT_FROM_WIN32(winEr);
-        NonStandardAssertBreakpoint();
-    }
-
-    return hr;
-}
-
-static HRESULT vboxNetFltWinQueryDriverKey(IN INetCfgComponent *pComponent, OUT PHKEY phKey)
-{
-    HKEY InstanceKey;
-    HRESULT hr = vboxNetFltWinQueryInstanceKey(pComponent, &InstanceKey);
-    if (hr == S_OK)
-    {
-        hr = vboxNetFltWinQueryDriverKey(InstanceKey, phKey);
-        if (hr != S_OK)
-        {
-            NonStandardAssertBreakpoint();
-        }
-        RegCloseKey(InstanceKey);
+        NonStandardAssertBreakpoint();
+    return hrc;
+}
+
+static HRESULT vboxNetFltWinNotifyCheckNetAdp(IN INetCfgComponent *pComponent, OUT bool *pfShouldBind)
+{
+    *pfShouldBind = false;
+
+    LPWSTR  pwszDevId = NULL;
+    HRESULT hrc = pComponent->GetId(&pwszDevId);
+    if (hrc == S_OK)
+    {
+        /** @todo r=bird: This was _wcsnicmp(pwszDevId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
+         * which includes the terminator, so it translates to a full compare. Goes way back. */
+        if (RTUtf16ICmpAscii(pwszDevId, "sun_VBoxNetAdp") == 0)
+            *pfShouldBind = false;
+        else
+            hrc = S_FALSE;
+        CoTaskMemFree(pwszDevId);
     }
     else
-    {
-        NonStandardAssertBreakpoint();
-    }
-
-    return hr;
-}
-
-static HRESULT vboxNetFltWinNotifyCheckNetAdp(IN INetCfgComponent *pComponent, OUT bool * pbShouldBind)
-{
-    HRESULT hr;
-    LPWSTR pDevId;
-    hr = pComponent->GetId(&pDevId);
-    if (hr == S_OK)
-    {
-        if (!_wcsnicmp(pDevId, L"sun_VBoxNetAdp", sizeof(L"sun_VBoxNetAdp")/2))
-        {
-            *pbShouldBind = false;
-        }
-        else
-        {
-            hr = S_FALSE;
-        }
-        CoTaskMemFree(pDevId);
-    }
-    else
-    {
-        NonStandardAssertBreakpoint();
-    }
-
-    return hr;
-}
-
-static HRESULT vboxNetFltWinNotifyCheckMsLoop(IN INetCfgComponent *pComponent, OUT bool * pbShouldBind)
-{
-    HRESULT hr;
-    LPWSTR pDevId;
-    hr = pComponent->GetId(&pDevId);
-    if (hr == S_OK)
-    {
-        if (!_wcsnicmp(pDevId, L"*msloop", sizeof(L"*msloop")/2))
+        NonStandardAssertBreakpoint();
+
+    return hrc;
+}
+
+static HRESULT vboxNetFltWinNotifyCheckMsLoop(IN INetCfgComponent *pComponent, OUT bool *pfShouldBind)
+{
+    *pfShouldBind = false;
+
+    LPWSTR  pwszDevId = NULL;
+    HRESULT hrc = pComponent->GetId(&pwszDevId);
+    if (hrc == S_OK)
+    {
+        /** @todo r=bird: This was _wcsnicmp(pwszDevId, L"*msloop", sizeof(L"*msloop")/2)
+         * which includes the terminator, making it a full compare. Goes way back. */
+        if (RTUtf16ICmpAscii(pwszDevId, "*msloop") == 0)
         {
             /* we need to detect the medium the adapter is presenting
              * to do that we could examine in the registry the *msloop params */
-            HKEY DriverKey;
-            hr = vboxNetFltWinQueryDriverKey(pComponent, &DriverKey);
-            if (hr == S_OK)
+            HKEY hKeyDriver;
+            hrc = vboxNetFltWinQueryDriverKey(pComponent, &hKeyDriver);
+            if (hrc == S_OK)
             {
-                DWORD Type = REG_SZ;
-                WCHAR Value[64]; /* 2 should be enough actually, paranoid check for extra spaces */
-                DWORD cbValue = sizeof(Value);
-                LONG winEr = RegQueryValueExW(DriverKey,
-                            L"Medium", /*__in_opt LPCTSTR lpValueName*/
-                            0, /*__reserved LPDWORD lpReserved*/
-                            &Type, /*__out_opt LPDWORD lpType*/
-                            (LPBYTE)Value, /*__out_opt LPBYTE lpData*/
-                            &cbValue/*__inout_opt LPDWORD lpcbData*/
-                            );
-                if (winEr == ERROR_SUCCESS)
+                WCHAR wszValue[64]; /* 2 should be enough actually, paranoid check for extra spaces */
+                DWORD cbValue = sizeof(wszValue) - sizeof(WCHAR);
+                DWORD dwType  = REG_SZ;
+                LSTATUS lrc = RegQueryValueExW(hKeyDriver, L"Medium", NULL /*lpReserved*/, &dwType, (LPBYTE)wszValue, &cbValue);
+                if (lrc == ERROR_SUCCESS)
                 {
-                    PWCHAR endPrt;
-                    ULONG enmMedium = wcstoul(Value,
-                       &endPrt,
-                       0 /* base*/);
-
-                    winEr = errno;
-                    if (winEr == ERROR_SUCCESS)
+                    if (dwType == REG_SZ)
                     {
-                        if (enmMedium == 0) /* 0 is Ethernet */
+                        wszValue[RT_ELEMENTS(wszValue) - 1] = '\0';
+
+                        char szUtf8[256];
+                        char *pszUtf8 = szUtf8;
+                        RTUtf16ToUtf8Ex(wszValue, RTSTR_MAX, &pszUtf8, sizeof(szUtf8), NULL);
+                        pszUtf8 = RTStrStrip(pszUtf8);
+
+                        uint64_t uValue = 0;
+                        int rc = RTStrToUInt64Ex(pszUtf8, NULL, 0, &uValue);
+                        if (RT_SUCCESS(rc))
                         {
-                            *pbShouldBind = true;
+                            if (uValue == 0) /* 0 is Ethernet */
+                                *pfShouldBind = true;
+                            else
+                                *pfShouldBind = false;
                         }
                         else
                         {
-                            *pbShouldBind = false;
+                            NonStandardAssertBreakpoint();
+                            *pfShouldBind = true;
                         }
                     }
                     else
-                    {
                         NonStandardAssertBreakpoint();
-                        *pbShouldBind = true;
-                    }
                 }
                 else
@@ -295 +310 @@
                     /** @todo we should check the default medium in HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Class\{4D36E972-E325-11CE-BFC1-08002bE10318}\<driver_id>\Ndi\Params\Medium, REG_SZ "Default" value */
                     NonStandardAssertBreakpoint();
-                    *pbShouldBind = true;
+                    *pfShouldBind = true;
                 }
 
-                RegCloseKey(DriverKey);
+                RegCloseKey(hKeyDriver);
             }
             else
+                NonStandardAssertBreakpoint();
+        }
+        else
+            hrc = S_FALSE;
+        CoTaskMemFree(pwszDevId);
+    }
+    else
+        NonStandardAssertBreakpoint();
+    return hrc;
+}
+
+static HRESULT vboxNetFltWinNotifyCheckLowerRange(IN INetCfgComponent *pComponent, OUT bool *pfShouldBind)
+{
+    *pfShouldBind = false;
+
+    HKEY    hKeyDriver = NULL;
+    HRESULT hrc = vboxNetFltWinQueryDriverKey(pComponent, &hKeyDriver);
+    if (hrc == S_OK)
+    {
+        HKEY    hKeyInterfaces = NULL;
+        LSTATUS lrc = RegOpenKeyExW(hKeyDriver, L"Ndi\\Interfaces", 0 /*ulOptions*/, KEY_READ, &hKeyInterfaces);
+        if (lrc == ERROR_SUCCESS)
+        {
+            WCHAR wszValue[MAX_PATH];
+            DWORD cbValue = sizeof(wszValue) - sizeof(WCHAR);
+            DWORD dwType  = REG_SZ;
+            lrc = RegQueryValueExW(hKeyInterfaces, L"LowerRange", NULL /*lpReserved*/, &dwType, (LPBYTE)wszValue, &cbValue);
+            if (lrc == ERROR_SUCCESS)
             {
-                NonStandardAssertBreakpoint();
-            }
-        }
-        else
-        {
-            hr = S_FALSE;
-        }
-        CoTaskMemFree(pDevId);
-    }
-    else
-    {
-        NonStandardAssertBreakpoint();
-    }
-
-    return hr;
-}
-
-static HRESULT vboxNetFltWinNotifyCheckLowerRange(IN INetCfgComponent *pComponent, OUT bool * pbShouldBind)
-{
-    HKEY DriverKey;
-    HKEY InterfacesKey;
-    HRESULT hr = vboxNetFltWinQueryDriverKey(pComponent, &DriverKey);
-    if (hr == S_OK)
-    {
-        LONG winEr = RegOpenKeyExW(DriverKey, L"Ndi\\Interfaces",
-                        0, /*__reserved DWORD ulOptions*/
-                        KEY_READ, /*__in REGSAM samDesired*/
-                        &InterfacesKey);
-        if (winEr == ERROR_SUCCESS)
-        {
-            DWORD Type = REG_SZ;
-            WCHAR Value[MAX_PATH];
-            DWORD cbValue = sizeof(Value);
-            winEr = RegQueryValueExW(InterfacesKey,
-                    L"LowerRange", /*__in_opt LPCTSTR lpValueName*/
-                    0, /*__reserved LPDWORD lpReserved*/
-                    &Type, /*__out_opt LPDWORD lpType*/
-                    (LPBYTE)Value, /*__out_opt LPBYTE lpData*/
-                    &cbValue/*__inout_opt LPDWORD lpcbData*/
-                    );
-            if (winEr == ERROR_SUCCESS)
-            {
-                if (wcsstr(Value,L"ethernet") || wcsstr(Value, L"wan"))
+                if (dwType == REG_SZ)
                 {
-                    *pbShouldBind = true;
-                }
-                else
-                {
-                    *pbShouldBind = false;
+                    if (RTUtf16FindAscii(wszValue, "ethernet") >= 0 || RTUtf16FindAscii(wszValue, "wan") >= 0)
+                        *pfShouldBind = true;
+                    else
+                        *pfShouldBind = false;
                 }
             }
@@ -356 +356 @@
             {
                 /* do not set err status to it */
-                *pbShouldBind = false;
+                *pfShouldBind = false;
                 NonStandardAssertBreakpoint();
             }
 
-            RegCloseKey(InterfacesKey);
+            RegCloseKey(hKeyInterfaces);
         }
         else
         {
-            hr = HRESULT_FROM_WIN32(winEr);
+            hrc = HRESULT_FROM_WIN32(lrc);
             NonStandardAssertBreakpoint();
         }
 
-        RegCloseKey(DriverKey);
+        RegCloseKey(hKeyDriver);
     }
     else
-    {
-        NonStandardAssertBreakpoint();
-    }
-
-    return hr;
-}
-
-static HRESULT vboxNetFltWinNotifyShouldBind(IN INetCfgComponent *pComponent, OUT bool *pbShouldBind)
-{
-    DWORD fCharacteristics;
-    HRESULT hr;
-
-    do
-    {
-        /* filter out only physical adapters */
-        hr = pComponent->GetCharacteristics(&fCharacteristics);
-        if (hr != S_OK)
-        {
-            NonStandardAssertBreakpoint();
-            break;
-        }
-
-
-        if (fCharacteristics & NCF_HIDDEN)
-        {
-            /* we are not binding to hidden adapters */
-            *pbShouldBind = false;
-            break;
-        }
-
-        hr = vboxNetFltWinNotifyCheckMsLoop(pComponent, pbShouldBind);
-        if (hr == S_OK)
-        {
-            /* this is a loopback adapter,
-             * the pbShouldBind already contains the result */
-            break;
-        }
-        else if (hr != S_FALSE)
-        {
-            /* error occurred */
-            break;
-        }
-
-        hr = vboxNetFltWinNotifyCheckNetAdp(pComponent, pbShouldBind);
-        if (hr == S_OK)
-        {
-            /* this is a VBoxNetAdp adapter,
-             * the pbShouldBind already contains the result */
-            break;
-        }
-        else if (hr != S_FALSE)
-        {
-            /* error occurred */
-            break;
-        }
-
-        /* hr == S_FALSE means this is not a loopback adpater, set it to S_OK */
-        hr = S_OK;
-
-//        if (!(fCharacteristics & NCF_PHYSICAL))
-//        {
-//            /* we are binding to physical adapters only */
-//            *pbShouldBind = false;
-//            break;
-//        }
-
-        hr = vboxNetFltWinNotifyCheckLowerRange(pComponent, pbShouldBind);
-        if (hr == S_OK)
-        {
-            /* the vboxNetFltWinNotifyCheckLowerRange ccucceeded,
-             * the pbShouldBind already contains the result */
-            break;
-        }
-        /* we are here because of the fail, nothing else to do */
-    } while (0);
-
-    return hr;
-}
-
-
-static HRESULT vboxNetFltWinNotifyShouldBind(IN INetCfgBindingInterface *pIf, OUT bool *pbShouldBind)
-{
-    INetCfgComponent * pAdapterComponent;
-    HRESULT hr = pIf->GetLowerComponent(&pAdapterComponent);
-    if (hr == S_OK)
-    {
-        hr = vboxNetFltWinNotifyShouldBind(pAdapterComponent, pbShouldBind);
+        NonStandardAssertBreakpoint();
+    return hrc;
+}
+
+static HRESULT vboxNetFltWinNotifyShouldBind(IN INetCfgComponent *pComponent, OUT bool *pfShouldBind)
+{
+    *pfShouldBind = false;
+
+    /* filter out only physical adapters */
+    DWORD fCharacteristics = 0;
+    HRESULT hrc = pComponent->GetCharacteristics(&fCharacteristics);
+    if (hrc != S_OK)
+    {
+        NonStandardAssertBreakpoint();
+        return hrc;
+    }
+
+    /* we are not binding to hidden adapters */
+    if (fCharacteristics & NCF_HIDDEN)
+        return S_OK;
+
+    hrc = vboxNetFltWinNotifyCheckMsLoop(pComponent, pfShouldBind);
+    if (   hrc == S_OK /* this is a loopback adapter, the pfShouldBind already contains the result */
+        || hrc != S_FALSE /* error occurred */)
+        return hrc;
+
+    hrc = vboxNetFltWinNotifyCheckNetAdp(pComponent, pfShouldBind);
+    if (   hrc == S_OK /* this is a VBoxNetAdp adapter, the pfShouldBind already contains the result */
+        || hrc != S_FALSE /* error occurred */)
+        return hrc;
+
+    //if (!(fCharacteristics & NCF_PHYSICAL))
+    //{
+    //    *pfShouldBind = false; /* we are binding to physical adapters only */
+    //    return S_OK;
+    //}
+
+    return vboxNetFltWinNotifyCheckLowerRange(pComponent, pfShouldBind);
+}
+
+
+static HRESULT vboxNetFltWinNotifyShouldBind(IN INetCfgBindingInterface *pIf, OUT bool *pfShouldBind)
+{
+    INetCfgComponent *pAdapterComponent = NULL;
+    HRESULT hrc = pIf->GetLowerComponent(&pAdapterComponent);
+    if (hrc == S_OK)
+    {
+        hrc = vboxNetFltWinNotifyShouldBind(pAdapterComponent, pfShouldBind);
 
         pAdapterComponent->Release();
@@ -464 +425 @@
     {
         NonStandardAssertBreakpoint();
-    }
-
-    return hr;
-}
-
-static HRESULT vboxNetFltWinNotifyShouldBind(IN INetCfgBindingPath *pPath, OUT bool *pbDoBind)
-{
-    IEnumNetCfgBindingInterface *pEnumBindingIf;
-    HRESULT hr = pPath->EnumBindingInterfaces(&pEnumBindingIf);
-    if (hr == S_OK)
-    {
-        hr = pEnumBindingIf->Reset();
-        if (hr == S_OK)
-        {
-            ULONG ulCount;
-            INetCfgBindingInterface *pBindingIf;
-            do
+        *pfShouldBind = false;
+    }
+    return hrc;
+}
+
+static HRESULT vboxNetFltWinNotifyShouldBind(IN INetCfgBindingPath *pPath, OUT bool *pfShouldBind)
+{
+    *pfShouldBind = false;
+
+    IEnumNetCfgBindingInterface *pIEnumBinding = NULL;
+    HRESULT hrc = pPath->EnumBindingInterfaces(&pIEnumBinding);
+    if (hrc == S_OK)
+    {
+        hrc = pIEnumBinding->Reset();
+        if (hrc == S_OK)
+        {
+            for (;;)
             {
-                hr = pEnumBindingIf->Next(1, &pBindingIf, &ulCount);
-                if (hr == S_OK)
+                ULONG                    uCount    = 0;
+                INetCfgBindingInterface *pIBinding = NULL;
+                hrc = pIEnumBinding->Next(1, &pIBinding, &uCount);
+                if (hrc == S_OK)
                 {
-                    hr = vboxNetFltWinNotifyShouldBind(pBindingIf, pbDoBind);
-
-                    pBindingIf->Release();
-
-                    if (hr == S_OK)
-                    {
-                        if (!(*pbDoBind))
-                        {
-                            break;
-                        }
-                    }
-                    else
-                    {
-                        /* break on failure */
+                    hrc = vboxNetFltWinNotifyShouldBind(pIBinding, pfShouldBind);
+                    pIBinding->Release();
+
+                    if (hrc != S_OK)
+                        break; /* break on failure. */
+                    if (!*pfShouldBind)
                         break;
-                    }
                 }
-                else if (hr == S_FALSE)
+                else if (hrc == S_FALSE)
                 {
                     /* no more elements */
-                    hr = S_OK;
+                    hrc = S_OK;
                     break;
                 }
@@ -514 +468 @@
                     break;
                 }
-            } while (true);
+            }
         }
         else
-        {
             NonStandardAssertBreakpoint();
-        }
-
-        pEnumBindingIf->Release();
+
+        pIEnumBinding->Release();
     }
     else
-    {
-        NonStandardAssertBreakpoint();
-    }
-
-    return hr;
+        NonStandardAssertBreakpoint();
+    return hrc;
 }
 
@@ -536 +485 @@
     return VBOXNETFLTNOTIFY_DEBUG_BIND;
 #else
-    bool bShouldBind;
-    HRESULT hr = vboxNetFltWinNotifyShouldBind(pPath, &bShouldBind) ;
-    if (hr != S_OK)
-    {
-        bShouldBind = VBOXNETFLTNOTIFY_ONFAIL_BINDDEFAULT;
-    }
-
-    return bShouldBind;
+    bool fShouldBind;
+    HRESULT hrc = vboxNetFltWinNotifyShouldBind(pPath, &fShouldBind);
+    if (hrc != S_OK)
+        fShouldBind = VBOXNETFLTNOTIFY_ONFAIL_BINDDEFAULT;
+
+    return fShouldBind;
 #endif
 }
@@ -571 +518 @@
 END_OBJECT_MAP()
 
+
 extern "C"
 BOOL WINAPI DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/)
@@ -576 +524 @@
     if (dwReason == DLL_PROCESS_ATTACH)
     {
+        g_hModSelf = (HMODULE)hInstance;
+
         _Module.Init(ObjectMap, hInstance);
         DisableThreadLibraryCalls(hInstance);
@@ -586 +536 @@
 }
 
-STDAPI DllCanUnloadNow()
-{
-    return (_Module.GetLockCount() == 0) ? S_OK : S_FALSE;
-}
-
-STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
+STDAPI DllCanUnloadNow(void)
+{
+    return _Module.GetLockCount() == 0 ? S_OK : S_FALSE;
+}
+
+STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
 {
     return _Module.GetClassObject(rclsid, riid, ppv);
 }
+
 
 /*
@@ -602 +553 @@
  */
 
+#ifdef RT_EXCEPTIONS_ENABLED
 /* Someday we may want to log errors. */
 class AdHocRegError
@@ -608 +560 @@
     AdHocRegError(LSTATUS rc) { RT_NOREF1(rc); };
 };
-
-/* A simple wrapper on Windows registry functions. */
+#endif
+
+/**
+ * A simple wrapper on Windows registry functions.
+ */
 class AdHocRegKey
 {
@@ -617 +572 @@
     ~AdHocRegKey() { RegCloseKey(m_hKey); };
 
-    AdHocRegKey *create(LPCWSTR pcwszSubkey, LPCWSTR pcwszDefaultValue = NULL);
-    void remove(LPCWSTR pcwszSubkey);
-    void setValue(LPCWSTR pcwszName, LPCWSTR pcwszValue);
+    AdHocRegKey *create(LPCWSTR pcwszSubkey);
+    LSTATUS setValue(LPCWSTR pcwszName, LPCWSTR pcwszValue);
     HKEY getKey(void) { return m_hKey; };
 private:
@@ -625 +579 @@
 };
 
-AdHocRegKey::AdHocRegKey(LPCWSTR pcwszName, HKEY hParent)
+AdHocRegKey::AdHocRegKey(LPCWSTR pcwszName, HKEY hParent) : m_hKey(NULL)
 {
     LSTATUS rc = RegOpenKeyExW(hParent, pcwszName, 0, KEY_ALL_ACCESS, &m_hKey);
     if (rc != ERROR_SUCCESS)
+#ifdef RT_EXCEPTIONS_ENABLED
         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)
+#else
+        m_hKey = NULL;
+#endif
+}
+
+AdHocRegKey *AdHocRegKey::create(LPCWSTR pcwszSubkey)
 {
     HKEY hSubkey;
@@ -664 +597 @@
                                  KEY_ALL_ACCESS, NULL /*pSecAttr*/, &hSubkey, NULL /*pdwDisposition*/);
     if (rc != ERROR_SUCCESS)
+#ifdef RT_EXCEPTIONS_ENABLED
         throw AdHocRegError(rc);
+#else
+        return NULL;
+#endif
     AdHocRegKey *pSubkey = new AdHocRegKey(hSubkey);
-    if (pcwszDefaultValue)
-        pSubkey->setValue(NULL, pcwszDefaultValue);
+    if (!pSubkey)
+        RegCloseKey(hSubkey);
     return pSubkey;
 }
 
-void AdHocRegKey::setValue(LPCWSTR pcwszName, LPCWSTR pcwszValue)
+LSTATUS AdHocRegKey::setValue(LPCWSTR pcwszName, LPCWSTR pcwszValue)
 {
     LSTATUS rc = RegSetValueExW(m_hKey, pcwszName, 0, REG_SZ, (const BYTE *)pcwszValue,
-                                (DWORD)((wcslen(pcwszValue) + 1) * sizeof(WCHAR)));
+                                (DWORD)((RTUtf16Len(pcwszValue) + 1) * sizeof(WCHAR)));
+#ifdef RT_EXCEPTIONS_ENABLED
     if (rc != ERROR_SUCCESS)
         throw AdHocRegError(rc);
-}
-
-/*
+#endif
+    return rc;
+}
+
+/**
  * Auxiliary class that facilitates automatic destruction of AdHocRegKey objects
  * allocated in heap. No reference counting here!
@@ -687 +627 @@
 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); };
+    ~AdHocRegKeyPtr()
+    {
+        if (m_pKey)
+        {
+            delete m_pKey;
+            m_pKey = NULL;
+        }
+    }
+
+    AdHocRegKey *create(LPCWSTR pcwszSubkey)
+    { return m_pKey ? m_pKey->create(pcwszSubkey) : NULL; };
+
+    LSTATUS setValue(LPCWSTR pcwszName, LPCWSTR pcwszValue)
+    { return m_pKey ? m_pKey->setValue(pcwszName, pcwszValue) : ERROR_INVALID_STATE; };
+
 private:
     AdHocRegKey *m_pKey;
@@ -703 +650 @@
 
 
-STDAPI DllRegisterServer()
-{
+STDAPI DllRegisterServer(void)
+{
+    /* Get the path to the DLL we're running inside. */
     WCHAR wszModule[MAX_PATH + 1];
-    if (GetModuleFileNameW(GetModuleHandleW(L"VBoxNetFltNobj"), wszModule, MAX_PATH) == 0)
+    UINT  cwcModule = GetModuleFileNameW(g_hModSelf, wszModule, MAX_PATH);
+    if (cwcModule == 0 || cwcModule > MAX_PATH)
         return SELFREG_E_CLASS;
-
-    try {
+    wszModule[MAX_PATH] = '\0';
+
+    /*
+     * Create registry keys and values.  When exceptions are disabled, we depend
+     * on setValue() to propagate fail key creation failures.
+     */
+#ifdef RT_EXCEPTIONS_ENABLED
+    try
+#endif
+    {
         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 {
+        AdHocRegKeyPtr pkeyNobjClass(keyCLSID.create(L"{f374d1a0-bf08-4bdc-9cb2-c15ddaeef955}"));
+        LSTATUS lrc = pkeyNobjClass.setValue(NULL, L"VirtualBox Bridged Networking Driver Notify Object v1.1");
+        if (lrc != ERROR_SUCCESS)
+            return SELFREG_E_CLASS;
+
+        AdHocRegKeyPtr pkeyNobjSrv(pkeyNobjClass.create(L"InProcServer32"));
+        lrc = pkeyNobjSrv.setValue(NULL, wszModule);
+        if (lrc != ERROR_SUCCESS)
+            return SELFREG_E_CLASS;
+        lrc = pkeyNobjSrv.setValue(L"ThreadingModel", L"Both");
+        if (lrc != ERROR_SUCCESS)
+            return SELFREG_E_CLASS;
+    }
+#ifdef RT_EXCEPTIONS_ENABLED
+    catch (AdHocRegError) { return SELFREG_E_CLASS; }
+#endif
+
+#ifdef RT_EXCEPTIONS_ENABLED
+    try
+#endif
+    {
         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"));
+        AdHocRegKeyPtr pkeyNobjLib(keyTypeLib.create(L"{2A0C94D1-40E1-439C-8FE8-24107CAB0840}\\1.1"));
+        LSTATUS lrc = pkeyNobjLib.setValue(NULL, L"VirtualBox Bridged Networking Driver Notify Object v1.1 Type Library");
+        if (lrc != ERROR_SUCCESS)
+            return SELFREG_E_TYPELIB;
+
+        AdHocRegKeyPtr pkeyNobjLib0(pkeyNobjLib.create(L"0\\win64"));
+        lrc = pkeyNobjLib0.setValue(NULL, wszModule);
+        if (lrc != ERROR_SUCCESS)
+            return SELFREG_E_TYPELIB;
+        AdHocRegKeyPtr pkeyNobjLibFlags(pkeyNobjLib.create(L"FLAGS"));
+        lrc = pkeyNobjLibFlags.setValue(NULL, L"0");
+        if (lrc != ERROR_SUCCESS)
+            return SELFREG_E_TYPELIB;
+
         if (GetSystemDirectoryW(wszModule, MAX_PATH) == 0)
             return SELFREG_E_TYPELIB;
-        AdHocRegKeyPtr pkeyNobjLibHelpDir(pkeyNobjLib.create(L"HELPDIR", wszModule));
-    }
-    catch (AdHocRegError)
-    {
-        return SELFREG_E_CLASS;
-    }
+        AdHocRegKeyPtr pkeyNobjLibHelpDir(pkeyNobjLib.create(L"HELPDIR"));
+        lrc = pkeyNobjLibHelpDir.setValue(NULL, wszModule);
+        if (lrc != ERROR_SUCCESS)
+            return SELFREG_E_TYPELIB;
+    }
+#ifdef RT_EXCEPTIONS_ENABLED
+    catch (AdHocRegError) { return SELFREG_E_TYPELIB; }
+#endif
 
     return S_OK;
 }
 
-STDAPI DllUnregisterServer()
-{
-    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; }
+
+STDAPI DllUnregisterServer(void)
+{
+    static struct { HKEY hKeyRoot; wchar_t const *pwszParentKey; wchar_t const *pwszKeyToDelete; HRESULT hrcFail; }
+    s_aKeys[] =
+    {
+        { HKEY_CLASSES_ROOT, L"TypeLib", L"{2A0C94D1-40E1-439C-8FE8-24107CAB0840}", SELFREG_E_TYPELIB },
+        { HKEY_CLASSES_ROOT, L"CLSID",   L"{f374d1a0-bf08-4bdc-9cb2-c15ddaeef955}", SELFREG_E_CLASS },
+    };
+
+    HRESULT hrc = S_OK;
+    for (size_t i = 0; i < RT_ELEMENTS(s_aKeys); i++)
+    {
+        HKEY hKey = NULL;
+        LSTATUS lrc = RegOpenKeyExW(s_aKeys[i].hKeyRoot, s_aKeys[i].pwszParentKey, 0, KEY_ALL_ACCESS, &hKey);
+        if (lrc == ERROR_SUCCESS)
+        {
+            lrc = RegDeleteTreeW(hKey, s_aKeys[i].pwszKeyToDelete); /* Vista and later */
+            RegCloseKey(hKey);
+        }
+
+        if (lrc != ERROR_SUCCESS && lrc != ERROR_FILE_NOT_FOUND && hrc == S_OK)
+            hrc = s_aKeys[i].hrcFail;
+    }
 
     return S_OK;
 }
+

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

@@ -53 +53 @@
  * Needed to make our driver bind to "real" host adapters only
  */
-class ATL_NO_VTABLE VBoxNetFltNobj :
-    public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>,
-    public ATL::CComCoClass<VBoxNetFltNobj, &CLSID_VBoxNetFltNobj>,
-    public INetCfgComponentControl,
-    public INetCfgComponentNotifyBinding
+class ATL_NO_VTABLE VBoxNetFltNobj
+    : public ATL::CComObjectRootEx<ATL::CComMultiThreadModel>
+    , public ATL::CComCoClass<VBoxNetFltNobj, &CLSID_VBoxNetFltNobj>
+    , public INetCfgComponentControl
+    , public INetCfgComponentNotifyBinding
 {
 public:

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpInstall.cpp

@@ -41 +41 @@
 #include <VBox/VBoxNetCfg-win.h>
 #include <VBox/VBoxDrvCfg-win.h>
-#include <stdio.h>
 #include <devguid.h>
+
+#include <iprt/initterm.h>
+#include <iprt/message.h>
+#include <iprt/process.h>
+#include <iprt/stream.h>
 
 
@@ -60 +64 @@
 static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
 {
-    printf("%s\n", pszString);
+    RTMsgInfo("%s", pszString);
 }
 
@@ -109 +113 @@
 static int VBoxNetAdpInstall(void)
 {
-    VBoxNetCfgWinSetLogging(winNetCfgLogger);
-
-    HRESULT hr = CoInitialize(NULL);
-    if (SUCCEEDED(hr))
-    {
-        wprintf(L"adding host-only interface..\n");
-
+    RTMsgInfo("Adding host-only interface...");
+    VBoxNetCfgWinSetLogging(winNetCfgLogger);
+
+    HRESULT hr = CoInitialize(NULL);
+    if (SUCCEEDED(hr))
+    {
         WCHAR wszInfFile[MAX_PATH];
         DWORD cwcInfFile = MyGetfullPathNameW(VBOX_NETADP_INF, RT_ELEMENTS(wszInfFile), wszInfFile);
@@ -129 +132 @@
 
                 if (hr == S_OK)
-                    wprintf(L"installed successfully\n");
+                    RTMsgInfo("Installed successfully!");
                 else
-                    wprintf(L"error installing VBoxNetAdp (%#lx)\n", hr);
+                    RTMsgError("failed to install VBoxNetAdp: %Rhrc", hr);
 
                 VBoxNetCfgWinReleaseINetCfg(pnc, TRUE);
             }
             else
-                wprintf(L"VBoxNetCfgWinQueryINetCfg failed: hr=%#lx\n", hr);
+                RTMsgError("VBoxNetCfgWinQueryINetCfg failed: %Rhrc", hr);
             /*
             hr = VBoxDrvCfgInfInstall(MpInf);
@@ -171 +174 @@
         {
             DWORD dwErr = GetLastError();
-            wprintf(L"GetFullPathNameW failed: winEr = %lu\n", dwErr);
+            RTMsgError("MyGetfullPathNameW failed: %Rwc", dwErr);
             hr = HRESULT_FROM_WIN32(dwErr);
         }
@@ -177 +180 @@
     }
     else
-        wprintf(L"Error initializing COM (%#lx)\n", hr);
+        RTMsgError("Failed initializing COM: %Rhrc", hr);
 
     VBoxNetCfgWinSetLogging(NULL);
@@ -186 +189 @@
 static int VBoxNetAdpUninstall(void)
 {
-    VBoxNetCfgWinSetLogging(winNetCfgLogger);
-
-    printf("uninstalling all host-only interfaces..\n");
+    RTMsgInfo("Uninstalling all host-only interfaces...");
+    VBoxNetCfgWinSetLogging(winNetCfgLogger);
 
     HRESULT hr = CoInitialize(NULL);
@@ -198 +200 @@
             hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, L"Net", VBOX_NETADP_HWID, 0/* could be SUOI_FORCEDELETE */);
             if (SUCCEEDED(hr))
-                printf("uninstallation successful\n");
+                RTMsgInfo("Uninstallation successful!");
             else
-                printf("uninstalled successfully, but failed to remove infs\n");
-        }
-        else
-            printf("uninstall failed, hr=%#lx\n", hr);
-        CoUninitialize();
-    }
-    else
-        printf("Error initializing COM (%#lx)\n", hr);
+                RTMsgWarning("uninstalled successfully, but failed to remove infs (%Rhrc)\n", hr);
+        }
+        else
+            RTMsgError("uninstall failed: %Rhrc", hr);
+        CoUninitialize();
+    }
+    else
+        RTMsgError("Failed initializing COM: %Rhrc", hr);
 
     VBoxNetCfgWinSetLogging(NULL);
@@ -216 +218 @@
 static int VBoxNetAdpUpdate(void)
 {
-    VBoxNetCfgWinSetLogging(winNetCfgLogger);
-
-    printf("uninstalling all host-only interfaces..\n");
+    RTMsgInfo("Uninstalling all host-only interfaces...");
+    VBoxNetCfgWinSetLogging(winNetCfgLogger);
 
     HRESULT hr = CoInitialize(NULL);
@@ -235 +236 @@
         {
             if (fRebootRequired)
-                printf("!!REBOOT REQUIRED!!\n");
-            printf("updated successfully\n");
-        }
-        else
-            printf("update failed, hr=%#lx\n", hr);
-
-        CoUninitialize();
-    }
-    else
-        printf("Error initializing COM (%#lx)\n", hr);
+                RTMsgWarning("!!REBOOT REQUIRED!!");
+            RTMsgInfo("Updated successfully!");
+        }
+        else
+            RTMsgError("update failed: %Rhrc", hr);
+
+        CoUninitialize();
+    }
+    else
+        RTMsgError("Failed initializing COM: %Rhrc", hr);
 
     VBoxNetCfgWinSetLogging(NULL);
@@ -253 +254 @@
 static int VBoxNetAdpDisable(void)
 {
-    VBoxNetCfgWinSetLogging(winNetCfgLogger);
-
-    printf("disabling all host-only interfaces..\n");
+    RTMsgInfo("Disabling all host-only interfaces...");
+    VBoxNetCfgWinSetLogging(winNetCfgLogger);
 
     HRESULT hr = CoInitialize(NULL);
@@ -262 +262 @@
         hr = VBoxNetCfgWinPropChangeAllNetDevicesOfId(VBOX_NETADP_HWID, VBOXNECTFGWINPROPCHANGE_TYPE_DISABLE);
         if (SUCCEEDED(hr))
-            printf("disabling successful\n");
-        else
-            printf("disable failed, hr=%#lx\n", hr);
-
-        CoUninitialize();
-    }
-    else
-        printf("Error initializing COM (%#lx)\n", hr);
+            RTMsgInfo("Disabling successful");
+        else
+            RTMsgError("disable failed: %Rhrc", hr);
+
+        CoUninitialize();
+    }
+    else
+        RTMsgError("Failed initializing COM: %Rhrc", hr);
 
     VBoxNetCfgWinSetLogging(NULL);
@@ -278 +278 @@
 static int VBoxNetAdpEnable(void)
 {
-    VBoxNetCfgWinSetLogging(winNetCfgLogger);
-
-    printf("enabling all host-only interfaces..\n");
+    RTMsgInfo("Enabling all host-only interfaces...");
+    VBoxNetCfgWinSetLogging(winNetCfgLogger);
 
     HRESULT hr = CoInitialize(NULL);
@@ -287 +286 @@
         hr = VBoxNetCfgWinPropChangeAllNetDevicesOfId(VBOX_NETADP_HWID, VBOXNECTFGWINPROPCHANGE_TYPE_ENABLE);
         if (SUCCEEDED(hr))
-            printf("enabling successful\n");
-        else
-            printf("enabling failed, hr=%#lx\n", hr);
-
-        CoUninitialize();
-    }
-    else
-        printf("Error initializing COM (%#lx)\n", hr);
+            RTMsgInfo("Enabling successful!");
+        else
+            RTMsgError("enabling failed: %hrc", hr);
+
+        CoUninitialize();
+    }
+    else
+        RTMsgError("Failed initializing COM: %Rhrc", hr);
 
     VBoxNetCfgWinSetLogging(NULL);
@@ -303 +302 @@
 static void printUsage(void)
 {
-    printf("host-only network adapter configuration tool\n"
-            "  Usage: VBoxNetAdpInstall [cmd]\n"
-            "    cmd can be one of the following values:\n"
-            "       i  - install a new host-only interface (default command)\n"
-            "       u  - uninstall all host-only interfaces\n"
-            "       a  - update the host-only driver\n"
-            "       d  - disable all host-only interfaces\n"
-            "       e  - enable all host-only interfaces\n"
-            "       h  - print this message\n");
+    RTPrintf("host-only network adapter configuration tool\n"
+             "  Usage: %s [cmd]\n"
+             "    cmd can be one of the following values:\n"
+             "       i  - install a new host-only interface (default command)\n"
+             "       u  - uninstall all host-only interfaces\n"
+             "       a  - update the host-only driver\n"
+             "       d  - disable all host-only interfaces\n"
+             "       e  - enable all host-only interfaces\n"
+             "       h  - print this message\n",
+             RTProcShortName());
 }
 
 int __cdecl main(int argc, char **argv)
 {
+    RTR3InitExe(argc, &argv, 0);
+
     if (argc < 2)
         return VBoxNetAdpInstall();

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetAdpUninstall.cpp

@@ -35 +35 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <VBox/VBoxNetCfg-win.h>
 #include <VBox/VBoxDrvCfg-win.h>
-#include <stdio.h>
 
 #include <devguid.h>
 
+#include <iprt/initterm.h>
+#include <iprt/message.h>
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #ifdef NDIS60
 # define VBOX_NETADP_HWID L"sun_VBoxNetAdp6"
@@ -47 +57 @@
 #endif
 
+
 static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
 {
-    printf("%s", pszString);
+    RTMsgInfo("%s", pszString);
 }
 
 static int VBoxNetAdpUninstall(void)
 {
+    RTMsgInfo("Uninstalling all Host-Only interfaces ...");
+
     int rcExit = RTEXITCODE_FAILURE;
     VBoxNetCfgWinSetLogging(winNetCfgLogger);
-
-    printf("uninstalling all Host-Only interfaces..\n");
 
     HRESULT hr = CoInitialize(NULL);
@@ -67 +78 @@
             hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, L"Net", VBOX_NETADP_HWID, 0/* could be SUOI_FORCEDELETE */);
             if (hr == S_OK)
-                printf("uninstalled successfully\n");
+                RTMsgInfo("Uninstalled successfully!");
             else
-                printf("uninstalled successfully, but failed to remove infs\n");
+                RTMsgError("uninstalled successfully, but failed to remove infs (%Rhrc)\n", hr);
             rcExit = RTEXITCODE_SUCCESS;
         }
         else
-            printf("uninstall failed, hr=%#lx\n", hr);
+            RTMsgError("uninstall failed: %Rhrc", hr);
 
         CoUninitialize();
     }
     else
-        wprintf(L"Error initializing COM (%#lx)\n", hr);
+        RTMsgError("Failed initializing COM: %Rhrc", hr);
 
     VBoxNetCfgWinSetLogging(NULL);
@@ -87 +98 @@
 int __cdecl main(int argc, char **argv)
 {
-    RT_NOREF2(argc, argv);
+    RTR3InitExeNoArguments(0);
+    if (argc != 1)
+        return RTMsgErrorExit(RTEXITCODE_SYNTAX, "This utility takes no arguments\n");
+    NOREF(argv);
+
     return VBoxNetAdpUninstall();
 }
+

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltInstall.cpp

@@ -35 +35 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <VBox/VBoxNetCfg-win.h>
 #include <devguid.h>
 #include <stdio.h>
 
+#include <iprt/initterm.h>
+#include <iprt/message.h>
+
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #define NETFLT_ID L"sun_VBoxNetFlt"
 #define VBOX_NETCFG_APP_NAME L"NetFltInstall"
@@ -181 +192 @@
 int __cdecl main(int argc, char **argv)
 {
-    RT_NOREF2(argc, argv);
+    RTR3InitExeNoArguments(0);
+    if (argc != 1)
+        return RTMsgErrorExit(RTEXITCODE_SYNTAX, "This utility takes no arguments\n");
+    NOREF(argv);
+
     return VBoxNetFltInstall();
 }
+

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetFltUninstall.cpp

@@ -35 +35 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <VBox/VBoxNetCfg-win.h>
 #include <stdio.h>
 
+#include <iprt/initterm.h>
+#include <iprt/message.h>
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define NETFLT_ID L"sun_VBoxNetFlt"
 #define VBOX_NETCFG_APP_NAME L"NetFltUninstall"
@@ -43 +54 @@
 #define VBOX_NETFLT_MP_INF L".\\VBoxNetFltM.inf"
 #define VBOX_NETFLT_RETRIES 10
+
 
 static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
@@ -112 +124 @@
 int __cdecl main(int argc, char **argv)
 {
-    RT_NOREF2(argc, argv);
+    RTR3InitExeNoArguments(0);
+    if (argc != 1)
+        return RTMsgErrorExit(RTEXITCODE_SYNTAX, "This utility takes no arguments\n");
+    NOREF(argv);
+
     return VBoxNetFltUninstall();
 }
+

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfInstall.cpp

@@ -35 +35 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <VBox/VBoxNetCfg-win.h>
 #include <devguid.h>
-#include <stdio.h>
 
+#include <iprt/initterm.h>
+#include <iprt/message.h>
+#include <iprt/utf16.h>
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define VBOX_NETCFG_APP_NAME L"NetLwfInstall"
 #define VBOX_NETLWF_INF L".\\VBoxNetLwf.inf"
@@ -46 +57 @@
 static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
 {
-    printf("%s", pszString);
+    RTMsgInfo("%s", pszString);
 }
 
@@ -116 +127 @@
                     if (hr == S_OK)
                     {
-                        wprintf(L"installed successfully\n");
+                        RTMsgInfo("Installed successfully!");
                         rcExit = RTEXITCODE_SUCCESS;
                     }
                     else
-                        wprintf(L"error installing VBoxNetLwf (%#lx)\n", hr);
+                        RTMsgError("Failed installing VBoxNetLwf: %Rhrc", hr);
                 }
                 else
                 {
                     hr = HRESULT_FROM_WIN32(GetLastError());
-                    wprintf(L"error getting full inf path for VBoxNetLwf.inf (%#lx)\n", hr);
+                    RTMsgError("Failed getting full inf path for VBoxNetLwf.inf: %Rhrc", hr);
                 }
 
@@ -134 +145 @@
             if (hr == NETCFG_E_NO_WRITE_LOCK && pwszLockedBy)
             {
-                if (i < VBOX_NETLWF_RETRIES && !wcscmp(pwszLockedBy, L"6to4svc.dll"))
+                if (i < VBOX_NETLWF_RETRIES && RTUtf16ICmpAscii(pwszLockedBy, "6to4svc.dll") == 0)
                 {
-                    wprintf(L"6to4svc.dll is holding the lock, retrying %d out of %d\n", i + 1, VBOX_NETLWF_RETRIES);
+                    RTMsgInfo("6to4svc.dll is holding the lock - retrying %d out of %d\n", i + 1, VBOX_NETLWF_RETRIES);
                     CoTaskMemFree(pwszLockedBy);
                 }
                 else
                 {
-                    wprintf(L"Error: write lock is owned by another application (%s), close the application and retry installing\n",
-                            pwszLockedBy);
+                    RTMsgError("write lock is owned by another application (%ls), close the application and retry installing",
+                               pwszLockedBy);
                     CoTaskMemFree(pwszLockedBy);
                     break;
@@ -149 +160 @@
             else
             {
-                wprintf(L"Error getting the INetCfg interface (%#lx)\n", hr);
+                RTMsgError("Failed getting the INetCfg interface: %Rhrc", hr);
                 break;
             }
@@ -157 +168 @@
     }
     else
-        wprintf(L"Error initializing COM (%#lx)\n", hr);
+        RTMsgError("Failed initializing COM: %Rhrc", hr);
 
     VBoxNetCfgWinSetLogging(NULL);
@@ -166 +177 @@
 int __cdecl main(int argc, char **argv)
 {
-    RT_NOREF2(argc, argv);
+    RTR3InitExeNoArguments(0);
+    if (argc != 1)
+        return RTMsgErrorExit(RTEXITCODE_SYNTAX, "This utility takes no arguments\n");
+    NOREF(argv);
+
     return VBoxNetLwfInstall();
 }
+

trunk/src/VBox/HostDrivers/VBoxNetFlt/win/tools/VBoxNetLwfUninstall.cpp

@@ -35 +35 @@
  */
 
+
+/*********************************************************************************************************************************
+*   Header Files                                                                                                                 *
+*********************************************************************************************************************************/
 #include <VBox/VBoxNetCfg-win.h>
-#include <stdio.h>
 
+#include <iprt/initterm.h>
+#include <iprt/message.h>
+#include <iprt/utf16.h>
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 #define VBOX_NETCFG_APP_NAME L"NetLwfUninstall"
 #define VBOX_NETLWF_RETRIES 10
 
+
 static DECLCALLBACK(void) winNetCfgLogger(const char *pszString)
 {
-    printf("%s", pszString);
+    RTMsgInfo("%s", pszString);
 }
 
 static int VBoxNetLwfUninstall()
 {
-    INetCfg *pnc;
     int rcExit = RTEXITCODE_FAILURE;
 
@@ -59 +70 @@
         {
             LPWSTR pwszLockedBy = NULL;
+            INetCfg *pnc = NULL;
             hr = VBoxNetCfgWinQueryINetCfg(&pnc, TRUE, VBOX_NETCFG_APP_NAME, 10000, &pwszLockedBy);
             if (hr == S_OK)
@@ -65 +77 @@
                 if (hr == S_OK)
                 {
-                    wprintf(L"uninstalled successfully\n");
+                    RTMsgInfo("uninstalled successfully!");
                     rcExit = RTEXITCODE_SUCCESS;
                 }
                 else
-                    wprintf(L"error uninstalling VBoxNetLwf (%#lx)\n", hr);
+                    RTMsgError("error uninstalling VBoxNetLwf: %Rhrc");
 
                 VBoxNetCfgWinReleaseINetCfg(pnc, TRUE);
@@ -77 +89 @@
             if (hr == NETCFG_E_NO_WRITE_LOCK && pwszLockedBy)
             {
-                if (i < VBOX_NETLWF_RETRIES && !wcscmp(pwszLockedBy, L"6to4svc.dll"))
+                if (i < VBOX_NETLWF_RETRIES && RTUtf16ICmpAscii(pwszLockedBy, "6to4svc.dll") == 0)
                 {
-                    wprintf(L"6to4svc.dll is holding the lock, retrying %d out of %d\n", i + 1, VBOX_NETLWF_RETRIES);
+                    RTMsgInfo("6to4svc.dll is holding the lock - retry %d out of %d ...", i + 1, VBOX_NETLWF_RETRIES);
                     CoTaskMemFree(pwszLockedBy);
                 }
                 else
                 {
-                    wprintf(L"Error: write lock is owned by another application (%s), close the application and retry uninstalling\n",
-                             pwszLockedBy);
+                    RTMsgError("Write lock is owned by another application (%ls), close the application and retry uninstalling",
+                               pwszLockedBy);
                     CoTaskMemFree(pwszLockedBy);
                     break;
@@ -92 +104 @@
             else
             {
-                wprintf(L"Error getting the INetCfg interface (%#lx)\n", hr);
+                RTMsgError("Failed getting the INetCfg interface: %Rhrc", hr);
                 break;
             }
@@ -100 +112 @@
     }
     else
-        wprintf(L"Error initializing COM (%#lx)\n", hr);
+        RTMsgError("Failed initializing COM: %Rhrc", hr);
 
     VBoxNetCfgWinSetLogging(NULL);
@@ -109 +121 @@
 int __cdecl main(int argc, char **argv)
 {
-    RT_NOREF2(argc, argv);
+    RTR3InitExeNoArguments(0);
+    if (argc != 1)
+        return RTMsgErrorExit(RTEXITCODE_SYNTAX, "This utility takes no arguments\n");
+    NOREF(argv);
+
     return VBoxNetLwfUninstall();
 }
+

trunk/src/VBox/HostDrivers/VBoxUSB/win/Install/USBInstall.cpp

@@ -75 +75 @@
 
 
-static DECLCALLBACK(void) vboxUsbLog(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char *pszMsg, void *pvContext)
+static DECLCALLBACK(void) vboxUsbLog(VBOXDRVCFG_LOG_SEVERITY_T enmSeverity, char *pszMsg, void *pvContext)
 {
     RT_NOREF1(pvContext);
@@ -84 +84 @@
             break;
         case VBOXDRVCFG_LOG_SEVERITY_REL:
-            RTPrintf("%s", pszMsg);
+            RTMsgInfo("%s", pszMsg);
             break;
         default:
@@ -106 +106 @@
         return RTMsgInitFailure(rc);
 
+    RTMsgInfo("USB installation");
+
     VBoxDrvCfgLoggerSet(vboxUsbLog, NULL);
     VBoxDrvCfgPanicSet(vboxUsbPanic, NULL);
-
-    RTPrintf("USB installation\n");
 
     rc = usblibOsCreateService();
@@ -130 +130 @@
             HRESULT hr = VBoxDrvCfgInfInstall(pwszInfFile);
             if (hr == S_OK)
-                RTPrintf("Installation successful.\n");
+                RTMsgInfo("Installation successful!");
             else
-                rc = -1;
+            {
+                RTMsgError("Installation failed: %Rhrc", hr);
+                rc = VERR_GENERAL_FAILURE;
+            }
 
             RTUtf16Free(pwszInfFile);
@@ -139 +142 @@
             RTMsgError("Failed to construct INF path: %Rrc", rc);
     }
+    else
+        RTMsgError("Service creation failed: %Rrc", rc);
 
     return RT_SUCCESS(rc) ? RTEXITCODE_SUCCESS : RTEXITCODE_FAILURE;

trunk/src/VBox/HostDrivers/VBoxUSB/win/Install/USBUninstall.cpp

@@ -45 +45 @@
 #include <iprt/assert.h>
 #include <iprt/errcore.h>
+#include <iprt/initterm.h>
+#include <iprt/message.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
 #include <iprt/string.h>
-#include <iprt/errcore.h>
 #include <VBox/VBoxDrvCfg-win.h>
-#include <stdio.h>
-
-
-int usblibOsStopService(void);
-int usblibOsDeleteService(void);
-
-static DECLCALLBACK(void) vboxUsbLog(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char *pszMsg, void *pvContext)
-{
-    RT_NOREF1(pvContext);
-    switch (enmSeverity)
-    {
-        case VBOXDRVCFG_LOG_SEVERITY_FLOW:
-        case VBOXDRVCFG_LOG_SEVERITY_REGULAR:
-            break;
-        case VBOXDRVCFG_LOG_SEVERITY_REL:
-            printf("%s", pszMsg);
-            break;
-        default:
-            break;
-    }
-}
-
-static DECLCALLBACK(void) vboxUsbPanic(void *pvPanic)
-{
-    RT_NOREF1(pvPanic);
-#ifndef DEBUG_bird
-    AssertFailed();
-#endif
-}
-
-
-int __cdecl main(int argc, char **argv)
-{
-    RT_NOREF2(argc, argv);
-    printf("USB uninstallation\n");
-
-    VBoxDrvCfgLoggerSet(vboxUsbLog, NULL);
-    VBoxDrvCfgPanicSet(vboxUsbPanic, NULL);
-
-    usblibOsStopService();
-    usblibOsDeleteService();
-
-    HRESULT hr = VBoxDrvCfgInfUninstallAllF(L"USB", L"USB\\VID_80EE&PID_CAFE", SUOI_FORCEDELETE);
-    if (hr != S_OK)
-    {
-        printf("SetupUninstallOEMInf failed with hr=0x%lx\n", hr);
-        return 1;
-    }
-
-    printf("USB uninstallation succeeded!\n");
-
-    return 0;
-}
-
+
+
+/*********************************************************************************************************************************
+*   Defined Constants And Macros                                                                                                 *
+*********************************************************************************************************************************/
 /** The support service name. */
 #define SERVICE_NAME    "VBoxUSBMon"
@@ -113 +65 @@
 #define DEVICE_NAME_DOS  L"\\DosDevices\\VBoxUSBMon"
 
+
+/*********************************************************************************************************************************
+*   Internal Functions                                                                                                           *
+*********************************************************************************************************************************/
+static int usblibOsStopService(void);
+static int usblibOsDeleteService(void);
+
+
+static DECLCALLBACK(void) vboxUsbLog(VBOXDRVCFG_LOG_SEVERITY_T enmSeverity, char *pszMsg, void *pvContext)
+{
+    RT_NOREF1(pvContext);
+    switch (enmSeverity)
+    {
+        case VBOXDRVCFG_LOG_SEVERITY_FLOW:
+        case VBOXDRVCFG_LOG_SEVERITY_REGULAR:
+            break;
+        case VBOXDRVCFG_LOG_SEVERITY_REL:
+            RTMsgInfo("%s", pszMsg);
+            break;
+        default:
+            break;
+    }
+}
+
+static DECLCALLBACK(void) vboxUsbPanic(void *pvPanic)
+{
+    RT_NOREF1(pvPanic);
+#ifndef DEBUG_bird
+    AssertFailed();
+#endif
+}
+
+
+int __cdecl main(int argc, char **argv)
+{
+    RTR3InitExeNoArguments(0);
+    if (argc != 1)
+        return RTMsgErrorExit(RTEXITCODE_SYNTAX, "This utility takes no arguments\n");
+    NOREF(argv);
+    RTMsgInfo("USB uninstallation\n");
+
+    VBoxDrvCfgLoggerSet(vboxUsbLog, NULL);
+    VBoxDrvCfgPanicSet(vboxUsbPanic, NULL);
+
+    usblibOsStopService();
+    usblibOsDeleteService();
+
+    HRESULT hr = VBoxDrvCfgInfUninstallAllF(L"USB", L"USB\\VID_80EE&PID_CAFE", SUOI_FORCEDELETE);
+    if (hr != S_OK)
+        return RTMsgErrorExitFailure("SetupUninstallOEMInf failed: %Rhrc\n", hr);
+
+    RTMsgInfo("USB uninstallation succeeded!");
+    return 0;
+}
+
+
 /**
  * Stops a possibly running service.
@@ -119 +127 @@
  * @returns -1 on failure.
  */
-int usblibOsStopService(void)
+static int usblibOsStopService(void)
 {
     /*
@@ -176 +184 @@
  * @returns -1 on failure.
  */
-int usblibOsDeleteService(void)
+static int usblibOsDeleteService(void)
 {
     /*

trunk/src/VBox/HostDrivers/VBoxUSB/win/Makefile.kmk

@@ -122 +122 @@
 #
 TEMPLATE_VBoxUsbR3 = Template for USBInstalls, USBUninstall and USBTest
-TEMPLATE_VBoxUsbR3_EXTENDS  = VBoxR3Static
-TEMPLATE_VBoxUsbR3_SDKS     = $(TEMPLATE_VBoxR3Static_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_WIN_NEWDEV
-TEMPLATE_VBoxUsbR3_CXXFLAGS = $(TEMPLATE_VBoxR3Static_CXXFLAGS) -Gz
-TEMPLATE_VBoxUsbR3_CFLAGS   = $(TEMPLATE_VBoxR3Static_CFLAGS) -Gz
-TEMPLATE_VBoxUsbR3_LIBS     = $(TEMPLATE_VBoxR3Static_LIBS) \
-        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB)
+TEMPLATE_VBoxUsbR3_EXTENDS  = VBOXR3EXE
+TEMPLATE_VBoxUsbR3_SDKS     = $(TEMPLATE_VBOXR3EXE_SDKS) ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK) VBOX_WIN_NEWDEV
+TEMPLATE_VBoxUsbR3_CXXFLAGS = $(TEMPLATE_VBOXR3EXE_CXXFLAGS) -Gz
+TEMPLATE_VBoxUsbR3_CFLAGS   = $(TEMPLATE_VBOXR3EXE_CFLAGS) -Gz
+TEMPLATE_VBoxUsbR3_LIBS     = $(TEMPLATE_VBOXR3EXE_LIBS) \
+        $(PATH_STAGE_LIB)/VBoxDrvCfgExe$(VBOX_SUFF_LIB) \
+       $(LIB_RUNTIME)
 
 #

trunk/src/VBox/HostDrivers/VBoxUSB/win/testcase/USBTest.cpp

@@ -42 +42 @@
 #include <iprt/win/setupapi.h>
 #include <newdev.h>
+
 #include <iprt/assert.h>
-#include <iprt/err.h>
+#include <VBox/err.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
+#include <iprt/stream.h>
 #include <iprt/string.h>
-#include <VBox/err.h>
-#include <stdio.h>
 #include <VBox/usblib.h>
 #include <VBox/VBoxDrvCfg-win.h>
 
+
+/*********************************************************************************************************************************
+*   Global Variables                                                                                                             *
+*********************************************************************************************************************************/
 /** Handle to the open device. */
 static HANDLE   g_hUSBMonitor = INVALID_HANDLE_VALUE;
@@ -57 +61 @@
 static bool     g_fStartedService = false;
 
+
 /**
  * Attempts to start the service, creating it if necessary.
@@ -83 +88 @@
 int usbMonStopService(void)
 {
-    printf("usbMonStopService\n");
+    RTPrintf("usbMonStopService\n");
+
     /*
      * Assume it didn't exist, so we'll create the service.
@@ -141 +147 @@
     DWORD          cbReturned = 0;
 
-    printf("usbLibReleaseDevice %x %x %x\n", usVendorId, usProductId, usRevision);
+    RTPrintf("usbLibReleaseDevice %x %x %x\n", usVendorId, usProductId, usRevision);
 
     release.usVendorId  = usVendorId;
@@ -174 +180 @@
     Assert(g_hUSBMonitor);
 
-    printf("usblibInsertFilter %04X %04X %04X\n", usVendorId, usProductId, usRevision);
+    RTPrintf("usblibInsertFilter %04X %04X %04X\n", usVendorId, usProductId, usRevision);
 
     USBFilterInit(&filter, USBFILTERTYPE_CAPTURE);
@@ -222 +228 @@
     Assert(g_hUSBMonitor);
 
-    printf("usblibRemoveFilter %p\n", aID);
+    RTPrintf("usblibRemoveFilter %p\n", aID);
 
     uId = (uintptr_t)aID;
@@ -244 +250 @@
     DWORD          cbReturned;
 
-    printf("usbproxy: usbLibInit\n");
+    RTPrintf("usbproxy: usbLibInit\n");
 
     g_hUSBMonitor = CreateFile (USBMON_DEVICE_NAME,
@@ -269 +275 @@
         {
             /* AssertFailed(); */
-            printf("usbproxy: Unable to open filter driver!! (rc=%lu)\n", GetLastError());
+            RTPrintf("usbproxy: Unable to open filter driver!! (rc=%lu)\n", GetLastError());
             rc = VERR_FILE_NOT_FOUND;
             goto failure;
@@ -281 +287 @@
     if (!DeviceIoControl(g_hUSBMonitor, SUPUSBFLT_IOCTL_GET_VERSION, NULL, 0,&version, sizeof(version),  &cbReturned, NULL))
     {
-        printf("usbproxy: Unable to query filter version!! (rc=%lu)\n", GetLastError());
+        RTPrintf("usbproxy: Unable to query filter version!! (rc=%lu)\n", GetLastError());
         rc = VERR_VERSION_MISMATCH;
         goto failure;
@@ -292 +298 @@
         )
     {
-        printf("usbproxy: Filter driver version mismatch!!\n");
+        RTPrintf("usbproxy: Filter driver version mismatch!!\n");
         rc = VERR_VERSION_MISMATCH;
         goto failure;
@@ -344 +350 @@
     RT_NOREF2(argc, argv);
 
-    printf("USB test\n");
+    RTPrintf("USB test\n");
 
     rc = usbMonitorInit();
@@ -355 +361 @@
     usbMonInsertFilter(0x80EE, 0x0030, 0x0110, &pId3);
 
-    printf("Waiting to capture devices... enter 'r' to run filters\n");
-    c = getchar();
+    RTPrintf("Waiting to capture devices... enter 'r' to run filters\n");
+    c = RTStrmGetCh(g_pStdIn);
     if (c == 'r')
     {
         usbMonRunFilters();
-        printf("Waiting to capture devices...\n");
-        getchar();  /* eat the '\n' */
-        getchar();  /* wait for more input */
-    }
-
-    printf("Releasing device\n");
+        RTPrintf("Waiting to capture devices...\n");
+        RTStrmGetCh(g_pStdIn);  /* eat the '\n' */
+        RTStrmGetCh(g_pStdIn);  /* wait for more input */
+    }
+
+    RTPrintf("Releasing device\n");
     usbMonReleaseDevice(0xA16, 0x2499, 0x100);
 
@@ -376 +382 @@
     return 0;
 }
+

trunk/src/VBox/HostDrivers/win/Makefile.kmk

@@ -38 +38 @@
 include $(KBUILD_PATH)/subheader.kmk
 
-# For the installer helpers
-LIBRARIES += VBoxDrvCfg
-VBoxDrvCfg_TEMPLATE       = VBoxR3StaticDllNoAsan
-VBoxDrvCfg_SDKS           = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
-VBoxDrvCfg_DEFS           = _WIN32_WINNT=0x0501 _UNICODE UNICODE
-VBoxDrvCfg_SOURCES        = cfg/VBoxDrvCfg.cpp
+# For the installer helper DLL.
+LIBRARIES += VBoxDrvCfgSharedStatic
+VBoxDrvCfgSharedStatic_TEMPLATE := VBoxR3StaticDllNoAsan
+VBoxDrvCfgSharedStatic_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
+VBoxDrvCfgSharedStatic_DEFS     := _WIN32_WINNT=0x0501 _UNICODE UNICODE
+VBoxDrvCfgSharedStatic_SOURCES  := cfg/VBoxDrvCfg.cpp
+
+# For the driver installer/uninstaller executables.
+LIBRARIES += VBoxDrvCfgExe
+VBoxDrvCfgExe_TEMPLATE := VBOXR3EXE
+VBoxDrvCfgExe_EXTENDS  := VBoxDrvCfgSharedStatic
+
+# For the regular VBox DLLs.
+LIBRARIES += VBoxDrvCfgDll
+VBoxDrvCfgDll_TEMPLATE := VBoxR3Dll
+VBoxDrvCfgDll_EXTENDS  := VBoxDrvCfgSharedStatic
 
 

trunk/src/VBox/HostDrivers/win/cfg/VBoxDrvCfg.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VBoxDrvCfg.cpp - Windows Driver Manipulation API implementation
+ * VBoxDrvCfg.cpp - Windows Driver Manipulation API implementation.
+ *
+ * @note This is EXTREMELY BADLY documented code. Please help improve by
+ *       adding comments whenever you've got a chance!
  */
 
@@ -43 +46 @@
 #include <iprt/win/setupapi.h>
 #include <iprt/win/shlobj.h>
-
-#include <string.h>
-
-#include <stdlib.h>
-#include <malloc.h>
-#include <stdio.h>
-
 #include <Newdev.h>
+
+#include <iprt/alloca.h>
+#include <iprt/mem.h>
+#include <iprt/path.h>
+#include <iprt/string.h>
+#include <iprt/utf16.h>
 
 
@@ -56 +58 @@
 *   Global Variables                                                                                                             *
 *********************************************************************************************************************************/
-static PFNVBOXDRVCFG_LOG g_pfnVBoxDrvCfgLog;
+static PFNVBOXDRVCFGLOG g_pfnVBoxDrvCfgLog;
 static void *g_pvVBoxDrvCfgLog;
 
-static PFNVBOXDRVCFG_PANIC g_pfnVBoxDrvCfgPanic;
+static PFNVBOXDRVCFGPANIC g_pfnVBoxDrvCfgPanic;
 static void *g_pvVBoxDrvCfgPanic;
 
 
-VBOXDRVCFG_DECL(void) VBoxDrvCfgLoggerSet(PFNVBOXDRVCFG_LOG pfnLog, void *pvLog)
+VBOXDRVCFG_DECL(void) VBoxDrvCfgLoggerSet(PFNVBOXDRVCFGLOG pfnLog, void *pvLog)
 {
     g_pfnVBoxDrvCfgLog = pfnLog;
@@ -69 +71 @@
 }
 
-VBOXDRVCFG_DECL(void) VBoxDrvCfgPanicSet(PFNVBOXDRVCFG_PANIC pfnPanic, void *pvPanic)
+VBOXDRVCFG_DECL(void) VBoxDrvCfgPanicSet(PFNVBOXDRVCFGPANIC pfnPanic, void *pvPanic)
 {
     g_pfnVBoxDrvCfgPanic = pfnPanic;
@@ -75 +77 @@
 }
 
-static void vboxDrvCfgLogRel(LPCSTR szString, ...)
-{
-    PFNVBOXDRVCFG_LOG pfnLog = g_pfnVBoxDrvCfgLog;
-    void * pvLog = g_pvVBoxDrvCfgLog;
+static void vboxDrvCfgLogRel(const char *pszFormat, ...)
+{
+    PFNVBOXDRVCFGLOG pfnLog = g_pfnVBoxDrvCfgLog;
+    void *pvLog = g_pvVBoxDrvCfgLog;
     if (pfnLog)
     {
-        char szBuffer[4096] = {0};
-        va_list pArgList;
-        va_start(pArgList, szString);
-        _vsnprintf(szBuffer, RT_ELEMENTS(szBuffer), szString, pArgList);
-        va_end(pArgList);
+        char szBuffer[4096];
+        va_list va;
+        va_start(va, pszFormat);
+        RTStrPrintfV(szBuffer, RT_ELEMENTS(szBuffer), pszFormat, va);
+        va_end(va);
         pfnLog(VBOXDRVCFG_LOG_SEVERITY_REL, szBuffer, pvLog);
     }
 }
 
-static void vboxDrvCfgLogRegular(LPCSTR szString, ...)
-{
-    PFNVBOXDRVCFG_LOG pfnLog = g_pfnVBoxDrvCfgLog;
-    void * pvLog = g_pvVBoxDrvCfgLog;
+static void vboxDrvCfgLogRegular(const char *pszFormat, ...)
+{
+    PFNVBOXDRVCFGLOG pfnLog = g_pfnVBoxDrvCfgLog;
+    void *pvLog = g_pvVBoxDrvCfgLog;
     if (pfnLog)
     {
-        char szBuffer[4096] = {0};
-        va_list pArgList;
-        va_start(pArgList, szString);
-        _vsnprintf(szBuffer, RT_ELEMENTS(szBuffer), szString, pArgList);
-        va_end(pArgList);
+        char szBuffer[4096];
+        va_list va;
+        va_start(va, pszFormat);
+        RTStrPrintfV(szBuffer, RT_ELEMENTS(szBuffer), pszFormat, va);
+        va_end(va);
         pfnLog(VBOXDRVCFG_LOG_SEVERITY_REGULAR, szBuffer, pvLog);
     }
 }
 
-static void vboxDrvCfgLogFlow(LPCSTR szString, ...)
-{
-    PFNVBOXDRVCFG_LOG pfnLog = g_pfnVBoxDrvCfgLog;
-    void * pvLog = g_pvVBoxDrvCfgLog;
+static void vboxDrvCfgLogFlow(const char *pszFormat, ...)
+{
+    PFNVBOXDRVCFGLOG pfnLog = g_pfnVBoxDrvCfgLog;
+    void *pvLog = g_pvVBoxDrvCfgLog;
     if (pfnLog)
     {
-        char szBuffer[4096] = {0};
-        va_list pArgList;
-        va_start(pArgList, szString);
-        _vsnprintf(szBuffer, RT_ELEMENTS(szBuffer), szString, pArgList);
-        va_end(pArgList);
+        char szBuffer[4096];
+        va_list va;
+        va_start(va, pszFormat);
+        RTStrPrintfV(szBuffer, RT_ELEMENTS(szBuffer), pszFormat, va);
+        va_end(va);
         pfnLog(VBOXDRVCFG_LOG_SEVERITY_FLOW, szBuffer, pvLog);
     }
 }
 
-static void vboxDrvCfgPanic()
-{
-    PFNVBOXDRVCFG_PANIC pfnPanic = g_pfnVBoxDrvCfgPanic;
-    void * pvPanic = g_pvVBoxDrvCfgPanic;
+static void vboxDrvCfgPanic(void)
+{
+    PFNVBOXDRVCFGPANIC pfnPanic = g_pfnVBoxDrvCfgPanic;
+    void *pvPanic = g_pvVBoxDrvCfgPanic;
     if (pfnPanic)
-    {
         pfnPanic(pvPanic);
-    }
 }
 
@@ -141 +141 @@
 
 
+/**
+ * This is a simple string vector class.
+ *
+ * @note Is is _NOT_ a list as the name could lead you to believe, but a vector.
+ */
 class VBoxDrvCfgStringList
 {
 public:
-    VBoxDrvCfgStringList(int aSize);
-
+    VBoxDrvCfgStringList(size_t a_cElements);
     ~VBoxDrvCfgStringList();
 
     HRESULT add(LPWSTR pStr);
 
-    int size() {return mSize;}
-
-    LPWSTR get(int i) {return maList[i];}
+    size_t size() { return m_cUsed; }
+
+    LPWSTR get(size_t i) { return i < m_cUsed ? m_paStrings[i] : NULL; }
 private:
-    HRESULT resize(int newSize);
-
-    LPWSTR *maList;
-    int mBufSize;
-    int mSize;
+    HRESULT grow(size_t a_cNew);
+
+    /** Array of strings. */
+    LPWSTR *m_paStrings;
+    size_t  m_cAllocated;
+    size_t  m_cUsed;
 };
 
-VBoxDrvCfgStringList::VBoxDrvCfgStringList(int aSize)
-{
-    maList = (LPWSTR*)malloc( sizeof(maList[0]) * aSize);
-    mBufSize = aSize;
-    mSize = 0;
+VBoxDrvCfgStringList::VBoxDrvCfgStringList(size_t a_cElements)
+{
+    m_paStrings  = (LPWSTR *)RTMemAllocZ(sizeof(m_paStrings[0]) * a_cElements);
+    m_cAllocated = a_cElements;
+    m_cUsed      = 0;
 }
 
 VBoxDrvCfgStringList::~VBoxDrvCfgStringList()
 {
-    if (!mBufSize)
+    if (!m_cAllocated)
         return;
 
-    for (int i = 0; i < mSize; ++i)
-    {
-        free(maList[i]);
-    }
-
-    free(maList);
+    for (size_t i = 0; i < m_cUsed; ++i)
+        RTMemFree(m_paStrings[i]);
+    RTMemFree(m_paStrings);
+    m_paStrings  = NULL;
+    m_cAllocated = 0;
+    m_cUsed      = 0;
 }
 
 HRESULT VBoxDrvCfgStringList::add(LPWSTR pStr)
 {
-    if (mSize == mBufSize)
-    {
-        int hr = resize(mBufSize+10);
-        if (SUCCEEDED(hr))
-            return hr;
-    }
-    size_t cStr = wcslen(pStr) + 1;
-    LPWSTR str = (LPWSTR)malloc( sizeof(maList[0][0]) * cStr);
-    memcpy(str, pStr, sizeof(maList[0][0]) * cStr);
-    maList[mSize] = str;
-    ++mSize;
+    if (m_cUsed == m_cAllocated)
+    {
+        int hrc = grow(m_cAllocated + 16);
+        if (SUCCEEDED(hrc))
+            return hrc;
+    }
+    LPWSTR str = (LPWSTR)RTMemDup(pStr, (RTUtf16Len(pStr) + 1) * sizeof(m_paStrings[0][0]));
+    if (!str)
+        return E_OUTOFMEMORY;
+    m_paStrings[m_cUsed] = str;
+    ++m_cUsed;
     return S_OK;
 }
 
-HRESULT VBoxDrvCfgStringList::resize(int newSize)
-{
-    NonStandardAssert(newSize >= mSize);
-    if (newSize < mSize)
+HRESULT VBoxDrvCfgStringList::grow(size_t a_cNew)
+{
+    NonStandardAssert(a_cNew >= m_cUsed);
+    if (a_cNew < m_cUsed)
         return E_FAIL;
-    LPWSTR* pOld = maList;
-    maList = (LPWSTR*)malloc( sizeof(maList[0]) * newSize);
-    mBufSize = newSize;
-    memcpy(maList, pOld, mSize*sizeof(maList[0]));
-    free(pOld);
+    void *pvNew = RTMemReallocZ(m_paStrings, m_cUsed * sizeof(m_paStrings[0]), a_cNew * sizeof(m_paStrings[0]));
+    if (!pvNew)
+        return E_OUTOFMEMORY;
+    m_paStrings  = (LPWSTR *)pvNew;
+    m_cAllocated = a_cNew;
     return S_OK;
 }
@@ -213 +218 @@
  * inf file manipulation API
  */
-typedef bool (*PFNVBOXNETCFG_ENUMERATION_CALLBACK) (LPCWSTR lpszFileName, PVOID pContext);
-
-typedef struct _INF_INFO
-{
-    LPCWSTR lpszClassName;
-    LPCWSTR lpszPnPId;
-} INF_INFO, *PINF_INFO;
-
-typedef struct _INFENUM_CONTEXT
-{
-    INF_INFO InfInfo;
-    DWORD Flags;
-    HRESULT hr;
-} INFENUM_CONTEXT, *PINFENUM_CONTEXT;
-
-static HRESULT vboxDrvCfgInfQueryContext(HINF hInf, LPCWSTR lpszSection, LPCWSTR lpszKey, PINFCONTEXT pCtx)
-{
-    if (!SetupFindFirstLineW(hInf, lpszSection, lpszKey, pCtx))
+typedef bool (*PFNVBOXNETCFG_ENUMERATION_CALLBACK_T)(LPCWSTR lpszFileName, PVOID pContext);
+
+typedef struct INF_INFO_T
+{
+    LPCWSTR pwszClassName;
+    LPCWSTR pwszPnPId;
+} INF_INFO_T, *PINF_INFO_T;
+
+typedef struct INFENUM_CONTEXT_T
+{
+    INF_INFO_T InfInfo;
+    DWORD fFlags;
+    HRESULT hrc;
+} INFENUM_CONTEXT_T, *PINFENUM_CONTEXT_T;
+
+static HRESULT vboxDrvCfgInfQueryContext(HINF hInf, LPCWSTR pwszSection, LPCWSTR pwszKey, PINFCONTEXT pCtx)
+{
+    if (!SetupFindFirstLineW(hInf, pwszSection, pwszKey, pCtx))
     {
         DWORD dwErr = GetLastError();
-        NonStandardLogRelCrap((__FUNCTION__ ": SetupFindFirstLine failed WinEr (%d) for Section(%S), Key(%S)\n", dwErr, lpszSection, lpszKey));
+        NonStandardLogRelCrap((__FUNCTION__ ": SetupFindFirstLine failed WinEr (%Rwc) for Section(%ls), Key(%ls)\n",
+                               dwErr, pwszSection, pwszKey));
         return HRESULT_FROM_WIN32(dwErr);
     }
@@ -239 +245 @@
 }
 
-static HRESULT vboxDrvCfgInfQueryKeyValue(PINFCONTEXT pCtx, DWORD iValue, LPWSTR *lppszValue, PDWORD pcValue)
-{
-    DWORD dwErr;
-    DWORD cValue;
-
-    if (!SetupGetStringFieldW(pCtx, iValue, NULL, 0, &cValue))
-    {
-        dwErr = GetLastError();
+static HRESULT vboxDrvCfgInfQueryKeyValue(PINFCONTEXT pCtx, DWORD iValue, LPWSTR *ppwszValue, PDWORD pcwcValue)
+{
+    *ppwszValue = NULL;
+    if (pcwcValue)
+        *pcwcValue = 0;
+
+    DWORD cwcValue;
+    if (!SetupGetStringFieldW(pCtx, iValue, NULL, 0, &cwcValue))
+    {
+        DWORD dwErr = GetLastError();
 //        NonStandardAssert(dwErr == ERROR_INSUFFICIENT_BUFFER);
         if (dwErr != ERROR_INSUFFICIENT_BUFFER)
         {
-            NonStandardLogFlowCrap((__FUNCTION__ ": SetupGetStringField failed WinEr (%d) for iValue(%d)\n", dwErr, iValue));
+            NonStandardLogFlowCrap((__FUNCTION__ ": SetupGetStringField failed WinEr (%Rwc) for iValue(%d)\n", dwErr, iValue));
             return HRESULT_FROM_WIN32(dwErr);
         }
     }
 
-    LPWSTR lpszValue = (LPWSTR)malloc(cValue * sizeof (lpszValue[0]));
-    NonStandardAssert(lpszValue);
-    if (!lpszValue)
-    {
-        NonStandardLogRelCrap((__FUNCTION__ ": SetCoTaskMemAlloc failed to alloc mem of size (%d), for iValue(%d)\n", cValue * sizeof (lpszValue[0]), iValue));
+    LPWSTR pwszValue = (LPWSTR)RTMemAlloc(cwcValue * sizeof(pwszValue[0]));
+    NonStandardAssert(pwszValue);
+    if (!pwszValue)
+    {
+        NonStandardLogRelCrap((__FUNCTION__ ": SetCoTaskMemAlloc failed to alloc mem of size (%d), for iValue(%d)\n",
+                               cwcValue * sizeof(pwszValue[0]), iValue));
         return E_FAIL;
     }
 
-    if (!SetupGetStringFieldW(pCtx, iValue, lpszValue, cValue, &cValue))
-    {
-        dwErr = GetLastError();
-        NonStandardLogRelCrap((__FUNCTION__ ": SetupGetStringField failed WinEr (%d) for iValue(%d)\n", dwErr, iValue));
-        NonStandardAssert(0);
-        free(lpszValue);
+    if (!SetupGetStringFieldW(pCtx, iValue, pwszValue, cwcValue, &cwcValue))
+    {
+        DWORD dwErr = GetLastError();
+        NonStandardLogRelCrap((__FUNCTION__ ": SetupGetStringField failed WinEr (%Rwc) for iValue(%d)\n", dwErr, iValue));
+        NonStandardAssertFailed();
+        RTMemFree(pwszValue);
         return HRESULT_FROM_WIN32(dwErr);
     }
 
-    *lppszValue = lpszValue;
-    if (pcValue)
-        *pcValue = cValue;
+    *ppwszValue = pwszValue;
+    if (pcwcValue)
+        *pcwcValue = cwcValue;
     return S_OK;
 }
+
 #if defined(RT_ARCH_AMD64)
-# define VBOXDRVCFG_ARCHSTR L"amd64"
+# define VBOXDRVCFG_ARCHSTR "amd64"
 #else
-# define VBOXDRVCFG_ARCHSTR L"x86"
+# define VBOXDRVCFG_ARCHSTR "x86"
 #endif
 
-static HRESULT vboxDrvCfgInfQueryModelsSectionName(HINF hInf, LPWSTR *lppszValue, PDWORD pcValue)
-{
+static HRESULT vboxDrvCfgInfQueryModelsSectionName(HINF hInf, LPWSTR *ppwszValue, PDWORD pcwcValue)
+{
+    *ppwszValue = NULL;
+    if (pcwcValue)
+        *pcwcValue = 0;
+
     INFCONTEXT InfCtx;
-    LPWSTR lpszModels, lpszPlatform = NULL, lpszPlatformCur;
-    LPWSTR lpszResult = NULL;
-    DWORD cModels, cPlatform = 0, cPlatformCur, cResult = 0;
-    bool bNt = false, bArch = false /*, bOs = false */;
-
-    HRESULT hr = vboxDrvCfgInfQueryContext(hInf, L"Manufacturer", NULL, &InfCtx);
-    if (hr != S_OK)
-    {
-        NonStandardLogCrap((__FUNCTION__ ": vboxDrvCfgInfQueryContext for Manufacturer failed, hr=0x%x\n", hr));
-        return hr;
-    }
-
-    hr = vboxDrvCfgInfQueryKeyValue(&InfCtx, 1, &lpszModels, &cModels);
-    if (hr != S_OK)
-    {
-        NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue 1 for Manufacturer failed, hr=0x%x\n", hr));
-        return hr;
-    }
-
-    for (DWORD i = 2; (hr = vboxDrvCfgInfQueryKeyValue(&InfCtx, i, &lpszPlatformCur, &cPlatformCur)) == S_OK; ++i)
-    {
-        if (wcsicmp(lpszPlatformCur, L"NT" VBOXDRVCFG_ARCHSTR))
-        {
-            if (bNt)
+    HRESULT hrc = vboxDrvCfgInfQueryContext(hInf, L"Manufacturer", NULL, &InfCtx);
+    if (hrc != S_OK)
+    {
+        NonStandardLogCrap((__FUNCTION__ ": vboxDrvCfgInfQueryContext for Manufacturer failed, hrc=0x%x\n", hrc));
+        return hrc;
+    }
+
+    LPWSTR pwszModels;
+    DWORD  cwcModels;
+    hrc = vboxDrvCfgInfQueryKeyValue(&InfCtx, 1, &pwszModels, &cwcModels);
+    if (hrc != S_OK)
+    {
+        NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue 1 for Manufacturer failed, hrc=0x%x\n", hrc));
+        return hrc;
+    }
+
+    LPWSTR pwszPlatform = NULL;
+    DWORD  cwcPlatform  = 0;
+    bool   fArch        = false;
+    bool   fNt          = false;
+
+    LPWSTR pwszPlatformCur;
+    DWORD  cwcPlatformCur;
+    for (DWORD i = 2; (hrc = vboxDrvCfgInfQueryKeyValue(&InfCtx, i, &pwszPlatformCur, &cwcPlatformCur)) == S_OK; ++i)
+    {
+        if (RTUtf16ICmpAscii(pwszPlatformCur, "NT" VBOXDRVCFG_ARCHSTR) == 0)
+            fArch = true;
+        else
+        {
+            if (fNt || RTUtf16ICmpAscii(pwszPlatformCur, "NT") != 0)
             {
-                free(lpszPlatformCur);
-                lpszPlatformCur = NULL;
+                RTMemFree(pwszPlatformCur);
+                pwszPlatformCur = NULL;
                 continue;
             }
-
-            if (wcsicmp(lpszPlatformCur, L"NT"))
+            fNt = true;
+        }
+
+        cwcPlatform = cwcPlatformCur;
+        if (pwszPlatform)
+            RTMemFree(pwszPlatform);
+        pwszPlatform = pwszPlatformCur;
+        pwszPlatformCur = NULL;
+    }
+
+    hrc = S_OK;
+
+    LPWSTR pwszResult = NULL;
+    DWORD  cwcResult = 0;
+    if (pwszPlatform)
+    {
+        pwszResult = (LPWSTR)RTMemAlloc((cwcModels + cwcPlatform) * sizeof(pwszResult[0]));
+        if (pwszResult)
+        {
+            memcpy(pwszResult, pwszModels, (cwcModels - 1) * sizeof(pwszResult[0]));
+            pwszResult[cwcModels - 1] = L'.';
+            memcpy(&pwszResult[cwcModels], pwszPlatform, cwcPlatform * sizeof(pwszResult[0]));
+            cwcResult = cwcModels + cwcPlatform;
+        }
+        else
+            hrc = E_OUTOFMEMORY;
+    }
+    else
+    {
+        pwszResult = pwszModels;
+        cwcResult  = cwcModels;
+        pwszModels = NULL;
+    }
+
+    if (pwszModels)
+        RTMemFree(pwszModels);
+    if (pwszPlatform)
+        RTMemFree(pwszPlatform);
+
+    if (hrc == S_OK)
+    {
+        *ppwszValue = pwszResult;
+        if (pcwcValue)
+            *pcwcValue = cwcResult;
+    }
+
+    return hrc;
+}
+
+static HRESULT vboxDrvCfgInfQueryFirstPnPId(HINF hInf, LPWSTR *ppwszPnPId)
+{
+    *ppwszPnPId = NULL;
+
+    LPWSTR pwszModels;
+    HRESULT hrc = vboxDrvCfgInfQueryModelsSectionName(hInf, &pwszModels, NULL);
+    NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryModelsSectionName returned pwszModels = (%ls)", pwszModels));
+    if (hrc != S_OK)
+    {
+        NonStandardLogCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for Manufacturer failed, hrc=0x%x\n", hrc));
+        return hrc;
+    }
+
+    LPWSTR     pwszPnPId = NULL;
+    INFCONTEXT InfCtx;
+    hrc = vboxDrvCfgInfQueryContext(hInf, pwszModels, NULL, &InfCtx);
+    if (hrc == S_OK)
+    {
+        hrc = vboxDrvCfgInfQueryKeyValue(&InfCtx, 2, &pwszPnPId, NULL);
+        if (hrc == S_OK)
+        {
+            NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for models (%ls) returned pwszPnPId (%ls)\n", pwszModels, pwszPnPId));
+            *ppwszPnPId = pwszPnPId;
+        }
+        else
+            NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for models (%ls) failed, hrc=0x%x\n", pwszModels, hrc));
+    }
+    else
+        NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryContext for models (%ls) failed, hrc=0x%x\n", pwszModels, hrc));
+
+    RTMemFree(pwszModels);
+    return hrc;
+}
+
+static bool vboxDrvCfgInfEnumerationCallback(LPCWSTR pwszFileName, PVOID pCtxt)
+{
+    PINFENUM_CONTEXT_T pContext = (PINFENUM_CONTEXT_T)pCtxt;
+    NonStandardLogRelCrap((__FUNCTION__": pwszFileName (%ls)\n", pwszFileName));
+    NonStandardLogRelCrap((__FUNCTION__ ": pContext->InfInfo.pwszClassName = (%ls)\n", pContext->InfInfo.pwszClassName));
+    HINF hInf = SetupOpenInfFileW(pwszFileName, pContext->InfInfo.pwszClassName, INF_STYLE_WIN4, NULL /*__in PUINT ErrorLine */);
+    if (hInf == INVALID_HANDLE_VALUE)
+    {
+        DWORD const dwErr = GetLastError();
+//        NonStandardAssert(dwErr == ERROR_CLASS_MISMATCH);
+        if (dwErr != ERROR_CLASS_MISMATCH)
+            NonStandardLogCrap((__FUNCTION__ ": SetupOpenInfFileW err dwErr=%u\n", dwErr));
+        else
+            NonStandardLogCrap((__FUNCTION__ ": dwErr == ERROR_CLASS_MISMATCH\n"));
+        return true;
+    }
+
+    LPWSTR pwszPnPId;
+    HRESULT hrc = vboxDrvCfgInfQueryFirstPnPId(hInf, &pwszPnPId);
+    NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryFirstPnPId returned pwszPnPId = (%ls)\n", pwszPnPId));
+    NonStandardLogRelCrap((__FUNCTION__ ": pContext->InfInfo.pwszPnPId = (%ls)\n", pContext->InfInfo.pwszPnPId));
+    if (hrc == S_OK)
+    {
+        if (!RTUtf16ICmp(pContext->InfInfo.pwszPnPId, pwszPnPId))
+        {
+            /** @todo bird/2020-09-01: See the following during uninstallation with
+             * windbg attached (see DllMain trick):
+             *
+             *   ModLoad: 00007ffa`73c20000 00007ffa`73c4f000   C:\WINDOWS\SYSTEM32\drvsetup.dll
+             *   (1b238.1b254): Access violation - code c0000005 (first chance)
+             *   First chance exceptions are reported before any exception handling.
+             *   This exception may be expected and handled.
+             *   KERNELBASE!WaitForMultipleObjectsEx+0x9e:
+             *   00007ffa`8247cb6e 458b74fd00      mov     r14d,dword ptr [r13+rdi*8] ds:00000000`00000010=????????
+             *   0:006> k
+             *    # Child-SP          RetAddr           Call Site
+             *   00 00000099`6e4fe7a0 00007ffa`73c2df46 KERNELBASE!WaitForMultipleObjectsEx+0x9e
+             *   01 00000099`6e4fea90 00007ffa`73c32ec2 drvsetup!pSetupStringTableEnum+0x3e
+             *   02 00000099`6e4feae0 00007ffa`73c2ae9d drvsetup!DrvUtilsUpdateInfoEnumDriverInfs+0x8e
+             *   03 00000099`6e4feb20 00007ffa`73c2b1cc drvsetup!DrvSetupUninstallDriverInternal+0x211
+             *   04 00000099`6e4febe0 00007ffa`83eb09d7 drvsetup!pDrvSetupUninstallDriver+0xfc
+             *   05 00000099`6e4fec30 00007ffa`83eb06a0 SETUPAPI!pSetupUninstallOEMInf+0x26b
+             *   06 00000099`6e4fef00 00007ffa`57a39fb7 SETUPAPI!SetupUninstallOEMInfW+0x170
+             *   07 00000099`6e4ff190 00007ffa`57a3ae0c MSID039!vboxDrvCfgInfEnumerationCallback+0xf7 [E:\vbox\svn\trunk\src\VBox\HostDrivers\win\cfg\VBoxDrvCfg.cpp @ 445]
+             *   08 00000099`6e4ff1c0 00007ffa`57a321e6 MSID039!VBoxDrvCfgInfUninstallAllSetupDi+0xfc [E:\vbox\svn\trunk\src\VBox\HostDrivers\win\cfg\VBoxDrvCfg.cpp @ 653]
+             *   09 (Inline Function) --------`-------- MSID039!_removeHostOnlyInterfaces+0x6c [E:\vbox\svn\trunk\src\VBox\Installer\win\InstallHelper\VBoxInstallHelper.cpp @ 1523]
+             *   0a 00000099`6e4ff240 00007ffa`610f59d3 MSID039!RemoveHostOnlyInterfaces+0x76 [E:\vbox\svn\trunk\src\VBox\Installer\win\InstallHelper\VBoxInstallHelper.cpp @ 1545]
+             *   0b 00000099`6e4ff270 00007ffa`610d80ac msi!CallCustomDllEntrypoint+0x2b
+             *   0c 00000099`6e4ff2e0 00007ffa`84567034 msi!CMsiCustomAction::CustomActionThread+0x34c
+             *   0d 00000099`6e4ff8d0 00007ffa`849a2651 KERNEL32!BaseThreadInitThunk+0x14
+             *   0e 00000099`6e4ff900 00000000`00000000 ntdll!RtlUserThreadStart+0x21
+             *   0:006> r
+             *   rax=000000996e114000 rbx=0000000000000002 rcx=0000000000000002
+             *   rdx=0000000000000000 rsi=0000000000000000 rdi=0000000000000000
+             *   rip=00007ffa8247cb6e rsp=000000996e4fe7a0 rbp=0000000000000004
+             *    r8=0000000000000000  r9=00000000ffffffff r10=0000000000000000
+             *   r11=0000000000000246 r12=00000000ffffffff r13=0000000000000010
+             *   r14=00007ffa73c32e00 r15=0000000000000001
+             *   iopl=0         nv up ei ng nz ac pe cy
+             *   cs=0033  ss=002b  ds=002b  es=002b  fs=0053  gs=002b             efl=00010293
+             *   KERNELBASE!WaitForMultipleObjectsEx+0x9e:
+             *   00007ffa`8247cb6e 458b74fd00      mov     r14d,dword ptr [r13+rdi*8] ds:00000000`00000010=????????
+             *
+             * Happens with the filter driver too:
+             *
+             *   (1b238.1b7e0): Access violation - code c0000005 (first chance)
+             *   First chance exceptions are reported before any exception handling.
+             *   This exception may be expected and handled.
+             *   KERNELBASE!WaitForMultipleObjectsEx+0x9e:
+             *   00007ffa`8247cb6e 458b74fd00      mov     r14d,dword ptr [r13+rdi*8] ds:00000000`00000010=????????
+             *   0:006> k
+             *    # Child-SP          RetAddr           Call Site
+             *   00 00000099`6e4fe8c0 00007ffa`6558df46 KERNELBASE!WaitForMultipleObjectsEx+0x9e
+             *   01 00000099`6e4febb0 00007ffa`65592ec2 drvsetup!pSetupStringTableEnum+0x3e
+             *   02 00000099`6e4fec00 00007ffa`6558ae9d drvsetup!DrvUtilsUpdateInfoEnumDriverInfs+0x8e
+             *   03 00000099`6e4fec40 00007ffa`6558b1cc drvsetup!DrvSetupUninstallDriverInternal+0x211
+             *   04 00000099`6e4fed00 00007ffa`83eb09d7 drvsetup!pDrvSetupUninstallDriver+0xfc
+             *   05 00000099`6e4fed50 00007ffa`83eb06a0 SETUPAPI!pSetupUninstallOEMInf+0x26b
+             *   06 00000099`6e4ff020 00007ffa`57a39fb7 SETUPAPI!SetupUninstallOEMInfW+0x170
+             *   07 00000099`6e4ff2b0 00007ffa`57a3abaf MSI398C!vboxDrvCfgInfEnumerationCallback+0xf7 [E:\vbox\svn\trunk\src\VBox\HostDrivers\win\cfg\VBoxDrvCfg.cpp @ 445]
+             *   08 (Inline Function) --------`-------- MSI398C!vboxDrvCfgEnumFiles+0x4f [E:\vbox\svn\trunk\src\VBox\HostDrivers\win\cfg\VBoxDrvCfg.cpp @ 670]
+             *   09 00000099`6e4ff2e0 00007ffa`57a3792e MSI398C!VBoxDrvCfgInfUninstallAllF+0xdf [E:\vbox\svn\trunk\src\VBox\HostDrivers\win\cfg\VBoxDrvCfg.cpp @ 723]
+             *   0a 00000099`6e4ff7b0 00007ffa`57a33411 MSI398C!vboxNetCfgWinNetLwfUninstall+0x9e [E:\vbox\svn\trunk\src\VBox\HostDrivers\VBoxNetFlt\win\cfg\VBoxNetCfg.cpp @ 2249]
+             *   0b 00000099`6e4ff7e0 00007ffa`57a3263d MSI398C!_uninstallNetLwf+0x71 [E:\vbox\svn\trunk\src\VBox\Installer\win\InstallHelper\VBoxInstallHelper.cpp @ 1206]
+             *   0c 00000099`6e4ff810 00007ffa`610f59d3 MSI398C!UninstallNetFlt+0xd [E:\vbox\svn\trunk\src\VBox\Installer\win\InstallHelper\VBoxInstallHelper.cpp @ 1124]
+             *   0d 00000099`6e4ff840 00007ffa`610d80ac msi!CallCustomDllEntrypoint+0x2b
+             *   0e 00000099`6e4ff8b0 00007ffa`84567034 msi!CMsiCustomAction::CustomActionThread+0x34c
+             *   0f 00000099`6e4ffea0 00007ffa`849a2651 KERNEL32!BaseThreadInitThunk+0x14
+             *   10 00000099`6e4ffed0 00000000`00000000 ntdll!RtlUserThreadStart+0x21
+             *   0:006> r
+             *   rax=000000996e114000 rbx=0000000000000002 rcx=0000000000000002
+             *   rdx=0000000000000000 rsi=0000000000000000 rdi=0000000000000000
+             *   rip=00007ffa8247cb6e rsp=000000996e4fe8c0 rbp=0000000000000004
+             *    r8=0000000000000000  r9=00000000ffffffff r10=0000000000000000
+             *   r11=0000000000000246 r12=00000000ffffffff r13=0000000000000010
+             *   r14=00007ffa65592e00 r15=0000000000000000
+             *   iopl=0         nv up ei ng nz ac pe cy
+             *   cs=0033  ss=002b  ds=002b  es=002b  fs=0053  gs=002b             efl=00010293
+             *   KERNELBASE!WaitForMultipleObjectsEx+0x9e:
+             *   00007ffa`8247cb6e 458b74fd00      mov     r14d,dword ptr [r13+rdi*8] ds:00000000`00000010=????????
+             *
+             * BUGBUG
+             */
+#if 0
+            if (!SetupUninstallOEMInfW(pwszFileName, pContext->fFlags, /* could be SUOI_FORCEDELETE */ NULL /* Reserved */))
+#else /* Just in case the API doesn't catch it itself (seems it does on w10/19044).  */
+            BOOL  fRc = TRUE;
+            __try
             {
-                free(lpszPlatformCur);
-                lpszPlatformCur = NULL;
-                continue;
+                fRc = SetupUninstallOEMInfW(pwszFileName, pContext->fFlags, /* could be SUOI_FORCEDELETE */ NULL /* Reserved */);
             }
-
-            bNt = true;
-        }
-        else
-        {
-            bArch = true;
-        }
-
-        cPlatform = cPlatformCur;
-        if(lpszPlatform)
-            free(lpszPlatform);
-        lpszPlatform = lpszPlatformCur;
-        lpszPlatformCur = NULL;
-    }
-
-    hr = S_OK;
-
-    if (lpszPlatform)
-    {
-        lpszResult = (LPWSTR)malloc((cModels + cPlatform) * sizeof (lpszResult[0]));
-        if (lpszResult)
-        {
-            memcpy(lpszResult, lpszModels, (cModels - 1) * sizeof (lpszResult[0]));
-            *(lpszResult + cModels - 1) = L'.';
-            memcpy(lpszResult + cModels, lpszPlatform, cPlatform * sizeof (lpszResult[0]));
-            cResult = cModels + cPlatform;
-        }
-        else
-        {
-            hr = E_FAIL;
-        }
+            __except(hrc = GetExceptionCode(), EXCEPTION_EXECUTE_HANDLER)
+            {
+                NonStandardLogRelCrap((__FUNCTION__ ": SetupUninstallOEMInf raised an exception: %#x\n", hrc));
+                hrc = E_ABORT;
+            }
+            if (!fRc)
+#endif
+            {
+                DWORD const dwErr = GetLastError();
+                NonStandardLogRelCrap((__FUNCTION__ ": SetupUninstallOEMInf failed for file (%ls), dwErr=%u\n", pwszFileName, dwErr));
+                NonStandardAssertFailed();
+                hrc = HRESULT_FROM_WIN32( dwErr );
+            }
+        }
+
+        RTMemFree(pwszPnPId);
     }
     else
-    {
-        lpszResult = lpszModels;
-        cResult = cModels;
-        lpszModels = NULL;
-    }
-
-    if (lpszModels)
-        free(lpszModels);
-    if (lpszPlatform)
-        free(lpszPlatform);
-
-    if (hr == S_OK)
-    {
-        *lppszValue = lpszResult;
-        if (pcValue)
-            *pcValue = cResult;
-    }
-
-    return hr;
-}
-
-static HRESULT vboxDrvCfgInfQueryFirstPnPId(HINF hInf, LPWSTR *lppszPnPId)
-{
-    *lppszPnPId = NULL;
-
-    LPWSTR lpszModels;
-    HRESULT hr = vboxDrvCfgInfQueryModelsSectionName(hInf, &lpszModels, NULL);
-    NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryModelsSectionName returned lpszModels = (%S)", lpszModels));
-    if (hr != S_OK)
-    {
-        NonStandardLogCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for Manufacturer failed, hr=0x%x\n", hr));
-        return hr;
-    }
-
-    LPWSTR lpszPnPId = NULL;
-    INFCONTEXT InfCtx;
-    hr = vboxDrvCfgInfQueryContext(hInf, lpszModels, NULL, &InfCtx);
-    if (hr != S_OK)
-    {
-        NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryContext for models (%S) failed, hr=0x%x\n", lpszModels, hr));
-    }
-    else
-    {
-        hr = vboxDrvCfgInfQueryKeyValue(&InfCtx, 2, &lpszPnPId, NULL);
-        NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for models (%S) returned lpszPnPId (%S) \n", lpszModels, lpszPnPId));
-
-        if (hr != S_OK)
-            NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgRegQueryKeyValue for models (%S) failed, hr=0x%x\n", lpszModels, hr));
-    }
-    /* free models string right away */
-    free(lpszModels);
-    if (hr != S_OK)
-        return hr;
-
-    *lppszPnPId = lpszPnPId;
+        NonStandardLogCrap((__FUNCTION__ ": vboxDrvCfgInfQueryFirstPnPId failed, hrc=0x%x\n", hrc));
+
+    SetupCloseInfFile(hInf);
+    return true;
+}
+
+
+#define VBOXDRVCFG_S_INFEXISTS (HRESULT_FROM_WIN32(ERROR_FILE_EXISTS))
+
+static HRESULT vboxDrvCfgInfCopyEx(IN LPCWSTR pwszInfPath, IN DWORD fCopyStyle, OUT LPWSTR pwszDstName, IN DWORD cwcDstName,
+                                   OUT PDWORD pcwcDstNameRet, OUT LPWSTR *pwszDstNameComponent)
+{
+    /* Extract the director from pwszInfPath */
+    size_t cchPath = RTUtf16Len(pwszInfPath);
+    while (cchPath > 0 && !RTPATH_IS_SEP(pwszInfPath[cchPath - 1]))
+        cchPath--;
+
+    WCHAR *pwszMediaLocation = (WCHAR *)alloca(((cchPath) + 1) * sizeof(pwszMediaLocation[0]));
+    memcpy(pwszMediaLocation, pwszInfPath, cchPath * sizeof(pwszMediaLocation[0]));
+    pwszMediaLocation[cchPath] = '\0';
+
+
+    if (!SetupCopyOEMInfW(pwszInfPath, pwszMediaLocation, SPOST_PATH, fCopyStyle,
+                          pwszDstName, cwcDstName, pcwcDstNameRet, pwszDstNameComponent))
+    {
+        DWORD const dwErr = GetLastError();
+        HRESULT hrc = HRESULT_FROM_WIN32(dwErr);
+        if (fCopyStyle != SP_COPY_REPLACEONLY || hrc != VBOXDRVCFG_S_INFEXISTS)
+            NonStandardLogRelCrap((__FUNCTION__ ": SetupCopyOEMInf fail dwErr=%u\n", dwErr));
+        return hrc;
+    }
+
     return S_OK;
 }
 
-static bool vboxDrvCfgInfEnumerationCallback(LPCWSTR lpszFileName, PVOID pCtxt);
-
-#define VBOXDRVCFG_S_INFEXISTS (HRESULT_FROM_WIN32(ERROR_FILE_EXISTS))
-
-static HRESULT vboxDrvCfgInfCopyEx(IN LPCWSTR lpszInfPath, IN DWORD fCopyStyle, OUT LPWSTR lpszDstName, IN DWORD cbDstName, OUT PDWORD pcbDstNameSize, OUT LPWSTR* lpszDstNameComponent)
-{
-    WCHAR aMediaLocation[_MAX_DIR];
-    WCHAR aDir[_MAX_DIR];
-
-    _wsplitpath(lpszInfPath, aMediaLocation, aDir, NULL, NULL);
-    wcscat(aMediaLocation, aDir);
-
-    if (!SetupCopyOEMInfW(lpszInfPath, aMediaLocation, SPOST_PATH, fCopyStyle,
-            lpszDstName, cbDstName, pcbDstNameSize,
-            lpszDstNameComponent))
-    {
-        DWORD dwErr = GetLastError();
-        HRESULT hr = HRESULT_FROM_WIN32(dwErr);
-        if (fCopyStyle != SP_COPY_REPLACEONLY || hr != VBOXDRVCFG_S_INFEXISTS)
-        {
-            NonStandardLogRelCrap((__FUNCTION__ ": SetupCopyOEMInf fail dwErr=%ld\n", dwErr));
-        }
-        return hr;
-    }
-
+VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfInstall(IN LPCWSTR pwszInfPath)
+{
+    return vboxDrvCfgInfCopyEx(pwszInfPath, 0 /*fCopyStyle*/, NULL /*pwszDstName*/, 0 /*cwcDstName*/,
+                               NULL /*pcwcDstNameRet*/, NULL /*pwszDstNameComponent*/);
+}
+
+VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstall(IN LPCWSTR pwszInfPath, DWORD fFlags)
+{
+    WCHAR   wszDstInfName[MAX_PATH];
+    DWORD   cwcDword = RT_ELEMENTS(wszDstInfName);
+    HRESULT hrc = vboxDrvCfgInfCopyEx(pwszInfPath, SP_COPY_REPLACEONLY, wszDstInfName, cwcDword, &cwcDword, NULL);
+    if (hrc == VBOXDRVCFG_S_INFEXISTS)
+    {
+        if (!SetupUninstallOEMInfW(wszDstInfName, fFlags, NULL /*Reserved*/))
+        {
+            DWORD dwErr = GetLastError();
+            NonStandardLogRelCrap((__FUNCTION__ ": SetupUninstallOEMInf failed for file (%ls), oem(%ls), dwErr=%u\n",
+                                   pwszInfPath, wszDstInfName, dwErr));
+            NonStandardAssertFailed();
+            return HRESULT_FROM_WIN32(dwErr);
+        }
+    }
     return S_OK;
 }
 
-static HRESULT vboxDrvCfgInfCopy(IN LPCWSTR lpszInfPath)
-{
-    return vboxDrvCfgInfCopyEx(lpszInfPath, 0, NULL, 0, NULL, NULL);
-}
-
-VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfInstall(IN LPCWSTR lpszInfPath)
-{
-    return vboxDrvCfgInfCopy(lpszInfPath);
-}
-
-VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstall(IN LPCWSTR lpszInfPath, DWORD fFlags)
-{
-    WCHAR DstInfName[MAX_PATH];
-    DWORD cbDword = sizeof (DstInfName);
-    HRESULT hr = vboxDrvCfgInfCopyEx(lpszInfPath, SP_COPY_REPLACEONLY, DstInfName, cbDword, &cbDword, NULL);
-    if (hr == VBOXDRVCFG_S_INFEXISTS)
-    {
-        if (!SetupUninstallOEMInfW(DstInfName, fFlags, NULL /*__in PVOID Reserved == NULL */))
-        {
-            DWORD dwErr = GetLastError();
-            NonStandardLogRelCrap((__FUNCTION__ ": SetupUninstallOEMInf failed for file (%S), oem(%S), dwErr=%ld\n", lpszInfPath, DstInfName, dwErr));
-            NonStandardAssert(0);
-            return HRESULT_FROM_WIN32(dwErr);
-        }
-    }
-    return S_OK;
-}
-
-
-static HRESULT vboxDrvCfgCollectInfsSetupDi(const GUID * pGuid, LPCWSTR pPnPId, VBoxDrvCfgStringList & list)
-{
-    DWORD dwErr = ERROR_SUCCESS;
-    HDEVINFO hDevInfo = SetupDiCreateDeviceInfoList(
-                            pGuid, /* IN LPGUID ClassGuid, OPTIONAL */
-                            NULL /*IN HWND hwndParent OPTIONAL */
-                            );
+
+static HRESULT vboxDrvCfgCollectInfsSetupDi(const GUID *pGuid, LPCWSTR pwszPnPId, VBoxDrvCfgStringList &a_rList)
+{
+    DWORD dwErrRet = ERROR_SUCCESS;
+    HDEVINFO hDevInfo = SetupDiCreateDeviceInfoList(pGuid, /*ClassGuid*/ NULL /*hwndParent*/);
     if (hDevInfo != INVALID_HANDLE_VALUE)
     {
-        if (SetupDiBuildDriverInfoList(hDevInfo,
-                    NULL, /*IN OUT PSP_DEVINFO_DATA DeviceInfoData, OPTIONAL*/
-                    SPDIT_CLASSDRIVER  /*IN DWORD DriverType*/
-                    ))
+        /** @todo bird/2020-09-01: seeing this during uninstall when windbg is
+         * attached to msiexec.exe (see trick in DllMain):
+         *
+         *    (1b238.1b254): Access violation - code c0000005 (first chance)
+         *    First chance exceptions are reported before any exception handling.
+         *    This exception may be expected and handled.
+         *    SETUPAPI!SpSignVerifyInfFile+0x246:
+         *    00007ffa`83e3ee3e 663907          cmp     word ptr [rdi],ax ds:00000000`00000000=????
+         *    0:006> k
+         *     # Child-SP          RetAddr           Call Site
+         *    00 00000099`6e4f8340 00007ffa`83e1e765 SETUPAPI!SpSignVerifyInfFile+0x246
+         *    01 00000099`6e4f8420 00007ffa`83e9ebfd SETUPAPI!DrvSearchCallback+0x1155
+         *    02 00000099`6e4f9380 00007ffa`83e9eed3 SETUPAPI!InfCacheSearchDirectory+0x469
+         *    03 00000099`6e4f98b0 00007ffa`83e9f454 SETUPAPI!InfCacheSearchDirectoryRecursive+0xcf
+         *    04 00000099`6e4f9fe0 00007ffa`83e9da10 SETUPAPI!InfCacheSearchPath+0x1a0
+         *    05 00000099`6e4fa2b0 00007ffa`83e262a2 SETUPAPI!EnumDrvInfsInDirPathList+0x560
+         *    06 00000099`6e4fa3f0 00007ffa`57a39a21 SETUPAPI!SetupDiBuildDriverInfoList+0x1242
+         *    07 00000099`6e4fab10 00007ffa`57a3ad6e MSID039!vboxDrvCfgCollectInfsSetupDi+0x71 [E:\vbox\svn\trunk\src\VBox\HostDrivers\win\cfg\VBoxDrvCfg.cpp @ 526]
+         *    08 00000099`6e4ff1c0 00007ffa`57a321e6 MSID039!VBoxDrvCfgInfUninstallAllSetupDi+0x5e [E:\vbox\svn\trunk\src\VBox\HostDrivers\win\cfg\VBoxDrvCfg.cpp @ 633]
+         *    09 (Inline Function) --------`-------- MSID039!_removeHostOnlyInterfaces+0x6c [E:\vbox\svn\trunk\src\VBox\Installer\win\InstallHelper\VBoxInstallHelper.cpp @ 1523]
+         *    0a 00000099`6e4ff240 00007ffa`610f59d3 MSID039!RemoveHostOnlyInterfaces+0x76 [E:\vbox\svn\trunk\src\VBox\Installer\win\InstallHelper\VBoxInstallHelper.cpp @ 1545]
+         *    0b 00000099`6e4ff270 00007ffa`610d80ac msi!CallCustomDllEntrypoint+0x2b
+         *    0c 00000099`6e4ff2e0 00007ffa`84567034 msi!CMsiCustomAction::CustomActionThread+0x34c
+         *    0d 00000099`6e4ff8d0 00007ffa`849a2651 KERNEL32!BaseThreadInitThunk+0x14
+         *    0e 00000099`6e4ff900 00000000`00000000 ntdll!RtlUserThreadStart+0x21
+         *    0:006> r
+         *    rax=0000000000000000 rbx=0000000000000490 rcx=aa222a2675da0000
+         *    rdx=0000000000000000 rsi=0000000000000000 rdi=0000000000000000
+         *    rip=00007ffa83e3ee3e rsp=000000996e4f8340 rbp=000000996e4f9480
+         *     r8=0000000000050004  r9=00007ffa83ef5418 r10=0000000000008000
+         *    r11=000000996e4f76f0 r12=000000996e4f84c8 r13=0000000000000000
+         *    r14=000000996e4f88d0 r15=0000000000000000
+         *    iopl=0         nv up ei pl nz ac pe cy
+         *    cs=0033  ss=002b  ds=002b  es=002b  fs=0053  gs=002b             efl=00010213
+         *    SETUPAPI!SpSignVerifyInfFile+0x246:
+         *    00007ffa`83e3ee3e 663907          cmp     word ptr [rdi],ax ds:00000000`00000000=????
+          */
+#if 0
+        if (SetupDiBuildDriverInfoList(hDevInfo, NULL /*DeviceInfoData*/, SPDIT_CLASSDRIVER))
+#else   /* Just in case the API doesn't catch it itself (seems it does on w10/19044).  */
+        BOOL fRc = FALSE;
+        DWORD uXcpt = 0;
+        __try
+        {
+            fRc = SetupDiBuildDriverInfoList(hDevInfo, NULL /*DeviceInfoData*/, SPDIT_CLASSDRIVER);
+        }
+        __except(uXcpt = GetExceptionCode(), EXCEPTION_EXECUTE_HANDLER)
+        {
+            NonStandardLogRelCrap((__FUNCTION__ ": SetupDiBuildDriverInfoList raised an exception: %#x\n", uXcpt));
+        }
+        if (fRc)
+#endif
         {
             SP_DRVINFO_DATA DrvInfo;
             DrvInfo.cbSize = sizeof(SP_DRVINFO_DATA);
-            char DetailBuf[16384];
-            PSP_DRVINFO_DETAIL_DATA pDrvDetail = (PSP_DRVINFO_DETAIL_DATA)DetailBuf;
-
-            for (DWORD i = 0; ; i++)
+
+            union
             {
-                if (SetupDiEnumDriverInfo(hDevInfo,
-                        NULL, /* IN PSP_DEVINFO_DATA DeviceInfoData, OPTIONAL*/
-                        SPDIT_CLASSDRIVER , /*IN DWORD DriverType,*/
-                        i, /*IN DWORD MemberIndex,*/
-                        &DrvInfo /*OUT PSP_DRVINFO_DATA DriverInfoData*/
-                        ))
+                SP_DRVINFO_DETAIL_DATA_W s;
+                uint8_t ab[16384];
+            } DrvDetail;
+
+            /* Ensure zero terminated buffer: */
+            DrvDetail.ab[sizeof(DrvDetail) - 1] = '\0';
+            DrvDetail.ab[sizeof(DrvDetail) - 2] = '\0';
+
+            for (DWORD i = 0; dwErrRet == ERROR_SUCCESS; i++)
+            {
+                if (SetupDiEnumDriverInfo(hDevInfo, NULL /*DeviceInfoData*/, SPDIT_CLASSDRIVER /*DriverType*/,
+                                          i /*MemberIndex*/, &DrvInfo /*DriverInfoData*/))
                 {
-                    DWORD dwReq;
-                    pDrvDetail->cbSize = sizeof(SP_DRVINFO_DETAIL_DATA);
-                    if (SetupDiGetDriverInfoDetail(
-                            hDevInfo, /*IN HDEVINFO DeviceInfoSet,*/
-                            NULL, /*IN PSP_DEVINFO_DATA DeviceInfoData, OPTIONAL*/
-                            &DrvInfo, /*IN PSP_DRVINFO_DATA DriverInfoData,*/
-                            pDrvDetail, /*OUT PSP_DRVINFO_DETAIL_DATA DriverInfoDetailData, OPTIONAL*/
-                            sizeof(DetailBuf), /*IN DWORD DriverInfoDetailDataSize,*/
-                            &dwReq /*OUT PDWORD RequiredSize OPTIONAL*/
-                            ))
+                    DWORD dwReq = 0;
+                    DrvDetail.s.cbSize = sizeof(SP_DRVINFO_DETAIL_DATA);
+                    if (SetupDiGetDriverInfoDetail(hDevInfo, NULL /*DeviceInfoData*/, &DrvInfo,
+                                                   &DrvDetail.s, sizeof(DrvDetail) - 2 /*our terminator*/, &dwReq))
                     {
-                        for (WCHAR *pwszHwId = pDrvDetail->HardwareID;
-                             pwszHwId && *pwszHwId && (uintptr_t)pwszHwId < (uintptr_t)DetailBuf + sizeof(DetailBuf);
-                             pwszHwId += wcslen(pwszHwId) + 1)
+                        for (WCHAR *pwszHwId = DrvDetail.s.HardwareID;
+                             *pwszHwId != '\0' && (uintptr_t)pwszHwId < (uintptr_t)&DrvDetail.ab[sizeof(DrvDetail)];
+                             pwszHwId += RTUtf16Len(pwszHwId) + 1)
                         {
-                            if (!wcsicmp(pwszHwId, pPnPId))
+                            if (RTUtf16ICmp(pwszHwId, pwszPnPId) == 0)
                             {
-                                NonStandardAssert(pDrvDetail->InfFileName[0]);
-                                if (pDrvDetail->InfFileName)
+                                NonStandardAssert(DrvDetail.s.InfFileName[0]);
+                                if (DrvDetail.s.InfFileName[0])
                                 {
-                                    list.add(pDrvDetail->InfFileName);
-                                    NonStandardLogRelCrap((__FUNCTION__": %S added to list", pDrvDetail->InfFileName));
+                                    HRESULT hrc = a_rList.add(DrvDetail.s.InfFileName);
+                                    NonStandardLogRelCrap((__FUNCTION__": %ls added to list (%#x)", DrvDetail.s.InfFileName, hrc));
+                                    if (hrc != S_OK)
+                                    {
+                                        dwErrRet = ERROR_OUTOFMEMORY;
+                                        break;
+                                    }
                                 }
                             }
@@ -527 +713 @@
                     {
                         DWORD dwErr2 = GetLastError();
-                        NonStandardLogRelCrap((__FUNCTION__": SetupDiGetDriverInfoDetail fail dwErr=%ld, size(%d)", dwErr2, dwReq));
-//                        NonStandardAssert(0);
+                        NonStandardLogRelCrap((__FUNCTION__": SetupDiGetDriverInfoDetail fail dwErr=%u, size(%d)", dwErr2, dwReq));
+//                        NonStandardAssertFailed();
                     }
-
                 }
                 else
@@ -540 +725 @@
                         break;
                     }
-
-                    NonStandardAssert(0);
+                    NonStandardAssertFailed();
                 }
             }
 
-            SetupDiDestroyDriverInfoList(hDevInfo,
-                      NULL, /*IN PSP_DEVINFO_DATA DeviceInfoData, OPTIONAL*/
-                      SPDIT_CLASSDRIVER/*IN DWORD DriverType*/
-                      );
+            SetupDiDestroyDriverInfoList(hDevInfo, NULL /*DeviceInfoData*/, SPDIT_CLASSDRIVER);
         }
         else
         {
-            dwErr = GetLastError();
-            NonStandardAssert(0);
+            dwErrRet = GetLastError();
+            NonStandardAssertFailed();
         }
 
@@ -560 +741 @@
     else
     {
-        dwErr = GetLastError();
-        NonStandardAssert(0);
-    }
-
-    return HRESULT_FROM_WIN32(dwErr);
+        dwErrRet = GetLastError();
+        NonStandardAssertFailed();
+    }
+
+    return HRESULT_FROM_WIN32(dwErrRet);
 }
 
@@ -586 +767 @@
 #endif
 
-VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstallAllSetupDi(IN const GUID * pGuidClass, IN LPCWSTR lpszClassName, IN LPCWSTR lpszPnPId, IN DWORD Flags)
+VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstallAllSetupDi(IN const GUID *pGuidClass, IN LPCWSTR pwszClassName,
+                                                          IN LPCWSTR pwszPnPId, IN DWORD fFlags)
 {
     VBoxDrvCfgStringList list(128);
-    HRESULT hr = vboxDrvCfgCollectInfsSetupDi(pGuidClass, lpszPnPId, list);
-    NonStandardLogRelCrap((__FUNCTION__": vboxDrvCfgCollectInfsSetupDi returned %d devices with PnPId %S and class name %S", list.size(), lpszPnPId, lpszClassName));
-    if (hr == S_OK)
-    {
-        INFENUM_CONTEXT Context;
-        Context.InfInfo.lpszClassName = lpszClassName;
-        Context.InfInfo.lpszPnPId = lpszPnPId;
-        Context.Flags = Flags;
-        Context.hr = S_OK;
-        int size = list.size();
-        for (int i = 0; i < size; ++i)
-        {
-            LPCWSTR pInf = list.get(i);
-            const WCHAR* pRel = wcsrchr(pInf, '\\');
-            if (pRel)
-                ++pRel;
-            else
-                pRel = pInf;
-
-            vboxDrvCfgInfEnumerationCallback(pRel, &Context);
-            NonStandardLogRelCrap((__FUNCTION__": inf = %S\n", list.get(i)));
-        }
-    }
-    return hr;
-}
-
-static HRESULT vboxDrvCfgEnumFiles(LPCWSTR pPattern, PFNVBOXNETCFG_ENUMERATION_CALLBACK pfnCallback, PVOID pContext)
-{
-    WIN32_FIND_DATA Data;
-    memset(&Data, 0, sizeof(Data));
-    HRESULT hr = S_OK;
-
-    HANDLE hEnum = FindFirstFile(pPattern,&Data);
+    HRESULT hrc = vboxDrvCfgCollectInfsSetupDi(pGuidClass, pwszPnPId, list);
+    NonStandardLogRelCrap((__FUNCTION__": vboxDrvCfgCollectInfsSetupDi returned %d devices with PnPId %ls and class name %ls",
+                           list.size(), pwszPnPId, pwszClassName));
+    if (hrc == S_OK)
+    {
+        INFENUM_CONTEXT_T Context;
+        Context.InfInfo.pwszClassName = pwszClassName;
+        Context.InfInfo.pwszPnPId = pwszPnPId;
+        Context.fFlags = fFlags;
+        Context.hrc = S_OK;
+        size_t const cItems = list.size();
+        for (size_t i = 0; i < cItems; ++i)
+        {
+            LPCWSTR pwszInf = list.get(i);
+
+            /* Find the start of the filename: */
+            size_t offFilename = RTUtf16Len(pwszInf);
+            while (offFilename > 0 && !RTPATH_IS_SEP(pwszInf[offFilename - 1]))
+                offFilename--;
+
+            vboxDrvCfgInfEnumerationCallback(&pwszInf[offFilename], &Context);
+            NonStandardLogRelCrap((__FUNCTION__": inf = %ls\n", pwszInf));
+        }
+    }
+    return hrc;
+}
+
+static HRESULT vboxDrvCfgEnumFiles(LPCWSTR pwszDirAndPattern, PFNVBOXNETCFG_ENUMERATION_CALLBACK_T pfnCallback, PVOID pContext)
+{
+    HRESULT hrc = S_OK;
+
+    WIN32_FIND_DATAW Data;
+    RT_ZERO(Data);
+    HANDLE hEnum = FindFirstFileW(pwszDirAndPattern, &Data);
     if (hEnum != INVALID_HANDLE_VALUE)
     {
-
-        do
+        for (;;)
         {
             if (!pfnCallback(Data.cFileName, pContext))
-            {
                 break;
-            }
 
             /* next iteration */
-            memset(&Data, 0, sizeof(Data));
-            BOOL bNext = FindNextFile(hEnum,&Data);
-            if (!bNext)
+            RT_ZERO(Data);
+            BOOL fNext = FindNextFile(hEnum, &Data);
+            if (!fNext)
             {
                 DWORD dwErr = GetLastError();
                 if (dwErr != ERROR_NO_MORE_FILES)
                 {
-                    NonStandardLogRelCrap((__FUNCTION__": FindNextFile fail dwErr=%ld\n", dwErr));
-                    NonStandardAssert(0);
-                    hr = HRESULT_FROM_WIN32(dwErr);
+                    NonStandardLogRelCrap((__FUNCTION__": FindNextFile fail dwErr=%u\n", dwErr));
+                    NonStandardAssertFailed();
+                    hrc = HRESULT_FROM_WIN32(dwErr);
                 }
                 break;
             }
-        }while (true);
+        }
+
         FindClose(hEnum);
     }
@@ -654 +835 @@
         if (dwErr != ERROR_NO_MORE_FILES)
         {
-            NonStandardLogRelCrap((__FUNCTION__": FindFirstFile fail dwErr=%ld\n", dwErr));
-            NonStandardAssert(0);
-            hr = HRESULT_FROM_WIN32(dwErr);
-        }
-    }
-
-    return hr;
-}
-
-static bool vboxDrvCfgInfEnumerationCallback(LPCWSTR lpszFileName, PVOID pCtxt)
-{
-    PINFENUM_CONTEXT pContext = (PINFENUM_CONTEXT)pCtxt;
-    DWORD dwErr;
-    NonStandardLogRelCrap((__FUNCTION__": lpszFileName (%S)\n", lpszFileName));
-    NonStandardLogRelCrap((__FUNCTION__ ": pContext->InfInfo.lpszClassName = (%S)\n", pContext->InfInfo.lpszClassName));
-    HINF hInf = SetupOpenInfFileW(lpszFileName, pContext->InfInfo.lpszClassName, INF_STYLE_WIN4, NULL /*__in PUINT ErrorLine */);
-    if (hInf == INVALID_HANDLE_VALUE)
-    {
-        dwErr = GetLastError();
-//        NonStandardAssert(dwErr == ERROR_CLASS_MISMATCH);
-        if (dwErr != ERROR_CLASS_MISMATCH)
-        {
-            NonStandardLogCrap((__FUNCTION__ ": SetupOpenInfFileW err dwErr=%ld\n", dwErr));
-        }
+            NonStandardLogRelCrap((__FUNCTION__": FindFirstFile fail dwErr=%u\n", dwErr));
+            NonStandardAssertFailed();
+            hrc = HRESULT_FROM_WIN32(dwErr);
+        }
+    }
+
+    return hrc;
+}
+
+VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstallAllF(LPCWSTR pwszClassName, LPCWSTR pwszPnPId, DWORD fFlags)
+{
+    static WCHAR const s_wszFilter[] = L"\\inf\\oem*.inf";
+
+    HRESULT hrc;
+    WCHAR   wszInfDirPath[MAX_PATH];
+    UINT    cwcInput = RT_ELEMENTS(wszInfDirPath) - RT_ELEMENTS(s_wszFilter);
+    UINT    cwcWindows = GetSystemWindowsDirectoryW(wszInfDirPath, cwcInput);
+    if (cwcWindows > 0 && cwcWindows < cwcInput)
+    {
+        RTUtf16Copy(&wszInfDirPath[cwcWindows], RT_ELEMENTS(wszInfDirPath) - cwcWindows, s_wszFilter);
+
+        INFENUM_CONTEXT_T Context;
+        Context.InfInfo.pwszClassName = pwszClassName;
+        Context.InfInfo.pwszPnPId = pwszPnPId;
+        Context.fFlags = fFlags;
+        Context.hrc = S_OK;
+        NonStandardLogRelCrap((__FUNCTION__": Calling vboxDrvCfgEnumFiles(wszInfDirPath, vboxDrvCfgInfEnumerationCallback, &Context)"));
+        hrc = vboxDrvCfgEnumFiles(wszInfDirPath, vboxDrvCfgInfEnumerationCallback, &Context);
+        NonStandardAssert(hrc == S_OK);
+        if (hrc == S_OK)
+            hrc = Context.hrc;
         else
-        {
-            NonStandardLogCrap((__FUNCTION__ ": dwErr == ERROR_CLASS_MISMATCH\n"));
-        }
-        return true;
-    }
-
-    LPWSTR lpszPnPId;
-    HRESULT hr = vboxDrvCfgInfQueryFirstPnPId(hInf, &lpszPnPId);
-    NonStandardLogRelCrap((__FUNCTION__ ": vboxDrvCfgInfQueryFirstPnPId returned lpszPnPId = (%S)\n", lpszPnPId));
-    NonStandardLogRelCrap((__FUNCTION__ ": pContext->InfInfo.lpszPnPId = (%S)\n", pContext->InfInfo.lpszPnPId));
-    if (hr == S_OK)
-    {
-        if (!wcsicmp(pContext->InfInfo.lpszPnPId, lpszPnPId))
-        {
-            if (!SetupUninstallOEMInfW(lpszFileName,
-                        pContext->Flags, /*DWORD Flags could be SUOI_FORCEDELETE */
-                        NULL /*__in PVOID Reserved == NULL */
-                        ))
-            {
-                dwErr = GetLastError();
-                NonStandardLogRelCrap((__FUNCTION__ ": SetupUninstallOEMInf failed for file (%S), dwErr=%ld\n", lpszFileName, dwErr));
-                NonStandardAssert(0);
-                hr = HRESULT_FROM_WIN32( dwErr );
-            }
-        }
-
-        free(lpszPnPId);
-    }
-    else
-    {
-        NonStandardLogCrap((__FUNCTION__ ": vboxDrvCfgInfQueryFirstPnPId failed, hr=0x%x\n", hr));
-    }
-
-    SetupCloseInfFile(hInf);
-
-    return true;
-}
-
-VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgInfUninstallAllF(LPCWSTR lpszClassName, LPCWSTR lpszPnPId, DWORD Flags)
-{
-    static WCHAR const s_wszFilter[] = L"\\inf\\oem*.inf";
-    HRESULT hr;
-    WCHAR wszInfDirPath[MAX_PATH];
-    UINT cwcInput = RT_ELEMENTS(wszInfDirPath) - RT_ELEMENTS(s_wszFilter);
-    UINT cwcWindows = GetSystemWindowsDirectory(wszInfDirPath, cwcInput);
-    if (cwcWindows > 0 && cwcWindows < cwcInput)
-    {
-        wcscpy(&wszInfDirPath[cwcWindows], s_wszFilter);
-
-        INFENUM_CONTEXT Context;
-        Context.InfInfo.lpszClassName = lpszClassName;
-        Context.InfInfo.lpszPnPId = lpszPnPId;
-        Context.Flags = Flags;
-        Context.hr = S_OK;
-        NonStandardLogRelCrap((__FUNCTION__": Calling vboxDrvCfgEnumFiles(wszInfDirPath, vboxDrvCfgInfEnumerationCallback, &Context)"));
-        hr = vboxDrvCfgEnumFiles(wszInfDirPath, vboxDrvCfgInfEnumerationCallback, &Context);
-        NonStandardAssert(hr == S_OK);
-        if (hr == S_OK)
-        {
-            hr = Context.hr;
-        }
-        else
-        {
-            NonStandardLogRelCrap((__FUNCTION__": vboxDrvCfgEnumFiles failed, hr=0x%x\n", hr));
-        }
+            NonStandardLogRelCrap((__FUNCTION__": vboxDrvCfgEnumFiles failed, hrc=0x%x\n", hrc));
     }
     else
@@ -749 +873 @@
         NonStandardLogRelCrap((__FUNCTION__": GetSystemWindowsDirectory failed, cwcWindows=%u lasterr=%u\n", cwcWindows, GetLastError()));
         NonStandardAssertFailed();
-        hr = E_FAIL;
-    }
-
-    return hr;
+        hrc = E_FAIL;
+    }
+
+    return hrc;
 
 }
@@ -764 +888 @@
 #define VBOXDRVCFG_SVC_WAITSTART_RETRIES (VBOXDRVCFG_SVC_WAITSTART_TIME/VBOXDRVCFG_SVC_WAITSTART_TIME_PERIOD)
 
-VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgSvcStart(LPCWSTR lpszSvcName)
-{
-    SC_HANDLE hMgr = OpenSCManager(NULL, NULL, SERVICE_QUERY_STATUS | SERVICE_START);
+VBOXDRVCFG_DECL(HRESULT) VBoxDrvCfgSvcStart(LPCWSTR pwszSvcName)
+{
+    SC_HANDLE hMgr = OpenSCManagerW(NULL, NULL, SERVICE_QUERY_STATUS | SERVICE_START);
     if (hMgr == NULL)
     {
         DWORD dwErr = GetLastError();
-        NonStandardLogRelCrap((__FUNCTION__": OpenSCManager failed, dwErr=%ld\n", dwErr));
+        NonStandardLogRelCrap((__FUNCTION__": OpenSCManager failed, dwErr=%u\n", dwErr));
         return HRESULT_FROM_WIN32(dwErr);
     }
 
-    HRESULT hr = S_OK;
-    SC_HANDLE hSvc = OpenServiceW(hMgr, lpszSvcName, SERVICE_QUERY_STATUS | SERVICE_START);
+    HRESULT hrc = S_OK;
+    SC_HANDLE hSvc = OpenServiceW(hMgr, pwszSvcName, SERVICE_QUERY_STATUS | SERVICE_START);
     if (hSvc)
     {
-        do
-        {
-            SERVICE_STATUS Status;
-            BOOL fRc = QueryServiceStatus(hSvc, &Status);
-            if (!fRc)
-            {
-                DWORD dwErr = GetLastError();
-                NonStandardLogRelCrap((__FUNCTION__": QueryServiceStatus failed dwErr=%ld\n", dwErr));
-                hr = HRESULT_FROM_WIN32(dwErr);
-                break;
-            }
-
+        SERVICE_STATUS Status;
+        BOOL fRc = QueryServiceStatus(hSvc, &Status);
+        if (fRc)
+        {
             if (Status.dwCurrentState != SERVICE_RUNNING && Status.dwCurrentState != SERVICE_START_PENDING)
             {
-                NonStandardLogRelCrap(("Starting service (%S)\n", lpszSvcName));
+                NonStandardLogRelCrap(("Starting service (%ls)\n", pwszSvcName));
 
                 fRc = StartService(hSvc, 0, NULL);
@@ -798 +914 @@
                 {
                     DWORD dwErr = GetLastError();
-                    NonStandardLogRelCrap((__FUNCTION__": StartService failed dwErr=%ld\n", dwErr));
-                    hr = HRESULT_FROM_WIN32(dwErr);
-                    break;
+                    NonStandardLogRelCrap((__FUNCTION__": StartService failed dwErr=%u\n", dwErr));
+                    hrc = HRESULT_FROM_WIN32(dwErr);
                 }
             }
 
-            fRc = QueryServiceStatus(hSvc, &Status);
-            if (!fRc)
+            if (fRc)
             {
-                DWORD dwErr = GetLastError();
-                NonStandardLogRelCrap((__FUNCTION__": QueryServiceStatus failed dwErr=%ld\n", dwErr));
-                hr = HRESULT_FROM_WIN32(dwErr);
-                break;
-            }
-
-            if (Status.dwCurrentState == SERVICE_START_PENDING)
-            {
-                for (int i = 0; i < VBOXDRVCFG_SVC_WAITSTART_RETRIES; ++i)
+                fRc = QueryServiceStatus(hSvc, &Status);
+                if (fRc)
                 {
-                    Sleep(VBOXDRVCFG_SVC_WAITSTART_TIME_PERIOD);
-                    fRc = QueryServiceStatus(hSvc, &Status);
-                    if (!fRc)
+                    if (Status.dwCurrentState == SERVICE_START_PENDING)
+                        for (size_t i = 0; i < VBOXDRVCFG_SVC_WAITSTART_RETRIES; ++i)
+                        {
+                            Sleep(VBOXDRVCFG_SVC_WAITSTART_TIME_PERIOD);
+                            fRc = QueryServiceStatus(hSvc, &Status);
+                            if (!fRc)
+                            {
+                                DWORD dwErr = GetLastError();
+                                NonStandardLogRelCrap((__FUNCTION__": QueryServiceStatus failed dwErr=%u\n", dwErr));
+                                hrc = HRESULT_FROM_WIN32(dwErr);
+                                break;
+                            }
+                            if (Status.dwCurrentState != SERVICE_START_PENDING)
+                                break;
+                        }
+
+                    if (hrc != S_OK || Status.dwCurrentState != SERVICE_RUNNING)
                     {
-                        DWORD dwErr = GetLastError();
-                        NonStandardLogRelCrap((__FUNCTION__": QueryServiceStatus failed dwErr=%ld\n", dwErr));
-                        hr = HRESULT_FROM_WIN32(dwErr);
-                        break;
+                        NonStandardLogRelCrap((__FUNCTION__": Failed to start the service\n"));
+                        hrc = E_FAIL;
                     }
-                    else if (Status.dwCurrentState != SERVICE_START_PENDING)
-                        break;
+                }
+                else
+                {
+                    DWORD dwErr = GetLastError();
+                    NonStandardLogRelCrap((__FUNCTION__": QueryServiceStatus failed dwErr=%u\n", dwErr));
+                    hrc = HRESULT_FROM_WIN32(dwErr);
                 }
             }
-
-            if (hr != S_OK || Status.dwCurrentState != SERVICE_RUNNING)
-            {
-                NonStandardLogRelCrap((__FUNCTION__": Failed to start the service\n"));
-                hr = E_FAIL;
-                break;
-            }
-
-        } while (0);
+        }
+        else
+        {
+            DWORD dwErr = GetLastError();
+            NonStandardLogRelCrap((__FUNCTION__": QueryServiceStatus failed dwErr=%u\n", dwErr));
+            hrc = HRESULT_FROM_WIN32(dwErr);
+        }
 
         CloseServiceHandle(hSvc);
@@ -845 +966 @@
     {
         DWORD dwErr = GetLastError();
-        NonStandardLogRelCrap((__FUNCTION__": OpenServiceW failed, dwErr=%ld\n", dwErr));
-        hr = HRESULT_FROM_WIN32(dwErr);
+        NonStandardLogRelCrap((__FUNCTION__": OpenServiceW failed, dwErr=%u\n", dwErr));
+        hrc = HRESULT_FROM_WIN32(dwErr);
     }
 
     CloseServiceHandle(hMgr);
-
-    return hr;
-}
-
-
-HRESULT VBoxDrvCfgDrvUpdate(LPCWSTR pcszwHwId, LPCWSTR pcsxwInf, BOOL *pbRebootRequired)
-{
-    if (pbRebootRequired)
-        *pbRebootRequired = FALSE;
-    BOOL bRebootRequired = FALSE;
-    WCHAR InfFullPath[MAX_PATH];
-    DWORD dwChars = GetFullPathNameW(pcsxwInf,
-            sizeof (InfFullPath) / sizeof (InfFullPath[0]),
-            InfFullPath,
-            NULL /* LPTSTR *lpFilePart */
-            );
+    return hrc;
+}
+
+
+HRESULT VBoxDrvCfgDrvUpdate(LPCWSTR pszwHwId, LPCWSTR psxwInf, BOOL *pfRebootRequired)
+{
+    if (pfRebootRequired)
+        *pfRebootRequired = FALSE;
+
+    WCHAR wszInfFullPath[MAX_PATH];
+    DWORD dwChars = GetFullPathNameW(psxwInf, MAX_PATH, wszInfFullPath, NULL /*lpFilePart*/);
     if (!dwChars || dwChars >= MAX_PATH)
     {
-        NonStandardLogCrap(("GetFullPathNameW failed, dwErr=%ld, dwChars=%ld\n",
-                            GetLastError(), dwChars));
+        NonStandardLogCrap(("GetFullPathNameW failed, dwErr=%u, dwChars=%ld\n", GetLastError(), dwChars));
         return E_INVALIDARG;
     }
 
-
-    if (!UpdateDriverForPlugAndPlayDevicesW(NULL, /* HWND hwndParent */
-            pcszwHwId,
-            InfFullPath,
-            INSTALLFLAG_FORCE,
-            &bRebootRequired))
+    BOOL fRebootRequired = FALSE;
+    if (!UpdateDriverForPlugAndPlayDevicesW(NULL /*hwndParent*/, pszwHwId, wszInfFullPath, INSTALLFLAG_FORCE, &fRebootRequired))
     {
         DWORD dwErr = GetLastError();
-        NonStandardLogCrap(("UpdateDriverForPlugAndPlayDevicesW failed, dwErr=%ld\n",
-                            dwErr));
+        NonStandardLogCrap(("UpdateDriverForPlugAndPlayDevicesW failed, dwErr=%u\n", dwErr));
         return HRESULT_FROM_WIN32(dwErr);
     }
 
-
-    if (bRebootRequired)
-        NonStandardLogCrap(("!!Driver Update: REBOOT REQUIRED!!\n", GetLastError(), dwChars));
-
-    if (pbRebootRequired)
-        *pbRebootRequired = bRebootRequired;
+    if (fRebootRequired)
+        NonStandardLogCrap(("!!Driver Update: REBOOT REQUIRED!!\n"));
+
+    if (pfRebootRequired)
+        *pfRebootRequired = fRebootRequired;
 
     return S_OK;
 }
+

trunk/src/VBox/Installer/win/InstallHelper/Makefile.kmk

@@ -52 +52 @@
 ifdef VBOX_WITH_NETFLT
  VBoxInstallHelper_LIBS   += \
-        $(PATH_STAGE_LIB)/WinNetConfig.lib \
-        $(PATH_STAGE_LIB)/VBoxDrvCfg.lib \
+        $(PATH_STAGE_LIB)/WinNetConfigSharedStatic.lib \
+        $(PATH_STAGE_LIB)/VBoxDrvCfgSharedStatic.lib \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib

trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp

@@ -33 +33 @@
 *********************************************************************************************************************************/
 #include <iprt/win/windows.h>
-
-#include <tchar.h>
-#include <stdio.h>
-
 #include <msi.h>
 #include <msiquery.h>
 
+#include <iprt/string.h>
 #include <iprt/utf16.h>
 
 
-#if (_MSC_VER < 1400) /* Provide swprintf_s to VC < 8.0. */
-int swprintf_s(WCHAR *buffer, size_t cbBuffer, const WCHAR *format, ...)
+UINT VBoxGetMsiProp(MSIHANDLE hMsi, const WCHAR *pwszName, WCHAR *pwszValueBuf, DWORD cwcValueBuf)
 {
-    int ret;
-    va_list va;
-    va_start(va, format);
-    ret = _vsnwprintf(buffer, cbBuffer, format, va);
-    va_end(va);
-    return ret;
-}
-#endif
+    RT_BZERO(pwszValueBuf, cwcValueBuf * sizeof(pwszValueBuf[0]));
 
-UINT VBoxGetMsiProp(MSIHANDLE hMsi, const WCHAR *pwszName, WCHAR *pwszValue, DWORD dwSize)
-{
-    DWORD dwBuffer = 0;
-    UINT uiRet = MsiGetPropertyW(hMsi, pwszName, L"", &dwBuffer);
+    /** @todo r=bird: why do we need to query the size first and then the data.
+     *        The API should be perfectly capable of doing that without our help. */
+    DWORD cwcNeeded = 0;
+    UINT  uiRet = MsiGetPropertyW(hMsi, pwszName, L"", &cwcNeeded);
     if (uiRet == ERROR_MORE_DATA)
     {
-        ++dwBuffer;     /* On output does not include terminating null, so add 1. */
+        ++cwcNeeded;     /* On output does not include terminating null, so add 1. */
 
-        if (dwBuffer > dwSize)
+        if (cwcNeeded > cwcValueBuf)
             return ERROR_MORE_DATA;
-
-        ZeroMemory(pwszValue, dwSize);
-        uiRet = MsiGetPropertyW(hMsi, pwszName, pwszValue, &dwBuffer);
+        uiRet = MsiGetPropertyW(hMsi, pwszName, pwszValueBuf, &cwcNeeded);
     }
     return uiRet;
@@ -92 +79 @@
         WCHAR wszValue[1024]; /* 1024 should be enough for everybody (tm). */
         if (VBoxGetMsiProp(hMsi, pwszName, wszValue, sizeof(wszValue)) == ERROR_SUCCESS)
-        {
             rc = RTUtf16ToUtf8(wszValue, ppszValue);
-        }
         else
             rc = VERR_NOT_FOUND;
@@ -113 +98 @@
 {
     wchar_t wszTemp[32];
-    swprintf(wszTemp, sizeof(wszTemp) / sizeof(wchar_t), L"%ld", dwVal);
+    RTUtf16Printf(wszTemp, RT_ELEMENTS(wszTemp), "%u", dwVal);
     return VBoxSetMsiProp(hMsi, pwszName, wszTemp);
 }

trunk/src/VBox/Installer/win/InstallHelper/VBoxCommon.h

@@ -36 +36 @@
 #endif
 
-UINT VBoxGetMsiProp(MSIHANDLE hMsi, const WCHAR *pwszName, WCHAR *pwszValue, DWORD dwSize);
+UINT VBoxGetMsiProp(MSIHANDLE hMsi, const WCHAR *pwszName, WCHAR *pwszValueBuf, DWORD cwcValueBuf);
 int  VBoxGetMsiPropUtf8(MSIHANDLE hMsi, const char *pcszName, char **ppszValue);
 UINT VBoxSetMsiProp(MSIHANDLE hMsi, const WCHAR *pwszName, const WCHAR *pwszValue);

trunk/src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp

@@ -35 +35 @@
 #endif
 
-#include <VBox/version.h>
-
-#include <wchar.h>
-#include <stdio.h>
-
 #include <msi.h>
 #include <msiquery.h>
@@ -46 +41 @@
 #include <iprt/win/windows.h>
 
-#include <assert.h>
 #include <shellapi.h>
 #define INITGUID
@@ -53 +47 @@
 #include <devguid.h>
 
-#include <iprt/alloca.h>
-#include <iprt/string.h> /* RT_ZERO */
-#include <iprt/path.h>   /* RTPATH_MAX, RTPATH_IS_SLASH */
-
 #include <iprt/win/objbase.h>
 #include <iprt/win/setupapi.h>
 #include <iprt/win/shlobj.h>
 
+#include <VBox/version.h>
+
+#include <iprt/assert.h>
+#include <iprt/alloca.h>
+#include <iprt/mem.h>
+#include <iprt/path.h>   /* RTPATH_MAX, RTPATH_IS_SLASH */
+#include <iprt/string.h> /* RT_ZERO */
+#include <iprt/utf16.h>
+
 #include "VBoxCommon.h"
-
 #ifndef VBOX_OSE
 # include "internal/VBoxSerial.h"
@@ -72 +70 @@
 *********************************************************************************************************************************/
 #ifdef DEBUG
-# define NonStandardAssert(_expr) assert(_expr)
+# define NonStandardAssert(_expr) Assert(_expr)
 #else
 # define NonStandardAssert(_expr) do{ }while(0)
@@ -88 +86 @@
 {
     RT_NOREF(hInst, uReason, pReserved);
+
+#if 0
+    /*
+     * This is a trick for allowing the debugger to be attached, don't know if
+     * there is an official way to do that, but this is a pretty efficient.
+     *
+     * Monitor the debug output in DbgView and be ready to start windbg when
+     * the message below appear.  This will happen 3-4 times during install,
+     * and 2-3 times during uninstall.
+     *
+     * Note! The DIFxApp.DLL will automatically trigger breakpoints when a
+     *       debugger is attached.  Just continue on these.
+     */
+    if (uReason == DLL_PROCESS_ATTACH)
+    {
+        WCHAR wszMsg[128];
+        RTUtf16Printf(wszMsg, RT_ELEMENTS(wszMsg), "Waiting for debugger to attach: windbg -g -G -p %u\n", GetCurrentProcessId());
+        for (unsigned i = 0; i < 128 && !IsDebuggerPresent(); i++)
+        {
+            OutputDebugStringW(wszMsg);
+            Sleep(1001);
+        }
+        Sleep(1002);
+        __debugbreak();
+    }
+#endif
+
     return TRUE;
 }
@@ -94 +119 @@
  * Format and add message to the MSI log.
  *
- * UTF-16 strings are formatted using '%s' (lowercase).
- * ANSI strings are formatted using '%S' (uppercase).
+ * UTF-16 strings are formatted using '%ls' (lowercase).
+ * ANSI strings are formatted using '%s' (uppercase).
  */
-static UINT logStringF(MSIHANDLE hInstall, const wchar_t *pwszFmt, ...)
+static UINT logStringF(MSIHANDLE hInstall, const char *pszFmt, ...)
 {
     PMSIHANDLE hMSI = MsiCreateRecord(2 /* cParms */);
@@ -104 +129 @@
         wchar_t wszBuf[RTPATH_MAX + 256];
         va_list va;
-        va_start(va, pwszFmt);
-        ssize_t cwc = _vsnwprintf(wszBuf, RT_ELEMENTS(wszBuf), pwszFmt, va);
+        va_start(va, pszFmt);
+        ssize_t cwc = RTUtf16PrintfV(wszBuf, RT_ELEMENTS(wszBuf), pszFmt, va);
         va_end(va);
-        wszBuf[RT_ELEMENTS(wszBuf) - 1] = '\0';
 
         MsiRecordSetStringW(hMSI, 0, wszBuf);
@@ -151 +175 @@
      * Construct a full command line.
      */
-    size_t const cwcImage = wcslen(pwszImage);
-    size_t const cwcArgs  = wcslen(pwszArgs);
+    size_t const cwcImage = RTUtf16Len(pwszImage);
+    size_t const cwcArgs  = RTUtf16Len(pwszArgs);
 
     wchar_t *pwszCmdLine = (wchar_t *)alloca((1 + cwcImage + 1 + 1 + cwcArgs + 1) * sizeof(wchar_t));
@@ -184 +208 @@
                        0 /*fFlags*/, NULL /*pwszEnv*/, NULL /*pwszCwd*/, &StartupInfo, &ChildInfo))
     {
-        logStringF(hModule, L"procRun: Info: Started process %u: %s", ChildInfo.dwProcessId, pwszCmdLine);
+        logStringF(hModule, "procRun: Info: Started process %u: %ls", ChildInfo.dwProcessId, pwszCmdLine);
         CloseHandle(ChildInfo.hThread);
         DWORD const dwWait = WaitForSingleObject(ChildInfo.hProcess, RT_MS_30SEC);
@@ -192 +216 @@
             if (dwExitCode == 0)
             {
-                logStringF(hModule, L"procRun: Info: Process '%s' terminated exit code zero", pwszCmdLine);
+                logStringF(hModule, "procRun: Info: Process '%ls' terminated exit code zero", pwszCmdLine);
                 rcWin = ERROR_SUCCESS;
             }
             else
             {
-                logStringF(hModule, L"procRun: Process '%s' terminated with non-zero exit code: %u (%#x)",
+                logStringF(hModule, "procRun: Process '%ls' terminated with non-zero exit code: %u (%#x)",
                            pwszCmdLine, dwExitCode, dwExitCode);
                 rcWin = ERROR_GEN_FAILURE;
@@ -205 +229 @@
         {
             rcWin = GetLastError();
-            logStringF(hModule, L"procRun: Process '%s' is probably still running: rcWin=%u dwWait=%u (%#x)",
+            logStringF(hModule, "procRun: Process '%ls' is probably still running: rcWin=%u dwWait=%u (%#x)",
                        pwszCmdLine, rcWin, dwWait, dwWait);
         }
@@ -212 +236 @@
     {
         rcWin = GetLastError();
-        logStringF(hModule, L"procRun: Creating process '%s' failed: rcWin=%u\n", pwszCmdLine, rcWin);
+        logStringF(hModule, "procRun: Creating process '%ls' failed: rcWin=%u\n", pwszCmdLine, rcWin);
     }
     return rcWin;
@@ -308 +332 @@
                             cwc += RT_ELEMENTS(s_wszPythonExe) - 1;
                         wszBuf[cwc] = '\0';
-                        logStringF(hModule, L"getPythonPath: Found: \"%s\"", wszBuf);
+                        logStringF(hModule, "getPythonPath: Found: \"%ls\"", wszBuf);
 
                         NonStandardAssert(cwcPythonPath > cwc);
@@ -316 +340 @@
                     }
                     else
-                        logStringF(hModule, L"getPythonPath: Warning: Skipping \"%s\": is a directory (%#x)", wszBuf, fAttribs);
+                        logStringF(hModule, "getPythonPath: Warning: Skipping \"%ls\": is a directory (%#x)", wszBuf, fAttribs);
                 }
                 else
-                    logStringF(hModule, L"getPythonPath: Warning: Skipping \"%s\": Does not exist (%u)", wszBuf, GetLastError());
+                    logStringF(hModule, "getPythonPath: Warning: Skipping \"%ls\": Does not exist (%u)", wszBuf, GetLastError());
             }
         }
@@ -326 +350 @@
     RegCloseKey(hKeyPythonCore);
     if (rcWinRet != ERROR_SUCCESS)
-        logStringF(hModule, L"getPythonPath: Unable to find python");
+        logStringF(hModule, "getPythonPath: Unable to find python");
     return rcWinRet;
 }
@@ -374 +398 @@
      * This is a prerequisite for setting up the VBox API.
      */
-    logStringF(hModule, L"checkPythonDependencies: Checking for win32api extensions ...");
+    logStringF(hModule, "checkPythonDependencies: Checking for win32api extensions ...");
 
     UINT rcWin = procRun(hModule, pwszPythonExe, L"-c \"import win32api\"");
     if (rcWin == ERROR_SUCCESS)
-        logStringF(hModule, L"checkPythonDependencies: win32api found\n");
+        logStringF(hModule, "checkPythonDependencies: win32api found\n");
     else
-        logStringF(hModule, L"checkPythonDependencies: Importing win32api failed with %u (%#x)\n", rcWin, rcWin);
+        logStringF(hModule, "checkPythonDependencies: Importing win32api failed with %u (%#x)\n", rcWin, rcWin);
 
     return rcWin;
@@ -402 +426 @@
     if (rcWin == ERROR_SUCCESS)
     {
-        logStringF(hModule, L"IsPythonInstalled: Python installation found at \"%s\"", wszPythonPath);
+        logStringF(hModule, "IsPythonInstalled: Python installation found at \"%ls\"", wszPythonPath);
         VBoxSetMsiProp(hModule, L"VBOX_PYTHON_PATH", wszPythonPath);
         VBoxSetMsiProp(hModule, L"VBOX_PYTHON_INSTALLED", L"1");
@@ -408 +432 @@
     else
     {
-        logStringF(hModule, L"IsPythonInstalled: Error: No suitable Python installation found (%u), skipping installation.", rcWin);
-        logStringF(hModule, L"IsPythonInstalled: Python seems not to be installed; please download + install the Python Core package.");
+        logStringF(hModule, "IsPythonInstalled: Error: No suitable Python installation found (%u), skipping installation.", rcWin);
+        logStringF(hModule, "IsPythonInstalled: Python seems not to be installed; please download + install the Python Core package.");
         VBoxSetMsiProp(hModule, L"VBOX_PYTHON_INSTALLED", L"0");
     }
@@ -434 +458 @@
         dwErr = checkPythonDependencies(hModule, wszPythonExe);
         if (dwErr == ERROR_SUCCESS)
-            logStringF(hModule, L"ArePythonAPIDepsInstalled: Dependencies look good.");
+            logStringF(hModule, "ArePythonAPIDepsInstalled: Dependencies look good.");
     }
 
     if (dwErr != ERROR_SUCCESS)
-        logStringF(hModule, L"ArePythonAPIDepsInstalled: Failed with dwErr=%u", dwErr);
+        logStringF(hModule, "ArePythonAPIDepsInstalled: Failed with dwErr=%u", dwErr);
 
     VBoxSetMsiProp(hModule, L"VBOX_PYTHON_DEPS_INSTALLED", dwErr == ERROR_SUCCESS ? L"1" : L"0");
@@ -462 +486 @@
 {
     HKEY hKeyVS = NULL;
-    LSTATUS dwErr = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
-                                  L"SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64",
-                                  0, KEY_READ, &hKeyVS);
-    if (dwErr == ERROR_SUCCESS)
+    LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE,
+                                L"SOFTWARE\\Microsoft\\VisualStudio\\14.0\\VC\\Runtimes\\X64",
+                                0, KEY_READ, &hKeyVS);
+    if (lrc == ERROR_SUCCESS)
     {
         DWORD dwVal = 0;
         DWORD cbVal = sizeof(dwVal);
-        DWORD dwValueType = REG_DWORD;
-
-        dwErr = RegQueryValueExW(hKeyVS, L"Installed", NULL, &dwValueType, (LPBYTE)&dwVal, &cbVal);
-        if (dwErr == ERROR_SUCCESS)
+        DWORD dwValueType = REG_DWORD; /** @todo r=bird: output only parameter, optional, so pointless. */
+        lrc = RegQueryValueExW(hKeyVS, L"Installed", NULL, &dwValueType, (LPBYTE)&dwVal, &cbVal);
+        if (lrc == ERROR_SUCCESS)
         {
             if (dwVal >= 1)
             {
-                DWORD dwMin, dwMaj;
-                dwErr = RegQueryValueExW(hKeyVS, L"Major", NULL, &dwValueType, (LPBYTE)&dwMaj, &cbVal);
-                if (dwErr == ERROR_SUCCESS)
+                DWORD dwMaj = 0; /** @todo r=bird: It's purdent to initialize values if you don't bother to check the type and size! */
+                lrc = RegQueryValueExW(hKeyVS, L"Major", NULL, &dwValueType, (LPBYTE)&dwMaj, &cbVal);
+                if (lrc == ERROR_SUCCESS)
                 {
                     VBoxSetMsiPropDWORD(hModule, L"VBOX_MSCRT_VER_MAJ", dwMaj);
 
-                    dwErr = RegQueryValueExW(hKeyVS, L"Minor", NULL, &dwValueType, (LPBYTE)&dwMin, &cbVal);
-                    if (dwErr == ERROR_SUCCESS)
+                    DWORD dwMin = 0;
+                    lrc = RegQueryValueExW(hKeyVS, L"Minor", NULL, &dwValueType, (LPBYTE)&dwMin, &cbVal);
+                    if (lrc == ERROR_SUCCESS)
                     {
                         VBoxSetMsiPropDWORD(hModule, L"VBOX_MSCRT_VER_MIN", dwMin);
 
-                        logStringF(hModule, L"IsMSCRTInstalled: Found v%ld.%ld\n", dwMaj, dwMin);
+                        logStringF(hModule, "IsMSCRTInstalled: Found v%u.%u\n", dwMaj, dwMin);
 
                         /* Check for at least 2019. */
@@ -494 +518 @@
                     }
                     else
-                        logStringF(hModule, L"IsMSCRTInstalled: Found, but 'Minor' key not present");
+                        logStringF(hModule, "IsMSCRTInstalled: Found, but 'Minor' key not present (lrc=%d)", lrc);
                 }
                 else
-                    logStringF(hModule, L"IsMSCRTInstalled: Found, but 'Major' key not present");
+                    logStringF(hModule, "IsMSCRTInstalled: Found, but 'Major' key not present (lrc=%d)", lrc);
             }
             else
             {
-                logStringF(hModule, L"IsMSCRTInstalled: Found, but not marked as installed");
-                dwErr = ERROR_NOT_INSTALLED;
+                logStringF(hModule, "IsMSCRTInstalled: Found, but not marked as installed");
+                lrc = ERROR_NOT_INSTALLED;
             }
         }
         else
-            logStringF(hModule, L"IsMSCRTInstalled: Found, but 'Installed' key not present");
-    }
-
-    if (dwErr != ERROR_SUCCESS)
-        logStringF(hModule, L"IsMSCRTInstalled: Failed with dwErr=%ld", dwErr);
+            logStringF(hModule, "IsMSCRTInstalled: Found, but 'Installed' key not present (lrc=%d)", lrc);
+    }
+
+    if (lrc != ERROR_SUCCESS)
+        logStringF(hModule, "IsMSCRTInstalled: Failed with lrc=%ld", lrc);
 
     return ERROR_SUCCESS; /* Never return failure. */
@@ -533 +557 @@
      */
     HKEY hKeyCurVer = NULL;
-    LSTATUS dwErr = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hKeyCurVer);
-    if (dwErr == ERROR_SUCCESS)
+    LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion", 0, KEY_READ, &hKeyCurVer);
+    if (lrc == ERROR_SUCCESS)
     {
         DWORD dwVal = 0;
         DWORD cbVal = sizeof(dwVal);
-        DWORD dwValueType = REG_DWORD;
-        dwErr = RegQueryValueExW(hKeyCurVer, L"CurrentMajorVersionNumber", NULL, &dwValueType, (LPBYTE)&dwVal, &cbVal);
-        if (dwErr == ERROR_SUCCESS)
-        {
-            logStringF(hModule, L"IsWindows10/CurrentMajorVersionNumber: %ld", dwVal);
+        DWORD dwValueType = REG_DWORD; /** @todo r=bird: Again, the type is an optional output parameter. pointless to init or pass it unless you check.  */
+        lrc = RegQueryValueExW(hKeyCurVer, L"CurrentMajorVersionNumber", NULL, &dwValueType, (LPBYTE)&dwVal, &cbVal);
+        if (lrc == ERROR_SUCCESS)
+        {
+            logStringF(hModule, "IsWindows10/CurrentMajorVersionNumber: %u", dwVal);
 
             VBoxSetMsiProp(hModule, L"VBOX_IS_WINDOWS_10", dwVal >= 10 ? L"1" : L"");
         }
         else
-            logStringF(hModule, L"IsWindows10/RegOpenKeyExW: Error reading CurrentMajorVersionNumber (%ld)", dwErr);
+            logStringF(hModule, "IsWindows10/RegOpenKeyExW: Error reading CurrentMajorVersionNumber (%ld)", lrc);
 
         RegCloseKey(hKeyCurVer);
     }
     else
-        logStringF(hModule, L"IsWindows10/RegOpenKeyExW: Error opening CurrentVersion key (%ld)", dwErr);
+        logStringF(hModule, "IsWindows10/RegOpenKeyExW: Error opening CurrentVersion key (%ld)", lrc);
 
     return ERROR_SUCCESS; /* Never return failure. */
@@ -569 +593 @@
 UINT __stdcall InstallPythonAPI(MSIHANDLE hModule)
 {
-    logStringF(hModule, L"InstallPythonAPI: Checking for installed Python environment(s) ...");
+    logStringF(hModule, "InstallPythonAPI: Checking for installed Python environment(s) ...");
 
     /** @todo r=bird: Can't we get the VBOX_PYTHON_PATH property here? */
@@ -585 +609 @@
     /* Get the VBox API setup string. */
     WCHAR wszVBoxSDKPath[RTPATH_MAX];
-    rcWin = VBoxGetMsiProp(hModule, L"CustomActionData", wszVBoxSDKPath, sizeof(wszVBoxSDKPath));
+    rcWin = VBoxGetMsiProp(hModule, L"CustomActionData", wszVBoxSDKPath, RT_ELEMENTS(wszVBoxSDKPath));
     if (rcWin == ERROR_SUCCESS)
     {
@@ -594 +618 @@
             if (SetEnvironmentVariableW(L"VBOX_INSTALL_PATH", wszVBoxSDKPath))
             {
-                logStringF(hModule, L"InstallPythonAPI: Invoking vboxapisetup.py in \"%s\" ...", wszVBoxSDKPath);
+                logStringF(hModule, "InstallPythonAPI: Invoking vboxapisetup.py in \"%ls\" ...", wszVBoxSDKPath);
 
                 rcWin = procRun(hModule, wszPythonExe, L"vboxapisetup.py install");
                 if (rcWin == ERROR_SUCCESS)
                 {
-                    logStringF(hModule, L"InstallPythonAPI: Installation of vboxapisetup.py successful");
+                    logStringF(hModule, "InstallPythonAPI: Installation of vboxapisetup.py successful");
 
                     /*
                      * Do some sanity checking if the VBox API works.
                      */
-                    logStringF(hModule, L"InstallPythonAPI: Validating VBox API ...");
+                    logStringF(hModule, "InstallPythonAPI: Validating VBox API ...");
 
                     rcWin = procRun(hModule, wszPythonExe, L"-c \"from vboxapi import VirtualBoxManager\"");
                     if (rcWin == ERROR_SUCCESS)
                     {
-                        logStringF(hModule, L"InstallPythonAPI: VBox API looks good.");
+                        logStringF(hModule, "InstallPythonAPI: VBox API looks good.");
                         VBoxSetMsiProp(hModule, L"VBOX_API_INSTALLED", L"1");
                         return ERROR_SUCCESS;
@@ -615 +639 @@
 
                     /* failed */
-                    logStringF(hModule, L"InstallPythonAPI: Validating VBox API failed with %u (%#x)", rcWin, rcWin);
+                    logStringF(hModule, "InstallPythonAPI: Validating VBox API failed with %u (%#x)", rcWin, rcWin);
                 }
                 else
-                    logStringF(hModule, L"InstallPythonAPI: Calling vboxapisetup.py failed with %u (%#x)", rcWin, rcWin);
+                    logStringF(hModule, "InstallPythonAPI: Calling vboxapisetup.py failed with %u (%#x)", rcWin, rcWin);
             }
             else
-                logStringF(hModule, L"InstallPythonAPI: Could set environment variable VBOX_INSTALL_PATH: LastError=%u",
+                logStringF(hModule, "InstallPythonAPI: Could set environment variable VBOX_INSTALL_PATH: LastError=%u",
                            GetLastError());
         }
         else
-            logStringF(hModule, L"InstallPythonAPI: Could set working directory to \"%s\": LastError=%u",
+            logStringF(hModule, "InstallPythonAPI: Could set working directory to \"%ls\": LastError=%u",
                        wszVBoxSDKPath, GetLastError());
     }
     else
-        logStringF(hModule, L"InstallPythonAPI: Unable to retrieve VBox installation directory: rcWin=%u (%#x)", rcWin, rcWin);
+        logStringF(hModule, "InstallPythonAPI: Unable to retrieve VBox installation directory: rcWin=%u (%#x)", rcWin, rcWin);
 
     VBoxSetMsiProp(hModule, L"VBOX_API_INSTALLED", L"0");
-    logStringF(hModule, L"InstallPythonAPI: Installation failed");
+    logStringF(hModule, "InstallPythonAPI: Installation failed");
     return ERROR_SUCCESS; /* Do not fail here. */
 }
@@ -642 +666 @@
 {
     LONG rc;
-    WCHAR wszValue[_MAX_PATH];
+    WCHAR wszValue[MAX_PATH];
     if (GetPrivateProfileStringW(pwszSection, pwszValue, NULL, wszValue, sizeof(wszValue), pwszFileName) > 0)
     {
-        WCHAR wszKey[_MAX_PATH + 64];
-        if (wcsicmp(L"General", pwszSection) != 0)
-            swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%S\\VirtualBox\\Branding\\%s", VBOX_VENDOR_SHORT, pwszSection);
+        WCHAR wszKey[MAX_PATH + 64];
+        if (RTUtf16ICmpAscii(pwszSection, "General") != 0)
+            RTUtf16Printf(wszKey, RT_ELEMENTS(wszKey), "SOFTWARE\\%s\\VirtualBox\\Branding\\%ls", VBOX_VENDOR_SHORT, pwszSection);
         else
-            swprintf_s(wszKey, RT_ELEMENTS(wszKey), L"SOFTWARE\\%S\\VirtualBox\\Branding", VBOX_VENDOR_SHORT);
+            RTUtf16Printf(wszKey, RT_ELEMENTS(wszKey), "SOFTWARE\\%s\\VirtualBox\\Branding", VBOX_VENDOR_SHORT);
 
         HKEY hkBranding = NULL;
@@ -660 +684 @@
                                 REG_SZ,
                                 (BYTE *)wszValue,
-                                (DWORD)wcslen(wszValue));
+                                (DWORD)RTUtf16Len(wszValue));
             if (rc != ERROR_SUCCESS)
-                logStringF(hModule, L"InstallBranding: Could not write value %s! Error %d", pwszValue, rc);
+                logStringF(hModule, "InstallBranding: Could not write value %s! Error %d", pwszValue, rc);
             RegCloseKey(hkBranding);
         }
@@ -676 +700 @@
 static UINT CopyDir(MSIHANDLE hModule, const WCHAR *pwszzDstDir, const WCHAR *pwszzSrcDir)
 {
-    NonStandardAssert(pwszzDstDir[wcslen(pwszzDstDir) + 1] == '\0');
-    NonStandardAssert(pwszzSrcDir[wcslen(pwszzSrcDir) + 1] == '\0');
+    NonStandardAssert(pwszzDstDir[RTUtf16Len(pwszzDstDir) + 1] == '\0');
+    NonStandardAssert(pwszzSrcDir[RTUtf16Len(pwszzSrcDir) + 1] == '\0');
 
     SHFILEOPSTRUCTW s = {0};
@@ -689 +713 @@
              | FOF_NOERRORUI;
 
-    logStringF(hModule, L"CopyDir: pwszzDstDir=%s, pwszzSrcDir=%s", pwszzDstDir, pwszzSrcDir);
+    logStringF(hModule, "CopyDir: pwszzDstDir=%ls, pwszzSrcDir=%ls", pwszzDstDir, pwszzSrcDir);
     int r = SHFileOperationW(&s);
     if (r == 0)
         return ERROR_SUCCESS;
-    logStringF(hModule, L"CopyDir: Copy operation returned status %#x", r);
+    logStringF(hModule, "CopyDir: Copy operation returned status %#x", r);
     return ERROR_GEN_FAILURE;
 }
@@ -702 +726 @@
 static UINT RemoveDir(MSIHANDLE hModule, const WCHAR *pwszzDstDir)
 {
-    NonStandardAssert(pwszzDstDir[wcslen(pwszzDstDir) + 1] == '\0');
+    NonStandardAssert(pwszzDstDir[RTUtf16Len(pwszzDstDir) + 1] == '\0');
 
     SHFILEOPSTRUCTW s = {0};
@@ -713 +737 @@
              | FOF_NOERRORUI;
 
-    logStringF(hModule, L"RemoveDir: pwszzDstDir=%s", pwszzDstDir);
+    logStringF(hModule, "RemoveDir: pwszzDstDir=%ls", pwszzDstDir);
     int r = SHFileOperationW(&s);
     if (r == 0)
         return ERROR_SUCCESS;
-    logStringF(hModule, L"RemoveDir: Remove operation returned status %#x", r);
+    logStringF(hModule, "RemoveDir: Remove operation returned status %#x", r);
     return ERROR_GEN_FAILURE;
 }
@@ -726 +750 @@
 static UINT RenameDir(MSIHANDLE hModule, const WCHAR *pwszzDstDir, const WCHAR *pwszzSrcDir)
 {
-    NonStandardAssert(pwszzDstDir[wcslen(pwszzDstDir) + 1] == '\0');
-    NonStandardAssert(pwszzSrcDir[wcslen(pwszzSrcDir) + 1] == '\0');
+    NonStandardAssert(pwszzDstDir[RTUtf16Len(pwszzDstDir) + 1] == '\0');
+    NonStandardAssert(pwszzSrcDir[RTUtf16Len(pwszzSrcDir) + 1] == '\0');
 
     SHFILEOPSTRUCTW s = {0};
@@ -739 +763 @@
              | FOF_NOERRORUI;
 
-    logStringF(hModule, L"RenameDir: pwszzDstDir=%s, pwszzSrcDir=%s", pwszzDstDir, pwszzSrcDir);
+    logStringF(hModule, "RenameDir: pwszzDstDir=%ls, pwszzSrcDir=%ls", pwszzDstDir, pwszzSrcDir);
     int r = SHFileOperationW(&s);
     if (r == 0)
         return ERROR_SUCCESS;
-    logStringF(hModule, L"RenameDir: Rename operation returned status %#x", r);
+    logStringF(hModule, "RenameDir: Rename operation returned status %#x", r);
     return ERROR_GEN_FAILURE;
 }
@@ -750 +774 @@
 static UINT AppendToPath(wchar_t *pwszPath, size_t cwcPath, wchar_t *pwszAppend, bool fDoubleTerm = false)
 {
-    size_t cwcCurPath = wcslen(pwszPath);
+    size_t cwcCurPath = RTUtf16Len(pwszPath);
     size_t cwcSlash   = cwcCurPath > 1 && RTPATH_IS_SLASH(pwszPath[cwcCurPath - 1]) ? 0 : 1;
     while (RTPATH_IS_SLASH(*pwszAppend))
         pwszAppend++;
-    size_t cwcAppend  = wcslen(pwszAppend);
+    size_t cwcAppend  = RTUtf16Len(pwszAppend);
     if (cwcCurPath + cwcCurPath + cwcAppend + fDoubleTerm < cwcPath)
     {
@@ -770 +794 @@
 static UINT JoinPaths(wchar_t *pwszPath, size_t cwcPath, wchar_t *pwszPath1, wchar_t *pwszAppend, bool fDoubleTerm = false)
 {
-    size_t cwcCurPath = wcslen(pwszPath1);
+    size_t cwcCurPath = RTUtf16Len(pwszPath1);
     if (cwcCurPath < cwcPath)
     {
@@ -781 +805 @@
 UINT __stdcall UninstallBranding(MSIHANDLE hModule)
 {
-    logStringF(hModule, L"UninstallBranding: Handling branding file ...");
+    logStringF(hModule, "UninstallBranding: Handling branding file ...");
 
     WCHAR wszPath[RTPATH_MAX];
-    UINT rc = VBoxGetMsiProp(hModule, L"CustomActionData", wszPath, sizeof(wszPath));
+    UINT rc = VBoxGetMsiProp(hModule, L"CustomActionData", wszPath, RT_ELEMENTS(wszPath));
     if (rc == ERROR_SUCCESS)
     {
-        size_t const cwcPath = wcslen(wszPath);
+        size_t const cwcPath = RTUtf16Len(wszPath);
         rc = AppendToPath(wszPath, RTPATH_MAX, L"custom", true /*fDoubleTerm*/);
         if (rc == ERROR_SUCCESS)
@@ -799 +823 @@
     }
 
-    logStringF(hModule, L"UninstallBranding: Handling done. (rc=%u (ignored))", rc);
+    logStringF(hModule, "UninstallBranding: Handling done. (rc=%u (ignored))", rc);
     return ERROR_SUCCESS; /* Do not fail here. */
 }
@@ -805 +829 @@
 UINT __stdcall InstallBranding(MSIHANDLE hModule)
 {
-    logStringF(hModule, L"InstallBranding: Handling branding file ...");
+    logStringF(hModule, "InstallBranding: Handling branding file ...");
 
     /*
@@ -842 +866 @@
     }
 
-    logStringF(hModule, L"InstallBranding: Handling done. (rc=%u (ignored))", rc);
+    logStringF(hModule, "InstallBranding: Handling done. (rc=%u (ignored))", rc);
     return ERROR_SUCCESS; /* Do not fail here. */
 }
@@ -863 +887 @@
 static UINT _uninstallNetLwf(MSIHANDLE hModule);
 
-static VOID vboxDrvLoggerCallback(VBOXDRVCFG_LOG_SEVERITY enmSeverity, char *pszMsg, void *pvContext)
+static VOID vboxDrvLoggerCallback(VBOXDRVCFG_LOG_SEVERITY_T enmSeverity, char *pszMsg, void *pvContext)
 {
     RT_NOREF1(pvContext);
@@ -873 +897 @@
         case VBOXDRVCFG_LOG_SEVERITY_REL:
             if (g_hCurrentModule)
-                logStringF(g_hCurrentModule, L"%S", pszMsg);
+                logStringF(g_hCurrentModule, "%s", pszMsg);
             break;
         default:
@@ -883 +907 @@
 {
     if (g_hCurrentModule)
-        logStringF(g_hCurrentModule, L"%S", pszString);
+        logStringF(g_hCurrentModule, "%s", pszString);
 }
 
@@ -920 +944 @@
         case NETCFG_S_REBOOT:
         {
-            logStringF(hModule, L"Reboot required, setting REBOOT property to \"force\"");
+            logStringF(hModule, "Reboot required, setting REBOOT property to \"force\"");
             HRESULT hr2 = MsiSetPropertyW(hModule, L"REBOOT", L"Force");
             if (hr2 != ERROR_SUCCESS)
-                logStringF(hModule, L"Failed to set REBOOT property, error = %#x", hr2);
+                logStringF(hModule, "Failed to set REBOOT property, error = %#x", hr2);
             uRet = ERROR_SUCCESS; /* Never fail here. */
             break;
@@ -929 +953 @@
 
         default:
-            logStringF(hModule, L"Converting unhandled HRESULT (%#x) to ERROR_GEN_FAILURE", hr);
+            logStringF(hModule, "Converting unhandled HRESULT (%#x) to ERROR_GEN_FAILURE", hr);
             uRet = ERROR_GEN_FAILURE;
     }
@@ -943 +967 @@
         if (uErr != ERROR_SUCCESS)
         {
-            logStringF(hModule, L"createNetCfgLockedMsgRecord: MsiRecordSetInteger failed, error = %#x", uErr);
+            logStringF(hModule, "createNetCfgLockedMsgRecord: MsiRecordSetInteger failed, error = %#x", uErr);
             MsiCloseHandle(hRecord);
             hRecord = NULL;
@@ -949 +973 @@
     }
     else
-        logStringF(hModule, L"createNetCfgLockedMsgRecord: Failed to create a record");
+        logStringF(hModule, "createNetCfgLockedMsgRecord: Failed to create a record");
 
     return hRecord;
@@ -968 +992 @@
         {
             if (FAILED(hr))
-                logStringF(hModule, L"doNetCfgInit: VBoxNetCfgWinQueryINetCfg failed, error = %#x", hr);
+                logStringF(hModule, "doNetCfgInit: VBoxNetCfgWinQueryINetCfg failed, error = %#x", hr);
             uErr = errorConvertFromHResult(hModule, hr);
             break;
@@ -977 +1001 @@
         if (!lpszLockedBy)
         {
-            logStringF(hModule, L"doNetCfgInit: lpszLockedBy == NULL, breaking");
+            logStringF(hModule, "doNetCfgInit: lpszLockedBy == NULL, breaking");
             break;
         }
@@ -988 +1012 @@
          * rather than waiting for a longer period of time before displaying it */
         if (   cRetries < VBOX_NETCFG_MAX_RETRIES
-            && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
+            && RTUtf16ICmpAscii(lpszLockedBy, "6to4svc.dll") == 0)
         {
             cRetries++;
-            logStringF(hModule, L"doNetCfgInit: lpszLockedBy is 6to4svc.dll, retrying %d out of %d", cRetries, VBOX_NETCFG_MAX_RETRIES);
+            logStringF(hModule, "doNetCfgInit: lpszLockedBy is 6to4svc.dll, retrying %d out of %d", cRetries, VBOX_NETCFG_MAX_RETRIES);
             MsgResult = IDRETRY;
         }
@@ -1001 +1025 @@
                 if (!hMsg)
                 {
-                    logStringF(hModule, L"doNetCfgInit: Failed to create a message record, breaking");
+                    logStringF(hModule, "doNetCfgInit: Failed to create a message record, breaking");
                     CoTaskMemFree(lpszLockedBy);
                     break;
@@ -1011 +1035 @@
             if (rTmp != ERROR_SUCCESS)
             {
-                logStringF(hModule, L"doNetCfgInit: MsiRecordSetStringW failed, error = #%x", rTmp);
+                logStringF(hModule, "doNetCfgInit: MsiRecordSetStringW failed, error = #%x", rTmp);
                 CoTaskMemFree(lpszLockedBy);
                 break;
@@ -1018 +1042 @@
             MsgResult = MsiProcessMessage(hModule, (INSTALLMESSAGE)(INSTALLMESSAGE_USER | MB_RETRYCANCEL), hMsg);
             NonStandardAssert(MsgResult == IDRETRY || MsgResult == IDCANCEL);
-            logStringF(hModule, L"doNetCfgInit: MsiProcessMessage returned (%#x)", MsgResult);
+            logStringF(hModule, "doNetCfgInit: MsiProcessMessage returned (%#x)", MsgResult);
         }
         CoTaskMemFree(lpszLockedBy);
@@ -1029 +1053 @@
 }
 
-static UINT vboxNetFltQueryInfArray(MSIHANDLE hModule, OUT LPWSTR pwszPtInf, OUT LPWSTR pwszMpInf, DWORD dwSize)
-{
-    DWORD dwBuf = dwSize - RT_MAX(sizeof(NETFLT_PT_INF_REL_PATH), sizeof(NETFLT_MP_INF_REL_PATH));
-    UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", pwszPtInf, &dwBuf);
+static UINT vboxNetFltQueryInfArray(MSIHANDLE hModule, OUT LPWSTR pwszPtInf, DWORD cwcPtInf,
+                                    OUT LPWSTR pwszMpInf, DWORD cwcMpInf)
+{
+    DWORD cwcEffBuf = cwcPtInf - RT_MAX(sizeof(NETFLT_PT_INF_REL_PATH), sizeof(NETFLT_MP_INF_REL_PATH)) / sizeof(WCHAR);
+    UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", pwszPtInf, &cwcEffBuf);
     if (   uErr == ERROR_SUCCESS
-        && dwBuf)
-    {
-        wcscpy(pwszMpInf, pwszPtInf);
-
-        wcsncat(pwszPtInf, NETFLT_PT_INF_REL_PATH, sizeof(NETFLT_PT_INF_REL_PATH));
-        logStringF(hModule, L"vboxNetFltQueryInfArray: INF 1: %s", pwszPtInf);
-
-        wcsncat(pwszMpInf, NETFLT_MP_INF_REL_PATH, sizeof(NETFLT_MP_INF_REL_PATH));
-        logStringF(hModule, L"vboxNetFltQueryInfArray: INF 2: %s", pwszMpInf);
+        && cwcEffBuf > 0)
+    {
+        int vrc = RTUtf16Copy(pwszMpInf, cwcMpInf, pwszPtInf);
+        AssertRCReturn(vrc, ERROR_BUFFER_OVERFLOW);
+
+        vrc = RTUtf16Cat(pwszPtInf, cwcPtInf, NETFLT_PT_INF_REL_PATH);
+        AssertRCReturn(vrc, ERROR_BUFFER_OVERFLOW);
+        logStringF(hModule, "vboxNetFltQueryInfArray: INF 1: %ls", pwszPtInf);
+
+        vrc = RTUtf16Cat(pwszMpInf, cwcMpInf, NETFLT_MP_INF_REL_PATH);
+        AssertRCReturn(vrc, ERROR_BUFFER_OVERFLOW);
+        logStringF(hModule, "vboxNetFltQueryInfArray: INF 2: %ls", pwszMpInf);
     }
     else if (uErr != ERROR_SUCCESS)
-        logStringF(hModule, L"vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = %#x", uErr);
+        logStringF(hModule, "vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = %#x", uErr);
     else
     {
-        logStringF(hModule, L"vboxNetFltQueryInfArray: Empty installation directory");
+        logStringF(hModule, "vboxNetFltQueryInfArray: Empty installation directory");
         uErr = ERROR_GEN_FAILURE;
     }
@@ -1069 +1097 @@
     __try
     {
-        logStringF(hModule, L"Uninstalling NetFlt");
+        logStringF(hModule, "Uninstalling NetFlt");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -1076 +1104 @@
             HRESULT hr = VBoxNetCfgWinNetFltUninstall(pNetCfg);
             if (hr != S_OK)
-                logStringF(hModule, L"UninstallNetFlt: VBoxNetCfgWinUninstallComponent failed, error = %#x", hr);
+                logStringF(hModule, "UninstallNetFlt: VBoxNetCfgWinUninstallComponent failed, error = %#x", hr);
 
             uErr = errorConvertFromHResult(hModule, hr);
@@ -1082 +1110 @@
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringF(hModule, L"Uninstalling NetFlt done, error = %#x", uErr);
+            logStringF(hModule, "Uninstalling NetFlt done, error = %#x", uErr);
         }
         else
-            logStringF(hModule, L"UninstallNetFlt: doNetCfgInit failed, error = %#x", uErr);
+            logStringF(hModule, "UninstallNetFlt: doNetCfgInit failed, error = %#x", uErr);
     }
     __finally
@@ -1121 +1149 @@
     {
 
-        logStringF(hModule, L"InstallNetFlt: Installing NetFlt");
+        logStringF(hModule, "InstallNetFlt: Installing NetFlt");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -1128 +1156 @@
             WCHAR wszPtInf[MAX_PATH];
             WCHAR wszMpInf[MAX_PATH];
-            uErr = vboxNetFltQueryInfArray(hModule, wszPtInf, wszMpInf, sizeof(wszMpInf));
+            uErr = vboxNetFltQueryInfArray(hModule, wszPtInf, RT_ELEMENTS(wszPtInf), wszMpInf, RT_ELEMENTS(wszMpInf));
             if (uErr == ERROR_SUCCESS)
             {
@@ -1134 +1162 @@
                 HRESULT hr = VBoxNetCfgWinNetFltInstall(pNetCfg, &apwszInfs[0], RT_ELEMENTS(apwszInfs));
                 if (FAILED(hr))
-                    logStringF(hModule, L"InstallNetFlt: VBoxNetCfgWinNetFltInstall failed, error = %#x", hr);
+                    logStringF(hModule, "InstallNetFlt: VBoxNetCfgWinNetFltInstall failed, error = %#x", hr);
 
                 uErr = errorConvertFromHResult(hModule, hr);
             }
             else
-                logStringF(hModule, L"InstallNetFlt: vboxNetFltQueryInfArray failed, error = %#x", uErr);
+                logStringF(hModule, "InstallNetFlt: vboxNetFltQueryInfArray failed, error = %#x", uErr);
 
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringF(hModule, L"InstallNetFlt: Done");
+            logStringF(hModule, "InstallNetFlt: Done");
         }
         else
-            logStringF(hModule, L"InstallNetFlt: doNetCfgInit failed, error = %#x", uErr);
+            logStringF(hModule, "InstallNetFlt: doNetCfgInit failed, error = %#x", uErr);
     }
     __finally
@@ -1182 +1210 @@
     __try
     {
-        logStringF(hModule, L"Uninstalling NetLwf");
+        logStringF(hModule, "Uninstalling NetLwf");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -1189 +1217 @@
             HRESULT hr = VBoxNetCfgWinNetLwfUninstall(pNetCfg);
             if (hr != S_OK)
-                logStringF(hModule, L"UninstallNetLwf: VBoxNetCfgWinUninstallComponent failed, error = %#x", hr);
+                logStringF(hModule, "UninstallNetLwf: VBoxNetCfgWinUninstallComponent failed, error = %#x", hr);
 
             uErr = errorConvertFromHResult(hModule, hr);
@@ -1195 +1223 @@
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringF(hModule, L"Uninstalling NetLwf done, error = %#x", uErr);
+            logStringF(hModule, "Uninstalling NetLwf done, error = %#x", uErr);
         }
         else
-            logStringF(hModule, L"UninstallNetLwf: doNetCfgInit failed, error = %#x", uErr);
+            logStringF(hModule, "UninstallNetLwf: doNetCfgInit failed, error = %#x", uErr);
     }
     __finally
@@ -1234 +1262 @@
     {
 
-        logStringF(hModule, L"InstallNetLwf: Installing NetLwf");
+        logStringF(hModule, "InstallNetLwf: Installing NetLwf");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -1252 +1280 @@
                     }
 
-                    wcscat(wszInf, NETLWF_INF_NAME);
+                    int vrc = RTUtf16Cat(wszInf, RT_ELEMENTS(wszInf), NETLWF_INF_NAME);
+                    AssertRC(vrc);
 
                     HRESULT hr = VBoxNetCfgWinNetLwfInstall(pNetCfg, wszInf);
                     if (FAILED(hr))
-                        logStringF(hModule, L"InstallNetLwf: VBoxNetCfgWinNetLwfInstall failed, error = %#x", hr);
+                        logStringF(hModule, "InstallNetLwf: VBoxNetCfgWinNetLwfInstall failed, error = %#x", hr);
 
                     uErr = errorConvertFromHResult(hModule, hr);
@@ -1262 +1291 @@
                 else
                 {
-                    logStringF(hModule, L"vboxNetFltQueryInfArray: Empty installation directory");
+                    logStringF(hModule, "vboxNetFltQueryInfArray: Empty installation directory");
                     uErr = ERROR_GEN_FAILURE;
                 }
             }
             else
-                logStringF(hModule, L"vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = %#x", uErr);
+                logStringF(hModule, "vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = %#x", uErr);
 
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringF(hModule, L"InstallNetLwf: Done");
+            logStringF(hModule, "InstallNetLwf: Done");
         }
         else
-            logStringF(hModule, L"InstallNetLwf: doNetCfgInit failed, error = %#x", uErr);
+            logStringF(hModule, "InstallNetLwf: doNetCfgInit failed, error = %#x", uErr);
     }
     __finally
@@ -1336 +1365 @@
                 ULONG cbName = sizeof(ConnectoinName);
 
-                HRESULT hr = VBoxNetCfgWinGenHostonlyConnectionName (DevName, ConnectoinName, &cbName);
+                HRESULT hr = VBoxNetCfgWinGenHostonlyConnectionName(DevName, ConnectoinName, &cbName);
                 NonStandardAssert(hr == S_OK);
                 if (SUCCEEDED(hr))
@@ -1363 +1392 @@
     BOOL fSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
 
-    logStringF(hModule, L"CreateHostOnlyInterface: Creating host-only interface");
+    logStringF(hModule, "CreateHostOnlyInterface: Creating host-only interface");
 
     HRESULT hr = E_FAIL;
     GUID guid;
     WCHAR wszMpInf[MAX_PATH];
-    DWORD cchMpInf = RT_ELEMENTS(wszMpInf) - (DWORD)wcslen(pwszInfName) - 1 - 1;
+    DWORD cwcMpInf = RT_ELEMENTS(wszMpInf) - (DWORD)RTUtf16Len(pwszInfName) - 1 - 1;
     LPCWSTR pwszInfPath = NULL;
     bool fIsFile = false;
-    UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", wszMpInf, &cchMpInf);
+    UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", wszMpInf, &cwcMpInf);
     if (uErr == ERROR_SUCCESS)
     {
-        if (cchMpInf)
-        {
-            logStringF(hModule, L"CreateHostOnlyInterface: NetAdpDir property = %s", wszMpInf);
-            if (wszMpInf[cchMpInf - 1] != L'\\')
-            {
-                wszMpInf[cchMpInf++] = L'\\';
-                wszMpInf[cchMpInf]   = L'\0';
-            }
-
-            wcscat(wszMpInf, pwszInfName);
+        if (cwcMpInf)
+        {
+            logStringF(hModule, "CreateHostOnlyInterface: NetAdpDir property = %ls", wszMpInf);
+            if (wszMpInf[cwcMpInf - 1] != L'\\')
+            {
+                wszMpInf[cwcMpInf++] = L'\\';
+                wszMpInf[cwcMpInf]   = L'\0';
+            }
+
+            int vrc = RTUtf16Cat(wszMpInf, RT_ELEMENTS(wszMpInf), pwszInfName);
+            AssertRC(vrc);
+
             pwszInfPath = wszMpInf;
             fIsFile = true;
 
-            logStringF(hModule, L"CreateHostOnlyInterface: Resulting INF path = %s", pwszInfPath);
+            logStringF(hModule, "CreateHostOnlyInterface: Resulting INF path = %ls", pwszInfPath);
         }
         else
-            logStringF(hModule, L"CreateHostOnlyInterface: VBox installation path is empty");
+            logStringF(hModule, "CreateHostOnlyInterface: VBox installation path is empty");
     }
     else
-        logStringF(hModule, L"CreateHostOnlyInterface: Unable to retrieve VBox installation path, error = %#x", uErr);
+        logStringF(hModule, "CreateHostOnlyInterface: Unable to retrieve VBox installation path, error = %#x", uErr);
 
     /* Make sure the inf file is installed. */
     if (pwszInfPath != NULL && fIsFile)
     {
-        logStringF(hModule, L"CreateHostOnlyInterface: Calling VBoxDrvCfgInfInstall(%s)", pwszInfPath);
+        logStringF(hModule, "CreateHostOnlyInterface: Calling VBoxDrvCfgInfInstall(%ls)", pwszInfPath);
         hr = VBoxDrvCfgInfInstall(pwszInfPath);
-        logStringF(hModule, L"CreateHostOnlyInterface: VBoxDrvCfgInfInstall returns %#x", hr);
+        logStringF(hModule, "CreateHostOnlyInterface: VBoxDrvCfgInfInstall returns %#x", hr);
         if (FAILED(hr))
-            logStringF(hModule, L"CreateHostOnlyInterface: Failed to install INF file, error = %#x", hr);
+            logStringF(hModule, "CreateHostOnlyInterface: Failed to install INF file, error = %#x", hr);
     }
 
@@ -1414 +1445 @@
             if (fRebootRequired)
             {
-                logStringF(hModule, L"CreateHostOnlyInterface: Reboot required for update, setting REBOOT property to force");
+                logStringF(hModule, "CreateHostOnlyInterface: Reboot required for update, setting REBOOT property to force");
                 HRESULT hr2 = MsiSetPropertyW(hModule, L"REBOOT", L"Force");
                 if (hr2 != ERROR_SUCCESS)
-                    logStringF(hModule, L"CreateHostOnlyInterface: Failed to set REBOOT property for update, error = %#x", hr2);
+                    logStringF(hModule, "CreateHostOnlyInterface: Failed to set REBOOT property for update, error = %#x", hr2);
             }
         }
@@ -1423 +1454 @@
         {
             //in fail case call CreateHostOnlyInterface
-            logStringF(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = %#x", hr);
-            logStringF(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinCreateHostOnlyNetworkInterface");
+            logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = %#x", hr);
+            logStringF(hModule, "CreateHostOnlyInterface: calling VBoxNetCfgWinCreateHostOnlyNetworkInterface");
 #ifdef VBOXNETCFG_DELAYEDRENAME
             BSTR devId;
@@ -1431 +1462 @@
             hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface(pwszInfPath, fIsFile, NULL, &guid, NULL, NULL);
 #endif /* !VBOXNETCFG_DELAYEDRENAME */
-            logStringF(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface returns %#x", hr);
+            logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface returns %#x", hr);
             if (SUCCEEDED(hr))
             {
                 ULONG ip = inet_addr("192.168.56.1");
                 ULONG mask = inet_addr("255.255.255.0");
-                logStringF(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinEnableStaticIpConfig");
+                logStringF(hModule, "CreateHostOnlyInterface: calling VBoxNetCfgWinEnableStaticIpConfig");
                 hr = VBoxNetCfgWinEnableStaticIpConfig(&guid, ip, mask);
-                logStringF(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig returns %#x", hr);
+                logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig returns %#x", hr);
                 if (FAILED(hr))
-                    logStringF(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, error = %#x", hr);
+                    logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, error = %#x", hr);
 #ifdef VBOXNETCFG_DELAYEDRENAME
                 hr = VBoxNetCfgWinRenameHostOnlyConnection(&guid, devId, NULL);
                 if (FAILED(hr))
-                    logStringF(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinRenameHostOnlyConnection failed, error = %#x", hr);
+                    logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinRenameHostOnlyConnection failed, error = %#x", hr);
                 SysFreeString(devId);
 #endif /* VBOXNETCFG_DELAYEDRENAME */
             }
             else
-                logStringF(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, error = %#x", hr);
+                logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, error = %#x", hr);
         }
     }
 
     if (SUCCEEDED(hr))
-        logStringF(hModule, L"CreateHostOnlyInterface: Creating host-only interface done");
+        logStringF(hModule, "CreateHostOnlyInterface: Creating host-only interface done");
 
     /* Restore original setup mode. */
-    logStringF(hModule, L"CreateHostOnlyInterface: Almost done...");
+    logStringF(hModule, "CreateHostOnlyInterface: Almost done...");
     if (fSetupModeInteractive)
         SetupSetNonInteractiveMode(fSetupModeInteractive);
@@ -1465 +1496 @@
 #endif /* VBOX_WITH_NETFLT */
 
-    logStringF(hModule, L"CreateHostOnlyInterface: Returns success (ignoring all failures)");
+    logStringF(hModule, "CreateHostOnlyInterface: Returns success (ignoring all failures)");
     /* Never fail the install even if we did not succeed. */
     return ERROR_SUCCESS;
@@ -1477 +1508 @@
 UINT __stdcall Ndis6CreateHostOnlyInterface(MSIHANDLE hModule)
 {
+#if 0 /* Trick for allowing the debugger to be attached. */
+    for (unsigned i = 0; i < 128 && !IsDebuggerPresent(); i++)
+    {
+        logStringF(hModule, "Waiting for debugger to attach: windbg -p %u", GetCurrentProcessId());
+        Sleep(1001);
+    }
+    Sleep(1002);
+    __debugbreak();
+#endif
     return _createHostOnlyInterface(hModule, NETADP_ID, L"VBoxNetAdp6.inf");
 }
@@ -1485 +1525 @@
     netCfgLoggerEnable(hModule);
 
-    logStringF(hModule, L"RemoveHostOnlyInterfaces: Removing all host-only interfaces");
+    logStringF(hModule, "RemoveHostOnlyInterfaces: Removing all host-only interfaces");
 
     BOOL fSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
@@ -1494 +1534 @@
         hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, L"Net", pwszId, SUOI_FORCEDELETE/* could be SUOI_FORCEDELETE */);
         if (FAILED(hr))
-            logStringF(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstalled successfully, but failed to remove INF files");
+            logStringF(hModule, "RemoveHostOnlyInterfaces: NetAdp uninstalled successfully, but failed to remove INF files");
         else
-            logStringF(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstalled successfully");
+            logStringF(hModule, "RemoveHostOnlyInterfaces: NetAdp uninstalled successfully");
     }
     else
-        logStringF(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstall failed, hr = %#x", hr);
+        logStringF(hModule, "RemoveHostOnlyInterfaces: NetAdp uninstall failed, hr = %#x", hr);
 
     /* Restore original setup mode. */
@@ -1522 +1562 @@
     netCfgLoggerEnable(hModule);
 
-    logStringF(hModule, L"StopHostOnlyInterfaces: Stopping all host-only interfaces");
+    logStringF(hModule, "StopHostOnlyInterfaces: Stopping all host-only interfaces");
 
     BOOL fSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
@@ -1528 +1568 @@
     HRESULT hr = VBoxNetCfgWinPropChangeAllNetDevicesOfId(pwszId, VBOXNECTFGWINPROPCHANGE_TYPE_DISABLE);
     if (SUCCEEDED(hr))
-        logStringF(hModule, L"StopHostOnlyInterfaces: Disabling host interfaces was successful, hr = %#x", hr);
+        logStringF(hModule, "StopHostOnlyInterfaces: Disabling host interfaces was successful, hr = %#x", hr);
     else
-        logStringF(hModule, L"StopHostOnlyInterfaces: Disabling host interfaces failed, hr = %#x", hr);
+        logStringF(hModule, "StopHostOnlyInterfaces: Disabling host interfaces failed, hr = %#x", hr);
 
     /* Restore original setup mode. */
@@ -1553 +1593 @@
     netCfgLoggerEnable(hModule);
 
-    logStringF(hModule, L"UpdateHostOnlyInterfaces: Updating all host-only interfaces");
+    logStringF(hModule, "UpdateHostOnlyInterfaces: Updating all host-only interfaces");
 
     BOOL fSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
 
     WCHAR wszMpInf[MAX_PATH];
-    DWORD cchMpInf = RT_ELEMENTS(wszMpInf) - (DWORD)wcslen(pwszInfName) - 1 - 1;
+    DWORD cwcMpInf = RT_ELEMENTS(wszMpInf) - (DWORD)RTUtf16Len(pwszInfName) - 1 - 1;
     LPCWSTR pwszInfPath = NULL;
     bool fIsFile = false;
-    UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", wszMpInf, &cchMpInf);
+    UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", wszMpInf, &cwcMpInf);
     if (uErr == ERROR_SUCCESS)
     {
-        if (cchMpInf)
-        {
-            logStringF(hModule, L"UpdateHostOnlyInterfaces: NetAdpDir property = %s", wszMpInf);
-            if (wszMpInf[cchMpInf - 1] != L'\\')
-            {
-                wszMpInf[cchMpInf++] = L'\\';
-                wszMpInf[cchMpInf]   = L'\0';
-            }
-
-            wcscat(wszMpInf, pwszInfName);
+        if (cwcMpInf)
+        {
+            logStringF(hModule, "UpdateHostOnlyInterfaces: NetAdpDir property = %ls", wszMpInf);
+            if (wszMpInf[cwcMpInf - 1] != L'\\')
+            {
+                wszMpInf[cwcMpInf++] = L'\\';
+                wszMpInf[cwcMpInf]   = L'\0';
+            }
+
+            int vrc = RTUtf16Cat(wszMpInf, RT_ELEMENTS(wszMpInf), pwszInfName);
+             AssertRC(vrc);
             pwszInfPath = wszMpInf;
             fIsFile = true;
 
-            logStringF(hModule, L"UpdateHostOnlyInterfaces: Resulting INF path = %s", pwszInfPath);
+            logStringF(hModule, "UpdateHostOnlyInterfaces: Resulting INF path = %ls", pwszInfPath);
 
             DWORD attrFile = GetFileAttributesW(pwszInfPath);
@@ -1583 +1624 @@
             {
                 DWORD dwErr = GetLastError();
-                logStringF(hModule, L"UpdateHostOnlyInterfaces: File \"%s\" not found, dwErr=%ld", pwszInfPath, dwErr);
+                logStringF(hModule, "UpdateHostOnlyInterfaces: File \"%ls\" not found, dwErr=%ld", pwszInfPath, dwErr);
             }
             else
             {
-                logStringF(hModule, L"UpdateHostOnlyInterfaces: File \"%s\" exists", pwszInfPath);
+                logStringF(hModule, "UpdateHostOnlyInterfaces: File \"%ls\" exists", pwszInfPath);
 
                 BOOL fRebootRequired = FALSE;
@@ -1595 +1636 @@
                     if (fRebootRequired)
                     {
-                        logStringF(hModule, L"UpdateHostOnlyInterfaces: Reboot required, setting REBOOT property to force");
+                        logStringF(hModule, "UpdateHostOnlyInterfaces: Reboot required, setting REBOOT property to force");
                         HRESULT hr2 = MsiSetPropertyW(hModule, L"REBOOT", L"Force");
                         if (hr2 != ERROR_SUCCESS)
-                            logStringF(hModule, L"UpdateHostOnlyInterfaces: Failed to set REBOOT property, error = %#x", hr2);
+                            logStringF(hModule, "UpdateHostOnlyInterfaces: Failed to set REBOOT property, error = %#x", hr2);
                     }
                 }
                 else
-                    logStringF(hModule, L"UpdateHostOnlyInterfaces: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = %#x", hr);
+                    logStringF(hModule, "UpdateHostOnlyInterfaces: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = %#x", hr);
             }
         }
         else
-            logStringF(hModule, L"UpdateHostOnlyInterfaces: VBox installation path is empty");
+            logStringF(hModule, "UpdateHostOnlyInterfaces: VBox installation path is empty");
     }
     else
-        logStringF(hModule, L"UpdateHostOnlyInterfaces: Unable to retrieve VBox installation path, error = %#x", uErr);
+        logStringF(hModule, "UpdateHostOnlyInterfaces: Unable to retrieve VBox installation path, error = %#x", uErr);
 
     /* Restore original setup mode. */
@@ -1644 +1685 @@
     __try
     {
-        logStringF(hModule, L"Uninstalling NetAdp");
+        logStringF(hModule, "Uninstalling NetAdp");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -1651 +1692 @@
             HRESULT hr = VBoxNetCfgWinNetAdpUninstall(pNetCfg, pwszId);
             if (hr != S_OK)
-                logStringF(hModule, L"UninstallNetAdp: VBoxNetCfgWinUninstallComponent failed, error = %#x", hr);
+                logStringF(hModule, "UninstallNetAdp: VBoxNetCfgWinUninstallComponent failed, error = %#x", hr);
 
             uErr = errorConvertFromHResult(hModule, hr);
@@ -1657 +1698 @@
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringF(hModule, L"Uninstalling NetAdp done, error = %#x", uErr);
+            logStringF(hModule, "Uninstalling NetAdp done, error = %#x", uErr);
         }
         else
-            logStringF(hModule, L"UninstallNetAdp: doNetCfgInit failed, error = %#x", uErr);
+            logStringF(hModule, "UninstallNetAdp: doNetCfgInit failed, error = %#x", uErr);
     }
     __finally
@@ -1724 +1765 @@
                 lStatus = RegQueryValueExW(hNetCardGUID, L"ProviderName", NULL, &dwKeyType, (LPBYTE)wszNetProviderName, &dwLen);
 
-                if (   !wcscmp(wszNetCfgInstanceId, pwszGUID)
-                    && !wcscmp(wszNetProductName, L"VirtualBox TAP Adapter")
-                    && (   (!wcscmp(wszNetProviderName, L"innotek GmbH")) /* Legacy stuff. */
-                        || (!wcscmp(wszNetProviderName, L"Sun Microsystems, Inc.")) /* Legacy stuff. */
-                        || (!wcscmp(wszNetProviderName, MY_WTEXT(VBOX_VENDOR))) /* Reflects current vendor string. */
+                if (   !RTUtf16Cmp(wszNetCfgInstanceId, pwszGUID)
+                    && !RTUtf16Cmp(wszNetProductName, L"VirtualBox TAP Adapter")
+                    && (   (!RTUtf16Cmp(wszNetProviderName, L"innotek GmbH")) /* Legacy stuff. */
+                        || (!RTUtf16Cmp(wszNetProviderName, L"Sun Microsystems, Inc.")) /* Legacy stuff. */
+                        || (!RTUtf16Cmp(wszNetProviderName, MY_WTEXT(VBOX_VENDOR))) /* Reflects current vendor string. */
                        )
                    )
@@ -1746 +1787 @@
 }
 
-/** @todo r=andy BUGBUG WTF! Why do we a) set the rc to 0 (success), and b) need this macro at all!? */
+/** @todo r=andy BUGBUG WTF! Why do we a) set the rc to 0 (success), and b) need this macro at all!?
+ *
+ * @todo r=bird: Because it's returning a bool, not int? The return code is
+ * ignored anyway, both internally in removeNetworkInterface and in it's caller.
+ * There is similar code in VBoxNetCfg.cpp, which is probably where it was copied from. */
 #define SetErrBreak(args) \
     if (1) { \
@@ -1769 +1814 @@
         {
             WCHAR wszRegLocation[256];
-            swprintf_s(wszRegLocation, RT_ELEMENTS(wszRegLocation),
-                       L"SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s", pwszGUID);
-            LONG lStatus = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegLocation, 0, KEY_READ, &hkeyNetwork);
-            if (lStatus != ERROR_SUCCESS || !hkeyNetwork)
-                SetErrBreak((hModule, L"VBox HostInterfaces: Host interface network was not found in registry (%s)! [1]",
-                             wszRegLocation));
-
-            lStatus = RegOpenKeyExW(hkeyNetwork, L"Connection", 0, KEY_READ, &hkeyConnection);
-            if (lStatus != ERROR_SUCCESS || !hkeyConnection)
-                SetErrBreak((hModule, L"VBox HostInterfaces: Host interface network was not found in registry (%s)! [2]",
-                             wszRegLocation));
+            RTUtf16Printf(wszRegLocation, RT_ELEMENTS(wszRegLocation),
+                          "SYSTEM\\CurrentControlSet\\Control\\Network\\{4D36E972-E325-11CE-BFC1-08002BE10318}\\%ls", pwszGUID);
+            LONG lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, wszRegLocation, 0, KEY_READ, &hkeyNetwork);
+            if (lrc != ERROR_SUCCESS || !hkeyNetwork)
+                SetErrBreak((hModule, "VBox HostInterfaces: Host interface network was not found in registry (%ls)! (lrc=%d) [1]",
+                             wszRegLocation, lrc));
+
+            lrc = RegOpenKeyExW(hkeyNetwork, L"Connection", 0, KEY_READ, &hkeyConnection);
+            if (lrc != ERROR_SUCCESS || !hkeyConnection)
+                SetErrBreak((hModule, "VBox HostInterfaces: Host interface network was not found in registry (%ls)! (lrc=%d) [2]",
+                             wszRegLocation, lrc));
 
             DWORD len = sizeof(wszPnPInstanceId);
             DWORD dwKeyType;
-            lStatus = RegQueryValueExW(hkeyConnection, L"PnPInstanceID", NULL, &dwKeyType, (LPBYTE)&wszPnPInstanceId[0], &len);
-            if (lStatus != ERROR_SUCCESS || (dwKeyType != REG_SZ))
-                SetErrBreak((hModule, L"VBox HostInterfaces: Host interface network was not found in registry (%s)! [3]",
-                             wszRegLocation));
+            lrc = RegQueryValueExW(hkeyConnection, L"PnPInstanceID", NULL, &dwKeyType, (LPBYTE)&wszPnPInstanceId[0], &len);
+            if (lrc != ERROR_SUCCESS || dwKeyType != REG_SZ)
+                SetErrBreak((hModule, "VBox HostInterfaces: Host interface network was not found in registry (%ls)! (lrc=%d) [3]",
+                             wszRegLocation, lrc));
         }
         while (0);
@@ -1805 +1850 @@
         do /* break-loop */
         {
+            /* initialize the structure size */
+            SP_DEVINFO_DATA DeviceInfoData = { sizeof(DeviceInfoData) };
+
+            /* copy the net class GUID */
             GUID netGuid;
-            SP_DEVINFO_DATA DeviceInfoData;
-            DWORD index = 0;
-            DWORD size = 0;
-
-            /* initialize the structure size */
-            DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
-
-            /* copy the net class GUID */
             memcpy(&netGuid, &GUID_DEVCLASS_NET, sizeof (GUID_DEVCLASS_NET));
 
@@ -1820 +1861 @@
             if (hDeviceInfo == INVALID_HANDLE_VALUE)
             {
-                logStringF(hModule, L"VBox HostInterfaces: SetupDiGetClassDevs failed (0x%08X)!", GetLastError());
-                SetErrBreak((hModule, L"VBox HostInterfaces: Uninstallation failed!"));
-            }
-
+                logStringF(hModule, "VBox HostInterfaces: SetupDiGetClassDevs failed (0x%08X)!", GetLastError());
+                SetErrBreak((hModule, "VBox HostInterfaces: Uninstallation failed!"));
+            }
+
+            /* enumerate the driver info list */
             BOOL fFoundDevice = FALSE;
-
-            /* enumerate the driver info list */
-            while (TRUE)
-            {
-                WCHAR *pwszDeviceHwid;
-
+            for (DWORD index = 0;; index++)
+            {
                 fResult = SetupDiEnumDeviceInfo(hDeviceInfo, index, &DeviceInfoData);
                 if (!fResult)
@@ -1836 +1874 @@
                     if (GetLastError() == ERROR_NO_MORE_ITEMS)
                         break;
-                    else
-                    {
-                        index++;
-                        continue;
-                    }
+                    continue;
                 }
 
                 /* try to get the hardware ID registry property */
+                WCHAR *pwszDeviceHwid;
+                DWORD size = 0;
                 fResult = SetupDiGetDeviceRegistryProperty(hDeviceInfo,
                                                            &DeviceInfoData,
@@ -1854 +1890 @@
                 {
                     if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+                        continue;
+
+                    pwszDeviceHwid = (WCHAR *)RTMemAllocZ(size);
+                    if (!pwszDeviceHwid)
+                        continue;
+
+                    fResult = SetupDiGetDeviceRegistryProperty(hDeviceInfo,
+                                                               &DeviceInfoData,
+                                                               SPDRP_HARDWAREID,
+                                                               NULL,
+                                                               (PBYTE)pwszDeviceHwid,
+                                                               size,
+                                                               &size);
+                    if (!fResult)
                     {
-                        index++;
+                        RTMemFree(pwszDeviceHwid);
                         continue;
-                    }
-
-                    pwszDeviceHwid = (WCHAR *)malloc(size);
-                    if (pwszDeviceHwid)
-                    {
-                        fResult = SetupDiGetDeviceRegistryProperty(hDeviceInfo,
-                                                                   &DeviceInfoData,
-                                                                   SPDRP_HARDWAREID,
-                                                                   NULL,
-                                                                   (PBYTE)pwszDeviceHwid,
-                                                                   size,
-                                                                   NULL);
-                        if (!fResult)
-                        {
-                            free(pwszDeviceHwid);
-                            pwszDeviceHwid = NULL;
-                            index++;
-                            continue;
-                        }
                     }
                 }
@@ -1881 +1912 @@
                 {
                     /* something is wrong.  This shouldn't have worked with a NULL buffer */
-                    index++;
                     continue;
                 }
 
                 for (WCHAR *t = pwszDeviceHwid;
-                     t && *t && t < &pwszDeviceHwid[size / sizeof(WCHAR)];
-                     t += wcslen(t) + 1)
+                     *t && t < &pwszDeviceHwid[size / sizeof(WCHAR)];
+                     t += RTUtf16Len(t) + 1)
                 {
-                    if (!_wcsicmp(L"vboxtap", t))
+                    if (RTUtf16ICmpAscii(t, "vboxtap") == 0)
                     {
-                          /* get the device instance ID */
-                          WCHAR wszDevID[MAX_DEVICE_ID_LEN];
-                          if (CM_Get_Device_IDW(DeviceInfoData.DevInst,
-                                                wszDevID, MAX_DEVICE_ID_LEN, 0) == CR_SUCCESS)
-                          {
-                              /* compare to what we determined before */
-                              if (!wcscmp(wszDevID, wszPnPInstanceId))
-                              {
-                                  fFoundDevice = TRUE;
-                                  break;
-                              }
-                          }
+                        /* get the device instance ID */
+                        WCHAR wszDevID[MAX_DEVICE_ID_LEN];
+                        if (CM_Get_Device_IDW(DeviceInfoData.DevInst, wszDevID, MAX_DEVICE_ID_LEN, 0) == CR_SUCCESS)
+                        {
+                            /* compare to what we determined before */
+                            if (RTUtf16Cmp(wszDevID, wszPnPInstanceId) == 0)
+                            {
+                                fFoundDevice = TRUE;
+                                break;
+                            }
+                        }
                     }
                 }
 
-                if (pwszDeviceHwid)
-                {
-                    free(pwszDeviceHwid);
-                    pwszDeviceHwid = NULL;
-                }
+                RTMemFree(pwszDeviceHwid);
 
                 if (fFoundDevice)
                     break;
-
-                index++;
             }
 
@@ -1923 +1946 @@
                 if (!fResult)
                 {
-                    logStringF(hModule, L"VBox HostInterfaces: SetupDiSetSelectedDevice failed (0x%08X)!", GetLastError());
-                    SetErrBreak((hModule, L"VBox HostInterfaces: Uninstallation failed!"));
+                    logStringF(hModule, "VBox HostInterfaces: SetupDiSetSelectedDevice failed (0x%08X)!", GetLastError());
+                    SetErrBreak((hModule, "VBox HostInterfaces: Uninstallation failed!"));
                 }
 
@@ -1930 +1953 @@
                 if (!fResult)
                 {
-                    logStringF(hModule, L"VBox HostInterfaces: SetupDiCallClassInstaller (DIF_REMOVE) failed (0x%08X)!", GetLastError());
-                    SetErrBreak((hModule, L"VBox HostInterfaces: Uninstallation failed!"));
+                    logStringF(hModule, "VBox HostInterfaces: SetupDiCallClassInstaller (DIF_REMOVE) failed (0x%08X)!", GetLastError());
+                    SetErrBreak((hModule, "VBox HostInterfaces: Uninstallation failed!"));
                 }
             }
             else
-                SetErrBreak((hModule, L"VBox HostInterfaces: Host interface network device not found!"));
+                SetErrBreak((hModule, "VBox HostInterfaces: Host interface network device not found!"));
         } while (0);
 
@@ -1950 +1973 @@
     HKEY hCtrlNet;
 
-    LONG lStatus = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_wszNetworkKey, 0, KEY_READ, &hCtrlNet);
-    if (lStatus == ERROR_SUCCESS)
-    {
-        logStringF(hModule, L"VBox HostInterfaces: Enumerating interfaces ...");
+    LSTATUS lrc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, s_wszNetworkKey, 0, KEY_READ, &hCtrlNet);
+    if (lrc == ERROR_SUCCESS)
+    {
+        logStringF(hModule, "VBox HostInterfaces: Enumerating interfaces ...");
         for (int i = 0; ; ++i)
         {
             WCHAR wszNetworkGUID[256] = { 0 };
             DWORD dwLen = (DWORD)sizeof(wszNetworkGUID);
-            lStatus = RegEnumKeyExW(hCtrlNet, i, wszNetworkGUID, &dwLen, NULL, NULL, NULL, NULL);
-            if (lStatus != ERROR_SUCCESS)
-            {
-                switch (lStatus)
+            lrc = RegEnumKeyExW(hCtrlNet, i, wszNetworkGUID, &dwLen, NULL, NULL, NULL, NULL);
+            if (lrc != ERROR_SUCCESS)
+            {
+                switch (lrc)
                 {
                     case ERROR_NO_MORE_ITEMS:
-                        logStringF(hModule, L"VBox HostInterfaces: No interfaces found.");
+                        logStringF(hModule, "VBox HostInterfaces: No interfaces found.");
                         break;
                     default:
-                        logStringF(hModule, L"VBox HostInterfaces: Enumeration failed: %ld", lStatus);
+                        logStringF(hModule, "VBox HostInterfaces: Enumeration failed: %ld", lrc);
                         break;
                 }
@@ -1975 +1998 @@
             if (isTAPDevice(wszNetworkGUID))
             {
-                logStringF(hModule, L"VBox HostInterfaces: Removing interface \"%s\" ...", wszNetworkGUID);
+                logStringF(hModule, "VBox HostInterfaces: Removing interface \"%ls\" ...", wszNetworkGUID);
                 removeNetworkInterface(hModule, wszNetworkGUID);
-                lStatus = RegDeleteKeyW(hCtrlNet, wszNetworkGUID);
+                lrc = RegDeleteKeyW(hCtrlNet, wszNetworkGUID);
             }
         }
         RegCloseKey(hCtrlNet);
-        logStringF(hModule, L"VBox HostInterfaces: Removing interfaces done.");
+        logStringF(hModule, "VBox HostInterfaces: Removing interfaces done.");
     }
     return ERROR_SUCCESS;
@@ -2016 +2039 @@
             QueryServiceStatus(hService, &Status);
             if (Status.dwCurrentState == SERVICE_STOPPED)
-                logStringF(hModule, L"VBoxDrv: The service old service was already stopped");
+                logStringF(hModule, "VBoxDrv: The service old service was already stopped");
             else
             {
-                logStringF(hModule, L"VBoxDrv: Stopping the service (state %u)", Status.dwCurrentState);
+                logStringF(hModule, "VBoxDrv: Stopping the service (state %u)", Status.dwCurrentState);
                 if (ControlService(hService, SERVICE_CONTROL_STOP, &Status))
                 {
@@ -2031 +2054 @@
 
                     if (Status.dwCurrentState == SERVICE_STOPPED)
-                        logStringF(hModule, L"VBoxDrv: Stopped service");
+                        logStringF(hModule, "VBoxDrv: Stopped service");
                     else
-                        logStringF(hModule, L"VBoxDrv: Failed to stop the service, status: %u", Status.dwCurrentState);
+                        logStringF(hModule, "VBoxDrv: Failed to stop the service, status: %u", Status.dwCurrentState);
                 }
                 else
@@ -2040 +2063 @@
                     if (   Status.dwCurrentState == SERVICE_STOP_PENDING
                         && dwErr == ERROR_SERVICE_CANNOT_ACCEPT_CTRL)
-                        logStringF(hModule, L"VBoxDrv: Failed to stop the service: stop pending, not accepting control messages");
+                        logStringF(hModule, "VBoxDrv: Failed to stop the service: stop pending, not accepting control messages");
                     else
-                        logStringF(hModule, L"VBoxDrv: Failed to stop the service: dwErr=%u status=%u", dwErr, Status.dwCurrentState);
+                        logStringF(hModule, "VBoxDrv: Failed to stop the service: dwErr=%u status=%u", dwErr, Status.dwCurrentState);
                 }
             }
@@ -2050 +2073 @@
              */
             if (DeleteService(hService))
-                logStringF(hModule, L"VBoxDrv: Successfully delete service");
+                logStringF(hModule, "VBoxDrv: Successfully delete service");
             else
-                logStringF(hModule, L"VBoxDrv: Failed to delete the service: %u", GetLastError());
+                logStringF(hModule, "VBoxDrv: Failed to delete the service: %u", GetLastError());
 
             CloseServiceHandle(hService);
@@ -2060 +2083 @@
             DWORD const dwErr = GetLastError();
             if (dwErr == ERROR_SERVICE_DOES_NOT_EXIST)
-                logStringF(hModule, L"VBoxDrv: Nothing to do, the old service does not exist");
+                logStringF(hModule, "VBoxDrv: Nothing to do, the old service does not exist");
             else
-                logStringF(hModule, L"VBoxDrv: Failed to open the service: %u", dwErr);
+                logStringF(hModule, "VBoxDrv: Failed to open the service: %u", dwErr);
         }
 
@@ -2068 +2091 @@
     }
     else
-        logStringF(hModule, L"VBoxDrv: Failed to open service manager (%u).", GetLastError());
+        logStringF(hModule, "VBoxDrv: Failed to open service manager (%u).", GetLastError());
 
     return ERROR_SUCCESS;

trunk/src/VBox/Installer/win/Makefile.kmk

@@ -103 +103 @@
 endif
 
+# Aliases for VBOX_SIGN_FILE_FN that allows better control of the MSI and MSM signing.
+VBOX_SIGN_MSI_FN ?= $(VBOX_SIGN_FILE_FN)
+VBOX_SIGN_MSM_FN ?= $(VBOX_SIGN_FILE_FN)
+VBOX_SIGN_CAB_FN ?= $(VBOX_SIGN_FILE_FN)
 
 #
@@ -569 +573 @@
                 $(VBOX_PATH_WIX)/difxapp_$(if-expr "$(KBUILD_TARGET_ARCH)" == "x86",x86,x64).wixlib
         $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/NLS/$(lang).mst
-        $(call VBOX_SIGN_FILE_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
+        $(call VBOX_SIGN_MSM_FN,$$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
 # Create repack script for this step.
         $(APPEND) -tn "$$(VBOX_WIN_INST_REPACK_DIR)/2-link-VBoxMerge$(module)_$(lang).cmd" \
@@ -1127 +1131 @@
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUBSTG) $(@F)
         $(REDIRECT) -C $(@D) -- cscript.exe /nologo $(VBOX_PATH_WISUMINFO) $@ $(VBOX_INS_PROD_LANG)
-        $(call VBOX_SIGN_FILE_FN,$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
+        $(call VBOX_SIGN_MSI_FN,$@,$(VBOX_PRODUCT) $(VBOX_VERSION_STRING)r$(VBOX_SVN_REV) ($(KBUILD_TARGET_ARCH)),,,disable-dual-signing)
 
 # Create repack script for this step.
@@ -1168 +1172 @@
                 $@ \
                 $(VBOX_WIN_INST_REPACK_DIR)/4-multiarch-$(PACKAGE_NAME_MULTIARCH_FINAL).cmd ) )
-        $(if-expr defined(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_FILE_FN,$(PACKAGE_NAME_MULTIARCH_COMMONCAB)))
+        $(if-expr defined(VBOX_WITH_MSM_INSTALL),,$(call VBOX_SIGN_CAB_FN,$(PACKAGE_NAME_MULTIARCH_COMMONCAB)))
         $(REDIRECT) -C $(@D) -- \
                 $(VBoxStubBld_1_TARGET) -out $@ \

trunk/src/VBox/Main/Makefile.kmk

@@ -772 +772 @@
  VBoxSVC_SDKS.win += VBOX_WIN_NEWDEV
  VBoxSVC_LIBS.win += \
-        $(PATH_STAGE_LIB)/WinNetConfigNonStatic$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/WinNetConfigDll$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VBoxDrvCfgDll$(VBOX_SUFF_LIB) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib
@@ -1083 +1083 @@
  VBoxC_SDKS.win += VBOX_WIN_NEWDEV
  VBoxC_LIBS.win += \
-        $(PATH_STAGE_LIB)/VBoxDrvCfg$(VBOX_SUFF_LIB) \
-        $(PATH_STAGE_LIB)/WinNetConfigNonStatic$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/WinNetConfigDll$(VBOX_SUFF_LIB) \
+        $(PATH_STAGE_LIB)/VBoxDrvCfgDll$(VBOX_SUFF_LIB) \
         $(PATH_TOOL_$(VBOX_VCC_TOOL)_LIB)/comsupp.lib \
         $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/WbemUuid.Lib