From 5e70dd89f7d0484700bc67be078d9301aee995be Mon Sep 17 00:00:00 2001 From: Magnus Olsen Date: Thu, 1 May 2008 09:24:53 +0000 Subject: [PATCH] Fixed a smaller bug in intEnableReactXDriver it was not the drv hPDev that was the frist param it was hdev aka pDC->pPDev now we see value getting fill in to edd_DdirectDraw_Global from pfnDdEnableDirectDraw fucntion in ms dxg.sys svn path=/trunk/; revision=33206 --- reactos/subsystems/win32/win32k/ntddraw/ddraw.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c index c609cfed50d..859063f33c9 100644 --- a/reactos/subsystems/win32/win32k/ntddraw/ddraw.c +++ b/reactos/subsystems/win32/win32k/ntddraw/ddraw.c @@ -40,6 +40,9 @@ intEnableReactXDriver(PEDD_DIRECTDRAW_GLOBAL pEddgbl, PDC pDC) /*clean up some of the cache entry */ RtlZeroMemory(pEddgbl,sizeof(EDD_DIRECTDRAW_GLOBAL)); + /* setup EDD_DIRECTDRAW_GLOBAL for pDev xp */ + pDev->pEDDgpl = pEddgbl; + if (pfnDdEnableDirectDraw == NULL) { DPRINT1("Warning: no pfnDdEnableDirectDraw\n"); @@ -47,7 +50,10 @@ intEnableReactXDriver(PEDD_DIRECTDRAW_GLOBAL pEddgbl, PDC pDC) else { DPRINT1(" call to pfnDdEnableDirectDraw \n "); - success = pfnDdEnableDirectDraw(pDC->PDev, TRUE); + /* Note it is the hdev struct it want, not the drv hPDev aka pdc->PDev */ + success = pfnDdEnableDirectDraw(pDC->pPDev, TRUE); + + dump_edd_directdraw_global(pEddgbl); DPRINT1(" end call to pfnDdEnableDirectDraw \n "); } @@ -55,8 +61,6 @@ intEnableReactXDriver(PEDD_DIRECTDRAW_GLOBAL pEddgbl, PDC pDC) edd_DdirectDraw_Global.hDev = pDC->pPDev; /*FIXME : edd_DdirectDraw_Global.dhpdev = (PVOID)pDC->PDev; */ - /* setup EDD_DIRECTDRAW_GLOBAL for pDev xp */ - pDev->pEDDgpl = pEddgbl; /* test see if drv got a dx interface or not */ if ( ( pDev->DriverFunctions.DisableDirectDraw == NULL) ||