Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-18 00:31:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

-don't rely on wingdi.h in winuser.h

Browse source 
-remove NOGDI hacks from wine directx dlls

svn path=/trunk/; revision=39508
This commit is contained in:
Christoph von Wittich 2009-02-09 08:55:19 +00:00
parent c4d49789a6
commit bc58fedee4
4 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/dll/directx/dinput/dinput.rbuild
View file

@ -4,7 +4,6 @@
<autoregister infsection="OleControlDlls" type="DllRegisterServer" /> <autoregister infsection="OleControlDlls" type="DllRegisterServer" />
<importlibrary definition="dinput.spec" /> <importlibrary definition="dinput.spec" />
<define name="_WIN32_WINNT">0x600</define> <define name="_WIN32_WINNT">0x600</define>
<define name="NOGDI" />
<include base="dinput">.</include> <include base="dinput">.</include>
<include base="ReactOS">include/reactos/wine</include> <include base="ReactOS">include/reactos/wine</include>
<library>wine</library> <library>wine</library>

1
reactos/dll/directx/dplayx/dplayx.rbuild
View file

@ -3,7 +3,6 @@
<module name="dplayx" type="win32dll" baseaddress="${BASEADDRESS_DPLAYX}" installbase="system32" installname="dplayx.dll" unicode="yes"> <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" --> <!-- Won't load correctly in ReactOS yet autoregister infsection="OleControlDlls" type="DllRegisterServer" -->
<importlibrary definition="dplayx.spec" /> <importlibrary definition="dplayx.spec" />
<define name="NOGDI" />
<include base="dplayx">.</include> <include base="dplayx">.</include>
<include base="ReactOS">include/reactos/wine</include> <include base="ReactOS">include/reactos/wine</include>
<library>wine</library> <library>wine</library>

2
reactos/dll/directx/wine/d3d8/d3d8.rbuild
View file

@ -6,7 +6,7 @@
<include base="ReactOS">include/reactos/wine</include> <include base="ReactOS">include/reactos/wine</include>
<define name="__WINESRC__" /> <define name="__WINESRC__" />
<define name="USE_WIN32_OPENGL" /> <define name="USE_WIN32_OPENGL" />
<define name="NOGDI" />
<library>uuid</library> <library>uuid</library>
<library>wine</library> <library>wine</library>
<library>user32</library> <library>user32</library>

14
reactos/include/psdk/winuser.h
View file

@ -3115,6 +3115,11 @@ typedef struct tagICONMETRICSW {
int iTitleWrap; int iTitleWrap;
LOGFONTW lfFont; LOGFONTW lfFont;
} ICONMETRICSW,*LPICONMETRICSW; } ICONMETRICSW,*LPICONMETRICSW;
#ifdef UNICODE
typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
#else /* UNICODE */
typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
#endif /* UNICODE */
#endif /* NOGDI */ #endif /* NOGDI */
typedef struct tagMINIMIZEDMETRICS { typedef struct tagMINIMIZEDMETRICS {
UINT cbSize; UINT cbSize;
@ -3167,6 +3172,11 @@ typedef struct tagNONCLIENTMETRICSW {
LOGFONTW lfStatusFont; LOGFONTW lfStatusFont;
LOGFONTW lfMessageFont; LOGFONTW lfMessageFont;
} NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW; } NONCLIENTMETRICSW,*LPNONCLIENTMETRICSW;
#ifdef UNICODE
typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#else /* UNICODE */
typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#endif /* UNICODE */
#endif #endif
typedef struct tagSERIALKEYSA { typedef struct tagSERIALKEYSA {
UINT cbSize; UINT cbSize;
@ -4485,8 +4495,6 @@ typedef MONITORINFOEXW MONITORINFOEX, *LPMONITORINFOEX;
#define wvsprintf wvsprintfW #define wvsprintf wvsprintfW
#ifndef NOGDI #ifndef NOGDI
typedef ICONMETRICSW ICONMETRICS,*LPICONMETRICS;
typedef NONCLIENTMETRICSW NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#define ChangeDisplaySettings ChangeDisplaySettingsW #define ChangeDisplaySettings ChangeDisplaySettingsW
#define ChangeDisplaySettingsEx ChangeDisplaySettingsExW #define ChangeDisplaySettingsEx ChangeDisplaySettingsExW
#define CreateDesktop CreateDesktopW #define CreateDesktop CreateDesktopW
@ -4653,8 +4661,6 @@ typedef MONITORINFOEXA MONITORINFOEX, *LPMONITORINFOEX;
#define wsprintf wsprintfA #define wsprintf wsprintfA
#define wvsprintf wvsprintfA #define wvsprintf wvsprintfA
#if defined(_WINGDI_) && !defined(NOGDI) #if defined(_WINGDI_) && !defined(NOGDI)
typedef ICONMETRICSA ICONMETRICS,*LPICONMETRICS;
typedef NONCLIENTMETRICSA NONCLIENTMETRICS,*LPNONCLIENTMETRICS;
#define ChangeDisplaySettings ChangeDisplaySettingsA #define ChangeDisplaySettings ChangeDisplaySettingsA
#define ChangeDisplaySettingsEx ChangeDisplaySettingsExA #define ChangeDisplaySettingsEx ChangeDisplaySettingsExA
#define CreateDesktop CreateDesktopA #define CreateDesktop CreateDesktopA