Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-07 21:25:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixing few compiling issue with this new header.

Browse source 
svn path=/branches/reactx/; revision=29606
This commit is contained in:
Magnus Olsen 2007-10-15 18:40:01 +00:00
parent 7396205d50
commit 8e71c124ed
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/subsystems/win32/win32k/include/intddraw.h
View file

@ -9,10 +9,10 @@
/* From ddraw.c */ /* From ddraw.c */
extern PDRVFN gpDxFuncs; extern PDRVFN gpDxFuncs;
typedef HANDLE (NTAPI* PGD_PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL); typedef HANDLE (NTAPI* PGD_DDGETDXHANDLE)(HANDLE, HANDLE, BOOL);
typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *); typedef HDC (NTAPI *PGD_DDGETDC)(HANDLE, PALETTEENTRY *);
typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID); typedef DWORD (NTAPI *PGD_DXGENERICTRUNK)(ULONG_PTR, ULONG_PTR, SIZE_T*, PVOID, SIZE_T*, PVOID);
typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL); typedef DWORD (NTAPI *PGD_DXDDREENABLEDIRECTDRAWOBJECT)(HANDLE, BOOL*);
typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA); typedef DWORD (NTAPI *PGD_DXDDGETDRIVERINFO)(HANDLE, PDD_GETDRIVERINFODATA);
typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA); typedef DWORD (NTAPI *PGD_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA);
typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS); typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS);

9
reactos/subsystems/win32/win32k/ntddraw/ddraw.c
View file

@ -97,8 +97,7 @@ BOOL
INTERNAL_CALL INTERNAL_CALL
DD_Cleanup(PVOID ObjectBody) DD_Cleanup(PVOID ObjectBody)
{ {
PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; // FIXME remove this line PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody;
DPRINT1("DD_Cleanup\n"); DPRINT1("DD_Cleanup\n");
/* Do not known what the new cleanup code should do at moment */ /* Do not known what the new cleanup code should do at moment */
@ -175,9 +174,9 @@ NtGdiDxgGenericThunk(ULONG_PTR ulIndex,
PGD_DXGENERICTRUNK pfnDxgGenericThunk = NULL; PGD_DXGENERICTRUNK pfnDxgGenericThunk = NULL;
INT i; INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDriverState, pfnDxgGenericThunk); DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDxgGenericThunk, pfnDxgGenericThunk);
if (pfnDdGetDriverState == NULL) if (pfnDxgGenericThunk == NULL)
{ {
DPRINT1("Warring no pfnDxgGenericThunk"); DPRINT1("Warring no pfnDxgGenericThunk");
return DDHAL_DRIVER_NOTHANDLED; return DDHAL_DRIVER_NOTHANDLED;
@ -432,7 +431,7 @@ NtGdiDdSetExclusiveMode(HANDLE hDirectDraw,
} }
DPRINT1("Calling on dxg.sys pfnDdSetExclusiveMode"); DPRINT1("Calling on dxg.sys pfnDdSetExclusiveMode");
return pfnDdSetExclusiveMode(hDirectDrawLocal, puGetAvailDriverMemoryData); return pfnDdSetExclusiveMode(hDirectDraw, puSetExclusiveModeData);
} }