From af242e43cb31d355a53937b1f31d024e330a1e73 Mon Sep 17 00:00:00 2001
From: Zhiyi Zhang <zzhang@codeweavers.com>
Date: Wed, 16 Jun 2021 10:31:42 +0800
Subject: [PATCH] clock: Enable visual styles.

Signed-off-by: Zhiyi Zhang <zzhang@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 programs/clock/Makefile.in    |  2 +-
 programs/clock/clock.manifest | 16 ++++++++++++++++
 programs/clock/clock.rc       |  3 +++
 programs/clock/clock_res.h    |  1 +
 programs/clock/main.c         |  3 +++
 5 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 programs/clock/clock.manifest

diff --git a/programs/clock/Makefile.in b/programs/clock/Makefile.in
index 060e2ff0881..ad1681aeef0 100644
--- a/programs/clock/Makefile.in
+++ b/programs/clock/Makefile.in
@@ -1,5 +1,5 @@
 MODULE    = clock.exe
-IMPORTS   = comdlg32 shell32 user32 gdi32
+IMPORTS   = comdlg32 shell32 user32 gdi32 comctl32
 
 EXTRADLLFLAGS = -mwindows -mno-cygwin
 
diff --git a/programs/clock/clock.manifest b/programs/clock/clock.manifest
new file mode 100644
index 00000000000..4a9f38c4ff8
--- /dev/null
+++ b/programs/clock/clock.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.Clock" 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/clock/clock.rc b/programs/clock/clock.rc
index 8e3b9ef4b7c..0d19369b9f4 100644
--- a/programs/clock/clock.rc
+++ b/programs/clock/clock.rc
@@ -49,3 +49,6 @@ STRINGTABLE
 {
 IDS_CLOCK, "Clock"
 }
+
+/* @makedep: clock.manifest */
+1 RT_MANIFEST clock.manifest
diff --git a/programs/clock/clock_res.h b/programs/clock/clock_res.h
index b7abf1c35d3..32fd9ff8a0f 100644
--- a/programs/clock/clock_res.h
+++ b/programs/clock/clock_res.h
@@ -17,6 +17,7 @@
  */
 
 #include <windef.h>
+#include <winuser.h>
 
 #define MAIN_MENU                 0x100
 #define IDM_ANALOG                0x101
diff --git a/programs/clock/main.c b/programs/clock/main.c
index 43364745ea5..e64e66dffe6 100644
--- a/programs/clock/main.c
+++ b/programs/clock/main.c
@@ -26,6 +26,7 @@
 #include <stdio.h>
 
 #include "windows.h"
+#include "commctrl.h"
 #include "commdlg.h"
 #include "shellapi.h"
 
@@ -389,6 +390,8 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE prev, LPSTR cmdline, int show
     MSG      msg;
     WNDCLASSW class;
 
+    InitCommonControls();
+
     /* Setup Globals */
     memset(&Globals.hFont, 0, sizeof (Globals.hFont));
     Globals.bAnalog         = TRUE;