Hans Leidekker : msi: Remove the unused CurrentlyScripting field from MSISCRIPT.

Alexandre Julliard julliard at winehq.org
Fri Jan 3 11:23:16 CST 2014


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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Fri Jan  3 15:01:23 2014 +0100

msi: Remove the unused CurrentlyScripting field from MSISCRIPT.

---

 dlls/msi/action.c  |    7 -------
 dlls/msi/msipriv.h |    1 -
 2 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index aab8c0f..73aae35 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -3178,8 +3178,6 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package )
 
 static UINT ACTION_InstallInitialize(MSIPACKAGE *package)
 {
-    package->script->CurrentlyScripting = TRUE;
-
     return ERROR_SUCCESS;
 }
 
@@ -5291,9 +5289,6 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package)
     UINT rc;
     WCHAR *remove;
 
-    /* turn off scheduling */
-    package->script->CurrentlyScripting= FALSE;
-
     /* first do the same as an InstallExecute */
     rc = ACTION_InstallExecute(package);
     if (rc != ERROR_SUCCESS)
@@ -7820,8 +7815,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
     else
         rc = ACTION_ProcessExecSequence(package, FALSE);
 
-    package->script->CurrentlyScripting = FALSE;
-
     /* process the ending type action */
     if (rc == ERROR_SUCCESS)
         ACTION_PerformActionSequence(package, -1);
diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h
index c597fe6..3780d48 100644
--- a/dlls/msi/msipriv.h
+++ b/dlls/msi/msipriv.h
@@ -686,7 +686,6 @@ typedef struct tagMSISCRIPT
     LPWSTR  *Actions[SCRIPT_MAX];
     UINT    ActionCount[SCRIPT_MAX];
     BOOL    ExecuteSequenceRun;
-    BOOL    CurrentlyScripting;
     UINT    InWhatSequence;
     LPWSTR  *UniqueActions;
     UINT    UniqueActionsCount;




More information about the wine-cvs mailing list