shell32: Update version information to match XP values.

Dmitry Timoshkov dmitry at baikal.ru
Sun Mar 22 21:20:59 CDT 2015


This patch makes an application installer that checks product version
from the shell32 resources work (it uses different logic for earlier
versions when passing flags and arguments to SHFileOperation, and Wine
behaviour matches later shell32 version).
---
 dlls/shell32/shell32.rc | 7 ++++++-
 dlls/shell32/version.h  | 7 ++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 37acbe7..847d2ce 100644
--- a/dlls/shell32/shell32.rc
+++ b/dlls/shell32/shell32.rc
@@ -457,9 +457,14 @@ IDR_AVI_FILEDELETE AVI searching.avi
 /* @makedep: AUTHORS */
 AUTHORS RCDATA AUTHORS
 
-#include "version.h"
+/* please keep in sync with version.h values */
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #define WINE_FILENAME_STR "shell32.dll"
+#define WINE_FILEVERSION 6,0,2900,6242
+#define WINE_FILEVERSION_STR "6.0.2900.6242"
+#define WINE_PRODUCTVERSION 6,0,2900,6242
+#define WINE_PRODUCTVERSION_STR "6.0.2900.6242"
 #define WINE_EXTRAVALUES VALUE "OLESelfRegister",""
 
 #include "wine/wine_common_ver.rc"
diff --git a/dlls/shell32/version.h b/dlls/shell32/version.h
index aedf231..06f4871 100644
--- a/dlls/shell32/version.h
+++ b/dlls/shell32/version.h
@@ -18,7 +18,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#define WINE_FILEVERSION_MAJOR         5
+/* please keep in sync with shell32.rc values */
+#define WINE_FILEVERSION_MAJOR         6
 #define WINE_FILEVERSION_MINOR         0
-#define WINE_FILEVERSION_BUILD      3900
-#define WINE_FILEVERSION_PLATFORMID 6975
+#define WINE_FILEVERSION_BUILD      2900
+#define WINE_FILEVERSION_PLATFORMID 6242
-- 
2.3.3




More information about the wine-patches mailing list