reactos/wine
1
0
Fork 0
mirror of https://github.com/reactos/wine.git synced 2025-02-24 15:01:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

shell32/tests: Allow the short and long forms when checking a ShellExecute() path.

Browse Source 
ShellExecute() sometimes converts a short path to a long one so always accept the long form.
Windows XP SP1 often converts them to short paths instead but consider this behavior to be broken.

Signed-off-by: Francois Gouget <fgouget@free.fr>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francois Gouget 2016-02-08 05:30:31 +01:00 committed by Alexandre Julliard
parent bfc1244381
commit 5af9c123f6
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -425,13 +425,29 @@ static int StrCmpPath(const char* s1, const char* s2)
static void okChildPath_(const char* file, int line, const char* key, const char* expected)
{
char* result;
int equal, shortequal;
result=getChildString("Child", key);
if (!result)
{
okShell_(file,line)(FALSE, "%s expected '%s', but key not found or empty\n", key, expected);
return;
}
okShell_(file,line)(StrCmpPath(result, expected) == 0,
shortequal = FALSE;
equal = (StrCmpPath(result, expected) == 0);
if (!equal)
{
char altpath[MAX_PATH];
DWORD rc = GetLongPathNameA(expected, altpath, sizeof(altpath));
if (0 < rc && rc < sizeof(altpath))
equal = (StrCmpPath(result, altpath) == 0);
if (!equal)
{
rc = GetShortPathNameA(expected, altpath, sizeof(altpath));
if (0 < rc && rc < sizeof(altpath))
shortequal = (StrCmpPath(result, altpath) == 0);
}
}
okShell_(file,line)(equal || broken(shortequal) /* XP SP1 */,
"%s expected '%s', got '%s'\n", key, expected, result);
}
#define okChildPath(key, expected) okChildPath_(__FILE__, __LINE__, (key), (expected))