From ed673bdcf56784636aae29d8cf4dfbe52f1ef790 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Wed, 9 Jun 2021 21:57:40 +0800
Subject: [PATCH] extrac32: Enable visual styles.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 programs/extrac32/Makefile.in       |  4 +++-
 programs/extrac32/extrac32.c        |  3 +++
 programs/extrac32/extrac32.manifest | 16 ++++++++++++++++
 programs/extrac32/extrac32.rc       | 25 +++++++++++++++++++++++++
 4 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 programs/extrac32/extrac32.manifest
 create mode 100644 programs/extrac32/extrac32.rc

diff --git a/programs/extrac32/Makefile.in b/programs/extrac32/Makefile.in
index cda7a84253b..3528a0d7599 100644
--- a/programs/extrac32/Makefile.in
+++ b/programs/extrac32/Makefile.in
@@ -1,7 +1,9 @@
 MODULE    = extrac32.exe
-IMPORTS   = shell32 setupapi shlwapi user32
+IMPORTS   = shell32 setupapi shlwapi user32 comctl32
 
 EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
 
 C_SRCS = \
 	extrac32.c
+
+RC_SRCS = extrac32.rc
diff --git a/programs/extrac32/extrac32.c b/programs/extrac32/extrac32.c
index 278f8ff9bf5..3741f16b3cd 100644
--- a/programs/extrac32/extrac32.c
+++ b/programs/extrac32/extrac32.c
@@ -21,6 +21,7 @@
 
 #include <stdio.h>
 #include <windows.h>
+#include <commctrl.h>
 #include <shellapi.h>
 #include <setupapi.h>
 #include <shlwapi.h>
@@ -226,6 +227,8 @@ int PASCAL wWinMain(HINSTANCE hInstance, HINSTANCE prev, LPWSTR cmdline, int sho
     WCHAR path[MAX_PATH];
     LPCWSTR cabfile = NULL;
 
+    InitCommonControls();
+
     path[0] = 0;
 
     /* Do not use CommandLineToArgvW() or __wgetmainargs() to parse
diff --git a/programs/extrac32/extrac32.manifest b/programs/extrac32/extrac32.manifest
new file mode 100644
index 00000000000..5fdae4e453e
--- /dev/null
+++ b/programs/extrac32/extrac32.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.Extrac32" 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/extrac32/extrac32.rc b/programs/extrac32/extrac32.rc
new file mode 100644
index 00000000000..3526dcb6612
--- /dev/null
+++ b/programs/extrac32/extrac32.rc
@@ -0,0 +1,25 @@
+/*
+ * Extrac32 resources
+ *
+ * Copyright 2021 Zhiyi Zhang for CodeWeavers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#include <windef.h>
+#include <winuser.h>
+
+/* @makedep: extrac32.manifest */
+1 RT_MANIFEST extrac32.manifest