Changeset 37289 in vbox for trunk

Timestamp:

Jun 1, 2011 11:59:23 AM (14 years ago)

Author:

vboxsync

Message:

Windows host installaer/VBoxNetCfg: Major overhaul for supporting Windows Installer XML 3.5, fixed VBoxInstallHelper logging, coding style, added missing installer icons.

Location:

trunk

Files:

• Config.kmk (modified) (1 diff)
• src/VBox/HostDrivers/VBoxNetFlt/win/cfg/VBoxNetCfg.cpp (modified) (68 diffs)
• src/VBox/Installer/win/InstallHelper/VBoxCommon.cpp (modified) (1 diff)
• src/VBox/Installer/win/InstallHelper/VBoxInstallHelper.cpp (modified) (58 diffs)
• src/VBox/Installer/win/Languages/de_DE.wxl (modified) (1 diff)
• src/VBox/Installer/win/Languages/en_US.wxl (modified) (1 diff)
• src/VBox/Installer/win/Languages/fr_FR.wxl (modified) (1 diff)
• src/VBox/Installer/win/Makefile.kmk (modified) (12 diffs)
• src/VBox/Installer/win/UserInterface.wxi (modified) (33 diffs)
• src/VBox/Installer/win/VBoxKey.wxi (modified) (1 diff)
• src/VBox/Installer/win/VirtualBox.wxs (modified) (24 diffs)
• src/VBox/Installer/win/VirtualBox_TypeLib.xsl (modified) (1 diff)
• src/VBox/Installer/win/dep.sed (modified) (2 diffs)

trunk/Config.kmk

@@ -1668 +1668 @@
 
 # Windows install tools...
-VBOX_PATH_WIX       ?= $(PATH_DEVTOOLS)/win.x86/wix/v2.0.5805.0
+VBOX_PATH_WIX       ?= $(PATH_DEVTOOLS)/win.x86/wix/v3.5.2519.0
 VBOX_PATH_MSITRAN   ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiTran.Exe
 VBOX_PATH_MSIDB     ?= $(PATH_DEVTOOLS)/win.x86/sdk/200504/Bin/MsiDb.Exe

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

@@ -50 +50 @@
 static VOID DoLogging(LPCSTR szString, ...);
 #define Log DoLogging
+#define LogFlow(x) DoLogging x
 
 #define DbgLog
@@ -57 +58 @@
 
 static HRESULT vboxNetCfgWinINetCfgLock(IN INetCfg *pNetCfg,
-                          IN LPCWSTR pszwClientDescription,
-                          IN DWORD cmsTimeout,
-                          OUT LPWSTR *ppszwClientDescription)
+                                        IN LPCWSTR pszwClientDescription,
+                                        IN DWORD cmsTimeout,
+                                        OUT LPWSTR *ppszwClientDescription)
 {
     INetCfgLock *pLock;
     HRESULT hr = pNetCfg->QueryInterface(IID_INetCfgLock, (PVOID*)&pLock);
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": QueryInterface failed, hr (0x%x)\n", hr);
+    if (FAILED(hr))
+    {
+        LogFlow(("QueryInterface failed, hr (0x%x)\n", hr));
         return hr;
     }
 
     hr = pLock->AcquireWriteLock(cmsTimeout, pszwClientDescription, ppszwClientDescription);
-    Assert(hr == S_OK || hr == S_FALSE);
     if (hr == S_FALSE)
     {
-        Log(__FUNCTION__ ": write lock busy\n");
-    }
-    else if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": AcquireWriteLock failed hr (0x%x)\n", hr);
+        LogFlow(("Write lock busy\n"));
+    }
+    else if (FAILED(hr))
+    {
+        LogFlow(("AcquireWriteLock failed, hr (0x%x)\n", hr));
     }
 
@@ -89 +88 @@
     INetCfgLock *pLock;
     HRESULT hr = pNetCfg->QueryInterface(IID_INetCfgLock, (PVOID*)&pLock);
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": QueryInterface failed, hr (0x%x)\n", hr);
+    if (FAILED(hr))
+    {
+        LogFlow(("QueryInterface failed, hr (0x%x)\n", hr));
         return hr;
     }
 
     hr = pLock->ReleaseWriteLock();
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": ReleaseWriteLock failed hr (0x%x)\n", hr);
-    }
+    if (FAILED(hr))
+        LogFlow(("ReleaseWriteLock failed, hr (0x%x)\n", hr));
 
     pLock->Release();
@@ -108 +103 @@
 
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinQueryINetCfg(OUT INetCfg **ppNetCfg,
-                          IN BOOL fGetWriteLock,
-                          IN LPCWSTR pszwClientDescription,
-                          IN DWORD cmsTimeout,
-                          OUT LPWSTR *ppszwClientDescription)
+                                                      IN BOOL fGetWriteLock,
+                                                      IN LPCWSTR pszwClientDescription,
+                                                      IN DWORD cmsTimeout,
+                                                      OUT LPWSTR *ppszwClientDescription)
 {
     INetCfg *pNetCfg;
     HRESULT hr = CoCreateInstance(CLSID_CNetCfg, NULL, CLSCTX_INPROC_SERVER, IID_INetCfg, (PVOID*)&pNetCfg);
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": CoCreateInstance failed, hr (0x%x)\n", hr);
+    if (FAILED(hr))
+    {
+        LogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -125 +119 @@
     {
         hr = vboxNetCfgWinINetCfgLock(pNetCfg, pszwClientDescription, cmsTimeout, ppszwClientDescription);
-        Assert(hr == S_OK || hr == S_FALSE);
         if (hr == S_FALSE)
         {
-            Log(__FUNCTION__ ": write lock is busy\n", hr);
+            LogFlow(("Write lock is busy\n", hr));
             hr = NETCFG_E_NO_WRITE_LOCK;
         }
     }
 
-    if (hr == S_OK)
+    if (SUCCEEDED(hr))
     {
         hr = pNetCfg->Initialize(NULL);
-        Assert(hr == S_OK);
-        if (hr == S_OK)
+        if (SUCCEEDED(hr))
         {
             *ppNetCfg = pNetCfg;
@@ -143 +135 @@
         }
         else
-        {
-            Log(__FUNCTION__ ": Initialize failed, hr (0x%x)\n", hr);
-        }
+            LogFlow(("Initialize failed, hr (0x%x)\n", hr));
     }
 
@@ -155 +145 @@
 {
     HRESULT hr = pNetCfg->Uninitialize();
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": Uninitialize failed, hr (0x%x)\n", hr);
+    if (FAILED(hr))
+    {
+        LogFlow(("Uninitialize failed, hr (0x%x)\n", hr));
         return hr;
     }
@@ -165 +154 @@
     {
         hr = vboxNetCfgWinINetCfgUnlock(pNetCfg);
-        Assert(hr == S_OK);
-        if (hr != S_OK)
-        {
-            Log(__FUNCTION__ ": vboxNetCfgWinINetCfgUnlock failed, hr (0x%x)\n", hr);
-        }
+        if (FAILED(hr))
+            LogFlow(("vboxNetCfgWinINetCfgUnlock failed, hr (0x%x)\n", hr));
     }
 
@@ -176 +162 @@
 }
 
-static HRESULT vboxNetCfgWinGetComponentByGuidEnum(IEnumNetCfgComponent *pEnumNcc, IN const GUID * pGuid, OUT INetCfgComponent ** ppNcc)
-{
-    INetCfgComponent * pNcc;
-    GUID NccGuid;
-
+static HRESULT vboxNetCfgWinGetComponentByGuidEnum(IEnumNetCfgComponent *pEnumNcc,
+                                                   IN const GUID *pGuid,
+                                                   OUT INetCfgComponent **ppNcc)
+{
     HRESULT hr = pEnumNcc->Reset();
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__": Reset failed, hr (0x%x)\n", hr);
+    if (FAILED(hr))
+    {
+        LogFlow(("Reset failed, hr (0x%x)\n", hr));
         return hr;
     }
 
+    INetCfgComponent *pNcc;
     while ((hr = pEnumNcc->Next(1, &pNcc, NULL)) == S_OK)
     {
         ULONG uComponentStatus;
         hr = pNcc->GetDeviceStatus(&uComponentStatus);
-        if (hr == S_OK)
+        if (SUCCEEDED(hr))
         {
             if (uComponentStatus == 0)
             {
+                GUID NccGuid;
                 hr = pNcc->GetInstanceGuid(&NccGuid);
-                Assert(hr == S_OK);
-                if (hr == S_OK)
+
+                if (SUCCEEDED(hr))
                 {
                     if (NccGuid == *pGuid)
@@ -209 +195 @@
                 }
                 else
-                {
-                    Log(__FUNCTION__": GetInstanceGuid failed, hr (0x%x)\n", hr);
-                }
+                    LogFlow(("GetInstanceGuid failed, hr (0x%x)\n", hr));
             }
         }
@@ -217 +201 @@
         pNcc->Release();
     }
-
-    Assert(hr == S_OK || hr == S_FALSE);
-    return hr;
-}
-
-VBOXNETCFGWIN_DECL(HRESULT)
-VBoxNetCfgWinGetComponentByGuid(IN INetCfg *pNc,
-                                IN const GUID *pguidClass,
-                                IN const GUID * pComponentGuid,
-                                OUT INetCfgComponent **ppncc)
+    return hr;
+}
+
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGetComponentByGuid(IN INetCfg *pNc,
+                                                            IN const GUID *pguidClass,
+                                                            IN const GUID * pComponentGuid,
+                                                            OUT INetCfgComponent **ppncc)
 {
     IEnumNetCfgComponent *pEnumNcc;
     HRESULT hr = pNc->EnumComponents(pguidClass, &pEnumNcc);
-    Assert(hr == S_OK);
-    if (hr == S_OK)
+
+    if (SUCCEEDED(hr))
     {
         hr = vboxNetCfgWinGetComponentByGuidEnum(pEnumNcc, pComponentGuid, ppncc);
-        Assert(hr == S_OK || hr == S_FALSE);
         if (hr == S_FALSE)
         {
-            Log(__FUNCTION__": component not found \n");
-        }
-        else if (hr != S_OK)
-        {
-            Log(__FUNCTION__": vboxNetCfgWinGetComponentByGuidEnum failed, hr (0x%x)\n", hr);
+            LogFlow(("Component not found\n"));
+        }
+        else if (FAILED(hr))
+        {
+            LogFlow(("vboxNetCfgWinGetComponentByGuidEnum failed, hr (0x%x)\n", hr));
         }
         pEnumNcc->Release();
     }
     else
-    {
-        Log(__FUNCTION__": EnumComponents failed, hr (0x%x)\n", hr);
-    }
+        LogFlow(("EnumComponents failed, hr (0x%x)\n", hr));
     return hr;
 }
@@ -255 +233 @@
 {
     HRESULT hr = pNetCfg->QueryNetCfgClass(pguidClass, IID_INetCfgClassSetup, (void**)ppSetup);
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": QueryNetCfgClass failed hr (0x%x)\n", hr);
-    }
+    if (FAILED(hr))
+        LogFlow(("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)
+                                                          OUT INetCfgComponent **ppComponent)
 {
     INetCfgClassSetup *pSetup;
     HRESULT hr = vboxNetCfgWinQueryInstaller(pNetCfg, pguidClass, &pSetup);
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": vboxNetCfgWinQueryInstaller failed hr (0x%x)\n", hr);
+    if (FAILED(hr))
+    {
+        LogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr));
         return hr;
     }
 
     OBO_TOKEN Token;
-    memset(&Token, 0, sizeof (Token));
+    ZeroMemory(&Token, sizeof (Token));
     Token.Type = OBO_USER;
 
     hr = pSetup->Install(pszwComponentId, &Token,
-            0,    /* IN DWORD dwSetupFlags */
-            0,    /* IN DWORD dwUpgradeFromBuildNo */
-            NULL, /* IN LPCWSTR pszwAnswerFile */
-            NULL, /* IN LPCWSTR pszwAnswerSections */
-            ppComponent);
-    Assert(hr == S_OK);
-    if (hr == S_OK)
+                         0,    /* IN DWORD dwSetupFlags */
+                         0,    /* IN DWORD dwUpgradeFromBuildNo */
+                         NULL, /* IN LPCWSTR pszwAnswerFile */
+                         NULL, /* IN LPCWSTR pszwAnswerSections */
+                         ppComponent);
+    if (SUCCEEDED(hr))
     {
         /* ignore the apply failure */
@@ -292 +265 @@
         Assert(tmpHr == S_OK);
         if (tmpHr != S_OK)
-        {
-            Log(__FUNCTION__ ": Apply failed, hr (0x%x)\n", tmpHr);
-        }
+            LogFlow(("Apply failed, hr (0x%x)\n", tmpHr));
     }
     else
-    {
-        Log(__FUNCTION__ ": Install failed hr (0x%x)\n", hr);
-    }
+        LogFlow(("Install failed, hr (0x%x)\n", hr));
+
     pSetup->Release();
     return hr;
@@ -305 +275 @@
 
 VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinInstallInfAndComponent(IN INetCfg *pNetCfg, IN LPCWSTR pszwComponentId, IN const GUID *pguidClass,
-        IN LPCWSTR * apInfPaths, IN UINT cInfPaths,
-        OUT INetCfgComponent **ppComponent)
+                                                                IN LPCWSTR * apInfPaths, IN UINT cInfPaths,
+                                                                OUT INetCfgComponent **ppComponent)
 {
     HRESULT hr = S_OK;
     UINT i = 0;
 
+    LogFlow(("Installing %u INF files ...\n", cInfPaths));
+
     for (; i < cInfPaths; i++)
     {
+        LogFlow(("Installing INF file \"%ws\" ...\n", apInfPaths[i]));
         hr = VBoxDrvCfgInfInstall(apInfPaths[i]);
-        Assert(hr == S_OK);
-        if (hr != S_OK)
-        {
-            Log(__FUNCTION__ ": VBoxNetCfgWinInfInstall failed hr (0x%x)\n", hr);
+        if (FAILED(hr))
+        {
+            LogFlow(("VBoxNetCfgWinInfInstall failed, hr (0x%x)\n", hr));
             break;
         }
     }
 
-    if (hr == S_OK)
+    if (SUCCEEDED(hr))
     {
         hr = VBoxNetCfgWinInstallComponent(pNetCfg, pszwComponentId, pguidClass, ppComponent);
-        Assert(hr == S_OK);
-        if (hr != S_OK)
-        {
-            Log(__FUNCTION__ ": VBoxNetCfgWinInstallComponent failed hr (0x%x)\n", hr);
-        }
-    }
-
-    if (hr != S_OK)
-    {
-        for (UINT j = i-1; j != 0; j--)
-        {
+        if (FAILED(hr))
+            LogFlow(("VBoxNetCfgWinInstallComponent failed, hr (0x%x)\n", hr));
+    }
+
+    if (FAILED(hr))
+    {
+        for (UINT j = i - 1; j != 0; j--)
             VBoxDrvCfgInfUninstall(apInfPaths[j], 0);
-        }
     }
 
@@ -347 +314 @@
     GUID GuidClass;
     HRESULT hr = pComponent->GetClassGuid(&GuidClass);
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": GetClassGuid failed hr (0x%x)\n", hr);
+    if (FAILED(hr))
+    {
+        LogFlow(("GetClassGuid failed, hr (0x%x)\n", hr));
         return hr;
     }
 
-    INetCfgClassSetup *pSetup;
+    INetCfgClassSetup *pSetup = NULL;
     hr = vboxNetCfgWinQueryInstaller(pNetCfg, &GuidClass, &pSetup);
-    Assert(hr == S_OK);
-    if (hr != S_OK)
-    {
-        Log(__FUNCTION__ ": vboxNetCfgWinQueryInstaller failed hr (0x%x)\n", hr);
+    if (FAILED(hr))
+    {
+        LogFlow(("vboxNetCfgWinQueryInstaller failed, hr (0x%x)\n", hr));
         return hr;
     }
 
     OBO_TOKEN Token;
-    memset(&Token, 0, sizeof (Token));
+    ZeroMemory(&Token, sizeof(Token));
     Token.Type = OBO_USER;
 
     hr = pSetup->DeInstall(pComponent, &Token, NULL /* OUT LPWSTR *pmszwRefs */);
-    Assert(hr == S_OK);
-    if (hr == S_OK)
-    {
-        HRESULT tmpHr = pNetCfg->Apply();
-        Assert(tmpHr == S_OK);
-        if (tmpHr != S_OK)
-        {
-            Log(__FUNCTION__ ": Apply failed, hr (0x%x)\n", tmpHr);
-        }
+    if (SUCCEEDED(hr))
+    {
+        hr = pNetCfg->Apply();
+        if (FAILED(hr))
+            LogFlow(("Apply failed, hr (0x%x)\n", hr));
     }
     else
-    {
-        Log(__FUNCTION__ ": DeInstall failed hr (0x%x)\n", hr);
-    }
-    pSetup->Release();
-    return hr;
-}
-
-typedef BOOL (*VBOXNETCFGWIN_NETCFGENUM_CALLBACK) (IN INetCfg *pNc, IN INetCfgComponent *pNcc, PVOID pContext);
-
-static HRESULT vboxNetCfgWinEnumNetCfgComponents(IN INetCfg *pNc,
-        IN const GUID *pguidClass,
-        VBOXNETCFGWIN_NETCFGENUM_CALLBACK callback,
-        PVOID pContext)
+        LogFlow(("DeInstall failed, hr (0x%x)\n", hr));
+
+    if (pSetup)
+        pSetup->Release();
+    return hr;
+}
+
+typedef BOOL (*VBOXNETCFGWIN_NETCFGENUM_CALLBACK) (IN INetCfg *pNetCfg, IN INetCfgComponent *pNetCfgComponent, PVOID pContext);
+
+static HRESULT vboxNetCfgWinEnumNetCfgComponents(IN INetCfg *pNetCfg,
+                                                 IN const GUID *pguidClass,
+                                                 VBOXNETCFGWIN_NETCFGENUM_CALLBACK callback,
+                                                 PVOID pContext)
 {
     IEnumNetCfgComponent *pEnumComponent;
-    HRESULT hr = pNc->EnumComponents(pguidClass, &pEnumComponent);
-    bool bBreak = false;
-    Assert(hr == S_OK);
-    if (hr == S_OK)
-    {
-        INetCfgComponent *pNcc;
+    HRESULT hr = pNetCfg->EnumComponents(pguidClass, &pEnumComponent);
+    if (SUCCEEDED(hr))
+    {
+        INetCfgComponent *pNetCfgComponent;
         hr = pEnumComponent->Reset();
-        Assert(hr == S_OK);
         do
         {
-            hr = pEnumComponent->Next(1, &pNcc, NULL);
-            Assert(hr == S_OK || hr == S_FALSE);
-            if (hr == S_OK)
+            hr = pEnumComponent->Next(1, &pNetCfgComponent, NULL);
+            if (SUCCEEDED(hr))
             {
 //                ULONG uComponentStatus;
 //                hr = pNcc->GetDeviceStatus(&uComponentStatus);
-//                if (hr == S_OK)
-                {
-                    if (!callback(pNc, pNcc, pContext))
-                    {
-                        bBreak = true;
-                    }
-                }
-                pNcc->Release();
+//                if (SUCCEEDED(hr))
+                BOOL fResult = FALSE;
+                if (pNetCfgComponent)
+                {
+                    if (pContext)
+                        fResult = callback(pNetCfg, pNetCfgComponent, pContext);
+                    pNetCfgComponent->Release();
+                }
+
+                if (!fResult)
+                    break;
             }
             else
             {
-                if (hr ==S_FALSE)
+                if (hr == S_FALSE)
                 {
                     hr = S_OK;
                 }
                 else
-                {
-                    Log(__FUNCTION__": Next failed, hr (0x%x)\n", hr);
-                }
+                    LogFlow(("Next failed, hr (0x%x)\n", hr));
                 break;
             }
-        } while (!bBreak);
-
+        } while (true);
         pEnumComponent->Release();
     }
@@ -440 +397 @@
 static BOOL vboxNetCfgWinRemoveAllNetDevicesOfIdCallback(HDEVINFO hDevInfo, PSP_DEVINFO_DATA pDev, PVOID pContext)
 {
-    DWORD winEr;
     HRESULT hr = S_OK;
     SP_REMOVEDEVICE_PARAMS rmdParams;
+
     rmdParams.ClassInstallHeader.cbSize = sizeof(SP_CLASSINSTALL_HEADER);
     rmdParams.ClassInstallHeader.InstallFunction = DIF_REMOVE;
     rmdParams.Scope = DI_REMOVEDEVICE_GLOBAL;
     rmdParams.HwProfile = 0;
+
     if (SetupDiSetClassInstallParams(hDevInfo,pDev,&rmdParams.ClassInstallHeader,sizeof(rmdParams)))
     {
@@ -460 +418 @@
                     {
                         hr = S_FALSE;
-                        Log(__FUNCTION__": !!!REBOOT REQUIRED!!!\n");
+                        Log(("!!!REBOOT REQUIRED!!!\n"));
                     }
                 }
@@ -466 +424 @@
             else
             {
-                winEr = GetLastError();
-                Log(__FUNCTION__": SetupDiCallClassInstaller failed winErr(%d)\n", winEr);
-                hr = HRESULT_FROM_WIN32(winEr);
+                DWORD dwErr = GetLastError();
+                LogFlow(("SetupDiCallClassInstaller failed with %ld\n", dwErr));
+                hr = HRESULT_FROM_WIN32(dwErr);
             }
         }
         else
         {
-            winEr = GetLastError();
-            Log(__FUNCTION__": SetupDiSetSelectedDevice failed winErr(%d)\n", winEr);
-            hr = HRESULT_FROM_WIN32(winEr);
+            DWORD dwErr = GetLastError();
+            LogFlow(("SetupDiSetSelectedDevice failed with %ld\n", dwErr));
+            hr = HRESULT_FROM_WIN32(dwErr);
         }
     }
     else
     {
-        winEr = GetLastError();
-        Log(__FUNCTION__": SetupDiSetClassInstallParams failed winErr(%d)\n", winEr);
-        hr = HRESULT_FROM_WIN32(winEr);
+        DWORD dwErr = GetLastError();
+        LogFlow(("SetupDiSetClassInstallParams failed with %ld\n", dwErr));
+        hr = HRESULT_FROM_WIN32(dwErr);
     }
 
@@ -528 +486 @@
                 if (winEr != ERROR_INSUFFICIENT_BUFFER)
                 {
-                    Log(__FUNCTION__": SetupDiGetDeviceRegistryPropertyW (1) failed winErr(%d)\n", winEr);
+                    LogFlow(("SetupDiGetDeviceRegistryPropertyW (1) failed winErr(%d)\n", winEr));
                     hr = HRESULT_FROM_WIN32(winEr);
                     break;
@@ -534 +492 @@
 
                 if (pBuffer)
-                {
                     free(pBuffer);
-                }
 
                 pBuffer = (PBYTE)malloc(cbRequired);
@@ -542 +498 @@
 
                 if (!SetupDiGetDeviceRegistryPropertyW(hDevInfo,&Dev,
-                          SPDRP_HARDWAREID, /* IN DWORD Property,*/
-                          NULL, /*OUT PDWORD PropertyRegDataType, OPTIONAL*/
-                          pBuffer, /*OUT PBYTE PropertyBuffer,*/
-                          cbBuffer, /* IN DWORD PropertyBufferSize,*/
-                          &cbRequired /*OUT PDWORD RequiredSize OPTIONAL*/
-                        ))
+                                                       SPDRP_HARDWAREID, /* IN DWORD Property,*/
+                                                       NULL, /*OUT PDWORD PropertyRegDataType, OPTIONAL*/
+                                                       pBuffer, /*OUT PBYTE PropertyBuffer,*/
+                                                       cbBuffer, /* IN DWORD PropertyBufferSize,*/
+                                                       &cbRequired /*OUT PDWORD RequiredSize OPTIONAL*/
+                                                       ))
                 {
                     winEr = GetLastError();
-                    Log(__FUNCTION__": SetupDiGetDeviceRegistryPropertyW (2) failed winErr(%d)\n", winEr);
+                    LogFlow(("SetupDiGetDeviceRegistryPropertyW (2) failed winErr(%d)\n", winEr));
                     hr = HRESULT_FROM_WIN32(winEr);
                     break;
@@ -585 +541 @@
     {
         DWORD winEr = GetLastError();
-        Log(__FUNCTION__": SetupDiGetClassDevsExW failed winErr(%d)\n", winEr);
+        LogFlow(("SetupDiGetClassDevsExW failed winErr(%d)\n", winEr));
         hr = HRESULT_FROM_WIN32(winEr);
     }
@@ -868 +824 @@
         }
         else
-        {
-            Log(__FUNCTION__": ExecQuery fail hr (0x%x)\n", hr);
-        }
+            LogFlow(("ExecQuery failed (0x%x)\n", hr));
     }
     else
     {
         DWORD winEr = GetLastError();
-        Log(__FUNCTION__": StringFromGUID2 fail winEr (%d)\n", winEr);
+        LogFlow(("StringFromGUID2 failed winEr (%d)\n", winEr));
         hr = HRESULT_FROM_WIN32( winEr );
     }
@@ -1002 +956 @@
                         {
                             if (!wcsicmp(pCurMask, pMask))
-                            {
                                 *pFound = true;
-                            }
                             break;
                         }
@@ -1076 +1028 @@
             }
             else
-            {
-                Log(__FUNCTION__": CoSetProxyBlanket failed hr (0x%x)\n", hr);
-            }
+                LogFlow(("CoSetProxyBlanket failed, hr (0x%x)\n", hr));
 
             pSvc->Release();
         }
         else
-        {
-            Log(__FUNCTION__": ConnectServer failed hr (0x%x)\n", hr);
-        }
-
+            LogFlow(("ConnectServer failed, hr (0x%x)\n", hr));
         pLoc->Release();
     }
     else
-    {
-        Log(__FUNCTION__": CoCreateInstance failed hr (0x%x)\n", hr);
-    }
-
+        LogFlow(("CoCreateInstance failed, hr (0x%x)\n", hr));
     return hr;
 }
@@ -1108 +1052 @@
     }
     else
-    {
-        DWORD winEr = GetLastError();
-        Log(__FUNCTION__": Get failed winEr (%d)\n", winEr);
-        Assert(0);
-        hr = HRESULT_FROM_WIN32(winEr);
-    }
+        LogFlow(("Get failed, hr (0x%x)\n", hr));
     return hr;
 }
@@ -1139 +1078 @@
                         pArgs[i], 0);
                     if (FAILED(hr))
-                    {
                         break;
-                    }
                 }
             }
@@ -1187 +1124 @@
     }
     else
-    {
-        DWORD dwError = GetLastError();
-        Assert(0);
-        hr = HRESULT_FROM_WIN32( dwError );
-    }
+        hr = HRESULT_FROM_WIN32(GetLastError());
 
     return hr;
@@ -1218 +1151 @@
     }
     else
-    {
-        DWORD dwError = GetLastError();
-        Assert(0);
-        hr = HRESULT_FROM_WIN32( dwError );
-    }
+        hr = HRESULT_FROM_WIN32(GetLastError());
 
     return hr;
@@ -1300 +1229 @@
     }
     else
-    {
-        DWORD winEr = GetLastError();
-        Assert(0);
-        hr = HRESULT_FROM_WIN32(winEr);
-    }
+        hr = HRESULT_FROM_WIN32(GetLastError());
 
     return hr;
@@ -1381 +1306 @@
                     }
                 }
-            }        }
+            }
+        }
         SysFreeString(ClassName);
     }
     else
-    {
-        DWORD dwError = GetLastError();
-        Assert(0);
-        hr = HRESULT_FROM_WIN32( dwError );
-    }
+        hr = HRESULT_FROM_WIN32(GetLastError());
 
     return hr;
@@ -1458 +1380 @@
     }
     else
-    {
-        DWORD dwError = GetLastError();
-        Assert(0);
-        hr = HRESULT_FROM_WIN32( dwError );
-    }
+        hr = HRESULT_FROM_WIN32(GetLastError());
 
     return hr;
@@ -1502 +1420 @@
                                 int winEr = varReturnValue.uintVal;
                                 if (winEr == 0)
-                                {
                                     hr = S_OK;
-                                }
                                 else
-                                {
                                     hr = HRESULT_FROM_WIN32( winEr );
-                                }
                             }
                         }
                     }
                     else
-                    {
                         hr = HRESULT_FROM_WIN32( winEr );
-                    }
                 }
             }
@@ -1522 +1434 @@
     }
     else
-    {
-        DWORD dwError = GetLastError();
-        Assert(0);
-        hr = HRESULT_FROM_WIN32(dwError);
-    }
+        hr = HRESULT_FROM_WIN32(GetLastError());
 
     return hr;
@@ -1536 +1444 @@
     HRESULT hr = pAdapterConfig->Get(L"DHCPEnabled", 0, &vtEnabled, 0, 0);
     if (SUCCEEDED(hr))
-    {
         *pEnabled = vtEnabled.boolVal;
-    }
     return hr;
 }
@@ -1551 +1457 @@
         ComPtr <IWbemClassObject> pAdapterConfig;
         hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam());
-        if (hr == S_OK)
+        if (SUCCEEDED(hr))
         {
             hr = vboxNetCfgWinIsDhcpEnabled(pAdapterConfig, &pSettings->bDhcp);
             if (SUCCEEDED(hr))
-            {
                 hr = netIfWinGetIpSettings(pAdapterConfig, &pSettings->ip, &pSettings->mask);
-            }
         }
     }
@@ -1573 +1477 @@
             ComPtr <IWbemClassObject> pAdapterConfig;
             hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam());
-            if (hr == S_OK)
+            if (SUCCEEDED(hr))
             {
                 VARIANT vtEnabled;
                 hr = pAdapterConfig->Get(L"DHCPEnabled", 0, &vtEnabled, 0, 0);
                 if (SUCCEEDED(hr))
-                {
                     *pEnabled = vtEnabled.boolVal;
-                }
             }
         }
@@ -1596 +1498 @@
             ComPtr <IWbemClassObject> pAdapterConfig;
             hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam());
-            if (hr == S_OK)
+            if (SUCCEEDED(hr))
             {
                 BOOL bIsHostOnly;
@@ -1649 +1551 @@
             ComPtr <IWbemClassObject> pAdapterConfig;
             hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam());
-            if (hr == S_OK)
+            if (SUCCEEDED(hr))
             {
                 BSTR ObjPath;
@@ -1697 +1599 @@
             ComPtr <IWbemClassObject> pAdapterConfig;
             hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam());
-            if (hr == S_OK)
+            if (SUCCEEDED(hr))
             {
                 BOOL bIsHostOnly;
@@ -1738 +1640 @@
             ComPtr <IWbemClassObject> pAdapterConfig;
             hr = netIfWinFindAdapterClassById(pSvc, pGuid, pAdapterConfig.asOutParam());
-            if (hr == S_OK)
+            if (SUCCEEDED(hr))
             {
                 BOOL bIsHostOnly;
@@ -1902 +1804 @@
     }
     else
-    {
-        Log(__FUNCTION__": GetAdaptersAddresses err (%d)\n", dwRc);
-    }
-    free(pAddresses);
+        LogFlow(("GetAdaptersAddresses err (%d)\n", dwRc));
+
+    if (pAddresses)
+        free(pAddresses);
 
     if (dwRc != NO_ERROR)
@@ -1927 +1829 @@
     if (hr == S_OK)
     {
-        Log("NetFlt Is Installed currently\n");
+        Log("NetFlt is installed currently, uninstalling ...\n");
 
         hr = VBoxNetCfgWinUninstallComponent(pNc, pNcc);
@@ -1935 +1837 @@
     else if (hr == S_FALSE)
     {
-        Log("NetFlt Is Not Installed currently\n");
+        Log("NetFlt is not installed currently\n");
         hr = S_OK;
     }
     else
     {
-        Log("vboxNetCfgWinNetFltUninstall: FindComponent for NetFlt failed, hr (0x%x)\n", hr);
+        LogFlow(("FindComponent failed, hr (0x%x)\n", hr));
         hr = S_OK;
     }
@@ -1950 +1852 @@
 }
 
-VBOXNETCFGWIN_DECL(HRESULT)
-VBoxNetCfgWinNetFltUninstall(IN INetCfg *pNc)
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetFltUninstall(IN INetCfg *pNc)
 {
     return vboxNetCfgWinNetFltUninstall(pNc, 0);
 }
 
-VBOXNETCFGWIN_DECL(HRESULT)
-VBoxNetCfgWinNetFltInstall(IN INetCfg *pNc, IN LPCWSTR * apInfFullPaths, IN UINT cInfFullPaths)
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinNetFltInstall(IN INetCfg *pNc,
+                                                       IN LPCWSTR * apInfFullPaths, IN UINT cInfFullPaths)
 {
     HRESULT hr = vboxNetCfgWinNetFltUninstall(pNc, SUOI_FORCEDELETE);
-
-    hr = VBoxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETFLT_ID,
-                                     &GUID_DEVCLASS_NETSERVICE,
-                                     apInfFullPaths,
-                                     cInfFullPaths,
-                                     NULL);
-
+    if (SUCCEEDED(hr))
+    {
+        Log("NetFlt will be installed ...\n");
+        hr = VBoxNetCfgWinInstallInfAndComponent(pNc, VBOXNETCFGWIN_NETFLT_ID,
+                                                 &GUID_DEVCLASS_NETSERVICE,
+                                                 apInfFullPaths,
+                                                 cInfFullPaths,
+                                                 NULL);
+    }
     return hr;
 }
 
 #define VBOX_CONNECTION_NAME L"VirtualBox Host-Only Network"
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGenHostonlyConnectionName (PCWSTR DevName, WCHAR *pBuf, PULONG pcbBuf)
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinGenHostonlyConnectionName(PCWSTR DevName, WCHAR *pBuf, PULONG pcbBuf)
 {
     const WCHAR * pSuffix = wcsrchr( DevName, L'#' );
@@ -1999 +1902 @@
 }
 
