msi: Fix ACTION_AppSearchDr on empty path.

[Nicolas Le Cam]

---
 dlls/msi/appsearch.c     |    7 +++++--
 dlls/msi/tests/package.c |    1 -
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
index 7a74810..cdf72df 100644
--- a/dlls/msi/appsearch.c
+++ b/dlls/msi/appsearch.c
@@ -967,7 +967,10 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU
     else
         depth = MSI_RecordGetInteger(row,4);
 
-    ACTION_ExpandAnyPath(package, path, expanded, MAX_PATH);
+    if (sz)
+        ACTION_ExpandAnyPath(package, path, expanded, MAX_PATH);
+    else
+        strcpyW(expanded, path);
 
     if (parent)
     {
@@ -982,7 +985,7 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU
         strcpyW(path, parent);
         strcatW(path, expanded);
     }
-    else
+    else if (sz)
         strcpyW(path, expanded);
 
     PathAddBackslashW(path);
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index d55895d..822667c 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -8794,7 +8794,6 @@ static void test_appsearch_drlocator(void)
     }
     r = MsiGetPropertyA(hpkg, "SIGPROP11", 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);
 
     DeleteFileA("FileName1");
-- 
1.6.0.4


--=-RFNblT5Y49oUskHp6RIg--