diff --git a/reactos/include/reactos/drivers/directx/directxint.h b/reactos/include/reactos/drivers/directx/directxint.h index 2c3c0186254..f51b7850535 100644 --- a/reactos/include/reactos/drivers/directx/directxint.h +++ b/reactos/include/reactos/drivers/directx/directxint.h @@ -104,8 +104,8 @@ typedef struct _EDD_DIRECTDRAW_GLOBAL /* 0x018 */ LONG cDriverReferences; /* 0x01C */ ULONG unk_01c[3]; /* 0x028 */ LONGLONG llAssertModeTimeout; -/* 0x030 */ DWORD dwNumHeaps; -/* 0x034 */ VIDEOMEMORY *pvmList; +/* 0x030 */ DWORD dwNumHeaps; // verify it match windows xp +/* 0x034 */ VIDEOMEMORY *pvmList; // verify it match windows xp /* 0x038 */ DWORD dwNumFourCC; /* 0x03C */ PDWORD pdwFourCC; /* 0x040 */ DD_HALINFO ddHalInfo; diff --git a/reactos/include/reactos/drivers/directx/dxeng.h b/reactos/include/reactos/drivers/directx/dxeng.h index 3cf1d72e267..829cf0e3828 100644 --- a/reactos/include/reactos/drivers/directx/dxeng.h +++ b/reactos/include/reactos/drivers/directx/dxeng.h @@ -73,31 +73,32 @@ typedef enum _DXEGSHDEVDATA /* win32k.sys internal protypes for the driver functions it export */ /************************************************************************/ BOOLEAN STDCALL DxEngNUIsTermSrv(); + +PDC STDCALL DxEngLockDC(HDC hDC); +BOOLEAN STDCALL DxEngUnlockDC(PDC pDC); +DWORD STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA); +BOOLEAN STDCALL DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); +BOOLEAN STDCALL DxEngLockHdev(HDEV hdev); +BOOLEAN STDCALL DxEngUnlockHdev(HDEV hdev); +DWORD STDCALL DxEngGetDCState(HDC hDC, DWORD type); +DWORD STDCALL DxEngReferenceHdev(HDEV hdev); + +/* prototypes are not done yet, I need gather all my notes + * to make them correct + */ BOOLEAN DxEngRedrawDesktop(); ULONG DxEngDispUniq(); ULONG DxEngVisRgnUniq(); HDEV *DxEngEnumerateHdev(HDEV *hdev); BOOL DxEngGetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp); -PDC STDCALL DxEngLockDC(HDC hDC); -BOOLEAN STDCALL DxEngUnlockDC(PDC pDC); BOOLEAN DxEngSetDeviceGammaRamp(HDEV hPDev, PGAMMARAMP Ramp, BOOL Unuse); BOOLEAN DxEngLockShareSem(); BOOLEAN DxEngUnlockShareSem(); BOOLEAN DxEngCleanDC(HDC hdc); -DWORD STDCALL DxEngGetHdevData(HDEV, DXEGSHDEVDATA); -BOOLEAN STDCALL DxEngSetHdevData(HDEV, DXEGSHDEVDATA, DWORD); BOOLEAN DxEngIncDispUniq(); -BOOLEAN STDCALL DxEngLockHdev(HDEV hdev); -BOOLEAN DxEngUnlockHdev(HDEV hdev); -DWORD STDCALL DxEngGetDCState(HDC hDC, DWORD type); -/* prototypes are not done yet, I need gather all my notes - * to make them correct - */ DWORD DxEngCreateMemoryDC(DWORD x1); DWORD DxEngScreenAccessCheck(); - -DWORD DxEngReferenceHdev(DWORD x1); DWORD DxEngIsHdevLockedByCurrentThread(DWORD x1); DWORD DxEngUnreferenceHdev(DWORD x1); DWORD DxEngSpTearDownSprites(DWORD x1, DWORD x2, DWORD x3); diff --git a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c index 5084fc94ae2..8845abe7fef 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/dxeng.c +++ b/reactos/subsystems/win32/win32k/ntddraw/dxeng.c @@ -553,7 +553,8 @@ DxEngLockHdev(HDEV hDev) * none * *--*/ -BOOLEAN +BOOLEAN +STDCALL DxEngUnlockHdev(HDEV hDev) { PGDIDEVICE pPDev = (PGDIDEVICE)hDev; @@ -570,6 +571,19 @@ DxEngUnlockHdev(HDEV hDev) } +/************************************************************************/ +/* DxEngReferenceHdev */ +/************************************************************************/ +DWORD +STDCALL +DxEngReferenceHdev(HDEV hDev) +{ + UNIMPLEMENTED; + + /* ALWAYS return true */ + return TRUE; +} + /************************************************************************/ /* DxEngNUIsTermSrv */ /************************************************************************/ @@ -640,17 +654,6 @@ DWORD DxEngScreenAccessCheck() return FALSE; } - - -/************************************************************************/ -/* DxEngReferenceHdev */ -/************************************************************************/ -DWORD DxEngReferenceHdev(DWORD x1) -{ - UNIMPLEMENTED; - return FALSE; -} - /************************************************************************/ /* DxEngIsHdevLockedByCurrentThread */ /************************************************************************/