[ros-diffs] [akhaldi] 72254: [USER32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

Author: akhaldi
Date: Thu Aug 18 09:26:41 2016
New Revision: 72254

URL: http://svn.reactos.org/svn/reactos?rev=72254&view=rev
Log:
[USER32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866

Modified:
    trunk/rostests/winetests/user32/input.c
    trunk/rostests/winetests/user32/menu.c
    trunk/rostests/winetests/user32/msg.c

Modified: trunk/rostests/winetests/user32/input.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/input.c?r...
==============================================================================
--- trunk/rostests/winetests/user32/input.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/input.c	[iso-8859-1] Thu Aug 18 09:26:41 2016
@@ -184,7 +184,7 @@
             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 @@
     char klid[KL_NAMELENGTH];

if (0) /* crashes on native system */
+{
     ret = GetKeyboardLayoutNameA(NULL);
+}

SetLastError(0xdeadbeef);
     ret = GetKeyboardLayoutNameW(NULL);

Modified: trunk/rostests/winetests/user32/menu.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/menu.c?re...
==============================================================================
--- trunk/rostests/winetests/user32/menu.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/menu.c	[iso-8859-1] Thu Aug 18 09:26:41 2016
@@ -3973,12 +3973,16 @@
     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);

Modified: trunk/rostests/winetests/user32/msg.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/user32/msg.c?rev...
==============================================================================
--- trunk/rostests/winetests/user32/msg.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/user32/msg.c	[iso-8859-1] Thu Aug 18 09:26:41 2016
@@ -12190,11 +12190,7 @@
                "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);