Henri Verbeet : ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface_update_frontbuffer().
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Jan 28 10:06:44 CST 2016
Module: wine
Branch: master
Commit: 492e785513d552df2eb41ec199d86637668fd6ed
URL: http://source.winehq.org/git/wine.git/?a=commit;h=492e785513d552df2eb41ec199d86637668fd6ed
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Wed Jan 27 20:44:34 2016 +0100
ddraw: Pass non-NULL rectangles to wined3d_surface_blt() in ddraw_surface_update_frontbuffer().
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/surface.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index b4fa5de..d4a25c6 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -46,22 +46,19 @@ HRESULT ddraw_surface_update_frontbuffer(struct ddraw_surface *surface, const RE
int x, y, w, h;
HRESULT hr;
BOOL ret;
+ RECT r;
if (!rect)
{
- x = 0;
- y = 0;
- w = surface->surface_desc.dwWidth;
- h = surface->surface_desc.dwHeight;
- }
- else
- {
- x = rect->left;
- y = rect->top;
- w = rect->right - rect->left;
- h = rect->bottom - rect->top;
+ SetRect(&r, 0, 0, surface->surface_desc.dwWidth, surface->surface_desc.dwHeight);
+ rect = &r;
}
+ x = rect->left;
+ y = rect->top;
+ w = rect->right - rect->left;
+ h = rect->bottom - rect->top;
+
if (w <= 0 || h <= 0)
return DD_OK;
More information about the wine-cvs
mailing list