[WINESYNC] msi: Store the current script in the package.

winesync · learn-more · commit 0d762dcba31c · 2022-03-20T19:27:54.000+01:00
Signed-off-by: Zebediah Figura &lt;z.figura12@gmail.com&gt;
Signed-off-by: Hans Leidekker &lt;hans@codeweavers.com&gt;
Signed-off-by: Alexandre Julliard &lt;julliard@winehq.org&gt;

wine commit id 756bbb5bb756d1fcbeea41e10a6fdf2149fa1323 by Zebediah Figura &lt;z.figura12@gmail.com&gt;
diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c
@@ -517,7 +517,7 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param)
         return ERROR_SUCCESS;
     }
 
-    rc = ACTION_PerformAction(package, action, SCRIPT_NONE);
+    rc = ACTION_PerformAction(package, action);
 
     msi_dialog_check_messages( NULL );
 
@@ -611,7 +611,7 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package)
 /********************************************************
  * ACTION helper functions and functions that perform the actions
  *******************************************************/
-static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script)
+static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action)
 {
     UINT arc;
     INT uirc;
@@ -620,7 +620,7 @@ static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT
     if (uirc == IDCANCEL)
         return ERROR_INSTALL_USEREXIT;
     ui_actioninfo(package, action, TRUE, 0);
-    arc = ACTION_CustomAction( package, action, script );
+    arc = ACTION_CustomAction(package, action);
     uirc = !arc;
 
     if (arc == ERROR_FUNCTION_NOT_CALLED && needs_ui_sequence(package))
@@ -1553,11 +1553,13 @@ static UINT execute_script( MSIPACKAGE *package, UINT script )
 
     TRACE("executing script %u\n", script);
 
+    package->script = script;
+
     if (script == SCRIPT_ROLLBACK)
     {
         for (i = package->script_actions_count[script]; i > 0; i--)
         {
-            rc = ACTION_PerformAction(package, package->script_actions[script][i-1], script);
+            rc = ACTION_PerformAction(package, package->script_actions[script][i-1]);
             if (rc != ERROR_SUCCESS)
             {
                 ERR("Execution of script %i halted; action %s returned %u\n",
@@ -1570,7 +1572,7 @@ static UINT execute_script( MSIPACKAGE *package, UINT script )
     {
         for (i = 0; i < package->script_actions_count[script]; i++)
         {
-            rc = ACTION_PerformAction(package, package->script_actions[script][i], script);
+            rc = ACTION_PerformAction(package, package->script_actions[script][i]);
             if (rc != ERROR_SUCCESS)
             {
                 ERR("Execution of script %i halted; action %s returned %u\n",
@@ -1579,6 +1581,9 @@ static UINT execute_script( MSIPACKAGE *package, UINT script )
             }
         }
     }
+
+    package->script = SCRIPT_NONE;
+
     msi_free_action_script(package, script);
     return rc;
 }
@@ -5686,7 +5691,7 @@ static UINT ACTION_ExecuteAction(MSIPACKAGE *package)
         msiobj_release(&uirow->hdr);
     }
     else
-        rc = ACTION_PerformAction(package, action, SCRIPT_NONE);
+        rc = ACTION_PerformAction(package, action);
 
     /* Send all set properties. */
     if (!MSI_OpenQuery(package->db, &view, prop_query))
@@ -7937,7 +7942,7 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action)
     return rc;
 }
 
-UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script)
+UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action)
 {
     UINT rc;
 
@@ -7947,7 +7952,7 @@ UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script)
     rc = ACTION_HandleStandardAction(package, action);
 
     if (rc == ERROR_FUNCTION_NOT_CALLED)
-        rc = ACTION_HandleCustomAction(package, action, script);
+        rc = ACTION_HandleCustomAction(package, action);
 
     if (rc == ERROR_FUNCTION_NOT_CALLED)
         WARN("unhandled msi action %s\n", debugstr_w(action));
@@ -8000,7 +8005,7 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
             return ERROR_FUNCTION_FAILED;
         }
 
-        rc = ACTION_PerformAction(package, action, SCRIPT_NONE);
+        rc = ACTION_PerformAction(package, action);
 
         msiobj_release(&row->hdr);
     }
@@ -8128,7 +8133,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,
         msi_set_property( package->db, szRollbackDisabled, szOne, -1 );
     }
 
-    rc = ACTION_PerformAction(package, action, SCRIPT_NONE);
+    rc = ACTION_PerformAction(package, action);
 
     /* process the ending type action */
     if (rc == ERROR_SUCCESS)
diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c
@@ -1209,7 +1209,7 @@ static UINT defer_custom_action( MSIPACKAGE *package, const WCHAR *action, UINT
     return ERROR_SUCCESS;
 }
 
-UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script )
+UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action)
 {
     static const WCHAR query[] = {
         'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',
@@ -1249,7 +1249,7 @@ UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script )
         if (type & msidbCustomActionTypeNoImpersonate)
             WARN("msidbCustomActionTypeNoImpersonate not handled\n");
 
-        if (!action_type_matches_script( type, script ))
+        if (!action_type_matches_script(type, package->script))
         {
             rc = defer_custom_action( package, action, type );
             goto end;
diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c
@@ -4380,7 +4380,7 @@ static UINT event_spawn_wait_dialog( msi_dialog *dialog, const WCHAR *argument )
 
 static UINT event_do_action( msi_dialog *dialog, const WCHAR *argument )
 {
-    ACTION_PerformAction( dialog->package, argument, SCRIPT_NONE );
+    ACTION_PerformAction(dialog->package, argument);
     return ERROR_SUCCESS;
 }
 
diff --git a/dll/win32/msi/install.c b/dll/win32/msi/install.c
@@ -83,7 +83,7 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction )
         return remote_DoAction(remote, szAction);
     }
  
-    ret = ACTION_PerformAction( package, szAction, SCRIPT_NONE );
+    ret = ACTION_PerformAction(package, szAction);
     msiobj_release( &package->hdr );
 
     return ret;
diff --git a/dll/win32/msi/msi.c b/dll/win32/msi/msi.c
@@ -3742,7 +3742,7 @@ UINT WINAPI MsiCollectUserInfoW(LPCWSTR szProduct)
     if (!package)
         return ERROR_CALL_NOT_IMPLEMENTED;
 
-    rc = ACTION_PerformAction(package, szFirstRun, SCRIPT_NONE);
+    rc = ACTION_PerformAction(package, szFirstRun);
     msiobj_release( &package->hdr );
 
     MsiCloseHandle(handle);
@@ -3768,7 +3768,7 @@ UINT WINAPI MsiCollectUserInfoA(LPCSTR szProduct)
     if (!package)
         return ERROR_CALL_NOT_IMPLEMENTED;
 
-    rc = ACTION_PerformAction(package, szFirstRun, SCRIPT_NONE);
+    rc = ACTION_PerformAction(package, szFirstRun);
     msiobj_release( &package->hdr );
 
     MsiCloseHandle(handle);
@@ -3849,7 +3849,7 @@ UINT WINAPI MsiConfigureFeatureW(LPCWSTR szProduct, LPCWSTR szFeature, INSTALLST
 
     MsiSetInternalUI( INSTALLUILEVEL_BASIC, NULL );
 
-    r = ACTION_PerformAction( package, szCostInitialize, SCRIPT_NONE );
+    r = ACTION_PerformAction(package, szCostInitialize);
     if (r != ERROR_SUCCESS)
         goto end;
 
diff --git a/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h
@@ -414,6 +414,7 @@ typedef struct tagMSIPACKAGE
     struct list mimes;
     struct list appids;
 
+    enum script script;
     LPWSTR *script_actions[SCRIPT_MAX];
     int    script_actions_count[SCRIPT_MAX];
     LPWSTR *unique_actions;
@@ -976,9 +977,9 @@ extern WCHAR *gszLogFile DECLSPEC_HIDDEN;
 extern HINSTANCE msi_hInstance DECLSPEC_HIDDEN;
 
 /* action related functions */
-extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action, UINT script) DECLSPEC_HIDDEN;
+extern UINT ACTION_PerformAction(MSIPACKAGE *package, const WCHAR *action) DECLSPEC_HIDDEN;
 extern void ACTION_FinishCustomActions( const MSIPACKAGE* package) DECLSPEC_HIDDEN;
-extern UINT ACTION_CustomAction(MSIPACKAGE *, const WCHAR *, UINT) DECLSPEC_HIDDEN;
+extern UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) DECLSPEC_HIDDEN;
 
 /* actions in other modules */
 extern UINT ACTION_AppSearch(MSIPACKAGE *package) DECLSPEC_HIDDEN;
diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c
@@ -1119,6 +1119,7 @@ MSIPACKAGE *MSI_CreatePackage( MSIDATABASE *db )
             msi_load_admin_properties( package );
 
         package->log_file = INVALID_HANDLE_VALUE;
+        package->script = SCRIPT_NONE;
     }
     return package;
 }

Original file line number	Diff line number	Diff line change
`@@ -517,7 +517,7 @@ static UINT ITERATE_Actions(MSIRECORD *row, LPVOID param)`
`517`	`517`	`return ERROR_SUCCESS;`
`518`	`518`	`}`
`519`	`519`
`520`		`- rc = ACTION_PerformAction(package, action, SCRIPT_NONE);`
	`520`	`+ rc = ACTION_PerformAction(package, action);`
