ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

msi: Rename the need_reboot flag to need_reboot_at_end.

This commit is contained in:
Hans Leidekker 2012-04-02 13:15:16 +02:00 committed by Alexandre Julliard
parent 4f60ddceb1
commit 89c80c41ea
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/msi/action.c
View File

@ -6883,7 +6883,7 @@ static UINT ACTION_ValidateProductID( MSIPACKAGE *package )
static UINT ACTION_ScheduleReboot( MSIPACKAGE *package ) static UINT ACTION_ScheduleReboot( MSIPACKAGE *package )
{ {
TRACE("\n"); TRACE("\n");
package->need_reboot = 1; package->need_reboot_at_end = 1;
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
@ -7508,7 +7508,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
} }
msi_free( reinstall ); 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 ERROR_SUCCESS_REBOOT_REQUIRED;
return rc; return rc;

2
dlls/msi/files.c
View File

@ -215,7 +215,7 @@ static UINT copy_install_file(MSIPACKAGE *package, MSIFILE *file, LPWSTR source)
MoveFileExW(tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT)) MoveFileExW(tmpfileW, file->TargetPath, MOVEFILE_DELAY_UNTIL_REBOOT))
{ {
file->state = msifs_installed; file->state = msifs_installed;
package->need_reboot = 1; package->need_reboot_at_end = 1;
gle = ERROR_SUCCESS; gle = ERROR_SUCCESS;
} }
else else

4
dlls/msi/install.c
View File

@ -761,7 +761,7 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode)
break; break;
case MSIRUNMODE_REBOOTATEND: case MSIRUNMODE_REBOOTATEND:
r = package->need_reboot; r = package->need_reboot_at_end;
break; break;
case MSIRUNMODE_LOGENABLED: case MSIRUNMODE_LOGENABLED:
@ -814,7 +814,7 @@ UINT WINAPI MsiSetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode, BOOL fState)
switch (iRunMode) switch (iRunMode)
{ {
case MSIRUNMODE_REBOOTATEND: case MSIRUNMODE_REBOOTATEND:
package->need_reboot = 1; package->need_reboot_at_end = 1;
r = ERROR_SUCCESS; r = ERROR_SUCCESS;
break; break;

2
dlls/msi/media.c
View File

@ -477,7 +477,7 @@ static INT_PTR cabinet_copy_file(FDINOTIFICATIONTYPE fdint,
MoveFileExW(path, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) && MoveFileExW(path, NULL, MOVEFILE_DELAY_UNTIL_REBOOT) &&
MoveFileExW(tmpfileW, path, MOVEFILE_DELAY_UNTIL_REBOOT)) MoveFileExW(tmpfileW, path, MOVEFILE_DELAY_UNTIL_REBOOT))
{ {
data->package->need_reboot = 1; data->package->need_reboot_at_end = 1;
} }
else else
{ {

2
dlls/msi/msipriv.h
View File

@ -406,7 +406,7 @@ typedef struct tagMSIPACKAGE
unsigned char scheduled_action_running : 1; unsigned char scheduled_action_running : 1;
unsigned char commit_action_running : 1; unsigned char commit_action_running : 1;
unsigned char rollback_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; unsigned char need_rollback : 1;
} MSIPACKAGE; } MSIPACKAGE;