-static BOOL vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority (IN INetCfg *pNc, IN INetCfgComponent *pNcc, PVOID pContext)
-{
-    INetCfgComponentBindings *pNccb = NULL;
-    IEnumNetCfgBindingPath  *pEnumNccbp;
+static BOOL vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority(IN INetCfg *pNc, IN INetCfgComponent *pNcc, PVOID pContext)
+{
+    INetCfgComponentBindings *pNetCfgBindings;
     GUID *pGuid = (GUID*)pContext;
-    HRESULT hr;
-    bool bFound = false;
 
     /* Get component's binding. */
-    hr = pNcc->QueryInterface(IID_INetCfgComponentBindings, (PVOID*)&pNccb);
-    Assert(hr == S_OK);
-    if ( hr == S_OK )
+    HRESULT hr = pNcc->QueryInterface(IID_INetCfgComponentBindings, (PVOID*)&pNetCfgBindings);
+    if (SUCCEEDED(hr))
     {
         /* Get binding path enumerator reference. */
-        hr = pNccb->EnumBindingPaths(EBP_BELOW, &pEnumNccbp);
-        Assert(hr == S_OK);
-        if (hr == S_OK)
-        {
-            INetCfgBindingPath *pNccbp;
-            hr = pEnumNccbp->Reset();
-            Assert(hr == S_OK);
+        IEnumNetCfgBindingPath *pEnumNetCfgBindPath;
+        hr = pNetCfgBindings->EnumBindingPaths(EBP_BELOW, &pEnumNetCfgBindPath);
+        if (SUCCEEDED(hr))
+        {
+            bool bFoundIface = false;
+            hr = pEnumNetCfgBindPath->Reset();
             do
             {
-                hr = pEnumNccbp->Next(1, &pNccbp, NULL);
-                Assert(hr == S_OK || hr == S_FALSE);
+                INetCfgBindingPath *pNetCfgBindPath;
+                hr = pEnumNetCfgBindPath->Next(1, &pNetCfgBindPath, NULL);
                 if (hr == S_OK)
                 {
-//                   if (pNccbp->IsEnabled() == S_OK)
+                    IEnumNetCfgBindingInterface *pEnumNetCfgBindIface;
+                    hr = pNetCfgBindPath->EnumBindingInterfaces(&pEnumNetCfgBindIface);
+                    if (hr == S_OK)
                     {
-                        IEnumNetCfgBindingInterface *pEnumNcbi;
-                        hr = pNccbp->EnumBindingInterfaces(&pEnumNcbi);
-                        Assert(hr == S_OK);
-                        if (hr == S_OK)
+                        pEnumNetCfgBindIface->Reset();
+                        do
                         {
-                            INetCfgBindingInterface *pNcbi;
-                            hr = pEnumNcbi->Reset();
-                            Assert(hr == S_OK);
-                            do
+                            INetCfgBindingInterface *pNetCfgBindIfce;
+                            hr = pEnumNetCfgBindIface->Next(1, &pNetCfgBindIfce, NULL);
+                            if (hr == S_OK)
                             {
-                                hr = pEnumNcbi->Next(1, &pNcbi, NULL);
-                                Assert(hr == S_OK || hr == S_FALSE);
+                                INetCfgComponent *pNetCfgCompo;
+                                hr = pNetCfgBindIfce->GetLowerComponent(&pNetCfgCompo);
                                 if (hr == S_OK)
                                 {
-                                    INetCfgComponent * pNccBoud;
-                                    hr = pNcbi->GetLowerComponent(&pNccBoud);
-                                    Assert(hr == S_OK);
+                                    ULONG uComponentStatus;
+                                    hr = pNetCfgCompo->GetDeviceStatus(&uComponentStatus);
                                     if (hr == S_OK)
                                     {
-                                        ULONG uComponentStatus;
-                                        hr = pNccBoud->GetDeviceStatus(&uComponentStatus);
-                                        if (hr == S_OK)
+                                        GUID guid;
+                                        hr = pNetCfgCompo->GetInstanceGuid(&guid);
+                                        if (   hr == S_OK
+                                            && guid == *pGuid)
                                         {
-//                                            if (uComponentStatus == 0)
-                                            {
-                                                GUID guid;
-                                                hr = pNccBoud->GetInstanceGuid(&guid);
-                                                if (guid == *pGuid)
-                                                {
-                                                    hr = pNccb->MoveAfter(pNccbp, NULL);
-                                                    Assert(hr == S_OK);
-                                                    bFound = true;
-                                                }
-                                            }
+                                            hr = pNetCfgBindings->MoveAfter(pNetCfgBindPath, NULL);
+                                            if (FAILED(hr))
+                                                LogFlow(("Unable to move interface, hr (0x%x)\n", hr));
+                                            bFoundIface = true;
                                         }
-                                        pNccBoud->Release();
                                     }
-                                    pNcbi->Release();
+                                    pNetCfgCompo->Release();
                                 }
                                 else
-                                {
-                                    if (hr == S_FALSE)
-                                    {
-                                        hr = S_OK;
-                                    }
-                                    else
-                                    {
-                                        Log(__FUNCTION__": Next failed, hr (0x%x)\n", hr);
-                                    }
-                                    break;
-                                }
-                            } while (!bFound);
-                            pEnumNcbi->Release();
-                        }
-                        else
-                        {
-                            Log(__FUNCTION__": EnumBindingInterfaces failed, hr (0x%x)\n", hr);
-                        }
-                    }
-
-                    pNccbp->Release();
-                }
-                else
-                {
-                    if (hr = S_FALSE)
-                    {
-                        hr = S_OK;
+                                    LogFlow(("GetLowerComponent failed, hr (0x%x)\n", hr));
+                                pNetCfgBindIfce->Release();
+                            }
+                            else
+                            {
+                                if (hr == S_FALSE) /* No more binding interfaces? */
+                                    hr = S_OK;
+                                else
+                                    LogFlow(("Next binding interface failed, hr (0x%x)\n", hr));
+                                break;
+                            }
+                        } while (!bFoundIface);
+                        pEnumNetCfgBindIface->Release();
                     }
                     else
-                    {
-                        Log(__FUNCTION__": Next failed, hr (0x%x)\n", hr);
-                    }
+                        LogFlow(("EnumBindingInterfaces failed, hr (0x%x)\n", hr));
+                    pNetCfgBindPath->Release();
+                }
+                else
+                {
+                    if (hr = S_FALSE) /* No more binding paths? */
+                        hr = S_OK;
+                    else
+                        LogFlow(("Next bind path failed, hr (0x%x)\n", hr));
                     break;
                 }
-            } while (!bFound);
-
-            pEnumNccbp->Release();
+            } while (!bFoundIface);
+            pEnumNetCfgBindPath->Release();
         }
         else
-        {
-            Log(__FUNCTION__": EnumBindingPaths failed, hr (0x%x)\n", hr);
-        }
-
-        pNccb->Release();
+            LogFlow(("EnumBindingPaths failed, hr (0x%x)\n", hr));
+        pNetCfgBindings->Release();
     }
     else
-    {
-        Log(__FUNCTION__": QueryInterface for IID_INetCfgComponentBindings failed, hr (0x%x)\n", hr);
-    }
-
-    return true;
+        LogFlow(("QueryInterface for IID_INetCfgComponentBindings failed, hr (0x%x)\n", hr));
+    return TRUE;
 }
 
@@ -2257 +2131 @@
         hrc = E_FAIL; \
         Log strAndArgs; \
-        Assert(0); \
         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 *pErrMsg)
 {
     HRESULT hrc = S_OK;
@@ -2467 +2339 @@
 }
 
-VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface (IN LPCWSTR pInfPath, IN bool bIsInfPathFile,
-        OUT GUID *pGuid, OUT BSTR *lppszName, OUT BSTR *pErrMsg)
+VBOXNETCFGWIN_DECL(HRESULT) VBoxNetCfgWinCreateHostOnlyNetworkInterface(IN LPCWSTR pInfPath, IN bool bIsInfPathFile,
+                                                                        OUT GUID *pGuid, OUT BSTR *lppszName, OUT BSTR *pErrMsg)
 {
     HRESULT hrc = S_OK;
@@ -2484 +2356 @@
     do
     {
-        BOOL ok;
         GUID netGuid;
         SP_DRVINFO_DATA DriverInfoData;
@@ -2508 +2379 @@
 
         /* create an empty device info set associated with the net class GUID */
-        hDeviceInfo = SetupDiCreateDeviceInfoList (&netGuid, NULL);
+        hDeviceInfo = SetupDiCreateDeviceInfoList(&netGuid, NULL);
         if (hDeviceInfo == INVALID_HANDLE_VALUE)
             SetErrBreak (("SetupDiCreateDeviceInfoList failed (0x%08X)",
@@ -2514 +2385 @@
 
         /* get the class name from GUID */
-        ok = SetupDiClassNameFromGuid (&netGuid, className, MAX_PATH, NULL);
-        if (!ok)
+        BOOL fResult = SetupDiClassNameFromGuid (&netGuid, className, MAX_PATH, NULL);
+        if (!fResult)
             SetErrBreak (("SetupDiClassNameFromGuid failed (0x%08X)",
                           GetLastError()));
@@ -2521 +2392 @@
         /* create a device info element and add the new device instance
          * key to registry */
-        ok = SetupDiCreateDeviceInfo (hDeviceInfo, className, &netGuid, NULL, NULL,
+        fResult = SetupDiCreateDeviceInfo (hDeviceInfo, className, &netGuid, NULL, NULL,
                                      DICD_GENERATE_ID, &DeviceInfoData);
-        if (!ok)
+        if (!fResult)
             SetErrBreak (("SetupDiCreateDeviceInfo failed (0x%08X)",
                           GetLastError()));
@@ -2529 +2400 @@
         /* select the newly created device info to be the currently
            selected member */
-        ok = SetupDiSetSelectedDevice (hDeviceInfo, &DeviceInfoData);
-        if (!ok)
+        fResult = SetupDiSetSelectedDevice (hDeviceInfo, &DeviceInfoData);
+        if (!fResult)
             SetErrBreak (("SetupDiSetSelectedDevice failed (0x%08X)",
                           GetLastError()));
@@ -2538 +2409 @@
             /* get the device install parameters and disable filecopy */
             DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
-            ok = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
+            fResult = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
                                                 &DeviceInstallParams);
-            if (ok)
+            if (fResult)
             {
                 memset(DeviceInstallParams.DriverPath, 0, sizeof(DeviceInstallParams.DriverPath));
@@ -2553 +2424 @@
                     }
 
-                    ok = SetupDiSetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
-                                                        &DeviceInstallParams);
-                    if (!ok)
+                    fResult = SetupDiSetDeviceInstallParams(hDeviceInfo, &DeviceInfoData,
+                                                       &DeviceInstallParams);
+                    if (!fResult)
                     {
                         DWORD winEr = GetLastError();
-                        Log("SetupDiSetDeviceInstallParams: SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr);
-                        Assert(0);
+                        LogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr));
                         break;
                     }
@@ -2565 +2435 @@
                 else
                 {
-                    Log("SetupDiSetDeviceInstallParams: inf path is too long\n");
-                    Assert(0);
+                    LogFlow(("SetupDiSetDeviceInstallParams faileed: INF path is too long\n"));
                     break;
                 }
@@ -2573 +2442 @@
             {
                 DWORD winEr = GetLastError();
-                Assert(0);
-                Log("VBoxNetCfgWinCreateHostOnlyNetworkInterface: SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr);
-            }
-
+                LogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr));
+            }
         }
 
         /* build a list of class drivers */
-        ok = SetupDiBuildDriverInfoList (hDeviceInfo, &DeviceInfoData,
-                                        SPDIT_CLASSDRIVER);
-        if (!ok)
+        fResult = SetupDiBuildDriverInfoList (hDeviceInfo, &DeviceInfoData,
+                                              SPDIT_CLASSDRIVER);
+        if (!fResult)
             SetErrBreak (("SetupDiBuildDriverInfoList failed (0x%08X)",
                           GetLastError()));
@@ -2647 +2514 @@
 
         if (!found)
-            SetErrBreak (("Could not find Host Interface Networking driver! "
-                              "Please reinstall"));
+            SetErrBreak(("Could not find Host Interface Networking driver! Please reinstall"));
 
         /* set the loopback driver to be the currently selected */
-        ok = SetupDiSetSelectedDriver (hDeviceInfo, &DeviceInfoData,
+        fResult = SetupDiSetSelectedDriver (hDeviceInfo, &DeviceInfoData,
                                        &DriverInfoData);
-        if (!ok)
-            SetErrBreak (("SetupDiSetSelectedDriver failed (0x%08X)",
-                          GetLastError()));
+        if (!fResult)
+            SetErrBreak(("SetupDiSetSelectedDriver failed (0x%08X)",
+                         GetLastError()));
 
         /* register the phantom device to prepare for install */
-        ok = SetupDiCallClassInstaller (DIF_REGISTERDEVICE, hDeviceInfo,
-                                        &DeviceInfoData);
-        if (!ok)
+        fResult = SetupDiCallClassInstaller (DIF_REGISTERDEVICE, hDeviceInfo,
+                                             &DeviceInfoData);
+        if (!fResult)
         {
             DWORD err = GetLastError();
@@ -2671 +2537 @@
 
         /* ask the installer if we can install the device */
-        ok = SetupDiCallClassInstaller (DIF_ALLOW_INSTALL, hDeviceInfo,
-                                        &DeviceInfoData);
-        if (!ok)
+        fResult = SetupDiCallClassInstaller (DIF_ALLOW_INSTALL, hDeviceInfo,
+                                             &DeviceInfoData);
+        if (!fResult)
         {
             if (GetLastError() != ERROR_DI_DO_DEFAULT)
@@ -2683 +2549 @@
         /* get the device install parameters and disable filecopy */
         DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
-        ok = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
-                                            &DeviceInstallParams);
-        if (ok)
+        fResult = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
+                                                 &DeviceInstallParams);
+        if (fResult)
         {
             pQueueCallbackContext = SetupInitDefaultQueueCallback(NULL);
@@ -2692 +2558 @@
                 DeviceInstallParams.InstallMsgHandlerContext = pQueueCallbackContext;
                 DeviceInstallParams.InstallMsgHandler = (PSP_FILE_CALLBACK)vboxNetCfgWinPspFileCallback;
-                ok = SetupDiSetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
+                fResult = SetupDiSetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
                                                     &DeviceInstallParams);
-                if (!ok)
+                if (!fResult)
                 {
                     DWORD winEr = GetLastError();
-                    Assert(0);
-                    Log("SetupDiSetDeviceInstallParams: SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr);
-                }
-                Assert(ok);
+                    LogFlow(("SetupDiSetDeviceInstallParams failed, winEr (%d)\n", winEr));
+                }
+                Assert(fResult);
             }
             else
             {
                 DWORD winEr = GetLastError();
-                Assert(0);
-                Log("VBoxNetCfgWinCreateHostOnlyNetworkInterface: SetupInitDefaultQueueCallback failed, winEr (%d)\n", winEr);
+                LogFlow(("SetupInitDefaultQueueCallback failed, winEr (%d)\n", winEr));
             }
         }
@@ -2712 +2576 @@
         {
             DWORD winEr = GetLastError();
-            Assert(0);
-            Log("VBoxNetCfgWinCreateHostOnlyNetworkInterface: SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr);
+            LogFlow(("SetupDiGetDeviceInstallParams failed, winEr (%d)\n", winEr));
         }
 
         /* install the files first */
-        ok = SetupDiCallClassInstaller (DIF_INSTALLDEVICEFILES, hDeviceInfo,
+        fResult = SetupDiCallClassInstaller (DIF_INSTALLDEVICEFILES, hDeviceInfo,
                                         &DeviceInfoData);
-        if (!ok)
+        if (!fResult)
             SetErrBreak (("SetupDiCallClassInstaller (DIF_INSTALLDEVICEFILES) failed (0x%08X)",
                           GetLastError()));
-
         /* get the device install parameters and disable filecopy */
         DeviceInstallParams.cbSize = sizeof(SP_DEVINSTALL_PARAMS);
-        ok = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
+        fResult = SetupDiGetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
                                             &DeviceInstallParams);
-        if (ok)
+        if (fResult)
         {
             DeviceInstallParams.Flags |= DI_NOFILECOPY;
-            ok = SetupDiSetDeviceInstallParams (hDeviceInfo, &DeviceInfoData,
-                                                &DeviceInstallParams);
-            if (!ok)
+            fResult = SetupDiSetDeviceInstallParams(hDeviceInfo, &DeviceInfoData,
+                                                    &DeviceInstallParams);
+            if (!fResult)
                 SetErrBreak (("SetupDiSetDeviceInstallParams failed (0x%08X)",
                               GetLastError()));
@@ -2740 +2602 @@
          * Register any device-specific co-installers for this device,
          */
-
-        ok = SetupDiCallClassInstaller (DIF_REGISTER_COINSTALLERS,
-                                        hDeviceInfo,
-                                        &DeviceInfoData);
-        if (!ok)
+        fResult = SetupDiCallClassInstaller(DIF_REGISTER_COINSTALLERS,
+                                            hDeviceInfo,
+                                            &DeviceInfoData);
+        if (!fResult)
             SetErrBreak (("SetupDiCallClassInstaller (DIF_REGISTER_COINSTALLERS) failed (0x%08X)",
                           GetLastError()));
@@ -2752 +2613 @@
          * and then do the real install
          */
-        ok = SetupDiCallClassInstaller (DIF_INSTALLINTERFACES,
-                                        hDeviceInfo,
-                                        &DeviceInfoData);
-        if (!ok)
+        fResult = SetupDiCallClassInstaller(DIF_INSTALLINTERFACES,
+                                            hDeviceInfo,
+                                            &DeviceInfoData);
+        if (!fResult)
             SetErrBreak (("SetupDiCallClassInstaller (DIF_INSTALLINTERFACES) failed (0x%08X)",
                           GetLastError()));
 
-        ok = SetupDiCallClassInstaller (DIF_INSTALLDEVICE,
-                                        hDeviceInfo,
-                                        &DeviceInfoData);
-        if (!ok)
+        fResult = SetupDiCallClassInstaller(DIF_INSTALLDEVICE,
+                                            hDeviceInfo,
+                                            &DeviceInfoData);
+        if (!fResult)
             SetErrBreak (("SetupDiCallClassInstaller (DIF_INSTALLDEVICE) failed (0x%08X)",
                           GetLastError()));
 
         /* 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)
             SetErrBreak (("SetupDiOpenDevRegKey failed (0x%08X)",
@@ -2785 +2646 @@
 
         if (!SetupDiGetDeviceRegistryPropertyW(hDeviceInfo, &DeviceInfoData,
-                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*/
-                ))
+                                               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();
@@ -2819 +2679 @@
      */
     if (pQueueCallbackContext)
-    {
         SetupTermDefaultQueueCallback(pQueueCallbackContext);
-    }
 
     if (hDeviceInfo != INVALID_HANDLE_VALUE)
@@ -2827 +2685 @@
         /* an error has occurred, but the device is registered, we must remove it */
         if (ret != 0 && registered)
-            SetupDiCallClassInstaller (DIF_REMOVE, hDeviceInfo, &DeviceInfoData);
-
-        found = SetupDiDeleteDeviceInfo (hDeviceInfo, &DeviceInfoData);
+            SetupDiCallClassInstaller(DIF_REMOVE, hDeviceInfo, &DeviceInfoData);
+
+        found = SetupDiDeleteDeviceInfo(hDeviceInfo, &DeviceInfoData);
 
         /* destroy the driver info list */
         if (destroyList)
-            SetupDiDestroyDriverInfoList (hDeviceInfo, &DeviceInfoData,
-                                          SPDIT_CLASSDRIVER);
+            SetupDiDestroyDriverInfoList(hDeviceInfo, &DeviceInfoData,
+                                         SPDIT_CLASSDRIVER);
         /* clean up the device info set */
         SetupDiDestroyDeviceInfoList (hDeviceInfo);
@@ -2845 +2703 @@
         ULONG cbName = sizeof(ConnectoinName);
 
-        HRESULT hr = VBoxNetCfgWinGenHostonlyConnectionName (DevName, ConnectoinName, &cbName);
+        HRESULT hr = VBoxNetCfgWinGenHostonlyConnectionName(DevName, ConnectoinName, &cbName);
+        if (SUCCEEDED(hr))
+            hr = VBoxNetCfgWinRenameConnection(pWCfgGuidString, ConnectoinName);
+
+        if (lppszName)
+        {
+            *lppszName = ::SysAllocString((const OLECHAR *) DevName);
+            if (!*lppszName)
+            {
+                LogFlow(("SysAllocString failed\n"));
+                hrc = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
+            }
+        }
+
+        if (pGuid)
+        {
+            hrc = CLSIDFromString(pWCfgGuidString, (LPCLSID)pGuid);
+            if (FAILED(hrc))
+                LogFlow(("CLSIDFromString failed, hrc (0x%x)\n", hrc));
+        }
+
+        INetCfg *pNetCfg = NULL;
+        LPWSTR lpszApp = NULL;
+        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)
         {
-            hr = VBoxNetCfgWinRenameConnection (pWCfgGuidString, ConnectoinName);
-        }
-
-        if (lppszName)
-        {
-            *lppszName = ::SysAllocString ((const OLECHAR *) DevName);
-            if (!*lppszName)
-            {
-                Log("VBoxNetCfgWinCreateHostOnlyNetworkInterface: SysAllocString failed\n");
-                Assert(0);
-                hrc = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY);
-            }
-        }
-
-        if (pGuid)
-        {
-            hrc = CLSIDFromString(pWCfgGuidString, (LPCLSID)pGuid);
-            if (hrc != S_OK)
-            {
-                Log("VBoxNetCfgWinCreateHostOnlyNetworkInterface: CLSIDFromString failed, hrc (0x%x)\n", hrc);
-                Assert(0);
-            }
-        }
-
-        INetCfg *pNc;
-        LPWSTR lpszApp = NULL;
-
-        hr = VBoxNetCfgWinQueryINetCfg(&pNc, TRUE, L"VirtualBox Host-Only Creation",
-                           30000, /* 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);
-        Assert(hr == S_OK);
-        if (hr == S_OK)
-        {
-            hr = vboxNetCfgWinEnumNetCfgComponents(pNc,
-                    &GUID_DEVCLASS_NETSERVICE,
-                    vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority,
-                    pGuid);
-            Assert(hr == S_OK);
-
-            hr = vboxNetCfgWinEnumNetCfgComponents(pNc,
-                    &GUID_DEVCLASS_NETTRANS,
-                    vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority,
-                    pGuid);
-            Assert(hr == S_OK);
-
-            hr = vboxNetCfgWinEnumNetCfgComponents(pNc,
-                    &GUID_DEVCLASS_NETCLIENT,
-                    vboxNetCfgWinAdjustHostOnlyNetworkInterfacePriority,
-                    pGuid);
-            Assert(hr == S_OK);
-
-            if (hr == S_OK)
-            {
-                hr = pNc->Apply();
-                Assert(hr == S_OK);
-            }
-
-            VBoxNetCfgWinReleaseINetCfg(pNc, TRUE);
+            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();
+            }
+            else
+                LogFlow(("Enumeration failed, hr 0x%x\n", hr));
+            VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
         }
         else if (hr == NETCFG_E_NO_WRITE_LOCK && lpszApp)
         {
-            Log("VBoxNetCfgWinCreateHostOnlyNetworkInterface: app %S is holding the lock, failed\n", lpszApp);
+            LogFlow(("Application %ws is holding the lock, failed\n", lpszApp));
             CoTaskMemFree(lpszApp);
         }
         else
-        {
-            Log("VBoxNetCfgWinCreateHostOnlyNetworkInterface: VBoxNetCfgWinQueryINetCfg failed, hr 0x%x\n", hr);
-        }
-    }
-
+            LogFlow(("VBoxNetCfgWinQueryINetCfg failed, hr 0x%x\n", hr));
+    }
     return hrc;
 }
 
 #undef SetErrBreak
+

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

@@ -52 +52 @@
         uiRet = MsiGetProperty(a_hModule, a_pszName, a_pValue, &dwBuffer);
     }
-
     return uiRet;
 }

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2008-2010 Oracle Corporation
+ * Copyright (C) 2008-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -61 +61 @@
 }
 
-void LogString(MSIHANDLE hInstall, TCHAR* szString, ...)
+static void LogString(MSIHANDLE hInstall, LPCSTR szString, ...)
 {
     PMSIHANDLE newHandle = ::MsiCreateRecord(2);
 
-    TCHAR szBuffer[1024] = {0};
+    char szBuffer[1024] = {0};
     va_list pArgList;
     va_start(pArgList, szString);
-    _vsntprintf(szBuffer, sizeof(szBuffer) / sizeof(TCHAR), szString, pArgList);
+    _vsnprintf(szBuffer, sizeof(szBuffer) / sizeof(char), szString, pArgList);
     va_end(pArgList);
 
-    MsiRecordSetString(newHandle, 0, szBuffer);
+    MsiRecordSetStringA(newHandle, 0, szBuffer);
     MsiProcessMessage(hInstall, INSTALLMESSAGE(INSTALLMESSAGE_INFO), newHandle);
     MsiCloseHandle(newHandle);
@@ -95 +95 @@
 }
 
-UINT __stdcall IsSerialCheckNeeded(MSIHANDLE a_hModule)
+UINT __stdcall IsSerialCheckNeeded(MSIHANDLE hModule)
 {
 #ifndef VBOX_OSE
-    /*BOOL bRet =*/ serialCheckNeeded(a_hModule);
+    /*BOOL bRet =*/ serialCheckNeeded(hModule);
 #endif
     return ERROR_SUCCESS;
 }
 
-UINT __stdcall CheckSerial(MSIHANDLE a_hModule)
+UINT __stdcall CheckSerial(MSIHANDLE hModule)
 {
 #ifndef VBOX_OSE
-    /*BOOL bRet =*/ serialIsValid(a_hModule);
+    /*BOOL bRet =*/ serialIsValid(hModule);
 #endif
     return ERROR_SUCCESS;
@@ -126 +126 @@
     ::ZeroMemory(&pi, sizeof(pi));
 
-    LogString(hModule, TEXT("Executing command line: %s %s (Working Dir: %s)"), szAppName, szCmdLine, szWorkDir == NULL ? L"Current" : szWorkDir);
+    LogStringW(hModule, TEXT("Executing command line: %s %s (Working Dir: %s)"),
+               szAppName, szCmdLine, szWorkDir == NULL ? L"Current" : szWorkDir);
 
     ::SetLastError(0);
@@ -141 +142 @@
     {
         rc = ::GetLastError();
-        LogString(hModule, TEXT("Executing command line: CreateProcess() failed! Error: %ld"), rc);
+        LogStringW(hModule, TEXT("Executing command line: CreateProcess() failed! Error: %ld"), rc);
         return rc;
     }
@@ -149 +150 @@
     {
         rc = ::GetLastError();
-        LogString(hModule, TEXT("Executing command line: WaitForSingleObject() failed! Error: %ld"), rc);
+        LogStringW(hModule, TEXT("Executing command line: WaitForSingleObject() failed! Error: %ld"), rc);
     }
     else
@@ -156 +157 @@
         {
             rc = ::GetLastError();
-            LogString(hModule, TEXT("Executing command line: GetExitCodeProcess() failed! Error: %ld"), rc);
+            LogStringW(hModule, TEXT("Executing command line: GetExitCodeProcess() failed! Error: %ld"), rc);
         }
     }
@@ -164 +165 @@
     ::CloseHandle(pi.hThread);
 
-    LogString(hModule, TEXT("Executing command returned: %ld (exit code %ld)"), rc, *dwExitCode);
+    LogStringW(hModule, TEXT("Executing command returned: %ld (exit code %ld)"), rc, *dwExitCode);
     return rc;
 }
@@ -170 +171 @@
 UINT __stdcall InstallPythonAPI(MSIHANDLE hModule)
 {
-    LogString(hModule, TEXT("InstallPythonAPI: Checking for installed Python environment ..."));
+    LogStringW(hModule, TEXT("InstallPythonAPI: Checking for installed Python environment ..."));
 
     HKEY hkPythonCore = NULL;
-    BOOL bInstalled = FALSE;
+    BOOL bFound = FALSE;
     LONG rc = ::RegOpenKeyEx(HKEY_LOCAL_MACHINE, L"SOFTWARE\\Python\\PythonCore", 0, KEY_READ, &hkPythonCore);
     if (rc != ERROR_SUCCESS)
     {
-        LogString(hModule, TEXT("InstallPythonAPI: No environment seems to be installed."));
+        LogStringW(hModule, TEXT("InstallPythonAPI: Python seems not to be installed."));
         return ERROR_SUCCESS;
     }
@@ -203 +204 @@
 
         rc = ::RegQueryValueEx(hkPythonInstPath, L"", NULL, &dwKeyType, (LPBYTE)szVal, &dwLen);
-        if(rc == ERROR_SUCCESS)
-            LogString(hModule, TEXT("InstallPythonAPI: Path \"%s\" detected."), szVal);
+        if (rc == ERROR_SUCCESS)
+            LogStringW(hModule, TEXT("InstallPythonAPI: Path \"%s\" detected."), szVal);
 
         ::RegCloseKey(hkPythonInstPath);
@@ -217 +218 @@
     {
         /* Cool, check for installed Win32 extensions. */
-        LogString(hModule, TEXT("InstallPythonAPI: Python installed. Checking for Win32 extensions ..."));
+        LogStringW(hModule, TEXT("InstallPythonAPI: Python installed. Checking for Win32 extensions ..."));
         _stprintf_s(szExec, sizeof(szExec) / sizeof(TCHAR), L"%s\\python.exe", szVal);
         _stprintf_s(szCmdLine, sizeof(szCmdLine) / sizeof(TCHAR), L"%s\\python.exe -c \"import win32api\"", szVal);
@@ -225 +226 @@
         {
             /* Did we get the correct error level (=0)? */
-            LogString(hModule, TEXT("InstallPythonAPI: Win32 extensions installed."));
-            bInstalled = TRUE;
-        }
-        else LogString(hModule, TEXT("InstallPythonAPI: Win32 extensions not found."));
-    }
-
-    if (bInstalled) /* Is Python and all required stuff installed? */
+            LogStringW(hModule, TEXT("InstallPythonAPI: Win32 extensions installed."));
+            bFound = TRUE;
+        }
+        else LogStringW(hModule, TEXT("InstallPythonAPI: Win32 extensions not found."));
+    }
+
+    BOOL bInstalled = FALSE;
+    if (bFound) /* Is Python and all required stuff installed? */
     {
         /* Get the VBoxAPI setup string. */
@@ -246 +248 @@
         if (!SetEnvironmentVariable(L"VBOX_INSTALL_PATH", szVBoxAPISetupPath))
         {
-            LogString(hModule, TEXT("InstallPythonAPI: Cannot set environment variable VBOX_INSTALL_PATH!"));
-            return FALSE;
+            LogStringW(hModule, TEXT("InstallPythonAPI: Could set environment variable VBOX_INSTALL_PATH!"));
         }
         else
@@ -255 +256 @@
             {
                 /* All done! */
-                LogString(hModule, TEXT("InstallPythonAPI: VBoxAPI for Python successfully installed."));
-                return ERROR_SUCCESS;
+                LogStringW(hModule, TEXT("InstallPythonAPI: VBoxAPI for Python successfully installed."));
+                bInstalled = TRUE;
             }
-            else LogString(hModule, TEXT("InstallPythonAPI: Error while installing VBoxAPI: %ld"), dwExitCode);
-        }
-    }
-
-    LogString(hModule, TEXT("InstallPythonAPI: VBoxAPI not installed."));
+            else
+                LogStringW(hModule, TEXT("InstallPythonAPI: Error while installing VBox API: %ld"), dwExitCode);
+        }
+    }
+
+    VBoxSetProperty(hModule, L"PYTHON_INSTALLED", bInstalled ? L"1" : L"0");
+
+    if (!bInstalled)
+        LogStringW(hModule, TEXT("InstallPythonAPI: VBox API not installed."));
     return ERROR_SUCCESS; /* Do not fail here. */
 }
@@ -295 +300 @@
                                (DWORD)wcslen(szValue));
             if (rc != ERROR_SUCCESS)
-                LogString(hModule, TEXT("InstallBranding: Could not write value %s! Error %ld"), pszValue, rc);
+                LogStringW(hModule, TEXT("InstallBranding: Could not write value %s! Error %ld"), pszValue, rc);
             RegCloseKey (hkBranding);
         }
@@ -323 +328 @@
                FOF_NOERRORUI;
 
-    LogString(hModule, TEXT("CopyDir: DestDir=%s, SourceDir=%s"),
+    LogStringW(hModule, TEXT("CopyDir: DestDir=%s, SourceDir=%s"),
               szDest, szSource);
     int r = SHFileOperation(&s);
     if (r != 0)
     {
-        LogString(hModule, TEXT("CopyDir: Copy operation returned status 0x%x"), r);
+        LogStringW(hModule, TEXT("CopyDir: Copy operation returned status 0x%x"), r);
         rc = ERROR_GEN_FAILURE;
     }
@@ -352 +357 @@
                FOF_NOERRORUI;
 
-    LogString(hModule, TEXT("RemoveDir: DestDir=%s"), szDest);
+    LogStringW(hModule, TEXT("RemoveDir: DestDir=%s"), szDest);
     int r = SHFileOperation(&s);
     if (r != 0)
     {
-        LogString(hModule, TEXT("RemoveDir: Remove operation returned status 0x%x"), r);
+        LogStringW(hModule, TEXT("RemoveDir: Remove operation returned status 0x%x"), r);
         rc = ERROR_GEN_FAILURE;
     }
@@ -383 +388 @@
                FOF_NOERRORUI;
 
-    LogString(hModule, TEXT("RenameDir: DestDir=%s, SourceDir=%s"),
+    LogStringW(hModule, TEXT("RenameDir: DestDir=%s, SourceDir=%s"),
               szDest, szSource);
     int r = SHFileOperation(&s);
     if (r != 0)
     {
-        LogString(hModule, TEXT("RenameDir: Rename operation returned status 0x%x"), r);
+        LogStringW(hModule, TEXT("RenameDir: Rename operation returned status 0x%x"), r);
         rc = ERROR_GEN_FAILURE;
     }
@@ -399 +404 @@
 {
     UINT rc;
-    LogString(hModule, TEXT("UninstallBranding: Handling branding file ..."));
+    LogStringW(hModule, TEXT("UninstallBranding: Handling branding file ..."));
 
     TCHAR szPathTargetDir[_MAX_PATH];
@@ -418 +423 @@
     }
 
-    LogString(hModule, TEXT("UninstallBranding: Handling done."));
+    LogStringW(hModule, TEXT("UninstallBranding: Handling done."));
     return ERROR_SUCCESS; /* Do not fail here. */
 }
@@ -425 +430 @@
 {
     UINT rc;
-    LogString(hModule, TEXT("InstallBranding: Handling branding file ..."));
+    LogStringW(hModule, TEXT("InstallBranding: Handling branding file ..."));
 
     TCHAR szPathMSI[_MAX_PATH];
@@ -434 +439 @@
 
     rc = VBoxGetProperty(hModule, L"SOURCEDIR", szPathMSI, sizeof(szPathMSI));
-    rc = VBoxGetProperty(hModule, L"INSTALLDIR", szPathTargetDir, sizeof(szPathTargetDir));
     if (rc == ERROR_SUCCESS)
     {
-        /** @todo Check for trailing slash after %s. */
-        _stprintf_s(szPathDest, sizeof(szPathDest) / sizeof(TCHAR), L"%s", szPathTargetDir);
-        _stprintf_s(szPathSource, sizeof(szPathSource) / sizeof(TCHAR), L"%s.custom", szPathMSI);
-        rc = CopyDir(hModule, szPathDest, szPathSource);
+        rc = VBoxGetProperty(hModule, L"INSTALLDIR", szPathTargetDir, sizeof(szPathTargetDir));
         if (rc == ERROR_SUCCESS)
         {
-            _stprintf_s(szPathDest, sizeof(szPathDest) / sizeof(TCHAR), L"%scustom", szPathTargetDir);
-            _stprintf_s(szPathSource, sizeof(szPathSource) / sizeof(TCHAR), L"%s.custom", szPathTargetDir);
-            rc = RenameDir(hModule, szPathDest, szPathSource);
-        }
-    }
-
-    LogString(hModule, TEXT("InstallBranding: Handling done."));
+            /** @todo Check for trailing slash after %s. */
+            _stprintf_s(szPathDest, sizeof(szPathDest) / sizeof(TCHAR), L"%s", szPathTargetDir);
+            _stprintf_s(szPathSource, sizeof(szPathSource) / sizeof(TCHAR), L"%s.custom", szPathMSI);
+            rc = CopyDir(hModule, szPathDest, szPathSource);
+            if (rc == ERROR_SUCCESS)
+            {
+                _stprintf_s(szPathDest, sizeof(szPathDest) / sizeof(TCHAR), L"%scustom", szPathTargetDir);
+                _stprintf_s(szPathSource, sizeof(szPathSource) / sizeof(TCHAR), L"%s.custom", szPathTargetDir);
+                rc = RenameDir(hModule, szPathDest, szPathSource);
+            }
+        }
+    }
+
+    LogStringW(hModule, TEXT("InstallBranding: Handling done."));
     return ERROR_SUCCESS; /* Do not fail here. */
 }
@@ -464 +472 @@
 
 static MSIHANDLE g_hCurrentModule = NULL;
-static VOID winNetCfgLogger(LPCWSTR szString)
-{
-    Assert(g_hCurrentModule);
-    if(g_hCurrentModule)
-    {
-        LogStringW(g_hCurrentModule, szString);
-    }
-}
-
-static VOID inintWinNetCfgLogger(MSIHANDLE hModule)
-{
-    Assert(!g_hCurrentModule);
+
+static VOID netCfgLoggerCallback(LPCSTR szString)
+{
+    if (g_hCurrentModule)
+        LogString(g_hCurrentModule, szString);
+}
+
+static VOID netCfgLoggerDisable()
+{
+    if (g_hCurrentModule)
+    {
+        VBoxNetCfgWinSetLogging((LOG_ROUTINE)NULL);
+        g_hCurrentModule = NULL;
+    }
+}
+
+static VOID netCfgLoggerEnable(MSIHANDLE hModule)
+{
     Assert(hModule);
 
+    if (g_hCurrentModule)
+        netCfgLoggerDisable();
+
     g_hCurrentModule = hModule;
 
-    VBoxNetCfgWinSetLogging((LOG_ROUTINE)winNetCfgLogger);
-}
-
-static VOID finiWinNetCfgLogger()
-{
-    Assert(g_hCurrentModule);
-
-    VBoxNetCfgWinSetLogging((LOG_ROUTINE)NULL);
-
-    g_hCurrentModule = NULL;
-}
-
-static UINT Hresult2Error(MSIHANDLE hModule, HRESULT hr)
-{
-    switch(hr)
+    VBoxNetCfgWinSetLogging((LOG_ROUTINE)netCfgLoggerCallback);
+}
+
+static UINT ErrorConvertFromHResult(MSIHANDLE hModule, HRESULT hr)
+{
+    UINT uRet;
+    switch (hr)
     {
         case S_OK:
-            return ERROR_SUCCESS;
+            uRet = ERROR_SUCCESS;
+            break;
+
         case NETCFG_S_REBOOT:
-            LogString(hModule, TEXT("Reboot required, setting REBOOT property to Force"));
-            if(MsiSetProperty(hModule, TEXT("REBOOT"), TEXT("Force")) != ERROR_SUCCESS)
-            {
-                LogString(hModule, TEXT("Failed to set REBOOT property"));
-                return ERROR_GEN_FAILURE;
-            }
-            return ERROR_SUCCESS;
+        {
+            LogStringW(hModule, TEXT("Reboot required, setting REBOOT property to Force"));
+            HRESULT hr2 = MsiSetProperty(hModule, TEXT("REBOOT"), TEXT("Force"));
+            if (hr2 != ERROR_SUCCESS)
+                LogStringW(hModule, TEXT("Failed to set REBOOT property, error = 0x%x"), hr2);
+            uRet = ERROR_SUCCESS; /* Never fail here. */
+            break;
+        }
+
         default:
-            LogString(hModule, TEXT("converting hresult (0x%x) to ERROR_GEN_FAILURE"), hr);
-            return ERROR_GEN_FAILURE;
-    }
+            LogStringW(hModule, TEXT("Converting unhandled HRESULT (0x%x) to ERROR_GEN_FAILURE"), hr);
+            uRet = ERROR_GEN_FAILURE;
+    }
+    return uRet;
 }
 
