diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 8abf456de62..5ecf8a5dfd6 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6883,7 +6883,7 @@ static UINT ACTION_ValidateProductID( MSIPACKAGE *package ) static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) { TRACE("\n"); - package->need_reboot = 1; + package->need_reboot_at_end = 1; return ERROR_SUCCESS; } @@ -7508,7 +7508,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, } msi_free( reinstall ); - if (rc == ERROR_SUCCESS && package->need_reboot) + if (rc == ERROR_SUCCESS && package->need_reboot_at_end) return ERROR_SUCCESS_REBOOT_REQUIRED; return rc; diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e3a12c30d65..6edf781300b 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -215,7 +215,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source) MoveFileExW(tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) { file->state = msifs_installed; - package->need_reboot = 1; + package->need_reboot_at_end = 1; gle = ERROR_SUCCESS; } else diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 83b8b7d1738..d78e604deda 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -761,7 +761,7 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) break; case MSIRUNMODE_REBOOTATEND: - r = package->need_reboot; + r = package->need_reboot_at_end; break; case MSIRUNMODE_LOGENABLED: @@ -814,7 +814,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState) switch (iRunMode) { case MSIRUNMODE_REBOOTATEND: - package->need_reboot = 1; + package->need_reboot_at_end = 1; r = ERROR_SUCCESS; break; diff --git a/dlls/msi/media.c b/dlls/msi/media.c index dd5ecd6281a..9a012771c95 100644 --- a/dlls/msi/media.c +++ b/dlls/msi/media.c @@ -477,7 +477,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint, MoveFileExW(path, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && MoveFileExW(tmpfileW, path, MOVEFILE_DELAY_UNTIL_REBOOT)) { - data->package->need_reboot = 1; + data->package->need_reboot_at_end = 1; } else { diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index cd16baf27fb..bf15f509b18 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -406,7 +406,7 @@ typedef struct tagMSIPACKAGE unsigned char scheduled_action_running : 1; unsigned char commit_action_running : 1; unsigned char rollback_action_running : 1; - unsigned char need_reboot : 1; + unsigned char need_reboot_at_end : 1; unsigned char need_rollback : 1; } MSIPACKAGE;