mirror of
https://github.com/reactos/reactos.git
synced 2025-06-03 08:20:27 +00:00
[WIN32K]
- Fix parameter to DrvEnablePDEV - improve DPRINTs svn path=/trunk/; revision=54901
This commit is contained in:
parent
dfc99f6701
commit
9dd162b0ac
1 changed files with 10 additions and 11 deletions
|
@ -125,7 +125,7 @@ PDEVOBJ_bEnablePDEV(
|
||||||
HS_DDI_MAX,
|
HS_DDI_MAX,
|
||||||
ppdev->ahsurf,
|
ppdev->ahsurf,
|
||||||
sizeof(GDIINFO),
|
sizeof(GDIINFO),
|
||||||
&ppdev->gdiinfo,
|
(PULONG)&ppdev->gdiinfo,
|
||||||
sizeof(DEVINFO),
|
sizeof(DEVINFO),
|
||||||
&ppdev->devinfo,
|
&ppdev->devinfo,
|
||||||
(HDEV)ppdev,
|
(HDEV)ppdev,
|
||||||
|
@ -202,19 +202,16 @@ PDEVOBJ_pdmMatchDevMode(
|
||||||
/* Compare asked DEVMODE fields
|
/* Compare asked DEVMODE fields
|
||||||
* Only compare those that are valid in both DEVMODE structs */
|
* Only compare those that are valid in both DEVMODE structs */
|
||||||
dwFields = pdmCurrent->dmFields & pdm->dmFields ;
|
dwFields = pdmCurrent->dmFields & pdm->dmFields ;
|
||||||
|
|
||||||
/* For now, we only need those */
|
/* For now, we only need those */
|
||||||
if ((dwFields & DM_BITSPERPEL) &&
|
if ((dwFields & DM_BITSPERPEL) &&
|
||||||
(pdmCurrent->dmBitsPerPel != pdm->dmBitsPerPel))
|
(pdmCurrent->dmBitsPerPel != pdm->dmBitsPerPel)) continue;
|
||||||
continue;
|
|
||||||
if ((dwFields & DM_PELSWIDTH) &&
|
if ((dwFields & DM_PELSWIDTH) &&
|
||||||
(pdmCurrent->dmPelsWidth != pdm->dmPelsWidth))
|
(pdmCurrent->dmPelsWidth != pdm->dmPelsWidth)) continue;
|
||||||
continue;
|
|
||||||
if ((dwFields & DM_PELSHEIGHT) &&
|
if ((dwFields & DM_PELSHEIGHT) &&
|
||||||
(pdmCurrent->dmPelsHeight != pdm->dmPelsHeight))
|
(pdmCurrent->dmPelsHeight != pdm->dmPelsHeight)) continue;
|
||||||
continue;
|
|
||||||
if ((dwFields & DM_DISPLAYFREQUENCY) &&
|
if ((dwFields & DM_DISPLAYFREQUENCY) &&
|
||||||
(pdmCurrent->dmDisplayFrequency != pdm->dmDisplayFrequency))
|
(pdmCurrent->dmDisplayFrequency != pdm->dmDisplayFrequency)) continue;
|
||||||
continue;
|
|
||||||
|
|
||||||
/* Match! Return the DEVMODE */
|
/* Match! Return the DEVMODE */
|
||||||
return pdmCurrent;
|
return pdmCurrent;
|
||||||
|
@ -232,6 +229,7 @@ EngpCreatePDEV(
|
||||||
{
|
{
|
||||||
PGRAPHICS_DEVICE pGraphicsDevice;
|
PGRAPHICS_DEVICE pGraphicsDevice;
|
||||||
PPDEVOBJ ppdev;
|
PPDEVOBJ ppdev;
|
||||||
|
DPRINT("EngpCreatePDEV(%wZ, %p)\n", pustrDeviceName, pdm);
|
||||||
|
|
||||||
/* Try to find the GRAPHICS_DEVICE */
|
/* Try to find the GRAPHICS_DEVICE */
|
||||||
if (pustrDeviceName)
|
if (pustrDeviceName)
|
||||||
|
@ -269,8 +267,9 @@ EngpCreatePDEV(
|
||||||
ppdev->pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY);
|
ppdev->pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY);
|
||||||
if (!ppdev->pldev)
|
if (!ppdev->pldev)
|
||||||
{
|
{
|
||||||
DPRINT1("Could not load display driver '%ls'\n",
|
DPRINT1("Could not load display driver '%ls', '%s'\n",
|
||||||
pGraphicsDevice->pDiplayDrivers);
|
pGraphicsDevice->pDiplayDrivers,
|
||||||
|
pdm->dmDeviceName);
|
||||||
ExFreePoolWithTag(ppdev, GDITAG_PDEV);
|
ExFreePoolWithTag(ppdev, GDITAG_PDEV);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue