Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 21:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

- DXAPI: Fix incompatible header inclusion

Browse source 
- DXG: Change the way PDC is defined -- treat the DC structure as opaque instead of including internal win32k headers. Also rework the way DD_BASEOBJECT is defined.

svn path=/trunk/; revision=37689
This commit is contained in:
Stefan Ginsberg 2008-11-27 15:34:33 +00:00
parent 67a842b6fe
commit fb33d87194
3 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/drivers/directx/dxapi/dxapi_driver.h
View file

@ -1,7 +1,4 @@
/* DDK/NDK/SDK Headers */
/* DDK/NDK/SDK Headers */
#include <ddk/ntddk.h>
#include <ddk/ntddmou.h>
@ -14,10 +11,9 @@
#include <winerror.h>
#include <wingdi.h>
#include <winddi.h>
#include <winuser.h>
#include <prntfont.h>
#include <dde.h>
#include <wincon.h>
#include <ddk/ddkmapi.h>

23
reactos/drivers/directx/dxg/dxg_int.h
View file

@ -17,22 +17,23 @@
#include <winerror.h>
#include <wingdi.h>
#include <winddi.h>
#include <winuser.h>
#include <prntfont.h>
#include <dde.h>
#include <wincon.h>
/* Public Win32K Headers */
#include <win32k/ntusrtyp.h>
#include <win32k/ntuser.h>
#include <win32k/ntgdityp.h>
#include <win32k/ntgdihdl.h>
#include <win32.h>
#include <gdiobj.h>
#include <dc.h>
/* DXG treats this as opaque */
typedef PVOID PDC;
typedef PVOID PW32THREAD;
typedef struct _DD_BASEOBJECT
{
HGDIOBJ hHmgr;
ULONG ulShareCount;
USHORT cExclusiveLock;
USHORT BaseFlags;
PW32THREAD Tid;
} DD_BASEOBJECT, *PDD_BASEOBJECT;
#include <drivers/directx/directxint.h>
#include <drivers/directx/dxg.h>
#include <drivers/directx/dxeng.h>

2
reactos/include/reactos/drivers/directx/directxint.h
View file

@ -2,8 +2,10 @@
#ifndef _DXINTERNEL_
#define _DXINTERNEL_
#ifdef __W32K_H
#define PDD_BASEOBJECT POBJ
#define DD_BASEOBJECT BASEOBJECT
#endif
/* _EDD_DIRECTDRAW_LOCAL is 0x54 bytes long on Windows XP */
typedef struct _EDD_DIRECTDRAW_LOCAL