Henri Verbeet : wined3d: Directly call surface_cpu_blt() in cpu_blit_color_fill().

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 18434ddc57c049e1f78d79471651d73d0dbc5f78
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=18434ddc57c049e1f78d794716...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Sun Aug 21 21:34:57 2011 +0200

wined3d: Directly call surface_cpu_blt() in cpu_blit_color_fill().

And avoid a potential infinite recursion if wined3d_surface_blt() ends up
calling cpu_blit_color_fill().

---

 dlls/wined3d/surface.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c
index d7d65fb..087196c 100644
--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -7024,12 +7024,13 @@ release:
 static HRESULT cpu_blit_color_fill(struct wined3d_device *device, struct wined3d_surface *dst_surface,
         const RECT *dst_rect, const WINED3DCOLORVALUE *color)
 {
+    static const RECT src_rect;
     WINEDDBLTFX BltFx;
 
     memset(&BltFx, 0, sizeof(BltFx));
     BltFx.dwSize = sizeof(BltFx);
     BltFx.u5.dwFillColor = wined3d_format_convert_from_float(dst_surface, color);
-    return wined3d_surface_blt(dst_surface, dst_rect, NULL, NULL,
+    return surface_cpu_blt(dst_surface, dst_rect, NULL, &src_rect,
             WINEDDBLT_COLORFILL, &BltFx, WINED3DTEXF_POINT);
 }