Author: jimtabor Date: Sat May 3 18:30:19 2008 New Revision: 33259
URL: http://svn.reactos.org/svn/reactos?rev=33259&view=rev Log: Fix DxEngCreateMemoryDC, GetDesktopDC and DeleteDC.
Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h 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 18:30:19 2008 @@ -1,3 +1,4 @@ +
/************************************************************************/ /* These functions are imported from win32k.sys by dxg.sys */ @@ -96,15 +97,15 @@ 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);
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 18:30:19 2008 @@ -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 @@ /************************************************************************/ /* DxEngCreateMemoryDC */ /************************************************************************/ -DWORD -STDCALL -DxEngCreateMemoryDC(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; +HDC +STDCALL +DxEngCreateMemoryDC(HDEV hDev) +{ + UNIMPLEMENTED; + return NULL; }
/************************************************************************/ @@ -705,12 +705,12 @@ /************************************************************************/ 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,140 +726,138 @@ /************************************************************************/ /* DxEngDeleteDC */ /************************************************************************/ +BOOLEAN +STDCALL +DxEngDeleteDC(HDC hdc, BOOL Force) +{ + return IntGdiDeleteDC(hdc, Force); +} + +/************************************************************************/ +/* DxEngCleanDC */ +/************************************************************************/ +BOOLEAN +STDCALL +DxEngCleanDC(HDC hdc) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetDCOwner */ +/************************************************************************/ +BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) +{ + DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); + + return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); +} + +/************************************************************************/ +/* DxEngSetDCState */ +/************************************************************************/ +DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectBitmap */ +/************************************************************************/ +DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetBitmapOwner */ +/************************************************************************/ +DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngDeleteSurface */ +/************************************************************************/ +DWORD STDCALL DxEngDeleteSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetSurfaceData */ +/************************************************************************/ +DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngAltLockSurface */ +/************************************************************************/ +DWORD STDCALL DxEngAltLockSurface(DWORD x1) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngUploadPaletteEntryToSurface */ +/************************************************************************/ +DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngMarkSurfaceAsDirectDraw */ +/************************************************************************/ +DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSelectPaletteToSurface */ +/************************************************************************/ +DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSyncPaletteTableWithDevice */ +/************************************************************************/ +DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngSetPaletteState */ +/************************************************************************/ +DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) +{ + UNIMPLEMENTED; + return FALSE; +} + +/************************************************************************/ +/* DxEngGetRedirectionBitmap */ +/************************************************************************/ DWORD STDCALL -DxEngDeleteDC(HDC hdc, DWORD x2) -{ - - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngCleanDC */ -/************************************************************************/ -BOOLEAN -STDCALL -DxEngCleanDC(HDC hdc) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetDCOwner */ -/************************************************************************/ -BOOL STDCALL DxEngSetDCOwner(HGDIOBJ hObject, DWORD OwnerMask) -{ - DPRINT1("ReactX Calling : DxEngSetDCOwner \n"); - - return IntGdiSetDCOwnerEx( hObject, OwnerMask, FALSE); -} - -/************************************************************************/ -/* DxEngSetDCState */ -/************************************************************************/ -DWORD STDCALL DxEngSetDCState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSelectBitmap */ -/************************************************************************/ -DWORD STDCALL DxEngSelectBitmap(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetBitmapOwner */ -/************************************************************************/ -DWORD STDCALL DxEngSetBitmapOwner(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngDeleteSurface */ -/************************************************************************/ -DWORD STDCALL DxEngDeleteSurface(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngGetSurfaceData */ -/************************************************************************/ -DWORD STDCALL DxEngGetSurfaceData(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngAltLockSurface */ -/************************************************************************/ -DWORD STDCALL DxEngAltLockSurface(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngUploadPaletteEntryToSurface */ -/************************************************************************/ -DWORD STDCALL DxEngUploadPaletteEntryToSurface(DWORD x1, DWORD x2,DWORD x3, DWORD x4) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngMarkSurfaceAsDirectDraw */ -/************************************************************************/ -DWORD STDCALL DxEngMarkSurfaceAsDirectDraw(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSelectPaletteToSurface */ -/************************************************************************/ -DWORD STDCALL DxEngSelectPaletteToSurface(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSyncPaletteTableWithDevice */ -/************************************************************************/ -DWORD STDCALL DxEngSyncPaletteTableWithDevice(DWORD x1, DWORD x2) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngSetPaletteState */ -/************************************************************************/ -DWORD STDCALL DxEngSetPaletteState(DWORD x1, DWORD x2, DWORD x3) -{ - UNIMPLEMENTED; - return FALSE; -} - -/************************************************************************/ -/* DxEngGetRedirectionBitmap */ -/************************************************************************/ -DWORD -STDCALL DxEngGetRedirectionBitmap(DWORD x1) { return FALSE; // Normal return.