Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 15:15:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32K]

Browse source 
Do not ignore failure when calling DrvEnablePDEV and properly handle a failure in PDEVOBJ_bEnablePDEV instead of ASSERTing. Properly cleanup the PDEV after failure, check if the PDEV was enabled before calling DrvDisablePDEV. Fixes some crashes with VBox driver.

svn path=/trunk/; revision=62855
This commit is contained in:
Timo Kreuzer 2014-04-21 17:09:27 +00:00
parent e67aa1e2ca
commit a794e3f2d0
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
reactos/win32ss/gdi/eng/pdevobj.c
View file

@ -94,8 +94,12 @@ PDEVOBJ_vRelease(PPDEVOBJ ppdev)
PALETTE_ShareUnlockPalette(ppdev->ppalSurf);
}
/* Disable PDEV */
ppdev->pfn.DisablePDEV(ppdev->dhpdev);
/* Check if the PDEV was enabled */
if (ppdev->dhpdev != NULL)
{
/* Disable the PDEV */
ppdev->pfn.DisablePDEV(ppdev->dhpdev);
}
/* Remove it from list */
if( ppdev == gppdevList )
@ -155,6 +159,11 @@ PDEVOBJ_bEnablePDEV(
(HDEV)ppdev,
ppdev->pGraphicsDevice->pwszDescription,
ppdev->pGraphicsDevice->DeviceObject);
if (ppdev->dhpdev == NULL)
{
DPRINT1("Failed to enable PDEV\n");
return FALSE;
}
/* Fix up some values */
if (ppdev->gdiinfo.ulLogPixelsX == 0)
@ -337,7 +346,8 @@ EngpCreatePDEV(
if (!PDEVOBJ_bEnablePDEV(ppdev, pdm, NULL))
{
DPRINT1("Failed to enable PDEV!\n");
ASSERT(FALSE);
PDEVOBJ_vRelease(ppdev);
return NULL;
}
/* FIXME: this must be done in a better way */