Changeset 86775 in vbox for trunk/src/VBox/Installer/win

Timestamp:

Oct 30, 2020 6:24:36 PM (4 years ago)

Author:

vboxsync

Message:

Windows host installer: Rewritten Python installation support to now utilize IPRT for most tasks, also now supporting

• Python 3 support.
• Python Core installer support for user-based installs (as fallback only).
• Automatic (simple) validation of the VBox API after installation.

Work in progress.

Location:

trunk/src/VBox/Installer/win/InstallHelper

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxCommon.cpp (modified) (3 diffs)
• VBoxCommon.h (modified) (1 diff)
• VBoxInstallHelper.cpp (modified) (66 diffs)

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

@@ -20 +20 @@
 
 DLLS += VBoxInstallHelper
-VBoxInstallHelper_TEMPLATE = VBOXR3STATIC
+VBoxInstallHelper_TEMPLATE = VBoxR3Static
 VBoxInstallHelper_DEFS     = _WIN32_WINNT=0x0501 _UNICODE UNICODE
 VBoxInstallHelper_DEFS    += VBOX_SVN_REV=$(VBOX_SVN_REV)
@@ -36 +36 @@
 endif
 VBoxInstallHelper_SDKS     = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
-VBoxInstallHelper_LIBS     = $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
+VBoxInstallHelper_LIBS    += $(PATH_SDK_$(VBOX_WINPSDK)_LIB)/Msi.lib
 ifdef VBOX_WITH_NETFLT
  VBoxInstallHelper_LIBS   += \

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

@@ -21 +21 @@
 *********************************************************************************************************************************/
 #include <iprt/win/windows.h>
+
 #include <tchar.h>
 #include <stdio.h>
@@ -26 +27 @@
 #include <msi.h>
 #include <msiquery.h>
+
+#include <iprt/utf16.h>
 
 
@@ -40 +43 @@
 #endif
 
-UINT VBoxGetProperty(MSIHANDLE a_hModule, WCHAR *a_pwszName, WCHAR *a_pwszValue, DWORD a_dwSize)
+UINT VBoxGetMsiProp(MSIHANDLE hMsi, WCHAR *pwszName, WCHAR *pwszValue, DWORD dwSize)
 {
     DWORD dwBuffer = 0;
-    UINT uiRet = MsiGetPropertyW(a_hModule, a_pwszName, L"", &dwBuffer);
+    UINT uiRet = MsiGetPropertyW(hMsi, pwszName, L"", &dwBuffer);
     if (uiRet == ERROR_MORE_DATA)
     {
         ++dwBuffer;     /* On output does not include terminating null, so add 1. */
 
-        if (dwBuffer > a_dwSize)
+        if (dwBuffer > dwSize)
             return ERROR_MORE_DATA;
 
-        ZeroMemory(a_pwszValue, a_dwSize);
-        uiRet = MsiGetPropertyW(a_hModule, a_pwszName, a_pwszValue, &dwBuffer);
+        ZeroMemory(pwszValue, dwSize);
+        uiRet = MsiGetPropertyW(hMsi, pwszName, pwszValue, &dwBuffer);
     }
     return uiRet;
 }
 
-UINT VBoxSetProperty(MSIHANDLE a_hModule, WCHAR *a_pwszName, WCHAR *a_pwszValue)
+/**
+ * Retrieves a MSI property (in UTF-8).
+ *
+ * Convenience function for VBoxGetMsiProp().
+ *
+ * @returns VBox status code.
+ * @param   hMsi                MSI handle to use.
+ * @param   pcszName            Name of property to retrieve.
+ * @param   ppszValue           Where to store the allocated value on success.
+ *                              Must be free'd using RTStrFree() by the caller.
+ */
+int VBoxGetMsiPropUtf8(MSIHANDLE hMsi, const char *pcszName, char **ppszValue)
 {
-    return MsiSetPropertyW(a_hModule, a_pwszName, a_pwszValue);
+    PRTUTF16 pwszName;
+    int rc = RTStrToUtf16(pcszName, &pwszName);
+    if (RT_SUCCESS(rc))
+    {
+        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;
+
+        RTUtf16Free(pwszName);
+    }
+
+    return rc;
 }
 
+UINT VBoxSetMsiProp(MSIHANDLE hMsi, WCHAR *pwszName, WCHAR *pwszValue)
+{
+    return MsiSetPropertyW(hMsi, pwszName, pwszValue);
+}
+

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

@@ -26 +26 @@
 #endif
 
-UINT VBoxGetProperty(MSIHANDLE a_hModule, WCHAR *a_pwszName, WCHAR *a_pwszValue, DWORD a_dwSize);
-UINT VBoxSetProperty(MSIHANDLE a_hModule, WCHAR *a_pwszName, WCHAR *a_pwszValue);
+UINT VBoxGetMsiProp(MSIHANDLE hMsi, WCHAR *pwszName, WCHAR *pwszValue, DWORD dwSize);
+int  VBoxGetMsiPropUtf8(MSIHANDLE hMsi, const char *pcszName, char **ppszValue);
+UINT VBoxSetMsiProp(MSIHANDLE hMsi, WCHAR *pwszName, WCHAR *pwszValue);
 
 #endif /* !VBOX_INCLUDED_SRC_InstallHelper_VBoxCommon_h */

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

@@ -27 +27 @@
 #include <VBox/version.h>
 
-#include <iprt/win/windows.h>
 #include <wchar.h>
 #include <stdio.h>
@@ -36 +35 @@
 #define _WIN32_DCOM
 #include <iprt/win/windows.h>
+
 #include <assert.h>
 #include <shellapi.h>
 #define INITGUID
 #include <guiddef.h>
+#include <cfgmgr32.h>
 #include <devguid.h>
+
+#include <iprt/env.h>
+#include <iprt/err.h>
+#include <iprt/initterm.h>
+#include <iprt/path.h>
+#include <iprt/process.h>
+#include <iprt/utf16.h>
+
 #include <iprt/win/objbase.h>
 #include <iprt/win/setupapi.h>
 #include <iprt/win/shlobj.h>
-#include <cfgmgr32.h>
 
 #include "VBoxCommon.h"