@@ -515 +529 @@
 {
     MSIHANDLE hRecord = MsiCreateRecord(2);
-    Assert(hRecord);
-    if(hRecord)
-    {
-        do
-        {
-            UINT r = MsiRecordSetInteger(hRecord, 1, 25001);
-            Assert(r == ERROR_SUCCESS);
-            if(r != ERROR_SUCCESS)
-            {
-                LogString(hModule, TEXT("createNetCfgLockedMsgRecord: MsiRecordSetInteger failed, r (0x%x)"), r);
-                MsiCloseHandle(hRecord);
-                hRecord = NULL;
-                break;
-            }
-        }while(0);
+    if (hRecord)
+    {
+        UINT uErr = MsiRecordSetInteger(hRecord, 1, 25001);
+        if (uErr != ERROR_SUCCESS)
+        {
+            LogStringW(hModule, TEXT("createNetCfgLockedMsgRecord: MsiRecordSetInteger failed, error = 0x%x"), uErr);
+            MsiCloseHandle(hRecord);
+            hRecord = NULL;
+        }
     }
     else
-    {
-        LogString(hModule, TEXT("createNetCfgLockedMsgRecord: failed to create a record"));
-    }
+        LogStringW(hModule, TEXT("createNetCfgLockedMsgRecord: Failed to create a record"));
 
     return hRecord;
@@ -542 +548 @@
 {
     MSIHANDLE hMsg = NULL;
-    UINT r = ERROR_GEN_FAILURE;
+    UINT uErr = ERROR_GEN_FAILURE;
     int MsgResult;
     int cRetries = 0;
@@ -550 +556 @@
         LPWSTR lpszLockedBy;
         HRESULT hr = VBoxNetCfgWinQueryINetCfg(ppnc, bWrite, VBOX_NETCFG_APP_NAME, 10000, &lpszLockedBy);
-        if(hr != NETCFG_E_NO_WRITE_LOCK)
-        {
-            Assert(hr == S_OK);
-            if(hr != S_OK)
-            {
-                LogString(hModule, TEXT("doNetCfgInit: VBoxNetCfgWinQueryINetCfg failed, hr (0x%x)"), hr);
-            }
-            r = Hresult2Error(hModule, hr);
+        if (hr != NETCFG_E_NO_WRITE_LOCK)
+        {
+            if (FAILED(hr))
+                LogStringW(hModule, TEXT("doNetCfgInit: VBoxNetCfgWinQueryINetCfg failed, error = 0x%x"), hr);
+            uErr = ErrorConvertFromHResult(hModule, hr);
             break;
         }
@@ -563 +566 @@
         /* hr == NETCFG_E_NO_WRITE_LOCK */
 
-        Assert(lpszLockedBy);
-        if(!lpszLockedBy)
-        {
-            LogString(hModule, TEXT("doNetCfgInit: lpszLockedBy == NULL, breaking"));
+        if (!lpszLockedBy)
+        {
+            LogStringW(hModule, TEXT("doNetCfgInit: lpszLockedBy == NULL, breaking"));
             break;
         }
@@ -576 +578 @@
          * dialog is opened, it would be better to post a notification to the user as soon as possible
          * rather than waiting for a longer period of time before displaying it */
-        if(cRetries < VBOX_NETCFG_MAX_RETRIES
-                && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
+        if (   cRetries < VBOX_NETCFG_MAX_RETRIES
+            && !wcscmp(lpszLockedBy, L"6to4svc.dll"))
         {
             cRetries++;
-            LogString(hModule, TEXT("doNetCfgInit: lpszLockedBy is 6to4svc.dll, retrying %d out of %d"), cRetries, VBOX_NETCFG_MAX_RETRIES);
+            LogStringW(hModule, TEXT("doNetCfgInit: lpszLockedBy is 6to4svc.dll, retrying %d out of %d"), cRetries, VBOX_NETCFG_MAX_RETRIES);
             MsgResult = IDRETRY;
         }
         else
         {
-            if(!hMsg)
+            if (!hMsg)
             {
                 hMsg = createNetCfgLockedMsgRecord(hModule);
-                if(!hMsg)
+                if (!hMsg)
                 {
-                    LogString(hModule, TEXT("doNetCfgInit: failed to create a message record, breaking"));
+                    LogStringW(hModule, TEXT("doNetCfgInit: Failed to create a message record, breaking"));
                     CoTaskMemFree(lpszLockedBy);
                     break;
@@ -598 +600 @@
             UINT rTmp = MsiRecordSetStringW(hMsg, 2, lpszLockedBy);
             Assert(rTmp == ERROR_SUCCESS);
-            if(rTmp != ERROR_SUCCESS)
+            if (rTmp != ERROR_SUCCESS)
             {
-                LogString(hModule, TEXT("doNetCfgInit: MsiRecordSetStringW failed, r (0x%x)"), rTmp);
+                LogStringW(hModule, TEXT("doNetCfgInit: MsiRecordSetStringW failed, error = 0x%x"), rTmp);
                 CoTaskMemFree(lpszLockedBy);
                 break;
@@ -607 +609 @@
             MsgResult = MsiProcessMessage(hModule, (INSTALLMESSAGE)(INSTALLMESSAGE_USER | MB_RETRYCANCEL), hMsg);
             Assert(MsgResult == IDRETRY || MsgResult == IDCANCEL);
-            LogString(hModule, TEXT("doNetCfgInit: MsiProcessMessage returned (0x%x)"), MsgResult);
+            LogStringW(hModule, TEXT("doNetCfgInit: MsiProcessMessage returned (0x%x)"), MsgResult);
         }
         CoTaskMemFree(lpszLockedBy);
     } while(MsgResult == IDRETRY);
 
-    if(hMsg)
-    {
+    if (hMsg)
         MsiCloseHandle(hMsg);
-    }
-
-    return r;
-}
-
-static UINT vboxNetFltQueryInfArray(MSIHANDLE hModule, OUT LPWSTR *apInfFullPaths, PUINT pcInfs, DWORD cSize)
-{
-    UINT r;
-    Assert(*pcInfs >= 2);
-    if(*pcInfs >= 2)
+
+    return uErr;
+}
+
+static UINT vboxNetFltQueryInfArray(MSIHANDLE hModule, OUT LPWSTR *apInfFullPaths, PUINT pcInfs, DWORD dwSize)
+{
+    UINT uErr;
+    if (*pcInfs >= 2)
     {
         *pcInfs = 2;
-        r = MsiGetPropertyW(hModule, L"CustomActionData", apInfFullPaths[0], &cSize);
-        Assert(r == ERROR_SUCCESS);
-        if(r == ERROR_SUCCESS)
-        {
+
+        DWORD dwBuf = dwSize;
+        uErr = MsiGetPropertyW(hModule, L"CustomActionData", apInfFullPaths[0], &dwBuf);
+        if (   uErr == ERROR_SUCCESS
+            && dwBuf)
+        {
+            /** @todo r=andy Avoid wcscpy and wcsncat, can cause buffer overruns! */
             wcscpy(apInfFullPaths[1], apInfFullPaths[0]);
 
             wcsncat(apInfFullPaths[0], NETFLT_PT_INF_REL_PATH, sizeof(NETFLT_PT_INF_REL_PATH));
+            LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: INF 1: %s"), apInfFullPaths[0]);
+
             wcsncat(apInfFullPaths[1], NETFLT_MP_INF_REL_PATH, sizeof(NETFLT_MP_INF_REL_PATH));
+            LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: INF 2: %s"), apInfFullPaths[1]);
         }
         else
         {
-            LogString(hModule, TEXT("vboxNetFltQueryInfArray: MsiGetPropertyW failes, r (%d)"), r);
+            if (uErr != ERROR_SUCCESS)
+                LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: MsiGetPropertyW failed, error = 0x%x"), uErr);
+            else
+                LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: Empty installation directory"));
         }
     }
     else
     {
-        r = ERROR_GEN_FAILURE;
-        LogString(hModule, TEXT("vboxNetFltQueryInfArray: buffer array size is < 2 : (%d)"), *pcInfs);
-        *pcInfs = 2;
-    }
-
-    return r;
+        uErr = ERROR_BUFFER_OVERFLOW;
+        LogStringW(hModule, TEXT("vboxNetFltQueryInfArray: Buffer array size is < 2 (%u)"), *pcInfs);
+    }
+
+    return uErr;
 }
 
@@ -656 +663 @@
 {
 #ifdef VBOX_WITH_NETFLT
-    INetCfg *pnc;
-    UINT r;
-
-    inintWinNetCfgLogger(hModule);
+    INetCfg *pNetCfg;
+    UINT uErr;
+
+    netCfgLoggerEnable(hModule);
 
     BOOL bOldIntMode = SetupSetNonInteractiveMode(FALSE);
@@ -665 +672 @@
     __try
     {
-        LogString(hModule, TEXT("Uninstalling NetFlt"));
-
-        r = doNetCfgInit(hModule, &pnc, TRUE);
-        Assert(r == ERROR_SUCCESS);
-        if(r == ERROR_SUCCESS)
-        {
-            HRESULT hr = VBoxNetCfgWinNetFltUninstall(pnc);
-            Assert(hr == S_OK);
-            if(hr != S_OK)
-            {
-                LogString(hModule, TEXT("UninstallNetFlt: VBoxNetCfgWinUninstallComponent failed, hr (0x%x)"), hr);
-            }
-
-            r = Hresult2Error(hModule, hr);
-
-            VBoxNetCfgWinReleaseINetCfg(pnc, TRUE);
-
-            /* Never fail the uninstall */
-            r = ERROR_SUCCESS;
+        LogStringW(hModule, TEXT("Uninstalling NetFlt"));
+
+        uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
+        if (uErr == ERROR_SUCCESS)
+        {
+            HRESULT hr = VBoxNetCfgWinNetFltUninstall(pNetCfg);
+            if (hr != S_OK)
+                LogStringW(hModule, TEXT("UninstallNetFlt: VBoxNetCfgWinUninstallComponent failed, error = 0x%x"), hr);
+
+            uErr = ErrorConvertFromHResult(hModule, hr);
+
+            VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
+
+            LogStringW(hModule, TEXT("Uninstalling NetFlt done, error = 0x%x"), uErr);
+
+            /* Never fail on uninstall. */
+            uErr = ERROR_SUCCESS;
         }
         else
-        {
-            LogString(hModule, TEXT("UninstallNetFlt: doNetCfgInit failed, r (0x%x)"), r);
-        }
-
-        LogString(hModule, TEXT("Uninstalling NetFlt done, r (0x%x)"), r);
+            LogStringW(hModule, TEXT("UninstallNetFlt: doNetCfgInit failed, error = 0x%x"), uErr);
     }
     __finally
     {
-        if(bOldIntMode)
-        {
-            /* the prev mode != FALSE, i.e. non-interactive */
+        if (bOldIntMode)
+        {
+            /* The prev mode != FALSE, i.e. non-interactive. */
             SetupSetNonInteractiveMode(bOldIntMode);
         }
-        finiWinNetCfgLogger();
-    }
-
+        netCfgLoggerDisable();
+    }
+#endif /* VBOX_WITH_NETFLT */
+
+    /* Never fail the install even if we did not succeed. */
     return ERROR_SUCCESS;
-#else /* not defined VBOX_WITH_NETFLT */
-    return ERROR_SUCCESS;
-#endif /* VBOX_WITH_NETFLT */
 }
 
@@ -711 +711 @@
 {
 #ifdef VBOX_WITH_NETFLT
-    UINT r;
-    INetCfg *pnc;
-
-    inintWinNetCfgLogger(hModule);
+    UINT uErr;
+    INetCfg *pNetCfg;
+
+    netCfgLoggerEnable(hModule);
 
     BOOL bOldIntMode = SetupSetNonInteractiveMode(FALSE);
@@ -721 +721 @@
     {
 
-        LogString(hModule, TEXT("Installing NetFlt"));
-
-        r = doNetCfgInit(hModule, &pnc, TRUE);
-        Assert(r == ERROR_SUCCESS);
-        if(r == ERROR_SUCCESS)
+        LogStringW(hModule, TEXT("Installing NetFlt"));
+
+        uErr = doNetCfgInit(hModule, &pNetCfg, TRUE);
+        if (uErr == ERROR_SUCCESS)
         {
             WCHAR PtInf[MAX_PATH];
@@ -732 +731 @@
             LPWSTR aInfs[] = {PtInf, MpInf};
             UINT cInfs = 2;
-
-            r = vboxNetFltQueryInfArray(hModule, aInfs, &cInfs, sz);
-            Assert(r == ERROR_SUCCESS);
-            Assert(cInfs == 2);
-            if(r == ERROR_SUCCESS)
+            uErr = vboxNetFltQueryInfArray(hModule, aInfs, &cInfs, sz);
+            if (uErr == ERROR_SUCCESS)
             {
-    //            HRESULT hr = VBoxNetCfgWinInstallSpecifiedComponent (
-    //                                                        pnc,
-    //                                                        (LPCWSTR*)aInfs,
-    //                                                        cInfs,
-    //                                                        NETFLT_ID,
-    //                                                        &GUID_DEVCLASS_NETSERVICE,
-    //                                                        true);
-                HRESULT hr = VBoxNetCfgWinNetFltInstall(pnc, (LPCWSTR*)aInfs, cInfs);
-                Assert(hr == S_OK);
-                if(hr != S_OK)
-                {
-                    LogString(hModule, TEXT("InstallNetFlt: VBoxNetCfgWinInstallSpecifiedComponent failed, hr (0x%x)"), hr);
-                }
-
-                r = Hresult2Error(hModule, hr);
+                HRESULT hr = VBoxNetCfgWinNetFltInstall(pNetCfg, (LPCWSTR*)aInfs, cInfs);
+                if (FAILED(hr))
+                    LogStringW(hModule, TEXT("InstallNetFlt: VBoxNetCfgWinNetFltInstall failed, error = 0x%x"), hr);
+
+                uErr = ErrorConvertFromHResult(hModule, hr);
             }
             else
-            {
-                LogString(hModule, TEXT("InstallNetFlt: vboxNetFltQueryInfArray failed, r (0x%x)"), r);
-            }
-
-            VBoxNetCfgWinReleaseINetCfg(pnc, TRUE);
-
-            /* Never fail the uninstall */
-            r = ERROR_SUCCESS;
+                LogStringW(hModule, TEXT("InstallNetFlt: vboxNetFltQueryInfArray failed, error = 0x%x"), uErr);
+
+            VBoxNetCfgWinReleaseINetCfg(pNetCfg, TRUE);
+
+            LogStringW(hModule, TEXT("Installing NetFlt done"));
         }
         else
-        {
-            LogString(hModule, TEXT("InstallNetFlt: doNetCfgInit failed, r (0x%x)"), r);
-        }
-
-        LogString(hModule, TEXT("Installing NetFlt done, r (0x%x)"), r);
+            LogStringW(hModule, TEXT("InstallNetFlt: doNetCfgInit failed, error = 0x%x"), uErr);
     }
     __finally
     {
-        if(bOldIntMode)
-        {
-            /* the prev mode != FALSE, i.e. non-interactive */
+        if (bOldIntMode)
+        {
+            /* The prev mode != FALSE, i.e. non-interactive. */
             SetupSetNonInteractiveMode(bOldIntMode);
         }
-        finiWinNetCfgLogger();
-    }
-
+        netCfgLoggerDisable();
+    }
+#endif /* VBOX_WITH_NETFLT */
+
+    /* Never fail the install even if we did not succeed. */
     return ERROR_SUCCESS;
-#else /* not defined VBOX_WITH_NETFLT */
-    return ERROR_SUCCESS;
-#endif /* VBOX_WITH_NETFLT */
 }
 
@@ -793 +771 @@
     DWORD winEr;
 
-    if(SetupDiGetDeviceRegistryPropertyW(hDevInfo, pDev,
+    if (SetupDiGetDeviceRegistryPropertyW(hDevInfo, pDev,
             SPDRP_FRIENDLYNAME , /* IN DWORD  Property,*/
               NULL, /*OUT PDWORD  PropertyRegDataType,  OPTIONAL*/
@@ -820 +798 @@
             );
             Assert(winEr == ERROR_SUCCESS);
-            if(winEr == ERROR_SUCCESS)
+            if (winEr == ERROR_SUCCESS)
             {
                 WCHAR ConnectoinName[128];
@@ -827 +805 @@
                 HRESULT hr = VBoxNetCfgWinGenHostonlyConnectionName (DevName, ConnectoinName, &cbName);
                 Assert(hr == S_OK);
-                if(hr == S_OK)
+                if (SUCCEEDED(hr))
                 {
                     hr = VBoxNetCfgWinRenameConnection (guid, ConnectoinName);
@@ -848 +826 @@
 {
 #ifdef VBOX_WITH_NETFLT
-    inintWinNetCfgLogger(hModule);
-
-    BOOL bPrevMode = SetupSetNonInteractiveMode(FALSE);
+    netCfgLoggerEnable(hModule);
+
+    BOOL bSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
     bool bSetStaticIp = true;
 
-    LogString(hModule, TEXT("Creating Host-Only Interface"));
+    LogStringW(hModule, TEXT("Creating host-only interface"));
 
     HRESULT hr = VBoxNetCfgWinRemoveAllNetDevicesOfId(NETADP_ID);
-    Assert(hr == S_OK);
-    if(hr != S_OK)
-    {
-        LogString(hModule, TEXT("CreateHostOnlyInterface: VBoxNetCfgWinRemoveAllNetDevicesOfId failed, hr (0x%x)"), hr);
+    if (FAILED(hr))
+    {
+        LogStringW(hModule, TEXT("CreateHostOnlyInterface: VBoxNetCfgWinRemoveAllNetDevicesOfId failed, error = 0x%x"), hr);
         bSetStaticIp = false;
     }
@@ -868 +845 @@
     LPCWSTR pInfPath = NULL;
     bool bIsFile = false;
-    UINT r = MsiGetPropertyW(hModule, L"CustomActionData", MpInf, &cSize);
-    Assert(r == ERROR_SUCCESS);
-    if(r == ERROR_SUCCESS)
-    {
-        LogString(hModule, TEXT("NetAdpDir property: (%s)"), MpInf);
-        if(cSize)
-        {
-            if(MpInf[cSize-1] != L'\\')
+    UINT uErr = MsiGetPropertyW(hModule, L"CustomActionData", MpInf, &cSize);
+    if (uErr == ERROR_SUCCESS)
+    {
+        if (cSize)
+        {
+            LogStringW(hModule, TEXT("CreateHostOnlyInterface: NetAdpDir property = %s"), MpInf);
+            if (MpInf[cSize-1] != L'\\')
             {
                 MpInf[cSize] = L'\\';
@@ -881 +857 @@
                 MpInf[cSize] = L'\0';
             }
-//          wcscat(MpInf, L"VBoxNetFlt.inf");
+
+            /** @todo r=andy Avoid wcscat, can cause buffer overruns! */
             wcscat(MpInf, L"drivers\\network\\netadp\\VBoxNetAdp.inf");
             pInfPath = MpInf;
             bIsFile = true;
-            LogString(hModule, TEXT("Resulting inf path is: (%s)"), pInfPath);
+
+            LogStringW(hModule, TEXT("CreateHostOnlyInterface: Resulting INF path = %s"), pInfPath);
         }
         else
-        {
-            LogString(hModule, TEXT("CreateHostOnlyInterface: NetAdpDir property value is empty"));
-        }
+            LogStringW(hModule, TEXT("CreateHostOnlyInterface: NetAdpDir property value is empty"));
     }
     else
-    {
-        LogString(hModule, TEXT("CreateHostOnlyInterface: failed to get NetAdpDir property, r(%d)"), r);
-    }
-
-    /* make sure the inf file is installed */
-    if(!!pInfPath && bIsFile)
-    {
-        HRESULT tmpHr = VBoxDrvCfgInfInstall(pInfPath);
-        Assert(tmpHr == S_OK);
-    }
-
-    hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface (pInfPath, bIsFile, &guid, NULL, NULL);
-    Assert(hr == S_OK);
-    if(hr == S_OK)
-    {
-        ULONG ip = inet_addr("192.168.56.1");
-        ULONG mask = inet_addr("255.255.255.0");
-
-        hr = VBoxNetCfgWinEnableStaticIpConfig(&guid, ip, mask);
-        Assert(hr == S_OK);
-        if(hr != S_OK)
-        {
-            LogString(hModule, TEXT("CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, hr (0x%x)"), hr);
+        LogStringW(hModule, TEXT("CreateHostOnlyInterface: Failed to get NetAdpDir property, error = 0x%x"), uErr);
+
+    /* Make sure the inf file is installed. */
+    if (!!pInfPath && bIsFile)
+    {
+        hr = VBoxDrvCfgInfInstall(pInfPath);
+        if (FAILED(hr))
+            LogStringW(hModule, TEXT("CreateHostOnlyInterface: Failed to install INF file, error = 0x%x"), hr);
+    }
+
+    if (SUCCEEDED(hr))
+    {
+        hr = VBoxNetCfgWinCreateHostOnlyNetworkInterface(pInfPath, bIsFile, &guid, NULL, NULL);
+        if (SUCCEEDED(hr))
+        {
+            ULONG ip = inet_addr("192.168.56.1");
+            ULONG mask = inet_addr("255.255.255.0");
+            hr = VBoxNetCfgWinEnableStaticIpConfig(&guid, ip, mask);
+            if (FAILED(hr))
+                LogStringW(hModule, TEXT("CreateHostOnlyInterface: VBoxNetCfgWinEnableStaticIpConfig failed, error = 0x%x"), hr);
+        }
+        else
+            LogStringW(hModule, TEXT("CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, error = 0x%x"), hr);
+    }
+
+    if (SUCCEEDED(hr))
+        LogStringW(hModule, TEXT("Creating host-only interface done"));
+
+    /* Restore original setup mode. */
+    if (bSetupModeInteractive)
+        SetupSetNonInteractiveMode(bSetupModeInteractive);
+
+    netCfgLoggerDisable();
+
+#endif /* VBOX_WITH_NETFLT */
+
+    /* Never fail the install even if we did not succeed. */
+    return ERROR_SUCCESS;
+}
+
+UINT __stdcall RemoveHostOnlyInterfaces(MSIHANDLE hModule)
+{
+#ifdef VBOX_WITH_NETFLT
+    netCfgLoggerEnable(hModule);
+
+    LogStringW(hModule, TEXT("RemoveHostOnlyInterfaces: Removing All Host-Only Interface"));
+
+    BOOL bSetupModeInteractive = SetupSetNonInteractiveMode(FALSE);
+
+    HRESULT hr = VBoxNetCfgWinRemoveAllNetDevicesOfId(NETADP_ID);
+    if (SUCCEEDED(hr))
+    {
+        hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, NETADP_ID, L"Net", 0/* could be SUOI_FORCEDELETE */);
+        if (FAILED(hr))
+        {
+            LogStringW(hModule, TEXT("RemoveHostOnlyInterfaces: NetAdp uninstalled successfully, but failed to remove infs\n"));
         }
     }
     else
-    {
-        LogString(hModule, TEXT("CreateHostOnlyInterface: VBoxNetCfgWinCreateHostOnlyNetworkInterface failed, hr (0x%x)"), hr);
-    }
-
-    if(bPrevMode)
-    {
-        /* the prev mode != FALSE, i.e. non-interactive */
-        SetupSetNonInteractiveMode(bPrevMode);
-    }
-
-    finiWinNetCfgLogger();
-
-    /* never fail the install even if we are not succeeded */
+        LogStringW(hModule, TEXT("RemoveHostOnlyInterfaces: NetAdp uninstall failed, hr = 0x%x\n"), hr);
+
+    /* Restore original setup mode. */
+    if (bSetupModeInteractive)
+        SetupSetNonInteractiveMode(bSetupModeInteractive);
+
+    netCfgLoggerDisable();
+#endif /* VBOX_WITH_NETFLT */
+
+    /* Never fail the install even if we did not succeed. */
     return ERROR_SUCCESS;
-#else /* not defined VBOX_WITH_NETFLT */
-    return ERROR_SUCCESS;
-#endif /* VBOX_WITH_NETFLT */
-}
-
-UINT __stdcall RemoveHostOnlyInterfaces(MSIHANDLE hModule)
-{
-#ifdef VBOX_WITH_NETFLT
-    inintWinNetCfgLogger(hModule);
-
-    LogString(hModule, TEXT("Removing All Host-Only Interface"));
-
-    BOOL bPrevMode = SetupSetNonInteractiveMode(FALSE);
-
-    HRESULT hr = VBoxNetCfgWinRemoveAllNetDevicesOfId(NETADP_ID);
-    if(hr == S_OK)
-    {
-        hr = VBoxDrvCfgInfUninstallAllSetupDi(&GUID_DEVCLASS_NET, NETADP_ID, L"Net", 0/* could be SUOI_FORCEDELETE */);
-        if(hr != S_OK)
-        {
-            LogString(hModule, TEXT("NetAdp uninstalled successfully, but failed to remove infs\n"));
-        }
-    }
-    else
-    {
-        LogString(hModule, TEXT("NetAdp uninstall failed, hr = 0x%x\n"), hr);
-    }
-
-    if(bPrevMode)
-    {
-        /* the prev mode != FALSE, i.e. non-interactive */
-        SetupSetNonInteractiveMode(bPrevMode);
-    }
-
-    finiWinNetCfgLogger();
-
-    return ERROR_SUCCESS;
-#else /* not defined VBOX_WITH_NETFLT */
-    return ERROR_SUCCESS;
-#endif /* VBOX_WITH_NETFLT */
-}
-
-static bool IsTAPDevice (const TCHAR *a_pcGUID)
+}
+
+static bool IsTAPDevice(const TCHAR *pcGUID)
 {
     HKEY hNetcard;
-    LONG status;
-    DWORD len;
+    bool bIsTapDevice = false;
+    LONG lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE,
+                                TEXT("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"),
+                                0, KEY_READ, &hNetcard);
+    if (lStatus != ERROR_SUCCESS)
+        return false;
+
     int i = 0;
-    bool ret = false;
-
-    status = RegOpenKeyEx (HKEY_LOCAL_MACHINE,
-        TEXT("SYSTEM\\CurrentControlSet\\Control\\Class\\{4D36E972-E325-11CE-BFC1-08002BE10318}"),
-        0, KEY_READ, &hNetcard);
-
-    if (status != ERROR_SUCCESS)
-        return false;
-
-    while(true)
+    while (true)
     {
         TCHAR szEnumName[256];
@@ -997 +959 @@
         HKEY  hNetCardGUID;
 
-        len = sizeof(szEnumName);
-        status = RegEnumKeyEx (hNetcard, i, szEnumName, &len, NULL, NULL, NULL, NULL);
-        if (status != ERROR_SUCCESS)
+        DWORD dwLen = sizeof(szEnumName);
+        lStatus = RegEnumKeyEx(hNetcard, i, szEnumName, &dwLen, NULL, NULL, NULL, NULL);
+        if (lStatus != ERROR_SUCCESS)
             break;
 
-        status = RegOpenKeyEx (hNetcard, szEnumName, 0, KEY_READ, &hNetCardGUID);
-        if (status == ERROR_SUCCESS)
-        {
-            len = sizeof (szNetCfgInstanceId);
-            status = RegQueryValueEx (hNetCardGUID, TEXT("NetCfgInstanceId"), NULL, &dwKeyType, (LPBYTE)szNetCfgInstanceId, &len);
-            if (status == ERROR_SUCCESS && dwKeyType == REG_SZ)
+        lStatus = RegOpenKeyEx(hNetcard, szEnumName, 0, KEY_READ, &hNetCardGUID);
+        if (lStatus == ERROR_SUCCESS)
+        {
+            dwLen = sizeof(szNetCfgInstanceId);
+            lStatus = RegQueryValueEx(hNetCardGUID, TEXT("NetCfgInstanceId"), NULL, &dwKeyType, (LPBYTE)szNetCfgInstanceId, &dwLen);
+            if (   lStatus == ERROR_SUCCESS
+                && dwKeyType == REG_SZ)
             {
                 TCHAR szNetProductName[256];
@@ -1013 +976 @@
 
                 szNetProductName[0] = 0;
-                len = sizeof(szNetProductName);
-                status = RegQueryValueEx (hNetCardGUID, TEXT("ProductName"), NULL, &dwKeyType, (LPBYTE)szNetProductName, &len);
+                dwLen = sizeof(szNetProductName);
+                lStatus = RegQueryValueEx(hNetCardGUID, TEXT("ProductName"), NULL, &dwKeyType, (LPBYTE)szNetProductName, &dwLen);
 
                 szNetProviderName[0] = 0;
-                len = sizeof(szNetProviderName);
-                status = RegQueryValueEx (hNetCardGUID, TEXT("ProviderName"), NULL, &dwKeyType, (LPBYTE)szNetProviderName, &len);
-
-                if (   !wcscmp(szNetCfgInstanceId, a_pcGUID)
+                dwLen = sizeof(szNetProviderName);
+                lStatus = RegQueryValueEx(hNetCardGUID, TEXT("ProviderName"), NULL, &dwKeyType, (LPBYTE)szNetProviderName, &dwLen);
+
+                if (   !wcscmp(szNetCfgInstanceId, pcGUID)
                     && !wcscmp(szNetProductName, TEXT("VirtualBox TAP Adapter"))
                     && (   (!wcscmp(szNetProviderName, TEXT("innotek GmbH"))) /* Legacy stuff. */
@@ -1028 +991 @@
                    )
                 {
-                    ret = true;
+                    bIsTapDevice = true;
                     RegCloseKey(hNetCardGUID);
                     break;
@@ -1039 +1002 @@
 
     RegCloseKey (hNetcard);
-    return ret;
+    return bIsTapDevice;
 }
 
@@ -1047 +1010 @@
     if (1) { \
         rc = 0; \
-        LogString (a_hModule, strAndArgs); \
+        LogStringW(hModule, strAndArgs); \
         break; \
     } else do {} while (0)
 
-int removeNetworkInterface (MSIHANDLE a_hModule, const TCHAR* pcGUID)
+int removeNetworkInterface(MSIHANDLE hModule, const TCHAR* pcGUID)
 {
     int rc = 1;
@@ -1070 +1033 @@
                       TEXT("{4D36E972-E325-11CE-BFC1-08002BE10318}\\%s"),
                       pcGUID);
-            LONG status;
-            status = RegOpenKeyEx (HKEY_LOCAL_MACHINE, strRegLocation, 0,
+            LONG lStatus;
+            lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, strRegLocation, 0,
                                    KEY_READ, &hkeyNetwork);
-            if ((status != ERROR_SUCCESS) || !hkeyNetwork)
-                SetErrBreak ((TEXT("VBox HostInterfaces: Host interface network was not found in registry (%s)! [1]"), strRegLocation));
-
-            status = RegOpenKeyExA (hkeyNetwork, "Connection", 0,
+            if ((lStatus != ERROR_SUCCESS) || !hkeyNetwork)
+                SetErrBreak((TEXT("VBox HostInterfaces: Host interface network was not found in registry (%s)! [1]"), strRegLocation));
+
+            lStatus = RegOpenKeyExA(hkeyNetwork, "Connection", 0,
                                     KEY_READ, &hkeyConnection);
-            if ((status != ERROR_SUCCESS) || !hkeyConnection)
-                SetErrBreak ((TEXT("VBox HostInterfaces: Host interface network was not found in registry (%s)! [2]"), strRegLocation));
+            if ((lStatus != ERROR_SUCCESS) || !hkeyConnection)
+                SetErrBreak((TEXT("VBox HostInterfaces: Host interface network was not found in registry (%s)! [2]"), strRegLocation));
 
             DWORD len = sizeof (lszPnPInstanceId);
             DWORD dwKeyType;
-            status = RegQueryValueExW (hkeyConnection, L"PnPInstanceID", NULL,
+            lStatus = RegQueryValueExW(hkeyConnection, L"PnPInstanceID", NULL,
                                        &dwKeyType, (LPBYTE) lszPnPInstanceId, &len);
-            if ((status != ERROR_SUCCESS) || (dwKeyType != REG_SZ))
-                SetErrBreak ((TEXT("VBox HostInterfaces: Host interface network was not found in registry (%s)! [3]"), strRegLocation));
+            if ((lStatus != ERROR_SUCCESS) || (dwKeyType != REG_SZ))
+                SetErrBreak((TEXT("VBox HostInterfaces: Host interface network was not found in registry (%s)! [3]"), strRegLocation));
         }
         while (0);
 
         if (hkeyConnection)
-            RegCloseKey (hkeyConnection);
+            RegCloseKey(hkeyConnection);
         if (hkeyNetwork)
-            RegCloseKey (hkeyNetwork);
+            RegCloseKey(hkeyNetwork);
 
         /*
@@ -1101 +1064 @@
 
         HDEVINFO hDeviceInfo = INVALID_HANDLE_VALUE;
+        BOOL fResult;
 
         do
         {
-            BOOL ok;
             DWORD ret = 0;
             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);
+            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);
-
+            hDeviceInfo = SetupDiGetClassDevs(&netGuid, NULL, NULL, DIGCF_PRESENT);
             if (hDeviceInfo == INVALID_HANDLE_VALUE)
             {
-                LogString (a_hModule, TEXT("VBox HostInterfaces: SetupDiGetClassDevs failed (0x%08X)!"), GetLastError());
-                SetErrBreak (TEXT("VBox HostInterfaces: Uninstallation failed!"));
+                LogStringW(hModule, TEXT("VBox HostInterfaces: SetupDiGetClassDevs failed (0x%08X)!"), GetLastError());
+                SetErrBreak(TEXT("VBox HostInterfaces: Uninstallation failed!"));
             }
+
+            BOOL fFoundDevice = FALSE;
 
             /* enumerate the driver info list */
             while (TRUE)
             {
-                TCHAR *deviceHwid;
-
-                ok = SetupDiEnumDeviceInfo (hDeviceInfo, index, &DeviceInfoData);
-
-                if (!ok)
+                TCHAR *pszDeviceHwid;
+
+                fResult = SetupDiEnumDeviceInfo(hDeviceInfo, index, &DeviceInfoData);
+                if (!fResult)
                 {
                     if (GetLastError() == ERROR_NO_MORE_ITEMS)
@@ -1146 +1108 @@
 
                 /* try to get the hardware ID registry property */
-                ok = SetupDiGetDeviceRegistryProperty (hDeviceInfo,
-                                                       &DeviceInfoData,
-                                                       SPDRP_HARDWAREID,
-                                                       NULL,
-                                                       NULL,
-                                                       0,
-                                                       &size);
-                if (!ok)
+                fResult = SetupDiGetDeviceRegistryProperty(hDeviceInfo,
+                                                           &DeviceInfoData,
+                                                           SPDRP_HARDWAREID,
+                                                           NULL,
+                                                           NULL,
+                                                           0,
+                                                           &size);
+                if (!fResult)
                 {
                     if (GetLastError() != ERROR_INSUFFICIENT_BUFFER)
@@ -1161 +1123 @@
                     }
 
-                    deviceHwid = (TCHAR *) malloc (size);
-                    ok = SetupDiGetDeviceRegistryProperty (hDeviceInfo,
-                                                           &DeviceInfoData,
-                                                           SPDRP_HARDWAREID,
-                                                           NULL,
-                                                           (PBYTE)deviceHwid,
-                                                           size,
-                                                           NULL);
-                    if (!ok)
+                    pszDeviceHwid = (TCHAR *)malloc(size);
+                    if (pszDeviceHwid)
                     {
-                        free (deviceHwid);
-                        deviceHwid = NULL;
-                        index++;
-                        continue;
+                        fResult = SetupDiGetDeviceRegistryProperty(hDeviceInfo,
+                                                                   &DeviceInfoData,
+                                                                   SPDRP_HARDWAREID,
+                                                                   NULL,
+                                                                   (PBYTE)pszDeviceHwid,
+                                                                   size,
+                                                                   NULL);
+                        if (!fResult)
+                        {
+                            free(pszDeviceHwid);
+                            pszDeviceHwid = NULL;
+                            index++;
+                            continue;
+                        }
                     }
                 }
@@ -1184 +1149 @@
                 }
 
-                for (TCHAR *t = deviceHwid;
-                     t && *t && t < &deviceHwid[size / sizeof(TCHAR)];
+                for (TCHAR *t = pszDeviceHwid;
+                     t && *t && t < &pszDeviceHwid[size / sizeof(TCHAR)];
                      t += _tcslen (t) + 1)
                 {
-                    if (!_tcsicmp (VBOX_TAP_HWID, t))
+                    if (!_tcsicmp(VBOX_TAP_HWID, t))
                     {
                           /* get the device instance ID */
@@ -1196 +1161 @@
                           {
                               /* compare to what we determined before */
-                              if (wcscmp(devID, lszPnPInstanceId) == 0)
+                              if (!wcscmp(devID, lszPnPInstanceId))
                               {
-                                  found = TRUE;
+                                  fFoundDevice = TRUE;
                                   break;
                               }
@@ -1205 +1170 @@
                 }
 
-                if (deviceHwid)
+                if (pszDeviceHwid)
                 {
-                    free (deviceHwid);
-                    deviceHwid = NULL;
+                    free(pszDeviceHwid);
+                    pszDeviceHwid = NULL;
                 }
 
-                if (found)
+                if (fFoundDevice)
                     break;
 
@@ -1217 +1182 @@
             }
 
-            if (found == FALSE)
-                SetErrBreak (TEXT("VBox HostInterfaces: Host Interface Network driver not found!"));
-
-            ok = SetupDiSetSelectedDevice (hDeviceInfo, &DeviceInfoData);
-            if (!ok)
+            if (fFoundDevice)
             {
-                LogString (a_hModule, TEXT("VBox HostInterfaces: SetupDiSetSelectedDevice failed (0x%08X)!"), GetLastError());
-                SetErrBreak (TEXT("VBox HostInterfaces: Uninstallation failed!"));
+                fResult = SetupDiSetSelectedDevice(hDeviceInfo, &DeviceInfoData);
+                if (!fResult)
+                {
+                    LogStringW(hModule, TEXT("VBox HostInterfaces: SetupDiSetSelectedDevice failed (0x%08X)!"), GetLastError());
+                    SetErrBreak(TEXT("VBox HostInterfaces: Uninstallation failed!"));
+                }
+
+                fResult = SetupDiCallClassInstaller(DIF_REMOVE, hDeviceInfo, &DeviceInfoData);
+                if (!fResult)
+                {
+                    LogStringW(hModule, TEXT("VBox HostInterfaces: SetupDiCallClassInstaller (DIF_REMOVE) failed (0x%08X)!"), GetLastError());
+                    SetErrBreak(TEXT("VBox HostInterfaces: Uninstallation failed!"));
+                }
             }
-
-            ok = SetupDiCallClassInstaller (DIF_REMOVE, hDeviceInfo, &DeviceInfoData);
-            if (!ok)
-            {
-                LogString (a_hModule, TEXT("VBox HostInterfaces: SetupDiCallClassInstaller (DIF_REMOVE) failed (0x%08X)!"), GetLastError());
-                SetErrBreak (TEXT("VBox HostInterfaces: Uninstallation failed!"));
-            }
+            else
+                SetErrBreak(TEXT("VBox HostInterfaces: Host interface network device not found!"));
         }
         while (0);
@@ -1238 +1205 @@
         /* clean up the device info set */
         if (hDeviceInfo != INVALID_HANDLE_VALUE)
-            SetupDiDestroyDeviceInfoList (hDeviceInfo);
+            SetupDiDestroyDeviceInfoList(hDeviceInfo);
     }
     while (0);
@@ -1244 +1211 @@
 }
 
-UINT __stdcall UninstallTAPInstances (MSIHANDLE a_hModule)
+UINT __stdcall UninstallTAPInstances(MSIHANDLE hModule)
 {
     static const TCHAR *NetworkKey = TEXT("SYSTEM\\CurrentControlSet\\Control\\Network\\")
                                      TEXT("{4D36E972-E325-11CE-BFC1-08002BE10318}");
     HKEY hCtrlNet;
-    LONG status = 0;
-    DWORD len = 0;
-    LONG cnt = 0;
-
-    status = RegOpenKeyEx (HKEY_LOCAL_MACHINE, NetworkKey, 0, KEY_READ, &hCtrlNet);
-    if (status == ERROR_SUCCESS)
-    {
-        LogString(a_hModule, TEXT("VBox HostInterfaces: Enumerating interfaces ..."));
+
+    LONG lStatus = RegOpenKeyEx(HKEY_LOCAL_MACHINE, NetworkKey, 0, KEY_READ, &hCtrlNet);
+    if (lStatus == ERROR_SUCCESS)
+    {
+        LogStringW(hModule, TEXT("VBox HostInterfaces: Enumerating interfaces ..."));
         for (int i = 0;; ++ i)
         {
@@ -1262 +1226 @@
             TCHAR szNetworkConnection [256] = { 0 };
 
-            len = sizeof (szNetworkGUID);
-            status = RegEnumKeyEx (hCtrlNet, i, szNetworkGUID, &len, NULL, NULL, NULL, NULL);
-            if (status != ERROR_SUCCESS)
+            DWORD dwLen = (DWORD)sizeof(szNetworkGUID);
+            lStatus = RegEnumKeyEx(hCtrlNet, i, szNetworkGUID, &dwLen, NULL, NULL, NULL, NULL);
+            if (lStatus != ERROR_SUCCESS)
             {
-                switch (status)
+                switch (lStatus)
                 {
                 case ERROR_NO_MORE_ITEMS:
-                    LogString(a_hModule, TEXT("VBox HostInterfaces: No interfaces found."));
+                    LogStringW(hModule, TEXT("VBox HostInterfaces: No interfaces found."));
                     break;
                 default:
-                    LogString(a_hModule, TEXT("VBox HostInterfaces: Enumeration failed: %ld"), status);
+                    LogStringW(hModule, TEXT("VBox HostInterfaces: Enumeration failed: %ld"), lStatus);
                     break;
                 };
@@ -1280 +1244 @@
             if (IsTAPDevice(szNetworkGUID))
             {
-                LogString(a_hModule, TEXT("VBox HostInterfaces: Removing interface \"%s\" ..."), szNetworkGUID);
-                removeNetworkInterface (a_hModule, szNetworkGUID);
-                status = RegDeleteKey (hCtrlNet, szNetworkGUID);
+                LogStringW(hModule, TEXT("VBox HostInterfaces: Removing interface \"%s\" ..."), szNetworkGUID);
+                removeNetworkInterface (hModule, szNetworkGUID);
+                lStatus = RegDeleteKey (hCtrlNet, szNetworkGUID);
             }
         }
         RegCloseKey (hCtrlNet);
-        LogString(a_hModule, TEXT("VBox HostInterfaces: Removing interfaces done."));
+        LogStringW(hModule, TEXT("VBox HostInterfaces: Removing interfaces done."));
     }
     return ERROR_SUCCESS;

trunk/src/VBox/Installer/win/Languages/de_DE.wxl

@@ -1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<WixLocalization xmlns="http://schemas.microsoft.com/wix/2003/11/localization" Codepage='1252'>
+<?xml version="1.0" encoding="utf-8"?>
+<WixLocalization xmlns="http://schemas.microsoft.com/wix/2003/11/localization" Codepage="1252" Culture="de_DE">
 
     <!--
             Language Definition Include for VirtualBox WiX script.
 
-            Copyright (C) 2010 Oracle Corporation
+            Copyright (C) 2011 Oracle Corporation
 
             All rights reserved.

trunk/src/VBox/Installer/win/Languages/en_US.wxl

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WixLocalization xmlns="http://schemas.microsoft.com/wix/2003/11/localization" Codepage='1252'>
+<WixLocalization xmlns="http://schemas.microsoft.com/wix/2003/11/localization" Codepage="1252" Culture="en_US">
 
     <!--
             Language Definition Include for VirtualBox WiX script.
 
-            Copyright (C) 2010 Oracle Corporation
+            Copyright (C) 2011 Oracle Corporation
 
             All rights reserved.

trunk/src/VBox/Installer/win/Languages/fr_FR.wxl

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
-<WixLocalization xmlns="http://schemas.microsoft.com/wix/2003/11/localization" Codepage='1252'>
+<WixLocalization xmlns="http://schemas.microsoft.com/wix/2003/11/localization" Codepage="1252" Culture="fr_FR">
 
     <!--

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

@@ -107 +107 @@
                 $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \
         $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \
-        $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi
+        $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \
+        $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi
 
 ifdef VBOX_WITH_COMBINED_PACKAGE
@@ -146 +147 @@
 endif
 
+#
+# Surpress/skip the following ICE (internal consistency evaluators):
+# - ICE64: Checks that new directories in the user profile are removed correctly in roaming scenarios.
+#          -> We don't want to remove system folders (like "Microsoft/Internet Explorer/Quick Launch").
+#
+VBOX_MSI_ICE_IGNORE := \
+        -ice:64
 
 #
@@ -182 +190 @@
         $$(call MSG_GENERATE,,$$@,$$<)
         $(APPEND) -t $$@ '<?xml version="1.0" encoding="utf-8"?>'
-        $(APPEND) $$@ '<WixLocalization xmlns="http://schemas.microsoft.com/wix/2003/11/localization" Codepage="1252">'
+        $(APPEND) $$@ '<WixLocalization xmlns="http://schemas.microsoft.com/wix/2006/localization" Codepage="1252" Culture="$(lang)">'
 
         $(REDIRECT) -a+to $$@ -- $(ECHO_EXT) -n '<String Id=\"LicenseText\">'
@@ -210 +218 @@
         $(call MSG_GENERATE,,$@,$<)
         $(APPEND) -t $@ '<?xml version="1.0" ?>'
-        $(APPEND) $@ '<Include>'
+        $(APPEND) $@ '<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">'
   ifdef VBOX_WITH_DOCS_CHM
-                $(APPEND) $@ '  <File Id="VirtualBox.chm" Name="VBox.chm" LongName="VirtualBox.chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/VirtualBox.chm"></File>'
+                $(APPEND) $@ '  <File Id="file_VirtualBox.chm" Name="VirtualBox.chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/VirtualBox.chm"></File>'
                 $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
-                             '  <File Id="VirtualBox_$(lang).chm" Name="VB_$(lang).chm" LongName="VirtualBox_$(lang).chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/VirtualBox_$(lang).chm"></File>')
+                             '  <File Id="file_VirtualBox_$(lang).chm" Name="VirtualBox_$(lang).chm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/VirtualBox_$(lang).chm"></File>')
   endif
         $(APPEND) $@ '</Include>'
@@ -221 +229 @@
         $(call MSG_GENERATE,,$@,$<)
         $(APPEND) -t $@ '<?xml version="1.0" ?>'
-        $(APPEND) $@ '<Include>'
-        $(APPEND) $@ '  <File Id="UserManual.pdf" Name="Manual.pdf" LongName="UserManual.pdf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/UserManual.pdf">'
-        $(APPEND) $@ '          <Shortcut Id="startmenuManPDF_en_US" Directory="ProgramMenuDir" Name="M_en_US" LongName="$$(loc.StartMenu_UserManual) (English)" WorkingDirectory="INSTALLDIR"/>'
+        $(APPEND) $@ '<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">'
+        $(APPEND) $@ '  <File Id="file_UserManual.pdf" Name="UserManual.pdf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/UserManual.pdf">'
         $(APPEND) $@ '  </File>'
         $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
-                     '  <File Id="UserManual_$(lang).pdf" Name="Mn_$(lang).pdf" LongName="UserManual_$(lang).pdf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/UserManual_$(lang).pdf">' \
-                     '          <Shortcut Id="startmenuManPDF_$(lang)" Directory="ProgramMenuDir" Name="M_$(lang)" LongName="$$(loc.StartMenu_UserManual) ($(VBOX_BRAND_$(lang)_LANG_NAME))" WorkingDirectory="INSTALLDIR"/>' \
+                     '  <File Id="file_UserManual_$(lang).pdf" Name="UserManual_$(lang).pdf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(PATH_BIN)/UserManual_$(lang).pdf">' \
                      '  </File>')
         $(APPEND) $@ '</Include>'
@@ -234 +240 @@
         $(call MSG_GENERATE,,$@,$<)
         $(APPEND) -t $@ '<?xml version="1.0" ?>'
-        $(APPEND) $@ '<Include>'
-        $(APPEND) $@ '  <File Id="License_en_US.rtf" Name="Li_en_US.rtf" LongName="License_en_US.rtf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(VBOX_BRAND_LICENSE_RTF)">'
-        $(APPEND) $@ '          <Shortcut Id="startmenuLicRTF_en_US" Directory="ProgramMenuDir" Name="L_en_US" LongName="$$(loc.StartMenu_License) (English)" WorkingDirectory="INSTALLDIR"/>'
-        $(APPEND) $@ '  </File>'
+        $(APPEND) $@ '<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">'
+        $(APPEND) $@ '  <File Id="file_License_en_US.rtf" Name="License_en_US.rtf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(VBOX_BRAND_LICENSE_RTF)">' \
+                     '  </File>'
         $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
-                     '  <File Id="License_$(lang).rtf" Name="Li_$(lang).rtf" LongName="License_$(lang).rtf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(VBOX_BRAND_$(lang)_LICENSE_RTF)">' \
-                     '          <Shortcut Id="startmenuLicRTF_$(lang)" Directory="ProgramMenuDir" Name="L_$(lang)" LongName="$$(loc.StartMenu_License) ($(VBOX_BRAND_$(lang)_LANG_NAME))" WorkingDirectory="INSTALLDIR"/>' \
+                     '  <File Id="file_License_$(lang).rtf" Name="License_$(lang).rtf" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$(VBOX_BRAND_$(lang)_LICENSE_RTF)"/>' \
                      '  </File>')
         $(APPEND) $@ '</Include>'
 
+$(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi: $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(call MSG_GENERATE,,$@,$<)
+        $(APPEND) -t $@ '<?xml version="1.0" ?>'
+        $(APPEND) $@ '<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">'
+        #
+        # Documentation (PDF/CHM)
+        #
+  ifdef VBOX_WITH_DOCS_CHM
+        $(APPEND) $@ '  <Shortcut Id="sc_StartMenu_ManualCHM_en_US" Directory="dir_StartMenuVBox" Name="!(loc.StartMenu_UserManual) (CHM, English)" Description="!(loc.StartMenu_UserManual)"' \
+                     '            Target="[INSTALLDIR]VirtualBox.chm" WorkingDirectory="INSTALLDIR" Advertise="no"/>'
+        $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
+                     '  <Shortcut Id="sc_StartMenu_ManualCHM_$(lang)" Directory="dir_StartMenuVBox" Name="$!(loc.StartMenu_UserManual) (CHM, $(VBOX_BRAND_$(lang)_LANG_NAME))"' \
+                     '            Description="$!(loc.StartMenu_UserManual) ($(VBOX_BRAND_$(lang)_LANG_NAME))" Target="VirtualBox_$(lang).chm" WorkingDirectory="INSTALLDIR"/>')
+  endif
+        $(APPEND) $@ '  <Shortcut Id="sc_StartMenu_ManualPDF_en_US" Directory="dir_StartMenuVBox" Name="!(loc.StartMenu_UserManual) (PDF, English)" Description="!(loc.StartMenu_UserManual)"' \
+                     '            Target="[INSTALLDIR]UserManual.pdf" WorkingDirectory="INSTALLDIR" Advertise="no"/>'
+        $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
+                     '  <Shortcut Id="sc_StartMenu_ManualPDF_$(lang)" Directory="dir_StartMenuVBox" Name="$!(loc.StartMenu_UserManual) (PDF, $(VBOX_BRAND_$(lang)_LANG_NAME))"' \
+                     '            Description="$!(loc.StartMenu_UserManual) ($(VBOX_BRAND_$(lang)_LANG_NAME))" Target="UserManual_$(lang).pdf" WorkingDirectory="INSTALLDIR"/>')
+        #
+        # License(s) (RTF)
+        #
+        $(APPEND) $@ '  <Shortcut Id="sc_StartMenu_License_en_US" Directory="dir_StartMenuVBox" Name="!(loc.StartMenu_License) (English)" Description="!(loc.StartMenu_License)"' \
+                     '            Target="[INSTALLDIR]License_en_US.rtf" WorkingDirectory="INSTALLDIR" Advertise="no"/>'
+        $(APPEND) -n $@ $(foreach lang,$(VBOX_MANUAL_ADD_LANGUAGES), \
+                     '  <Shortcut Id="sc_StartMenu_License_$(lang)" Directory="dir_StartMenuVBox" Name="$!(loc.StartMenu_License) ($(VBOX_BRAND_$(lang)_LANG_NAME))"' \
+                     '            Description="$!(loc.StartMenu_License) ($(VBOX_BRAND_$(lang)_LANG_NAME))" Target="License_$(lang).rtf" WorkingDirectory="INSTALLDIR"/>')
+        $(APPEND) $@ '</Include>'
 
 #
@@ -264 +296 @@
                 -loc $(VBOX_WIN_INST_OUT_DIR)/Languages/Language_$(lang).wxl \
                 -loc $(VBOX_WIN_INST_OUT_DIR)/Languages/License_$(lang).wxl \
+                -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \
+                -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \
+                $(VBOX_MSI_ICE_IGNORE) \
                 -out $$@ \
                 $$< \
-                $(VBOX_PATH_WIX)/wixca.wixlib \
-                $(VBOX_PATH_DIFX)/DIFxApp.wixlib
+                $(if-expr "$(KBUILD_TARGET_ARCH)" == "x86", \
+                        $(VBOX_PATH_WIX)/difxapp_x86.wixlib, \
+                        $(VBOX_PATH_WIX)/difxapp_x64.wixlib)
         $(RM) -f $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst
         $(call VBOX_SIGN_FILE_FN,$$@)
@@ -281 +317 @@
 
 # Filter out some files depending on build type and compiler.
-VBOX_MSI_DEPENDENCIES := $(filter-out wixca.dll, $(VBOX_MSI_DEPENDENCIES))
 ifeq ($(KBUILD_TYPE),release)
  VBOX_MSI_DEPENDENCIES := $(filer-out $(PATH_OUT)/bin/VBoxDbg3.dll, $(VBOX_MSI_DEPENDENCIES))
@@ -303 +338 @@
         , $(VBOX_MSI_DEPENDENCIES))
 endif
+# TODO: Add filtering out more dependencies here!
+ifndef VBOX_WITH_QTGUI
+        $(PATH_OUT)/bin/VirtualBox.exe \
+        $(PATH_OUT)/bin/VBoxTestOGL.exe \
+        $(PATH_OUT)/bin/QtCoreVBox4.dll \
+        $(PATH_OUT)/bin/QtGuiVBox4.dll \
+        $(PATH_OUT)/bin/QtNetworkVBox4.dll \
+        $(PATH_OUT)/bin/QtOpenGLVBox4.dll \
+        $(PATH_OUT)/bin/accessible/qtaccessiblewidgets4.dll \
+        , $(VBOX_MSI_DEPENDENCIES))
+endif
+ifndef VBOX_WITH_PYTHON
+ VBOX_MSI_DEPENDENCIES := $(filer-out $ \
+        $(PATH_OUT)/bin/sdk/installer/vboxapisetup.py \
+        $(PATH_OUT)/bin/sdk/installer/vboxapi/__init__.py \
+        $(PATH_OUT)/bin/sdk/installer/vboxapi/VirtualBox_constants.py \
+        , $(VBOX_MSI_DEPENDENCIES))
+endif
+ifndef VBOX_WITH_CROGL
+ VBOX_MSI_DEPENDENCIES := $(filer-out $ \
+        $(PATH_OUT)/bin/VBoxOGLhostcrutil.dll \
+        $(PATH_OUT)/bin/VBoxOGLhosterrorspu.dll \
+        $(PATH_OUT)/bin/VBoxOGLrenderspu.dll \
+        $(PATH_OUT)/bin/VBoxSharedCrOpenGL.dll \
+        , $(VBOX_MSI_DEPENDENCIES))
+endif
+ifndef VBOX_WITH_SECURELABEL
+ VBOX_MSI_DEPENDENCIES := $(filer-out $(PATH_OUT)/bin/SDL_ttf.dll, $(VBOX_MSI_DEPENDENCIES))
+endif
+ifndef VBOX_WITH_WEBSERVICES
+ VBOX_MSI_DEPENDENCIES := $(filer-out $(PATH_OUT)/bin/vboxwebsrv.exe, $(VBOX_MSI_DEPENDENCIES))
+endif
+
 ifneq ($(KBUILD_TARGET_ARCH),amd64)
  VBOX_MSI_DEPENDENCIES := $(filter-out \
@@ -384 +452 @@
                 -E 'VBOX_USE_VCC80=$(if $(VBOX_USE_VCC80),yes,no)' \
                 -- \
-                $(VBOX_PATH_WIX)/candle.exe $(filter-out $(VBOX_VERSION_STAMP),$$<) -out $$@
+                $(VBOX_PATH_WIX)/candle.exe $(filter-out $(VBOX_VERSION_STAMP),$$<) \
+                        -ext $(VBOX_PATH_WIX)/WixUIExtension.dll \
+                        -ext $(VBOX_PATH_WIX)/WixDifxAppExtension.dll \
+                        -out $$@
 ifeq ($(lang),en_US)
 #
@@ -420 +491 @@
         $(APPEND) $@ '<Include>'
         $(APPEND) -n $@ $(foreach lang,$(VBOX_APPROVED_GUI_LANGUAGES), \
-                     '  <File Id="nlsqt${lang}"  Name="qt_${lang}.qm" LongName="qt_${lang}.qm"         DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" src="$$(env.PATH_OUT)\bin\nls\qt_${lang}.qm"         />' \
-                     '  <File Id="nlsgui${lang}" Name="vb_${lang}.qm" LongName="VirtualBox_${lang}.qm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" src="$$(env.PATH_OUT)\bin\nls\VirtualBox_${lang}.qm" />')
+                     '  <File Id="nlsqt${lang}"  Name="qt_${lang}.qm"         DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$$(env.PATH_OUT)\bin\nls\qt_${lang}.qm"         />' \
+                     '  <File Id="nlsgui${lang}" Name="VirtualBox_${lang}.qm" DiskId="$(VBOX_INSTALLER_COMMON_DISKID)" Vital="yes" Source="$$(env.PATH_OUT)\bin\nls\VirtualBox_${lang}.qm" />')
         $(APPEND) $@ '</Include>'
 
@@ -476 +547 @@
                 $(VBOX_WIN_INST_OUT_DIR)/Files_Doc.wxi \
                 $(VBOX_WIN_INST_OUT_DIR)/Files_License.wxi \
+                $(VBOX_WIN_INST_OUT_DIR)/Shortcuts_StartMenu.wxi \
                 $(foreach lang,$(VBOX_INSTALLER_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/$(PACKAGE_NAME_LANG)_$(lang).msi) \
                 $(foreach lang,$(VBOX_INSTALLER_ADD_LANGUAGES), $(VBOX_WIN_INST_OUT_DIR)/Languages/$(lang).mst) \

trunk/src/VBox/Installer/win/UserInterface.wxi

@@ -1 @@
-<?xml version="1.0" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
-    User Interface Include for VirtualBox WiX script
-
-    Copyright (C) 2006-2010 Oracle Corporation
+    User interface include for VirtualBox WiX script.
+
+    Copyright (C) 2006-2011 Oracle Corporation
 
     This file is part of VirtualBox Open Source Edition (OSE), as
@@ -14 +14 @@
 -->
 
-<Include>
-
+<Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
     <UI>
-        <Property Id="DefaultUIFont">DlgFont8</Property>
-        <!--  <Property Id="ErrorDialog">ErrorDlg</Property> -->
-
         <!-- This dialog will be shown when the user cancels the installation -->
-        <Dialog Id="CancelDlg" Width="260" Height="85" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
-            <Control Id="No" Type="PushButton" X="132" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_No)">
+        <Dialog Id="VBoxCancelDlg" Width="260" Height="85" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+            <Control Id="No" Type="PushButton" X="132" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_No)">
                 <Publish Event="EndDialog" Value="Return">1</Publish>
             </Control>
-            <Control Id="Yes" Type="PushButton" X="72" Y="57" Width="56" Height="17" Text="$(loc.ButtonText_Yes)">
+            <Control Id="Yes" Type="PushButton" X="72" Y="57" Width="56" Height="17" Text="!(loc.ButtonText_Yes)">
                 <Publish Event="EndDialog" Value="Exit">1</Publish>
             </Control>
             <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30">
-                <Text>$(loc.CancelDlg_Question)</Text>
+                <Text>!(loc.CancelDlg_Question)</Text>
             </Control>
             <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Information icon" FixedSize="yes" IconSize="32" Text="[InfoIcon]" />
@@ -35 +31 @@
 
         <!-- This is the very first page the user will see -->
-        <Dialog Id="WelcomeDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
+        <Dialog Id="VBoxWelcomeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <!-- The wizard has a bitmap as background. The source is defined as a property below. -->
             <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
@@ -41 +37 @@
             <!-- Title text drawn on the background -->
             <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgVerdanaBold13}$(loc.WelcomeDlg_Header)</Text>
+                <Text>{\DlgVerdanaBold13}!(loc.WelcomeDlg_Header)</Text>
             </Control>
 
             <!-- Text saying what we gonna do -->
             <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.WelcomeDlg_Body)</Text>
+                <Text>!(loc.WelcomeDlg_Body)</Text>
             </Control>
 
@@ -57 +53 @@
             </Control>
 
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Next)">
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)">
         <?if $(env.VBOX_WITH_LICENSE_DISPLAY) = "yes" ?>
                 <!-- Next dialog is the license agreement -->
-                <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+                <Publish Event="NewDialog" Value="VBoxLicenseAgreementDlg">1</Publish>
         <?else ?>
                 <!-- Decide which dialog to show next: The serial number dialog (if this is a branded build)
                      or directly proceed to the customization dialog (Vbox not installed yet) -->
                 <?if $(env.VBOX_WITH_SERIALNUMBER_INSTALL) = "yes" ?>
-                    <Publish Event="NewDialog" Value="CheckSerialDlg">1</Publish>
+                    <Publish Event="NewDialog" Value="VBoxCheckSerialDlg">1</Publish>
                 <?else ?>
-                    <Publish Event="NewDialog" Value="CustomizeDlg"><![CDATA[(PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED)]]></Publish>
-                    <Publish Event="NewDialog" Value="CustomizeDlg"><![CDATA[(NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED)]]></Publish>
+                    <Publish Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[(PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED)]]></Publish>
+                    <Publish Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[(NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED)]]></Publish>
                 <?endif ?>
         <?endif ?>
@@ -74 +70 @@
 
             <!-- Canceling will bring up a confirmation dialog ('SpawnDialog' attribute) -->
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
             </Control>
 
             <!-- Uncomment if we need a 'back' button
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Back)" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
             -->
         </Dialog>
@@ -85 +81 @@
         <!-- The radio button group used for the license agreement page -->
         <RadioButtonGroup Property="IAgree">
-            <RadioButton Text="{\DlgFont8}$(loc.LicenseAgreementDlg_Accept)" Value="Yes" X="5" Y="0" Width="250" Height="15" />
-            <RadioButton Text="{\DlgFont8}$(loc.LicenseAgreementDlg_Decline)" Value="No" X="5" Y="20" Width="250" Height="15" />
+            <RadioButton Text="{\DlgFont8}!(loc.LicenseAgreementDlg_Accept)" Value="Yes" X="5" Y="0" Width="250" Height="15" />
+            <RadioButton Text="{\DlgFont8}!(loc.LicenseAgreementDlg_Decline)" Value="No" X="5" Y="20" Width="250" Height="15" />
         </RadioButtonGroup>
 
         <!-- The dialog page showing the license. The user has to set the appropriate check box to proceed -->
-        <Dialog Id="LicenseAgreementDlg" Width="370" Height="270" Title="[ProductName] License Agreement" NoMinimize="yes">
+        <Dialog Id="VBoxLicenseAgreementDlg" Width="370" Height="270" Title="[ProductName] License Agreement" NoMinimize="yes">
             <!-- The bitmap at the top of the dialog. This dialog doesn't have a background -->
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
@@ -96 +92 @@
             <!-- The font used here is defined below -->
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.LicenseAgreementDlg_Header)</Text>
+                <Text>[DlgTitleFont]!(loc.LicenseAgreementDlg_Header)</Text>
             </Control>
 
             <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.LicenseAgreementDlg_Body)</Text>
+                <Text>!(loc.LicenseAgreementDlg_Body)</Text>
             </Control>
 
@@ -107 +103 @@
 
             <!-- The license text should be a RTF text so we have formatting -->
-            <Control Id="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Sunken="yes" TabSkip="no" Text="$(loc.LicenseText)"/>
+            <Control Id="AgreementText" Type="ScrollableText" X="20" Y="60" Width="330" Height="120" Sunken="yes" TabSkip="no" Text="!(loc.LicenseText)"/>
 
             <!-- This radio button group is defined below -->
@@ -120 +116 @@
             </Control>
 
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Back)">
-                <Publish Event="NewDialog" Value="WelcomeDlg">1</Publish>
-            </Control>
-
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Next)">
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)">
+                <Publish Event="NewDialog" Value="VBoxWelcomeDlg">1</Publish>
+            </Control>
+
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)">
                 <!-- 'Next' button is only enabled when 'I agree' radio button is selected -->
                 <Condition Action="disable"><![CDATA[IAgree <> "Yes"]]></Condition>
                 <Condition Action="enable">IAgree = "Yes"</Condition>
-                <Publish Property="InstallMode" Value="$(loc.InstallModeCustom)">1</Publish>
+                <Publish Property="InstallMode" Value="!(loc.InstallModeCustom)">1</Publish>
 
                 <!-- Decide which dialog to show next: The serial number dialog (if this is a branded build)
                      or directly proceed to the customization dialog (Vbox not installed yet) -->
             <?if $(env.VBOX_WITH_SERIALNUMBER_INSTALL) = "yes" ?>
-                <Publish Event="NewDialog" Value="CheckSerialDlg">1</Publish>
+                <Publish Event="NewDialog" Value="VBoxCheckSerialDlg">1</Publish>
             <?else ?>
-                <Publish Event="NewDialog" Value="CustomizeDlg"><![CDATA[(PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED)]]></Publish>
-                <Publish Event="NewDialog" Value="CustomizeDlg"><![CDATA[(NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED)]]></Publish>
+                <Publish Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[(PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED)]]></Publish>
+                <Publish Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[(NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED)]]></Publish>
             <?endif ?>
             </Control>
 
             <!-- Canceling will bring up a confirmation dialog ('SpawnDialog' attribute) -->
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-        </Dialog>
-
-        <Dialog Id="CheckSerialDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
+            </Control>
+        </Dialog>
+
+        <Dialog Id="VBoxCheckSerialDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <!-- The wizard has a bitmap as background. The source is defined as a property below. -->
             <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
 
             <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgVerdanaBold13}$(loc.CheckSerialDlg_Header)</Text>
+                <Text>{\DlgVerdanaBold13}!(loc.CheckSerialDlg_Header)</Text>
             </Control>
 
             <!-- Text saying what we gonna do -->
             <Control Id="Description" Type="Text" X="135" Y="50" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.CheckSerialDlg_Body)</Text>