`521`	`521`
`522`	`522`	`msi_dialog_check_messages( NULL );`
`523`	`523`
`@@ -611,7 +611,7 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package)`
`611`	`611`	`/********************************************************`
`612`	`612`	`* ACTION helper functions and functions that perform the actions`
`613`	`613`	`*******************************************************/`
`614`		`-static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT script)`
	`614`	`+static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action)`
`615`	`615`	`{`
`616`	`616`	`UINT arc;`
`617`	`617`	`INT uirc;`
`@@ -620,7 +620,7 @@ static UINT ACTION_HandleCustomAction(MSIPACKAGE *package, LPCWSTR action, UINT`
`620`	`620`	`if (uirc == IDCANCEL)`
`621`	`621`	`return ERROR_INSTALL_USEREXIT;`
`622`	`622`	`ui_actioninfo(package, action, TRUE, 0);`
`623`		`- arc = ACTION_CustomAction( package, action, script );`
	`623`	`+ arc = ACTION_CustomAction(package, action);`
`624`	`624`	`uirc = !arc;`
`625`	`625`
`626`	`626`	`if (arc == ERROR_FUNCTION_NOT_CALLED && needs_ui_sequence(package))`
`@@ -1553,11 +1553,13 @@ static UINT execute_script( MSIPACKAGE *package, UINT script )`
`1553`	`1553`
`1554`	`1554`	`TRACE("executing script %u\n", script);`
`1555`	`1555`
	`1556`	`+ package->script = script;`
	`1557`	`+`
`1556`	`1558`	`if (script == SCRIPT_ROLLBACK)`
`1557`	`1559`	`{`
`1558`	`1560`	`for (i = package->script_actions_count[script]; i > 0; i--)`
`1559`	`1561`	`{`
`1560`		`- rc = ACTION_PerformAction(package, package->script_actions[script][i-1], script);`
	`1562`	`+ rc = ACTION_PerformAction(package, package->script_actions[script][i-1]);`
`1561`	`1563`	`if (rc != ERROR_SUCCESS)`
`1562`	`1564`	`{`
`1563`	`1565`	`ERR("Execution of script %i halted; action %s returned %u\n",`
`@@ -1570,7 +1572,7 @@ static UINT execute_script( MSIPACKAGE *package, UINT script )`
`1570`	`1572`	`{`
`1571`	`1573`	`for (i = 0; i < package->script_actions_count[script]; i++)`
`1572`	`1574`	`{`
`1573`		`- rc = ACTION_PerformAction(package, package->script_actions[script][i], script);`
	`1575`	`+ rc = ACTION_PerformAction(package, package->script_actions[script][i]);`
`1574`	`1576`	`if (rc != ERROR_SUCCESS)`
`1575`	`1577`	`{`
`1576`	`1578`	`ERR("Execution of script %i halted; action %s returned %u\n",`
`@@ -1579,6 +1581,9 @@ static UINT execute_script( MSIPACKAGE *package, UINT script )`
`1579`	`1581`	`}`
`1580`	`1582`	`}`
`1581`	`1583`	`}`
	`1584`	`+`
	`1585`	`+ package->script = SCRIPT_NONE;`
	`1586`	`+`
`1582`	`1587`	`msi_free_action_script(package, script);`
`1583`	`1588`	`return rc;`
`1584`	`1589`	`}`
`@@ -5686,7 +5691,7 @@ static UINT ACTION_ExecuteAction(MSIPACKAGE *package)`
`5686`	`5691`	`msiobj_release(&uirow->hdr);`
`5687`	`5692`	`}`
`5688`	`5693`	`else`
`5689`		`- rc = ACTION_PerformAction(package, action, SCRIPT_NONE);`
	`5694`	`+ rc = ACTION_PerformAction(package, action);`
`5690`	`5695`
`5691`	`5696`	`/* Send all set properties. */`
`5692`	`5697`	`if (!MSI_OpenQuery(package->db, &view, prop_query))`
`@@ -7937,7 +7942,7 @@ static UINT ACTION_HandleStandardAction(MSIPACKAGE *package, LPCWSTR action)`
`7937`	`7942`	`return rc;`
`7938`	`7943`	`}`
`7939`	`7944`
`7940`		`-UINT ACTION_PerformAction(MSIPACKAGE package, const WCHAR action, UINT script)`
	`7945`	`+UINT ACTION_PerformAction(MSIPACKAGE package, const WCHAR action)`
