diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 74d072f8ed2..163ddf8d0b7 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -964,6 +964,12 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU if (parent) { + if (!(GetFileAttributesW(parent) & FILE_ATTRIBUTE_DIRECTORY)) + { + PathRemoveFileSpecW(parent); + PathAddBackslashW(parent); + } + strcpyW(path, parent); strcatW(path, expanded); } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 9911bd1b883..cc2b04a501a 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7169,10 +7169,7 @@ static void test_appsearch_drlocator(void) sprintf(path, "%s\\one\\two\\three\\FileName2", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP7", 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\\FileName3.dll", CURR_DIR);