Sync to Wine-20050628:

Stefan Leichter <Stefan.Leichter@camLine.com>
- Update version resource of msiexec.exe to current version shipped from
  Windows Update.
Mike McCormack <mike@codeweavers.com>
- Fix some declaration and write string warnings.

svn path=/trunk/; revision=17077
This commit is contained in:
Gé van Geldorp 2005-08-05 20:30:42 +00:00
parent be83809179
commit 3f6ea7fd61
2 changed files with 7 additions and 6 deletions

View file

@ -386,7 +386,7 @@ static int chomp( WCHAR *str )
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 @@ void process_args( WCHAR *cmdline, int *pargc, WCHAR ***pargv )
*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;

View file

@ -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"