`7941`	`7946`	`{`
`7942`	`7947`	`UINT rc;`
`7943`	`7948`
`@@ -7947,7 +7952,7 @@ UINT ACTION_PerformAction(MSIPACKAGE package, const WCHAR action, UINT script)`
`7947`	`7952`	`rc = ACTION_HandleStandardAction(package, action);`
`7948`	`7953`
`7949`	`7954`	`if (rc == ERROR_FUNCTION_NOT_CALLED)`
`7950`		`- rc = ACTION_HandleCustomAction(package, action, script);`
	`7955`	`+ rc = ACTION_HandleCustomAction(package, action);`
`7951`	`7956`
`7952`	`7957`	`if (rc == ERROR_FUNCTION_NOT_CALLED)`
`7953`	`7958`	`WARN("unhandled msi action %s\n", debugstr_w(action));`
`@@ -8000,7 +8005,7 @@ static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)`
`8000`	`8005`	`return ERROR_FUNCTION_FAILED;`
`8001`	`8006`	`}`
`8002`	`8007`
`8003`		`- rc = ACTION_PerformAction(package, action, SCRIPT_NONE);`
	`8008`	`+ rc = ACTION_PerformAction(package, action);`
`8004`	`8009`
`8005`	`8010`	`msiobj_release(&row->hdr);`
`8006`	`8011`	`}`
`@@ -8128,7 +8133,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath,`
`8128`	`8133`	`msi_set_property( package->db, szRollbackDisabled, szOne, -1 );`
`8129`	`8134`	`}`
`8130`	`8135`
`8131`		`- rc = ACTION_PerformAction(package, action, SCRIPT_NONE);`
	`8136`	`+ rc = ACTION_PerformAction(package, action);`
`8132`	`8137`
`8133`	`8138`	`/* process the ending type action */`
`8134`	`8139`	`if (rc == ERROR_SUCCESS)`
Original file line number	Diff line number	Diff line change
`@@ -1209,7 +1209,7 @@ static UINT defer_custom_action( MSIPACKAGE package, const WCHAR action, UINT`
`1209`	`1209`	`return ERROR_SUCCESS;`
`1210`	`1210`	`}`
`1211`	`1211`
`1212`		`-UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script )`
	`1212`	`+UINT ACTION_CustomAction(MSIPACKAGE package, const WCHAR action)`
`1213`	`1213`	`{`
`1214`	`1214`	`static const WCHAR query[] = {`
`1215`	`1215`	`'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',`
`@@ -1249,7 +1249,7 @@ UINT ACTION_CustomAction( MSIPACKAGE *package, LPCWSTR action, UINT script )`
`1249`	`1249`	`if (type & msidbCustomActionTypeNoImpersonate)`
`1250`	`1250`	`WARN("msidbCustomActionTypeNoImpersonate not handled\n");`
`1251`	`1251`
`1252`		`- if (!action_type_matches_script( type, script ))`
	`1252`	`+ if (!action_type_matches_script(type, package->script))`
`1253`	`1253`	`{`
`1254`	`1254`	`rc = defer_custom_action( package, action, type );`
`1255`	`1255`	`goto end;`
Original file line number	Diff line number	Diff line change
`@@ -4380,7 +4380,7 @@ static UINT event_spawn_wait_dialog( msi_dialog dialog, const WCHAR argument )`
`4380`	`4380`
`4381`	`4381`	`static UINT event_do_action( msi_dialog dialog, const WCHAR argument )`
`4382`	`4382`	`{`
`4383`		`- ACTION_PerformAction( dialog->package, argument, SCRIPT_NONE );`
	`4383`	`+ ACTION_PerformAction(dialog->package, argument);`
`4384`	`4384`	`return ERROR_SUCCESS;`
`4385`	`4385`	`}`
`4386`	`4386`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ UINT WINAPI MsiDoActionW( MSIHANDLE hInstall, LPCWSTR szAction )`
`83`	`83`	`return remote_DoAction(remote, szAction);`
`84`	`84`	`}`
`85`	`85`
`86`		`- ret = ACTION_PerformAction( package, szAction, SCRIPT_NONE );`
	`86`	`+ ret = ACTION_PerformAction(package, szAction);`
`87`	`87`	`msiobj_release( &package->hdr );`
`88`	`88`
`89`	`89`	`return ret;`
Original file line number	Diff line number	Diff line change
`@@ -1119,6 +1119,7 @@ MSIPACKAGE MSI_CreatePackage( MSIDATABASE db )`
`1119`	`1119`	`msi_load_admin_properties( package );`
`1120`	`1120`
`1121`	`1121`	`package->log_file = INVALID_HANDLE_VALUE;`
	`1122`	`+ package->script = SCRIPT_NONE;`
`1122`	`1123`	`}`
`1123`	`1124`	`return package;`
`1124`	`1125`	`}`