[PATCH 2/4] uninstaller: Enable visual styles.

[Zhiyi Zhang]

Signed-off-by: Zhiyi Zhang 
---
 programs/uninstaller/Makefile.in          |  2 +-
 programs/uninstaller/main.c               |  3 +++
 programs/uninstaller/resource.h           |  1 +
 programs/uninstaller/uninstaller.manifest | 16 ++++++++++++++++
 programs/uninstaller/uninstaller.rc       |  3 +++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 programs/uninstaller/uninstaller.manifest

diff --git a/programs/uninstaller/Makefile.in b/programs/uninstaller/Makefile.in
index 146e6204baa..d37316c14c7 100644
--- a/programs/uninstaller/Makefile.in
+++ b/programs/uninstaller/Makefile.in
@@ -1,6 +1,6 @@
 MODULE    = uninstaller.exe
 IMPORTS   = advapi32
-DELAYIMPORTS = shlwapi shell32 user32 gdi32
+DELAYIMPORTS = shlwapi shell32 user32 gdi32 comctl32

EXTRADLLFLAGS = -mconsole -municode -mno-cygwin

diff --git a/programs/uninstaller/main.c b/programs/uninstaller/main.c
index 42aa53631f1..8941d3a47ad 100644
--- a/programs/uninstaller/main.c
+++ b/programs/uninstaller/main.c
@@ -23,6 +23,7 @@

#include <string.h>
 #include <windows.h>
+#include <commctrl.h>
 #include <shlwapi.h>
 #include "resource.h"
 #include "regstr.h"
@@ -176,6 +177,8 @@ int __cdecl wmain(int argc, WCHAR *argv[])
         Wow64RevertWow64FsRedirection( redir );
     }

+    InitCommonControls();
+
     while( i<argc )
     {
         token = argv[i++];
diff --git a/programs/uninstaller/resource.h b/programs/uninstaller/resource.h
index 72ba160d5bd..35ac91f01a2 100644
--- a/programs/uninstaller/resource.h
+++ b/programs/uninstaller/resource.h
@@ -19,6 +19,7 @@
  */

#include <windef.h>
+#include <winuser.h>

#define IDS_APPNAME                     1000
 #define IDS_UNINSTALLFAILED             1001
diff --git a/programs/uninstaller/uninstaller.manifest b/programs/uninstaller/uninstaller.manifest
new file mode 100644
index 00000000000..ee41796562e
--- /dev/null
+++ b/programs/uninstaller/uninstaller.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.Uninstaller" 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/uninstaller/uninstaller.rc b/programs/uninstaller/uninstaller.rc
index 4afc6845bc0..631f81e0f77 100644
--- a/programs/uninstaller/uninstaller.rc
+++ b/programs/uninstaller/uninstaller.rc
@@ -41,3 +41,6 @@ STRINGTABLE {
 \t\t    Use '--list' to determine the application GUID.\n\
 \  [no option]       Launch the graphical version of this program.\n\n"
 }
+
+/* @makedep: uninstaller.manifest */
+1 RT_MANIFEST uninstaller.manifest