ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

shell32/tests: Remove win9x hacks.

Browse Source
This commit is contained in:
Austin English 2011-02-24 15:40:28 -08:00 committed by Alexandre Julliard
parent b651dcdb6b
commit d710056e4d
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dlls/shell32/tests/systray.c
View File

@ -45,19 +45,15 @@ static void test_cbsize(void)
nidW.hIcon = LoadIcon(NULL, IDI_APPLICATION); nidW.hIcon = LoadIcon(NULL, IDI_APPLICATION);
nidW.uCallbackMessage = WM_USER+17; nidW.uCallbackMessage = WM_USER+17;
ret = pShell_NotifyIconW(NIM_ADD, &nidW); ret = pShell_NotifyIconW(NIM_ADD, &nidW);
if (ret) /* using an invalid cbSize does work */
{ nidW.cbSize = 3;
/* using an invalid cbSize does work */ nidW.hWnd = hMainWnd;
nidW.cbSize = 3; nidW.uID = 1;
nidW.hWnd = hMainWnd; ret = pShell_NotifyIconW(NIM_DELETE, &nidW);
nidW.uID = 1; ok( ret || broken(!ret), /* nt4 */ "NIM_DELETE failed!\n");
ret = pShell_NotifyIconW(NIM_DELETE, &nidW); /* as icon doesn't exist anymore - now there will be an error */
ok( ret || broken(!ret), /* nt4 */ "NIM_DELETE failed!\n"); nidW.cbSize = sizeof(nidW);
/* as icon doesn't exist anymore - now there will be an error */ ok(!pShell_NotifyIconW(NIM_DELETE, &nidW) != !ret, "The icon was not deleted\n");
nidW.cbSize = sizeof(nidW);
ok(!pShell_NotifyIconW(NIM_DELETE, &nidW) != !ret, "The icon was not deleted\n");
}
else win_skip( "Shell_NotifyIconW not working\n" ); /* win9x */
} }
/* same for Shell_NotifyIconA */ /* same for Shell_NotifyIconA */
@ -75,7 +71,7 @@ static void test_cbsize(void)
nidA.hWnd = hMainWnd; nidA.hWnd = hMainWnd;
nidA.uID = 1; nidA.uID = 1;
ret = Shell_NotifyIconA(NIM_DELETE, &nidA); ret = Shell_NotifyIconA(NIM_DELETE, &nidA);
ok( ret || broken(!ret), /* win9x */ "NIM_DELETE failed!\n"); ok(ret, "NIM_DELETE failed!\n");
/* as icon doesn't exist anymore - now there will be an error */ /* as icon doesn't exist anymore - now there will be an error */
nidA.cbSize = sizeof(nidA); nidA.cbSize = sizeof(nidA);
ok(!Shell_NotifyIconA(NIM_DELETE, &nidA) != !ret, "The icon was not deleted\n"); ok(!Shell_NotifyIconA(NIM_DELETE, &nidA) != !ret, "The icon was not deleted\n");