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

shell32.dll: Return SE_ERR_FNF if file not found before checking for associations.

Browse Source
This commit is contained in:
Paul Chitescu 2008-12-08 21:06:12 +02:00 committed by Alexandre Julliard
parent 23456b690f
commit cd616409ba
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/shell32/shlexec.c
View File

@ -588,6 +588,12 @@ static UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOpera
}
else
{
/* Did we get something? Anything? */
if (xlpFile[0]==0)
{
TRACE("Returning SE_ERR_FNF\n");
return SE_ERR_FNF;
}
/* First thing we need is the file's extension */
extension = strrchrW(xlpFile, '.'); /* Assume last "." is the one; */
/* File->Run in progman uses */

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

@ -627,8 +627,8 @@ typedef struct
static filename_tests_t filename_tests[]=
{
/* Test bad / nonexistent filenames */
{NULL, "%s\\nonexistent.shlexec", 0x11, SE_ERR_FNF},
{NULL, "%s\\nonexistent.noassoc", 0x11, SE_ERR_FNF},
{NULL, "%s\\nonexistent.shlexec", 0x0, SE_ERR_FNF},
{NULL, "%s\\nonexistent.noassoc", 0x0, SE_ERR_FNF},
/* Standard tests */
{NULL, "%s\\test file.shlexec", 0x0, 33},
@ -644,7 +644,7 @@ static filename_tests_t filename_tests[]=
{NULL, "%s\\test file.shlexec.noassoc", 0x0, SE_ERR_NOASSOC},
/* Test alternate verbs */
{"LowerL", "%s\\nonexistent.shlexec", 0x11, SE_ERR_FNF},
{"LowerL", "%s\\nonexistent.shlexec", 0x0, SE_ERR_FNF},
{"LowerL", "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC},
{"QuotedLowerL", "%s\\test file.shlexec", 0x0, 33},
@ -868,7 +868,7 @@ static void test_find_executable(void)
ok(rc > 32, "FindExecutable(%s) returned %d\n", filename, rc);
rc=(int)FindExecutableA("test file.sfe", NULL, command);
todo_wine ok(rc == SE_ERR_FNF, "FindExecutable(%s) returned %d\n", filename, rc);
ok(rc == SE_ERR_FNF, "FindExecutable(%s) returned %d\n", filename, rc);
delete_test_association(".sfe");