[PATCH 2/7] msi: Simplify message type processing.
Zebediah Figura
z.figura12 at gmail.com
Tue Sep 12 20:51:17 CDT 2017
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
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 4716461320..3673069c8a 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 {
--
2.14.1
More information about the wine-patches
mailing list