[ros-diffs] [greatlrd] 33040: added 3 more correct prototype for dxeng.c now we crash on NTGdiDdDeleteDirectDrawObject

Author: greatlrd
Date: Sat Apr 19 17:38:54 2008
New Revision: 33040

URL: http://svn.reactos.org/svn/reactos?rev=33040&view=rev
Log:
added 3 more correct prototype for dxeng.c
now we crash on NTGdiDdDeleteDirectDrawObject 

Modified:
    trunk/reactos/include/reactos/drivers/directx/directxint.h
    trunk/reactos/include/reactos/drivers/directx/dxeng.h
    trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c

Modified: trunk/reactos/include/reactos/drivers/directx/directxint.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di…
==============================================================================
--- trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/drivers/directx/directxint.h [iso-8859-1] Sat Apr 19
17:38:54 2008
@@ -104,8 +104,8 @@
 /* 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;

Modified: trunk/reactos/include/reactos/drivers/directx/dxeng.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/di…
==============================================================================
--- trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/drivers/directx/dxeng.h [iso-8859-1] Sat Apr 19 17:38:54
2008
@@ -73,31 +73,32 @@
 /* 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);

Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c [iso-8859-1] Sat Apr 19 17:38:54
2008
@@ -553,7 +553,8 @@
 * none
 *
 *--*/
-BOOLEAN 
+BOOLEAN
+STDCALL
 DxEngUnlockHdev(HDEV hDev)
 {
     PGDIDEVICE pPDev = (PGDIDEVICE)hDev;
@@ -571,6 +572,19 @@
 
 
 /************************************************************************/
+/* DxEngReferenceHdev                                                   */
+/************************************************************************/
+DWORD
+STDCALL
+DxEngReferenceHdev(HDEV hDev)
+{
+    UNIMPLEMENTED;
+
+    /* ALWAYS return true */
+    return TRUE;
+}
+
+/************************************************************************/
 /* DxEngNUIsTermSrv                                                     */
 /************************************************************************/
 
@@ -640,17 +654,6 @@
     return FALSE;
 }
 
-
-
-/************************************************************************/
-/* DxEngReferenceHdev                                                   */
-/************************************************************************/
-DWORD DxEngReferenceHdev(DWORD x1)
-{
-    UNIMPLEMENTED;
-    return FALSE;
-}
-
 /************************************************************************/
 /* DxEngIsHdevLockedByCurrentThread                                     */
 /************************************************************************/