[ros-diffs] [akhaldi] 66630: [MSIEXEC] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Mon Mar  9 20:02:20 2015
New Revision: 66630

URL: http://svn.reactos.org/svn/reactos?rev=66630&view=rev
Log:
[MSIEXEC] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/reactos/base/system/msiexec/msiexec.c
    trunk/reactos/base/system/msiexec/rsrc.rc
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/base/system/msiexec/msiexec.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/msiexe…
==============================================================================
--- trunk/reactos/base/system/msiexec/msiexec.c	[iso-8859-1] (original)
+++ trunk/reactos/base/system/msiexec/msiexec.c	[iso-8859-1] Mon Mar  9 20:02:20 2015
@@ -866,7 +866,7 @@
 				ExitProcess(1);
 			}
 		}
-		else if(msi_option_equal(argvW[i], "p"))
+		else if(msi_option_equal(argvW[i], "p") || msi_option_equal(argvW[i],
"update"))
 		{
 			FunctionPatch = TRUE;
 			i++;

Modified: trunk/reactos/base/system/msiexec/rsrc.rc
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/msiexec/rsrc.r…
==============================================================================
--- trunk/reactos/base/system/msiexec/rsrc.rc	[iso-8859-1] (original)
+++ trunk/reactos/base/system/msiexec/rsrc.rc	[iso-8859-1] Mon Mar  9 20:02:20 2015
@@ -21,10 +21,10 @@
 #define WINE_FILEDESCRIPTION_STR "Wine Installer"
 #define WINE_FILENAME_STR "msiexec.exe"
 #define WINE_FILETYPE VFT_APP
-#define WINE_FILEVERSION 4,5,6001,22299
-#define WINE_FILEVERSION_STR "4.5.6001.22299"
-#define WINE_PRODUCTVERSION 4,5,6001,22299
-#define WINE_PRODUCTVERSION_STR "4.5.6001.22299"
+#define WINE_FILEVERSION 4,5,6001,22308
+#define WINE_FILEVERSION_STR "4.5.6001.22308"
+#define WINE_PRODUCTVERSION 4,5,6001,22308
+#define WINE_PRODUCTVERSION_STR "4.5.6001.22308"
 #define WINE_PRODUCTNAME_STR "Wine Installer"
 
 #include "wine/wine_common_ver.rc"

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Mar  9 20:02:20 2015
@@ -251,7 +251,7 @@
 reactos/base/applications/wordpad           # Synced to Wine-1.7.27
 reactos/base/services/rpcss                 # Synced to Wine-1.7.27
 reactos/base/system/expand                  # Synced to Wine-1.7.27
-reactos/base/system/msiexec                 # Synced to Wine-1.7.27
+reactos/base/system/msiexec                 # Synced to WineStaging-1.7.37
 reactos/modules/rosapps/winfile             # Autosync
 
 In addition the following libs, dlls and source files are mostly based on code ported