+                <Text>!(loc.CheckSerialDlg_Body)</Text>
             </Control>
 
@@ -176 +172 @@
 
             <Control Id="Description3" Type="Text" X="135" Y="120" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.CheckSerialDlg_Footer)</Text>
+                <Text>!(loc.CheckSerialDlg_Footer)</Text>
             </Control>
 
@@ -187 +183 @@
             </Control>
 
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Back)">
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)">
         <?if $(env.VBOX_WITH_LICENSE_DISPLAY) = "yes" ?>
-                <Publish Event="NewDialog" Value="LicenseAgreementDlg">1</Publish>
+                <Publish Event="NewDialog" Value="VBoxLicenseAgreementDlg">1</Publish>
         <?else ?>
-                <Publish Event="NewDialog" Value="WelcomeDlg">1</Publish>
+                <Publish Event="NewDialog" Value="VBoxWelcomeDlg">1</Publish>
         <?endif ?>
             </Control>
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Check)">
-                <Publish Event="DoAction" Value="CheckSerial">1</Publish>
-                <Publish Event="NewDialog" Value="CustomizeDlg"><![CDATA[(PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED) AND (SERIALVALID = "1")]]></Publish>
-                <Publish Event="NewDialog" Value="CustomizeDlg"><![CDATA[(NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED) AND (SERIALVALID = "1")]]></Publish>
-                <Publish Event="NewDialog" Value="WrongSerialDlg"><![CDATA[SERIALVALID = "0"]]></Publish>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-
-        </Dialog>
-
-        <Dialog Id="WrongSerialDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Check)">
+                <Publish Event="DoAction" Value="ca_CheckSerial">1</Publish>
+                <Publish Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[(PREVIOUSVERSIONSINSTALLED OR NEWERVERSIONDETECTED) AND (SERIALVALID = "1")]]></Publish>
+                <Publish Event="NewDialog" Value="VBoxCustomizeDlg"><![CDATA[(NOT PREVIOUSVERSIONSINSTALLED) AND (NOT NEWERVERSIONDETECTED) AND (SERIALVALID = "1")]]></Publish>
+                <Publish Event="NewDialog" Value="VBoxWrongSerialDlg"><![CDATA[SERIALVALID = "0"]]></Publish>
+            </Control>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
+            </Control>
+
+        </Dialog>
+
+        <Dialog Id="VBoxWrongSerialDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
 
             <!-- The wizard has a bitmap as background. The source is defined as a property below. -->
@@ -213 +209 @@
             <!-- Title text drawn on the background -->
             <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgInvalidSerial}$(loc.WrongSerialDlg_Header)</Text>
+                <Text>{\DlgInvalidSerial}!(loc.WrongSerialDlg_Header)</Text>
             </Control>
 
             <!-- Text saying what we gonna do -->
             <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.WrongSerialDlg_Desc1)</Text>
+                <Text>!(loc.WrongSerialDlg_Desc1)</Text>
             </Control>
 
             <Control Id="Description2" Type="Text" X="135" Y="95" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.WrongSerialDlg_Desc2)</Text>
+                <Text>!(loc.WrongSerialDlg_Desc2)</Text>
             </Control>
 
@@ -233 +229 @@
             </Control>
 
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Back)">
-                 <Publish Event="NewDialog" Value="CheckSerialDlg">1</Publish>
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Back)">
+                 <Publish Event="NewDialog" Value="VBoxCheckSerialDlg">1</Publish>
             </Control>
 
             <!-- Canceling will bring up a confirmation dialog ('SpawnDialog' attribute) -->
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
             </Control>
 
@@ -246 +242 @@
         <!-- Dialog used to set another installation path. This is taken from the tutorial template on the web and can also be
              used for package selection etc. if necessary after some tweaking. -->
-        <Dialog Id="CustomizeDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes" TrackDiskSpace="yes">
+        <Dialog Id="VBoxCustomizeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes" TrackDiskSpace="yes">
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.CustomizeDlg_CustomSetup)</Text>
+                <Text>[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)</Text>
             </Control>
             <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.CustomizeDlg_SelFeatures)</Text>
+                <Text>!(loc.CustomizeDlg_SelFeatures)</Text>
             </Control>
             <Control Id="Text" Type="Text" X="25" Y="55" Width="320" Height="20">
-                <Text>$(loc.CustomizeDlg_IconTree)</Text>
+                <Text>!(loc.CustomizeDlg_IconTree)</Text>
             </Control>
             <Control Id="Tree" Type="SelectionTree" X="25" Y="85" Width="175" Height="95" Property="_BrowseProperty"
                      Sunken="yes" TabSkip="no" Text="Tree of selections" />
-            <Control Id="Browse" Type="PushButton" X="304" Y="200" Width="56" Height="17" Text="$(loc.ButtonText_Browse)">
-                <Publish Event="SelectionBrowse" Value="BrowseDlg">1</Publish>
+            <Control Id="Browse" Type="PushButton" X="304" Y="200" Width="56" Height="17" Text="!(loc.ButtonText_Browse)">
+                <Publish Event="SelectionBrowse" Value="VBoxBrowseDlg">1</Publish>
                 <Condition Action="hide">Installed</Condition>
             </Control>
             <Control Id="DiskCost" Type="PushButton" X="111" Y="243" Width="56" Height="17">
-                <Text>$(loc.CustomizeDlg_DiskUsage)</Text>
-                <Publish Event="SpawnDialog" Value="DiskCostDlg">1</Publish>
+                <Text>!(loc.CustomizeDlg_DiskUsage)</Text>
+                <Publish Event="SpawnDialog" Value="VBoxDiskCostDlg">1</Publish>
                 <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
             </Control>
             <Control Id="Box" Type="GroupBox" X="210" Y="81" Width="140" Height="98" />
             <Control Id="ItemDescription" Type="Text" X="215" Y="90" Width="131" Height="30">
