Commit 48908c13 authored by Hans Leidekker's avatar Hans Leidekker Committed by Alexandre Julliard

msi: Remove the unused CurrentlyScripting field from MSISCRIPT.

parent fcb924c1
...@@ -3178,8 +3178,6 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) ...@@ -3178,8 +3178,6 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package )
static UINT ACTION_InstallInitialize(MSIPACKAGE *package) static UINT ACTION_InstallInitialize(MSIPACKAGE *package)
{ {
package->script->CurrentlyScripting = TRUE;
return ERROR_SUCCESS; return ERROR_SUCCESS;
} }
...@@ -5291,9 +5289,6 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) ...@@ -5291,9 +5289,6 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package)
UINT rc; UINT rc;
WCHAR *remove; WCHAR *remove;
/* turn off scheduling */
package->script->CurrentlyScripting= FALSE;
/* first do the same as an InstallExecute */ /* first do the same as an InstallExecute */
rc = ACTION_InstallExecute(package); rc = ACTION_InstallExecute(package);
if (rc != ERROR_SUCCESS) if (rc != ERROR_SUCCESS)
...@@ -7820,8 +7815,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, ...@@ -7820,8 +7815,6 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
else else
rc = ACTION_ProcessExecSequence(package, FALSE); rc = ACTION_ProcessExecSequence(package, FALSE);
package->script->CurrentlyScripting = FALSE;
/* process the ending type action */ /* process the ending type action */
if (rc == ERROR_SUCCESS) if (rc == ERROR_SUCCESS)
ACTION_PerformActionSequence(package, -1); ACTION_PerformActionSequence(package, -1);
......
...@@ -686,7 +686,6 @@ typedef struct tagMSISCRIPT ...@@ -686,7 +686,6 @@ typedef struct tagMSISCRIPT
LPWSTR *Actions[SCRIPT_MAX]; LPWSTR *Actions[SCRIPT_MAX];
UINT ActionCount[SCRIPT_MAX]; UINT ActionCount[SCRIPT_MAX];
BOOL ExecuteSequenceRun; BOOL ExecuteSequenceRun;
BOOL CurrentlyScripting;
UINT InWhatSequence; UINT InWhatSequence;
LPWSTR *UniqueActions; LPWSTR *UniqueActions;
UINT UniqueActionsCount; UINT UniqueActionsCount;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment