Module: wine Branch: master Commit: 29c0836fcc7b3c7ea99f3cb1d5b2f30007a99b54 URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c0836fcc7b3c7ea99f3cb1d5... Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Oct 20 04:20:06 2008 -0500 msi: Handle searching for directories in the IniLocator part of the AppSearch action. --- dlls/msi/appsearch.c | 2 +- dlls/msi/tests/package.c | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index 6d92886..d72edda 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -539,7 +539,7 @@ static UINT ACTION_AppSearchIni(MSIPACKAGE *package, LPWSTR *appValue, switch (type & 0x0f) { case msidbLocatorTypeDirectory: - FIXME("unimplemented for Directory (%s)\n", debugstr_w(buf)); + ACTION_SearchDirectory(package, sig, buf, 0, appValue); break; case msidbLocatorTypeFileName: *appValue = app_search_file(buf, sig); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index a243957..e9a9bb0 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6935,10 +6935,7 @@ static void test_appsearch_inilocator(void) sprintf(path, "%s\\", CURR_DIR); r = MsiGetPropertyA(hpkg, "SIGPROP6", 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);