-                <Text>$(loc.CustomizeDlg_SelItemDesc)</Text>
+                <Text>!(loc.CustomizeDlg_SelItemDesc)</Text>
                 <Subscribe Event="SelectionDescription" Attribute="Text" />
             </Control>
             <Control Id="ItemSize" Type="Text" X="215" Y="130" Width="131" Height="45">
-                <Text>$(loc.CustomizeDlg_SelItemSize)</Text>
+                <Text>!(loc.CustomizeDlg_SelItemSize)</Text>
                 <Subscribe Event="SelectionSize" Attribute="Text" />
             </Control>
             <Control Id="Location" Type="Text" X="75" Y="200" Width="215" Height="20">
-                <Text>$(loc.CustomizeDlg_SelItemPath)</Text>
+                <Text>!(loc.CustomizeDlg_SelItemPath)</Text>
                 <Subscribe Event="SelectionPath" Attribute="Text" />
                 <Subscribe Event="SelectionPathOn" Attribute="Visible" />
                 <Condition Action="hide">Installed</Condition>
             </Control>
-            <Control Id="LocationLabel" Type="Text" X="25" Y="200" Width="50" Height="10" Text="$(loc.CustomizeDlg_Location)">
+            <Control Id="LocationLabel" Type="Text" X="25" Y="200" Width="50" Height="10" Text="!(loc.CustomizeDlg_Location)">
                 <Subscribe Event="SelectionPathOn" Attribute="Visible" />
                 <Condition Action="hide">Installed</Condition>
             </Control>
 
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Back)">
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)">
         <?if $(env.VBOX_WITH_LICENSE_DISPLAY) = "yes" ?>
-                <Publish Event="NewDialog" Value="LicenseAgreementDlg"><![CDATA[(NOT CHECKSERIAL) AND (InstallMode = "$(loc.InstallModeCustom)")]]></Publish>
-                <Publish Event="NewDialog" Value="CheckSerialDlg"><![CDATA[CHECKSERIAL]]></Publish>
+                <Publish Event="NewDialog" Value="VBoxLicenseAgreementDlg"><![CDATA[(NOT CHECKSERIAL) AND (InstallMode = "!(loc.InstallModeCustom)")]]></Publish>
+                <Publish Event="NewDialog" Value="VBoxCheckSerialDlg"><![CDATA[CHECKSERIAL]]></Publish>
         <?else ?>
-                <Publish Event="NewDialog" Value="WelcomeDlg">1</Publish>
+                <Publish Event="NewDialog" Value="VBoxWelcomeDlg">1</Publish>
         <?endif ?>
             </Control>
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Next)">
-                <Publish Event="NewDialog" Value="Customize2Dlg">1</Publish>
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)">
+                <Publish Event="NewDialog" Value="VBoxCustomize2Dlg">1</Publish>
                 <Subscribe Event="SelectionNoItems" Attribute="Enabled" />
             </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-        </Dialog>
-
-        <Dialog Id="Customize2Dlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
+            </Control>
+
+            <!-- Build number text drawn left bottom -->
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
+            </Control>
+        </Dialog>
+
+        <Dialog Id="VBoxCustomize2Dlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.CustomizeDlg_CustomSetup)</Text>
+                <Text>[DlgTitleFont]!(loc.CustomizeDlg_CustomSetup)</Text>
             </Control>
             <Control Id="Description" Type="Text" X="25" Y="23" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.CustomizeDlg_SelFeatures)</Text>
+                <Text>!(loc.CustomizeDlg_SelFeatures)</Text>
             </Control>
             <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="20">
-                <Text>$(loc.Customize2Dlg_Desc)</Text>
+                <Text>!(loc.Customize2Dlg_Desc)</Text>
             </Control>
             <!-- Note the gray background behind the checkboxes. Unfortunately there's no easy way to
@@ -333 +329 @@
             <Control Id="DesktopShortcutCheckBox" Type="CheckBox" X="25" Y="95" Width="200" Height="17"
                 Property="INSTALLDESKTOPSHORTCUT" CheckBoxValue="1">
-                <Text>$(loc.Customize2Dlg_CreateShortcut)</Text>
+                <Text>!(loc.Customize2Dlg_CreateShortcut)</Text>
             </Control>
             <Control Id="QuicklaunchShortcutCheckBox" Type="CheckBox" X="25" Y="115" Width="200" Height="17"
-                Property="INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1">
-                <Text>$(loc.Customize2Dlg_CreateQuickLaunch)</Text>
+                     Property="INSTALLQUICKLAUNCHSHORTCUT" CheckBoxValue="1">
+                <Text>!(loc.Customize2Dlg_CreateQuickLaunch)</Text>
             </Control>
 
             <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17"
-                Default="yes" Cancel="yes" Text="$(loc.ButtonText_Next)">
+                Default="yes" Cancel="yes" Text="!(loc.ButtonText_Next)">
 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-                <Publish Event="NewDialog" Value="WarnDisconNetIfacesDlg"><![CDATA[(&VBoxNetworkFlt=3) AND NOT(!VBoxNetworkFlt=3)]]></Publish>
-                <Publish Event="NewDialog" Value="VerifyReadyDlg"><![CDATA[(&VBoxNetworkFlt<3)]]></Publish>
+                <Publish Event="NewDialog" Value="VBoxWarnDisconNetIfacesDlg"><![CDATA[(&ft_VBoxNetworkFlt=3) AND NOT(!ft_VBoxNetworkFlt=3)]]></Publish>
+                <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg"><![CDATA[(&ft_VBoxNetworkFlt<3)]]></Publish>
 <?else ?>
-                <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+                <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg">1</Publish>
 <?endif?>
             </Control>
             <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17"
-                Text="$(loc.ButtonText_Back)">
-                <Publish Event="NewDialog" Value="CustomizeDlg">1</Publish>
+                Text="!(loc.ButtonText_Back)">
+                <Publish Event="NewDialog" Value="VBoxCustomizeDlg">1</Publish>
             </Control>
             <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17"
-                Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-        </Dialog>
-
-        <Dialog Id="WarnDisconNetIfacesDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
+                Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
+            </Control>
+
+            <!-- Build number text drawn left bottom -->
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
+            </Control>
+        </Dialog>
+
+        <Dialog Id="VBoxWarnDisconNetIfacesDlg" Width="370" Height="270" Title="[ProductName] [Setup]" NoMinimize="yes">
 
             <!-- The wizard has a bitmap as background. The source is defined as a property below. -->
@@ -372 +368 @@
             <!-- Title text drawn on the background -->
             <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgWarnDisconNetIfaces}$(loc.WarnDisconNetIfacesDlg_Title)</Text>
+                <Text>{\DlgWarnDisconNetIfaces}!(loc.WarnDisconNetIfacesDlg_Title)</Text>
             </Control>
 
             <Control Id="Title2" Type="Text" X="135" Y="40" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgWarnDisconNetIfaces}$(loc.WarnDisconNetIfacesDlg_Title2)</Text>
+                <Text>{\DlgWarnDisconNetIfaces}!(loc.WarnDisconNetIfacesDlg_Title2)</Text>
             </Control>
 
             <!-- Text saying what we gonna do -->
             <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.WarnDisconNetIfacesDlg_Desc)</Text>
+                <Text>!(loc.WarnDisconNetIfacesDlg_Desc)</Text>
             </Control>
 
             <Control Id="Description2" Type="Text" X="135" Y="115" Width="220" Height="130" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.WarnDisconNetIfacesDlg_Question)</Text>
+                <Text>!(loc.WarnDisconNetIfacesDlg_Question)</Text>
             </Control>
 
@@ -397 +393 @@
 
             <!-- Next dialog is the warning dialog for TAP devices -->
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Yes)">
-                 <Publish Event="NewDialog" Value="VerifyReadyDlg">1</Publish>
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Yes)">
+                 <Publish Event="NewDialog" Value="VBoxVerifyReadyDlg">1</Publish>
             </Control>
 
             <!-- Canceling will bring up a confirmation dialog ('SpawnDialog' attribute) -->
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_No)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-
-        </Dialog>
-
-        <Dialog Id="DiskCostDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
-            <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_OK)">
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_No)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
+            </Control>
+
+        </Dialog>
+
+        <Dialog Id="VBoxDiskCostDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+            <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_OK)">
                 <Publish Event="EndDialog" Value="Return">1</Publish>
             </Control>
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
             <Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
-              <Text>$(loc.DiskCostDlg_SpaceRequired)</Text>
+              <Text>!(loc.DiskCostDlg_SpaceRequired)</Text>
             </Control>
             <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="40">
-                <Text>$(loc.DiskCostDlg_NotEnoughSpace)</Text>
+                <Text>!(loc.DiskCostDlg_NotEnoughSpace)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.DiskCostDlg_SpaceRequirements)</Text>
+                <Text>[DlgTitleFont]!(loc.DiskCostDlg_SpaceRequirements)</Text>
             </Control>
             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
             <Control Id="VolumeList" Type="VolumeCostList" X="20" Y="100" Width="330" Height="120" Sunken="yes" Fixed="yes" Remote="yes">
-                <Text>$(loc.DiskCostDlg_VolumeList)</Text>
+                <Text>!(loc.DiskCostDlg_VolumeList)</Text>
             </Control>
         </Dialog>
 
         <!-- Dialog used to change the installation directory -->
-        <Dialog Id="BrowseDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
+        <Dialog Id="VBoxBrowseDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <Control Id="PathEdit" Type="PathEdit" X="84" Y="202" Width="261" Height="18" Property="_BrowseProperty" Indirect="yes" />
-            <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_OK)">
+            <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_OK)">
                 <Publish Event="SetTargetPath" Value="[_BrowseProperty]">1</Publish>
                 <Publish Event="EndDialog" Value="Return">1</Publish>
             </Control>
-            <Control Id="Cancel" Type="PushButton" X="240" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
+            <Control Id="Cancel" Type="PushButton" X="240" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
                 <Publish Event="Reset" Value="0">1</Publish>
                 <Publish Event="EndDialog" Value="Return">1</Publish>
             </Control>
-            <Control Id="ComboLabel" Type="Text" X="25" Y="58" Width="44" Height="10" TabSkip="no" Text="$(loc.BrowseDlg_LookIn)" />
+            <Control Id="ComboLabel" Type="Text" X="25" Y="58" Width="44" Height="10" TabSkip="no" Text="!(loc.BrowseDlg_LookIn)" />
             <Control Id="DirectoryCombo" Type="DirectoryCombo" X="70" Y="55" Width="220" Height="80"
                      Property="_BrowseProperty" Indirect="yes" Fixed="yes" Remote="yes">
                 <Subscribe Event="IgnoreChange" Attribute="IgnoreChange" />
             </Control>
-            <Control Id="Up" Type="PushButton" X="298" Y="55" Width="19" Height="19" ToolTip="$(loc.BrowseDlg_UpOneLevelTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="[FolderUp]">
+            <Control Id="Up" Type="PushButton" X="298" Y="55" Width="19" Height="19" ToolTip="!(loc.BrowseDlg_UpOneLevelTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="[FolderUp]">
                 <Publish Event="DirectoryListUp" Value="0">1</Publish>
             </Control>
             <Control Id="NewFolder" Type="PushButton" X="325" Y="55" Width="19" Height="19"
-                     ToolTip="$(loc.BrowseDlg_CreateNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="[FolderNew]">
+                     ToolTip="!(loc.BrowseDlg_CreateNewFolderTooltip)" Icon="yes" FixedSize="yes" IconSize="16" Text="[FolderNew]">
                 <Publish Event="DirectoryListNew" Value="0">1</Publish>
             </Control>
             <Control Id="DirectoryList" Type="DirectoryList" X="25" Y="83" Width="320" Height="110"
                      Property="_BrowseProperty" Sunken="yes" Indirect="yes" TabSkip="no" />
-            <Control Id="PathLabel" Type="Text" X="25" Y="205" Width="59" Height="10" TabSkip="no" Text="$(loc.BrowseDlg_FolderName)" />
+            <Control Id="PathLabel" Type="Text" X="25" Y="205" Width="59" Height="10" TabSkip="no" Text="!(loc.BrowseDlg_FolderName)" />
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
             <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.BrowseDlg_BrowseDestFolder)</Text>
+                <Text>!(loc.BrowseDlg_BrowseDestFolder)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.BrowseDlg_ChangeCurFolder)</Text>
-            </Control>
-            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-        </Dialog>
-
-        <Dialog Id="PrepareDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" Modeless="yes">
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                <Text>[DlgTitleFont]!(loc.BrowseDlg_ChangeCurFolder)</Text>
+            </Control>
+            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+        </Dialog>
+
+        <Dialog Id="VBoxPrepareDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" Modeless="yes">
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
             </Control>
             <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
         </Dialog>
 
-        <Dialog Id="VerifyReadyDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes" TrackDiskSpace="yes">
+        <Dialog Id="VBoxVerifyReadyDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes" TrackDiskSpace="yes">
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.VerifyReadyDlg_ReadyToInstall)</Text>
+                <Text>[DlgTitleFont]!(loc.VerifyReadyDlg_ReadyToInstall)</Text>
             </Control>
             <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.VerifyReadyDlg_ReadyToBegin)</Text>
+                <Text>!(loc.VerifyReadyDlg_ReadyToBegin)</Text>
             </Control>
             <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="80">
-                <Text>$(loc.VerifyReadyDlg_ClickInstall)</Text>
-            </Control>
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Install)">
+                <Text>!(loc.VerifyReadyDlg_ClickInstall)</Text>
+            </Control>
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+            <Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Install)">
                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-                <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
+                <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
                 <Publish Event="EnableRollback" Value="False"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
-                <Publish Event="SpawnDialog" Value="OutOfDiskDlg"><![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]></Publish>
-            </Control>
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Back)">
-                <Publish Event="NewDialog" Value="Customize2Dlg"><![CDATA[InstallMode = "$(loc.InstallModeCustom)"]]></Publish>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg"><![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]></Publish>
+            </Control>
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)">
+                <Publish Event="NewDialog" Value="VBoxCustomize2Dlg"><![CDATA[InstallMode = "!(loc.InstallModeCustom)"]]></Publish>
+            </Control>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
             </Control>
 
@@ -507 +503 @@
 
         <!-- This dialog is called after successful installation -->
-        <Dialog Id="ExitDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
-            <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_Finish)">
-                <Publish Event="DoAction" Value="StartVBox"><![CDATA[STARTVBOX]]></Publish>
+        <Dialog Id="VBoxExitDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+            <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Finish)">
+                <Publish Event="DoAction" Value="ca_StartVBox"><![CDATA[STARTVBOX]]></Publish>
                 <Publish Event="EndDialog" Value="Return">1</Publish>
             </Control>
@@ -518 +514 @@
             </Control>
 
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Cancel)" />
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Cancel)" />
             <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Back)" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
             <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.ExitDlg_ClickFinish)</Text>
+                <Text>!(loc.ExitDlg_ClickFinish)</Text>
             </Control>
 
@@ -534 +530 @@
             <Control Id="StartVBoxCheckBox" Type="CheckBox" X="135" Y="115" Width="200" Height="17"
                 Property="STARTVBOX" CheckBoxValue="1">
-                <Text>$(loc.ExitDlg_StartVBox)</Text>
+                <Text>!(loc.ExitDlg_StartVBox)</Text>
                 <Condition Action="hide">
                     <![CDATA[(InstallMode="Repair") OR (InstallMode="Remove") OR
@@ -543 +539 @@
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgVerdanaBold13}$(loc.ExitDlg_InstComplete)</Text>
+                <Text>{\DlgVerdanaBold13}!(loc.ExitDlg_InstComplete)</Text>
             </Control>
         </Dialog>
 
         <!-- This dialog is called after an error during installation -->
-        <Dialog Id="FatalErrorDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
-            <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_Finish)">
+        <Dialog Id="VBoxFatalErrorDlg" ErrorDialog="yes" Width="270" Height="150" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+            <!-- Do *not* change the control IDs in the dialog! -->
+            <Control Id="ErrorIcon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Icon" FixedSize="yes" IconSize="32" Text="[ExclamationIcon]" />
+            <Control Id="ErrorText" Type="Text" X="75" Y="20" Width="155" Height="80" TabSkip="no">
+                <Text><![CDATA[{&DlgFont8}]]></Text>
+            </Control>
+            <Control Id="Y" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
+                <Text><![CDATA[{\DlgFont8}&Yes]]></Text>
+                <Publish Event="EndDialog" Value="ErrorYes">1</Publish>
+            </Control>
+            <Control Id="A" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
+                <Text><![CDATA[{\DlgFont8}&Cancel]]></Text>
+                <Publish Event="EndDialog" Value="ErrorAbort">1</Publish>
+            </Control>
+            <Control Id="C" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
+                <Text><![CDATA[{\DlgFont8}&Cancel]]></Text>
+                <Publish Event="EndDialog" Value="ErrorCancel">1</Publish>
+            </Control>
+            <Control Id="I" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
+                <Text><![CDATA[{\DlgFont8}&Ignore]]></Text>
+                <Publish Event="EndDialog" Value="ErrorIgnore">1</Publish>
+            </Control>
+            <Control Id="N" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
+                <Text><![CDATA[{\DlgFont8}&No]]></Text>
+                <Publish Event="EndDialog" Value="ErrorNo">1</Publish>
+            </Control>
+            <Control Id="O" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
+                <Text><![CDATA[{\DlgFont8}&OK]]></Text>
+                <Publish Event="EndDialog" Value="ErrorOk">1</Publish>
+            </Control>
+            <Control Id="R" Type="PushButton" X="20" Y="110" Width="80" Height="18" TabSkip="yes">
+                <Text><![CDATA[{\DlgFont8}&Retry]]></Text>
+                <Publish Event="EndDialog" Value="ErrorRetry">1</Publish>
+            </Control>
+        </Dialog>
+
+        <Dialog Id="FilesInUse" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" KeepModeless="yes">
+            <Control Id="Retry" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Retry)">
+                <Publish Event="EndDialog" Value="Retry">1</Publish>
+            </Control>
+            <Control Id="Ignore" Type="PushButton" X="235" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Ignore)">
+                <Publish Event="EndDialog" Value="Ignore">1</Publish>
+            </Control>
+            <Control Id="Exit" Type="PushButton" X="166" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Exit)">
                 <Publish Event="EndDialog" Value="Exit">1</Publish>
             </Control>
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Cancel)" />
+            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
+            <Control Id="Text" Type="Text" X="20" Y="55" Width="330" Height="50" Text="!(loc.FilesInUse_Text)" />
+            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
+            <Control Id="Description" Type="Text" X="20" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="!(loc.FilesInUse_Description)" />
+            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="[DlgTitleFont]!(loc.FilesInUse_Title)" />
+            <Control Id="List" Type="ListBox" X="20" Y="107" Width="330" Height="130" Property="FileInUseProcess" Sunken="yes" TabSkip="yes" />
+        </Dialog>
+
+        <!-- This dialog is shown if the user interrupts the installation process -->
+        <Dialog Id="VBoxUserExitDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+            <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Finish)">
+                <Publish Event="EndDialog" Value="Exit">1</Publish>
+            </Control>
+            <!-- Build number text drawn left bottom -->
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
+            </Control>
+
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Cancel)" />
             <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Back)" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgVerdanaBold13}$(loc.FatalErrorDlg_Header)</Text>
+                <Text>{\DlgVerdanaBold13}!(loc.UserExitDlg_Header)</Text>
             </Control>
             <Control Id="Description1" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.FatalErrorDlg_Desc)</Text>
+                <Text>!(loc.UserExitDlg_Desc)</Text>
             </Control>
             <Control Id="Description2" Type="Text" X="135" Y="115" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.FatalErrorDlg_Footer)</Text>
-            </Control>
-        </Dialog>
-
-        <Dialog Id="FilesInUse" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" KeepModeless="yes">
-            <Control Id="Retry" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_Retry)">
-                <Publish Event="EndDialog" Value="Retry">1</Publish>
-            </Control>
-            <Control Id="Ignore" Type="PushButton" X="235" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Ignore)">
-                <Publish Event="EndDialog" Value="Ignore">1</Publish>
-            </Control>
-            <Control Id="Exit" Type="PushButton" X="166" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Exit)">
-                <Publish Event="EndDialog" Value="Exit">1</Publish>
-            </Control>
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
-            <Control Id="Text" Type="Text" X="20" Y="55" Width="330" Height="50" Text="$(loc.FilesInUse_Text)" />
-            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Description" Type="Text" X="20" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="$(loc.FilesInUse_Description)" />
-            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="[DlgTitleFont]$(loc.FilesInUse_Title)" />
-            <Control Id="List" Type="ListBox" X="20" Y="107" Width="330" Height="130" Property="FileInUseProcess" Sunken="yes" TabSkip="yes" />
-        </Dialog>
-
-        <!-- This dialog is shown if the user interrupts the installation process -->
-        <Dialog Id="UserExitDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
-            <Control Id="Finish" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_Finish)">
-                <Publish Event="EndDialog" Value="Exit">1</Publish>
-            </Control>
-            <!-- Build number text drawn left bottom -->
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Cancel)" />
-            <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Back)" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgVerdanaBold13}$(loc.UserExitDlg_Header)</Text>
-            </Control>
-            <Control Id="Description1" Type="Text" X="135" Y="70" Width="220" Height="40" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.UserExitDlg_Desc)</Text>
-            </Control>
-            <Control Id="Description2" Type="Text" X="135" Y="115" Width="220" Height="20" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.UserExitDlg_Footer)</Text>
+                <Text>!(loc.UserExitDlg_Footer)</Text>
             </Control>
         </Dialog>
 
         <!-- Progress dialog shown during file copying and other lengthy operations -->
-        <Dialog Id="ProgressDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" Modeless="yes">
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Back)" />
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Next)" />
+        <Dialog Id="VBoxProgressDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" Modeless="yes">
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
+            </Control>
+
+            <!-- Build number text drawn left bottom -->
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
+            </Control>
+
+            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Next)" />
             <Control Id="ActionText" Type="Text" X="70" Y="100" Width="265" Height="10">
                 <Subscribe Event="ActionText" Attribute="Text" />
             </Control>
             <Control Id="Text" Type="Text" X="35" Y="65" Width="300" Height="20">
-                <Text>$(loc.ProgressDlg_PleaseWait)</Text>
+                <Text>!(loc.ProgressDlg_PleaseWait)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
@@ -647 +655 @@
         </Dialog>
 
-        <Dialog Id="ResumeDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
-            <Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="[$(loc.ButtonText_Install)]">
-                <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">CostingComplete = 1</Publish>
+        <Dialog Id="VBoxResumeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+            <Control Id="Install" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Install)">
+                <Publish Event="SpawnWaitDialog" Value="VBoxWaitForCostingDlg">CostingComplete = 1</Publish>
                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-                <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg">
+                <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg">
                     <![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]>
                 </Publish>
                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
                 <Publish Event="EnableRollback" Value="False"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
-                <Publish Event="SpawnDialog" Value="OutOfDiskDlg">
+                <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg">
                     <![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]>
                 </Publish>
@@ -662 +670 @@
 
             <!-- Build number text drawn left bottom -->
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
             </Control>
             <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Back)" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
             <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgVerdanaBold13}$(loc.ResumeDlg_Header)</Text>
+                <Text>{\DlgVerdanaBold13}!(loc.ResumeDlg_Header)</Text>
             </Control>
             <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="30" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.ResumeDlg_Desc)</Text>
+                <Text>!(loc.ResumeDlg_Desc)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
@@ -681 +689 @@
         <!-- This dialog is shown after the welcome page if the user restarts the MSI package on a system where the product is already installed. The user
              may choose to repair the installation or remove it. -->
-        <Dialog Id="MaintenanceTypeDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
+        <Dialog Id="VBoxMaintenanceTypeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <Control Id="RepairLabel" Type="Text" X="105" Y="90" Width="100" Height="10" TabSkip="no">
-                <Text>[DlgTitleFont]$(loc.MaintenanceTypeDlg_Repair)</Text>
-            </Control>
-            <Control Id="RepairButton" Type="PushButton" X="50" Y="90" Width="38" Height="38" ToolTip="$(loc.MaintenanceTypeDlg_RepairTooltip)"
+                <Text>[DlgTitleFont]!(loc.MaintenanceTypeDlg_Repair)</Text>
+            </Control>
+            <Control Id="RepairButton" Type="PushButton" X="50" Y="90" Width="38" Height="38" ToolTip="!(loc.MaintenanceTypeDlg_RepairTooltip)"
                      Icon="yes" FixedSize="yes" IconSize="32" Text="[RepairIcon]">
                 <Publish Property="InstallMode" Value="Repair">1</Publish>
-                <Publish Property="Progress1" Value="$(loc.MaintenanceTypeDlg_RepairProgress1)">1</Publish>
-                <Publish Property="Progress2" Value="$(loc.MaintenanceTypeDlg_RepairProgress2)">1</Publish>
-                <Publish Event="NewDialog" Value="VerifyRepairDlg">1</Publish>
+                <Publish Property="Progress1" Value="!(loc.MaintenanceTypeDlg_RepairProgress1)">1</Publish>
+                <Publish Property="Progress2" Value="!(loc.MaintenanceTypeDlg_RepairProgress2)">1</Publish>
+                <Publish Event="NewDialog" Value="VBoxVerifyRepairDlg">1</Publish>
             </Control>
             <Control Id="RemoveLabel" Type="Text" X="105" Y="163" Width="100" Height="10" TabSkip="no">
-                <Text>[DlgTitleFont]$(loc.MaintenanceTypeDlg_Remove)</Text>
-            </Control>
-            <Control Id="RemoveButton" Type="PushButton" X="50" Y="163" Width="38" Height="38" ToolTip="$(loc.MaintenanceTypeDlg_RemoveTooltip)"
+                <Text>[DlgTitleFont]!(loc.MaintenanceTypeDlg_Remove)</Text>
+            </Control>
+            <Control Id="RemoveButton" Type="PushButton" X="50" Y="163" Width="38" Height="38" ToolTip="!(loc.MaintenanceTypeDlg_RemoveTooltip)"
                      Icon="yes" FixedSize="yes" IconSize="32" Text="[RemoveIcon]">
                 <Publish Property="InstallMode" Value="Remove">1</Publish>
-                <Publish Property="Progress1" Value="$(loc.MaintenanceTypeDlg_RemoveProgress1)">1</Publish>
-                <Publish Property="Progress2" Value="$(loc.MaintenanceTypeDlg_RemoveProgress2)">1</Publish>
-                <Publish Event="NewDialog" Value="VerifyRemoveDlg">1</Publish>
-            </Control>
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Back)">
-                <Publish Event="NewDialog" Value="MaintenanceWelcomeDlg">1</Publish>
-            </Control>
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Next)" />
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                <Publish Property="Progress1" Value="!(loc.MaintenanceTypeDlg_RemoveProgress1)">1</Publish>
+                <Publish Property="Progress2" Value="!(loc.MaintenanceTypeDlg_RemoveProgress2)">1</Publish>
+                <Publish Event="NewDialog" Value="VBoxVerifyRemoveDlg">1</Publish>
+            </Control>
+
+            <!-- Build number text drawn left bottom -->
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
+            </Control>
+
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)">
+                <Publish Event="NewDialog" Value="VBoxMaintenanceWelcomeDlg">1</Publish>
+            </Control>
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Next)" />
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
             </Control>
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
             <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.MaintenanceTypeDlg_SelOption)</Text>
+                <Text>!(loc.MaintenanceTypeDlg_SelOption)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="240" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.MaintenanceTypeDlg_Header)</Text>
+                <Text>[DlgTitleFont]!(loc.MaintenanceTypeDlg_Header)</Text>
             </Control>
             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
             <Control Id="RemoveText" Type="Text" X="105" Y="176" Width="230" Height="20">
-                <Text>$(loc.MaintenanceTypeDlg_RemoveText)</Text>
+                <Text>!(loc.MaintenanceTypeDlg_RemoveText)</Text>
             </Control>
             <Control Id="RepairText" Type="Text" X="105" Y="102" Width="230" Height="30">
-                <Text>$(loc.MaintenanceTypeDlg_RepairText)</Text>
+                <Text>!(loc.MaintenanceTypeDlg_RepairText)</Text>
             </Control>
         </Dialog>
@@ -734 +742 @@
         <!-- This dialog is shown if the app is installed and the installation package is started again. It's the welcome
              screen for maintenance -->
-        <Dialog Id="MaintenanceWelcomeDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
+        <Dialog Id="VBoxMaintenanceWelcomeDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>{\DlgVerdanaBold13}$(loc.MaintenanceWelcomeDlg_Header)</Text>
-            </Control>
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-
-            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Next)">
-                <Publish Event="SpawnWaitDialog" Value="WaitForCostingDlg">CostingComplete = 1</Publish>
-                <Publish Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                <Text>{\DlgVerdanaBold13}!(loc.MaintenanceWelcomeDlg_Header)</Text>
+            </Control>
+
+            <!-- Build number text drawn left bottom -->
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
+            </Control>
+
+            <Control Id="Next" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Next)">
+                <Publish Event="SpawnWaitDialog" Value="VBoxWaitForCostingDlg">CostingComplete = 1</Publish>
+                <Publish Event="NewDialog" Value="VBoxMaintenanceTypeDlg">1</Publish>
+            </Control>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
             </Control>
             <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="[DialogBitmap]" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="$(loc.ButtonText_Back)" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Disabled="yes" Text="!(loc.ButtonText_Back)" />
             <Control Id="Description" Type="Text" X="135" Y="70" Width="220" Height="60" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.MaintenanceWelcomeDlg_Desc)</Text>
+                <Text>!(loc.MaintenanceWelcomeDlg_Desc)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
@@ -760 +768 @@
 
         <!-- Out of disk error dialog -->
-        <Dialog Id="OutOfDiskDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-
-            <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_OK)">
+        <Dialog Id="VBoxOutOfDiskDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+
+            <!-- Build number text drawn left bottom -->
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
+            </Control>
+
+            <Control Id="OK" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_OK)">
                 <Publish Event="EndDialog" Value="Return">1</Publish>
             </Control>
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
             <Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.OutOfDiskDlg_InstallationExceeds)</Text>
+                <Text>!(loc.OutOfDiskDlg_InstallationExceeds)</Text>
             </Control>
             <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="40">
-                <Text>$(loc.OutOfDiskDlg_NotEnoughDiskSpace)</Text>
+                <Text>!(loc.OutOfDiskDlg_NotEnoughDiskSpace)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.OutOfDiskDlg_OutOfDiskSpace)</Text>
+                <Text>[DlgTitleFont]!(loc.OutOfDiskDlg_OutOfDiskSpace)</Text>
             </Control>
             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
@@ -787 +795 @@
         </Dialog>
 
-        <Dialog Id="OutOfRbDiskDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
-            <Control Id="No" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="$(loc.ButtonText_No)">
+        <Dialog Id="VBoxOutOfRbDiskDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
+            <Control Id="No" Type="PushButton" X="304" Y="243" Width="56" Height="17" Default="yes" Cancel="yes" Text="!(loc.ButtonText_No)">
                 <Publish Event="EndDialog" Value="Return">1</Publish>
             </Control>
-            <Control Id="Yes" Type="PushButton" X="240" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Yes)">
+            <Control Id="Yes" Type="PushButton" X="240" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Yes)">
                 <Publish Event="EnableRollback" Value="False">1</Publish>
                 <Publish Event="EndDialog" Value="Return">1</Publish>
@@ -797 +805 @@
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
             <Control Id="Description" Type="Text" X="20" Y="20" Width="280" Height="20" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.OutOfRbDiskDlg_InstallationExceeds)</Text>
+                <Text>!(loc.OutOfRbDiskDlg_InstallationExceeds)</Text>
             </Control>
             <Control Id="Text" Type="Text" X="20" Y="53" Width="330" Height="40">
-                <Text>$(loc.OutOfRbDiskDlg_NotEnoughDiskSpace)</Text>
+                <Text>!(loc.OutOfRbDiskDlg_NotEnoughDiskSpace)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.OutOfRbDiskDlg_OutOfDiskSpace)</Text>
+                <Text>[DlgTitleFont]!(loc.OutOfRbDiskDlg_OutOfDiskSpace)</Text>
             </Control>
             <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
@@ -811 +819 @@
             </Control>
             <Control Id="Text2" Type="Text" X="20" Y="94" Width="330" Height="40">
-                <Text>$(loc.OutOfRbDiskDlg_Desc)</Text>
-            </Control>
-        </Dialog>
-
-        <Dialog Id="VerifyRemoveDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes" TrackDiskSpace="yes">
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Back)">
-                <Publish Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
-            </Control>
-            <Control Id="Remove" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Remove)">
+                <Text>!(loc.OutOfRbDiskDlg_Desc)</Text>
+            </Control>
+        </Dialog>
+
+        <Dialog Id="VBoxVerifyRemoveDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes" TrackDiskSpace="yes">
+
+            <!-- Build number text drawn left bottom -->
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
+            </Control>
+
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Back)">
+                <Publish Event="NewDialog" Value="VBoxMaintenanceTypeDlg">1</Publish>
+            </Control>
+            <Control Id="Remove" Type="PushButton" X="236" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Remove)">
                 <Publish Event="Remove" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-                <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
+                <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
                 <Publish Event="EnableRollback" Value="False"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
-                <Publish Event="SpawnDialog" Value="OutOfDiskDlg"><![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]></Publish>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
+                <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg"><![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]></Publish>
+            </Control>
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
             </Control>
             <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
             <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.VerifyRemoveDlg_Desc)</Text>
+                <Text>!(loc.VerifyRemoveDlg_Desc)</Text>
             </Control>
             <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="30">
-                <Text>$(loc.VerifyRemoveDlg_ClickRemove)</Text>
+                <Text>!(loc.VerifyRemoveDlg_ClickRemove)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.VerifyRemoveDlg_Header)</Text>
-            </Control>
-            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-        </Dialog>
-
-        <Dialog Id="VerifyRepairDlg" Width="370" Height="270" Title="[ProductName] $(loc.Setup)" NoMinimize="yes" TrackDiskSpace="yes">
-            <Control Id="Repair" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_Repair)">
+                <Text>[DlgTitleFont]!(loc.VerifyRemoveDlg_Header)</Text>
+            </Control>
+            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+        </Dialog>
+
+        <Dialog Id="VBoxVerifyRepairDlg" Width="370" Height="270" Title="[ProductName] !(loc.Setup)" NoMinimize="yes" TrackDiskSpace="yes">
+            <Control Id="Repair" Type="PushButton" X="236" Y="243" Width="56" Height="17" Default="yes" Text="!(loc.ButtonText_Repair)">
                 <Publish Event="ReinstallMode" Value="ecmus"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
                 <Publish Event="Reinstall" Value="All"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace <> 1]]></Publish>
-                <Publish Event="SpawnDialog" Value="OutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
+                <Publish Event="SpawnDialog" Value="VBoxOutOfRbDiskDlg"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND (PROMPTROLLBACKCOST="P" OR NOT PROMPTROLLBACKCOST)]]></Publish>
                 <Publish Event="EndDialog" Value="Return"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
                 <Publish Event="EnableRollback" Value="False"><![CDATA[OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 0 AND PROMPTROLLBACKCOST="D"]]></Publish>
-                <Publish Event="SpawnDialog" Value="OutOfDiskDlg"><![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]></Publish>
-            </Control>
-
-            <!-- Build number text drawn left bottom -->
-            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
-                <Text>[Version_text] $(var.Property_Version)</Text>
-            </Control>
-
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="SpawnDialog" Value="CancelDlg">1</Publish>
-            </Control>
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
-            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="$(loc.ButtonText_Back)">
-                <Publish Event="NewDialog" Value="MaintenanceTypeDlg">1</Publish>
+                <Publish Event="SpawnDialog" Value="VBoxOutOfDiskDlg"><![CDATA[(OutOfDiskSpace = 1 AND OutOfNoRbDiskSpace = 1) OR (OutOfDiskSpace = 1 AND PROMPTROLLBACKCOST="F")]]></Publish>
+            </Control>
+
+            <!-- Build number text drawn left bottom -->
+            <Control Id="Build" Type="Text" X="20" Y="247" Width="220" Height="10" Transparent="yes" NoPrefix="yes">
+                <Text>[Version_text] $(var.Property_Version)</Text>
+            </Control>
+
+            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.ButtonText_Cancel)">
+                <Publish Event="SpawnDialog" Value="VBoxCancelDlg">1</Publish>
+            </Control>
+            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
+            <Control Id="Back" Type="PushButton" X="180" Y="243" Width="56" Height="17" Text="!(loc.ButtonText_Back)">
+                <Publish Event="NewDialog" Value="VBoxMaintenanceTypeDlg">1</Publish>
             </Control>
             <Control Id="Description" Type="Text" X="25" Y="23" Width="280" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>$(loc.VerifyRepairDlg_ReadyToBegin)</Text>
+                <Text>!(loc.VerifyRepairDlg_ReadyToBegin)</Text>
             </Control>
             <Control Id="Text" Type="Text" X="25" Y="70" Width="320" Height="30">
