Michael Stefaniuc : comctl32/tests: Use EqualRect() instead of memcmp() to compare RECTs.

Alexandre Julliard julliard at winehq.org
Tue Jun 21 11:13:47 CDT 2016


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

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Mon Jun 20 13:42:15 2016 +0200

comctl32/tests: Use EqualRect() instead of memcmp() to compare RECTs.

Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/comctl32/tests/listview.c | 2 +-
 dlls/comctl32/tests/toolbar.c  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c
index ed5d9f9..1444a9f 100644
--- a/dlls/comctl32/tests/listview.c
+++ b/dlls/comctl32/tests/listview.c
@@ -908,7 +908,7 @@ static void test_images(void)
     r = SendMessageA(hwnd, LVM_GETITEMRECT, 0, (LPARAM) &r2);
     expect(1, r);
 
-    ok(!memcmp(&r1, &r2, sizeof r1), "rectangle should be the same\n");
+    ok(EqualRect(&r1, &r2), "rectangle should be the same\n");
 
     DestroyWindow(hwnd);
 }
diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c
index d825e18..efad00a 100644
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -1232,7 +1232,7 @@ static DWORD tbsize_alt_numtests = 0;
         for (i=0; i<min(buttonCount, res->nButtons); i++) { \
             ok(SendMessageA(hToolbar, TB_GETITEMRECT, i, (LPARAM)&rc) == 1, "TB_GETITEMRECT\n"); \
             if (broken(tbsize_alt_numtests < sizeof(tbsize_alt_results)/sizeof(tbsize_alt_results[0]) && \
-                       memcmp(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton, sizeof(RECT)) == 0)) { \
+                       EqualRect(&rc, &tbsize_alt_results[tbsize_alt_numtests].rcButton))) { \
                 win_skip("Alternate rect found\n"); \
                 tbsize_alt_numtests++; \
             } else if (!(mask&1)) { \




More information about the wine-cvs mailing list