From bc58fedee463c3a04895c52693bf7e0789f42755 Mon Sep 17 00:00:00 2001
From: Christoph von Wittich <christoph_vw@reactos.org>
Date: Mon, 9 Feb 2009 08:55:19 +0000
Subject: [PATCH] -don't rely on wingdi.h in winuser.h -remove NOGDI hacks from
 wine directx dlls

svn path=/trunk/; revision=39508
---
 reactos/dll/directx/dinput/dinput.rbuild  |  1 -
 reactos/dll/directx/dplayx/dplayx.rbuild  |  1 -
 reactos/dll/directx/wine/d3d8/d3d8.rbuild |  2 +-
 reactos/include/psdk/winuser.h            | 14 ++++++++++----
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/reactos/dll/directx/dinput/dinput.rbuild b/reactos/dll/directx/dinput/dinput.rbuild
index cb8b9afd244..127853bc2b4 100644
--- a/reactos/dll/directx/dinput/dinput.rbuild
+++ b/reactos/dll/directx/dinput/dinput.rbuild
@@ -4,7 +4,6 @@
 	<autoregister infsection="OleControlDlls" type="DllRegisterServer" />
 	<importlibrary definition="dinput.spec" />
 	<define name="_WIN32_WINNT">0x600</define>
-	<define name="NOGDI" />
 	<include base="dinput">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<library>wine</library>
diff --git a/reactos/dll/directx/dplayx/dplayx.rbuild b/reactos/dll/directx/dplayx/dplayx.rbuild
index 17dfda01ce1..2a6037b37b9 100644
--- a/reactos/dll/directx/dplayx/dplayx.rbuild
+++ b/reactos/dll/directx/dplayx/dplayx.rbuild
@@ -3,7 +3,6 @@
 <module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" unicode="yes">
 	<!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
 	<importlibrary definition="dplayx.spec" />
-	<define name="NOGDI" />
 	<include base="dplayx">.</include>
 	<include base="ReactOS">include/reactos/wine</include>
 	<library>wine</library>
diff --git a/reactos/dll/directx/wine/d3d8/d3d8.rbuild b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
index c791d4a6d5f..13ccdacc539 100644
--- a/reactos/dll/directx/wine/d3d8/d3d8.rbuild
+++ b/reactos/dll/directx/wine/d3d8/d3d8.rbuild
@@ -6,7 +6,7 @@
 	<include base="ReactOS">include/reactos/wine</include>
 	<define name="__WINESRC__" />
 	<define name="USE_WIN32_OPENGL" />
-	<define name="NOGDI" />
+
 	<library>uuid</library>
 	<library>wine</library>
 	<library>user32</library>
diff --git a/reactos/include/psdk/winuser.h b/reactos/include/psdk/winuser.h
index 78377718725..7e9cd301754 100644
--- a/reactos/include/psdk/winuser.h
+++ b/reactos/include/psdk/winuser.h
@@ -3115,6 +3115,11 @@ typedef struct tagICONMETRICSW {
 	int iTitleWrap;
 	LOGFONTW lfFont;
 } ICONMETRICSW,*LPICONMETRICSW;
+#ifdef UNICODE
+typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
+#else /* UNICODE */
+typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
+#endif /* UNICODE */
 #endif /*  NOGDI */
 typedef struct tagMINIMIZEDMETRICS {
 	UINT cbSize;
@@ -3167,6 +3172,11 @@ typedef struct tagNONCLIENTMETRICSW {
 	LOGFONTW lfStatusFont;
 	LOGFONTW lfMessageFont;
 } NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
+#ifdef UNICODE
+typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
+#else /* UNICODE */
+typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
+#endif /* UNICODE */
 #endif
 typedef struct tagSERIALKEYSA {
 	UINT cbSize;
@@ -4485,8 +4495,6 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
 #define wvsprintf wvsprintfW
 
 #ifndef NOGDI
-typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
-typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 #define ChangeDisplaySettings ChangeDisplaySettingsW
 #define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
 #define CreateDesktop CreateDesktopW
@@ -4653,8 +4661,6 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
 #define wsprintf wsprintfA
 #define wvsprintf wvsprintfA
 #if defined(_WINGDI_) && !defined(NOGDI)
-typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
-typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
 #define ChangeDisplaySettings ChangeDisplaySettingsA
 #define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
 #define CreateDesktop CreateDesktopA