[cwittich] 39508: -don't rely on wingdi.h in winuser.h -remove NOGDI hacks from wine directx dlls

Author: cwittich
Date: Mon Feb  9 02:55:19 2009
New Revision: 39508

URL: http://svn.reactos.org/svn/reactos?rev=39508&view=rev
Log:
-don't rely on wingdi.h in winuser.h
-remove NOGDI hacks from wine directx dlls

Modified:
    trunk/reactos/dll/directx/dinput/dinput.rbuild
    trunk/reactos/dll/directx/dplayx/dplayx.rbuild
    trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild
    trunk/reactos/include/psdk/winuser.h

Modified: trunk/reactos/dll/directx/dinput/dinput.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dinput/dinput.…
==============================================================================
--- trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dinput/dinput.rbuild [iso-8859-1] Mon Feb  9 02:55:19 2009
@@ -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>

Modified: trunk/reactos/dll/directx/dplayx/dplayx.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/dplayx/dplayx.…
==============================================================================
--- trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/dplayx/dplayx.rbuild [iso-8859-1] Mon Feb  9 02:55:19 2009
@@ -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>

Modified: trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/d3d8/d3d8…
==============================================================================
--- trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/d3d8/d3d8.rbuild [iso-8859-1] Mon Feb  9 02:55:19 2009
@@ -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>

Modified: trunk/reactos/include/psdk/winuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winuser.h?rev…
==============================================================================
--- trunk/reactos/include/psdk/winuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/winuser.h [iso-8859-1] Mon Feb  9 02:55:19 2009
@@ -3115,6 +3115,11 @@
 	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 @@
 	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 @@
 #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 @@
 #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