[ros-diffs] [cwittich] 41064: sync msi with wine 1.1.22

[cwittich at svn.reactos.org]

Author: cwittich
Date: Sat May 23 14:29:15 2009
New Revision: 41064

URL: http://svn.reactos.org/svn/reactos?rev=41064&view=rev
Log:
sync msi with wine 1.1.22

Modified:
    trunk/reactos/dll/win32/msi/dialog.c
    trunk/reactos/dll/win32/msi/msi.c

Modified: trunk/reactos/dll/win32/msi/dialog.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/dialog.c?rev=41064&r1=41063&r2=41064&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/dialog.c [iso-8859-1] Sat May 23 14:29:15 2009
@@ -135,6 +135,8 @@
 static const WCHAR szPathEdit[] = { 'P','a','t','h','E','d','i','t',0 };
 static const WCHAR szProgressBar[] = {
      'P','r','o','g','r','e','s','s','B','a','r',0 };
+static const WCHAR szSetProgress[] = {
+    'S','e','t','P','r','o','g','r','e','s','s',0 };
 static const WCHAR szRadioButtonGroup[] = { 
     'R','a','d','i','o','B','u','t','t','o','n','G','r','o','u','p',0 };
 static const WCHAR szIcon[] = { 'I','c','o','n',0 };
@@ -1571,7 +1573,14 @@
 
 static UINT msi_dialog_progress_bar( msi_dialog *dialog, MSIRECORD *rec )
 {
-    msi_dialog_add_control( dialog, rec, PROGRESS_CLASSW, WS_VISIBLE );
+    msi_control *control;
+
+    control = msi_dialog_add_control( dialog, rec, PROGRESS_CLASSW, WS_VISIBLE );
+    if( !control )
+        return ERROR_FUNCTION_FAILED;
+
+    ControlEvent_SubscribeToEvent( dialog->package, dialog,
+                                   szSetProgress, control->name, szProgress );
     return ERROR_SUCCESS;
 }
 

Modified: trunk/reactos/dll/win32/msi/msi.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/msi.c?rev=41064&r1=41063&r2=41064&view=diff
==============================================================================
--- trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/msi/msi.c [iso-8859-1] Sat May 23 14:29:15 2009
@@ -304,7 +304,7 @@
 static UINT MSI_ApplyPatchW(LPCWSTR szPatchPackage, LPCWSTR szProductCode, LPCWSTR szCommandLine)
 {
     MSIHANDLE patch = 0, info = 0;
-    UINT r, type;
+    UINT r = ERROR_SUCCESS, type;
     DWORD size = 0;
     LPCWSTR cmd_ptr = szCommandLine;
     LPCWSTR product_code = szProductCode;