@@ -66 +74 @@
 
 
-BOOL APIENTRY DllMain(HANDLE hModule, DWORD  uReason, LPVOID lpReserved)
-{
-    RT_NOREF3(hModule, uReason, lpReserved);
+BOOL WINAPI DllMain(HANDLE hInst, ULONG uReason, LPVOID pReserved)
+{
+    RT_NOREF(hInst, pReserved);
+
+    switch (uReason)
+    {
+        case DLL_PROCESS_ATTACH:
+            RTR3InitDll(RTR3INIT_FLAGS_UNOBTRUSIVE);
+            break;
+
+        case DLL_PROCESS_DETACH:
+            break;
+
+        case DLL_THREAD_ATTACH:
+            break;
+
+        case DLL_THREAD_DETACH:
+            break;
+
+        default:
+            break;
+    }
+
     return TRUE;
 }
 
-
-static void logString(MSIHANDLE hInstall, LPCSTR szString, ...)
-{
-    PMSIHANDLE newHandle = MsiCreateRecord(2);
-
-    char szBuffer[1024];
+static int logStringF(MSIHANDLE hInstall, const char *pcszFmt, ...)
+{
+    PMSIHANDLE hMSI = MsiCreateRecord(2 /* cParms */);
+    if (!hMSI)
+        return VERR_ACCESS_DENIED;
+
+    RTUTF16 wszBuf[_1K] = { 0 };
+
     va_list va;
-    va_start(va, szString);
-    _vsnprintf(szBuffer, sizeof(szBuffer), szString, va);
+    va_start(va, pcszFmt);
+    ssize_t cwch = RTUtf16PrintfV(wszBuf, RT_ELEMENTS(wszBuf), pcszFmt, va);
     va_end(va);
 
-    MsiRecordSetStringA(newHandle, 0, szBuffer);
-    MsiProcessMessage(hInstall, INSTALLMESSAGE(INSTALLMESSAGE_INFO), newHandle);
-    MsiCloseHandle(newHandle);
-
-#if 0/*def DEBUG - wrong? What does '%s' expect, wchar or char? */
-    _tprintf(_T("Debug: %s\n"), szBuffer);
-#endif
-}
-
-static void logStringW(MSIHANDLE hInstall, LPCWSTR pwszString, ...)
-{
-    PMSIHANDLE newHandle = MsiCreateRecord(2);
-
-    WCHAR szBuffer[1024];
-    va_list va;
-    va_start(va, pwszString);
-    _vsnwprintf(szBuffer, RT_ELEMENTS(szBuffer), pwszString, va);
-    va_end(va);
-
-    MsiRecordSetStringW(newHandle, 0, szBuffer);
-    MsiProcessMessage(hInstall, INSTALLMESSAGE(INSTALLMESSAGE_INFO), newHandle);
-    MsiCloseHandle(newHandle);
+    if (cwch <= 0)
+        return VERR_BUFFER_OVERFLOW;
+
+    MsiRecordSetStringW(hMSI, 0, wszBuf);
+    MsiProcessMessage(hInstall, INSTALLMESSAGE(INSTALLMESSAGE_INFO), hMSI);
+    MsiCloseHandle(hMSI);
+
+    return VINF_SUCCESS;
 }
 
@@ -110 +126 @@
 {
 #ifndef VBOX_OSE
-    /*BOOL bRet =*/ serialCheckNeeded(hModule);
+    /*BOOL fRet =*/ serialCheckNeeded(hModule);
 #else
-    RT_NOREF1(hModule);
+    RT_NOREF(hModule);
 #endif
     return ERROR_SUCCESS;
@@ -122 +138 @@
     /*BOOL bRet =*/ serialIsValid(hModule);
 #else
-    RT_NOREF1(hModule);
+    RT_NOREF(hModule);
 #endif
     return ERROR_SUCCESS;
 }
 
-DWORD Exec(MSIHANDLE hModule,
-           const WCHAR *pwszAppName, WCHAR *pwszCmdLine, const WCHAR *pwszWorkDir,
-           DWORD *pdwExitCode)
-{
-    STARTUPINFOW si;
-    PROCESS_INFORMATION pi;
-    DWORD rc = ERROR_SUCCESS;
-
-    ZeroMemory(&si, sizeof(si));
-    si.dwFlags = STARTF_USESHOWWINDOW;
-#ifdef UNICODE
-    si.dwFlags |= CREATE_UNICODE_ENVIRONMENT;
+/**
+ * Tries to retrieve the Python installation path on the system.
+ *
+ * @returns VBox status code.
+ * @param   hModule             Windows installer module handle.
+ * @param   hKeyRoot            Registry root key to use, e.g. HKEY_LOCAL_MACHINE.
+ * @param   ppszPath            Where to store the allocated Python path on success.
+ *                              Must be free'd by the caller using RTStrFree().
+ */
+static int getPythonPath(MSIHANDLE hModule, HKEY hKeyRoot, char **ppszPath)
+{
+    HKEY hkPythonCore = NULL;
+    LSTATUS dwErr = RegOpenKeyExW(hKeyRoot, L"SOFTWARE\\Python\\PythonCore", 0, KEY_READ, &hkPythonCore);
+    if (dwErr != ERROR_SUCCESS)
+        return RTErrConvertFromWin32(dwErr);
+
+    char *pszPythonPath = NULL;
+
+    RTUTF16 wszKey [RTPATH_MAX] = { 0 };
+    RTUTF16 wszKey2[RTPATH_MAX] = { 0 };
+    RTUTF16 wszVal [RTPATH_MAX] = { 0 };
+
+    int rc = VINF_SUCCESS;
+
+    /* Note: The loop ASSUMES that later found versions are higher, e.g. newer Python versions.
+     *       For now we always go by the newest version. */
+    for (int i = 0;; ++i)
+    {
+        DWORD dwKey     = sizeof(wszKey);
+        DWORD dwKeyType = REG_SZ;
+
+        dwErr = RegEnumKeyExW(hkPythonCore, i, wszKey, &dwKey, NULL, NULL, NULL, NULL);
+        if (dwErr != ERROR_SUCCESS || dwKey <= 0)
+            break;
+        AssertBreakStmt(dwKey <= sizeof(wszKey), VERR_BUFFER_OVERFLOW);
+
+        if (RTUtf16Printf(wszKey2, sizeof(wszKey2), "%ls\\InstallPath", wszKey) <= 0)
+        {
+            rc = VERR_BUFFER_OVERFLOW;
+            break;
+        }
+
+        dwKey = sizeof(wszKey2); /* Re-initialize length. */
+
+        HKEY hkPythonInstPath = NULL;
+        dwErr = RegOpenKeyExW(hkPythonCore, wszKey2, 0, KEY_READ,  &hkPythonInstPath);
+        if (dwErr != ERROR_SUCCESS)
+            continue;
+
+        dwErr = RegQueryValueExW(hkPythonInstPath, L"", NULL, &dwKeyType, (LPBYTE)wszVal, &dwKey);
+        if (dwErr == ERROR_SUCCESS)
+            logStringF(hModule, "InstallPythonAPI: Path \"%ls\" found.", wszVal);
+
+        if (pszPythonPath) /* Free former path, if any. */
+        {
+            RTStrFree(pszPythonPath);
+            pszPythonPath = NULL;
+        }
+
+        rc = RTUtf16ToUtf8(wszVal, &pszPythonPath);
+        AssertRCBreak(rc);
+
+        if (!RTPathExists(pszPythonPath))
+        {
+            logStringF(hModule, "InstallPythonAPI: Warning: Path \"%s\" does not exist, skipping.", wszVal);
+            rc = VERR_PATH_NOT_FOUND;
+        }
+
+        RegCloseKey(hkPythonInstPath);
+    }
+
+    RegCloseKey(hkPythonCore);
+
+    if (RT_FAILURE(rc))
+    {
+        RTStrFree(pszPythonPath);
+    }
+    else
+        *ppszPath = pszPythonPath;
+
+    return rc;
+}
+
+/**
+ * Waits for a started process to terminate.
+ *
+ * @returns VBox status code.
+ * @param   Process             Handle of process to wait for.
+ * @param   msTimeout           Timeout (in ms) to wait for process to terminate.
+ * @param   pProcSts            Pointer to process status on return.
+ */
+int procWait(RTPROCESS Process, RTMSINTERVAL msTimeout, PRTPROCSTATUS pProcSts)
+{
+    uint64_t tsStartMs = RTTimeMilliTS();
+
+    while (RTTimeMilliTS() - tsStartMs <= msTimeout)
+    {
+        int rc = RTProcWait(Process, RTPROCWAIT_FLAGS_NOBLOCK, pProcSts);
+        if (rc == VERR_PROCESS_RUNNING)
+            continue;
+        else if (RT_FAILURE(rc))
+            return rc;
+
+        if (   pProcSts->iStatus   != 0
+            || pProcSts->enmReason != RTPROCEXITREASON_NORMAL)
+        {
+            rc = VERR_GENERAL_FAILURE; /** @todo Fudge! */
+        }
+
+        return VINF_SUCCESS;
+    }
+
+    return VERR_TIMEOUT;
+}
+
+/**
+ * Checks for a valid Python installation on the system.
+ *
+ * Called from the MSI installer as custom action.
+ *
+ * @returns Always ERROR_SUCCESS.
+ *          Sets public property VBOX_PYTHON_INSTALLED to "0" (false) or "1" (success).
+ *          Sets public property VBOX_PYTHON_PATH to the Python installation path (if found).
+ *
+ * @param   hModule             Windows installer module handle.
+ */
+UINT __stdcall IsPythonInstalled(MSIHANDLE hModule)
+{
+    char *pszPythonPath;
+    int rc = getPythonPath(hModule, HKEY_LOCAL_MACHINE, &pszPythonPath);
+    if (RT_FAILURE(rc))
+        rc = getPythonPath(hModule, HKEY_CURRENT_USER, &pszPythonPath);
+
+    if (RT_SUCCESS(rc))
+    {
+        logStringF(hModule, "IsPythonInstalled: Python installation found at \"%s\"", pszPythonPath);
+
+        PRTUTF16 pwszPythonPath;
+        rc = RTStrToUtf16(pszPythonPath, &pwszPythonPath);
+        if (RT_SUCCESS(rc))
+        {
+            VBoxSetMsiProp(hModule, L"VBOX_PYTHON_PATH", pwszPythonPath);
+
+            RTUtf16Free(pwszPythonPath);
+        }
+        else
+            logStringF(hModule, "IsPythonInstalled: Error: Unable to convert path, rc=%Rrc", rc);
+
+        RTStrFree(pszPythonPath);
+    }
+    else
+        logStringF(hModule, "IsPythonInstalled: Error: No suitable Python installation found (%Rrc), skipping installation.", rc);
+
+    VBoxSetMsiProp(hModule, L"VBOX_PYTHON_INSTALLED", RT_SUCCESS(rc) ? L"1" : L"0");
+
+    return ERROR_SUCCESS; /* Never return failure. */
+}
+
+/**
+ * Installs and compiles the VBox Python bindings.
+ *
+ * Called from the MSI installer as custom action.
+ *
+ * @returns Always ERROR_SUCCESS.
+ *          Sets public property VBOX_API_INSTALLED to "0" (false) or "1" (success).
+ *
+ * @param   hModule             Windows installer module handle.
+ */
+UINT __stdcall InstallPythonAPI(MSIHANDLE hModule)
+{
+    logStringF(hModule, "InstallPythonAPI: Checking for installed Python environment(s) ...");
+
+    char *pszPythonPath;
+    int rc = getPythonPath(hModule, HKEY_LOCAL_MACHINE, &pszPythonPath);
+    if (RT_FAILURE(rc))
+        rc = getPythonPath(hModule, HKEY_CURRENT_USER, &pszPythonPath);
+
+    if (RT_FAILURE(rc))
+    {
+        VBoxSetMsiProp(hModule, L"VBOX_API_INSTALLED", L"0");
+
+        logStringF(hModule, "InstallPythonAPI: Python seems not to be installed (%Rrc); please download + install the Python Core package.", rc);
+        return ERROR_SUCCESS;
+    }
+
+    logStringF(hModule, "InstallPythonAPI: Python installation found at \"%s\".", pszPythonPath);
+    logStringF(hModule, "InstallPythonAPI: Checking for win32api extensions ...");
+
+    uint32_t fProcess = 0;
+#ifndef DEBUG
+    uint32_t fProcess |= RTPROC_FLAGS_HIDDEN;
 #endif
-    si.wShowWindow = SW_HIDE; /* For debugging: SW_SHOW; */
-    si.cb = sizeof(si);
-    ZeroMemory(&pi, sizeof(pi));
-
-    logStringW(hModule, L"Executing command line: %s %s (Working Dir: %s)",
-               pwszAppName, pwszCmdLine, pwszWorkDir == NULL ? L"Current" : pwszWorkDir);
-
-    SetLastError(0);
-    if (!CreateProcessW(pwszAppName,  /* Module name. */
-                        pwszCmdLine,  /* Command line. */
-                        NULL,         /* Process handle not inheritable. */
-                        NULL,         /* Thread handle not inheritable. */
-                        FALSE,        /* Set handle inheritance to FALSE .*/
-                        0,            /* No creation flags. */
-                        NULL,         /* Use parent's environment block. */
-                        pwszWorkDir,  /* Use parent's starting directory. */
-                        &si,          /* Pointer to STARTUPINFO structure. */
-                        &pi))         /* Pointer to PROCESS_INFORMATION structure. */
-    {
-        rc = GetLastError();
-        logStringW(hModule, L"Executing command line: CreateProcess() failed! Error: %ld", rc);
-        return rc;
-    }
-
-    /* Wait until child process exits. */
-    if (WAIT_FAILED == WaitForSingleObject(pi.hProcess, 30 * 1000 /* Wait 30 secs max. */))
-    {
-        rc = GetLastError();
-        logStringW(hModule, L"Executing command line: WaitForSingleObject() failed! Error: %u", rc);
-    }
-    else
-    {
-        if (!GetExitCodeProcess(pi.hProcess, pdwExitCode))
-        {
-            rc = GetLastError();
-            logStringW(hModule, L"Executing command line: GetExitCodeProcess() failed! Error: %u", rc);
-        }
-    }
-
-    /* Close process and thread handles. */
-    CloseHandle(pi.hProcess);
-    CloseHandle(pi.hThread);
-
-    logStringW(hModule, L"Executing command returned: %u (exit code %u)", rc, *pdwExitCode);
-    return rc;
-}
-
-UINT __stdcall InstallPythonAPI(MSIHANDLE hModule)
-{
-    logStringW(hModule, L"InstallPythonAPI: Checking for installed Python environment ...");
-
-    HKEY hkPythonCore = NULL;
-    BOOL bFound = FALSE;
-    LONG rc = RegOpenKeyExW(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Python\\PythonCore", 0, KEY_READ, &hkPythonCore);
-    if (rc != ERROR_SUCCESS)
-    {
-        logStringW(hModule, L"InstallPythonAPI: Python seems not to be installed.");
-        return ERROR_SUCCESS;
-    }
-
-    WCHAR wszPath[MAX_PATH] = { 0 };
-    WCHAR wszVal[MAX_PATH] = { 0 };
-
-    for (int i = 0;; ++i)
-    {
-        WCHAR wszRoot[MAX_PATH] = { 0 };
-        DWORD dwLen = sizeof(wszPath);
-        DWORD dwKeyType = REG_SZ;
-
-        rc = RegEnumKeyExW(hkPythonCore, i, wszRoot, &dwLen, NULL, NULL, NULL, NULL);
-        if (rc != ERROR_SUCCESS || dwLen <= 0)
-            break;
-
-        swprintf_s(wszPath, RT_ELEMENTS(wszPath), L"%s\\InstallPath", wszRoot);
-        dwLen = sizeof(wszVal);
-
-        HKEY hkPythonInstPath = NULL;
-        rc = RegOpenKeyExW(hkPythonCore, wszPath, 0, KEY_READ,  &hkPythonInstPath);
-        if (rc != ERROR_SUCCESS)
-            continue;
-
-        rc = RegQueryValueExW(hkPythonInstPath, L"", NULL, &dwKeyType, (LPBYTE)wszVal, &dwLen);
-        if (rc == ERROR_SUCCESS)
-            logStringW(hModule, L"InstallPythonAPI: Path \"%s\" detected.", wszVal);
-
-        RegCloseKey(hkPythonInstPath);
-    }
-    RegCloseKey(hkPythonCore);
-
-    /* Python path found? */
-    WCHAR wszExec[MAX_PATH] = { 0 };
-    WCHAR wszCmdLine[MAX_PATH] = { 0 };
-    DWORD dwExitCode = 0;
-    if (wcslen(wszVal) > 0)
-    {
-        /* Cool, check for installed Win32 extensions. */
-        logStringW(hModule, L"InstallPythonAPI: Python installed. Checking for Win32 extensions ...");
-        swprintf_s(wszExec, RT_ELEMENTS(wszExec), L"%s\\python.exe", wszVal);
-        swprintf_s(wszCmdLine, RT_ELEMENTS(wszCmdLine), L"%s\\python.exe -c \"import win32api\"", wszVal);
-
-        DWORD dwRetExec = Exec(hModule, wszExec, wszCmdLine, NULL, &dwExitCode);
-        if (   (ERROR_SUCCESS == dwRetExec)
-            && (            0 == dwExitCode))
-        {
-            /* Did we get the correct error level (=0)? */
-            logStringW(hModule, L"InstallPythonAPI: Win32 extensions installed.");
-            bFound = TRUE;
-        }
-        else
-            logStringW(hModule, L"InstallPythonAPI: Win32 extensions not found.");
-    }
-
-    BOOL bInstalled = FALSE;
-    if (bFound) /* Is Python and all required stuff installed? */
-    {
-        /* Get the VBoxAPI setup string. */
-        WCHAR wszPathTargetDir[MAX_PATH] = {0};
-        VBoxGetProperty(hModule, L"CustomActionData", wszPathTargetDir, sizeof(wszPathTargetDir));
-        if (wcslen(wszPathTargetDir))
-        {
-            /* Set final path. */
-            swprintf_s(wszPath, RT_ELEMENTS(wszPath), L"%s", wszPathTargetDir);
-
-            /* Install our API module. */
-            swprintf_s(wszCmdLine, RT_ELEMENTS(wszCmdLine), L"%s\\python.exe vboxapisetup.py install", wszVal);
-
-            /* Set required environment variables. */
-            if (!SetEnvironmentVariableW(L"VBOX_INSTALL_PATH", wszPathTargetDir))
-                logStringW(hModule, L"InstallPythonAPI: Could set environment variable VBOX_INSTALL_PATH!");
-            else
-            {
-                DWORD dwRetExec = Exec(hModule, wszExec, wszCmdLine, wszPath, &dwExitCode);
-                if (   (ERROR_SUCCESS == dwRetExec)
-                    && (            0 == dwExitCode))
+
+    char szPythonPath[RTPATH_MAX] = { 0 };
+    rc = RTPathAppend(szPythonPath, sizeof(szPythonPath), pszPythonPath);
+    if (RT_SUCCESS(rc))
+    {
+        rc = RTPathAppend(szPythonPath, sizeof(szPythonPath), "python.exe");
+        if (RT_SUCCESS(rc))
+        {
+            /*
+             * Check if importing the win32api module works.
+             * This is a prerequisite for setting up the VBox API.
+             */
+            RTPROCESS Process;
+            RT_ZERO(Process);
+            const char *papszArgs[4] = { szPythonPath, "-c", "import win32api", NULL};
+            rc = RTProcCreate(szPythonPath, papszArgs, RTENV_DEFAULT, fProcess, &Process);
+            if (RT_SUCCESS(rc))
+            {
+                RTPROCSTATUS ProcSts;
+                rc = procWait(Process, RT_MS_30SEC, &ProcSts);
+                if (RT_FAILURE(rc))
+                    logStringF(hModule, "InstallPythonAPI: Importing the win32api failed with %d (exit reason: %d)\n",
+                                   ProcSts.iStatus, ProcSts.enmReason);
+            }
+        }
+    }
+
+    /*
+     * Set up the VBox API.
+     */
+    if (RT_SUCCESS(rc))
+    {
+        /* Get the VBox API setup string. */
+        char *pszVBoxSDKPath;
+        rc = VBoxGetMsiPropUtf8(hModule, "CustomActionData", &pszVBoxSDKPath);
+        if (RT_SUCCESS(rc))
+        {
+            /* Make sure our current working directory is the VBox installation path. */
+            rc = RTPathSetCurrent(pszVBoxSDKPath);
+            if (RT_SUCCESS(rc))
+            {
+                /* Set required environment variables. */
+                rc = RTEnvSet("VBOX_INSTALL_PATH", pszVBoxSDKPath);
+                if (RT_SUCCESS(rc))
                 {
-                    /* All done! */
-                    logStringW(hModule, L"InstallPythonAPI: VBoxAPI for Python successfully installed.");
-                    bInstalled = TRUE;
+                    RTPROCSTATUS ProcSts;
+                    RT_ZERO(ProcSts);
+
+                    logStringF(hModule, "InstallPythonAPI: Invoking vboxapisetup.py in \"%s\" ...\n", pszVBoxSDKPath);
+
+                    RTPROCESS Process;
+                    RT_ZERO(Process);
+                    const char *papszArgs[4] = { szPythonPath, "vboxapisetup.py", "install", NULL};
+                    rc = RTProcCreate(szPythonPath, papszArgs, RTENV_DEFAULT, fProcess, &Process);
+                    if (RT_SUCCESS(rc))
+                    {
+                        rc = procWait(Process, RT_MS_30SEC, &ProcSts);
+                        if (RT_SUCCESS(rc))
+                            logStringF(hModule, "InstallPythonAPI: Installation of vboxapisetup.py successful\n");
+                    }
+
+                    if (RT_FAILURE(rc))
+                        logStringF(hModule, "InstallPythonAPI: Calling vboxapisetup.py failed with %Rrc (process status: %d, exit reason: %d)\n",
+                                   rc, ProcSts.iStatus, ProcSts.enmReason);
                 }
                 else
-                {
-                    if (dwRetExec)
-                        logStringW(hModule, L"InstallPythonAPI: Error while executing installation of VBox API: %ld", dwRetExec);
-                    else
-                        logStringW(hModule, L"InstallPythonAPI: Python reported an error while installing VBox API: %ld", dwExitCode);
-                }
-            }
+                    logStringF(hModule, "InstallPythonAPI: Could set environment variable VBOX_INSTALL_PATH, rc=%Rrc\n", rc);
+            }
+            else
+                logStringF(hModule, "InstallPythonAPI: Could set working directory to \"%s\", rc=%Rrc\n", pszVBoxSDKPath, rc);
+
+            RTStrFree(pszVBoxSDKPath);
         }
         else
-            logStringW(hModule, L"InstallPythonAPI: Unable to retrieve VBox installation path!");
-    }
-
-    VBoxSetProperty(hModule, L"VBOX_PYTHON_IS_INSTALLED", bInstalled ? L"1" : L"0");
-
-    if (!bInstalled)
-        logStringW(hModule, L"InstallPythonAPI: VBox API not installed.");
+            logStringF(hModule, "InstallPythonAPI: Unable to retrieve VBox installation directory, rc=%Rrc\n", rc);
+    }
+
+    /*
+     * Do some sanity checking if the VBox API works.
+     */
+    if (RT_SUCCESS(rc))
+    {
+        logStringF(hModule, "InstallPythonAPI: Validating VBox API ...\n");
+
+        RTPROCSTATUS ProcSts;
+        RT_ZERO(ProcSts);
+
+        RTPROCESS Process;
+        RT_ZERO(Process);
+        const char *papszArgs[4] = { szPythonPath, "-c", "from vboxapi import VirtualBoxManager", NULL};
+        rc = RTProcCreate(szPythonPath, papszArgs, RTENV_DEFAULT, fProcess, &Process);
+        if (RT_SUCCESS(rc))
+        {
+            rc = procWait(Process, RT_MS_30SEC, &ProcSts);
+            if (RT_SUCCESS(rc))
+                logStringF(hModule, "InstallPythonAPI: VBox API looks good.\n");
+        }
+
+        if (RT_FAILURE(rc))
+            logStringF(hModule, "InstallPythonAPI: Validating VBox API failed with %Rrc (process status: %d, exit reason: %d)\n",
+                       rc, ProcSts.iStatus, ProcSts.enmReason);
+    }
+
+    RTStrFree(pszPythonPath);
+
+    VBoxSetMsiProp(hModule, L"VBOX_API_INSTALLED", RT_SUCCESS(rc) ? L"1" : L"0");
+
+    if (RT_FAILURE(rc))
+        logStringF(hModule, "InstallPythonAPI: Installation failed with %Rrc\n", rc);
+
     return ERROR_SUCCESS; /* Do not fail here. */
 }
@@ -327 +476 @@
                                 (DWORD)wcslen(wszValue));
             if (rc != ERROR_SUCCESS)
-                logStringW(hModule, L"InstallBranding: Could not write value %s! Error %ld", pwszValue, rc);
+                logStringF(hModule, "InstallBranding: Could not write value %s! Error %ld", pwszValue, rc);
             RegCloseKey (hkBranding);
         }
@@ -355 +504 @@
                FOF_NOERRORUI;
 
-    logStringW(hModule, L"CopyDir: DestDir=%s, SourceDir=%s", wszDest, wszSource);
+    logStringF(hModule, "CopyDir: DestDir=%s, SourceDir=%s", wszDest, wszSource);
     int r = SHFileOperationW(&s);
     if (r != 0)
     {
-        logStringW(hModule, L"CopyDir: Copy operation returned status 0x%x", r);
+        logStringF(hModule, "CopyDir: Copy operation returned status 0x%x", r);
         rc = ERROR_GEN_FAILURE;
     }
@@ -383 +532 @@
              | FOF_NOERRORUI;
 
-    logStringW(hModule, L"RemoveDir: DestDir=%s", wszDest);
+    logStringF(hModule, "RemoveDir: DestDir=%s", wszDest);
     int r = SHFileOperationW(&s);
     if (r != 0)
     {
-        logStringW(hModule, L"RemoveDir: Remove operation returned status 0x%x", r);
+        logStringF(hModule, "RemoveDir: Remove operation returned status 0x%x", r);
         rc = ERROR_GEN_FAILURE;
     }
@@ -414 +563 @@
              | FOF_NOERRORUI;
 
-    logStringW(hModule, L"RenameDir: DestDir=%s, SourceDir=%s", wszDest, wszSource);
+    logStringF(hModule, "RenameDir: DestDir=%s, SourceDir=%s", wszDest, wszSource);
     int r = SHFileOperationW(&s);
     if (r != 0)
     {
-        logStringW(hModule, L"RenameDir: Rename operation returned status 0x%x", r);
+        logStringF(hModule, "RenameDir: Rename operation returned status 0x%x", r);
         rc = ERROR_GEN_FAILURE;
     }
@@ -429 +578 @@
 {
     UINT rc;
-    logStringW(hModule, L"UninstallBranding: Handling branding file ...");
+    logStringF(hModule, "UninstallBranding: Handling branding file ...");
 
     WCHAR wszPathTargetDir[_MAX_PATH];
     WCHAR wszPathDest[_MAX_PATH];
 
-    rc = VBoxGetProperty(hModule, L"CustomActionData", wszPathTargetDir, sizeof(wszPathTargetDir));
+    rc = VBoxGetMsiProp(hModule, L"CustomActionData", wszPathTargetDir, sizeof(wszPathTargetDir));
     if (rc == ERROR_SUCCESS)
     {
@@ -454 +603 @@
     }
 
-    logStringW(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. */
 }
@@ -461 +610 @@
 {
     UINT rc;
-    logStringW(hModule, L"InstallBranding: Handling branding file ...");
+    logStringF(hModule, "InstallBranding: Handling branding file ...");
 
     WCHAR wszPathMSI[_MAX_PATH];
-    rc = VBoxGetProperty(hModule, L"SOURCEDIR", wszPathMSI, sizeof(wszPathMSI));
+    rc = VBoxGetMsiProp(hModule, L"SOURCEDIR", wszPathMSI, sizeof(wszPathMSI));
     if (rc == ERROR_SUCCESS)
     {
         WCHAR wszPathTargetDir[_MAX_PATH];
-        rc = VBoxGetProperty(hModule, L"CustomActionData", wszPathTargetDir, sizeof(wszPathTargetDir));
+        rc = VBoxGetMsiProp(hModule, L"CustomActionData", wszPathTargetDir, sizeof(wszPathTargetDir));
         if (rc == ERROR_SUCCESS)
         {
@@ -487 +636 @@
     }
 
-    logStringW(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. */
 }
@@ -518 +667 @@
         case VBOXDRVCFG_LOG_SEVERITY_REL:
             if (g_hCurrentModule)
-                logString(g_hCurrentModule, pszMsg);
+                logStringF(g_hCurrentModule, pszMsg);
             break;
         default:
@@ -528 +677 @@
 {
     if (g_hCurrentModule)
-        logString(g_hCurrentModule, pszString);
+        logStringF(g_hCurrentModule, pszString);
 }
 
@@ -565 +714 @@
         case NETCFG_S_REBOOT:
         {
-            logStringW(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)
-                logStringW(hModule, L"Failed to set REBOOT property, error = 0x%x", hr2);
+                logStringF(hModule, "Failed to set REBOOT property, error = 0x%x", hr2);
             uRet = ERROR_SUCCESS; /* Never fail here. */
             break;
@@ -574 +723 @@
 
         default:
-            logStringW(hModule, L"Converting unhandled HRESULT (0x%x) to ERROR_GEN_FAILURE", hr);
+            logStringF(hModule, "Converting unhandled HRESULT (0x%x) to ERROR_GEN_FAILURE", hr);
             uRet = ERROR_GEN_FAILURE;
     }
@@ -588 +737 @@
         if (uErr != ERROR_SUCCESS)
         {
-            logStringW(hModule, L"createNetCfgLockedMsgRecord: MsiRecordSetInteger failed, error = 0x%x", uErr);
+            logStringF(hModule, "createNetCfgLockedMsgRecord: MsiRecordSetInteger failed, error = 0x%x", uErr);
             MsiCloseHandle(hRecord);
             hRecord = NULL;
@@ -594 +743 @@
     }
     else
-        logStringW(hModule, L"createNetCfgLockedMsgRecord: Failed to create a record");
+        logStringF(hModule, "createNetCfgLockedMsgRecord: Failed to create a record");
 
     return hRecord;
@@ -613 +762 @@
         {
             if (FAILED(hr))
-                logStringW(hModule, L"doNetCfgInit: VBoxNetCfgWinQueryINetCfg failed, error = 0x%x", hr);
+                logStringF(hModule, "doNetCfgInit: VBoxNetCfgWinQueryINetCfg failed, error = 0x%x", hr);
             uErr = errorConvertFromHResult(hModule, hr);
             break;
@@ -622 +771 @@
         if (!lpszLockedBy)
         {
-            logStringW(hModule, L"doNetCfgInit: lpszLockedBy == NULL, breaking");
+            logStringF(hModule, "doNetCfgInit: lpszLockedBy == NULL, breaking");
             break;
         }
@@ -636 +785 @@
         {
             cRetries++;
-            logStringW(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;
         }
@@ -646 +795 @@
                 if (!hMsg)
                 {
-                    logStringW(hModule, L"doNetCfgInit: Failed to create a message record, breaking");
+                    logStringF(hModule, "doNetCfgInit: Failed to create a message record, breaking");
                     CoTaskMemFree(lpszLockedBy);
                     break;
@@ -656 +805 @@
             if (rTmp != ERROR_SUCCESS)
             {
-                logStringW(hModule, L"doNetCfgInit: MsiRecordSetStringW failed, error = 0x%x", rTmp);
+                logStringF(hModule, "doNetCfgInit: MsiRecordSetStringW failed, error = 0x%x", rTmp);
                 CoTaskMemFree(lpszLockedBy);
                 break;
@@ -663 +812 @@
             MsgResult = MsiProcessMessage(hModule, (INSTALLMESSAGE)(INSTALLMESSAGE_USER | MB_RETRYCANCEL), hMsg);
             NonStandardAssert(MsgResult == IDRETRY || MsgResult == IDCANCEL);
-            logStringW(hModule, L"doNetCfgInit: MsiProcessMessage returned (0x%x)", MsgResult);
+            logStringF(hModule, "doNetCfgInit: MsiProcessMessage returned (0x%x)", MsgResult);
         }
         CoTaskMemFree(lpszLockedBy);
@@ -684 +833 @@
 
         wcsncat(pwszPtInf, NETFLT_PT_INF_REL_PATH, sizeof(NETFLT_PT_INF_REL_PATH));
-        logStringW(hModule, L"vboxNetFltQueryInfArray: INF 1: %s", pwszPtInf);
+        logStringF(hModule, "vboxNetFltQueryInfArray: INF 1: %s", pwszPtInf);
 
         wcsncat(pwszMpInf, NETFLT_MP_INF_REL_PATH, sizeof(NETFLT_MP_INF_REL_PATH));
-        logStringW(hModule, L"vboxNetFltQueryInfArray: INF 2: %s", pwszMpInf);
+        logStringF(hModule, "vboxNetFltQueryInfArray: INF 2: %s", pwszMpInf);
     }
     else if (uErr != ERROR_SUCCESS)
-        logStringW(hModule, L"vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = 0x%x", uErr);
+        logStringF(hModule, "vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = 0x%x", uErr);
     else
     {
-        logStringW(hModule, L"vboxNetFltQueryInfArray: Empty installation directory");
+        logStringF(hModule, "vboxNetFltQueryInfArray: Empty installation directory");
         uErr = ERROR_GEN_FAILURE;
     }
@@ -714 +863 @@
     __try
     {
-        logStringW(hModule, L"Uninstalling NetFlt");
+        logStringF(hModule, "Uninstalling NetFlt");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -721 +870 @@
             HRESULT hr = VBoxNetCfgWinNetFltUninstall(pNetCfg);
             if (hr != S_OK)
-                logStringW(hModule, L"UninstallNetFlt: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr);
+                logStringF(hModule, "UninstallNetFlt: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr);
 
             uErr = errorConvertFromHResult(hModule, hr);
@@ -727 +876 @@
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringW(hModule, L"Uninstalling NetFlt done, error = 0x%x", uErr);
+            logStringF(hModule, "Uninstalling NetFlt done, error = 0x%x", uErr);
         }
         else
-            logStringW(hModule, L"UninstallNetFlt: doNetCfgInit failed, error = 0x%x", uErr);
+            logStringF(hModule, "UninstallNetFlt: doNetCfgInit failed, error = 0x%x", uErr);
     }
     __finally
@@ -766 +915 @@
     {
 
-        logStringW(hModule, L"InstallNetFlt: Installing NetFlt");
+        logStringF(hModule, "InstallNetFlt: Installing NetFlt");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -779 +928 @@
                 HRESULT hr = VBoxNetCfgWinNetFltInstall(pNetCfg, &apwszInfs[0], RT_ELEMENTS(apwszInfs));
                 if (FAILED(hr))
-                    logStringW(hModule, L"InstallNetFlt: VBoxNetCfgWinNetFltInstall failed, error = 0x%x", hr);
+                    logStringF(hModule, "InstallNetFlt: VBoxNetCfgWinNetFltInstall failed, error = 0x%x", hr);
 
                 uErr = errorConvertFromHResult(hModule, hr);
             }
             else
-                logStringW(hModule, L"InstallNetFlt: vboxNetFltQueryInfArray failed, error = 0x%x", uErr);
+                logStringF(hModule, "InstallNetFlt: vboxNetFltQueryInfArray failed, error = 0x%x", uErr);
 
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringW(hModule, L"InstallNetFlt: Done");
+            logStringF(hModule, "InstallNetFlt: Done");
         }
         else
-            logStringW(hModule, L"InstallNetFlt: doNetCfgInit failed, error = 0x%x", uErr);
+            logStringF(hModule, "InstallNetFlt: doNetCfgInit failed, error = 0x%x", uErr);
     }
     __finally
@@ -827 +976 @@
     __try
     {
-        logStringW(hModule, L"Uninstalling NetLwf");
+        logStringF(hModule, "Uninstalling NetLwf");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -834 +983 @@
             HRESULT hr = VBoxNetCfgWinNetLwfUninstall(pNetCfg);
             if (hr != S_OK)
-                logStringW(hModule, L"UninstallNetLwf: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr);
+                logStringF(hModule, "UninstallNetLwf: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr);
 
             uErr = errorConvertFromHResult(hModule, hr);
@@ -840 +989 @@
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringW(hModule, L"Uninstalling NetLwf done, error = 0x%x", uErr);
+            logStringF(hModule, "Uninstalling NetLwf done, error = 0x%x", uErr);
         }
         else
-            logStringW(hModule, L"UninstallNetLwf: doNetCfgInit failed, error = 0x%x", uErr);
+            logStringF(hModule, "UninstallNetLwf: doNetCfgInit failed, error = 0x%x", uErr);
     }
     __finally
@@ -879 +1028 @@
     {
 
-        logStringW(hModule, L"InstallNetLwf: Installing NetLwf");
+        logStringF(hModule, "InstallNetLwf: Installing NetLwf");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -901 +1050 @@
                     HRESULT hr = VBoxNetCfgWinNetLwfInstall(pNetCfg, wszInf);
                     if (FAILED(hr))
-                        logStringW(hModule, L"InstallNetLwf: VBoxNetCfgWinNetLwfInstall failed, error = 0x%x", hr);
+                        logStringF(hModule, "InstallNetLwf: VBoxNetCfgWinNetLwfInstall failed, error = 0x%x", hr);
 
                     uErr = errorConvertFromHResult(hModule, hr);
@@ -907 +1056 @@
                 else
                 {
-                    logStringW(hModule, L"vboxNetFltQueryInfArray: Empty installation directory");
+                    logStringF(hModule, "vboxNetFltQueryInfArray: Empty installation directory");
                     uErr = ERROR_GEN_FAILURE;
                 }
             }
             else
-                logStringW(hModule, L"vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = 0x%x", uErr);
+                logStringF(hModule, "vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = 0x%x", uErr);
 
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringW(hModule, L"InstallNetLwf: Done");
+            logStringF(hModule, "InstallNetLwf: Done");
         }
         else
-            logStringW(hModule, L"InstallNetLwf: doNetCfgInit failed, error = 0x%x", uErr);
+            logStringF(hModule, "InstallNetLwf: doNetCfgInit failed, error = 0x%x", uErr);
     }
     __finally
@@ -1008 +1157 @@
     BOOL fSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
 
-    logStringW(hModule, L"CreateHostOnlyInterface: Creating host-only interface");
+    logStringF(hModule, "CreateHostOnlyInterface: Creating host-only interface");
 
     HRESULT hr = E_FAIL;
@@ -1021 +1170 @@
         if (cchMpInf)
         {
-            logStringW(hModule, L"CreateHostOnlyInterface: NetAdpDir property = %s", wszMpInf);
+            logStringF(hModule, "CreateHostOnlyInterface: NetAdpDir property = %s", wszMpInf);
             if (wszMpInf[cchMpInf - 1] != L'\\')
             {
@@ -1032 +1181 @@
             fIsFile = true;
 
-            logStringW(hModule, L"CreateHostOnlyInterface: Resulting INF path = %s", pwszInfPath);
+            logStringF(hModule, "CreateHostOnlyInterface: Resulting INF path = %s", pwszInfPath);
         }
         else
-            logStringW(hModule, L"CreateHostOnlyInterface: VBox installation path is empty");
+            logStringF(hModule, "CreateHostOnlyInterface: VBox installation path is empty");
     }
     else
-        logStringW(hModule, L"CreateHostOnlyInterface: Unable to retrieve VBox installation path, error = 0x%x", uErr);
+        logStringF(hModule, "CreateHostOnlyInterface: Unable to retrieve VBox installation path, error = 0x%x", uErr);
 
     /* Make sure the inf file is installed. */
     if (pwszInfPath != NULL && fIsFile)
     {
-        logStringW(hModule, L"CreateHostOnlyInterface: Calling VBoxDrvCfgInfInstall(%s)", pwszInfPath);
+        logStringF(hModule, "CreateHostOnlyInterface: Calling VBoxDrvCfgInfInstall(%s)", pwszInfPath);
         hr = VBoxDrvCfgInfInstall(pwszInfPath);
-        logStringW(hModule, L"CreateHostOnlyInterface: VBoxDrvCfgInfInstall returns 0x%x", hr);
+        logStringF(hModule, "CreateHostOnlyInterface: VBoxDrvCfgInfInstall returns 0x%x", hr);
         if (FAILED(hr))
-            logStringW(hModule, L"CreateHostOnlyInterface: Failed to install INF file, error = 0x%x", hr);
+            logStringF(hModule, "CreateHostOnlyInterface: Failed to install INF file, error = 0x%x", hr);
     }
 
@@ -1059 +1208 @@
             if (fRebootRequired)
             {
-                logStringW(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)
-                    logStringW(hModule, L"CreateHostOnlyInterface: Failed to set REBOOT property for update, error = 0x%x", hr2);
+                    logStringF(hModule, "CreateHostOnlyInterface: Failed to set REBOOT property for update, error = 0x%x", hr2);
             }
         }
@@ -1068 +1217 @@
         {
             //in fail case call CreateHostOnlyInterface
-            logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = 0x%x", hr);
-            logStringW(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinCreateHostOnlyNetworkInterface");
+            logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = 0x%x", hr);
+            logStringF(hModule, "CreateHostOnlyInterface: calling VBoxNetCfgWinCreateHostOnlyNetworkInterface");
 #ifdef VBOXNETCFG_DELAYEDRENAME
             BSTR devId;
@@ -1076 +1225 @@
             hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface(pwszInfPath, fIsFile, NULL, &guid, NULL, NULL);
 #endif /* !VBOXNETCFG_DELAYEDRENAME */
-            logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface returns 0x%x", hr);
+            logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface returns 0x%x", hr);
             if (SUCCEEDED(hr))
             {
                 ULONG ip = inet_addr("192.168.56.1");
                 ULONG mask = inet_addr("255.255.255.0");
-                logStringW(hModule, L"CreateHostOnlyInterface: calling VBoxNetCfgWinEnableStaticIpConfig");
+                logStringF(hModule, "CreateHostOnlyInterface: calling VBoxNetCfgWinEnableStaticIpConfig");
                 hr = VBoxNetCfgWinEnableStaticIpConfig(&guid, ip, mask);
-                logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig returns 0x%x", hr);
+                logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig returns 0x%x", hr);
                 if (FAILED(hr))
-                    logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, error = 0x%x", hr);
+                    logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, error = 0x%x", hr);
 #ifdef VBOXNETCFG_DELAYEDRENAME
                 hr = VBoxNetCfgWinRenameHostOnlyConnection(&guid, devId, NULL);
                 if (FAILED(hr))
-                    logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinRenameHostOnlyConnection failed, error = 0x%x", hr);
+                    logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinRenameHostOnlyConnection failed, error = 0x%x", hr);
                 SysFreeString(devId);
 #endif /* VBOXNETCFG_DELAYEDRENAME */
             }
             else
-                logStringW(hModule, L"CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, error = 0x%x", hr);
+                logStringF(hModule, "CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, error = 0x%x", hr);
         }
     }
 
     if (SUCCEEDED(hr))
-        logStringW(hModule, L"CreateHostOnlyInterface: Creating host-only interface done");
+        logStringF(hModule, "CreateHostOnlyInterface: Creating host-only interface done");
 
     /* Restore original setup mode. */
-    logStringW(hModule, L"CreateHostOnlyInterface: Almost done...");
+    logStringF(hModule, "CreateHostOnlyInterface: Almost done...");
     if (fSetupModeInteractive)
         SetupSetNonInteractiveMode(fSetupModeInteractive);
@@ -1110 +1259 @@
 #endif /* VBOX_WITH_NETFLT */
 
-    logStringW(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;
@@ -1130 +1279 @@
     netCfgLoggerEnable(hModule);
 
-    logStringW(hModule, L"RemoveHostOnlyInterfaces: Removing all host-only interfaces");
+    logStringF(hModule, "RemoveHostOnlyInterfaces: Removing all host-only interfaces");
 
     BOOL fSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
@@ -1140 +1289 @@
         if (FAILED(hr))
         {
-            logStringW(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
-            logStringW(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstalled successfully");
+            logStringF(hModule, "RemoveHostOnlyInterfaces: NetAdp uninstalled successfully");
 
     }
     else
-        logStringW(hModule, L"RemoveHostOnlyInterfaces: NetAdp uninstall failed, hr = 0x%x", hr);
+        logStringF(hModule, "RemoveHostOnlyInterfaces: NetAdp uninstall failed, hr = 0x%x", hr);
 
     /* Restore original setup mode. */
@@ -1170 +1319 @@
     netCfgLoggerEnable(hModule);
 
-    logStringW(hModule, L"StopHostOnlyInterfaces: Stopping all host-only interfaces");
+    logStringF(hModule, "StopHostOnlyInterfaces: Stopping all host-only interfaces");
 
     BOOL fSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
@@ -1177 +1326 @@
     if (SUCCEEDED(hr))
     {
-        logStringW(hModule, L"StopHostOnlyInterfaces: Disabling host interfaces was successful, hr = 0x%x", hr);
+        logStringF(hModule, "StopHostOnlyInterfaces: Disabling host interfaces was successful, hr = 0x%x", hr);
     }
     else
-        logStringW(hModule, L"StopHostOnlyInterfaces: Disabling host interfaces failed, hr = 0x%x", hr);
+        logStringF(hModule, "StopHostOnlyInterfaces: Disabling host interfaces failed, hr = 0x%x", hr);
 
     /* Restore original setup mode. */
@@ -1203 +1352 @@
     netCfgLoggerEnable(hModule);
 
-    logStringW(hModule, L"UpdateHostOnlyInterfaces: Updating all host-only interfaces");
+    logStringF(hModule, "UpdateHostOnlyInterfaces: Updating all host-only interfaces");
 
     BOOL fSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
@@ -1216 +1365 @@
         if (cchMpInf)
         {
-            logStringW(hModule, L"UpdateHostOnlyInterfaces: NetAdpDir property = %s", wszMpInf);
+            logStringF(hModule, "UpdateHostOnlyInterfaces: NetAdpDir property = %s", wszMpInf);
             if (wszMpInf[cchMpInf - 1] != L'\\')
             {
@@ -1227 +1376 @@
             fIsFile = true;
 
-            logStringW(hModule, L"UpdateHostOnlyInterfaces: Resulting INF path = %s", pwszInfPath);
+            logStringF(hModule, "UpdateHostOnlyInterfaces: Resulting INF path = %s", pwszInfPath);
 
             DWORD attrFile = GetFileAttributesW(pwszInfPath);
@@ -1233 +1382 @@
             {
                 DWORD dwErr = GetLastError();
-                logStringW(hModule, L"UpdateHostOnlyInterfaces: File \"%s\" not found, dwErr=%ld",
+                logStringF(hModule, "UpdateHostOnlyInterfaces: File \"%s\" not found, dwErr=%ld",
                            pwszInfPath, dwErr);
             }
             else
             {
-                logStringW(hModule, L"UpdateHostOnlyInterfaces: File \"%s\" exists",
+                logStringF(hModule, "UpdateHostOnlyInterfaces: File \"%s\" exists",
                            pwszInfPath);
 
@@ -1247 +1396 @@
                     if (fRebootRequired)
                     {
-                        logStringW(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)
-                            logStringW(hModule, L"UpdateHostOnlyInterfaces: Failed to set REBOOT property, error = 0x%x", hr2);
+                            logStringF(hModule, "UpdateHostOnlyInterfaces: Failed to set REBOOT property, error = 0x%x", hr2);
                     }
                 }
                 else
-                    logStringW(hModule, L"UpdateHostOnlyInterfaces: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = 0x%x", hr);
+                    logStringF(hModule, "UpdateHostOnlyInterfaces: VBoxNetCfgWinUpdateHostOnlyNetworkInterface failed, hr = 0x%x", hr);
             }
         }
         else
-            logStringW(hModule, L"UpdateHostOnlyInterfaces: VBox installation path is empty");
+            logStringF(hModule, "UpdateHostOnlyInterfaces: VBox installation path is empty");
     }
     else
-        logStringW(hModule, L"UpdateHostOnlyInterfaces: Unable to retrieve VBox installation path, error = 0x%x", uErr);
+        logStringF(hModule, "UpdateHostOnlyInterfaces: Unable to retrieve VBox installation path, error = 0x%x", uErr);
 
     /* Restore original setup mode. */
@@ -1296 +1445 @@
     __try
     {
-        logStringW(hModule, L"Uninstalling NetAdp");
+        logStringF(hModule, "Uninstalling NetAdp");
 
         uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
@@ -1303 +1452 @@
             HRESULT hr = VBoxNetCfgWinNetAdpUninstall(pNetCfg, pwszId);
             if (hr != S_OK)
-                logStringW(hModule, L"UninstallNetAdp: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr);
+                logStringF(hModule, "UninstallNetAdp: VBoxNetCfgWinUninstallComponent failed, error = 0x%x", hr);
 
             uErr = errorConvertFromHResult(hModule, hr);
@@ -1309 +1458 @@
             VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
 
-            logStringW(hModule, L"Uninstalling NetAdp done, error = 0x%x", uErr);
+            logStringF(hModule, "Uninstalling NetAdp done, error = 0x%x", uErr);
         }
         else
-            logStringW(hModule, L"UninstallNetAdp: doNetCfgInit failed, error = 0x%x", uErr);
+            logStringF(hModule, "UninstallNetAdp: doNetCfgInit failed, error = 0x%x", uErr);
     }
     __finally
@@ -1398 +1547 @@
 }
 
+/** @todo r=andy BUGBUG WTF! Why do we a) set the rc to 0 (success), and b) need this macro at all!? */
 #define SetErrBreak(args) \
     if (1) { \
         rc = 0; \
-        logStringW args; \
+        logStringF args; \
         break; \
     } else do {} while (0)
@@ -1425 +1575 @@
             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]",
+                SetErrBreak((hModule, "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]",
+                SetErrBreak((hModule, "VBox HostInterfaces: Host interface network was not found in registry (%s)! [2]",
                              wszRegLocation));
 
@@ -1438 +1588 @@
                                        &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]",
+                SetErrBreak((hModule, "VBox HostInterfaces: Host interface network was not found in registry (%s)! [3]",
                              wszRegLocation));
         }
@@ -1473 +1623 @@
             if (hDeviceInfo == INVALID_HANDLE_VALUE)
             {
-                logStringW(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!"));
             }
 
@@ -1576 +1726 @@
                 if (!fResult)
                 {
-                    logStringW(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!"));
                 }
 
@@ -1583 +1733 @@
                 if (!fResult)
                 {
-                    logStringW(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);
 
@@ -1606 +1756 @@
     if (lStatus == ERROR_SUCCESS)
     {
-        logStringW(hModule, L"VBox HostInterfaces: Enumerating interfaces ...");
+        logStringF(hModule, "VBox HostInterfaces: Enumerating interfaces ...");
         for (int i = 0; ; ++i)
         {
@@ -1617 +1767 @@
                 {
                     case ERROR_NO_MORE_ITEMS:
-                        logStringW(hModule, L"VBox HostInterfaces: No interfaces found.");
+                        logStringF(hModule, "VBox HostInterfaces: No interfaces found.");
                         break;
                     default:
-                        logStringW(hModule, L"VBox HostInterfaces: Enumeration failed: %ld", lStatus);
+                        logStringF(hModule, "VBox HostInterfaces: Enumeration failed: %ld", lStatus);
                         break;
                 }
@@ -1628 +1778 @@
             if (isTAPDevice(wszNetworkGUID))
             {
-                logStringW(hModule, L"VBox HostInterfaces: Removing interface \"%s\" ...", wszNetworkGUID);
+                logStringF(hModule, "VBox HostInterfaces: Removing interface \"%s\" ...", wszNetworkGUID);
                 removeNetworkInterface(hModule, wszNetworkGUID);
                 lStatus = RegDeleteKeyW(hCtrlNet, wszNetworkGUID);
@@ -1634 +1784 @@
         }
         RegCloseKey(hCtrlNet);
-        logStringW(hModule, L"VBox HostInterfaces: Removing interfaces done.");
+        logStringF(hModule, "VBox HostInterfaces: Removing interfaces done.");
     }
     return ERROR_SUCCESS;