Author: greatlrd Date: Mon Oct 15 22:40:01 2007 New Revision: 29606
URL: http://svn.reactos.org/svn/reactos?rev=29606&view=rev Log: fixing few compiling issue with this new header.
Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c
Modified: branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/... ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h (original) +++ branches/reactx/reactos/subsystems/win32/win32k/include/intddraw.h Mon Oct 15 22:40:01 2007 @@ -9,10 +9,10 @@ /* From ddraw.c */ 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 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_DXDDSETEXCLUSIVEMODE)(HANDLE, PDD_SETEXCLUSIVEMODEDATA); typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULONG, PDRVENABLEDATA, PULONG, PEPROCESS);
Modified: branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/subsystems/win32/... ============================================================================== --- branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c (original) +++ branches/reactx/reactos/subsystems/win32/win32k/ntddraw/ddraw.c Mon Oct 15 22:40:01 2007 @@ -97,8 +97,7 @@ INTERNAL_CALL DD_Cleanup(PVOID ObjectBody) { - PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; - + // FIXME remove this line PDD_DIRECTDRAW pDirectDraw = (PDD_DIRECTDRAW) ObjectBody; DPRINT1("DD_Cleanup\n");
/* Do not known what the new cleanup code should do at moment */ @@ -175,9 +174,9 @@ PGD_DXGENERICTRUNK pfnDxgGenericThunk = NULL; INT i;
- DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDriverState, pfnDxgGenericThunk); - - if (pfnDdGetDriverState == NULL) + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDxgGenericThunk, pfnDxgGenericThunk); + + if (pfnDxgGenericThunk == NULL) { DPRINT1("Warring no pfnDxgGenericThunk"); return DDHAL_DRIVER_NOTHANDLED; @@ -432,7 +431,7 @@ }
DPRINT1("Calling on dxg.sys pfnDdSetExclusiveMode"); - return pfnDdSetExclusiveMode(hDirectDrawLocal, puGetAvailDriverMemoryData); + return pfnDdSetExclusiveMode(hDirectDraw, puSetExclusiveModeData);
}