[PATCH 0/7] MR8255: msvcp140*, vcruntime140*: Add version resources
Games built with recent versions of Unreal Engine (e.g. Backrooms Escape Together, Ratshaker, Abiotic Factor) refuse to start unless msvcp140_2 and vcruntime140_1 have version resources. I took this opportunity to factor out the version numbers into their own include file so they'll be easier to change if we need to bump them in the future. These version resources will likely stop MS redists from installing via winetricks, but we already bit that bullet with !6943, which added one to msvcp140. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8255
From: Tim Clem <tclem(a)codeweavers.com> --- dlls/msvcp140/version.rc | 7 +------ include/Makefile.in | 1 + include/wine/wine_msvcrt_ver.rc | 25 +++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 include/wine/wine_msvcrt_ver.rc diff --git a/dlls/msvcp140/version.rc b/dlls/msvcp140/version.rc index 7e31ee4a5db..463300a8a40 100644 --- a/dlls/msvcp140/version.rc +++ b/dlls/msvcp140/version.rc @@ -16,11 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define WINE_FILEDESCRIPTION_STR "Wine runtime library" #define WINE_FILENAME_STR "msvcp140.dll" -#define WINE_FILEVERSION 14,42,34433,0 -#define WINE_FILEVERSION_STR "14.42.34433.0" -#define WINE_PRODUCTVERSION 14,42,34433,0 -#define WINE_PRODUCTVERSION_STR "14.42.34433.0" -#include "wine/wine_common_ver.rc" +#include "wine/wine_msvcrt_ver.rc" diff --git a/include/Makefile.in b/include/Makefile.in index ab4957969d3..3437a2bb08e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -970,6 +970,7 @@ SOURCES = \ wine/winbase16.h \ wine/windef16.h \ wine/wine_common_ver.rc \ + wine/wine_msvcrt_ver.rc \ wine/winebth.h \ wine/wined3d.h \ wine/winedmo.h \ diff --git a/include/wine/wine_msvcrt_ver.rc b/include/wine/wine_msvcrt_ver.rc new file mode 100644 index 00000000000..5300dfd5500 --- /dev/null +++ b/include/wine/wine_msvcrt_ver.rc @@ -0,0 +1,25 @@ +/* + * Copyright 2024 Louis Lenders + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILEDESCRIPTION_STR "Wine runtime library" +#define WINE_FILEVERSION 14,42,34433,0 +#define WINE_FILEVERSION_STR "14.42.34433.0" +#define WINE_PRODUCTVERSION 14,42,34433,0 +#define WINE_PRODUCTVERSION_STR "14.42.34433.0" + +#include "wine/wine_common_ver.rc" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8255
From: Tim Clem <tclem(a)codeweavers.com> --- dlls/vcruntime140/Makefile.in | 3 ++- dlls/vcruntime140/version.rc | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/vcruntime140/version.rc diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in index 1f99225ffe8..e49bbc2b19d 100644 --- a/dlls/vcruntime140/Makefile.in +++ b/dlls/vcruntime140/Makefile.in @@ -2,4 +2,5 @@ MODULE = vcruntime140.dll IMPORTLIB = vcruntime140 SOURCES = \ - misc.c + misc.c \ + version.rc diff --git a/dlls/vcruntime140/version.rc b/dlls/vcruntime140/version.rc new file mode 100644 index 00000000000..b119b32dd80 --- /dev/null +++ b/dlls/vcruntime140/version.rc @@ -0,0 +1,21 @@ +/* + * Copyright 2025 Tim Clem + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILENAME_STR "vcruntime140.dll" + +#include "wine/wine_msvcrt_ver.rc" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8255
From: Tim Clem <tclem(a)codeweavers.com> --- dlls/vcruntime140_1/Makefile.in | 3 ++- dlls/vcruntime140_1/version.rc | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/vcruntime140_1/version.rc diff --git a/dlls/vcruntime140_1/Makefile.in b/dlls/vcruntime140_1/Makefile.in index d7ed54cc588..caf50b641b4 100644 --- a/dlls/vcruntime140_1/Makefile.in +++ b/dlls/vcruntime140_1/Makefile.in @@ -6,4 +6,5 @@ SOURCES = \ except_arm64ec.c \ except_x86_64.c \ handler4.c \ - main.c + main.c \ + version.rc diff --git a/dlls/vcruntime140_1/version.rc b/dlls/vcruntime140_1/version.rc new file mode 100644 index 00000000000..bdfd5e46f89 --- /dev/null +++ b/dlls/vcruntime140_1/version.rc @@ -0,0 +1,21 @@ +/* + * Copyright 2025 Tim Clem + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILENAME_STR "vcruntime140_1.dll" + +#include "wine/wine_msvcrt_ver.rc" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8255
From: Tim Clem <tclem(a)codeweavers.com> --- dlls/msvcp140_1/Makefile.in | 3 ++- dlls/msvcp140_1/version.rc | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/msvcp140_1/version.rc diff --git a/dlls/msvcp140_1/Makefile.in b/dlls/msvcp140_1/Makefile.in index cb13b2a37b7..101a2124729 100644 --- a/dlls/msvcp140_1/Makefile.in +++ b/dlls/msvcp140_1/Makefile.in @@ -2,4 +2,5 @@ MODULE = msvcp140_1.dll PARENTSRC = ../msvcp90 SOURCES = \ - msvcp140_1.c + msvcp140_1.c \ + version.rc diff --git a/dlls/msvcp140_1/version.rc b/dlls/msvcp140_1/version.rc new file mode 100644 index 00000000000..285b4770dff --- /dev/null +++ b/dlls/msvcp140_1/version.rc @@ -0,0 +1,21 @@ +/* + * Copyright 2025 Tim Clem + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILENAME_STR "msvcp140_1.dll" + +#include "wine/wine_msvcrt_ver.rc" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8255
From: Tim Clem <tclem(a)codeweavers.com> --- dlls/msvcp140_2/Makefile.in | 3 ++- dlls/msvcp140_2/version.rc | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/msvcp140_2/version.rc diff --git a/dlls/msvcp140_2/Makefile.in b/dlls/msvcp140_2/Makefile.in index 0f75819198f..5258d5c0a02 100644 --- a/dlls/msvcp140_2/Makefile.in +++ b/dlls/msvcp140_2/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcp140_2.dll SOURCES = \ - math.c + math.c \ + version.rc diff --git a/dlls/msvcp140_2/version.rc b/dlls/msvcp140_2/version.rc new file mode 100644 index 00000000000..8195241378b --- /dev/null +++ b/dlls/msvcp140_2/version.rc @@ -0,0 +1,21 @@ +/* + * Copyright 2025 Tim Clem + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILENAME_STR "msvcp140_2.dll" + +#include "wine/wine_msvcrt_ver.rc" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8255
From: Tim Clem <tclem(a)codeweavers.com> --- dlls/msvcp140_atomic_wait/Makefile.in | 3 ++- dlls/msvcp140_atomic_wait/version.rc | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/msvcp140_atomic_wait/version.rc diff --git a/dlls/msvcp140_atomic_wait/Makefile.in b/dlls/msvcp140_atomic_wait/Makefile.in index 81b21c812c1..4cf7ec59038 100644 --- a/dlls/msvcp140_atomic_wait/Makefile.in +++ b/dlls/msvcp140_atomic_wait/Makefile.in @@ -2,4 +2,5 @@ MODULE = msvcp140_atomic_wait.dll IMPORTS = kernelbase msvcp140 SOURCES = \ - main.c + main.c \ + version.rc diff --git a/dlls/msvcp140_atomic_wait/version.rc b/dlls/msvcp140_atomic_wait/version.rc new file mode 100644 index 00000000000..c7100b64463 --- /dev/null +++ b/dlls/msvcp140_atomic_wait/version.rc @@ -0,0 +1,21 @@ +/* + * Copyright 2025 Tim Clem + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILENAME_STR "msvcp140_atomic_wait.dll" + +#include "wine/wine_msvcrt_ver.rc" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8255
From: Tim Clem <tclem(a)codeweavers.com> --- dlls/msvcp140_codecvt_ids/Makefile.in | 3 ++- dlls/msvcp140_codecvt_ids/version.rc | 21 +++++++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 dlls/msvcp140_codecvt_ids/version.rc diff --git a/dlls/msvcp140_codecvt_ids/Makefile.in b/dlls/msvcp140_codecvt_ids/Makefile.in index 08590232f8e..15784a709ea 100644 --- a/dlls/msvcp140_codecvt_ids/Makefile.in +++ b/dlls/msvcp140_codecvt_ids/Makefile.in @@ -1,4 +1,5 @@ MODULE = msvcp140_codecvt_ids.dll SOURCES = \ - main.c + main.c \ + version.rc diff --git a/dlls/msvcp140_codecvt_ids/version.rc b/dlls/msvcp140_codecvt_ids/version.rc new file mode 100644 index 00000000000..fbd510e1399 --- /dev/null +++ b/dlls/msvcp140_codecvt_ids/version.rc @@ -0,0 +1,21 @@ +/* + * Copyright 2025 Tim Clem + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#define WINE_FILENAME_STR "msvcp140_codecvt_ids.dll" + +#include "wine/wine_msvcrt_ver.rc" -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/8255
I don't think we need a global header for this, particularly since it only applies to this specific msvcrt version. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/8255#note_105916
participants (3)
-
Alexandre Julliard (＠julliard) -
Tim Clem
-
Tim Clem (＠tclem)