Author: tkreuzer
Date: Tue Jan 10 14:59:23 2012
New Revision: 54901
URL:
http://svn.reactos.org/svn/reactos?rev=54901&view=rev
Log:
[WIN32K]
- Fix parameter to DrvEnablePDEV
- improve DPRINTs
Modified:
trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c
Modified: trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/eng/pdevobj.c [iso-8859-1] Tue Jan 10 14:59:23
2012
@@ -125,7 +125,7 @@
HS_DDI_MAX,
ppdev->ahsurf,
sizeof(GDIINFO),
- &ppdev->gdiinfo,
+ (PULONG)&ppdev->gdiinfo,
sizeof(DEVINFO),
&ppdev->devinfo,
(HDEV)ppdev,
@@ -202,19 +202,16 @@
/* Compare asked DEVMODE fields
* Only compare those that are valid in both DEVMODE structs */
dwFields = pdmCurrent->dmFields & pdm->dmFields ;
+
/* For now, we only need those */
if ((dwFields & DM_BITSPERPEL) &&
- (pdmCurrent->dmBitsPerPel != pdm->dmBitsPerPel))
- continue;
+ (pdmCurrent->dmBitsPerPel != pdm->dmBitsPerPel)) continue;
if ((dwFields & DM_PELSWIDTH) &&
- (pdmCurrent->dmPelsWidth != pdm->dmPelsWidth))
- continue;
+ (pdmCurrent->dmPelsWidth != pdm->dmPelsWidth)) continue;
if ((dwFields & DM_PELSHEIGHT) &&
- (pdmCurrent->dmPelsHeight != pdm->dmPelsHeight))
- continue;
+ (pdmCurrent->dmPelsHeight != pdm->dmPelsHeight)) continue;
if ((dwFields & DM_DISPLAYFREQUENCY) &&
- (pdmCurrent->dmDisplayFrequency != pdm->dmDisplayFrequency))
- continue;
+ (pdmCurrent->dmDisplayFrequency != pdm->dmDisplayFrequency)) continue;
/* Match! Return the DEVMODE */
return pdmCurrent;
@@ -232,6 +229,7 @@
{
PGRAPHICS_DEVICE pGraphicsDevice;
PPDEVOBJ ppdev;
+ DPRINT("EngpCreatePDEV(%wZ, %p)\n", pustrDeviceName, pdm);
/* Try to find the GRAPHICS_DEVICE */
if (pustrDeviceName)
@@ -269,8 +267,9 @@
ppdev->pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY);
if (!ppdev->pldev)
{
- DPRINT1("Could not load display driver '%ls'\n",
- pGraphicsDevice->pDiplayDrivers);
+ DPRINT1("Could not load display driver '%ls', '%s'\n",
+ pGraphicsDevice->pDiplayDrivers,
+ pdm->dmDeviceName);
ExFreePoolWithTag(ppdev, GDITAG_PDEV);
return NULL;
}