Changeset 37987 in vbox for trunk

Timestamp:

Jul 18, 2011 8:11:16 AM (13 years ago)

Author:

vboxsync

Message:

VBoxStub: Initialize extended common controls and use a manifest to provide modern looking common controls to Windows host installers.

Location:

trunk/src/VBox/Installer/win/Stub

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxStub.cpp (modified) (2 diffs)
• VBoxStub.manifest (added)
• VBoxStub.rc (modified) (2 diffs)
• resource.h (modified) (1 diff)

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

@@ -43 +43 @@
 # The icon location is configurable.
 VBoxStub.rc_INCS += $(VBoxStub_0_OUTDIR)
-VBoxStub.rc_DEPS += $(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc
-VBoxStub.rc_CLEAN = $(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc
+VBoxStub.rc_DEPS += \
+        $(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc \
+        $(VBoxStub_0_OUTDIR)/VBoxStub-manifest.rc
+VBoxStub.rc_CLEAN = \
+        $(VBoxStub_0_OUTDIR)/VBoxStub-icon.rc \
+        $(VBoxStub_0_OUTDIR)/VBoxStub-manifest.rc
 
 # Icon include file.
@@ -50 +54 @@
         $(APPEND) -t $@ 'IDI_VIRTUALBOX ICON DISCARDABLE "$(subst /,\\,$(VBOX_WINDOWS_ICON_FILE))"'
 
+# Manifest.
+VBOX_STUB_MANIFEST_FILE := $(PATH_SUB_CURRENT)/VBoxStub.manifest
+$$(VBoxStub_0_OUTDIR)/VBoxStub-manifest.rc: $(VBOX_STUB_MANIFEST_FILE) $(MAKEFILE_CURRENT) | $$(dir $$@)
+        $(APPEND) -t $@ 'APP_MANIFEST RT_MANIFEST "$(subst /,\\,$(VBOX_STUB_MANIFEST_FILE))"'
+
 endif # x86 only
 

trunk/src/VBox/Installer/win/Stub/VBoxStub.cpp

@@ -20 +20 @@
 *******************************************************************************/
 #include <windows.h>
+#include <commctrl.h>
 #include <lmerr.h>
 #include <msiquery.h>
@@ -568 +569 @@
                             AssertMsgBreak(uLogLevel == ERROR_SUCCESS, ("Could not set installer logging level!\n"));
                         }
+
+                        /* Initialize the common controls (extended version). This is necessary to
+                         * run the actual .MSI installers with the new fancy visual control
+                         * styles (XP+). Also, an integrated manifest is required. */
+                        INITCOMMONCONTROLSEX ccEx;
+                        ccEx.dwSize = sizeof(INITCOMMONCONTROLSEX);
+                        InitCommonControlsEx(&ccEx); /* Ignore failure. */
 
                         UINT uStatus = ::MsiInstallProductA(pszTempFile, szMSIArgs);

trunk/src/VBox/Installer/win/Stub/VBoxStub.rc

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -52 +52 @@
 
 #include "VBoxStub-icon.rc"
+#include "VBoxStub-manifest.rc"
 

trunk/src/VBox/Installer/win/Stub/resource.h

@@ -15 +15 @@
  * hope that it will be useful, but WITHOUT ANY WARRANTY of any kind.
  */
+#define IDI_VIRTUALBOX 101
 
-#define IDI_VIRTUALBOX 101
+#define RT_MANIFEST 24
+#define APP_MANIFEST 1
+