Author: jimtabor Date: Thu Jan 3 02:21:24 2008 New Revision: 31576
URL: http://svn.reactos.org/svn/reactos?rev=31576&view=rev Log: Fix DxEngSetHdevData.
Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h trunk/reactos/subsystems/win32/win32k/include/dc.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 (original) +++ trunk/reactos/include/reactos/drivers/directx/dxeng.h Thu Jan 3 02:21:24 2008 @@ -46,6 +46,29 @@ #define DXENG_INDEX_DxEngGetRedirectionBitmap 0x29 #define DXENG_INDEX_DxEngLoadImage 0x2A
+typedef enum _DXEGSHDEVDATA +{ + DxEGShDevData_Surface, + DxEGShDevData_hSpooler, + DxEGShDevData_DitherFmt, + DxEGShDevData_FxCaps, + DxEGShDevData_FxCaps2, + DxEGShDevData_DrvFuncs, + DxEGShDevData_dhpdev, + DxEGShDevData_eddg, + DxEGShDevData_dd_nCount, + DxEGShDevData_dd_flags, + DxEGShDevData_disable, + DxEGShDevData_metadev, + DxEGShDevData_display, + DxEGShDevData_Parent, + DxEGShDevData_OpenRefs, + DxEGShDevData_palette, + DxEGShDevData_ldev, + DxEGShDevData_GDev, + DxEGShDevData_clonedev, +} DXEGSHDEVDATA,*PDXEGSHDEVDATA; + /************************************************************************/ /* win32k.sys internal protypes for the driver functions it export */ /************************************************************************/ @@ -61,8 +84,8 @@ BOOLEAN DxEngLockShareSem(); BOOLEAN DxEngUnlockShareSem(); BOOLEAN DxEngCleanDC(HDC hdc); -DWORD DxEngGetHdevData(HDEV hdev, DWORD Index); -BOOLEAN DxEngSetHdevData(HDEV hdev, DWORD Index, DWORD Save); +DWORD DxEngGetHdevData(HDEV, DXEGSHDEVDATA); +BOOLEAN DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); BOOLEAN DxEngIncDispUniq();
/* prototypes are not done yet, I need gather all my notes
Modified: trunk/reactos/subsystems/win32/win32k/include/dc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/inc... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/dc.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/dc.h Thu Jan 3 02:21:24 2008 @@ -69,7 +69,7 @@
HSURF FillPatterns[HS_DDI_MAX];
- ULONG DxDD_Data; + ULONG DxDD_nCount;
DEVINFO DevInfo; GDIINFO GDIInfo;
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 (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c Thu Jan 3 02:21:24 2008 @@ -383,7 +383,7 @@ /************************************************************************/ DWORD DxEngGetHdevData(HDEV hdev, - DWORD Index) + DXEGSHDEVDATA Index) { UNIMPLEMENTED; return 0; @@ -398,11 +398,11 @@ * @param HDEV hPDev * The hdev * -* @param DWORD Index -* Support only Index 8 it is a internal counter how many time hdev been lock and unlock -* -* @param DWORD Save -* The value to be save to hdev internal counter +* @param DXEGSHDEVDATA Type +* Support only DxEGShDevData_dd_nCount it is a internal counter how many time hdev been lock and unlock +* +* @param DWORD Data +* The value to be save to hdev * * @return * Returns TRUE for success, FALSE for failure @@ -412,19 +412,18 @@ * *--*/ BOOLEAN -DxEngSetHdevData(HDEV hdev, - DWORD Index, - DWORD Save) -{ - BOOL retVal = FALSE; - if (Index == 8) - { - /* Counter how many time hdev been lock/unlock, we do not support it yet in ReactOS */ - DPRINT1("Warning not supproted yet\n"); - retVal = TRUE; - } - - return retVal; +DxEngSetHdevData(HDEV hDev, + DXEGSHDEVDATA Type, + DWORD Data) +{ + BOOL retVal = FALSE; // Default, no set. + + if ( Type == DxEGShDevData_dd_nCount ) + { + ((PGDIDEVICE)hDev)->DxDD_nCount = Data; + retVal = TRUE; // Set + } + return retVal; }
/************************************************************************/