Author: jimtabor
Date: Thu Jul 7 15:20:03 2016
New Revision: 71845
URL: http://svn.reactos.org/svn/reactos?rev=71845&view=rev
Log:
[USER32_WINETEST] Sync with Wine Staging 1.9.11 Part 1. CORE-11368
Modified:
trunk/rostests/winetests/user32/edit.c
trunk/rostests/winetests/user32/listbox.c
trunk/rostests/winetests/user32/uitools.c
Modified: trunk/rostests/winetests/user32/edit.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/edit.c?rev=71845&r1=71844&r2=71845&view=diff
==============================================================================
--- trunk/rostests/winetests/user32/edit.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/edit.c [iso-8859-1] Thu Jul 7
15:20:03 2016
@@ -574,11 +574,7 @@
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 @@
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 @@
/* 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);
Modified: trunk/rostests/winetests/user32/listbox.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/listbox.c?rev=71845&r1=71844&r2=71845&view=diff
==============================================================================
--- trunk/rostests/winetests/user32/listbox.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/listbox.c [iso-8859-1] Thu Jul 7
15:20:03 2016
@@ -125,8 +125,7 @@
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); \
Modified: trunk/rostests/winetests/user32/uitools.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/uitools.c?rev=71845&r1=71844&r2=71845&view=diff
==============================================================================
--- trunk/rostests/winetests/user32/uitools.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/uitools.c [iso-8859-1] Thu Jul 7
15:20:03 2016
@@ -49,8 +49,7 @@
/* 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 */
