From fc1712e4940b5153683e07c194ce1be20b0877c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Mon, 10 Jan 2022 15:53:46 +0100 Subject: [PATCH] [SHELL32] Set a sane SHELL32 versioning, when compiled for NT 5.2 and NT 6+. i.e. don't keep using version from Windows 2000... Values taken from https://www.geoffchappell.com/studies/windows/shell/shell32/history/index.htm --- dll/win32/shell32/shell32_version.h | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/dll/win32/shell32/shell32_version.h b/dll/win32/shell32/shell32_version.h index 92a0baf9bf9..f24ca3220df 100644 --- a/dll/win32/shell32/shell32_version.h +++ b/dll/win32/shell32/shell32_version.h @@ -20,11 +20,30 @@ #pragma once -#define WINE_FILEVERSION_MAJOR 5 +#if (NTDDI_VERSION < NTDDI_LONGHORN) + +/* Version from Windows Server 2003 SP2 */ + +#define WINE_FILEVERSION_MAJOR 6 #define WINE_FILEVERSION_MINOR 0 -#define WINE_FILEVERSION_BUILD 3900 -#define WINE_FILEVERSION_PLATFORMID 6975 +#define WINE_FILEVERSION_BUILD 3790 +#define WINE_FILEVERSION_PLATFORMID 3959 /* FIXME: when libs/wpp gets fixed to support concatenation we can remove * this and define it in version.rc */ -#define WINE_FILEVERSION_STR "5.0.3900.6975" +#define WINE_FILEVERSION_STR "6.0.3790.3959" + +#else + +/* Version from Windows Vista RTM */ + +#define WINE_FILEVERSION_MAJOR 6 +#define WINE_FILEVERSION_MINOR 0 +#define WINE_FILEVERSION_BUILD 6000 +#define WINE_FILEVERSION_PLATFORMID 16386 + +/* FIXME: when libs/wpp gets fixed to support concatenation we can remove + * this and define it in version.rc */ +#define WINE_FILEVERSION_STR "6.0.6000.16386" + +#endif // NTDDI_VERSION