[WIN32K]

- Don't check for presence of driver functions that are not mandatory
- Pass graphics device, devmode and log address to PDEVOBJ_CreatePDEV to make it work

svn path=/branches/GSoC_2011/GdiFontDriver/; revision=56032

Author: tkreuzer

win32ss/gdi/eng/ldevobj.c

@@ -275,8 +275,7 @@ LDEVOBJ_bEnableDriver(
 
     /* Check if the neccessary functions are there */
     if ((!pldev->pfn.EnablePDEV) ||
-        (!pldev->pfn.CompletePDEV) ||
-        (!pldev->pfn.UnloadFontFile))
+        (!pldev->pfn.CompletePDEV))
     {
         DPRINT1("Missing function for gdi driver\n");
         return FALSE;
@@ -287,7 +286,6 @@ LDEVOBJ_bEnableDriver(
         if ((!pldev->pfn.AssertMode) ||
             (!pldev->pfn.EnableSurface) ||
             (!pldev->pfn.DisableSurface) ||
-            (!pldev->pfn.DisableDriver) ||
             (!pldev->pfn.DisablePDEV) ||
             (!pldev->pfn.GetModes))
         {

win32ss/gdi/eng/pdevobj.c

@@ -7,8 +7,7 @@
  */
 
 #include <win32k.h>
-#define NDEBUG
-#include <debug.h>
+DBG_DEFAULT_CHANNEL(EngPDev);
 
 PPDEVOBJ gppdevPrimary = NULL;
 
@@ -134,7 +133,7 @@ PDEVOBJ_bEnablePDEV(
     PFN_DrvEnablePDEV pfnEnablePDEV;
     ULONG i;
 
-    DPRINT("PDEVOBJ_bEnablePDEV()\n");
+    TRACE("PDEVOBJ_bEnablePDEV()\n");
 
     /* Get the DrvEnablePDEV function */
     pfnEnablePDEV = ppdev->pldev->pfn.EnablePDEV;
@@ -186,7 +185,7 @@ PDEVOBJ_bEnablePDEV(
             ppdev->ahsurf[i] = gahsurfHatch[i];
     }
 
-    DPRINT("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev);
+    TRACE("PDEVOBJ_bEnablePDEV - dhpdev = %p\n", ppdev->dhpdev);
 
     return TRUE;
 }
@@ -203,16 +202,18 @@ PDEVOBJ_vCompletePDEV(
 PPDEVOBJ
 NTAPI
 PDEVOBJ_CreatePDEV(
-    PLDEVOBJ pldev)
+    PLDEVOBJ pldev,
+    PGRAPHICS_DEVICE pGraphicsDevice,
+    PDEVMODEW pdevmode,
+    PWSTR pwszLogAddress)
 {
     PPDEVOBJ ppdev;
-    LDEVTYPE ldevtype;
 
     /* Allocate a new PDEVOBJ */
     ppdev = ExAllocatePoolWithTag(PagedPool, sizeof(PDEVOBJ), GDITAG_PDEV);
     if (!ppdev)
     {
-        DPRINT1("failed to allocate a PDEV\n");
+        ERR("failed to allocate a PDEV\n");
         return FALSE;
     }
 
@@ -227,11 +228,14 @@ PDEVOBJ_CreatePDEV(
     /* Copy the function table from the LDEVOBJ */
     ppdev->pfn = ppdev->pldev->pfn;
 
+    /* Set the graphics device */
+    ppdev->pGraphicsDevice = pGraphicsDevice;
+
     /* Allocate the device lock semaphore */
     ppdev->hsemDevLock = EngCreateSemaphore();
     if (!ppdev->hsemDevLock)
     {
-        DPRINT1("Failed to create semaphore\n");
+        ERR("Failed to create semaphore\n");
         ExFreePoolWithTag(ppdev, GDITAG_PDEV);
         return FALSE;
     }
@@ -242,27 +246,48 @@ PDEVOBJ_CreatePDEV(
         RtlZeroMemory(ppdev->pEDDgpl, sizeof(EDD_DIRECTDRAW_GLOBAL));
 
     /* Call the drivers DrvEnablePDEV function */
-    if (!PDEVOBJ_bEnablePDEV(ppdev, NULL, NULL))
+    if (!PDEVOBJ_bEnablePDEV(ppdev, pdevmode, NULL))
     {
-        DPRINT1("Failed to enable PDEV\n");
+        ERR("Failed to enable PDEV\n");
         EngDeleteSemaphore(ppdev->hsemDevLock);
         ExFreePoolWithTag(ppdev, GDITAG_PDEV);
         return FALSE;
     }
 
-    /* Set flags based on the LDEV type */
-    ldevtype = pldev->ldevtype;
-    if (ldevtype == LDEV_DEVICE_MIRROR) ppdev->flFlags |= PDEV_CLONE_DEVICE;
-    else if (ldevtype == LDEV_DEVICE_DISPLAY) ppdev->flFlags |= PDEV_DISPLAY;
-    else if (ldevtype == LDEV_DEVICE_PRINTER) ppdev->flFlags |= PDEV_PRINTER;
-    else if (ldevtype == LDEV_DEVICE_META) ppdev->flFlags |= PDEV_META_DEVICE;
-    else if (ldevtype == LDEV_FONT) ppdev->flFlags |= PDEV_FONTDRIVER;
+    /* Check what type of driver this is */
+    if (pldev->ldevtype == LDEV_DEVICE_DISPLAY)
+    {
+        /* This is a display device */
+        ppdev->flFlags |= PDEV_DISPLAY;
+
+        /* Check if the driver supports a hardware pointer */
+        if (ppdev->pfn.SetPointerShape && ppdev->pfn.MovePointer)
+        {
+            ppdev->flFlags |= PDEV_HARDWARE_POINTER;
+            //ppdev->pfnDrvSetPointerShape = ppdev->pfn.SetPointerShape;
+            ppdev->pfnMovePointer = ppdev->pfn.MovePointer;
+        }
+        else
+        {
+            ppdev->flFlags |= PDEV_SOFTWARE_POINTER;
+            //ppdev->pfnDrvSetPointerShape = EngSetPointerShape;
+            ppdev->pfnMovePointer = EngMovePointer;
+        }
+
+    }
+    else if (pldev->ldevtype == LDEV_DEVICE_MIRROR)
+        ppdev->flFlags |= PDEV_CLONE_DEVICE;
+    else if (pldev->ldevtype == LDEV_DEVICE_PRINTER)
+        ppdev->flFlags |= PDEV_PRINTER;
+    else if (pldev->ldevtype == LDEV_DEVICE_META)
+        ppdev->flFlags |= PDEV_META_DEVICE;
+    else if (pldev->ldevtype == LDEV_FONT)
+        ppdev->flFlags |= PDEV_FONTDRIVER;
 
     /* Check if the driver supports fonts */
     if (ppdev->devinfo.cFonts != 0) ppdev->flFlags |= PDEV_GOTFONTS;
 
-    if (ppdev->pfn.MovePointer) ppdev->flFlags |= PDEV_HARDWARE_POINTER;
-
+    /* Check for a gamma ramp table */
     if (ppdev->pvGammaRamp) ppdev->flFlags |= PDEV_GAMMARAMP_TABLE;
 
     /* Call the drivers DrvCompletePDEV function */
@@ -297,7 +322,7 @@ PDEVOBJ_pSurface(
     /* Increment reference count */
     GDIOBJ_vReferenceObjectByPointer(&ppdev->pSurface->BaseObject);
 
-    DPRINT("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface);
+    TRACE("PDEVOBJ_pSurface() returning %p\n", ppdev->pSurface);
     return ppdev->pSurface;
 }
 
@@ -390,16 +415,16 @@ EngCreateDisplayPDEV(
     PGRAPHICS_DEVICE pGraphicsDevice;
     PLDEVOBJ pldev;
     PPDEVOBJ ppdev;
-    DPRINT("EngCreateDisplayPDEV(%wZ, %p)\n", pustrDeviceName, pdm);
+    TRACE("EngCreateDisplayPDEV(%wZ, %p)\n", pustrDeviceName, pdm);
 
     /* Try to find the GRAPHICS_DEVICE */
     if (pustrDeviceName)
     {
         pGraphicsDevice = EngpFindGraphicsDevice(pustrDeviceName, 0, 0);
         if (!pGraphicsDevice)
         {
-            DPRINT1("No GRAPHICS_DEVICE found for %ls!\n",
-                    pustrDeviceName ? pustrDeviceName->Buffer : 0);
+            ERR("No GRAPHICS_DEVICE found for %ls!\n",
+                pustrDeviceName ? pustrDeviceName->Buffer : 0);
             return NULL;
         }
     }
@@ -413,34 +438,27 @@ EngCreateDisplayPDEV(
     {
         /* ... use the device's default one */
         pdm = pGraphicsDevice->pDevModeList[pGraphicsDevice->iDefaultMode].pdm;
-        DPRINT("Using iDefaultMode = %lu\n", pGraphicsDevice->iDefaultMode);
+        TRACE("Using iDefaultMode = %lu\n", pGraphicsDevice->iDefaultMode);
     }
 
     /* Try to get a diplay driver */
     pldev = EngLoadImageEx(pdm->dmDeviceName, LDEV_DEVICE_DISPLAY);
     if (!pldev)
     {
-        DPRINT1("Could not load display driver '%ls', '%ls'\n",
-                pGraphicsDevice->pDiplayDrivers,
-                pdm->dmDeviceName);
+        ERR("Could not load display driver '%ls', '%ls'\n",
+            pGraphicsDevice->pDiplayDrivers, pdm->dmDeviceName);
         return NULL;
     }
 
     /* Create a new PDEVOBJ */
-    ppdev = PDEVOBJ_CreatePDEV(pldev);
+    ppdev = PDEVOBJ_CreatePDEV(pldev, pGraphicsDevice, pdm, NULL);
     if (!ppdev)
     {
-        DPRINT1("failed to allocate a PDEV\n");
+        ERR("failed to create a PDEV\n");
         EngUnloadImage(pldev);
         return FALSE;
     }
 
-    /* Set MovePointer function */
-    ppdev->pfnMovePointer = ppdev->pfn.MovePointer;
-    if (!ppdev->pfnMovePointer)
-        ppdev->pfnMovePointer = EngMovePointer;
-
-    ppdev->pGraphicsDevice = pGraphicsDevice;
 
     // DxEngGetHdevData asks for Graphics DeviceObject in hSpooler field
     ppdev->hSpooler = ppdev->pGraphicsDevice->DeviceObject;
@@ -537,22 +555,21 @@ PDEVOBJ_bSwitchMode(
     PPDEVOBJ ppdevTmp;
     PSURFACE pSurface;
     BOOL retval = FALSE;
+    TRACE("PDEVOBJ_bSwitchMode, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface);
 
     /* Lock the PDEV */
     EngAcquireSemaphore(ppdev->hsemDevLock);
 
     /* And everything else */
     EngAcquireSemaphore(ghsemPDEV);
 
-    DPRINT1("PDEVOBJ_bSwitchMode, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface);
-
     // Lookup the GraphicsDevice + select DEVMODE
     // pdm = PDEVOBJ_pdmMatchDevMode(ppdev, pdm);
 
     /* 1. Temporarily disable the current PDEV */
     if (!ppdev->pfn.AssertMode(ppdev->dhpdev, FALSE))
     {
-        DPRINT1("DrvAssertMode failed\n");
+        ERR("DrvAssertMode failed\n");
         goto leave;
     }
 
@@ -561,15 +578,15 @@ PDEVOBJ_bSwitchMode(
     ppdevTmp = EngCreateDisplayPDEV(&ustrDevice, pdm);
     if (!ppdevTmp)
     {
-        DPRINT1("Failed to create a new PDEV\n");
+        ERR("Failed to create a new PDEV\n");
         goto leave;
     }
 
     /* 3. Create a new surface */
     pSurface = PDEVOBJ_pSurface(ppdevTmp);
     if (!pSurface)
     {
-        DPRINT1("PDEVOBJ_pSurface failed\n");
+        ERR("PDEVOBJ_pSurface failed\n");
         goto leave;
     }
 
@@ -597,8 +614,7 @@ PDEVOBJ_bSwitchMode(
     EngReleaseSemaphore(ppdev->hsemDevLock);
     EngReleaseSemaphore(ghsemPDEV);
 
-    DPRINT1("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface);
-
+    TRACE("leave, ppdev = %p, pSurface = %p\n", ppdev, ppdev->pSurface);
     return retval;
 }
 

win32ss/gdi/eng/pdevobj.h

@@ -187,7 +187,10 @@ InitPDEVImpl(VOID);
 PPDEVOBJ
 NTAPI
 PDEVOBJ_CreatePDEV(
-    struct _LDEVOBJ *pldev);
+    struct _LDEVOBJ *pldev,
+    PGRAPHICS_DEVICE pGraphicsDevice,
+    PDEVMODEW pdevmode,
+    PWSTR pwszLogAddress);
 
 BOOL
 NTAPI

win32ss/gdi/font/fntdrvsup.c

@@ -278,7 +278,7 @@ EngLoadFontDriver(
     }
 
     /* Create a new PDEVOBJ */
-    ppdev = PDEVOBJ_CreatePDEV(pldev);
+    ppdev = PDEVOBJ_CreatePDEV(pldev, NULL, NULL, NULL);
     if (!ppdev)
     {
         DPRINT1("failed to allocate a PDEV\n");