-                <Text>$(loc.VerifyRepairDlg_ClickRepair)</Text>
+                <Text>!(loc.VerifyRepairDlg_ClickRepair)</Text>
             </Control>
             <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
             <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes">
-                <Text>[DlgTitleFont]$(loc.VerifyRepairDlg_Header)</Text>
-            </Control>
-            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-        </Dialog>
-
-        <Dialog Id="WaitForCostingDlg" Width="260" Height="85" Title="[ProductName] $(loc.Setup)" NoMinimize="yes">
+                <Text>[DlgTitleFont]!(loc.VerifyRepairDlg_Header)</Text>
+            </Control>
+            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
+        </Dialog>
+
+        <Dialog Id="VBoxWaitForCostingDlg" Width="260" Height="85" Title="[ProductName] !(loc.Setup)" NoMinimize="yes">
             <Control Id="Return" Type="PushButton" X="102" Y="57" Width="56" Height="17" Default="yes" Cancel="yes" Text="[ButtonText_Return]">
                 <Publish Event="EndDialog" Value="Exit">1</Publish>
             </Control>
             <Control Id="Text" Type="Text" X="48" Y="15" Width="194" Height="30">
-                <Text>$(loc.WaitForCostingDlg_PleaseWait)</Text>
+                <Text>!(loc.WaitForCostingDlg_PleaseWait)</Text>
             </Control>
             <Control Id="Icon" Type="Icon" X="15" Y="15" Width="24" Height="24" ToolTip="Exclamation icon" FixedSize="yes" IconSize="32" Text="[ExclamationIcon]" />
         </Dialog>
 
-        <!-- Dialogs used by the .MSI internally. -->
-        <Dialog Id="MsiRMFilesInUse" Width="370" Height="270" Title="[ProductName] $(loc.Setup) Test" KeepModeless="yes">
-            <Control Id="OK" Type="PushButton" X="240" Y="243" Width="56" Height="17" Default="yes" Text="$(loc.ButtonText_OK)">
-                <Publish Event="EndDialog" Value="Return">1</Publish>
-                <Publish Event="RMShutdownAndRestart" Value="0">WixUIRMOption~="UseRM"</Publish>
-            </Control>
-            <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="$(loc.ButtonText_Cancel)">
-                <Publish Event="EndDialog" Value="Exit">1</Publish>
-            </Control>
-            <Control Id="ShutdownOption" Type="RadioButtonGroup" X="26" Y="190" Width="305" Height="45" Property="WixUIRMOption">
-                <RadioButtonGroup Property="WixUIRMOption">
-                    <RadioButton Value="UseRM" X="0" Y="0" Width="295" Height="16" Text="$(loc.MsiRMFilesInUse_UseRM)" />
-                    <RadioButton Value="DontUseRM" X="0" Y="20" Width="295" Height="16" Text="$(loc.MsiRMFilesInUse_DontUseRM)" />
-                </RadioButtonGroup>
-            </Control>
-            <Control Id="List" Type="ListBox" X="20" Y="100" Width="330" Height="100" Property="FileInUseProcess" Sunken="yes" TabSkip="yes" />
-            <Control Id="BannerBitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="44" TabSkip="no" Text="[BannerBitmap]" />
-            <Control Id="Text" Type="Text" X="20" Y="55" Width="330" Height="45" Text="$(loc.MsiRMFilesInUse_Text)" />
-            <Control Id="BannerLine" Type="Line" X="0" Y="44" Width="370" Height="0" />
-            <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
-            <Control Id="Description" Type="Text" X="20" Y="23" Width="280" Height="20" Transparent="yes" NoPrefix="yes" Text="$(loc.MsiRMFilesInUse_Description)" />
-            <Control Id="Title" Type="Text" X="15" Y="6" Width="200" Height="15" Transparent="yes" NoPrefix="yes" Text="$(loc.MsiRMFilesInUse_Title)" />
-        </Dialog>
+        <!-- Dialog property table. -->
+        <Property Id="ErrorDialog" Value="VBoxFatalErrorDlg"/>
 
         <!-- Define some textstyles used for formatting dialog items. -->
+        <Property Id="DefaultUIFont">DlgFont8</Property>
         <TextStyle Id="DlgFont8" FaceName="Tahoma" Size="8" />
         <TextStyle Id="DlgFontBold8" FaceName="Tahoma" Size="8" Bold="yes" />
@@ -929 +917 @@
         <!-- The UIText table contains the localized versions of some of the strings used in the user interface.
                These strings are not part of any other table. The UIText table is for strings that have no logical place in any other table. -->
-        <ProgressText Action="CostFinalize">$(loc.ProgressTextCostFinalize)</ProgressText>
-        <ProgressText Action="CostInitialize">$(loc.ProgressTextCostInitialize)</ProgressText>
-        <ProgressText Action="FileCost">$(loc.ProgressTextFileCost)</ProgressText>
-        <ProgressText Action="InstallValidate">$(loc.ProgressTextInstallValidate)</ProgressText>
-        <ProgressText Action="InstallFiles" Template="File: [1],  Directory: [9],  Size: [6]">$(loc.ProgressTextInstallFiles)</ProgressText>
-        <ProgressText Action="InstallAdminPackage" Template="File: [1], Directory: [9], Size: [6]">$(loc.ProgressTextInstallAdminPackage)</ProgressText>
-        <ProgressText Action="CreateShortcuts" Template="Shortcut: [1]">$(loc.ProgressTextCreateShortcuts)</ProgressText>
-        <ProgressText Action="PublishComponents" Template="Component ID: [1], Qualifier: [2]">$(loc.ProgressTextPublishComponents)</ProgressText>
-        <ProgressText Action="PublishFeatures" Template="Feature: [1]">$(loc.ProgressTextPublishFeatures)</ProgressText>
-        <ProgressText Action="PublishProduct">$(loc.ProgressTextPublishProduct)</ProgressText>
-        <ProgressText Action="RegisterClassInfo" Template="Class Id: [1]">$(loc.ProgressTextRegisterClassInfo)</ProgressText>
-        <ProgressText Action="RegisterExtensionInfo" Template="Extension: [1]">$(loc.ProgressTextRegisterExtensionInfo)</ProgressText>
-        <ProgressText Action="RegisterMIMEInfo" Template="MIME Content Type: [1], Extension: [2]">$(loc.ProgressTextRegisterMIMEInfo)</ProgressText>
-        <ProgressText Action="RegisterProgIdInfo" Template="ProgId: [1]">$(loc.ProgressTextRegisterProgIdInfo)</ProgressText>
-        <ProgressText Action="AllocateRegistrySpace" Template="Free space: [1]">$(loc.ProgressTextAllocateRegistrySpace)</ProgressText>
-        <ProgressText Action="AppSearch" Template="Property: [1], Signature: [2]">$(loc.ProgressTextAppSearch)</ProgressText>
-        <ProgressText Action="BindImage" Template="File: [1]">$(loc.ProgressTextBindImage)</ProgressText>
-        <ProgressText Action="CCPSearch">$(loc.ProgressTextCCPSearch)</ProgressText>
-        <ProgressText Action="CreateFolders" Template="Folder: [1]">$(loc.ProgressTextCreateFolders)</ProgressText>
-        <ProgressText Action="DeleteServices" Template="Service: [1]">$(loc.ProgressTextDeleteServices)</ProgressText>
-        <ProgressText Action="DuplicateFiles" Template="File: [1],  Directory: [9],  Size: [6]">$(loc.ProgressTextDuplicateFiles)</ProgressText>
-        <ProgressText Action="FindRelatedProducts" Template="Found application: [1]">$(loc.ProgressTextFindRelatedProducts)</ProgressText>
-        <ProgressText Action="InstallODBC">$(loc.ProgressTextInstallODBC)</ProgressText>
-        <ProgressText Action="InstallServices" Template="Service: [2]">$(loc.ProgressTextInstallServices)</ProgressText>
-        <ProgressText Action="LaunchConditions">$(loc.ProgressTextLaunchConditions)</ProgressText>
-        <ProgressText Action="MigrateFeatureStates" Template="Application: [1]">$(loc.ProgressTextMigrateFeatureStates)</ProgressText>
-        <ProgressText Action="MoveFiles" Template="File: [1],  Directory: [9],  Size: [6]">$(loc.ProgressTextMoveFiles)</ProgressText>
-        <ProgressText Action="PatchFiles" Template="File: [1],  Directory: [2],  Size: [3]">$(loc.ProgressTextPatchFiles)</ProgressText>
-        <ProgressText Action="ProcessComponents">$(loc.ProgressTextProcessComponents)</ProgressText>
-        <ProgressText Action="RegisterComPlus" Template="AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}">$(loc.ProgressTextRegisterComPlus)</ProgressText>
-        <ProgressText Action="RegisterFonts" Template="Font: [1]">$(loc.ProgressTextRegisterFonts)</ProgressText>
-        <ProgressText Action="RegisterProduct" Template="[1]">$(loc.ProgressTextRegisterProduct)</ProgressText>
-        <ProgressText Action="RegisterTypeLibraries" Template="LibID: [1]">$(loc.ProgressTextRegisterTypeLibraries)</ProgressText>
-        <ProgressText Action="RegisterUser" Template="[1]">$(loc.ProgressTextRegisterUser)</ProgressText>
-        <ProgressText Action="RemoveDuplicateFiles" Template="File: [1], Directory: [9]">$(loc.ProgressTextRemoveDuplicateFiles)</ProgressText>
-        <ProgressText Action="RemoveEnvironmentStrings" Template="Name: [1], Value: [2], Action [3]">$(loc.ProgressTextRemoveEnvironmentStrings)</ProgressText>
-        <ProgressText Action="RemoveExistingProducts" Template="Application: [1], Command line: [2]">$(loc.ProgressTextRemoveExistingProducts)</ProgressText>
-        <ProgressText Action="RemoveFiles" Template="File: [1], Directory: [9]">$(loc.ProgressTextRemoveFiles)</ProgressText>
-        <ProgressText Action="RemoveFolders" Template="Folder: [1]">$(loc.ProgressTextRemoveFolders)</ProgressText>
-        <ProgressText Action="RemoveIniValues" Template="File: [1],  Section: [2],  Key: [3], Value: [4]">$(loc.ProgressTextRemoveIniValues)</ProgressText>
-        <ProgressText Action="RemoveODBC">$(loc.ProgressTextRemoveODBC)</ProgressText>
-        <ProgressText Action="RemoveRegistryValues" Template="Key: [1], Name: [2]">$(loc.ProgressTextRemoveRegistryValues)</ProgressText>
-        <ProgressText Action="RemoveShortcuts" Template="Shortcut: [1]">$(loc.ProgressTextRemoveShortcuts)</ProgressText>
-        <ProgressText Action="RMCCPSearch">$(loc.ProgressTextRMCCPSearch)</ProgressText>
-        <ProgressText Action="SelfRegModules" Template="File: [1], Folder: [2]">$(loc.ProgressTextSelfRegModules)</ProgressText>
-        <ProgressText Action="SelfUnregModules" Template="File: [1], Folder: [2]">$(loc.ProgressTextSelfUnregModules)</ProgressText>
-        <ProgressText Action="SetODBCFolders">$(loc.ProgressTextSetODBCFolders)</ProgressText>
-        <ProgressText Action="StartServices" Template="Service: [1]">$(loc.ProgressTextStartServices)</ProgressText>
-        <ProgressText Action="StopServices" Template="Service: [1]">$(loc.ProgressTextStopServices)</ProgressText>
-        <ProgressText Action="UnpublishComponents" Template="Component ID: [1], Qualifier: [2]">$(loc.ProgressTextUnpublishComponents)</ProgressText>
-        <ProgressText Action="UnpublishFeatures" Template="Feature: [1]">$(loc.ProgressTextUnpublishFeatures)</ProgressText>
-        <ProgressText Action="UnregisterClassInfo" Template="Class Id: [1]">$(loc.ProgressTextUnregisterClassInfo)</ProgressText>
-        <ProgressText Action="UnregisterComPlus" Template="AppId: [1]{{, AppType: [2]}}">$(loc.ProgressTextUnregisterComPlus)</ProgressText>
-        <ProgressText Action="UnregisterExtensionInfo" Template="Extension: [1]">$(loc.ProgressTextUnregisterExtensionInfo)</ProgressText>
-        <ProgressText Action="UnregisterFonts" Template="Font: [1]">$(loc.ProgressTextUnregisterFonts)</ProgressText>
-        <ProgressText Action="UnregisterMIMEInfo" Template="MIME Content Type: [1], Extension: [2]">$(loc.ProgressTextUnregisterMIMEInfo)</ProgressText>
-        <ProgressText Action="UnregisterProgIdInfo" Template="ProgId: [1]">$(loc.ProgressTextUnregisterProgIdInfo)</ProgressText>
-        <ProgressText Action="UnregisterTypeLibraries" Template="LibID: [1]">$(loc.ProgressTextUnregisterTypeLibraries)</ProgressText>
-        <ProgressText Action="WriteEnvironmentStrings" Template="Name: [1], Value: [2], Action [3]">$(loc.ProgressTextWriteEnvironmentStrings)</ProgressText>
-        <ProgressText Action="WriteIniValues" Template="File: [1],  Section: [2],  Key: [3], Value: [4]">$(loc.ProgressTextWriteIniValues)</ProgressText>
-        <ProgressText Action="WriteRegistryValues" Template="Key: [1], Name: [2], Value: [3]">$(loc.ProgressTextWriteRegistryValues)</ProgressText>
-        <ProgressText Action="Advertise">$(loc.ProgressTextAdvertise)</ProgressText>
-        <ProgressText Action="GenerateScript" Template="[1]">$(loc.ProgressTextGenerateScript)</ProgressText>
-        <ProgressText Action="InstallSFPCatalogFile" Template="File: [1],  Dependencies: [2]">$(loc.ProgressTextInstallSFPCatalogFile)</ProgressText>
-        <ProgressText Action="MsiPublishAssemblies" Template="Application Context:[1], Assembly Name:[2]">$(loc.ProgressTextMsiPublishAssemblies)</ProgressText>
-        <ProgressText Action="MsiUnpublishAssemblies" Template="Application Context:[1], Assembly Name:[2]">$(loc.ProgressTextMsiUnpublishAssemblies)</ProgressText>
-        <ProgressText Action="Rollback" Template="[1]">$(loc.ProgressTextRollback)</ProgressText>
-        <ProgressText Action="RollbackCleanup" Template="File: [1]">$(loc.ProgressTextRollbackCleanup)</ProgressText>
-        <ProgressText Action="UnmoveFiles" Template="File: [1], Directory: [9]">$(loc.ProgressTextUnmoveFiles)</ProgressText>
-        <ProgressText Action="UnpublishProduct">$(loc.ProgressTextUnpublishProduct)</ProgressText>
-
-        <UIText Id="bytes">$(loc.UITextbytes)</UIText>
-        <UIText Id="GB">$(loc.UITextGB)</UIText>
-        <UIText Id="KB">$(loc.UITextKB)</UIText>
-        <UIText Id="MB">$(loc.UITextMB)</UIText>
+        <ProgressText Action="CostFinalize">!(loc.ProgressTextCostFinalize)</ProgressText>
+        <ProgressText Action="CostInitialize">!(loc.ProgressTextCostInitialize)</ProgressText>
+        <ProgressText Action="FileCost">!(loc.ProgressTextFileCost)</ProgressText>
+        <ProgressText Action="InstallValidate">!(loc.ProgressTextInstallValidate)</ProgressText>
+        <ProgressText Action="InstallFiles" Template="File: [1],  Directory: [9],  Size: [6]">!(loc.ProgressTextInstallFiles)</ProgressText>
+        <ProgressText Action="InstallAdminPackage" Template="File: [1], Directory: [9], Size: [6]">!(loc.ProgressTextInstallAdminPackage)</ProgressText>
+        <ProgressText Action="CreateShortcuts" Template="Shortcut: [1]">!(loc.ProgressTextCreateShortcuts)</ProgressText>
+        <ProgressText Action="PublishComponents" Template="Component ID: [1], Qualifier: [2]">!(loc.ProgressTextPublishComponents)</ProgressText>
+        <ProgressText Action="PublishFeatures" Template="Feature: [1]">!(loc.ProgressTextPublishFeatures)</ProgressText>
+        <ProgressText Action="PublishProduct">!(loc.ProgressTextPublishProduct)</ProgressText>
+        <ProgressText Action="RegisterClassInfo" Template="Class Id: [1]">!(loc.ProgressTextRegisterClassInfo)</ProgressText>
+        <ProgressText Action="RegisterExtensionInfo" Template="Extension: [1]">!(loc.ProgressTextRegisterExtensionInfo)</ProgressText>
+        <ProgressText Action="RegisterMIMEInfo" Template="MIME Content Type: [1], Extension: [2]">!(loc.ProgressTextRegisterMIMEInfo)</ProgressText>
+        <ProgressText Action="RegisterProgIdInfo" Template="ProgId: [1]">!(loc.ProgressTextRegisterProgIdInfo)</ProgressText>
+        <ProgressText Action="AllocateRegistrySpace" Template="Free space: [1]">!(loc.ProgressTextAllocateRegistrySpace)</ProgressText>
+        <ProgressText Action="AppSearch" Template="Property: [1], Signature: [2]">!(loc.ProgressTextAppSearch)</ProgressText>
+        <ProgressText Action="BindImage" Template="File: [1]">!(loc.ProgressTextBindImage)</ProgressText>
+        <ProgressText Action="CCPSearch">!(loc.ProgressTextCCPSearch)</ProgressText>
+        <ProgressText Action="CreateFolders" Template="Folder: [1]">!(loc.ProgressTextCreateFolders)</ProgressText>
+        <ProgressText Action="DeleteServices" Template="Service: [1]">!(loc.ProgressTextDeleteServices)</ProgressText>
+        <ProgressText Action="DuplicateFiles" Template="File: [1],  Directory: [9],  Size: [6]">!(loc.ProgressTextDuplicateFiles)</ProgressText>
+        <ProgressText Action="FindRelatedProducts" Template="Found application: [1]">!(loc.ProgressTextFindRelatedProducts)</ProgressText>
+        <ProgressText Action="InstallODBC">!(loc.ProgressTextInstallODBC)</ProgressText>
+        <ProgressText Action="InstallServices" Template="Service: [2]">!(loc.ProgressTextInstallServices)</ProgressText>
+        <ProgressText Action="LaunchConditions">!(loc.ProgressTextLaunchConditions)</ProgressText>
+        <ProgressText Action="MigrateFeatureStates" Template="Application: [1]">!(loc.ProgressTextMigrateFeatureStates)</ProgressText>
+        <ProgressText Action="MoveFiles" Template="File: [1],  Directory: [9],  Size: [6]">!(loc.ProgressTextMoveFiles)</ProgressText>
+        <ProgressText Action="PatchFiles" Template="File: [1],  Directory: [2],  Size: [3]">!(loc.ProgressTextPatchFiles)</ProgressText>
+        <ProgressText Action="ProcessComponents">!(loc.ProgressTextProcessComponents)</ProgressText>
+        <ProgressText Action="RegisterComPlus" Template="AppId: [1]{{, AppType: [2], Users: [3], RSN: [4]}}">!(loc.ProgressTextRegisterComPlus)</ProgressText>
+        <ProgressText Action="RegisterFonts" Template="Font: [1]">!(loc.ProgressTextRegisterFonts)</ProgressText>
+        <ProgressText Action="RegisterProduct" Template="[1]">!(loc.ProgressTextRegisterProduct)</ProgressText>
+        <ProgressText Action="RegisterTypeLibraries" Template="LibID: [1]">!(loc.ProgressTextRegisterTypeLibraries)</ProgressText>
+        <ProgressText Action="RegisterUser" Template="[1]">!(loc.ProgressTextRegisterUser)</ProgressText>
+        <ProgressText Action="RemoveDuplicateFiles" Template="File: [1], Directory: [9]">!(loc.ProgressTextRemoveDuplicateFiles)</ProgressText>
+        <ProgressText Action="RemoveEnvironmentStrings" Template="Name: [1], Value: [2], Action [3]">!(loc.ProgressTextRemoveEnvironmentStrings)</ProgressText>
+        <ProgressText Action="RemoveExistingProducts" Template="Application: [1], Command line: [2]">!(loc.ProgressTextRemoveExistingProducts)</ProgressText>
+        <ProgressText Action="RemoveFiles" Template="File: [1], Directory: [9]">!(loc.ProgressTextRemoveFiles)</ProgressText>
+        <ProgressText Action="RemoveFolders" Template="Folder: [1]">!(loc.ProgressTextRemoveFolders)</ProgressText>
+        <ProgressText Action="RemoveIniValues" Template="File: [1],  Section: [2],  Key: [3], Value: [4]">!(loc.ProgressTextRemoveIniValues)</ProgressText>
+        <ProgressText Action="RemoveODBC">!(loc.ProgressTextRemoveODBC)</ProgressText>
+        <ProgressText Action="RemoveRegistryValues" Template="Key: [1], Name: [2]">!(loc.ProgressTextRemoveRegistryValues)</ProgressText>
+        <ProgressText Action="RemoveShortcuts" Template="Shortcut: [1]">!(loc.ProgressTextRemoveShortcuts)</ProgressText>
+        <ProgressText Action="RMCCPSearch">!(loc.ProgressTextRMCCPSearch)</ProgressText>
+        <ProgressText Action="SelfRegModules" Template="File: [1], Folder: [2]">!(loc.ProgressTextSelfRegModules)</ProgressText>
+        <ProgressText Action="SelfUnregModules" Template="File: [1], Folder: [2]">!(loc.ProgressTextSelfUnregModules)</ProgressText>
+        <ProgressText Action="SetODBCFolders">!(loc.ProgressTextSetODBCFolders)</ProgressText>
+        <ProgressText Action="StartServices" Template="Service: [1]">!(loc.ProgressTextStartServices)</ProgressText>
+        <ProgressText Action="StopServices" Template="Service: [1]">!(loc.ProgressTextStopServices)</ProgressText>
+        <ProgressText Action="UnpublishComponents" Template="Component ID: [1], Qualifier: [2]">!(loc.ProgressTextUnpublishComponents)</ProgressText>
+        <ProgressText Action="UnpublishFeatures" Template="Feature: [1]">!(loc.ProgressTextUnpublishFeatures)</ProgressText>
+        <ProgressText Action="UnregisterClassInfo" Template="Class Id: [1]">!(loc.ProgressTextUnregisterClassInfo)</ProgressText>
+        <ProgressText Action="UnregisterComPlus" Template="AppId: [1]{{, AppType: [2]}}">!(loc.ProgressTextUnregisterComPlus)</ProgressText>
+        <ProgressText Action="UnregisterExtensionInfo" Template="Extension: [1]">!(loc.ProgressTextUnregisterExtensionInfo)</ProgressText>
+        <ProgressText Action="UnregisterFonts" Template="Font: [1]">!(loc.ProgressTextUnregisterFonts)</ProgressText>
+        <ProgressText Action="UnregisterMIMEInfo" Template="MIME Content Type: [1], Extension: [2]">!(loc.ProgressTextUnregisterMIMEInfo)</ProgressText>
+        <ProgressText Action="UnregisterProgIdInfo" Template="ProgId: [1]">!(loc.ProgressTextUnregisterProgIdInfo)</ProgressText>
+        <ProgressText Action="UnregisterTypeLibraries" Template="LibID: [1]">!(loc.ProgressTextUnregisterTypeLibraries)</ProgressText>
+        <ProgressText Action="WriteEnvironmentStrings" Template="Name: [1], Value: [2], Action [3]">!(loc.ProgressTextWriteEnvironmentStrings)</ProgressText>
+        <ProgressText Action="WriteIniValues" Template="File: [1],  Section: [2],  Key: [3], Value: [4]">!(loc.ProgressTextWriteIniValues)</ProgressText>
+        <ProgressText Action="WriteRegistryValues" Template="Key: [1], Name: [2], Value: [3]">!(loc.ProgressTextWriteRegistryValues)</ProgressText>
+        <ProgressText Action="Advertise">!(loc.ProgressTextAdvertise)</ProgressText>
+        <ProgressText Action="GenerateScript" Template="[1]">!(loc.ProgressTextGenerateScript)</ProgressText>
+        <ProgressText Action="InstallSFPCatalogFile" Template="File: [1],  Dependencies: [2]">!(loc.ProgressTextInstallSFPCatalogFile)</ProgressText>
+        <ProgressText Action="MsiPublishAssemblies" Template="Application Context:[1], Assembly Name:[2]">!(loc.ProgressTextMsiPublishAssemblies)</ProgressText>
+        <ProgressText Action="MsiUnpublishAssemblies" Template="Application Context:[1], Assembly Name:[2]">!(loc.ProgressTextMsiUnpublishAssemblies)</ProgressText>
+        <ProgressText Action="Rollback" Template="[1]">!(loc.ProgressTextRollback)</ProgressText>
+        <ProgressText Action="RollbackCleanup" Template="File: [1]">!(loc.ProgressTextRollbackCleanup)</ProgressText>
+        <ProgressText Action="UnmoveFiles" Template="File: [1], Directory: [9]">!(loc.ProgressTextUnmoveFiles)</ProgressText>
+        <ProgressText Action="UnpublishProduct">!(loc.ProgressTextUnpublishProduct)</ProgressText>
+
+        <UIText Id="bytes">!(loc.UITextbytes)</UIText>
+        <UIText Id="GB">!(loc.UITextGB)</UIText>
+        <UIText Id="KB">!(loc.UITextKB)</UIText>
+        <UIText Id="MB">!(loc.UITextMB)</UIText>
         <UIText Id="AbsentPath"><![CDATA[-]]></UIText>
-        <UIText Id="MenuAbsent">$(loc.UITextMenuAbsent)</UIText>
-        <UIText Id="MenuAdvertise">$(loc.UITextMenuAdvertise)</UIText>
-        <UIText Id="MenuAllCD">$(loc.UITextMenuAllCD)</UIText>
-        <UIText Id="MenuAllLocal">$(loc.UITextMenuAllLocal)</UIText>
-        <UIText Id="MenuAllNetwork">$(loc.UITextMenuAllNetwork)</UIText>
-        <UIText Id="MenuCD">$(loc.UITextMenuCD)</UIText>
-        <UIText Id="MenuLocal">$(loc.UITextMenuLocal)</UIText>
-        <UIText Id="MenuNetwork">$(loc.UITextMenuNetwork)</UIText>
-        <UIText Id="ScriptInProgress">$(loc.UITextScriptInProgress)</UIText>
-        <UIText Id="SelAbsentAbsent">$(loc.UITextSelAbsentAbsent)</UIText>
-        <UIText Id="SelAbsentAdvertise">$(loc.UITextSelAbsentAdvertise)</UIText>
-        <UIText Id="SelAbsentCD">$(loc.UITextSelAbsentCD)</UIText>
-        <UIText Id="SelAbsentLocal">$(loc.UITextSelAbsentLocal)</UIText>
-        <UIText Id="SelAbsentNetwork">$(loc.UITextSelAbsentNetwork)</UIText>
-        <UIText Id="SelAdvertiseAbsent">$(loc.UITextSelAdvertiseAbsent)</UIText>
-        <UIText Id="SelAdvertiseAdvertise">$(loc.UITextSelAdvertiseAdvertise)</UIText>
-        <UIText Id="SelAdvertiseCD">$(loc.UITextSelAdvertiseCD)</UIText>
-        <UIText Id="SelAdvertiseLocal">$(loc.UITextSelAdvertiseLocal)</UIText>
-        <UIText Id="SelAdvertiseNetwork">$(loc.UITextSelAdvertiseNetwork)</UIText>
-        <UIText Id="SelCDAbsent">$(loc.UITextSelCDAbsent)</UIText>
-        <UIText Id="SelCDAdvertise">$(loc.UITextSelCDAdvertise)</UIText>
-        <UIText Id="SelCDCD">$(loc.UITextSelCDCD)</UIText>
-        <UIText Id="SelCDLocal">$(loc.UITextSelCDLocal)</UIText>
-        <UIText Id="SelChildCostNeg">$(loc.UITextSelChildCostNeg)</UIText>
-        <UIText Id="SelChildCostPos">$(loc.UITextSelChildCostPos)</UIText>
-        <UIText Id="SelCostPending">$(loc.UITextSelCostPending)</UIText>
-        <UIText Id="SelLocalAbsent">$(loc.UITextSelLocalAbsent)</UIText>
-        <UIText Id="SelLocalAdvertise">$(loc.UITextSelLocalAdvertise)</UIText>
-        <UIText Id="SelLocalCD">$(loc.UITextSelLocalCD)</UIText>
-        <UIText Id="SelLocalLocal">$(loc.UITextSelLocalLocal)</UIText>
-        <UIText Id="SelLocalNetwork">$(loc.UITextSelLocalNetwork)</UIText>
-        <UIText Id="SelNetworkAbsent">$(loc.UITextSelNetworkAbsent)</UIText>
-        <UIText Id="SelNetworkAdvertise">$(loc.UITextSelNetworkAdvertise)</UIText>
-        <UIText Id="SelNetworkLocal">$(loc.UITextSelNetworkLocal)</UIText>
-        <UIText Id="SelNetworkNetwork">$(loc.UITextSelNetworkNetwork)</UIText>
-        <UIText Id="SelParentCostNegNeg">$(loc.UITextSelParentCostNegNeg)</UIText>
-        <UIText Id="SelParentCostNegPos">$(loc.UITextSelParentCostNegPos)</UIText>
-        <UIText Id="SelParentCostPosNeg">$(loc.UITextSelParentCostPosNeg)</UIText>
-        <UIText Id="SelParentCostPosPos">$(loc.UITextSelParentCostPosPos)</UIText>
-        <UIText Id="TimeRemaining">$(loc.UITextTimeRemaining)</UIText>
-        <UIText Id="VolumeCostAvailable">$(loc.UITextVolumeCostAvailable)</UIText>
-        <UIText Id="VolumeCostDifference">$(loc.UITextVolumeCostDifference)</UIText>
-        <UIText Id="VolumeCostRequired">$(loc.UITextVolumeCostRequired)</UIText>
-        <UIText Id="VolumeCostSize">$(loc.UITextVolumeCostSize)</UIText>
-        <UIText Id="VolumeCostVolume">$(loc.UITextVolumeCostVolume)</UIText>
+        <UIText Id="MenuAbsent">!(loc.UITextMenuAbsent)</UIText>
+        <UIText Id="MenuAdvertise">!(loc.UITextMenuAdvertise)</UIText>
+        <UIText Id="MenuAllCD">!(loc.UITextMenuAllCD)</UIText>
+        <UIText Id="MenuAllLocal">!(loc.UITextMenuAllLocal)</UIText>
+        <UIText Id="MenuAllNetwork">!(loc.UITextMenuAllNetwork)</UIText>
+        <UIText Id="MenuCD">!(loc.UITextMenuCD)</UIText>
+        <UIText Id="MenuLocal">!(loc.UITextMenuLocal)</UIText>
+        <UIText Id="MenuNetwork">!(loc.UITextMenuNetwork)</UIText>
+        <UIText Id="ScriptInProgress">!(loc.UITextScriptInProgress)</UIText>
+        <UIText Id="SelAbsentAbsent">!(loc.UITextSelAbsentAbsent)</UIText>
+        <UIText Id="SelAbsentAdvertise">!(loc.UITextSelAbsentAdvertise)</UIText>
+        <UIText Id="SelAbsentCD">!(loc.UITextSelAbsentCD)</UIText>
+        <UIText Id="SelAbsentLocal">!(loc.UITextSelAbsentLocal)</UIText>
+        <UIText Id="SelAbsentNetwork">!(loc.UITextSelAbsentNetwork)</UIText>
+        <UIText Id="SelAdvertiseAbsent">!(loc.UITextSelAdvertiseAbsent)</UIText>
+        <UIText Id="SelAdvertiseAdvertise">!(loc.UITextSelAdvertiseAdvertise)</UIText>
+        <UIText Id="SelAdvertiseCD">!(loc.UITextSelAdvertiseCD)</UIText>
+        <UIText Id="SelAdvertiseLocal">!(loc.UITextSelAdvertiseLocal)</UIText>
+        <UIText Id="SelAdvertiseNetwork">!(loc.UITextSelAdvertiseNetwork)</UIText>
+        <UIText Id="SelCDAbsent">!(loc.UITextSelCDAbsent)</UIText>
+        <UIText Id="SelCDAdvertise">!(loc.UITextSelCDAdvertise)</UIText>
+        <UIText Id="SelCDCD">!(loc.UITextSelCDCD)</UIText>
+        <UIText Id="SelCDLocal">!(loc.UITextSelCDLocal)</UIText>
+        <UIText Id="SelChildCostNeg">!(loc.UITextSelChildCostNeg)</UIText>
+        <UIText Id="SelChildCostPos">!(loc.UITextSelChildCostPos)</UIText>
+        <UIText Id="SelCostPending">!(loc.UITextSelCostPending)</UIText>
+        <UIText Id="SelLocalAbsent">!(loc.UITextSelLocalAbsent)</UIText>
+        <UIText Id="SelLocalAdvertise">!(loc.UITextSelLocalAdvertise)</UIText>
+        <UIText Id="SelLocalCD">!(loc.UITextSelLocalCD)</UIText>
+        <UIText Id="SelLocalLocal">!(loc.UITextSelLocalLocal)</UIText>
+        <UIText Id="SelLocalNetwork">!(loc.UITextSelLocalNetwork)</UIText>
+        <UIText Id="SelNetworkAbsent">!(loc.UITextSelNetworkAbsent)</UIText>
+        <UIText Id="SelNetworkAdvertise">!(loc.UITextSelNetworkAdvertise)</UIText>
+        <UIText Id="SelNetworkLocal">!(loc.UITextSelNetworkLocal)</UIText>
+        <UIText Id="SelNetworkNetwork">!(loc.UITextSelNetworkNetwork)</UIText>
+        <UIText Id="SelParentCostNegNeg">!(loc.UITextSelParentCostNegNeg)</UIText>
+        <UIText Id="SelParentCostNegPos">!(loc.UITextSelParentCostNegPos)</UIText>
+        <UIText Id="SelParentCostPosNeg">!(loc.UITextSelParentCostPosNeg)</UIText>
+        <UIText Id="SelParentCostPosPos">!(loc.UITextSelParentCostPosPos)</UIText>
+        <UIText Id="TimeRemaining">!(loc.UITextTimeRemaining)</UIText>
+        <UIText Id="VolumeCostAvailable">!(loc.UITextVolumeCostAvailable)</UIText>
+        <UIText Id="VolumeCostDifference">!(loc.UITextVolumeCostDifference)</UIText>
+        <UIText Id="VolumeCostRequired">!(loc.UITextVolumeCostRequired)</UIText>
+        <UIText Id="VolumeCostSize">!(loc.UITextVolumeCostSize)</UIText>
+        <UIText Id="VolumeCostVolume">!(loc.UITextVolumeCostVolume)</UIText>
 
         <!-- Own error messages -->
-        <Error Id="25001">$(loc.Error25001)</Error>
+        <Error Id="25001">!(loc.Error25001)</Error>
 
         <!-- The text used in front of the build number -->
@@ -1063 +1051 @@
         <Property Id="IAgree">No</Property>
 
-        <!-- Aliases for the icon files -->
+        <!-- Icon files used for the UI -->
+        <Binary Id="infoico" SourceFile="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Info.ico" />
+        <Binary Id="exclico" SourceFile="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Exclamation.ico" />
+        <Binary Id="folderupico" SourceFile="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Up.ico" />
+        <Binary Id="foldernewico" SourceFile="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\New.ico" />
+        <Binary Id="removico" SourceFile="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Remove.ico" />
+        <Binary Id="repairic" SourceFile="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Repair.ico" />
+
+        <!-- Graphic files used for the UI -->
+        <!-- See: http://wix.sourceforge.net/manual-wix3/WixUI_customizations.htm -->
+        <Binary Id="bannerjpg" SourceFile="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Banner.jpg" />
+        <Binary Id="dlgjpg" SourceFile="$(env.VBOX_BRAND_WIN_INST_DLGJPG)" />
+
+        <!-- Aliases for the graphic files -->
+        <Property Id="InfoIcon">infoico</Property>
+        <Property Id="ExclamationIcon">exclico</Property>
         <Property Id="RemoveIcon">removico</Property>
         <Property Id="RepairIcon">repairic</Property>
-
-        <!-- Icon files used for the UI -->
-        <Binary Id="removico" src="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Remove.ico" />
-        <Binary Id="repairic" src="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Repair.ico" />
-        <Binary Id="folderupico" src="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Up.ico" />
-        <Binary Id="foldernewico" src="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\New.ico" />
-
-        <!-- Graphic files used for the UI -->
-        <!-- See: http://wix.sourceforge.net/manual-wix3/WixUI_customizations.htm -->
-        <Binary Id="bannerjpg" src="$(env.VBOX_PATH_WIN_INST_SRC)\Binary\Banner.jpg" />
-        <Binary Id="dlgjpg" src="$(env.VBOX_BRAND_WIN_INST_DLGJPG)" />
-
-        <!-- Aliases for the graphic files -->
         <Property Id="DialogBitmap">dlgjpg</Property>
         <Property Id="BannerBitmap">bannerjpg</Property>
