commit f8f64406fc468532fbec6c99ee0b345c7f49f30f
author Aric Stewart <aric@codeweavers.com> Thu Mar 24 19:03:45 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Thu Mar 24 19:03:45 2005 +0000
tree 8078c453a1c3394134d201da8bb39205c8c9630c
parent 2dd3288c4355cf374bda1762618feddf0632229e

If running in UI mode, then display the UI mode dialogs at the end of
the installs.

dlls/msi/action.c

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index 99dcedc..c545dca 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -61,7 +61,7 @@
  */
 static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran);
 static UINT ACTION_ProcessUISequence(MSIPACKAGE *package);
-static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq);
+static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI);
 static UINT build_icon_path(MSIPACKAGE *package, LPCWSTR icon_name, 
                             LPWSTR *FilePath);
 
@@ -864,6 +864,7 @@
     DWORD sz;
     WCHAR buffer[10];
     UINT rc;
+    BOOL ui = FALSE;
     static const WCHAR szUILevel[] = {'U','I','L','e','v','e','l',0};
     static const WCHAR szAction[] = {'A','C','T','I','O','N',0};
     static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0};
@@ -963,6 +964,7 @@
         if (atoiW(buffer) >= INSTALLUILEVEL_REDUCED)
         {
             rc = ACTION_ProcessUISequence(package);
+            ui = TRUE;
             if (rc == ERROR_SUCCESS)
                 rc = ACTION_ProcessExecSequence(package,TRUE);
         }
@@ -980,13 +982,13 @@
 
     /* process the ending type action */
     if (rc == ERROR_SUCCESS)
-        ACTION_PerformActionSequence(package,-1);
+        ACTION_PerformActionSequence(package,-1,ui);
     else if (rc == ERROR_INSTALL_USEREXIT) 
-        ACTION_PerformActionSequence(package,-2);
+        ACTION_PerformActionSequence(package,-2,ui);
     else if (rc == ERROR_FUNCTION_FAILED) 
-        ACTION_PerformActionSequence(package,-3);
+        ACTION_PerformActionSequence(package,-3,ui);
     else if (rc == ERROR_INSTALL_SUSPEND) 
-        ACTION_PerformActionSequence(package,-4);
+        ACTION_PerformActionSequence(package,-4,ui);
 
     /* finish up running custom actions */
     ACTION_FinishCustomActions(package);
@@ -994,7 +996,7 @@
     return rc;
 }
 
-static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq)
+static UINT ACTION_PerformActionSequence(MSIPACKAGE *package, UINT seq, BOOL UI)
 {
     MSIQUERY * view;
     UINT rc;
@@ -1007,7 +1009,16 @@
          'S','e','q','u','e','n','c','e',' ', 'W','H','E','R','E',' ',
          'S','e','q','u','e','n','c','e',' ', '=',' ','%','i',0};
 
-    rc = MSI_OpenQuery(package->db, &view, ExecSeqQuery, seq);
+    static const WCHAR UISeqQuery[] =
+        {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ',
+	 'I','n','s','t','a','l','l','U','I','S','e','q','u','e','n','c','e',
+	 ' ', 'W','H','E','R','E',' ', 'S','e','q','u','e','n','c','e',
+	 ' ', '=',' ','%','i',0};
+
+    if (UI)
+        rc = MSI_OpenQuery(package->db, &view, UISeqQuery, seq);
+    else
+        rc = MSI_OpenQuery(package->db, &view, ExecSeqQuery, seq);
 
     if (rc == ERROR_SUCCESS)
     {
@@ -1058,7 +1069,10 @@
             goto end;
         }
 
-        rc = ACTION_PerformAction(package,buffer);
+        if (UI)
+            rc = ACTION_PerformUIAction(package,buffer);
+        else
+            rc = ACTION_PerformAction(package,buffer);
         msiobj_release(&row->hdr);
 end:
         MSI_ViewClose(view);
@@ -3523,7 +3537,8 @@
             value_data = parse_value(package, value, &type, &size); 
         else
         {
-            value_data = NULL;
+            static const WCHAR szEmpty[] = {0};
+            value_data = (LPSTR)strdupW(szEmpty);
             size = 0;
             type = REG_SZ;
         }