Commit dd26e02c authored by Huw Davies's avatar Huw Davies Committed by Alexandre Julliard

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

parent 9ea33ed0
...@@ -486,42 +486,23 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) ...@@ -486,42 +486,23 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap )
return MulDiv(physDev->vertSize, 100, return MulDiv(physDev->vertSize, 100,
physDev->Devmode->dmPublic.u1.s1.dmScale); physDev->Devmode->dmPublic.u1.s1.dmScale);
case HORZRES: case HORZRES:
case DESKTOPHORZRES:
return physDev->horzRes; return physDev->horzRes;
case VERTRES: case VERTRES:
case DESKTOPVERTRES:
return physDev->vertRes; return physDev->vertRes;
case BITSPIXEL: case BITSPIXEL:
/* Although Windows returns 1 for monochrome printers, we want /* Although Windows returns 1 for monochrome printers, we want
CreateCompatibleBitmap to provide something other than 1 bpp */ CreateCompatibleBitmap to provide something other than 1 bpp */
return 32; return 32;
case PLANES:
return 1;
case NUMBRUSHES:
return -1;
case NUMPENS: case NUMPENS:
return 10; return 10;
case NUMMARKERS:
return 0;
case NUMFONTS: case NUMFONTS:
return 39; return 39;
case NUMCOLORS: case NUMCOLORS:
return -1; return -1;
case PDEVICESIZE: case PDEVICESIZE:
return sizeof(PSDRV_PDEVICE); 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: case TEXTCAPS:
return TC_CR_ANY | TC_VA_ABLE; /* psdrv 0x59f7 */ return TC_CR_ANY | TC_VA_ABLE; /* psdrv 0x59f7 */
case CLIPCAPS:
return CP_RECTANGLE;
case RASTERCAPS: case RASTERCAPS:
return (RC_BITBLT | RC_BITMAP64 | RC_GDI20_OUTPUT | RC_DIBTODEV | return (RC_BITBLT | RC_BITMAP64 | RC_GDI20_OUTPUT | RC_DIBTODEV |
RC_STRETCHBLT | RC_STRETCHDIB); /* psdrv 0x6e99 */ RC_STRETCHBLT | RC_STRETCHDIB); /* psdrv 0x6e99 */
...@@ -529,17 +510,12 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) ...@@ -529,17 +510,12 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap )
return physDev->logPixelsX; return physDev->logPixelsX;
case ASPECTY: case ASPECTY:
return physDev->logPixelsY; return physDev->logPixelsY;
case ASPECTXY:
return (int)hypot( (double)physDev->logPixelsX,
(double)physDev->logPixelsY );
case LOGPIXELSX: case LOGPIXELSX:
return MulDiv(physDev->logPixelsX, return MulDiv(physDev->logPixelsX,
physDev->Devmode->dmPublic.u1.s1.dmScale, 100); physDev->Devmode->dmPublic.u1.s1.dmScale, 100);
case LOGPIXELSY: case LOGPIXELSY:
return MulDiv(physDev->logPixelsY, return MulDiv(physDev->logPixelsY,
physDev->Devmode->dmPublic.u1.s1.dmScale, 100); physDev->Devmode->dmPublic.u1.s1.dmScale, 100);
case SIZEPALETTE:
return 0;
case NUMRESERVED: case NUMRESERVED:
return 0; return 0;
case COLORRES: case COLORRES:
...@@ -568,16 +544,9 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) ...@@ -568,16 +544,9 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap )
} }
return physDev->PageSize.cy - physDev->ImageableArea.top; return physDev->PageSize.cy - physDev->ImageableArea.top;
case SCALINGFACTORX:
case SCALINGFACTORY:
case VREFRESH:
case BLTALIGNMENT:
return 0;
case SHADEBLENDCAPS:
return SB_NONE;
default: default:
FIXME("(%p): unsupported capability %d, will return 0\n", dev->hdc, cap ); dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps );
return 0; return dev->funcs->pGetDeviceCaps( dev, cap );
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment