Module: wine Branch: master Commit: 7497f1ab5c8914e5c905feefedbb3f59b3adadc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7497f1ab5c8914e5c905feefed...
Author: James Hawkins jhawkins@codeweavers.com Date: Mon Oct 20 04:20:15 2008 -0500
msi: Don't get rid of the file signature when searching the DrLocator table.
---
dlls/msi/appsearch.c | 3 --- dlls/msi/tests/package.c | 10 ++-------- 2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c index e2f03c6..55bc472 100644 --- a/dlls/msi/appsearch.c +++ b/dlls/msi/appsearch.c @@ -917,9 +917,6 @@ static UINT ACTION_AppSearchDr(MSIPACKAGE *package, LPWSTR *appValue, MSISIGNATU
TRACE("%s\n", debugstr_w(sig->Name));
- msi_free(sig->File); - sig->File = NULL; - *appValue = NULL;
row = MSI_QueryGetRecord( package->db, query, sig->Name ); diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index e9a9bb0..288e227 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -7155,10 +7155,7 @@ static void test_appsearch_drlocator(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP4", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, ""), "Expected "", got "%s"\n", prop); - } + ok(!lstrcmpA(prop, ""), "Expected "", got "%s"\n", prop);
size = MAX_PATH; sprintf(path, "%s\one\two\three\FileName2", CURR_DIR); @@ -7206,10 +7203,7 @@ static void test_appsearch_drlocator(void) size = MAX_PATH; r = MsiGetPropertyA(hpkg, "SIGPROP10", prop, &size); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - todo_wine - { - ok(!lstrcmpA(prop, ""), "Expected "", got "%s"\n", prop); - } + ok(!lstrcmpA(prop, ""), "Expected "", got "%s"\n", prop);
DeleteFileA("FileName1"); DeleteFileA("FileName3.dll");