Dmitry Timoshkov : wineps.drv: Return ASPECTX/ Y which represent current device resolution.

[Alexandre Julliard]

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

Author: Dmitry Timoshkov 
Date:   Tue Dec 18 16:58:33 2012 +0800

wineps.drv: Return ASPECTX/Y which represent current device resolution.

---

dlls/wineps.drv/init.c |    9 ++++-----
 1 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c
index 4df859e..98768a4 100644
--- a/dlls/wineps.drv/init.c
+++ b/dlls/wineps.drv/init.c
@@ -421,14 +421,13 @@ static INT PSDRV_GetDeviceCaps( PHYSDEV dev, INT cap )
     case RASTERCAPS:
         return (RC_BITBLT | RC_BITMAP64 | RC_GDI20_OUTPUT | RC_DIBTODEV |
                 RC_STRETCHBLT | RC_STRETCHDIB); /* psdrv 0x6e99 */
-    /* Are aspect[XY] and logPixels[XY] correct? */
-    /* Need to handle different res in x and y => fix ppd */
     case ASPECTX:
+        return physDev->logPixelsX;
     case ASPECTY:
-        return physDev->pi->ppd->DefaultResolution;
+        return physDev->logPixelsY;
     case ASPECTXY:
-        return (int)hypot( (double)physDev->pi->ppd->DefaultResolution,
-                           (double)physDev->pi->ppd->DefaultResolution );
+        return (int)hypot( (double)physDev->logPixelsX,
+                           (double)physDev->logPixelsY );
     case LOGPIXELSX:
         return MulDiv(physDev->logPixelsX,
    	      physDev->Devmode->dmPublic.u1.s1.dmScale, 100);