Commit 9b2b760e authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

msi: Get the UI level from the global variable instead of the property.

parent 673377a7
...@@ -480,8 +480,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) ...@@ -480,8 +480,7 @@ UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace)
static BOOL needs_ui_sequence(MSIPACKAGE *package) static BOOL needs_ui_sequence(MSIPACKAGE *package)
{ {
INT level = msi_get_property_int(package->db, szUILevel, 0); return (gUILevel & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED;
return (level & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED;
} }
UINT msi_set_context(MSIPACKAGE *package) UINT msi_set_context(MSIPACKAGE *package)
......
...@@ -3978,8 +3978,7 @@ UINT msi_spawn_error_dialog( MSIPACKAGE *package, LPWSTR error_dialog, LPWSTR er ...@@ -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 '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 ) if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE) return ERROR_SUCCESS;
return ERROR_SUCCESS;
if ( !error_dialog ) if ( !error_dialog )
{ {
......
...@@ -77,9 +77,8 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) ...@@ -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}; 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) == if ((gUILevel & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE &&
INSTALLUILEVEL_NONE && !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) !gUIHandlerA && !gUIHandlerW && !gUIHandlerRecord) return ERROR_SUCCESS;
return ERROR_SUCCESS;
error = msi_build_error_string(package, 1302, 1, mi->disk_prompt); error = msi_build_error_string(package, 1302, 1, mi->disk_prompt);
error_dialog = msi_dup_property(package->db, error_prop); error_dialog = msi_dup_property(package->db, error_prop);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment