James Hawkins : msi: Only compare the file version if a version was specified.
Alexandre Julliard
julliard at winehq.org
Wed Oct 22 08:00:15 CDT 2008
Module: wine
Branch: master
Commit: f18c6ba28dc677934e7bd9776188759303ead278
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f18c6ba28dc677934e7bd9776188759303ead278
Author: James Hawkins <jhawkins at codeweavers.com>
Date: Tue Oct 21 16:13:40 2008 -0500
msi: Only compare the file version if a version was specified.
---
dlls/msi/appsearch.c | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/dlls/msi/appsearch.c b/dlls/msi/appsearch.c
index a9113c9..dc885bc 100644
--- a/dlls/msi/appsearch.c
+++ b/dlls/msi/appsearch.c
@@ -657,9 +657,10 @@ static UINT ACTION_FileVersionMatches(const MSISIGNATURE *sig, LPCWSTR filePath,
HIWORD(sig->MinVersionLS),
LOWORD(sig->MinVersionLS));
}
- else if (info->dwFileVersionMS > sig->MaxVersionMS
- || (info->dwFileVersionMS == sig->MaxVersionMS &&
- info->dwFileVersionLS > sig->MaxVersionLS))
+ else if ((sig->MaxVersionMS || sig->MaxVersionLS) &&
+ (info->dwFileVersionMS > sig->MaxVersionMS ||
+ (info->dwFileVersionMS == sig->MaxVersionMS &&
+ info->dwFileVersionLS > sig->MaxVersionLS)))
{
TRACE("Greater than maximum version %d.%d.%d.%d\n",
HIWORD(sig->MaxVersionMS),
More information about the wine-cvs
mailing list