ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gdi32: Remove PS_USERSTYLE FIXME and workarounds.

Browse Source
This commit is contained in:
Daniel Santos 2011-10-14 00:32:11 -05:00 committed by Alexandre Julliard
parent f2ad9df45d
commit 7a4349bb99
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/gdi32/pen.c
View File

@ -115,8 +115,6 @@ HPEN WINAPI CreatePenIndirect( const LOGPEN * pen )
/*********************************************************************** /***********************************************************************
* ExtCreatePen (GDI32.@) * ExtCreatePen (GDI32.@)
*
* FIXME: PS_USERSTYLE not handled
*/ */
HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, HPEN WINAPI ExtCreatePen( DWORD style, DWORD width,
@ -137,13 +135,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width,
return 0; return 0;
} }
if ((style & PS_TYPE_MASK) == PS_COSMETIC) if ((style & PS_TYPE_MASK) == PS_GEOMETRIC)
{
/* FIXME: PS_USERSTYLE workaround */
FIXME("PS_COSMETIC | PS_USERSTYLE not handled\n");
style = (style & ~PS_STYLE_MASK) | PS_SOLID;
}
else
{ {
UINT i; UINT i;
BOOL has_neg = FALSE, all_zero = TRUE; BOOL has_neg = FALSE, all_zero = TRUE;

6
dlls/gdi32/tests/pen.c
View File

@ -311,12 +311,6 @@ static void test_logpen(void)
break; 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.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.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); ok(ext_pen.elp.elpColor == pen[i].ret_color, "expected %08x, got %08x\n", pen[i].ret_color, ext_pen.elp.elpColor);