From a83c927ea6b54188f88b4bf0f0885bae4a2d253e Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Sun, 14 Oct 2007 20:05:40 +0000 Subject: [PATCH] delete stub.c from ntddraw folder it is not longer need it add more redirect to dxg.sys smaller cleanup as well svn path=/branches/reactx/; revision=29575 --- reactos/subsystems/win32/win32k/ntddraw/d3d.c | 1 + .../subsystems/win32/win32k/ntddraw/ddraw.c | 90 +++++++++++++++++-- .../subsystems/win32/win32k/ntddraw/ddsurf.c | 2 + .../subsystems/win32/win32k/ntddraw/stubs.c | 85 ------------------ 4 files changed, 85 insertions(+), 93 deletions(-) delete mode 100644 reactos/subsystems/win32/win32k/ntddraw/stubs.c diff --git a/reactos/subsystems/win32/win32k/ntddraw/d3d.c b/reactos/subsystems/win32/win32k/ntddraw/d3d.c index da0653abadf..7d67344b665 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/d3d.c +++ b/reactos/subsystems/win32/win32k/ntddraw/d3d.c @@ -25,6 +25,7 @@ extern PDRVFN gpDxFuncs; +typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE); typedef DWORD (NTAPI *PGD_DDCANCREATED3DBUFFER)(HANDLE, PDD_CANCREATESURFACEDATA); typedef DWORD (NTAPI *PGD_DXDDUNLOCKD3D)(HANDLE, PDD_UNLOCKDATA); typedef DWORD (NTAPI *PGD_DXDDLOCKD3D)(HANDLE, PDD_LOCKDATA); diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c index cb857278dbe..61dacadb9f1 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c +++ b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c @@ -30,13 +30,10 @@ typedef NTSTATUS (NTAPI *PGD_DXDDSTARTUPDXGRAPHICS) (ULONG, PDRVENABLEDATA, ULON typedef NTSTATUS (NTAPI *PGD_DXDDCLEANUPDXGRAPHICS) (VOID); typedef HANDLE (NTAPI *PGD_DDCREATEDIRECTDRAWOBJECT) (HDC hdc); typedef DWORD (NTAPI *PGD_DDGETDRIVERSTATE)(PDD_GETDRIVERSTATEDATA); -typedef DWORD (NTAPI *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA); -typedef BOOL (NTAPI *PGD_DDATTACHSURFACE)(HANDLE, HANDLE); typedef DWORD (NTAPI *PGD_DDCOLORCONTROL)(HANDLE hSurface,PDD_COLORCONTROLDATA puColorControlData); typedef HANDLE (NTAPI *PGD_DXDDCREATESURFACEOBJECT)(HANDLE, HANDLE, PDD_SURFACE_LOCAL, PDD_SURFACE_MORE, PDD_SURFACE_GLOBAL, BOOL); typedef BOOL (NTAPI *PGD_DXDDDELETEDIRECTDRAWOBJECT)(HANDLE); typedef BOOL (NTAPI *PGD_DXDDDELETESURFACEOBJECT)(HANDLE); -typedef DWORD (NTAPI *PGD_DXDDDESTROYD3DBUFFER)(HANDLE); typedef DWORD (NTAPI *PGD_DXDDFLIPTOGDISURFACE)(HANDLE, PDD_FLIPTOGDISURFACEDATA); typedef DWORD (NTAPI *PGD_DXDDGETAVAILDRIVERMEMORY)(HANDLE , PDD_GETAVAILDRIVERMEMORYDATA); typedef BOOL (NTAPI *PGD_DXDDQUERYDIRECTDRAWOBJECT)(HANDLE, DD_HALINFO*, DWORD*, LPD3DNTHAL_CALLBACKS, LPD3DNTHAL_GLOBALDRIVERDATA, @@ -361,8 +358,6 @@ NtGdiDdQueryDirectDrawObject(HANDLE hDirectDrawLocal, /************************************************************************/ /* NtGdiDdReenableDirectDrawObject */ /************************************************************************/ - - BOOL STDCALL NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, @@ -387,7 +382,6 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, /************************************************************************/ /* NtGdiDdGetDriverInfo */ /************************************************************************/ - DWORD STDCALL NtGdiDdGetDriverInfo(HANDLE hDirectDrawLocal, @@ -407,8 +401,6 @@ NtGdiDdGetDriverInfo(HANDLE hDirectDrawLocal, DPRINT1("Calling on dxg.sys pfnDdGetDriverInfo"); return pfnDdGetDriverInfo(hDirectDrawLocal, puGetDriverInfoData); - - } @@ -462,6 +454,88 @@ NtGdiDdSetExclusiveMode(HANDLE hDirectDraw, } +/************************************************************************/ +/* NtGdiDdFlipToGDISurface */ +/************************************************************************/ +DWORD +STDCALL +NtGdiDdFlipToGDISurface(HANDLE hDirectDraw, + PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData) +{ + PGD_DXDDFLIPTOGDISURFACE pfnDdFlipToGDISurface = NULL; + INT i; + + DXG_GET_INDEX_FUNCTION(DXG_INDEX_DxDdFlipToGDISurface, pfnDdFlipToGDISurface); + + if (pfnDdFlipToGDISurface == NULL) + { + DPRINT1("Warring no pfnDdFlipToGDISurface"); + return DDHAL_DRIVER_NOTHANDLED; + } + + DPRINT1("Calling on dxg.sys pfnDdFlipToGDISurface"); + return pfnDdFlipToGDISurface(hDirectDrawLocal, puFlipToGDISurfaceData); + +} + +/************************************************************************/ +/* NtGdiDdGetDC */ +/************************************************************************/ +HDC +STDCALL +NtGdiDdGetDC(HANDLE hSurface, + PALETTEENTRY *puColorTable) +{ + +} + +/************************************************************************/ +/* NtGdiDdGetDxHandle */ +/************************************************************************/ +HANDLE +STDCALL +NtGdiDdGetDxHandle(HANDLE hDirectDraw, + HANDLE hSurface, + BOOL bRelease) +{ + +} + + +/************************************************************************/ +/* NtGdiDdReleaseDC */ +/************************************************************************/ +BOOL +STDCALL +NtGdiDdReleaseDC(HANDLE hSurface) +{ + +} + +/************************************************************************/ +/* NtGdiDdResetVisrgn */ +/************************************************************************/ +BOOL +STDCALL +NtGdiDdResetVisrgn(HANDLE hSurface, + HWND hwnd) +{ + +} + +/************************************************************************/ +/* NtGdiDdSetGammaRamp */ +/************************************************************************/ +BOOL +STDCALL +NtGdiDdSetGammaRamp(HANDLE hDirectDraw, + HDC hdc, + LPVOID lpGammaRamp) +{ + +} + + /* EOF */ diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c b/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c index fa464343326..a43b0956727 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c +++ b/reactos/subsystems/win32/win32k/ntddraw/ddsurf.c @@ -16,6 +16,8 @@ extern PDRVFN gpDxFuncs; +typedef DWORD (NTAPI *PGD_DDALPHABLT)(HANDLE, HANDLE, PDD_BLTDATA); +typedef BOOL (NTAPI *PGD_DDATTACHSURFACE)(HANDLE, HANDLE); typedef DWORD (NTAPI *PGD_DXDDUNATTACHSURFACE)(HANDLE, HANDLE); typedef DWORD (NTAPI *PGD_DXDDDESTROYSURFACE)(HANDLE, BOOL); typedef DWORD (NTAPI *PGD_DXDDFLIP)(HANDLE, HANDLE, HANDLE, HANDLE, PDD_FLIPDATA); diff --git a/reactos/subsystems/win32/win32k/ntddraw/stubs.c b/reactos/subsystems/win32/win32k/ntddraw/stubs.c deleted file mode 100644 index b3b575eef60..00000000000 --- a/reactos/subsystems/win32/win32k/ntddraw/stubs.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS kernel - * PURPOSE: Native DirectDraw stubs - * FILE: subsys/win32k/ntddraw/stubs.c - * PROGRAMER: Peter Bajusz (hyp-x@stormregion.com) - * REVISION HISTORY: - * 25-10-2003 PB Created - */ - -#include - -#define NDEBUG -#include - - - -DWORD STDCALL NtGdiDdFlipToGDISurface( - HANDLE hDirectDraw, - PDD_FLIPTOGDISURFACEDATA puFlipToGDISurfaceData -) -{ - UNIMPLEMENTED - - return 0; -} - -HDC STDCALL NtGdiDdGetDC( - HANDLE hSurface, - PALETTEENTRY *puColorTable -) -{ - UNIMPLEMENTED - - return 0; -} - -HANDLE STDCALL NtGdiDdGetDxHandle( - HANDLE hDirectDraw, - HANDLE hSurface, - BOOL bRelease -) -{ - UNIMPLEMENTED - - return 0; -} - - - -BOOL STDCALL NtGdiDdReleaseDC( - HANDLE hSurface -) -{ - UNIMPLEMENTED - - return 0; -} - -BOOL STDCALL NtGdiDdResetVisrgn( - HANDLE hSurface, - HWND hwnd -) -{ - - return TRUE; -} - -BOOL STDCALL NtGdiDdSetGammaRamp( - HANDLE hDirectDraw, - HDC hdc, - LPVOID lpGammaRamp -) -{ - UNIMPLEMENTED - - return 0; -} - - - - - - -/* EOF */