Michael Stefaniuc : ddraw: Use SetRectEmpty() instead of open coding it.
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Mar 3 11:39:44 CST 2016
Module: wine
Branch: master
Commit: 3db08a49e170109ece767596b97ddf68fb12bfd4
URL: http://source.winehq.org/git/wine.git/?a=commit;h=3db08a49e170109ece767596b97ddf68fb12bfd4
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Mar 3 09:26:06 2016 +0100
ddraw: Use SetRectEmpty() instead of open coding it.
Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/ddraw/surface.c | 2 +-
dlls/ddraw/tests/d3d.c | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c
index e9c9c65..d133e7e 100644
--- a/dlls/ddraw/surface.c
+++ b/dlls/ddraw/surface.c
@@ -1436,7 +1436,7 @@ static HRESULT ddraw_surface_blt_clipped(struct ddraw_surface *dst_surface, cons
}
else
{
- SetRect(&src_rect, 0, 0, 0, 0);
+ SetRectEmpty(&src_rect);
wined3d_src_texture = NULL;
src_sub_resource_idx = 0;
}
diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c
index 06f16f3..d877020 100644
--- a/dlls/ddraw/tests/d3d.c
+++ b/dlls/ddraw/tests/d3d.c
@@ -1832,10 +1832,7 @@ static void DeviceLoadTest(void)
/* First test some broken coordinates. */
loadpoint.x = loadpoint.y = 0;
- loadrect.left = 0;
- loadrect.top = 0;
- loadrect.right = 0;
- loadrect.bottom = 0;
+ SetRectEmpty(&loadrect);
hr = IDirect3DDevice7_Load(lpD3DDevice, texture_levels[1][0], &loadpoint, texture_levels[0][0], &loadrect, 0);
ok(hr==DDERR_INVALIDPARAMS, "IDirect3DDevice7_Load returned: %x\n",hr);
More information about the wine-cvs
mailing list