From 9dd162b0acc4af7388adafb61b05a3fea9deaf3e Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Tue, 10 Jan 2012 14:59:23 +0000
Subject: [PATCH] [WIN32K] - Fix parameter to DrvEnablePDEV - improve DPRINTs

svn path=/trunk/; revision=54901
---
 reactos/subsystems/win32/win32k/eng/pdevobj.c | 21 +++++++++----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/reactos/subsystems/win32/win32k/eng/pdevobj.c b/reactos/subsystems/win32/win32k/eng/pdevobj.c
index 8b3658abe4d..625f510cb26 100644
--- a/reactos/subsystems/win32/win32k/eng/pdevobj.c
+++ b/reactos/subsystems/win32/win32k/eng/pdevobj.c
@@ -125,7 +125,7 @@ PDEVOBJ_bEnablePDEV(
                                   HS_DDI_MAX,
                                   ppdev->ahsurf,
                                   sizeof(GDIINFO),
-                                  &ppdev->gdiinfo,
+                                  (PULONG)&ppdev->gdiinfo,
                                   sizeof(DEVINFO),
                                   &ppdev->devinfo,
                                   (HDEV)ppdev,
@@ -202,19 +202,16 @@ PDEVOBJ_pdmMatchDevMode(
         /* 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 @@ EngpCreatePDEV(
 {
     PGRAPHICS_DEVICE pGraphicsDevice;
     PPDEVOBJ ppdev;
+    DPRINT("EngpCreatePDEV(%wZ, %p)\n", pustrDeviceName, pdm);
 
     /* Try to find the GRAPHICS_DEVICE */
     if (pustrDeviceName)
@@ -269,8 +267,9 @@ EngpCreatePDEV(
     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;
     }