Dmitry Timoshkov : Pens created without PS_GEOMETRIC style but with width > 1 unit are

[Alexandre Julliard]

Module: wine
Branch: refs/heads/master
Commit: 75e8166d7487461ead74e856106cfca79ae792a5
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=75e8166d7487461ead74e856...

Author: Dmitry Timoshkov <dmitry(a)codeweavers.com>
Date:   Wed Feb  8 12:35:29 2006 +0100

Pens created without PS_GEOMETRIC style but with width > 1 unit are
scalable.

---

 dlls/wineps/pen.c |    2 +-
 dlls/x11drv/pen.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/wineps/pen.c b/dlls/wineps/pen.c
index 9f92cbe..6944635 100644
--- a/dlls/wineps/pen.c
+++ b/dlls/wineps/pen.c
@@ -59,7 +59,7 @@ HPEN PSDRV_SelectPen( PSDRV_PDEVICE *phy
     TRACE("hpen = %p colour = %08lx\n", hpen, logpen.lopnColor);
 
     physDev->pen.width = logpen.lopnWidth.x;
-    if (logpen.lopnStyle & PS_GEOMETRIC)
+    if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width > 1))
     {
         physDev->pen.width = PSDRV_XWStoDS( physDev, physDev->pen.width );
         if(physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width;
diff --git a/dlls/x11drv/pen.c b/dlls/x11drv/pen.c
index 8fb1fa3..26cffce 100644
--- a/dlls/x11drv/pen.c
+++ b/dlls/x11drv/pen.c
@@ -59,7 +59,7 @@ HPEN X11DRV_SelectPen( X11DRV_PDEVICE *p
     physDev->pen.linejoin = logpen.lopnStyle & PS_JOIN_MASK;
 
     physDev->pen.width = logpen.lopnWidth.x;
-    if (logpen.lopnStyle & PS_GEOMETRIC)
+    if ((logpen.lopnStyle & PS_GEOMETRIC) || (physDev->pen.width > 1))
     {
         physDev->pen.width = X11DRV_XWStoDS( physDev, physDev->pen.width );
         if (physDev->pen.width < 0) physDev->pen.width = -physDev->pen.width;