Fix DxEngCreateMemoryDC, GetDesktopDC and DeleteDC.

svn path=/trunk/; revision=33259
This commit is contained in:
James Tabor 2008-05-03 23:30:19 +00:00
parent e3eb09236b
commit 3139c0bd7a
2 changed files with 13 additions and 14 deletions

View file

@ -1,4 +1,5 @@
/************************************************************************/ /************************************************************************/
/* These functions are imported from win32k.sys by dxg.sys */ /* These functions are imported from win32k.sys by dxg.sys */
/************************************************************************/ /************************************************************************/
@ -96,15 +97,15 @@ BOOLEAN STDCALL DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse)
BOOLEAN STDCALL DxEngCleanDC(HDC hdc); BOOLEAN STDCALL DxEngCleanDC(HDC hdc);
BOOLEAN STDCALL DxEngIncDispUniq(); BOOLEAN STDCALL DxEngIncDispUniq();
DWORD STDCALL DxEngCreateMemoryDC(DWORD x1); HDC STDCALL DxEngCreateMemoryDC(HDEV hDev);
DWORD STDCALL DxEngIsHdevLockedByCurrentThread(DWORD x1); DWORD STDCALL DxEngIsHdevLockedByCurrentThread(DWORD x1);
DWORD STDCALL DxEngUnreferenceHdev(DWORD x1); DWORD STDCALL DxEngUnreferenceHdev(DWORD x1);
DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); 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(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd);
DWORD STDCALL DxEngDeleteDC(HDC hdc, DWORD x2); BOOLEAN STDCALL DxEngDeleteDC(HDC hdc, BOOL Force);
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);

View file

@ -1,4 +1,4 @@
/* /*
* PROJECT: ReactOS Win32 Subsystem * PROJECT: ReactOS Win32 Subsystem
* LICENSE: GPL - See COPYING in the top level directory * LICENSE: GPL - See COPYING in the top level directory
* FILE: subsystems/win32/win32k/ntddraw/dxeng.c * FILE: subsystems/win32/win32k/ntddraw/dxeng.c
@ -658,12 +658,12 @@ DxEngEnumerateHdev(HDEV *hdev)
/************************************************************************/ /************************************************************************/
/* DxEngCreateMemoryDC */ /* DxEngCreateMemoryDC */
/************************************************************************/ /************************************************************************/
DWORD HDC
STDCALL STDCALL
DxEngCreateMemoryDC(DWORD x1) DxEngCreateMemoryDC(HDEV hDev)
{ {
UNIMPLEMENTED; UNIMPLEMENTED;
return FALSE; return NULL;
} }
/************************************************************************/ /************************************************************************/
@ -705,12 +705,12 @@ DxEngUnreferenceHdev(DWORD x1)
/************************************************************************/ /************************************************************************/
HDC HDC
STDCALL STDCALL
DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3) DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd)
{ {
PWINDOW_OBJECT DesktopObject = 0; PWINDOW_OBJECT DesktopObject = 0;
HDC DesktopHDC = 0; HDC DesktopHDC = 0;
if (CreateDesktopDc == FALSE) if (DcType == DC_TYPE_DIRECT)
{ {
DesktopObject = UserGetDesktopWindow(); DesktopObject = UserGetDesktopWindow();
DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); DesktopHDC = (HDC)UserGetWindowDC(DesktopObject);
@ -726,13 +726,11 @@ DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3)
/************************************************************************/ /************************************************************************/
/* DxEngDeleteDC */ /* DxEngDeleteDC */
/************************************************************************/ /************************************************************************/
DWORD BOOLEAN
STDCALL STDCALL
DxEngDeleteDC(HDC hdc, DWORD x2) DxEngDeleteDC(HDC hdc, BOOL Force)
{ {
return IntGdiDeleteDC(hdc, Force);
UNIMPLEMENTED;
return FALSE;
} }
/************************************************************************/ /************************************************************************/