[ros-diffs] [gvg] 17077: Sync to Wine-20050628:

[gvg at svn.reactos.com]

Sync to Wine-20050628:
Stefan Leichter <Stefan.Leichter at camLine.com>
- Update version resource of msiexec.exe to current version shipped from
  Windows Update.
Mike McCormack <mike at codeweavers.com>
- Fix some declaration and write string warnings.
Modified: trunk/reactos/subsys/system/msiexec/msiexec.c
Modified: trunk/reactos/subsys/system/msiexec/version.rc
  _____  

Modified: trunk/reactos/subsys/system/msiexec/msiexec.c
--- trunk/reactos/subsys/system/msiexec/msiexec.c	2005-08-05
20:25:46 UTC (rev 17076)
+++ trunk/reactos/subsys/system/msiexec/msiexec.c	2005-08-05
20:30:42 UTC (rev 17077)
@@ -386,7 +386,7 @@

 	return count;
 }
 
-void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
+static void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
 {
 	WCHAR **argv, *p = msi_strdup(cmdline);
 	int i, n;
@@ -404,7 +404,7 @@
 	*pargv = argv;
 }
 
-BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR ***pargv )
+static BOOL process_args_from_reg( LPWSTR ident, int *pargc, WCHAR
***pargv )
 {
 	LONG r;
 	HKEY hkey = 0, hkeyArgs = 0;
  _____  

Modified: trunk/reactos/subsys/system/msiexec/version.rc
--- trunk/reactos/subsys/system/msiexec/version.rc	2005-08-05
20:25:46 UTC (rev 17076)
+++ trunk/reactos/subsys/system/msiexec/version.rc	2005-08-05
20:30:42 UTC (rev 17077)
@@ -18,10 +18,11 @@

 
 #define WINE_FILEDESCRIPTION_STR "Wine Installer"
 #define WINE_FILENAME_STR "msiexec.exe"
-#define WINE_FILEVERSION 2,0,2600,1183
-#define WINE_FILEVERSION_STR "2.0.2600.1183"
-#define WINE_PRODUCTVERSION 2,0,2600,1183
-#define WINE_PRODUCTVERSION_STR "2.0.2600.1183"
+#define WINE_FILETYPE VFT_APP
+#define WINE_FILEVERSION 3,1,4000,1823
+#define WINE_FILEVERSION_STR "3.1.4000.1823"
+#define WINE_PRODUCTVERSION 3,1,4000,1823
+#define WINE_PRODUCTVERSION_STR "3.1.4000.1823"
 #define WINE_PRODUCTNAME_STR "Wine Installer"
 
 #include "wine/wine_common_ver.rc"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20050805/37f2adc8/attachment.html