mirror of
https://github.com/reactos/reactos.git
synced 2024-07-06 20:55:16 +00:00
[USER32_WINETEST] Sync with Wine Staging 1.9.16. CORE-11866
svn path=/trunk/; revision=72254
This commit is contained in:
parent
088421e1ef
commit
fb9b36051a
|
@ -184,7 +184,7 @@ static int KbdMessage( KEV kev, WPARAM *pwParam, LPARAM *plParam )
|
||||||
if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */
|
if( TrackSysKey == VK_MENU || /* <ALT>-down/<ALT>-up sequence */
|
||||||
(VKey != VK_MENU)) /* <ALT>-down...<something else>-up */
|
(VKey != VK_MENU)) /* <ALT>-down...<something else>-up */
|
||||||
message = WM_SYSKEYUP;
|
message = WM_SYSKEYUP;
|
||||||
TrackSysKey = 0;
|
TrackSysKey = 0; /* FIXME */
|
||||||
}
|
}
|
||||||
InputKeyStateTable[VKey] &= ~0x80;
|
InputKeyStateTable[VKey] &= ~0x80;
|
||||||
flags |= KF_REPEAT | KF_UP;
|
flags |= KF_REPEAT | KF_UP;
|
||||||
|
@ -1768,7 +1768,9 @@ static void test_keyboard_layout_name(void)
|
||||||
char klid[KL_NAMELENGTH];
|
char klid[KL_NAMELENGTH];
|
||||||
|
|
||||||
if (0) /* crashes on native system */
|
if (0) /* crashes on native system */
|
||||||
|
{
|
||||||
ret = GetKeyboardLayoutNameA(NULL);
|
ret = GetKeyboardLayoutNameA(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
SetLastError(0xdeadbeef);
|
SetLastError(0xdeadbeef);
|
||||||
ret = GetKeyboardLayoutNameW(NULL);
|
ret = GetKeyboardLayoutNameW(NULL);
|
||||||
|
|
|
@ -3973,12 +3973,16 @@ static void test_AppendMenu(void)
|
||||||
ret = InsertMenuItemA(hmenu, 0, TRUE, &mii);
|
ret = InsertMenuItemA(hmenu, 0, TRUE, &mii);
|
||||||
ok(ret, "InsertMenuItem failed\n");
|
ok(ret, "InsertMenuItem failed\n");
|
||||||
if (0) /* FIXME: uncomment once Wine is fixed */
|
if (0) /* FIXME: uncomment once Wine is fixed */
|
||||||
|
{
|
||||||
check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED);
|
check_menu_items(hmenu, 206, MF_SEPARATOR, MFS_GRAYED);
|
||||||
|
}
|
||||||
mii.wID = 207;
|
mii.wID = 207;
|
||||||
ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);
|
ret = SetMenuItemInfoA(hmenu, 0, TRUE, &mii);
|
||||||
ok(ret, "SetMenuItemInfo failed\n");
|
ok(ret, "SetMenuItemInfo failed\n");
|
||||||
if (0) /* FIXME: uncomment once Wine is fixed */
|
if (0) /* FIXME: uncomment once Wine is fixed */
|
||||||
|
{
|
||||||
check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED);
|
check_menu_items(hmenu, 207, MF_SEPARATOR, MFS_GRAYED);
|
||||||
|
}
|
||||||
DestroyMenu(hmenu);
|
DestroyMenu(hmenu);
|
||||||
|
|
||||||
hbmp = CreateBitmap(1, 1, 1, 1, NULL);
|
hbmp = CreateBitmap(1, 1, 1, 1, NULL);
|
||||||
|
|
|
@ -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);
|
"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_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
|
|
||||||
ok(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);
|
"expected %d,%d got %d,%d\n", sw[i].wp_max.x, sw[i].wp_max.y, wp.ptMaxPosition.x, wp.ptMaxPosition.y);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue