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

shell32: Fix FindExecutable() to return the executable path, not the whole command.

This commit is contained in:
Francois Gouget 2006-12-13 18:06:45 +01:00 committed by Alexandre Julliard
parent 65b81bebaa
commit 71e5f3c116
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dlls/shell32/shlexec.c
View File

@ -707,6 +707,16 @@ UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
}
*p = '\0';
}
else
{
/* Truncate on first space, like Windows:
* http://support.microsoft.com/?scid=kb%3Ben-us%3B140724
*/
WCHAR *p = lpResult;
while (*p != ' ' && *p != '\0')
p++;
*p='\0';
}
}
}
else /* Check win.ini */

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

@ -498,24 +498,24 @@ static filename_tests_t filename_tests[]=
{NULL, "%s\\nonexistent.noassoc", 0x11, SE_ERR_FNF},
/* Standard tests */
{NULL, "%s\\test file.shlexec", 0x20, 33},
{NULL, "%s\\test file.shlexec.", 0x20, 33},
{NULL, "%s\\%%nasty%% $file.shlexec", 0x20, 33},
{NULL, "%s/test file.shlexec", 0x20, 33},
{NULL, "%s\\test file.shlexec", 0x0, 33},
{NULL, "%s\\test file.shlexec.", 0x0, 33},
{NULL, "%s\\%%nasty%% $file.shlexec", 0x0, 33},
{NULL, "%s/test file.shlexec", 0x0, 33},
/* Test filenames with no association */
{NULL, "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC},
/* Test double extensions */
{NULL, "%s\\test file.noassoc.shlexec", 0x20, 33},
{NULL, "%s\\test file.noassoc.shlexec", 0x0, 33},
{NULL, "%s\\test file.shlexec.noassoc", 0x0, SE_ERR_NOASSOC},
/* Test alternate verbs */
{"LowerL", "%s\\nonexistent.shlexec", 0x11, SE_ERR_FNF},
{"LowerL", "%s\\test file.noassoc", 0x0, SE_ERR_NOASSOC},
{"QuotedLowerL", "%s\\test file.shlexec", 0x20, 33},
{"QuotedUpperL", "%s\\test file.shlexec", 0x20, 33},
{"QuotedLowerL", "%s\\test file.shlexec", 0x0, 33},
{"QuotedUpperL", "%s\\test file.shlexec", 0x0, 33},
{NULL, NULL, 0}
};