gdi32: Implement brushed pens.

dlls/gdi32/dibdrv/dc.c

@@ -309,6 +309,7 @@ static BOOL dibdrv_CreateDC( PHYSDEV *dev, LPCWSTR driver, LPCWSTR device,
     if (!pdev) return FALSE;
     clear_dib_info(&pdev->dib);
     clear_dib_info(&pdev->brush.dib);
+    clear_dib_info(&pdev->pen_brush.dib);
     push_dc_driver( dev, &pdev->dev, &dib_driver );
     return TRUE;
 }
@@ -321,6 +322,7 @@ static BOOL dibdrv_DeleteDC( PHYSDEV dev )
     dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
     TRACE("(%p)\n", dev);
     free_pattern_brush( &pdev->brush );
+    free_pattern_brush( &pdev->pen_brush );
     HeapFree( GetProcessHeap(), 0, pdev );
     return TRUE;
 }
@@ -389,7 +391,11 @@ static UINT dibdrv_SetDIBColorTable( PHYSDEV dev, UINT pos, UINT count, const RG
     dibdrv_physdev *pdev = get_dibdrv_pdev(dev);
     TRACE("(%p, %d, %d, %p)\n", dev, pos, count, colors);
 
-    if (pdev->dib.color_table) pdev->brush.rop = -1;  /* force re-creating the brush bits */
+    if (pdev->dib.color_table)  /* force re-creating the brush bits */
+    {
+        pdev->brush.rop = -1;
+        pdev->pen_brush.rop = -1;
+    }
 
     return next->funcs->pSetDIBColorTable( next, pos, count, colors );
 }

dlls/gdi32/dibdrv/dibdrv.h

@@ -99,10 +99,10 @@ typedef struct dibdrv_physdev
     DWORD defer;
 
     /* pen */
-    COLORREF pen_colorref;
     DWORD pen_style, pen_endcap, pen_join;
     BOOL pen_uses_region, pen_is_ext;
     int pen_width;
+    dib_brush pen_brush;
     dash_pattern pen_pattern;
     dash_pos dash_pos;
     rop_mask dash_masks[2];