[USER32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

svn path=/trunk/; revision=72254

diff --git a/rostests/winetests/user32/input.c b/rostests/winetests/user32/input.c
index bafe9d5..7744de2 100755 (executable)
--- a/rostests/winetests/user32/input.c
+++ b/rostests/winetests/user32/input.c
@@ -184,7 +184,7 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam )
             if(  TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */
                     (VKey != VK_MENU)) /* <ALT>-down...<something else>-up */
                 message = WM_SYSKEYUP;
-                TrackSysKey = 0;
+            TrackSysKey = 0; /* FIXME */
         }
         InputKeyStateTable[VKey] &= ~0x80;
         flags |= KF_REPEAT | KF_UP;
@@ -1768,7 +1768,9 @@ static void test_keyboard_layout_name(void)
     char klid[KL_NAMELENGTH];
 
 if (0) /* crashes on native system */
+{
     ret = GetKeyboardLayoutNameA(NULL);
+}
 
     SetLastError(0xdeadbeef);
     ret = GetKeyboardLayoutNameW(NULL);

diff --git a/rostests/winetests/user32/menu.c b/rostests/winetests/user32/menu.c
index 0460e19..4735d92 100755 (executable)
--- a/rostests/winetests/user32/menu.c
+++ b/rostests/winetests/user32/menu.c
@@ -3973,12 +3973,16 @@ static void test_AppendMenu(void)
     ret = InsertMenuItemA(hmenu, 0, TRUE, &mii);
     ok(ret, "InsertMenuItem failed\n");
 if (0) /* FIXME: uncomment once Wine is fixed */
+{
     check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED);
+}
     mii.wID = 207;
     ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);
     ok(ret, "SetMenuItemInfo failed\n");
 if (0) /* FIXME: uncomment once Wine is fixed */
+{
     check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED);
+}
     DestroyMenu(hmenu);
 
     hbmp = CreateBitmap(1, 1, 1, 1, NULL);

diff --git a/rostests/winetests/user32/msg.c b/rostests/winetests/user32/msg.c
index b4bf217..3c13284 100755 (executable)
--- a/rostests/winetests/user32/msg.c
+++ b/rostests/winetests/user32/msg.c
@@ -12190,11 +12190,7 @@ static void test_ShowWindow(void)
                "expected %d,%d got %d,%d\n", sw[i].wp_min.x, sw[i].wp_min.y, wp.ptMinPosition.x, wp.ptMinPosition.y);
         }
 
-        if (wp.ptMaxPosition.x != sw[i].wp_max.x || wp.ptMaxPosition.y != sw[i].wp_max.y)
-        todo_wine
-        ok(wp.ptMaxPosition.x == sw[i].wp_max.x && wp.ptMaxPosition.y == sw[i].wp_max.y,
-           "expected %d,%d got %d,%d\n", sw[i].wp_max.x, sw[i].wp_max.y, wp.ptMaxPosition.x, wp.ptMaxPosition.y);
-        else
+        todo_wine_if(wp.ptMaxPosition.x != sw[i].wp_max.x || wp.ptMaxPosition.y != sw[i].wp_max.y)
         ok(wp.ptMaxPosition.x == sw[i].wp_max.x && wp.ptMaxPosition.y == sw[i].wp_max.y,
            "expected %d,%d got %d,%d\n", sw[i].wp_max.x, sw[i].wp_max.y, wp.ptMaxPosition.x, wp.ptMaxPosition.y);