From 9b2b760ea91708e021c4c78d378258267ee53289 Mon Sep 17 00:00:00 2001 From: Hans Leidekker Date: Thu, 22 Mar 2012 11:02:06 +0100 Subject: [PATCH] msi: Get the UI level from the global variable instead of the property. --- dlls/msi/action.c | 3 +-- dlls/msi/dialog.c | 3 +-- dlls/msi/media.c | 5 ++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 16e2186e92f..8abf456de62 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -480,8 +480,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) static BOOL needs_ui_sequence(MSIPACKAGE *package) { - INT level = msi_get_property_int(package->db, szUILevel, 0); - return (level & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; + return (gUILevel & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED; } UINT msi_set_context(MSIPACKAGE *package) diff --git a/dlls/msi/dialog.c b/dlls/msi/dialog.c index 4e908ff0d4f..04a4a6bd1a6 100644 --- a/dlls/msi/dialog.c +++ b/dlls/msi/dialog.c @@ -3978,8 +3978,7 @@ UINT msi_spawn_error_dialog( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR er 'M','S','I','E','r','r','o','r','D','i','a','l','o','g','R','e','s','u','l','t',0 }; - if ( (msi_get_property_int( package->db, szUILevel, 0 ) & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE ) - return ERROR_SUCCESS; + if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE) return ERROR_SUCCESS; if ( !error_dialog ) { diff --git a/dlls/msi/media.c b/dlls/msi/media.c index 0199178b012..dd5ecd6281a 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -77,9 +77,8 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0}; - if ((msi_get_property_int(package->db, szUILevel, 0) & INSTALLUILEVEL_MASK) == - INSTALLUILEVEL_NONE && !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) - return ERROR_SUCCESS; + if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE && + !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) return ERROR_SUCCESS; error = msi_build_error_string(package, 1302, 1, mi->disk_prompt); error_dialog = msi_dup_property(package->db, error_prop);