Author: greatlrd Date: Sun Apr 20 06:50:43 2008 New Revision: 33054
URL: http://svn.reactos.org/svn/reactos?rev=33054&view=rev Log: add two hack so dxg.sys continue works for now. it does not longer crash at DdDeleteDirectDrawObject for it never been call longer to dxg.sys until I figout why take DxEngLockShareSem and DxEngUnLockShareSem offline need more invigaste how it is done in windows. take DxGdiDdGetScanLine offline for now so it does not crash dxg.sys
Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c trunk/reactos/subsystems/win32/win32k/ntddraw/dxeng.c
Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntd... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c [iso-8859-1] Sun Apr 20 06:50:43 2008 @@ -95,7 +95,10 @@ }
DPRINT1("Calling on dxg.sys pfnDdGetScanLine"); - return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); + DPRINT1("FIXME it crash when it trying call on pfnDdGetScanLine\n"); + /* FIXME it crash when it trying call on pfnDdGetScanLine */ + // return pfnDdGetScanLine(hDirectDrawLocal,puGetScanLineData); + return 0; }
Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntd... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/ddraw.c [iso-8859-1] Sun Apr 20 06:50:43 2008 @@ -336,8 +336,12 @@ DPRINT1("Warning: hDirectDrawLocal is NULL\n"); return DDHAL_DRIVER_HANDLED; } + DPRINT1("hDirectDrawLocal = %lx \n",hDirectDrawLocal); DPRINT1("Calling dxg.sys pfnDdDeleteDirectDrawObject\n"); - return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); + DPRINT1("FIXME delete of the HANDLE\n"); + /* FIXME it crash inside or after it return from DxEngLockShareSem */ + // return pfnDdDeleteDirectDrawObject(hDirectDrawLocal); + return DDHAL_DRIVER_HANDLED; }
/************************************************************************/ @@ -360,7 +364,7 @@ }
/************************************************************************/ -/* NtGdiDdDeleteSurfaceObject */ +/* NtGdiDdQueryDirectDrawObject */ /************************************************************************/ BOOL STDCALL
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] Sun Apr 20 06:50:43 2008 @@ -180,13 +180,13 @@ { BOOLEAN retVal = 0; DPRINT1("ReactX Calling : DxEngLockShareSem\n"); - +#if 0 if (ExIsResourceAcquiredExclusiveLite(&ghsemShareDevLock) == FALSE) { KeEnterCriticalRegion(); retVal = ExAcquireResourceExclusiveLite(&ghsemShareDevLock, TRUE); } - +#endif return retVal; }
@@ -208,11 +208,14 @@ DxEngUnlockShareSem() { DPRINT1("ReactX Calling : DxEngUnlockShareSem\n"); + +#if 0 if (ExIsResourceAcquiredExclusiveLite(&ghsemShareDevLock) == TRUE) { ExReleaseResourceLite(&ghsemShareDevLock); KeLeaveCriticalRegion(); } +#endif return TRUE; }