[USER32_WINETEST] Sync with Wine Staging 1.9.11 Part 1. CORE-11368

svn path=/trunk/; revision=71845

diff --git a/rostests/winetests/user32/edit.c b/rostests/winetests/user32/edit.c
index 6ff7225..8f92ff8 100755 (executable)
--- a/rostests/winetests/user32/edit.c
+++ b/rostests/winetests/user32/edit.c
@@ -574,11 +574,7 @@ static HWND create_child_editcontrol (DWORD style, DWORD exstyle)
     HWND editWnd;
     RECT rect;
     BOOL b;
-    
-    rect.left = 0;
-    rect.top = 0;
-    rect.right = 300;
-    rect.bottom = 300;
+    SetRect(&rect, 0, 0, 300, 300);
     b = AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE);
     ok(b, "AdjustWindowRect failed\n");
     
@@ -1468,10 +1464,7 @@ static void test_margins(void)
        the rectangle must not change */
 
     SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10));
-    old_rect.left = 1;
-    old_rect.right = 99;
-    old_rect.top = 1;
-    old_rect.bottom = 99;
+    SetRect(&old_rect, 1, 1, 99, 99);
     SendMessageA(hwEdit, EM_SETRECT, 0, (LPARAM)&old_rect);
     SendMessageA(hwEdit, EM_GETRECT, 0, (LPARAM)&old_rect);
     SendMessageA(hwEdit, EM_SETMARGINS, EC_LEFTMARGIN | EC_RIGHTMARGIN, MAKELONG(10, 10));
@@ -1679,7 +1672,7 @@ static void test_text_position_style(DWORD style)
 
     /* Get a stock font for which we can determine the metrics */
     font = GetStockObject(SYSTEM_FONT);
-    ok (font != NULL, "GetStockObjcet SYSTEM_FONT failed\n");
+    ok (font != NULL, "GetStockObject SYSTEM_FONT failed\n");
     dc = GetDC(NULL);
     ok (dc != NULL, "GetDC() failed\n");
     oldFont = SelectObject(dc, font);

diff --git a/rostests/winetests/user32/listbox.c b/rostests/winetests/user32/listbox.c
index 9380457..ba400f9 100644 (file)
--- a/rostests/winetests/user32/listbox.c
+++ b/rostests/winetests/user32/listbox.c
@@ -125,8 +125,7 @@ keypress (HWND handle, WPARAM keycode, BYTE scancode, BOOL extended)
       t.s.f, got.f)
 
 #define listbox_todo_field_ok(t, s, f, got) \
-  if (t.s##_todo.f) todo_wine { listbox_field_ok(t, s, f, got); } \
-  else listbox_field_ok(t, s, f, got)
+  todo_wine_if (t.s##_todo.f) { listbox_field_ok(t, s, f, got); }
 
 #define listbox_ok(t, s, got) \
   listbox_todo_field_ok(t, s, selected, got); \

diff --git a/rostests/winetests/user32/uitools.c b/rostests/winetests/user32/uitools.c
index 5f10b00..e1ddf2b 100644 (file)
--- a/rostests/winetests/user32/uitools.c
+++ b/rostests/winetests/user32/uitools.c
@@ -49,8 +49,7 @@ static void test_FillRect(void)
 
     /* select black brush */
     old_brush = SelectObject(hdcmem, GetStockObject(BLACK_BRUSH));
-    r.left  = r.top = 0;
-    r.right = r.bottom = 5;
+    SetRect(&r, 0, 0, 5, 5);
     FillRect(hdcmem, &r, 0);
     SelectObject(hdcmem, old_brush);
     /* bitmap filled with last selected brush */