Zhiyi Zhang : dxdiag: Enable visual styles.
Alexandre Julliard
julliard at winehq.org
Wed Jun 9 16:43:06 CDT 2021
Module: wine
Branch: master
Commit: 7af0ab05043d0d19e611c87b086b33ed43708ebb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=7af0ab05043d0d19e611c87b086b33ed43708ebb
Author: Zhiyi Zhang <zzhang at codeweavers.com>
Date: Wed Jun 9 21:57:17 2021 +0800
dxdiag: Enable visual styles.
Signed-off-by: Zhiyi Zhang <zzhang at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
programs/dxdiag/Makefile.in | 2 +-
programs/dxdiag/dxdiag.manifest | 16 ++++++++++++++++
programs/dxdiag/dxdiag.rc | 3 +++
programs/dxdiag/dxdiag_private.h | 1 +
programs/dxdiag/main.c | 3 +++
5 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/programs/dxdiag/Makefile.in b/programs/dxdiag/Makefile.in
index aeab69ea306..f7420ee27df 100644
--- a/programs/dxdiag/Makefile.in
+++ b/programs/dxdiag/Makefile.in
@@ -1,5 +1,5 @@
MODULE = dxdiag.exe
-IMPORTS = dxguid ole32 oleaut32 user32
+IMPORTS = dxguid ole32 oleaut32 user32 comctl32
EXTRADLLFLAGS = -mwindows -municode -mno-cygwin
diff --git a/programs/dxdiag/dxdiag.manifest b/programs/dxdiag/dxdiag.manifest
new file mode 100644
index 00000000000..57ba80c05db
--- /dev/null
+++ b/programs/dxdiag/dxdiag.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.Dxdiag" 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/dxdiag/dxdiag.rc b/programs/dxdiag/dxdiag.rc
index a37b28d58d6..d7e45579706 100644
--- a/programs/dxdiag/dxdiag.rc
+++ b/programs/dxdiag/dxdiag.rc
@@ -29,3 +29,6 @@ STRINGTABLE
STRING_DXDIAG_TOOL, "DirectX Diagnostic Tool"
STRING_USAGE, "Usage: dxdiag [/whql:off | /whql:on] [/t filename | /x filename]"
}
+
+/* @makedep: dxdiag.manifest */
+1 RT_MANIFEST dxdiag.manifest
diff --git a/programs/dxdiag/dxdiag_private.h b/programs/dxdiag/dxdiag_private.h
index 010bb941b27..8d76c0ef677 100644
--- a/programs/dxdiag/dxdiag_private.h
+++ b/programs/dxdiag/dxdiag_private.h
@@ -19,6 +19,7 @@
*/
#include <windef.h>
+#include <winuser.h>
/* Resource definitions. */
#define MAX_STRING_LEN 1024
diff --git a/programs/dxdiag/main.c b/programs/dxdiag/main.c
index 968d84adea1..f57eec99292 100644
--- a/programs/dxdiag/main.c
+++ b/programs/dxdiag/main.c
@@ -21,6 +21,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <dxdiag.h>
+#include <commctrl.h>
#include "wine/debug.h"
#include "dxdiag_private.h"
@@ -180,6 +181,8 @@ int WINAPI wWinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR cmdline, int cm
struct command_line_info info;
struct dxdiag_information *dxdiag_info;
+ InitCommonControls();
+
hInstance = hInst;
if (!process_command_line(cmdline, &info))
More information about the wine-cvs
mailing list