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

fixing few compiling issue with this new header.

Browse source 
add few more redirect in ddraw.c to dxg.sys

svn path=/branches/reactx/; revision=29607
This commit is contained in:
Magnus Olsen 2007-10-15 19:04:50 +00:00
parent 8e71c124ed
commit 5538059b89
3 changed files with 43 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -9,6 +9,9 @@
/* From ddraw.c */
extern PDRVFN gpDxFuncs;
typedef BOOL (NTAPI* PGD_DDSETGAMMARAMP)(HANDLE, HDC, LPVOID);
typedef BOOL (NTAPI* PGD_DDRELEASEDC)(HANDLE);
typedef BOOL (NTAPI* PGD_DDRESTVISRGN)(HANDLE, HWND);
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);

2
reactos/subsystems/win32/win32k/ntddraw/dd.c
View file

@ -137,7 +137,7 @@ NtGdiDdCreateSurfaceEx(HANDLE hDirectDraw,
}
DPRINT1("Calling on dxg.sys pfnDdCreateSurfaceEx");
return pfnDdCreateSurfaceEx(hDirectDrawLocal,puGetScanLineData);
return pfnDdCreateSurfaceEx(hDirectDraw,hSurface,dwSurfaceHandle);
}

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

@ -456,7 +456,7 @@ NtGdiDdFlipToGDISurface(HANDLE hDirectDraw,
}
DPRINT1("Calling on dxg.sys pfnDdFlipToGDISurface");
return pfnDdFlipToGDISurface(hDirectDrawLocal, puFlipToGDISurfaceData);
return pfnDdFlipToGDISurface(hDirectDraw, puFlipToGDISurfaceData);
}
@ -493,7 +493,7 @@ NtGdiDdGetDxHandle(HANDLE hDirectDraw,
BOOL bRelease)
{
PGD_DDGETDXHANDLE pfnDdGetDxHandle = NULL;
PGD_DDGETDXHANDLE pfnDdGetDxHandle = NULL;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdGetDxHandle, pfnDdGetDxHandle);
@ -516,7 +516,19 @@ BOOL
STDCALL
NtGdiDdReleaseDC(HANDLE hSurface)
{
PGD_DDRELEASEDC pfnDdReleaseDC = NULL;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdReleaseDC, pfnDdReleaseDC);
if (pfnDdReleaseDC == NULL)
{
DPRINT1("Warring no pfnDdReleaseDC");
return DDHAL_DRIVER_NOTHANDLED;
}
DPRINT1("Calling on dxg.sys pfnDdReleaseDC");
return pfnDdReleaseDC(hSurface);
}
/************************************************************************/
@ -528,6 +540,19 @@ NtGdiDdResetVisrgn(HANDLE hSurface,
HWND hwnd)
{
PGD_DDRESTVISRGN pfnDdResetVisrgn = NULL;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdResetVisrgn, pfnDdResetVisrgn);
if (pfnDdResetVisrgn == NULL)
{
DPRINT1("Warring no pfnDdResetVisrgn");
return DDHAL_DRIVER_NOTHANDLED;
}
DPRINT1("Calling on dxg.sys pfnDdResetVisrgn");
return pfnDdResetVisrgn(hSurface, hwnd);
}
/************************************************************************/
@ -539,7 +564,19 @@ NtGdiDdSetGammaRamp(HANDLE hDirectDraw,
HDC hdc,
LPVOID lpGammaRamp)
{
PGD_DDSETGAMMARAMP pfnDdSetGammaRamp = NULL;
INT i;
DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdSetGammaRamp, pfnDdSetGammaRamp);
if (pfnDdSetGammaRamp == NULL)
{
DPRINT1("Warring no pfnDdSetGammaRamp");
return DDHAL_DRIVER_NOTHANDLED;
}
DPRINT1("Calling on dxg.sys pfnDdSetGammaRamp");
return pfnDdSetGammaRamp(hDirectDraw, hdc, lpGammaRamp);
}