[PATCH 5/6] msiexec: Enable visual styles.
Zhiyi Zhang
zzhang at codeweavers.com
Wed Jun 9 08:57:51 CDT 2021
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
---
programs/msiexec/Makefile.in | 2 +-
programs/msiexec/msiexec.c | 3 +++
programs/msiexec/msiexec.manifest | 16 ++++++++++++++++
programs/msiexec/rsrc.rc | 3 +++
4 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 programs/msiexec/msiexec.manifest
diff --git a/programs/msiexec/Makefile.in b/programs/msiexec/Makefile.in
index e82acc0da74..05b0e0629cc 100644
--- a/programs/msiexec/Makefile.in
+++ b/programs/msiexec/Makefile.in
@@ -1,5 +1,5 @@
MODULE = msiexec.exe
-IMPORTS = msi ole32 advapi32 user32
+IMPORTS = msi ole32 advapi32 user32 comctl32
EXTRADLLFLAGS = -mwindows -mno-cygwin
diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c
index 2bc0ba9bbef..e25cc2659e6 100644
--- a/programs/msiexec/msiexec.c
+++ b/programs/msiexec/msiexec.c
@@ -22,6 +22,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
+#include <commctrl.h>
#include <msi.h>
#include <winsvc.h>
#include <objbase.h>
@@ -626,6 +627,8 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine
int argc;
LPWSTR *argvW = NULL;
+ InitCommonControls();
+
/* parse the command line */
process_args( GetCommandLineW(), &argc, &argvW );
diff --git a/programs/msiexec/msiexec.manifest b/programs/msiexec/msiexec.manifest
new file mode 100644
index 00000000000..a4a17a5397d
--- /dev/null
+++ b/programs/msiexec/msiexec.manifest
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity type="win32" name="Wine.Msiexec" version="0.0.0.0"/>
+<dependency>
+ <dependentAssembly>
+ <assemblyIdentity
+ type="win32"
+ name="Microsoft.Windows.Common-Controls"
+ version="6.0.0.0"
+ processorArchitecture="*"
+ publicKeyToken="6595b64144ccf1df"
+ language="*"
+ />
+ </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/programs/msiexec/rsrc.rc b/programs/msiexec/rsrc.rc
index 91c3df8d7ec..9cc45a446ee 100644
--- a/programs/msiexec/rsrc.rc
+++ b/programs/msiexec/rsrc.rc
@@ -33,3 +33,6 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
/* @makedep: msiexec.ico */
1 ICON msiexec.ico
+
+/* @makedep: msiexec.manifest */
+1 RT_MANIFEST msiexec.manifest
--
2.30.2
More information about the wine-devel
mailing list