https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8f4759920fb776b26c09a52f5bdcfeb4f6faebb
commit a8f4759920fb776b26c09a52f5bdcfeb4f6faebb Author: winesync <[email protected]> AuthorDate: Sun Mar 13 23:41:18 2022 +0100 Commit: Mark Jansen <[email protected]> CommitDate: Sun Mar 20 19:28:39 2022 +0100 [WINESYNC] msiexec: Enable visual styles. Signed-off-by: Zhiyi Zhang <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id 76e448bd7dc147443191b9f652f2f274f44e9fbe by Zhiyi Zhang <[email protected]> --- base/system/msiexec/CMakeLists.txt | 2 +- base/system/msiexec/msiexec.c | 3 +++ base/system/msiexec/msiexec.manifest | 16 ++++++++++++++++ base/system/msiexec/rsrc.rc | 3 +++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/base/system/msiexec/CMakeLists.txt b/base/system/msiexec/CMakeLists.txt index 626055cb55d..2c704510e2a 100644 --- a/base/system/msiexec/CMakeLists.txt +++ b/base/system/msiexec/CMakeLists.txt @@ -12,6 +12,6 @@ add_rc_deps(rsrc.rc ${CMAKE_CURRENT_SOURCE_DIR}/msiexec.ico) add_executable(msiexec ${SOURCE} rsrc.rc) set_module_type(msiexec win32gui) target_link_libraries(msiexec uuid wine) -add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll) +add_importlibs(msiexec user32 advapi32 ole32 comctl32 msi msvcrt kernel32 ntdll) add_pch(msiexec precomp.h SOURCE) add_cd_file(TARGET msiexec DESTINATION reactos/system32 FOR all) diff --git a/base/system/msiexec/msiexec.c b/base/system/msiexec/msiexec.c index 12ff7e7dc4e..5e0e1b107e8 100644 --- a/base/system/msiexec/msiexec.c +++ b/base/system/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/base/system/msiexec/msiexec.manifest b/base/system/msiexec/msiexec.manifest new file mode 100644 index 00000000000..a4a17a5397d --- /dev/null +++ b/base/system/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/base/system/msiexec/rsrc.rc b/base/system/msiexec/rsrc.rc index 91c3df8d7ec..9cc45a446ee 100644 --- a/base/system/msiexec/rsrc.rc +++ b/base/system/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
