James Hawkins : msi: Fix a copy and paste error.
Alexandre Julliard
julliard at winehq.org
Mon Oct 20 08:00:57 CDT 2008
Module: wine
Branch: master
Commit: 6df69c6aaa202a9a43acd1f0539a3d975aac2bc9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df69c6aaa202a9a43acd1f0539a3d975aac2bc9
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Mon Oct 20 04:20:40 2008 -0500
msi: Fix a copy and paste error.
---
dlls/msi/appsearch.c | 8 ++++----
dlls/msi/tests/package.c | 5 +----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
index 163ddf8..1679d80 100644
--- a/dlls/msi/appsearch.c
+++ b/dlls/msi/appsearch.c
@@ -651,11 +651,11 @@ static UINT ACTION_FileVersionMatches(const MSISIGNATURE *sig, LPCWSTR filePath,
HIWORD(sig->MinVersionLS),
LOWORD(sig->MinVersionLS));
}
- else if (info->dwFileVersionMS < sig->MinVersionMS
- || (info->dwFileVersionMS == sig->MinVersionMS &&
- info->dwFileVersionLS < sig->MinVersionLS))
+ else if (info->dwFileVersionMS > sig->MaxVersionMS
+ || (info->dwFileVersionMS == sig->MaxVersionMS &&
+ info->dwFileVersionLS > sig->MaxVersionLS))
{
- TRACE("Greater than minimum version %d.%d.%d.%d\n",
+ TRACE("Greater than maximum version %d.%d.%d.%d\n",
HIWORD(sig->MaxVersionMS),
LOWORD(sig->MaxVersionMS),
HIWORD(sig->MaxVersionLS),
diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c
index cc2b04a..0e7a821 100644
--- a/dlls/msi/tests/package.c
+++ b/dlls/msi/tests/package.c
@@ -7180,10 +7180,7 @@ static void test_appsearch_drlocator(void)
size = MAX_PATH;
r = MsiGetPropertyA(hpkg, "SIGPROP9", 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;
r = MsiGetPropertyA(hpkg, "SIGPROP10", prop, &size);
More information about the wine-cvs
mailing list