From b1eeaa657db649c256fe92c94f210982f810fd6a Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Mon, 18 Oct 2021 14:54:09 +0800
Subject: [PATCH] Revert "winevdm: Enable visual styles.".

This reverts commit f304b2ae23bb537029fe51983f060f680de66a12.

16-bit applications don't use themed controls even if theming is on.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51583
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51802
Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 programs/winevdm/Makefile.in      |  2 +-
 programs/winevdm/winevdm.c        |  3 ---
 programs/winevdm/winevdm.manifest | 12 ------------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/programs/winevdm/Makefile.in b/programs/winevdm/Makefile.in
index cc3dddb09c6..67420b81759 100644
--- a/programs/winevdm/Makefile.in
+++ b/programs/winevdm/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = winevdm.exe
-IMPORTS   = user32 kernel comctl32
+IMPORTS   = user32 kernel
 
 EXTRADLLFLAGS = -mwindows
 
diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c
index 19f3c778513..5b5f72db253 100644
--- a/programs/winevdm/winevdm.c
+++ b/programs/winevdm/winevdm.c
@@ -29,7 +29,6 @@
 #include "wine/winbase16.h"
 #include "winuser.h"
 #include "wincon.h"
-#include "commctrl.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(winevdm);
@@ -448,8 +447,6 @@ 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
index 6547ce24206..98bc91bd786 100644
--- a/programs/winevdm/winevdm.manifest
+++ b/programs/winevdm/winevdm.manifest
@@ -1,18 +1,6 @@
 <?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>
 <application xmlns="urn:schemas-microsoft-com:asm.v3">
     <windowsSettings>
         <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>