Zebediah Figura : msi: Simplify message type processing.
Alexandre Julliard
julliard at winehq.org
Wed Sep 13 14:47:03 CDT 2017
Module: wine
Branch: master
Commit: d17fda090d26c27a728afbe61cf39d47596e3af7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d17fda090d26c27a728afbe61cf39d47596e3af7
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Sep 12 20:51:17 2017 -0500
msi: Simplify message type processing.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Hans Leidekker <hans at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/msi/package.c | 32 ++------------------------------
1 file changed, 2 insertions(+), 30 deletions(-)
diff --git a/dlls/msi/package.c b/dlls/msi/package.c
index 4716461..3673069 100644
--- a/dlls/msi/package.c
+++ b/dlls/msi/package.c
@@ -1884,7 +1884,8 @@ LPWSTR msi_get_error_message(MSIDATABASE *db, int error)
INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, MSIRECORD *record)
{
LPWSTR message = {0};
- DWORD len, log_type = 0;
+ DWORD len;
+ DWORD log_type = 1 << (eMessageType >> 24);
UINT res;
INT rc = 0;
char *msg;
@@ -1892,35 +1893,6 @@ INT MSI_ProcessMessageVerbatim(MSIPACKAGE *package, INSTALLMESSAGE eMessageType,
TRACE("%x\n", eMessageType);
if (TRACE_ON(msi)) dump_record(record);
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_FATALEXIT)
- log_type |= INSTALLLOGMODE_FATALEXIT;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ERROR)
- log_type |= INSTALLLOGMODE_ERROR;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_WARNING)
- log_type |= INSTALLLOGMODE_WARNING;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_USER)
- log_type |= INSTALLLOGMODE_USER;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_INFO)
- log_type |= INSTALLLOGMODE_INFO;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_RESOLVESOURCE)
- log_type |= INSTALLLOGMODE_RESOLVESOURCE;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_OUTOFDISKSPACE)
- log_type |= INSTALLLOGMODE_OUTOFDISKSPACE;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_COMMONDATA)
- log_type |= INSTALLLOGMODE_COMMONDATA;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONSTART)
- log_type |= INSTALLLOGMODE_ACTIONSTART;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ACTIONDATA)
- log_type |= INSTALLLOGMODE_ACTIONDATA;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_PROGRESS)
- log_type |= INSTALLLOGMODE_PROGRESS;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_INITIALIZE)
- log_type |= INSTALLLOGMODE_INITIALIZE;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_TERMINATE)
- log_type |= INSTALLLOGMODE_TERMINATE;
- if ((eMessageType & 0xff000000) == INSTALLMESSAGE_SHOWDIALOG)
- log_type |= INSTALLLOGMODE_SHOWDIALOG;
-
if (!package || !record)
message = NULL;
else {
More information about the wine-cvs
mailing list