Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 23:45:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Bugfix : DRVFN gaEngFuncs one row was wrong thx irc : Pigglesworth for notice it.

Browse source 
start fixing prototype for DxEngDeleteDC

svn path=/trunk/; revision=33255
This commit is contained in:
Magnus Olsen 2008-05-03 11:46:34 +00:00
parent e54790f042
commit 0ab92a340f
3 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
reactos/include/reactos/drivers/directx/dxeng.h
View file

@ -104,7 +104,7 @@ DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSpUnTearDownSprites(DWORD x1, DWORD x2, DWORD x3);
DWORD STDCALL DxEngSpSpritesVisible(DWORD x1); DWORD STDCALL DxEngSpSpritesVisible(DWORD x1);
HDC STDCALL DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3); 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 DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3);
DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2);
DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2); DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2);

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

@ -24,6 +24,7 @@ DRVFN gpDxFuncs[DXG_INDEX_DxDdIoctl];
HANDLE ghDxGraphics = NULL; HANDLE ghDxGraphics = NULL;
ULONG gdwDirectDrawContext; ULONG gdwDirectDrawContext;
#define DXDBG 1
/************************************************************************/ /************************************************************************/
/* DirectX graphic/video driver enable start here */ /* DirectX graphic/video driver enable start here */
@ -451,6 +452,9 @@ STDCALL
NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal, NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal,
BOOL *pubNewMode) BOOL *pubNewMode)
{ {
#if DXDBG
BOOL status = FALSE;
#endif
PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject = (PGD_DXDDREENABLEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdReenableDirectDrawObject].pfn; PGD_DXDDREENABLEDIRECTDRAWOBJECT pfnDdReenableDirectDrawObject = (PGD_DXDDREENABLEDIRECTDRAWOBJECT)gpDxFuncs[DXG_INDEX_DxDdReenableDirectDrawObject].pfn;
if (pfnDdReenableDirectDrawObject == NULL) if (pfnDdReenableDirectDrawObject == NULL)
@ -460,7 +464,15 @@ NtGdiDdReenableDirectDrawObject(HANDLE hDirectDrawLocal,
} }
DPRINT1("Calling dxg.sys pfnDdReenableDirectDrawObject\n"); 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); return pfnDdReenableDirectDrawObject(hDirectDrawLocal, pubNewMode);
#endif
} }

5
reactos/subsystems/win32/win32k/ntddraw/dxeng.c
View file

@ -43,7 +43,7 @@ DRVFN gaEngFuncs [] =
{DXENG_INDEX_DxEngSetDCOwner, (PFN)DxEngSetDCOwner}, {DXENG_INDEX_DxEngSetDCOwner, (PFN)DxEngSetDCOwner},
{DXENG_INDEX_DxEngLockDC, (PFN)DxEngLockDC}, {DXENG_INDEX_DxEngLockDC, (PFN)DxEngLockDC},
{DXENG_INDEX_DxEngUnlockDC, (PFN)DxEngUnlockDC}, {DXENG_INDEX_DxEngUnlockDC, (PFN)DxEngUnlockDC},
{DXENG_INDEX_DxEngSetDCState, (PFN)DxEngGetDCState}, {DXENG_INDEX_DxEngSetDCState, (PFN)DxEngSetDCState},
{DXENG_INDEX_DxEngGetDCState, (PFN)DxEngGetDCState}, {DXENG_INDEX_DxEngGetDCState, (PFN)DxEngGetDCState},
{DXENG_INDEX_DxEngSelectBitmap, (PFN)DxEngSelectBitmap}, {DXENG_INDEX_DxEngSelectBitmap, (PFN)DxEngSelectBitmap},
{DXENG_INDEX_DxEngSetBitmapOwner, (PFN)DxEngSetBitmapOwner}, {DXENG_INDEX_DxEngSetBitmapOwner, (PFN)DxEngSetBitmapOwner},
@ -728,8 +728,9 @@ DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3)
/************************************************************************/ /************************************************************************/
DWORD DWORD
STDCALL STDCALL
DxEngDeleteDC(DWORD x1, DWORD x2) DxEngDeleteDC(HDC hdc, DWORD x2)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
return FALSE; return FALSE;
} }