msi: Make sure to ignore UI level flags in dialog and files as well.
This commit is contained in:
parent
0b1fb44aaf
commit
d8b00a071d
|
@ -642,7 +642,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
|
|||
msi_apply_transforms( package );
|
||||
msi_apply_patches( package );
|
||||
|
||||
if ( (msi_get_property_int(package, szUILevel, 0) & 0xf) >= INSTALLUILEVEL_REDUCED )
|
||||
if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) >= INSTALLUILEVEL_REDUCED )
|
||||
{
|
||||
package->script->InWhatSequence |= SEQUENCE_UI;
|
||||
rc = ACTION_ProcessUISequence(package);
|
||||
|
|
|
@ -3542,7 +3542,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, szUILevel, 0) == INSTALLUILEVEL_NONE )
|
||||
if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE )
|
||||
return ERROR_SUCCESS;
|
||||
|
||||
if ( !error_dialog )
|
||||
|
|
|
@ -77,7 +77,7 @@ static UINT msi_change_media( MSIPACKAGE *package, struct media_info *mi )
|
|||
static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0};
|
||||
static const WCHAR error_prop[] = {'E','r','r','o','r','D','i','a','l','o','g',0};
|
||||
|
||||
if ( msi_get_property_int(package, szUILevel, 0) == INSTALLUILEVEL_NONE && !gUIHandlerA )
|
||||
if ( (msi_get_property_int(package, szUILevel, 0) & INSTALLUILEVEL_MASK) == INSTALLUILEVEL_NONE && !gUIHandlerA )
|
||||
return ERROR_SUCCESS;
|
||||
|
||||
error = generate_error_string( package, 1302, 1, mi->disk_prompt );
|
||||
|
|
|
@ -46,6 +46,9 @@
|
|||
#define MSIWORDCOUNT_ADMINISTRATIVE 0x0004
|
||||
#define MSIWORDCOUNT_PRIVILEGES 0x0008
|
||||
|
||||
/* Install UI level mask for AND operation to exclude flags */
|
||||
#define INSTALLUILEVEL_MASK 0x0007
|
||||
|
||||
#define MSITYPE_IS_BINARY(type) (((type) & ~MSITYPE_NULLABLE) == (MSITYPE_STRING|MSITYPE_VALID))
|
||||
|
||||
struct tagMSITABLE;
|
||||
|
|
Loading…
Reference in New Issue