Hans Leidekker : msi: Rename the need_reboot flag to need_reboot_at_end.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 89c80c41ea708e1497c2d88b9673cf4d54d538ac
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=89c80c41ea708e1497c2d88b96...

Author: Hans Leidekker 
Date:   Mon Apr  2 13:15:16 2012 +0200

msi: Rename the need_reboot flag to need_reboot_at_end.

---

dlls/msi/action.c  |    4 ++--
 dlls/msi/files.c   |    2 +-
 dlls/msi/install.c |    4 ++--
 dlls/msi/media.c   |    2 +-
 dlls/msi/msipriv.h |    2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 8abf456..5ecf8a5 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 e3a12c3..6edf781 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 83b8b7d..d78e604 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 dd5ecd6..9a01277 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 cd16baf..bf15f50 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;