msi: Append the file signature to the component's directory when searching for the component's key path.

This commit is contained in:
James Hawkins 2008-10-13 03:57:36 -05:00 committed by Alexandre Julliard
parent 701c2a2728
commit 65915af1ae
2 changed files with 10 additions and 4 deletions

View File

@ -225,6 +225,15 @@ static UINT ACTION_AppSearchComponents(MSIPACKAGE *package, LPWSTR *appValue, MS
*appValue = strdupW(path);
}
else if (sigpresent)
{
PathAddBackslashW(path);
lstrcatW(path, MSI_RecordGetString(rec, 2));
attr = GetFileAttributesW(path);
if (attr != INVALID_FILE_ATTRIBUTES && attr != FILE_ATTRIBUTE_DIRECTORY)
*appValue = strdupW(path);
}
done:
if (rec) msiobj_release(&rec->hdr);

View File

@ -5963,10 +5963,7 @@ static void test_appsearch_complocator(void)
sprintf(path, "%s\\FileName5", CURR_DIR);
r = MsiGetPropertyA(hpkg, "SIGPROP5", prop, &size);
ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r);
todo_wine
{
ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop);
}
ok(!lstrcmpA(prop, path), "Expected \"%s\", got \"%s\"\n", path, prop);
size = MAX_PATH;
sprintf(path, "%s\\", CURR_DIR);