From 25d25b234e81aa285ca02499ec15b4d26183281e Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Wed, 9 Jun 2021 21:58:04 +0800
Subject: [PATCH] msinfo32: Enable visual styles.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 programs/msinfo32/Makefile.in       |  2 +-
 programs/msinfo32/main.c            |  8 ++++++++
 programs/msinfo32/msinfo32.manifest | 16 ++++++++++++++++
 programs/msinfo32/msinfo32.rc       |  3 +++
 programs/msinfo32/resource.h        |  1 +
 5 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 programs/msinfo32/msinfo32.manifest

diff --git a/programs/msinfo32/Makefile.in b/programs/msinfo32/Makefile.in
index e3e657baf61..8c36594fa31 100644
--- a/programs/msinfo32/Makefile.in
+++ b/programs/msinfo32/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = msinfo32.exe
-IMPORTS   = shell32 user32
+IMPORTS   = shell32 user32 comctl32
 
 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
 
diff --git a/programs/msinfo32/main.c b/programs/msinfo32/main.c
index 6c307853301..a1f89db2b68 100644
--- a/programs/msinfo32/main.c
+++ b/programs/msinfo32/main.c
@@ -16,6 +16,12 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <stdarg.h>
+
+#include <windef.h>
+#include <winbase.h>
+#include <winuser.h>
+#include <commctrl.h>
 #include <shlwapi.h>
 #include <shellapi.h>
 
@@ -29,6 +35,8 @@ int __cdecl wmain(int argc, WCHAR *argv[])
     int i;
     WCHAR system_info[64];
 
+    InitCommonControls();
+
     WINE_FIXME("stub:");
     for (i = 0; i < argc; i++)
         WINE_FIXME(" %s", wine_dbgstr_w(argv[i]));
diff --git a/programs/msinfo32/msinfo32.manifest b/programs/msinfo32/msinfo32.manifest
new file mode 100644
index 00000000000..67eb98a2799
--- /dev/null
+++ b/programs/msinfo32/msinfo32.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.Msinfo32" 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/msinfo32/msinfo32.rc b/programs/msinfo32/msinfo32.rc
index fc9b46a6cdb..94b1e764d63 100644
--- a/programs/msinfo32/msinfo32.rc
+++ b/programs/msinfo32/msinfo32.rc
@@ -26,3 +26,6 @@ STRINGTABLE
 {
     STRING_SYSTEM_INFO, "System Information"
 }
+
+/* @makedep: msinfo32.manifest */
+1 RT_MANIFEST msinfo32.manifest
diff --git a/programs/msinfo32/resource.h b/programs/msinfo32/resource.h
index 37db7e5e8bc..9ca33da5ec8 100644
--- a/programs/msinfo32/resource.h
+++ b/programs/msinfo32/resource.h
@@ -17,5 +17,6 @@
  */
 
 #include <windef.h>
+#include <winuser.h>
 
 #define STRING_SYSTEM_INFO 100
-- 
2.11.4.GIT