Hans Leidekker : msi: The UI sequence exists if there are runnable actions in the InstallUISequence table .

Alexandre Julliard julliard at winehq.org
Wed May 29 14:47:33 CDT 2013


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

Author: Hans Leidekker <hans at codeweavers.com>
Date:   Wed May 29 12:15:39 2013 +0200

msi: The UI sequence exists if there are runnable actions in the InstallUISequence table.

---

 dlls/msi/action.c |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/dlls/msi/action.c b/dlls/msi/action.c
index e6422a7..1fa065b 100644
--- a/dlls/msi/action.c
+++ b/dlls/msi/action.c
@@ -409,18 +409,16 @@ static BOOL ui_sequence_exists( MSIPACKAGE *package )
     static const WCHAR query [] = {
         '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','`',' ','>',' ','0',' ',
-        'O','R','D','E','R',' ','B','Y',' ','`','S','e','q','u','e','n','c','e','`',0};
+        'W','H','E','R','E',' ','`','S','e','q','u','e','n','c','e','`',' ','>',' ','0',0};
     MSIQUERY *view;
-    UINT rc;
+    DWORD count = 0;
 
-    rc = MSI_DatabaseOpenViewW(package->db, query, &view);
-    if (rc == ERROR_SUCCESS)
+    if (!(MSI_DatabaseOpenViewW( package->db, query, &view )))
     {
-        msiobj_release(&view->hdr);
-        return TRUE;
+        MSI_IterateRecords( view, &count, NULL, package );
+        msiobj_release( &view->hdr );
     }
-    return FALSE;
+    return count != 0;
 }
 
 UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace)




More information about the wine-cvs mailing list