From 3f6ea7fd61e1b698836c03ab9a3f6b118d850d56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9=20van=20Geldorp?= Date: Fri, 5 Aug 2005 20:30:42 +0000 Subject: [PATCH] Sync to Wine-20050628: Stefan Leichter - Update version resource of msiexec.exe to current version shipped from Windows Update. Mike McCormack - Fix some declaration and write string warnings. svn path=/trunk/; revision=17077 --- reactos/subsys/system/msiexec/msiexec.c | 4 ++-- reactos/subsys/system/msiexec/version.rc | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/reactos/subsys/system/msiexec/msiexec.c b/reactos/subsys/system/msiexec/msiexec.c index f20f29b3f12..05c29be549c 100644 --- a/reactos/subsys/system/msiexec/msiexec.c +++ b/reactos/subsys/system/msiexec/msiexec.c @@ -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; diff --git a/reactos/subsys/system/msiexec/version.rc b/reactos/subsys/system/msiexec/version.rc index 64be1378e10..60ae673af7e 100644 --- a/reactos/subsys/system/msiexec/version.rc +++ b/reactos/subsys/system/msiexec/version.rc @@ -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"