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

shell32/tests: Move a file URL test to test_fileurl(). 

This way it's integrated with the rest of the matching tests and skipped
on plaforms where file URLs don't work right (old Windows XP versions).

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2016-03-20 07:14:49 +01:00 committed by Alexandre Julliard
parent 11d77e51d5
commit e7065e0c51
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/shell32/tests/shlexec.c
View File

@ -1818,6 +1818,9 @@ static fileurl_tests_t fileurl_tests[]=
/* Test shortcuts vs. URLs */ /* Test shortcuts vs. URLs */
{"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d}, {"file://///", "%s\\test_shortcut_shlexec.lnk", 0, 0x1d},
/* Confuse things by mixing protocols */
{"file://", "shlproto://foo/bar", USE_COLON, 0},
{NULL, NULL, 0, 0} {NULL, NULL, 0, 0}
}; };
@ -1989,10 +1992,6 @@ static void test_urls(void)
todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc); todo_wine ok(rc == SE_ERR_FNF, "%s returned %lu\n", shell_call, rc);
SetEnvironmentVariableA("urlprefix", NULL); SetEnvironmentVariableA("urlprefix", NULL);
/* Try to confuse ShellExecute() by mixing protocols */
rc = shell_execute(NULL, "file://shlproto://foo/bar", NULL, NULL);
ok(rc == SE_ERR_FNF || rc == SE_ERR_PNF, "%s returned %lu\n", shell_call, rc);
delete_test_class("fakeproto"); delete_test_class("fakeproto");
delete_test_class("shlpaverb"); delete_test_class("shlpaverb");
} }