Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-22 16:36:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
svn path=/trunk/; revision=71847
This commit is contained in:
James Tabor 2016-07-07 15:37:02 +00:00
parent eaef5b9f37
commit 60370b0622
2 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
rostests/winetests/user32/menu.c
View file

@ -819,7 +819,7 @@ static void test_menu_ownerdraw(void)
ok( MOD_rc[0].right - MOD_rc[0].left == 2 * MOD_avec + MOD_SIZE,
"width of owner drawn menu item is wrong. Got %d expected %d\n",
MOD_rc[0].right - MOD_rc[0].left , 2*MOD_avec + MOD_SIZE);
/* test hight */
/* test height */
ok( MOD_rc[0].bottom - MOD_rc[0].top == GetSystemMetrics( SM_CYMENU) - 1,
"Height of owner drawn menu item is wrong. Got %d expected %d\n",
MOD_rc[0].bottom - MOD_rc[0].top, GetSystemMetrics( SM_CYMENU) - 1);
@ -3820,25 +3820,25 @@ static void test_emptypopup(void)
ok(gflag_initmenupopup == 1, "got %i\n", gflag_initmenupopup);
ok(gflag_entermenuloop == 1, "got %i\n", gflag_entermenuloop);
ok(gflag_initmenu == 1, "got %i\n", gflag_initmenu);
todo_wine ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu);
ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu);
todo_wine ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp);
todo_wine ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp);
ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp);
ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp);
gflag_initmenupopup = gflag_entermenuloop = gflag_initmenu = gflag_enteridle = 0;
selectitem_wp = 0xdeadbeef;
selectitem_lp = 0xdeadbeef;
ret = TrackPopupMenu( hmenu, 0, 100,100, 0, hwnd, NULL);
todo_wine ok(ret == 0, "got %i\n", ret);
ok(ret == 0, "got %i\n", ret);
ok(gflag_initmenupopup == 1, "got %i\n", gflag_initmenupopup);
ok(gflag_entermenuloop == 1, "got %i\n", gflag_entermenuloop);
ok(gflag_initmenu == 1, "got %i\n", gflag_initmenu);
todo_wine ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu);
ok(gflag_enteridle == 0, "got %i\n", gflag_initmenu);
todo_wine ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp);
todo_wine ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp);
ok(selectitem_wp == 0xdeadbeef, "got %lx\n", selectitem_wp);
ok(selectitem_lp == 0xdeadbeef, "got %lx\n", selectitem_lp);
SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)menu_fill_in_init);

10
rostests/winetests/user32/winstation.c
View file

@ -114,6 +114,8 @@ static void test_handles(void)
DWORD id, flags, le;
ATOM atom;
char buffer[20];
DWORD size;
BOOL ret;
/* win stations */
@ -215,6 +217,12 @@ static void test_handles(void)
w2 = CreateWindowStationA( "", 0, WINSTA_ALL_ACCESS, NULL );
ok( w2 != 0, "create station failed err %u\n", GetLastError() );
memset( buffer, 0, sizeof(buffer) );
ret = GetUserObjectInformationA( w2, UOI_NAME, buffer, sizeof(buffer), &size );
ok( ret, "GetUserObjectInformationA failed with error %u\n", GetLastError() );
ok( !memcmp(buffer, "Service-0x0-", 12), "unexpected window station name '%s'\n", buffer );
ok( buffer[strlen(buffer) - 1] == '$', "unexpected window station name '%s'\n", buffer );
SetLastError( 0xdeadbeef );
w3 = OpenWindowStationA( "", TRUE, WINSTA_ALL_ACCESS );
todo_wine
@ -276,7 +284,7 @@ static void test_handles(void)
SetLastError( 0xdeadbeef );
d2 = OpenDesktopA( "", 0, TRUE, DESKTOP_ALL_ACCESS );
ok( !d2, "open mepty desktop succeeded\n" );
ok( !d2, "open empty desktop succeeded\n" );
ok( GetLastError() == ERROR_INVALID_HANDLE, "wrong error %u\n", GetLastError() );
SetLastError( 0xdeadbeef );