Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 21:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32K]

Browse source 
Partially revert 46733
  Silence some debug output

svn path=/branches/reactos-yarotows/; revision=46734
This commit is contained in:
Jérôme Gardou 2010-04-05 11:53:36 +00:00
parent 243eeb574a
commit 47cbf8f46d
1 changed files with 24 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

36
subsystems/win32/win32k/eng/pdevobj.c
View file

@ -60,7 +60,8 @@ PDEVOBJ_vRelease(PPDEVOBJ ppdev)
/* Do we have a surface? */ /* Do we have a surface? */
if(ppdev->pSurface) if(ppdev->pSurface)
{ {
/* No one should hold a lock on this surface */ /* Release the surface and let the driver free it */
SURFACE_ShareUnlockSurface(ppdev->pSurface);
ppdev->pfn.DisableSurface(ppdev->dhpdev); ppdev->pfn.DisableSurface(ppdev->dhpdev);
} }
@ -146,8 +147,6 @@ PDEVOBJ_pSurface(
{ {
HSURF hsurf; HSURF hsurf;
DPRINT("PDEVOBJ_pSurface()\n");
/* Check if we already have a surface */ /* Check if we already have a surface */
if (ppdev->pSurface) if (ppdev->pSurface)
{ {
@ -291,6 +290,7 @@ PDEVOBJ_vSwitchPdev(
PPDEVOBJ ppdev2) PPDEVOBJ ppdev2)
{ {
PDEVOBJ pdevTmp; PDEVOBJ pdevTmp;
HDEV hdev;
/* Exchange data */ /* Exchange data */
pdevTmp = *ppdev; pdevTmp = *ppdev;
@ -310,10 +310,9 @@ PDEVOBJ_vSwitchPdev(
/* Exchange surface */ /* Exchange surface */
ppdev->pSurface = ppdev2->pSurface; ppdev->pSurface = ppdev2->pSurface;
ppdev2->pSurface = pdevTmp.pSurface; ppdev2->pSurface = pdevTmp.pSurface;
if(ppdev->pSurface) hdev = ppdev->pSurface->SurfObj.hdev;
ppdev->pSurface->SurfObj.hdev = (HDEV)ppdev; ppdev->pSurface->SurfObj.hdev = ppdev2->pSurface->SurfObj.hdev;
if(ppdev2->pSurface) ppdev2->pSurface->SurfObj.hdev = hdev;
ppdev2->pSurface->SurfObj.hdev = (HDEV)ppdev2;
/* Exchange devinfo */ /* Exchange devinfo */
ppdev->devinfo = ppdev2->devinfo; ppdev->devinfo = ppdev2->devinfo;
@ -337,6 +336,7 @@ PDEVOBJ_bSwitchMode(
{ {
UNICODE_STRING ustrDevice; UNICODE_STRING ustrDevice;
PPDEVOBJ ppdevTmp; PPDEVOBJ ppdevTmp;
PSURFACE pSurface;
BOOL retval = FALSE; BOOL retval = FALSE;
/* Lock the PDEV */ /* Lock the PDEV */
@ -365,14 +365,25 @@ PDEVOBJ_bSwitchMode(
goto leave; goto leave;
} }
/* 3. Get DirectDraw information */ /* 3. Create a new surface */
/* 4. Enable DirectDraw Not traced */ pSurface = PDEVOBJ_pSurface(ppdevTmp);
/* 5. Copy old PDEV state to new PDEV instance */ if (!pSurface)
{
DPRINT1("DrvEnableSurface failed\n");
goto leave;
}
/* 6. Switch the PDEVs */ ASSERT(pSurface->BitsLock);
/* 4. Get DirectDraw information */
/* 5. Enable DirectDraw Not traced */
/* 6. Copy old PDEV state to new PDEV instance */
/* 7. Switch the PDEVs */
PDEVOBJ_vSwitchPdev(ppdev, ppdevTmp); PDEVOBJ_vSwitchPdev(ppdev, ppdevTmp);
ASSERT(ppdev->pSurface->BitsLock);
/* 7. Disable DirectDraw */ /* 8. Disable DirectDraw */
PDEVOBJ_vRelease(ppdevTmp); PDEVOBJ_vRelease(ppdevTmp);
@ -384,6 +395,7 @@ leave:
EngReleaseSemaphore(ghsemPDEV); EngReleaseSemaphore(ghsemPDEV);
DPRINT1("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface); DPRINT1("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface);
ASSERT(ppdev->pSurface->BitsLock);
return retval; return retval;
} }