Daniel Santos : gdi32: Remove PS_USERSTYLE FIXME and workarounds.

[Alexandre Julliard]

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

Author: Daniel Santos 
Date:   Fri Oct 14 00:32:11 2011 -0500

gdi32: Remove PS_USERSTYLE FIXME and workarounds.

---

dlls/gdi32/pen.c       |   10 +---------
 dlls/gdi32/tests/pen.c |    6 ------
 2 files changed, 1 insertions(+), 15 deletions(-)

diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c
index 425b5aa..1f92b87 100644
--- a/dlls/gdi32/pen.c
+++ b/dlls/gdi32/pen.c
@@ -115,8 +115,6 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen )

/***********************************************************************
  *           ExtCreatePen    (GDI32.@)
- *
- * FIXME: PS_USERSTYLE not handled
  */

HPEN WINAPI ExtCreatePen( DWORD style, DWORD width,
@@ -137,13 +135,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width,
             return 0;
         }

-        if ((style & PS_TYPE_MASK) == PS_COSMETIC)
-        {
-            /* FIXME: PS_USERSTYLE workaround */
-            FIXME("PS_COSMETIC | PS_USERSTYLE not handled\n");
-            style = (style & ~PS_STYLE_MASK) | PS_SOLID;
-        }
-        else
+        if ((style & PS_TYPE_MASK) == PS_GEOMETRIC)
         {
             UINT i;
             BOOL has_neg = FALSE, all_zero = TRUE;
diff --git a/dlls/gdi32/tests/pen.c b/dlls/gdi32/tests/pen.c
index df13f6e..86250a0 100644
--- a/dlls/gdi32/tests/pen.c
+++ b/dlls/gdi32/tests/pen.c
@@ -311,12 +311,6 @@ static void test_logpen(void)
             break;
         }

-if (pen[i].style == PS_USERSTYLE)
-{
-    todo_wine
-        ok(ext_pen.elp.elpPenStyle == pen[i].style, "expected %x, got %x\n", pen[i].style, ext_pen.elp.elpPenStyle);
-}
-else
         ok(ext_pen.elp.elpPenStyle == pen[i].style, "expected %x, got %x\n", pen[i].style, ext_pen.elp.elpPenStyle);
         ok(ext_pen.elp.elpWidth == 1, "expected 1, got %x\n", ext_pen.elp.elpWidth);
         ok(ext_pen.elp.elpColor == pen[i].ret_color, "expected %08x, got %08x\n", pen[i].ret_color, ext_pen.elp.elpColor);