Just a fix for an annoying niggle; the current code checks if brush->lbHatch is nonnull. If it is, it assumes a hatch is being used, and prints a warning. Some apps however (e.g. Xara X) have rubbish in the hatch part of the structure when a hatch is not actually being used. This triggers an unnecessary warning (_all_ the time in Xara X). This patch makes sure the warning only appears if a hatch is REALLY being used by testing the flags.
Index: objects/pen.c =================================================================== RCS file: /home/wine/wine/objects/pen.c,v retrieving revision 1.24 diff -u -r1.24 pen.c --- objects/pen.c 5 Sep 2003 23:15:42 -0000 1.24 +++ objects/pen.c 29 Nov 2003 01:20:44 -0000 @@ -106,9 +106,9 @@ if ((style & PS_STYLE_MASK) == PS_USERSTYLE) FIXME("PS_USERSTYLE not handled\n"); if ((style & PS_TYPE_MASK) == PS_GEOMETRIC) - if (brush->lbHatch) - FIXME("Hatches not implemented\n"); - + if (brush->lbHatch && (brush->lbStyle & ~(BS_SOLID|BS_HOLLOW))) + FIXME("Hatches not implemented\n"); + if (!(penPtr = GDI_AllocObject( sizeof(PENOBJ), PEN_MAGIC, (HGDIOBJ *)&hpen, &pen_funcs ))) return 0; penPtr->logpen.lopnStyle = style & ~PS_TYPE_MASK;