From f623608f9f4cd5d44eb3dece660fc25a695231ee Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Thu, 10 Jun 2021 11:04:14 +0800
Subject: [PATCH] regedit: Enable visual styles.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 programs/regedit/main.c           |  2 ++
 programs/regedit/regedit.manifest | 16 ++++++++++++++++
 programs/regedit/regedit.rc       |  3 +++
 3 files changed, 21 insertions(+)
 create mode 100644 programs/regedit/regedit.manifest

diff --git a/programs/regedit/main.c b/programs/regedit/main.c
index df92a13ab69..d9f81218acb 100644
--- a/programs/regedit/main.c
+++ b/programs/regedit/main.c
@@ -142,6 +142,8 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi
     HACCEL hAccel;
     BOOL is_wow64;
 
+    InitCommonControls();
+
     if (ProcessCmdLine(GetCommandLineW())) {
         return 0;
     }
diff --git a/programs/regedit/regedit.manifest b/programs/regedit/regedit.manifest
new file mode 100644
index 00000000000..a2c1a437027
--- /dev/null
+++ b/programs/regedit/regedit.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.Regedit" 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/regedit/regedit.rc b/programs/regedit/regedit.rc
index 4e629b7d878..d7dd7c4b49e 100644
--- a/programs/regedit/regedit.rc
+++ b/programs/regedit/regedit.rc
@@ -434,6 +434,9 @@ STRINGTABLE
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
+/* @makedep: regedit.manifest */
+1 RT_MANIFEST regedit.manifest
+
 /* @makedep: folderopen.ico */
 IDI_OPEN_FILE ICON folderopen.ico