ddraw/tests: Finish the move to use wine_dbgstr_rect().

Michael Stefaniuc mstefani at redhat.de
Wed Jun 8 15:38:22 CDT 2016


Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
---
Though this is more likely one of those "to be fixed by moving to
ddraw[1247].c...
I did check and there are set_display_mode() tests in those files
already. They look different but parts seem to be the same.
So something for somebody that knows that code.



 dlls/ddraw/tests/ddrawmodes.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/dlls/ddraw/tests/ddrawmodes.c b/dlls/ddraw/tests/ddrawmodes.c
index f5b0666..3721ccf 100644
--- a/dlls/ddraw/tests/ddrawmodes.c
+++ b/dlls/ddraw/tests/ddrawmodes.c
@@ -563,8 +563,8 @@ static void setdisplaymode(int i)
                 SetRect(&virt, 0, 0, GetSystemMetrics(SM_CXVIRTUALSCREEN), GetSystemMetrics(SM_CYVIRTUALSCREEN));
                 OffsetRect(&virt, GetSystemMetrics(SM_XVIRTUALSCREEN), GetSystemMetrics(SM_YVIRTUALSCREEN));
                 SetRect(&scrn, 0, 0, GetSystemMetrics(SM_CXSCREEN), GetSystemMetrics(SM_CYSCREEN));
-                trace("Mode (%dx%d) [%dx%d] (%d %d)x(%d %d)\n", modes[i].dwWidth, modes[i].dwHeight,
-                      scrn.right, scrn.bottom, virt.left, virt.top, virt.right, virt.bottom);
+                trace("Mode (%dx%d) [%dx%d] %s\n", modes[i].dwWidth, modes[i].dwHeight,
+                      scrn.right, scrn.bottom, wine_dbgstr_rect(&virt));
                 if (!EqualRect(&scrn, &orig_rect))
                 {
                     BOOL rect_result, ret;
@@ -601,13 +601,11 @@ static void setdisplaymode(int i)
                 ok(GetClipCursor(&r), "GetClipCursor() failed\n");
                 /* ddraw sets clip rect here to the screen size, even for
                    multiple monitors */
-                ok(EqualRect(&r, &scrn), "Invalid clip rect: (%d %d) x (%d %d)\n",
-                   r.left, r.top, r.right, r.bottom);
+                ok(EqualRect(&r, &scrn), "Invalid clip rect: %s\n", wine_dbgstr_rect(&r));
 
                 ok(ClipCursor(NULL), "ClipCursor() failed\n");
                 ok(GetClipCursor(&r), "GetClipCursor() failed\n");
-                ok(EqualRect(&r, &virt), "Invalid clip rect: (%d %d) x (%d %d)\n",
-                   r.left, r.top, r.right, r.bottom);
+                ok(EqualRect(&r, &virt), "Invalid clip rect: %s\n", wine_dbgstr_rect(&r));
 
                 rc = IDirectDraw_RestoreDisplayMode(lpDD);
                 ok(DD_OK==rc,"RestoreDisplayMode returned: %x\n",rc);
-- 
2.5.5



More information about the wine-patches mailing list