From 3747699735bfaf5175e62425e84d90651897b009 Mon Sep 17 00:00:00 2001
From: Carlo-Bramini <carlo_bramini@users.sourceforge.net>
Date: Tue, 19 Mar 2019 21:23:32 +0100
Subject: [PATCH] [WINVER] Fix WINVER theming. CORE-13343 (#1428)

Use and initialize common controls for theming support,
and include a manifest as well.
---
 base/applications/winver/CMakeLists.txt | 2 +-
 base/applications/winver/winver.c       | 9 +++++++++
 base/applications/winver/winver.rc      | 5 +++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/base/applications/winver/CMakeLists.txt b/base/applications/winver/CMakeLists.txt
index af0286db2c0..ac5b762b83d 100644
--- a/base/applications/winver/CMakeLists.txt
+++ b/base/applications/winver/CMakeLists.txt
@@ -1,5 +1,5 @@
 
 add_executable(winver winver.c winver.rc)
 set_module_type(winver win32gui UNICODE)
-add_importlibs(winver shell32 msvcrt kernel32)
+add_importlibs(winver shell32 comctl32 msvcrt kernel32)
 add_cd_file(TARGET winver DESTINATION reactos/system32 FOR all)
diff --git a/base/applications/winver/winver.c b/base/applications/winver/winver.c
index bbac2782748..1e22096c4ee 100644
--- a/base/applications/winver/winver.c
+++ b/base/applications/winver/winver.c
@@ -7,14 +7,23 @@
 #include <stdarg.h>
 #include <windef.h>
 #include <winbase.h>
+#include <winuser.h>
+#include <commctrl.h>
 #include <shellapi.h>
 
 int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLine, int nCmdShow)
 {
+    INITCOMMONCONTROLSEX iccx;
+
     UNREFERENCED_PARAMETER(hInstance);
     UNREFERENCED_PARAMETER(hPrevInstance);
     UNREFERENCED_PARAMETER(lpCmdLine);
     UNREFERENCED_PARAMETER(nCmdShow);
 
+    /* Initialize common controls */
+    iccx.dwSize = sizeof(INITCOMMONCONTROLSEX);
+    iccx.dwICC = ICC_STANDARD_CLASSES | ICC_WIN95_CLASSES;
+    InitCommonControlsEx(&iccx);
+
     return ShellAboutW(NULL, L"ReactOS", NULL, NULL);
 }
diff --git a/base/applications/winver/winver.rc b/base/applications/winver/winver.rc
index bc853f8a4b0..050ae694370 100644
--- a/base/applications/winver/winver.rc
+++ b/base/applications/winver/winver.rc
@@ -1,5 +1,10 @@
 
+#include <windef.h>
+#include <winuser.h>
+
 #define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Version Program"
 #define REACTOS_STR_INTERNAL_NAME     "winver"
 #define REACTOS_STR_ORIGINAL_FILENAME "winver.exe"
 #include <reactos/version.rc>
+
+#include <reactos/manifest_exe.rc>