@@ -1084 +1074 @@
         <Property Id="FolderNew">foldernewico</Property>
 
-        <Binary Id="wixca" src="wixca.dll"/>
-
         <!-- This defines the order in which the GUI panels will be shown to the user -->
         <InstallUISequence>
 
-            <Custom Action="OriginalTargetDir" After="FileCost"><![CDATA[(NOT INSTALLDIR) AND (NOT EXISTINGINSTALLDIR)]]></Custom>
-            <Custom Action="DefaultTargetDir" After="FileCost"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom>
+            <Custom Action="ca_OriginalTargetDir" After="FileCost"><![CDATA[(NOT INSTALLDIR) AND (NOT EXISTINGINSTALLDIR)]]></Custom>
+            <Custom Action="ca_DefaultTargetDir" After="FileCost"><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom>
 
             <FindRelatedProducts Suppress="no">1</FindRelatedProducts>
 
-            <Show Dialog="FatalErrorDlg" OnExit="error" />
-            <Show Dialog="UserExitDlg" OnExit="cancel" />
-            <Show Dialog="PrepareDlg" After="LaunchConditions" />
-            <Show Dialog="WelcomeDlg" After="MigrateFeatureStates">NOT Installed</Show>
-            <Show Dialog="ResumeDlg" After="WelcomeDlg">Installed AND (RESUME OR Preselected)</Show>
-            <Show Dialog="MaintenanceWelcomeDlg" After="ResumeDlg">Installed AND (NOT RESUME) AND (NOT Preselected)</Show>
-            <Show Dialog="ExitDlg" OnExit="success">1</Show>
-            <Show Dialog="ProgressDlg" After="MaintenanceWelcomeDlg" />
+            <Show Dialog="VBoxFatalErrorDlg" OnExit="error" />
+            <Show Dialog="VBoxUserExitDlg" OnExit="cancel" />
+            <Show Dialog="VBoxPrepareDlg" After="LaunchConditions" />
+            <Show Dialog="VBoxWelcomeDlg" After="MigrateFeatureStates">NOT Installed</Show>
+            <Show Dialog="VBoxResumeDlg" After="VBoxWelcomeDlg">Installed AND (RESUME OR Preselected)</Show>
+            <Show Dialog="VBoxMaintenanceWelcomeDlg" After="VBoxResumeDlg">Installed AND (NOT RESUME) AND (NOT Preselected)</Show>
+            <Show Dialog="VBoxExitDlg" OnExit="success">1</Show>
+            <Show Dialog="VBoxProgressDlg" After="VBoxMaintenanceWelcomeDlg" />
         </InstallUISequence>
+
+        <!-- The AdminUISequence table lists actions that the installer calls in sequence when the top-level ADMIN
+             action is executed and the internal user interface level is set to full UI or reduced UI. The installer
+             skips the actions in this table if the user interface level is set to basic UI or no UI. -->
+         <AdminUISequence>
+            <Show Dialog="VBoxFatalErrorDlg" OnExit="error" />
+            <Show Dialog="VBoxUserExitDlg" OnExit="cancel" />
+            <Show Dialog="VBoxExitDlg" OnExit="success" />
+         </AdminUISequence>
     </UI>
 

trunk/src/VBox/Installer/win/VBoxKey.wxi

@@ -1 +1 @@
 <Include>
-    <Registry Root="HKLM" Key="$(var.Property_RegKey)" Name="Version" Value="%VER%" Type="string" />
-    <Registry Root="HKLM" Key="$(var.Property_RegKey)" Name="VersionExt" Value="%VER_EXT%" Type="string" />
-    <Registry Root="HKLM" Key="$(var.Property_RegKey)" Name="InstallDir" Value="[INSTALLDIR]" Type="string" />
+    <RegistryValue Root="HKLM" Key="$(var.Property_RegKey)" Name="Version" Value="%VER%" Type="string" />
+    <RegistryValue Root="HKLM" Key="$(var.Property_RegKey)" Name="VersionExt" Value="%VER_EXT%" Type="string" />
+    <RegistryValue Root="HKLM" Key="$(var.Property_RegKey)" Name="InstallDir" Value="[INSTALLDIR]" Type="string" />
 </Include>

trunk/src/VBox/Installer/win/VirtualBox.wxs

@@ -14 +14 @@
 -->
 
-<?define Property_RegKey ="Software\$(env.VBOX_VENDOR_SHORT)\VirtualBox" ?>
+<?define Property_RegKey = "Software\$(env.VBOX_VENDOR_SHORT)\VirtualBox" ?>
+<?define Property_RegKeyInstall = "Software\$(env.VBOX_VENDOR_SHORT)\VirtualBox\Install" ?>
 <?define Property_Version = "$(env.VBOX_VERSION_STRING_RAW)" ?>
 <?define Property_VersionExt = "$(env.VBOX_VERSION_STRING)" ?>
@@ -32 +33 @@
 <?else ?>
     <?define Property_ProgramFiles = "ProgramFilesFolder" ?>
-    <?define Property_Platform     = "Intel" ?>
+    <?define Property_Platform     = "x86" ?>
     <?define Property_Win64        = "no" ?>
 
@@ -50 +51 @@
 <?endif ?>
 
-<Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+     xmlns:difxapp="http://schemas.microsoft.com/wix/DifxAppExtension">
 
     <!-- Note: GUIDs in WiX *must* be uppercase! -->
@@ -65 +67 @@
          Old upgrade code of innotek: UpgradeCode="F5FFAEBF-97AE-4038-8F91-4DE719456127" -->
 
-    <Product Id="????????-????-????-????-????????????"
+    <Product Id="*"
              UpgradeCode="C4BAD770-BFE8-4D2C-A592-693028A7215B"
              Name="$(env.VBOX_PRODUCT) $(env.VBOX_VERSION_STRING)"
-             Language="$(loc.LANG)"
+             Language="!(loc.LANG)"
              Codepage="1252"
              Version="$(var.Property_Version)"
@@ -74 +76 @@
 
         <!-- Package GUIDs must be different for each package. The "???" directs WiX to create one. -->
-        <Package Id="????????-????-????-????-????????????" Keywords="Installer"
+        <Package Id="*" Keywords="Installer"
                  Description="$(env.VBOX_PRODUCT) $(var.Property_VersionExt) installation package"
                  Comments="$(env.VBOX_PRODUCT) installation package"
@@ -81 +83 @@
                  Compressed="yes"
                  InstallPrivileges="elevated"
-                 Platforms="$(var.Property_Platform)"/>
+                 Platform="$(var.Property_Platform)"/>
 
         <!-- *************************** Upgrade packages only ******************************* -->
@@ -118 +120 @@
         <!-- Make sure installation will not start on anything other but the NT family -->
 <?if $(env.BUILD_TARGET_ARCH) = "amd64" ?>
-        <Condition Message="$(loc.Only64Bit)">
+        <Condition Message="!(loc.Only64Bit)">
             VersionNT64
         </Condition>
 <?else ?>
-        <Condition Message="$(loc.Only32Bit)">
+        <Condition Message="!(loc.Only32Bit)">
             NOT VersionNT64
         </Condition>
 
-        <Condition Message="$(loc.WrongOS)">
+        <Condition Message="!(loc.WrongOS)">
             NOT VersionNT=500 AND NOT Version9X AND NOT VersionNT64
         </Condition>
@@ -132 +134 @@
 <?endif ?>
 
-        <Condition Message="$(loc.NeedAdmin)">
+        <Condition Message="!(loc.NeedAdmin)">
             Privileged
         </Condition>
 
-        <!-- Force overwriting all files and re-create shortcuts to guarantee a working environment. -->
+        <!-- Force overwriting all files and re-create shortcuts to guarantee a working environment -->
         <Property Id='REINSTALLMODE' Value='amus'/>
 
@@ -143 +145 @@
         <!-- Figure out where a previous installation was, if any -->
 <?if $(env.BUILD_TARGET_ARCH) = "amd64" ?>
-        <CustomAction Id="OriginalTargetDir" Execute="firstSequence" Property="INSTALLDIR" Value="[ProgramFiles64Folder]\$(env.VBOX_VENDOR_SHORT)\VirtualBox" />
+        <CustomAction Id="ca_OriginalTargetDir" Execute="firstSequence" Property="INSTALLDIR" Value="[ProgramFiles64Folder]\$(env.VBOX_VENDOR_SHORT)\VirtualBox" />
 
         <Property Id="EXISTINGINSTALLDIR" Secure="yes">
             <RegistrySearch Id="RegistryGetInstallPath" Root="HKLM" Key="$(var.Property_RegKey)" Name="InstallDir" Type="raw" Win64="$(var.Property_Win64)"/>
         </Property>
-        <CustomAction Id="DefaultTargetDir" Execute="firstSequence" Property="INSTALLDIR" Value="[EXISTINGINSTALLDIR]" />
+        <CustomAction Id="ca_DefaultTargetDir" Execute="firstSequence" Property="INSTALLDIR" Value="[EXISTINGINSTALLDIR]" />
 <?else ?>
-        <CustomAction Id="OriginalTargetDir" Execute="firstSequence" Property="INSTALLDIR" Value="[ProgramFilesFolder]\$(env.VBOX_VENDOR_SHORT)\VirtualBox" />
+        <CustomAction Id="ca_OriginalTargetDir" Execute="firstSequence" Property="INSTALLDIR" Value="[ProgramFilesFolder]\$(env.VBOX_VENDOR_SHORT)\VirtualBox" />
 
         <Property Id="EXISTINGINSTALLDIR" Secure="yes">
             <RegistrySearch Id="RegistryGetInstallPath" Root="HKLM" Key="$(var.Property_RegKey)" Name="InstallDir" Type="raw" Win64="$(var.Property_Win64)"/>
         </Property>
-        <CustomAction Id="DefaultTargetDir" Execute="firstSequence" Property="INSTALLDIR" Value="[EXISTINGINSTALLDIR]" />
+        <CustomAction Id="ca_DefaultTargetDir" Execute="firstSequence" Property="INSTALLDIR" Value="[EXISTINGINSTALLDIR]" />
 <?endif ?>
 
         <Binary Id="VBoxInstallHelper" SourceFile="$(env.PATH_OUT)\bin\VBoxInstallHelper.dll" />
-        <CustomAction Id="CheckSerial" BinaryKey="VBoxInstallHelper" DllEntry="CheckSerial" Impersonate="no"/>
-        <CustomAction Id="InstallPythonAPI" BinaryKey="VBoxInstallHelper" DllEntry="InstallPythonAPI" Impersonate="no"/>
-        <CustomAction Id="InstallBranding" BinaryKey="VBoxInstallHelper" DllEntry="InstallBranding" Impersonate="no"/>
-        <CustomAction Id="UninstallBranding" BinaryKey="VBoxInstallHelper" DllEntry="UninstallBranding" Impersonate="no"/>
-
-        <CustomAction Id="UninstallTAPInstances" BinaryKey="VBoxInstallHelper"
-            DllEntry="UninstallTAPInstances" Execute="deferred" Return="check" Impersonate="no"/>
+        <CustomAction Id="ca_CheckSerial" BinaryKey="VBoxInstallHelper" DllEntry="CheckSerial" Impersonate="no"/>
+        <CustomAction Id="ca_InstallPythonAPI" BinaryKey="VBoxInstallHelper" DllEntry="InstallPythonAPI" Execute="deferred" Impersonate="no"/>
+        <CustomAction Id="ca_InstallBranding" BinaryKey="VBoxInstallHelper" DllEntry="InstallBranding" Execute="deferred" Impersonate="no"/>
+        <CustomAction Id="ca_UninstallBranding" BinaryKey="VBoxInstallHelper" DllEntry="UninstallBranding" Execute="deferred" Impersonate="no"/>
+
+        <CustomAction Id="ca_UninstallTAPInstances" BinaryKey="VBoxInstallHelper"
+                      DllEntry="UninstallTAPInstances" Execute="deferred" Return="check" Impersonate="no"/>
 
 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-        <CustomAction Id="CreateHostOnlyInterfaceArgs" Property="CreateHostOnlyInterface" Value="[INSTALLDIR]" Execute="immediate"/>
-        <CustomAction Id="CreateHostOnlyInterface"  BinaryKey="VBoxInstallHelper"  DllEntry="CreateHostOnlyInterface"   Execute="deferred" Return="check" Impersonate="no"/>
-
-        <CustomAction Id="RemoveHostOnlyInterfaces" BinaryKey="VBoxInstallHelper"  DllEntry="RemoveHostOnlyInterfaces"  Execute="deferred" Return="check" Impersonate="no"/>
-
-        <CustomAction Id="InstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
-        <CustomAction Id="InstallNetFltArgs" Property="InstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
-
-        <CustomAction Id="RollbackInstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="rollback" Impersonate="no"/>
-        <CustomAction Id="RollbackInstallNetFltArgs" Property="RollbackInstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
-
-        <CustomAction Id="UninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
-        <CustomAction Id="UninstallNetFltArgs" Property="UninstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
-
-        <CustomAction Id="RollbackUninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="rollback" Impersonate="no"/>
-        <CustomAction Id="RollbackUninstallNetFltArgs" Property="RollbackUninstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
-<?endif ?>
-
-        <CustomAction Id="StartVBox" FileKey="vbox" ExeCommand="" Return="asyncNoWait" Impersonate="yes" />
-
-        <!-- Detect old Sun installation. -->
-        <!-- Force a manual uninstall of an already installed Sun VirtualBox version first. -->
+        <CustomAction Id="ca_CreateHostOnlyInterfaceArgs" Property="ca_CreateHostOnlyInterface" Value="[INSTALLDIR]" Execute="immediate"/>
+        <CustomAction Id="ca_CreateHostOnlyInterface"  BinaryKey="VBoxInstallHelper"  DllEntry="CreateHostOnlyInterface" Execute="deferred" Return="check" Impersonate="no"/>
+
+        <CustomAction Id="ca_RemoveHostOnlyInterfaces" BinaryKey="VBoxInstallHelper"  DllEntry="RemoveHostOnlyInterfaces" Execute="deferred" Return="check" Impersonate="no"/>
+
+        <CustomAction Id="ca_InstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
+        <CustomAction Id="ca_InstallNetFltArgs" Property="ca_InstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
+
+        <CustomAction Id="ca_RollbackInstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="rollback" Impersonate="no"/>
+        <CustomAction Id="ca_RollbackInstallNetFltArgs" Property="ca_RollbackInstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
+
+        <CustomAction Id="ca_UninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="UninstallNetFlt" Execute="deferred" Return="check" Impersonate="no"/>
+        <CustomAction Id="ca_UninstallNetFltArgs" Property="ca_UninstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
+
+        <CustomAction Id="ca_RollbackUninstallNetFlt" BinaryKey="VBoxInstallHelper" DllEntry="InstallNetFlt" Execute="rollback" Impersonate="no"/>
+        <CustomAction Id="ca_RollbackUninstallNetFltArgs" Property="ca_RollbackUninstallNetFlt" Value="[INSTALLDIR]" Execute="immediate"/>
+<?endif ?>
+
+        <CustomAction Id="ca_StartVBox" FileKey="file_VirtualBox.exe" ExeCommand="" Return="asyncNoWait" Impersonate="yes" />
+
+        <!-- Detect old Sun installation -->
+        <!-- Force a manual uninstall of an already installed Sun VirtualBox version first -->
         <!--<Property Id="VBOXSUN">
             <RegistrySearch Id="RegSearchSunVersion" Root="HKLM" Key="SOFTWARE\Sun\VirtualBox" Name="Version" Type="raw" Win64="$(var.Property_Win64)"/>
         </Property>
-        <Condition Message="$(loc.SunFound)">
+        <Condition Message="!(loc.SunFound)">
             NOT VBOXSUN
         </Condition>-->
 
-        <!-- Detect old innotek installation. -->
-        <!-- Force a manual uninstall of an already installed innotek VirtualBox version first. -->
+        <!-- Detect old innotek installation -->
+        <!-- Force a manual uninstall of an already installed innotek VirtualBox version first -->
         <Property Id="VBOXINNOTEK">
             <RegistrySearch Id="RegSearchInnotekVersion" Root="HKLM" Key="SOFTWARE\Innotek\VirtualBox" Name="Version" Type="raw" Win64="$(var.Property_Win64)"/>
         </Property>
-        <Condition Message="$(loc.InnotekFound)">
+        <Condition Message="!(loc.InnotekFound)">
             NOT VBOXINNOTEK
         </Condition>
@@ -214 +216 @@
         <Directory Id="TARGETDIR" Name="SourceDir">
            <Directory Id="$(var.Property_ProgramFiles)" Name="PFiles">
-                <Directory Id="INSTALLDIR" Name="VirtualB" LongName="$(env.VBOX_PRODUCT)">
+                <Directory Id="INSTALLDIR" Name="$(env.VBOX_PRODUCT)">
 
 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
-                    <Directory Id="documents" Name="doc">
+                    <Directory Id="dir_Documents" Name="doc">
                         <!-- The documentation is a separate component. This allows to split the install process
                              into pieces if ever necessary. Maintenance is easier, too. The following component
                              will be installed in the "doc" folder. -->
-                        <Component Id="docs" Guid="40BD12C5-89A8-4B81-8A5E-5EEE2C2763C4">
+                        <Component Id="cp_Docs" Guid="40BD12C5-89A8-4B81-8A5E-5EEE2C2763C4">
                             <?include $(env.PATH_TARGET)\Files_Doc.wxi ?>
                         </Component>
-
                     </Directory>
 <?endif ?>
                     <!-- Device driver directory -->
-                    <Directory Id="drivers" Name="drivers">
-
-                        <Directory Id="vboxdrv" Name="vboxdrv">
-                            <Component Id="VBoxDrv" Guid="D3E2F2BB-569F-46A2-836C-BDF30FF1EDF8"
-                                       DriverSequence="2" DriverLegacy="$(var.Property_DriverLegacy)" DriverForceInstall="yes"
-                                       DriverAddRemovePrograms="no" DriverPlugAndPlayPrompt="no" Win64="$(var.Property_Win64)">
-                                <File Id="vboxdrvsys" Name="VBoxDrv.sys" DiskId="1" Vital="yes" KeyPath="yes"
+                    <Directory Id="dir_Drivers" Name="drivers">
+                        <Directory Id="dir_VBoxDrv" Name="vboxdrv">
+                            <Component Id="cp_VBoxDrv" Guid="D3E2F2BB-569F-46A2-836C-BDF30FF1EDF8" Win64="$(var.Property_Win64)">
+                                <difxapp:Driver AddRemovePrograms="no" ForceInstall="yes"
+                                                Legacy="$(var.Property_DriverLegacy)" Sequence="2" PlugAndPlayPrompt="no"/>
+                                <File Id="file_VBoxDrv.sys" Name="VBoxDrv.sys"   KeyPath="yes"
                                       Source="$(env.PATH_OUT)\bin\VBoxDrv.sys"/>
-                                <File Id="vboxdrvinf" Name="VBoxDrv.inf" DiskId="1" Vital="yes"
+                                <File Id="file_VBoxDrv.inf" Name="VBoxDrv.inf"
                                       Source="$(env.PATH_OUT)\bin\VBoxDrv.inf" />
 <?if $(env.VBOX_SIGNING_MODE) != none ?>
-                                <File Id="vboxdrvcat" Name="VBoxDrv.cat" DiskId="1" Vital="yes"
+                                <File Id="file_VBoxDrv.cat" Name="VBoxDrv.cat"
                                       Source="$(env.PATH_OUT)\bin\VBoxDrv.cat" />
 <?endif ?>
-                            </Component> <!-- Directory "drivers\vboxdrv" -->
+                            </Component>
                         </Directory>
 
-                        <Directory Id="usbdrv" Name="USB">
-                            <Directory Id="usbfilter" Name="filter">
-                                <Component Id="USBFilterDriver" Guid="B7D782D2-96DF-4775-A0E1-A76CF7B04B65"
-                                           DriverSequence="0" DriverLegacy="$(var.Property_DriverLegacy)" DriverForceInstall="yes"
-                                           DriverAddRemovePrograms="no" DriverPlugAndPlayPrompt="no" Win64="$(var.Property_Win64)">
-                                    <File Id="vboxusbmon"  Name="VBoxUSBM.sys" LongName="VBoxUSBMon.sys" DiskId="1"  Vital="yes"
+                        <Directory Id="dir_USB" Name="USB">
+                            <Directory Id="dir_USBFilter" Name="filter">
+                                <Component Id="cp_USBFilterDriver" Guid="B7D782D2-96DF-4775-A0E1-A76CF7B04B65" Win64="$(var.Property_Win64)">
+                                    <difxapp:Driver AddRemovePrograms="no" ForceInstall="yes"
+                                                    Legacy="$(var.Property_DriverLegacy)" Sequence="0" PlugAndPlayPrompt="no"/>
+                                    <File Id="file_VBoxUSBMon.sys" Name="VBoxUSBMon.sys"
                                           Source="$(env.PATH_OUT)\bin\VBoxUSBMon.sys" />
-                                    <File Id="vboxusbmoninf"  Name="VBoxUSBM.inf" LongName="VBoxUSBMon.inf" DiskId="1"  Vital="yes"
+                                    <File Id="file_VBoxUSBMon.inf" Name="VBoxUSBMon.inf"
                                           Source="$(env.PATH_OUT)\bin\VBoxUSBMon.inf" />
 <?if $(env.VBOX_SIGNING_MODE) != none ?>
-                                    <File Id="vboxusbmoncat" Name="VBoxUSBM.cat" LongName="VBoxUSBMon.cat" DiskId="1" Vital="yes"
+                                    <File Id="file_VBoxUSBMon.cat" Name="VBoxUSBMon.cat"
                                           Source="$(env.PATH_OUT)\bin\VBoxUSBMon.cat" />
 <?endif ?>
-                                </Component> <!-- USBFilterDriver -->
-                            </Directory> <!-- Directory "drivers\usb\filter" -->
-
-                            <Directory Id="usbdevice" Name="device">
-                                <Component Id="USBDeviceDriver" Guid="010FE46A-E358-43E2-8BDC-38BC8BEC82E0"
-                                           DriverSequence="0" DriverLegacy="$(var.Property_DriverLegacy)" DriverForceInstall="yes"
-                                           DriverAddRemovePrograms="no" DriverPlugAndPlayPrompt="no" Win64="$(var.Property_Win64)">
-                                    <File Id="vboxusbdrv" Name="VBoxUSB.sys" DiskId="1"  Vital="yes"
+                                </Component>
+                            </Directory>
+
+                            <Directory Id="dir_USBDevice" Name="device">
+                                <Component Id="cp_USBDeviceDriver" Guid="010FE46A-E358-43E2-8BDC-38BC8BEC82E0" Win64="$(var.Property_Win64)">
+                                    <difxapp:Driver AddRemovePrograms="no" ForceInstall="yes"
+                                                    Legacy="$(var.Property_DriverLegacy)" Sequence="0" PlugAndPlayPrompt="no"/>
+                                    <File Id="file_VBoxUSB.sys" Name="VBoxUSB.sys"
                                           Source="$(env.PATH_OUT)\bin\VBoxUSB.sys" />
-                                    <File Id="vboxusbinf" Name="VBoxUSB.inf" DiskId="1"  Vital="yes"
+                                    <File Id="file_VBoxUSB.inf" Name="VBoxUSB.inf"
                                           Source="$(env.PATH_OUT)\bin\VBoxUSB.inf" />
 <?if $(env.VBOX_SIGNING_MODE) != none ?>
-                                    <File Id="vboxusbcat" Name="VBoxUSB.cat" DiskId="1" Vital="yes"
+                                    <File Id="file_VBoxUSB.cat" Name="VBoxUSB.cat"
                                           Source="$(env.PATH_OUT)\bin\VBoxUSB.cat" />
 <?endif ?>
-                                </Component> <!-- USBDeviceDriver -->
-                            </Directory> <!-- Directory "drivers\usb\device" -->
-                        </Directory> <!-- Directory "drivers\usb" -->
+                                </Component>
+                            </Directory>
+                        </Directory>
 
 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-                        <Directory Id="network" Name="network">
-                            <Directory Id="NetFltDir" Name="netflt">
-                                <Component Id="NetFltDriver" Guid="F0A02F6B-A349-42f8-A2EB-569DCAAAF846" Win64="$(var.Property_Win64)">
-                                            <File Id="vboxnetfltsys" Name="VBoxNFlt.sys" LongName="VBoxNetFlt.sys" DiskId="1" Vital="yes" KeyPath="yes"
-                                                  Source="$(env.PATH_OUT)\bin\VBoxNetFlt.sys"
-                                                  Checksum="yes"/>
-                                            <File Id="vboxnetfltnobjdll" Name="VBoxNob.dll" LongName="VBoxNetFltNobj.dll" DiskId="1" Vital="yes"
-                                                  Source="$(env.PATH_OUT)\bin\VBoxNetFltNobj.dll"
-                                                  Checksum="yes"/>
-                                            <File Id="vboxnetfltminf" Name="VBoxNFlM.inf" LongName="VBoxNetFltM.inf" DiskId="1" Vital="yes"
-                                                  Source="$(env.PATH_OUT)\bin\VBoxNetFltM.inf" />
-                                            <File Id="vboxnetfltinf" Name="VBoxNFlt.inf" LongName="VBoxNetFlt.inf" DiskId="1" Vital="yes"
-                                                  Source="$(env.PATH_OUT)\bin\VBoxNetFlt.inf" />
+                        <Directory Id="dir_Network" Name="network">
+                            <Directory Id="dir_NetFlt" Name="netflt">
+                                <Component Id="cp_NetFltDriver" Guid="F0A02F6B-A349-42f8-A2EB-569DCAAAF846" Win64="$(var.Property_Win64)">
+                                    <File Id="file_VBoxNetFlt.sys" Name="VBoxNetFlt.sys"   KeyPath="yes"
+                                          Source="$(env.PATH_OUT)\bin\VBoxNetFlt.sys" Checksum="yes"/>
+                                    <File Id="file_VBoxNetFltNobj.sys" Name="VBoxNetFltNobj.dll"
+                                          Source="$(env.PATH_OUT)\bin\VBoxNetFltNobj.dll" Checksum="yes"/>
+                                    <File Id="file_VBoxNetFltM.inf" Name="VBoxNetFltM.inf"
+                                          Source="$(env.PATH_OUT)\bin\VBoxNetFltM.inf" />
+                                    <File Id="file_VBoxNetFlt.inf" Name="VBoxNetFlt.inf"
+                                          Source="$(env.PATH_OUT)\bin\VBoxNetFlt.inf" />
 <?if $(env.VBOX_SIGNING_MODE) != none ?>
-                                            <File Id="vboxnetfltcat" Name="VBoxNFlt.cat" LongName="VBoxNetFlt.cat" DiskId="1" Vital="yes"
-                                                  Source="$(env.PATH_OUT)\bin\VBoxNetFlt.cat" />
+                                    <File Id="file_VBoxNetFlt.cat" Name="VBoxNetFlt.cat"
+                                          Source="$(env.PATH_OUT)\bin\VBoxNetFlt.cat" />
 <?endif ?>
                                 </Component>
-                            </Directory> <!-- Directory "drivers\network\netflt" -->
-                            <Directory Id="NetAdpDir" Name="netadp">
-                                    <Component Id="NetAdpDriver" Guid="7adf3e12-af3c-4d36-8bec-36d5064cf84f" Win64="$(var.Property_Win64)">
-                                            <File Id="vboxnetadpsys" Name="VBoxNAdp.sys" LongName="VBoxNetAdp.sys" DiskId="1" Vital="yes" KeyPath="yes"
-                                                  Source="$(env.PATH_OUT)\bin\VBoxNetAdp.sys"
-                                                  Checksum="yes"/>
-                                            <File Id="vboxnetadpinf" Name="VBoxNAdp.inf" LongName="VBoxNetAdp.inf" DiskId="1" Vital="yes"
-                                                  Source="$(env.PATH_OUT)\bin\VBoxNetAdp.inf" />
+                            </Directory>
+
+                            <Directory Id="dir_NetAdp" Name="netadp">
+                                <Component Id="cp_NetAdpDriver" Guid="7adf3e12-af3c-4d36-8bec-36d5064cf84f" Win64="$(var.Property_Win64)">
+                                    <File Id="file_VBoxNetAdp.sys" Name="VBoxNetAdp.sys" KeyPath="yes"
+                                          Source="$(env.PATH_OUT)\bin\VBoxNetAdp.sys" Checksum="yes"/>
+                                    <File Id="file_VBoxNetAdp.inf" Name="VBoxNetAdp.inf"
+                                          Source="$(env.PATH_OUT)\bin\VBoxNetAdp.inf" />
 <?if $(env.VBOX_SIGNING_MODE) != none ?>
-                                            <File Id="vboxnetadpcat" Name="VBoxNAdp.cat" LongName="VBoxNetAdp.cat" DiskId="1" Vital="yes"
-                                                  Source="$(env.PATH_OUT)\bin\VBoxNetAdp.cat" />
-<?endif ?>
-                                    </Component> <!-- NetAdpDriver -->
-                            </Directory> <!-- Directory "drivers\network\netadp" -->
-                        </Directory> <!-- Directory "drivers\network" -->
+                                    <File Id="file_VBoxNetAdp.cat" Name="VBoxNetAdp.cat"
+                                          Source="$(env.PATH_OUT)\bin\VBoxNetAdp.cat" />
+<?endif ?>
+                                </Component>
+                            </Directory>
+                        </Directory>
 <?endif ?>
                     </Directory> <!-- Directory "drivers" -->
@@ -316 +314 @@
 
                     <!-- National Language Support directory -->
-                    <Directory Id="nls" Name="nls">
-                        <Component Id="nls" Guid="D63517D7-1CF3-4D06-B3EE-C561E323069B">
+                    <Directory Id="dir_NLS" Name="nls">
+                        <Component Id="cp_NLS" Guid="D63517D7-1CF3-4D06-B3EE-C561E323069B" Win64="$(var.Property_Win64)">
                             <!-- Include the autogenerated NLS file list -->
                             <?include $(env.PATH_TARGET)\VBoxGuiNLS.wxi ?>
@@ -325 +323 @@
                     <!-- COM components have a separate entry mainly because of the KeyPath attribute (that hints the
                          TypeLib element where to take the TLB resource from) may appear only once per Component. -->
-                    <Component Id="MainCOM" Guid="CD4A3C6C-C2D5-428D-90A1-B6DA3D0777D6" Win64="$(var.Property_Win64)">
-
-                        <File Id="VBoxSVC" Name="VBoxSVC.exe" DiskId="1" Vital="yes"
+                    <Component Id="cp_MainCOM" Guid="CD4A3C6C-C2D5-428D-90A1-B6DA3D0777D6" Win64="$(var.Property_Win64)">
+
+                        <!-- File ID *must not* be changed because of our typelib template generation file! -->
+                        <File Id="VBoxSVC" Name="VBoxSVC.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxSVC.exe">
                         </File>
@@ -334 +333 @@
                              and create appropriate Interface registry entries. Note that the same TLB is present
                              in VBoxSVC.exe - it's just a matter of choice which one to use -->
-                        <File Id="VBoxC" Name="VBoxC.dll" DiskId="1" Vital="yes"
-                              Source="$(env.PATH_OUT)\bin\VBoxC.dll"
-                              KeyPath="yes">
+                        <!-- File ID *must not* be changed because of our typelib template generation file! -->
+                        <File Id="VBoxC" Name="VBoxC.dll"
+                              Source="$(env.PATH_OUT)\bin\VBoxC.dll" KeyPath="yes">
                         </File>
 
@@ -344 +343 @@
                     </Component>
 
-                    <Component Id="DesktopShortcut" Guid="668F8A1A-F5CE-48B3-BB1A-3042EE27B279" Win64="$(var.Property_Win64)">
-                        <Condition>INSTALLDESKTOPSHORTCUT</Condition>
-                        <CreateFolder/>
-                        <Shortcut Id="VBoxDesktopShortcut" Directory="DesktopFolder"
-                            Name="VBox" LongName="$(env.VBOX_PRODUCT)" WorkingDirectory="INSTALLDIR"
-                            Advertise="no" Target="[#vbox]" />
-                    </Component>
-
-                    <Component Id="QuicklaunchShortcut" Guid="CC19E026-938A-41CB-8E77-3F33296244B6" Win64="$(var.Property_Win64)">
-                        <Condition>INSTALLQUICKLAUNCHSHORTCUT</Condition>
-                        <CreateFolder/>
-                        <Shortcut Id="VBoxQuicklaunchShortcut" Directory="QuicklaunchFolder"
-                            Name="VBox" LongName="$(env.VBOX_PRODUCT)" WorkingDirectory="INSTALLDIR"
-                            Advertise="no" Target="[#vbox]" />
-                    </Component>
+                    <!--
+
+                    <Component Id="Cp_StartMenuShortcut" Guid="1C137D24-E599-47BD-98D0-2F62F202A8EA" Win64="$(var.Property_Win64)">
+                        <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string"
+                                       Value="installed" KeyPath="yes" />
+                        <Shortcut Id="ShortcutStartMenuVBox" Directory="ProgramMenuDir"
+                                  Name="VirtualBox" WorkingDirectory="INSTALLDIR" Advertise="no" Target="VirtualBox.exe" />
+                        <RemoveFolder Id="ShortcutStartMenuVBoxRemove" On="uninstall" />
+                    </Component>-->
+
+                    <!---->
 
                     <!-- All Binaries, DLLs (except COM) and drivers are in one component because they belong together. Additional
                          binaries e.g. test tools, utilities etc. should be in another component so they"re clearly separated. -->
-                    <Component Id="MainBinaries" Guid="5C8FE57A-F744-4DE0-AA3F-A563F486AD98" Win64="$(var.Property_Win64)">
+                    <Component Id="cp_MainBinaries" Guid="5C8FE57A-F744-4DE0-AA3F-A563F486AD98" Win64="$(var.Property_Win64)">
+
                         <!-- Set required environment variables. -->
-                        <Environment Id="EnvVBoxInstallDir" Action="set" Name="VBOX_INSTALL_PATH"
-                            System="yes" Part="last" Permanent="no" Value="[INSTALLDIR]" />
+                        <Environment Id="env_VBoxInstallDir" Action="set" Name="VBOX_INSTALL_PATH"
+                                     System="yes" Part="last" Permanent="no" Value="[INSTALLDIR]" />
+
                         <!-- Register file extensions. Note: Extension Id's *must not* be changed! These specify the actual
                              file extension to handle. Also, here would be the place to add more fancy DDE stuff later.
                              Important: The IDs in "IconIndex" *must* be matching "Resources\resource.h". -->
-                        <ProgId Id="VirtualBox.Shell.vbox" Description="VirtualBox Machine Definition" Icon="[#vboxresdll]" IconIndex="-201">
+                        <ProgId Id="progId_VirtualBox.Shell.vbox" Description="VirtualBox Machine Definition" Icon="file_VBoxRes.dll" IconIndex="-201">
                             <Extension Id="vbox" ContentType="application/x-virtualbox-vbox">
-                                <Verb Id="open" Sequence="1" Command="Open" Target="[#vbox]" Argument="&quot;%1&quot;" />
+                                <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
                             </Extension>
                         </ProgId>
-                        <ProgId Id="VirtualBox.Shell.vbox-extpack" Description="VirtualBox Extension Pack" Icon="[#vboxresdll]" IconIndex="-202">
+                        <ProgId Id="progId_VirtualBox.Shell.vbox-extpack" Description="VirtualBox Extension Pack" Icon="file_VBoxRes.dll" IconIndex="-202">
                             <Extension Id="vbox-extpack" ContentType="application/x-virtualbox-vbox-extpack">
-                                <Verb Id="open" Sequence="1" Command="Open" Target="[#vbox]" Argument="&quot;%1&quot;" />
+                                <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
                             </Extension>
                         </ProgId>
-                        <ProgId Id="VirtualBox.Shell.ovf" Description="Open Virtualization Format" Icon="[#vboxresdll]" IconIndex="-301">
+                        <ProgId Id="progId_VirtualBox.Shell.ovf" Description="Open Virtualization Format" Icon="file_VBoxRes.dll" IconIndex="-301">
                             <Extension Id="ovf" ContentType="application/x-virtualbox-ovf">
-                                <Verb Id="open" Sequence="1" Command="Open" Target="[#vbox]" Argument="&quot;%1&quot;" />
+                                <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
                             </Extension>
                         </ProgId>
-                        <ProgId Id="VirtualBox.Shell.ova" Description="Open Virtualization Format Archive" Icon="[#vboxresdll]" IconIndex="-302">
+                        <ProgId Id="progId_VirtualBox.Shell.ova" Description="Open Virtualization Format Archive" Icon="file_VBoxRes.dll" IconIndex="-302">
                             <Extension Id="ova" ContentType="application/x-virtualbox-ova">
