comctl32/tests: Use SetRect() instead of open coding it.

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

comctl32/tests: Use SetRect() instead of open coding it.
f98f01b3 · Michael Stefaniuc · Alexandre Julliard · 47b976e6 · f98f01b3 · f98f01b3
Commit f98f01b3 authored Dec 04, 2018 by Michael Stefaniuc Committed by Alexandre Julliard Dec 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

button.c dlls/comctl32/tests/button.c +1 -4

monthcal.c dlls/comctl32/tests/monthcal.c +3 -3

No files found.
--- a/dlls/comctl32/tests/button.c
+++ b/dlls/comctl32/tests/button.c
@@ -1366,10 +1366,7 @@ static void test_get_set_textmargin(void)
    BOOL ret;
    DWORD type;

-    margin_in.top = 1;
-    margin_in.left = 2;
-    margin_in.right = 3;
-    margin_in.bottom = 4;
+    SetRect(&margin_in, 2, 1, 3, 4);
    for (type = BS_PUSHBUTTON; type <= BS_DEFCOMMANDLINK; type++)
    {
        hwnd = create_button(type, NULL);

--- a/dlls/comctl32/tests/monthcal.c
+++ b/dlls/comctl32/tests/monthcal.c
@@ -1798,7 +1798,7 @@ static void test_hittest_v6(void)
    mchit.iOffset = -1;
    mchit.iCol = mchit.iRow = -1;
    mchit.uHit = 0;
-    mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1;
+    SetRect(&mchit.rc, -1, -1, -1, -1);
    ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit);
    expect_hex(MCHT_CALENDARDATE, ret);
    expect_hex(MCHT_CALENDARDATE, mchit.uHit);
@@ -1815,7 +1815,7 @@ static void test_hittest_v6(void)
    mchit.iOffset = -1;
    mchit.iCol = mchit.iRow = -1;
    mchit.uHit = 0;
-    mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1;
+    SetRect(&mchit.rc, -1, -1, -1, -1);
    ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit);
    expect_hex(MCHT_TITLE, ret);
    expect_hex(MCHT_TITLE, mchit.uHit);
@@ -1834,7 +1834,7 @@ static void test_hittest_v6(void)
    mchit.iOffset = -2;
    mchit.iCol = mchit.iRow = -2;
    mchit.uHit = ~0;
-    mchit.rc.left = mchit.rc.right = mchit.rc.top = mchit.rc.bottom = -1;
+    SetRect(&mchit.rc, -1, -1, -1, -1);
    ret = SendMessageA(hwnd, MCM_HITTEST, 0, (LPARAM)&mchit);
    todo_wine expect_hex(MCHT_NOWHERE, ret);
    todo_wine expect_hex(MCHT_NOWHERE, mchit.uHit);