gdi32: Use NtGdiStrokeAndFillPath for StrokeAndFillPath.

dlls/gdi32/enhmfdrv/graphics.c

@@ -1197,7 +1197,16 @@ BOOL EMFDC_FillPath( DC_ATTR *dc_attr )
  */
 BOOL CDECL EMFDRV_StrokeAndFillPath( PHYSDEV dev )
 {
-    return emfdrv_stroke_and_fill_path( dev, EMR_STROKEANDFILLPATH );
+    /* FIXME: update bound rect */
+    return TRUE;
+}
+
+/**********************************************************************
+ *	     EMFDC_StrokeAndFillPath
+ */
+BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr )
+{
+    return emfdrv_stroke_and_fill_path( dc_attr->emf, EMR_STROKEANDFILLPATH );
 }
 
 /**********************************************************************

dlls/gdi32/gdi_private.h

@@ -217,5 +217,6 @@ extern BOOL EMFDC_StretchDIBits( DC_ATTR *dc_attr, INT x_dst, INT y_dst, INT wid
                                  INT height_dst, INT x_src, INT y_src, INT width_src,
                                  INT height_src, const void *bits, const BITMAPINFO *info,
                                  UINT coloruse, DWORD rop ) DECLSPEC_HIDDEN;
+extern BOOL EMFDC_StrokeAndFillPath( DC_ATTR *dc_attr ) DECLSPEC_HIDDEN;
 
 #endif /* __WINE_GDI_PRIVATE_H */

dlls/gdi32/gdidc.c

@@ -1531,6 +1531,18 @@ BOOL WINAPI FillPath( HDC hdc )
     return NtGdiFillPath( hdc );
 }
 
+/*******************************************************************
+ *           StrokeAndFillPath   (GDI32.@)
+ */
+BOOL WINAPI StrokeAndFillPath( HDC hdc )
+{
+    DC_ATTR *dc_attr;
+
+    if (!(dc_attr = get_dc_attr( hdc ))) return FALSE;
+    if (dc_attr->emf && !EMFDC_StrokeAndFillPath( dc_attr )) return FALSE;
+    return NtGdiStrokeAndFillPath( hdc );
+}
+
 /***********************************************************************
  *           FlattenPath   (GDI32.@)
  */

dlls/gdi32/path.c

@@ -1901,11 +1901,9 @@ static struct gdi_path *PATH_WidenPath(DC *dc)
 
 
 /*******************************************************************
- *      StrokeAndFillPath [GDI32.@]
- *
- *
+ *           NtGdiStrokeAndFillPath   (win32u.@)
  */
-BOOL WINAPI StrokeAndFillPath(HDC hdc)
+BOOL WINAPI NtGdiStrokeAndFillPath( HDC hdc )
 {
     BOOL ret = FALSE;
     DC *dc = get_dc_ptr( hdc );