Alexandre Julliard : gdi32: Add support for 1-pixel wide geometric dashed pens.

[Alexandre Julliard]

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

Author: Alexandre Julliard 
Date:   Wed Dec 28 16:49:14 2011 +0100

gdi32: Add support for 1-pixel wide geometric dashed pens.

---

dlls/gdi32/dibdrv/objects.c |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/dibdrv/objects.c b/dlls/gdi32/dibdrv/objects.c
index 30af359..dfd5f1c 100644
--- a/dlls/gdi32/dibdrv/objects.c
+++ b/dlls/gdi32/dibdrv/objects.c
@@ -1237,15 +1237,22 @@ static BOOL wide_pen_lines(dibdrv_physdev *pdev, int num, POINT *pts, BOOL close
     return TRUE;
 }

-static const dash_pattern dash_patterns[5] =
+static const dash_pattern dash_patterns_cosmetic[4] =
 {
-    {0, {0}, 0},                  /* PS_SOLID - a pseudo-pattern used to initialise unpatterned pens. */
     {2, {18, 6}, 24},             /* PS_DASH */
     {2, {3,  3}, 6},              /* PS_DOT */
     {4, {9, 6, 3, 6}, 24},        /* PS_DASHDOT */
     {6, {9, 3, 3, 3, 3, 3}, 24}   /* PS_DASHDOTDOT */
 };

+static const dash_pattern dash_patterns_geometric[4] =
+{
+    {2, {3, 1}, 4},               /* PS_DASH */
+    {2, {1, 1}, 2},               /* PS_DOT */
+    {4, {3, 1, 1, 1}, 6},         /* PS_DASHDOT */
+    {6, {3, 1, 1, 1, 1, 1}, 8}    /* PS_DASHDOTDOT */
+};
+
 static inline int get_pen_device_width( dibdrv_physdev *pdev, int width )
 {
     POINT pts[2];
@@ -1296,7 +1303,7 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
         logpen.lopnColor = GetDCPenColor( dev->hdc );

pdev->pen_colorref = logpen.lopnColor;
-    pdev->pen_pattern = dash_patterns[PS_SOLID];
+    memset( &pdev->pen_pattern, 0, sizeof(pdev->pen_pattern) );

pdev->defer |= DEFER_PEN;

@@ -1308,11 +1315,18 @@ HPEN dibdrv_SelectPen( PHYSDEV dev, HPEN hpen )
     case PS_DOT:
     case PS_DASHDOT:
     case PS_DASHDOTDOT:
-        if(logpen.lopnStyle & PS_GEOMETRIC) break;
+        if (logpen.lopnStyle & PS_GEOMETRIC)
+        {
+            if (pdev->pen_width > 1) break;  /* not supported yet */
+            pdev->pen_lines = dashed_pen_lines;
+            pdev->pen_pattern = dash_patterns_geometric[pdev->pen_style - 1];
+            pdev->defer &= ~DEFER_PEN;
+            break;
+        }
         if (pdev->pen_width == 1)  /* wide cosmetic pens are not dashed */
         {
             pdev->pen_lines = dashed_pen_lines;
-            pdev->pen_pattern = dash_patterns[pdev->pen_style];
+            pdev->pen_pattern = dash_patterns_cosmetic[pdev->pen_style - 1];
             pdev->defer &= ~DEFER_PEN;
             break;
         }