Huw Davies : wineps: Fall back to the null driver for common device caps.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: dd26e02c58006de03ee53a8c2df76f254f7e36fc
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=dd26e02c58006de03ee53a8c2d...

Author: Huw Davies <huw(a)codeweavers.com>
Date:   Tue Aug 22 12:42:35 2017 +0100

wineps: Fall back to the null driver for common device caps.

Signed-off-by: Huw Davies <huw(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 dlls/wineps.drv/init.c | 35 ++---------------------------------
 1 file changed, 2 insertions(+), 33 deletions(-)

diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 3b00343..5b32879 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -486,42 +486,23 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap )
         return MulDiv(physDev->vertSize, 100,
 		      physDev->Devmode->dmPublic.u1.s1.dmScale);
     case HORZRES:
-    case DESKTOPHORZRES:
         return physDev->horzRes;
     case VERTRES:
-    case DESKTOPVERTRES:
         return physDev->vertRes;
     case BITSPIXEL:
         /* Although Windows returns 1 for monochrome printers, we want
            CreateCompatibleBitmap to provide something other than 1 bpp */
         return 32;
-    case PLANES:
-        return 1;
-    case NUMBRUSHES:
-        return -1;
     case NUMPENS:
         return 10;
-    case NUMMARKERS:
-        return 0;
     case NUMFONTS:
         return 39;
     case NUMCOLORS:
         return -1;
     case PDEVICESIZE:
         return sizeof(PSDRV_PDEVICE);
-    case CURVECAPS:
-        return (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE |
-                CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT);
-    case LINECAPS:
-        return (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE |
-                LC_STYLED | LC_WIDESTYLED | LC_INTERIORS);
-    case POLYGONALCAPS:
-        return (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE |
-                PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS);
     case TEXTCAPS:
         return TC_CR_ANY | TC_VA_ABLE; /* psdrv 0x59f7 */
-    case CLIPCAPS:
-        return CP_RECTANGLE;
     case RASTERCAPS:
         return (RC_BITBLT | RC_BITMAP64 | RC_GDI20_OUTPUT | RC_DIBTODEV |
                 RC_STRETCHBLT | RC_STRETCHDIB); /* psdrv 0x6e99 */
@@ -529,17 +510,12 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap )
         return physDev->logPixelsX;
     case ASPECTY:
         return physDev->logPixelsY;
-    case ASPECTXY:
-        return (int)hypot( (double)physDev->logPixelsX,
-                           (double)physDev->logPixelsY );
     case LOGPIXELSX:
         return MulDiv(physDev->logPixelsX,
 		      physDev->Devmode->dmPublic.u1.s1.dmScale, 100);
     case LOGPIXELSY:
         return MulDiv(physDev->logPixelsY,
 		      physDev->Devmode->dmPublic.u1.s1.dmScale, 100);
-    case SIZEPALETTE:
-        return 0;
     case NUMRESERVED:
         return 0;
     case COLORRES:
@@ -568,16 +544,9 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap )
       }
       return physDev->PageSize.cy - physDev->ImageableArea.top;
 
-    case SCALINGFACTORX:
-    case SCALINGFACTORY:
-    case VREFRESH:
-    case BLTALIGNMENT:
-        return 0;
-    case SHADEBLENDCAPS:
-        return SB_NONE;
     default:
-        FIXME("(%p): unsupported capability %d, will return 0\n", dev->hdc, cap );
-        return 0;
+        dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps );
+        return dev->funcs->pGetDeviceCaps( dev, cap );
     }
 }