-                                <Verb Id="open" Sequence="1" Command="Open" Target="[#vbox]" Argument="&quot;%1&quot;" />
+                                <Verb Id="open" Command="Open" TargetFile="file_VirtualBox.exe" Argument="&quot;%1&quot;" />
                             </Extension>
                         </ProgId>
-                        <!-- The "Name" attribute must always be present. If the name is longer than 8.3 the additional "LongName"
-                             attribute can be used. -->
-                        <File Id="vbox" Name="vbox.exe" LongName="VirtualBox.exe" DiskId="1"  Vital="yes"
-                              Source="$(env.PATH_OUT)\bin\VirtualBox.exe">
-                            <!-- The target folder for the shortcut in the "Programs" menu is defined below. -->
-                            <Shortcut Id="startmenuVBox" Directory="ProgramMenuDir" Name="VBox"
-                                      LongName="VirtualBox" WorkingDirectory="INSTALLDIR"/>
-                        </File>
+
+                        <!-- Files -->
 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
                         <!-- Include all user manual .CHM files (file is generated by makefile). -->
@@ -404 +395 @@
                         <?include $(env.PATH_TARGET)\Files_License.wxi ?>
 
-<?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>
-                        <File Id="vboxdbgdll" Name="VBoxDbg.dll" DiskId="1" Vital="yes"
-                              Source="$(env.PATH_OUT)\bin\VBoxDbg.dll" />
-<?endif ?>
-
-                        <File Id="vboxmanage" Name="VBoxMan.exe" LongName="VBoxManage.exe" DiskId="1" Vital="yes"
+                        <!-- Frontends -->
+                        <File Id="file_VBoxManage.exe" Name="VBoxManage.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxManage.exe" />
-                        <File Id="vboxheadless" Name="VBoxHead.exe" LongName="VBoxHeadless.exe" DiskId="1" Vital="yes"
+                        <File Id="file_VBoxHeadless.exe" Name="VBoxHeadless.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxHeadless.exe">
-
                             <!-- Create a simple shortcut for VBoxVRDP, which is not present anymore, pointing to VBoxHeadless.exe -->
-                            <Shortcut Id="ShortcutVBoxVRDP" Directory="INSTALLDIR" Name="VBoxVRDP" Show="normal" WorkingDirectory="INSTALLDIR"/>
-
+                       <!--     <Shortcut Id="ShortcutVBoxVRDP" Directory="INSTALLDIR" Name="VBoxVRDP" Show="normal" WorkingDirectory="INSTALLDIR"/> -->
                         </File>
-
-                        <File Id="vboxnetdhcp" Name="VBoxDHCP.exe" LongName="VBoxNetDHCP.exe" DiskId="1" Vital="yes"
+                        <File Id="file_VBoxBalloonCtrl.exe" Name="VBoxBalloonCtrl.exe"
+                              Source="$(env.PATH_OUT)\bin\VBoxBalloonCtrl.exe"/>
+
+                        <!-- Misc tools -->
+                        <File Id="file_VBoxNetDHCP.exe" Name="VBoxNetDHCP.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxNetDHCP.exe"/>
 <?if $(env.VBOX_WITH_EXTPACK) = "yes" ?>
-                        <File Id="vboxepha" Name="VBoxEPHA.exe" LongName="VBoxExtPackHelperApp.exe" DiskId="1" Vital="yes"
+                        <File Id="file_VBoxExtPackHelperApp.exe" Name="VBoxExtPackHelperApp.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxExtPackHelperApp.exe"/>
 <?endif ?>
-                        <File Id="vboxballoonctrl" Name="VBoxBCtl.exe" LongName="VBoxBalloonCtrl.exe" DiskId="1" Vital="yes"
-                              Source="$(env.PATH_OUT)\bin\VBoxBalloonCtrl.exe"/>
-
                         <!-- VBox DLL files -->
-                        <File Id="vboxdddll" Name="VBoxDD.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxDD.dll" Name="VBoxDD.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxDD.dll" />
-                        <File Id="vboxdd2dll" Name="VBoxDD2.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxDD2.dll" Name="VBoxDD2.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxDD2.dll" />
-                        <File Id="vboxddudll" Name="VBoxDDU.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxDDU.dll" Name="VBoxDDU.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxDDU.dll" />
-                        <File Id="vboxrtdll" Name="VBoxRT.dll" DiskId="1"   Vital="yes"
+                        <File Id="file_VBoxRT.dll" Name="VBoxRT.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxRT.dll" />
-                        <File Id="vboxremdll" Name="VBoxREM.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxREM.dll" Name="VBoxREM.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxREM.dll" />
 <?if $(env.BUILD_TARGET_ARCH) = "amd64" ?>
-                        <File Id="vboxrem2rel" Name="VBoxREM2.rel" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxREM2.rel" Name="VBoxREM2.rel"
                               Source="$(env.PATH_OUT)\bin\VBoxREM2.rel" />
 <?else ?>
-                        <File Id="vboxrem32dll" Name="VBoxREM3.dll" LongName="VBoxREM32.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxREM32.dll" Name="VBoxREM32.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxREM32.dll" />
-                        <File Id="vboxrem64dll" Name="VBoxREM6.dll" LongName="VBoxREM64.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxREM64.dll" Name="VBoxREM64.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxREM64.dll" />
 <?endif ?>
-                        <File Id="vboxvmmdll" Name="VBoxVMM.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxVMM.dll" Name="VBoxVMM.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxVMM.dll" />
 <?if $(env.VBOX_WITH_VRDP) = "yes" ?>
-                        <File Id="vboxvrdpdll" Name="VBoxVRDP.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxVRDP.dll" Name="VBoxVRDP.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxVRDP.dll" />
 <?endif ?>
-                        <File Id="vboxshfolderdll" Name="VBoxSF.dll" LongName="VBoxSharedFolders.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxSharedFolders.dll" Name="VBoxSharedFolders.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxSharedFolders.dll" />
-                        <File Id="vboxshclpbrddll" Name="VBoxClip.dll" LongName="VBoxSharedClipboard.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxSharedClipboard.dll" Name="VBoxSharedClipboard.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxSharedClipboard.dll" />
 <?if $(env.VBOX_WITH_GUEST_PROPS) = "yes" ?>
-                        <File Id="vboxguestpropdll" Name="VBoxProp.dll" LongName="VBoxGuestPropSvc.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxGuestPropSvc.dll" Name="VBoxGuestPropSvc.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxGuestPropSvc.dll" />
 <?endif ?>
 <?if $(env.VBOX_WITH_GUEST_CONTROL) = "yes" ?>
-                        <File Id="vboxguestctrldll" Name="VBoxCtrl.dll" LongName="VBoxGuestControlSvc.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxGuestControlSvc.dll" Name="VBoxGuestControlSvc.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxGuestControlSvc.dll" />
 <?endif ?>
-                        <File Id="vboxauthdll" Name="VBoxAuth.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxAuth.dll" Name="VBoxAuth.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxAuth.dll" />
-                        <File Id="vboxauthsimpledll" Name="VBoxASim.dll" LongName="VBoxAuthSimple.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxAuthSimple.dll" Name="VBoxAuthSimple.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxAuthSimple.dll" />
 
                         <!-- Include resource DLL (icons, ...). -->
-                        <File Id="vboxresdll" LongName="VBoxRes.dll" Name="VBoxRes.dll" DiskId="$(var.Property_DiskIdCommon)" Vital="yes"
+                        <File Id="file_VBoxRes.dll" Name="VBoxRes.dll" DiskId="$(var.Property_DiskIdCommon)"
                               Source="$(env.PATH_OUT)\bin\VBoxRes.dll" />
 
-                        <File Id="vmmgc" Name="VMMGC.gc" DiskId="1"  Vital="yes"
+                        <File Id="file_VMMGC.gc" Name="VMMGC.gc"
                               Source="$(env.PATH_OUT)\bin\VMMGC.gc" />
-                        <File Id="vboxddgc" Name="VBoxDDGC.gc" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxDDGC.gc" Name="VBoxDDGC.gc"
                               Source="$(env.PATH_OUT)\bin\VBoxDDGC.gc" />
-                        <File Id="vboxdd2gc" Name="VBoxDD2.gc" LongName="VBoxDD2GC.gc" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxDD2GC.gc" Name="VBoxDD2GC.gc"
                               Source="$(env.PATH_OUT)\bin\VBoxDD2GC.gc" />
 
-                        <File Id="vmmr0" Name="VMMR0.r0" DiskId="1"  Vital="yes"
+                        <File Id="file_VMMR0.r0" Name="VMMR0.r0"
                               Source="$(env.PATH_OUT)\bin\VMMR0.r0" />
-                        <File Id="vboxddr0" Name="VBoxDDR0.r0" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxDDR0.r0" Name="VBoxDDR0.r0"
                               Source="$(env.PATH_OUT)\bin\VBoxDDR0.r0" />
-                        <File Id="vboxdd2r0" Name="VBDD2R0.r0" LongName="VBoxDD2R0.r0" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxDD2R0.r0" Name="VBoxDD2R0.r0"
                               Source="$(env.PATH_OUT)\bin\VBoxDD2R0.r0" />
 
 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>
-                        <File Id="vboxtestogl" Name="VBTstOGL.exe" LongName="VBoxTestOGL.exe" DiskId="1"  Vital="yes"
+                        <File Id="file_VBoxTestOGL.exe" Name="VBoxTestOGL.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxTestOGL.exe" />
 <?endif ?>
-                        <!-- Qt stuff -->
-                        <File Id="qtcore4dll" Name="QtCrVBx4.dll" LongName="QtCoreVBox4.dll" DiskId="1"  Vital="yes"
+                        <!-- Qt frontend -->
+                        <File Id="file_VirtualBox.exe" Name="VirtualBox.exe"
+                              Source="$(env.PATH_OUT)\bin\VirtualBox.exe">
+                        </File>
+                        <File Id="file_QtCoreVBox4.dll" Name="QtCoreVBox4.dll"
                               Source="$(env.PATH_OUT)\bin\QtCoreVBox4.dll" />
-                        <File Id="qtgui4dll" Name="QtGuVbx4.dll" LongName="QtGuiVBox4.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_QtGuiVBox4.dll" Name="QtGuiVBox4.dll"
                               Source="$(env.PATH_OUT)\bin\QtGuiVBox4.dll" />
-                        <File Id="qtnetwork4dll" Name="QtNwVBx4.dll" LongName="QtNetworkVBox4.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_QtNetworkVBox4.dll" Name="QtNetworkVBox4.dll"
                               Source="$(env.PATH_OUT)\bin\QtNetworkVBox4.dll" />
+<?if $(env.VBOX_WITH_DEBUGGER_GUI) = "yes" ?>
+                        <File Id="file_VBoxDbg.dll" Name="VBoxDbg.dll"
+                              Source="$(env.PATH_OUT)\bin\VBoxDbg.dll" />
+<?endif ?>
 <?if $(env.VBOX_GUI_USE_QGL) = "yes" ?>
-                        <File Id="qtopengl4dll" Name="QtGlVBx4.dll" LongName="QtOpenGLVBox4.dll" DiskId="1"  Vital="yes"
+                        <File Id="file_QtOpenGLVBox4.dll" Name="QtOpenGLVBox4.dll"
                               Source="$(env.PATH_OUT)\bin\QtOpenGLVBox4.dll" />
 <?endif?>
@@ -507 +499 @@
 <?if $(env.VBOX_USE_VCC80) = "yes" ?>
                         <!-- MS v8 Runtime DLL files (private assembly) -->
-                        <File Id="vc80crtmft" Name="VC80CRT.mft" LongName="Microsoft.VC80.CRT.manifest" DiskId="1" Vital="yes"
+                        <File Id="file_Microsoft.VC80.CRT.manifest" Name="Microsoft.VC80.CRT.manifest"
                               Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest" />
-                        <File Id="msvcr80dll" Name="msvcr80.dll" DiskId="1" Vital="yes"
+                        <File Id="file_msvcr80.dll" Name="msvcr80.dll"
                               Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\msvcr80.dll" />
-                        <File Id="msvcp80dll" Name="msvcp80.dll" DiskId="1" Vital="yes"
+                        <File Id="file_msvcp80.dll" Name="msvcp80.dll"
                               Source="$(env.PATH_OUT)\bin\Microsoft.VC80.CRT\msvcp80.dll" />
 <?endif?>
@@ -517 +509 @@
                         <!-- MS v7 Runtime DLL files -->
 <?if $(env.VBOX_USE_VCC80) != "yes" ?>
-                        <File Id="msvcpdll" Name="msvcp71.dll" DiskId="1" Vital="yes"
+                        <File Id="file_msvcp71.dll" Name="msvcp71.dll"
                               Source="$(env.PATH_OUT)\bin\msvcp71.dll" />
-                        <File Id="msvcrtdll" Name="msvcrt.dll" DiskId="1" Vital="yes"
+                        <File Id="file_msvcrt.dll" Name="msvcrt.dll"
                               Source="$(env.PATH_OUT)\bin\msvcrt.dll" />
 <?endif?>
 <?if $(env.BUILD_TARGET_ARCH) != "amd64" ?>
-                        <File Id="msvcrdll" Name="msvcr71.dll" DiskId="1" Vital="yes"
+                        <File Id="msvcrdll" Name="msvcr71.dll"
                               Source="$(env.PATH_OUT)\bin\msvcr71.dll" />
 <?endif?>
                         <!-- EFI firmware -->
 <?if $(env.VBOX_WITH_EFIFW_PACKING) = "yes" ?>
-                        <File Id="vboxefifd32" LongName="VBoxEFI32.fd" Name="efi32.fd" DiskId="$(var.Property_DiskIdCommon)" Vital="yes"
+                        <File Id="file_VBoxEFI32.fd" Name="VBoxEFI32.fd" DiskId="$(var.Property_DiskIdCommon)"
                               Source="$(env.PATH_OUT)\bin\VBoxEFI32.fd" />
-                        <File Id="vboxefifd64" LongName="VBoxEFI64.fd" Name="efi64.fd" DiskId="$(var.Property_DiskIdCommon)" Vital="yes"
+                        <File Id="file_VBoxEFI64.fd" Name="VBoxEFI64.fd" DiskId="$(var.Property_DiskIdCommon)"
                               Source="$(env.PATH_OUT)\bin\VBoxEFI64.fd" />
 <?endif?>
@@ -536 +528 @@
 <?if $(env.VBOX_WITH_ADDITIONS_PACKING) = "yes" ?>
     <?if $(env.VBOX_WITH_COMBINED_PACKAGE) = "yes" ?>
-                        <File Id="VBoxGuestAdditions.iso" Name="VBoxAdd.iso" LongName="VBoxGuestAdditions.iso" DiskId="2" Vital="yes"
+                        <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso" DiskId="2"
                               Source="$(env.PATH_MULTIARCH_GUEST_ADDITIONS_ISO)\VBoxGuestAdditions.iso" />
     <?else ?>
-                        <File Id="vboxguest" Name="VBoxAdd.iso" LongName="VBoxGuestAdditionsiso" DiskId="1" Vital="yes"
+                        <File Id="file_VBoxGuestAdditions.iso" Name="VBoxGuestAdditions.iso"
                               Source="$(env.PATH_OUT)\bin\additions\VBoxGuestAdditions.iso" />
     <?endif ?>
@@ -550 +542 @@
 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
                     <!-- Qt accessible plugins -->
-                    <Directory Id="accessible" Name="accessbl" LongName="accessible">
-                        <Component Id="qtaccessible" Guid="12040EF9-D4A8-4FB2-A69C-CA2F5C354A45">
-                            <File Id="qtaccessibleplugindll" Name="qtacsw4.dll" LongName="qtaccessiblewidgets4.dll" DiskId="1"  Vital="yes"
+                    <Directory Id="dir_Accessible" Name="accessible">
+                        <Component Id="cp_QtAccessible" Guid="12040EF9-D4A8-4FB2-A69C-CA2F5C354A45" Win64="$(var.Property_Win64)">
+                            <File Id="file_qtaccessiblewidgets4.dll" Name="qtaccessiblewidgets4.dll"
                                   Source="$(env.PATH_OUT)\bin\accessible\qtaccessiblewidgets4.dll" />
                         </Component>
-                    </Directory> <!-- Qt accessible plugins -->
+                    </Directory>
 <?endif?>
 
 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
                     <!-- Python bindings -->
-                    <Directory Id="sdk" Name="sdk">
-                        <Directory Id="installer" Name="install">
-                            <Component Id="VBoxPyInst" Guid="C9A40306-5102-11DE-A7BA-C3C555D89593">
-                                 <File Id="vboxapisetup" Name="pysetup.py" LongName="vboxapisetup.py" DiskId="$(var.Property_DiskIdCommon)" Vital="yes"
-                                      Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapisetup.py" />
+                    <Directory Id="dir_SDK" Name="sdk">
+                        <Directory Id="dir_SDKInstall" Name="install">
+                            <Component Id="cp_VBoxPyInst" Guid="C9A40306-5102-11DE-A7BA-C3C555D89593" Win64="$(var.Property_Win64)">
+                                 <File Id="file_vboxapisetup.py" Name="vboxapisetup.py" DiskId="$(var.Property_DiskIdCommon)"
+                                       Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapisetup.py" />
                             </Component>
-                            <Directory Id="vboxapi" Name="vboxapi">
-                                <Component Id="VBoxPyMod" Guid="DF19CB76-5102-11DE-943B-13C755D89593">
-                                    <File Id="__init__.py" Name="__init__.py" DiskId="$(var.Property_DiskIdCommon)" Vital="yes"
-                                      Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapi\__init__.py" />
-                                    <File Id="VirtualBox_constants.py" Name="vbconst.py" LongName="VirtualBox_constants.py" DiskId="$(var.Property_DiskIdCommon)" Vital="yes"
-                                      Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapi\VirtualBox_constants.py" />
+                            <Directory Id="dir_SDKVBoxAPI" Name="vboxapi">
+                                <Component Id="cp_VBoxPyMod" Guid="DF19CB76-5102-11DE-943B-13C755D89593" Win64="$(var.Property_Win64)">
+                                    <File Id="file___init__.py" Name="__init__.py" DiskId="$(var.Property_DiskIdCommon)"
+                                          Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapi\__init__.py" />
+                                    <File Id="file_VirtualBox_constants.py" Name="VirtualBox_constants.py" DiskId="$(var.Property_DiskIdCommon)"
+                                          Source="$(env.PATH_OUT)\bin\sdk\installer\vboxapi\VirtualBox_constants.py" />
                                 </Component>
                             </Directory>
                         </Directory>
                     </Directory>
-                    <!-- Python bindings -->
 <?endif?>
 
 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>
-                    <Component Id="VBoxCROpenGL" Guid="874A1297-835A-491D-8A9D-7E723BC29EE7" Win64="$(var.Property_Win64)">
-                        <File Id="vboxoglhostcrutil" Name="VbGlHCRU.dll" LongName="VBoxOGLhostcrutil.dll" DiskId="1" Vital="yes"
+                    <Component Id="cp_VBoxCROpenGL" Guid="874A1297-835A-491D-8A9D-7E723BC29EE7" Win64="$(var.Property_Win64)">
+                        <File Id="file_VBoxOGLhostcrutil.dll" Name="VBoxOGLhostcrutil.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxOGLhostcrutil.dll" />
-                        <File Id="vboxoglhosterrorspu" Name="VbGlHers.dll" LongName="VBoxOGLhosterrorspu.dll" DiskId="1" Vital="yes"
+                        <File Id="file_VBoxOGLhosterrorspu.dll" Name="VBoxOGLhosterrorspu.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxOGLhosterrorspu.dll" />
-                        <File Id="vboxoglrenderspu" Name="VbGlRndr.dll" LongName="VBoxOGLrenderspu.dll" DiskId="1" Vital="yes"
+                        <File Id="file_VBoxOGLrenderspu.dll" Name="VBoxOGLrenderspu.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxOGLrenderspu.dll" />
-                        <File Id="vboxsharedcropengl" Name="VbShCRGL.dll" LongName="VBoxSharedCrOpenGL.dll" DiskId="1" Vital="yes"
+                        <File Id="file_VBoxSharedCrOpenGL.dll" Name="VBoxSharedCrOpenGL.dll"
                               Source="$(env.PATH_OUT)\bin\VBoxSharedCrOpenGL.dll" />
                     </Component>
 <?endif?>
                     <!-- SDL plugins -->
-                    <Component Id="VBoxSDLBinaries" Guid="F09D5FD9-E176-42B0-90A9-481BB18B0CB4" Win64="$(var.Property_Win64)">
-                        <File Id="vboxsdl" Name="VBoxSDL.exe" DiskId="1" Vital="yes"
+                    <Component Id="cp_VBoxSDLBinaries" Guid="F09D5FD9-E176-42B0-90A9-481BB18B0CB4" Win64="$(var.Property_Win64)">
+                        <File Id="file_VBoxSDL.exe" Name="VBoxSDL.exe"
                               Source="$(env.PATH_OUT)\bin\VBoxSDL.exe" />
-                        <File Id="sdldll" Name="SDL.dll" DiskId="1" Vital="yes"
+                        <File Id="file_SDL.dll" Name="SDL.dll"
                               Source="$(env.PATH_OUT)\bin\SDL.dll" />
 <?if $(env.VBOX_WITH_SECURELABEL) = "yes" ?>
-                        <File Id="sdlttfdll" Name="SDL_ttf.dll" DiskId="1" Vital="yes"
+                        <File Id="file_SDL_ttf.dll" Name="SDL_ttf.dll"
                               Source="$(env.PATH_OUT)\bin\SDL_ttf.dll" />
 <?endif?>
@@ -605 +596 @@
 <?if $(env.VBOX_WITH_WEBSERVICES) = "yes" ?>
                     <!-- Webservice -->
-                    <Component Id="VBoxWebService" Guid="DD404F04-9874-43E9-AEE2-7762924D922E">
-                        <File Id="vboxweb" Name="vboxwebs.exe" LongName="vboxwebsrv.exe" DiskId="1" Vital="yes"
+                    <Component Id="cp_VBoxWebService" Guid="DD404F04-9874-43E9-AEE2-7762924D922E">
+                        <File Id="file_VBoxWebSrv.exe" Name="VBoxWebSrv.exe"
                               Source="$(env.PATH_OUT)\bin\vboxwebsrv.exe" />
-                    </Component> <!-- Webservice -->
+                    </Component>
 <?endif?>
 
 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
-                    <!--Python -->
-                    <Component Id="VBoxPythonBinding" Guid="293D7E11-78DA-4C31-AEED-AE2FE42F6881">
-                        <Condition>PYTHONINSTALLED</Condition>
-                        <!-- Nothing in here yet. -->
+                    <Component Id="cp_VBoxPythonBinding" Guid="293D7E11-78DA-4C31-AEED-AE2FE42F6881">
+                        <Condition>PYTHON_INSTALLED</Condition>
                     </Component>
 <?endif?>
@@ -621 +610 @@
             </Directory> <!-- Windows program files directory -->
 
-            <!-- Create a subdirectory in the "Programs" start menu -->
-            <Directory Id="ProgramMenuFolder" Name="PMenu" LongName="Programs">
-                <Directory Id="ProgramMenuDir" Name="vbox" LongName="$(env.VBOX_PRODUCT)" />
+            <!-- Set up special directory IDs for referencing to the start menu
+                 or the Quick Launch bar.
+                 See: http://msdn.microsoft.com/en-us/library/aa368276.aspx
+                      http://wix.mindcapers.com/wiki/Shortcuts_in_WiX -->
+            <Directory Id="ProgramMenuFolder">
+                <Directory Id="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)"/>
             </Directory>
 
-            <Directory Id="DesktopFolder" Name="Desktop" />
+            <Directory Id="DesktopFolder" Name="Desktop"/>
 
             <Directory Id="AppDataFolder" Name="AppData">
-                <Directory Id="AppDataMicrosoft" Name="MS" LongName="Microsoft">
-                    <Directory Id="AppDataMSIE" Name="IE" LongName="Internet Explorer">
-                        <Directory Id="QuicklaunchFolder" Name="QL" LongName="Quick Launch"/>
+                <Directory Id="dir_AppDataMicrosoft" Name="Microsoft">
+                    <Directory Id="dir_AppDataMSIE" Name="Internet Explorer">
+                        <Directory Id="dir_QuicklaunchFolder" Name="Quick Launch"/>
                     </Directory>
                 </Directory>
             </Directory>
-        </Directory>
+
+            <!-- Shortcut(s) in start menu -->
+            <Component Id="cp_StartMenuVBox" Guid="C2DC321A-CE63-40EE-8A98-724DF8BD12FB" Win64="$(var.Property_Win64)">
+                <Shortcut Id="sc_StartMenuVBox" Directory="dir_StartMenuVBox" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)"
+                          Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR"/>
+                <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)"
+                               Type="string" Value="installed" KeyPath="yes" />
+                <?include $(env.PATH_TARGET)\Shortcuts_StartMenu.wxi ?>
+            </Component>
+
+            <Component Id="cp_DesktopShortcut" Guid="668F8A1A-F5CE-48B3-BB1A-3042EE27B279" Win64="$(var.Property_Win64)">
+                <Condition>INSTALLDESKTOPSHORTCUT</Condition>
+                <Shortcut Id="sc_DesktopVBox" Directory="DesktopFolder" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)"
+                          Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR"/>
+                <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)" Type="string"
+                               Value="installed" KeyPath="yes" />
+            </Component>
+
+            <Component Id="cp_QuickLaunchVBox" Guid="CC19E026-938A-41CB-8E77-3F33296244B6" Win64="$(var.Property_Win64)">
+                <CreateFolder/>
+                <Condition>INSTALLQUICKLAUNCHSHORTCUT</Condition>
+                <Shortcut Id="sc_QuickLaunchVBox" Directory="dir_QuicklaunchFolder" Name="$(env.VBOX_PRODUCT)" Description="$(env.VBOX_PRODUCT)"
+                          Target="[INSTALLDIR]VirtualBox.exe" WorkingDirectory="INSTALLDIR"/>
+                <RegistryValue Root="HKCU" Key="$(var.Property_RegKeyInstall)"
+                               Type="string" Value="installed" KeyPath="yes" />
+            </Component>
+        </Directory> <!-- TARGETDIR -->
 
         <Feature Id="VBoxApplication" Title="VirtualBox Application" Level="1"
-                 Description="$(loc.VB_App)"
+                 Description="!(loc.VB_App)"
                  ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand"
                  Absent="disallow">
 
-            <ComponentRef Id="DesktopShortcut" />
-            <ComponentRef Id="QuicklaunchShortcut" />
+            <ComponentRef Id="cp_StartMenuVBox" />
+            <ComponentRef Id="cp_DesktopShortcut" />
+            <ComponentRef Id="cp_QuickLaunchVBox" />
 
 <?if $(env.VBOX_WITH_DOCS_PACKING) = "yes" ?>
-            <ComponentRef Id="docs" />
-<?endif?>
-            <ComponentRef Id="nls" />
-            <ComponentRef Id="MainCOM" />
-            <ComponentRef Id="MainBinaries" />
+            <ComponentRef Id="cp_Docs" />
+<?endif?>
+            <ComponentRef Id="cp_NLS" />
+            <ComponentRef Id="cp_MainCOM" />
+            <ComponentRef Id="cp_MainBinaries" />
 <?if $(env.VBOX_WITH_QTGUI) = "yes" ?>
-            <ComponentRef Id="qtaccessible" />
+            <ComponentRef Id="cp_QtAccessible" />
 <?endif?>
 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
-            <ComponentRef Id="VBoxPyInst" />
-            <ComponentRef Id="VBoxPyMod" />
+            <ComponentRef Id="cp_VBoxPyInst" />
+            <ComponentRef Id="cp_VBoxPyMod" />
 <?endif?>
 
 <?if $(env.VBOX_WITH_CROGL) = "yes" ?>
-            <ComponentRef Id="VBoxCROpenGL" />
-<?endif?>
-            <ComponentRef Id="VBoxSDLBinaries" />
+            <ComponentRef Id="cp_VBoxCROpenGL" />
+<?endif?>
+            <ComponentRef Id="cp_VBoxSDLBinaries" />
 <?if $(env.VBOX_WITH_WEBSERVICES) = "yes" ?>
-            <ComponentRef Id="VBoxWebService" />
-<?endif?>
-            <ComponentRef Id="VBoxDrv" />
-
-            <Feature Id="VBoxUSB" Title="VirtualBox USB Support" Level="1"
-                     Description="$(loc.VB_USBDriver)"
+            <ComponentRef Id="cp_VBoxWebService" />
+<?endif?>
+            <ComponentRef Id="cp_VBoxDrv" />
+
+            <Feature Id="ft_VBoxUSB" Title="VirtualBox USB Support" Level="1"
+                     Description="!(loc.VB_USBDriver)"
                      ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" >
-                <ComponentRef Id="USBFilterDriver" />
-                <ComponentRef Id="USBDeviceDriver" />
+                <ComponentRef Id="cp_USBFilterDriver" />
+                <ComponentRef Id="cp_USBDeviceDriver" />
             </Feature>
 
 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-            <Feature Id="VBoxNetwork" Title="VirtualBox Networking" Level="1"
-                     Description="$(loc.VB_Network)"
+            <Feature Id="ft_VBoxNetwork" Title="VirtualBox Networking" Level="1"
+                     Description="!(loc.VB_Network)"
                      ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" >
-                 <Feature Id="VBoxNetworkFlt" Title="VirtualBox Bridged Networking" Level="1"
-                     Description="$(loc.VB_NetFltDriver)"
-                     ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" >
-                       <ComponentRef Id="NetFltDriver" />
+                 <Feature Id="ft_VBoxNetworkFlt" Title="VirtualBox Bridged Networking" Level="1"
+                          Description="!(loc.VB_NetFltDriver)"
+                          ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" >
+                     <ComponentRef Id="cp_NetFltDriver" />
                  </Feature>
-                 <Feature Id="VBoxNetworkAdp" Title="VirtualBox Host-Only Networking" Level="1"
-                     Description="$(loc.VB_NetAdpDriver)"
-                     ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" >
-                       <ComponentRef Id="NetAdpDriver" />
+                 <Feature Id="ft_VBoxNetworkAdp" Title="VirtualBox Host-Only Networking" Level="1"
+                          Description="!(loc.VB_NetAdpDriver)"
+                          ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" >
+                     <ComponentRef Id="cp_NetAdpDriver" />
                  </Feature>
             </Feature>
@@ -693 +712 @@
 
 <?if $(env.VBOX_WITH_PYTHON) = "yes" ?>
-
-            <Feature Id="VBoxPython" Title="VirtualBox Python Support" Level="1"
-                    Description="$(loc.VB_Python)"
+            <Feature Id="ft_VBoxPython" Title="VirtualBox Python Support" Level="1"
+                    Description="!(loc.VB_Python)"
                     ConfigurableDirectory="INSTALLDIR" TypicalDefault="install" Display="expand" >
-                <ComponentRef Id="VBoxPythonBinding" />
+                <ComponentRef Id="cp_VBoxPythonBinding" />
             </Feature>
 <?endif?>
@@ -713 +731 @@
             <RemoveExistingProducts After="InstallValidate"><![CDATA[NEWERVERSIONDETECTED OR PREVIOUSVERSIONSINSTALLED]]></RemoveExistingProducts>
 
-            <Custom Action="OriginalTargetDir" After="FileCost"><![CDATA[(NOT INSTALLDIR) AND (NOT EXISTINGINSTALLDIR)]]></Custom>
-            <Custom Action="DefaultTargetDir" Before="FileCost" ><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom>
-
-            <Custom Action="UninstallTAPInstances" Before="InstallFiles" >1</Custom>
+            <Custom Action="ca_OriginalTargetDir" After="FileCost"><![CDATA[(NOT INSTALLDIR) AND (NOT EXISTINGINSTALLDIR)]]></Custom>
+            <Custom Action="ca_DefaultTargetDir" Before="FileCost" ><![CDATA[NOT Installed AND (NOT INSTALLDIR) AND EXISTINGINSTALLDIR]]></Custom>
+
+            <Custom Action="ca_UninstallTAPInstances" Before="InstallFiles" >1</Custom>
 <?if $(env.VBOX_WITH_NETFLT) = "yes" ?>
-            <Custom Action="CreateHostOnlyInterfaceArgs" Before="CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
-            <Custom Action="CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[&VBoxNetworkAdp=3]]></Custom>
-            <Custom Action="RemoveHostOnlyInterfaces" After="UninstallNetFlt" ></Custom>
-
-            <Custom Action="RollbackInstallNetFltArgs" Before="RollbackInstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
-            <Custom Action="RollbackInstallNetFlt" Before="InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
-            <Custom Action="InstallNetFltArgs" Before="InstallNetFlt" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
-            <Custom Action="InstallNetFlt" Before="CreateHostOnlyInterface" ><![CDATA[&VBoxNetworkFlt=3]]></Custom>
-
-            <Custom Action="RollbackUninstallNetFltArgs" Before="RollbackUninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
-            <Custom Action="RollbackUninstallNetFlt" Before="UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
-            <Custom Action="UninstallNetFltArgs" Before="UninstallNetFlt" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
-            <Custom Action="UninstallNetFlt" After="InstallInitialize" ><![CDATA[&VBoxNetworkFlt=2]]></Custom>
-<?endif?>
-            <Custom Action="InstallPythonAPI" After="InstallFinalize" ><![CDATA[&VBoxPython=3]]></Custom>
-            <Custom Action="InstallBranding" After="InstallFinalize" ><![CDATA[NOT REMOVE]]></Custom>
-            <Custom Action="UninstallBranding" After="InstallFinalize" ><![CDATA[REMOVE]]></Custom>
+            <Custom Action="ca_CreateHostOnlyInterfaceArgs" Before="ca_CreateHostOnlyInterface" ><![CDATA[&ft_VBoxNetworkAdp=3]]></Custom>
+            <Custom Action="ca_CreateHostOnlyInterface" Before="InstallFinalize" ><![CDATA[&ft_VBoxNetworkAdp=3]]></Custom>
+            <Custom Action="ca_RemoveHostOnlyInterfaces" After="ca_UninstallNetFlt" ></Custom>
+
+            <Custom Action="ca_RollbackInstallNetFltArgs" Before="ca_RollbackInstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=3]]></Custom>
+            <Custom Action="ca_RollbackInstallNetFlt" Before="ca_InstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=3]]></Custom>
+            <Custom Action="ca_InstallNetFltArgs" Before="ca_InstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=3]]></Custom>
+            <Custom Action="ca_InstallNetFlt" Before="ca_CreateHostOnlyInterface" ><![CDATA[&ft_VBoxNetworkFlt=3]]></Custom>
+
+            <Custom Action="ca_RollbackUninstallNetFltArgs" Before="ca_RollbackUninstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=2]]></Custom>
+            <Custom Action="ca_RollbackUninstallNetFlt" Before="ca_UninstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=2]]></Custom>
+            <Custom Action="ca_UninstallNetFltArgs" Before="ca_UninstallNetFlt" ><![CDATA[&ft_VBoxNetworkFlt=2]]></Custom>
+            <Custom Action="ca_UninstallNetFlt" After="InstallInitialize" ><![CDATA[&ft_VBoxNetworkFlt=2]]></Custom>
+<?endif?>
+            <Custom Action="ca_InstallPythonAPI" Before="InstallFinalize" ><![CDATA[&ft_VBoxPython=3]]></Custom>
+            <Custom Action="ca_InstallBranding" Before="InstallFinalize" ><![CDATA[NOT REMOVE]]></Custom>
+            <Custom Action="ca_UninstallBranding" Before="InstallFinalize" ><![CDATA[REMOVE]]></Custom>
 
         </InstallExecuteSequence>
@@ -740 +758 @@
     </Product>
 </Wix>
+

trunk/src/VBox/Installer/win/VirtualBox_TypeLib.xsl

@@ -59 +59 @@
     <TypeLib>
       <xsl:attribute name="Id"><xsl:value-of select="@uuid"/></xsl:attribute>
+      <xsl:attribute name="Advertise">yes</xsl:attribute>
+      <xsl:attribute name="MajorVersion">1</xsl:attribute>
+      <xsl:attribute name="MinorVersion">0</xsl:attribute>
       <xsl:attribute name="Language">0</xsl:attribute>
       <xsl:attribute name="Description"><xsl:value-of select="@desc"/></xsl:attribute>

trunk/src/VBox/Installer/win/dep.sed

@@ -5 +5 @@
 
 #
-# Copyright (C) 2006-2010 Oracle Corporation
+# Copyright (C) 2006-2011 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -17 +17 @@
 
 # drop all lines not including a src property.
-/src=\"/!d
+/Source=\"/!d
 # extract the file spec
-s/^.*src="\([^"]*\).*$/\1 /
+s/^.*Source="\([^"]*\).*$/\1 /
 # convert to unix slashes
 s/\\/\//g