Author: greatlrd Date: Sat May 3 06:46:34 2008 New Revision: 33255
URL: http://svn.reactos.org/svn/reactos?rev=33255&view=rev Log: Bugfix : DRVFN gaEngFuncs one row was wrong thx irc : Pigglesworth for notice it. start fixing prototype for DxEngDeleteDC
Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/dir... ============================================================================== --- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sat May 3 06:46:34 2008 @@ -104,7 +104,7 @@ DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpSpritesVisible(DWORD x1); HDC STDCALL DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3); -DWORD STDCALL DxEngDeleteDC(DWORD x1, DWORD x2); +DWORD STDCALL DxEngDeleteDC(HDC hdc, DWORD x2); DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2);
Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntd... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sat May 3 06:46:34 2008 @@ -24,6 +24,7 @@ HANDLE ghDxGraphics = NULL; ULONG gdwDirectDrawContext;
+#define DXDBG 1
/************************************************************************/ /* DirectX graphic/video driver enable start here */ @@ -451,6 +452,9 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, BOOL *pubNewMode) { +#if DXDBG + BOOL status = FALSE; +#endif PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject = (PGD_DXDDREENABLEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdReenableDirectDrawObject].pfn;
if (pfnDdReenableDirectDrawObject == NULL) @@ -460,7 +464,15 @@ }
DPRINT1("Calling dxg.sys pfnDdReenableDirectDrawObject\n"); + +#if DXDBG + status = pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); + DPRINT1("end Calling dxg.sys pfnDdReenableDirectDrawObject\n"); + DPRINT1("return value : 0x%08x\n",status); + return status; +#else return pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode); +#endif }
Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntd... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sat May 3 06:46:34 2008 @@ -43,7 +43,7 @@ {DXENG_INDEX_DxEngSetDCOwner, (PFN)DxEngSetDCOwner}, {DXENG_INDEX_DxEngLockDC, (PFN)DxEngLockDC}, {DXENG_INDEX_DxEngUnlockDC, (PFN)DxEngUnlockDC}, - {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngGetDCState}, + {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngSetDCState}, {DXENG_INDEX_DxEngGetDCState, (PFN)DxEngGetDCState}, {DXENG_INDEX_DxEngSelectBitmap, (PFN)DxEngSelectBitmap}, {DXENG_INDEX_DxEngSetBitmapOwner, (PFN)DxEngSetBitmapOwner}, @@ -728,8 +728,9 @@ /************************************************************************/ DWORD STDCALL -DxEngDeleteDC(DWORD x1, DWORD x2) -{ +DxEngDeleteDC(HDC hdc, DWORD x2) +{ + UNIMPLEMENTED; return FALSE; }