From f304b2ae23bb537029fe51983f060f680de66a12 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Fri, 11 Jun 2021 10:05:33 +0800
Subject: [PATCH] winevdm: Enable visual styles.

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

diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in
index 0ea89f4b0de..c841f3c4d46 100644
--- a/programs/winevdm/Makefile.in
+++ b/programs/winevdm/Makefile.in
@@ -1,6 +1,8 @@
 MODULE    = winevdm.exe
 APPMODE   = -mwindows
-IMPORTS   = user32 kernel
+IMPORTS   = user32 kernel comctl32
 
 C_SRCS = \
 	winevdm.c
+
+RC_SRCS = winevdm.rc
diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c
index 0a43e579793..1ab91f41d66 100644
--- a/programs/winevdm/winevdm.c
+++ b/programs/winevdm/winevdm.c
@@ -30,6 +30,7 @@
 #include "wine/winbase16.h"
 #include "winuser.h"
 #include "wincon.h"
+#include "commctrl.h"
 #include "wine/unicode.h"
 #include "wine/debug.h"
 
@@ -504,6 +505,8 @@ int main( int argc, char *argv[] )
     char *cmdline, *appname, **first_arg;
     char *p;
 
+    InitCommonControls();
+
     if (!argv[1]) usage();
 
     if (!strcmp( argv[1], "--app-name" ))
diff --git a/programs/winevdm/winevdm.manifest b/programs/winevdm/winevdm.manifest
new file mode 100644
index 00000000000..9634ec55524
--- /dev/null
+++ b/programs/winevdm/winevdm.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.Winevdm" 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/winevdm/winevdm.rc b/programs/winevdm/winevdm.rc
new file mode 100644
index 00000000000..5ccf9e47151
--- /dev/null
+++ b/programs/winevdm/winevdm.rc
@@ -0,0 +1,25 @@
+/*
+ * Winevdm 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: winevdm.manifest */
+1 RT_MANIFEST winevdm.manifest