diff --git a/reactos/include/reactos/drivers/directx/dxeng.h b/reactos/include/reactos/drivers/directx/dxeng.h index 0d1da57c1c7..0b43e8ef666 100644 --- a/reactos/include/reactos/drivers/directx/dxeng.h +++ b/reactos/include/reactos/drivers/directx/dxeng.h @@ -1,4 +1,5 @@ + /************************************************************************/ /* 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 DxEngIncDispUniq(); -DWORD STDCALL DxEngCreateMemoryDC(DWORD x1); +HDC STDCALL DxEngCreateMemoryDC(HDEV hDev); DWORD STDCALL DxEngIsHdevLockedByCurrentThread(DWORD x1); DWORD STDCALL DxEngUnreferenceHdev(DWORD x1); DWORD STDCALL DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); 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(HDC hdc, DWORD x2); +HDC STDCALL DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd); +BOOLEAN STDCALL DxEngDeleteDC(HDC hdc, BOOL Force); DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3); DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2); DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2); diff --git a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c index 6743aaafdc4..7b960179618 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c +++ b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c @@ -1,4 +1,4 @@ -/* + /* * PROJECT: ReactOS Win32 Subsystem * LICENSE: GPL - See COPYING in the top level directory * FILE: subsystems/win32/win32k/ntddraw/dxeng.c @@ -658,12 +658,12 @@ DxEngEnumerateHdev(HDEV *hdev) /************************************************************************/ /* DxEngCreateMemoryDC */ /************************************************************************/ -DWORD +HDC STDCALL -DxEngCreateMemoryDC(DWORD x1) +DxEngCreateMemoryDC(HDEV hDev) { UNIMPLEMENTED; - return FALSE; + return NULL; } /************************************************************************/ @@ -705,12 +705,12 @@ DxEngUnreferenceHdev(DWORD x1) /************************************************************************/ HDC STDCALL -DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3) +DxEngGetDesktopDC(ULONG DcType, BOOL EmptyDC, BOOL ValidatehWnd) { PWINDOW_OBJECT DesktopObject = 0; HDC DesktopHDC = 0; - if (CreateDesktopDc == FALSE) + if (DcType == DC_TYPE_DIRECT) { DesktopObject = UserGetDesktopWindow(); DesktopHDC = (HDC)UserGetWindowDC(DesktopObject); @@ -726,13 +726,11 @@ DxEngGetDesktopDC(BOOLEAN CreateDesktopDc, DWORD x2, DWORD x3) /************************************************************************/ /* DxEngDeleteDC */ /************************************************************************/ -DWORD +BOOLEAN STDCALL -DxEngDeleteDC(HDC hdc, DWORD x2) +DxEngDeleteDC(HDC hdc, BOOL Force) { - - UNIMPLEMENTED; - return FALSE; + return IntGdiDeleteDC(hdc, Force); } /************************************************************************/