mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 6d26689484070b2c4ad4e0e16812c6eb8176cd40.
This commit is contained in:
Alistair Leslie-Hughes
parent
44af049de7
commit
34d5c3568f
@ -1,4 +1,4 @@
|
||||
From c4e663329366c37bca65a0beb83d656afea45ecc Mon Sep 17 00:00:00 2001
|
||||
From 338fc447537dd45e07a3c2d9ef8069af910c936f Mon Sep 17 00:00:00 2001
|
||||
From: Austin English <austinenglish@gmail.com>
|
||||
Date: Tue, 13 Oct 2020 04:42:03 -0500
|
||||
Subject: [PATCH] dxapi.sys: add stub dll
|
||||
@ -9,17 +9,16 @@ Signed-off-by: Austin English <austinenglish@gmail.com>
|
||||
dlls/dxapi.sys/Makefile.in | 6 ++++++
|
||||
dlls/dxapi.sys/dxapi.sys.spec | 7 +++++++
|
||||
dlls/dxapi.sys/version.rc | 26 ++++++++++++++++++++++++++
|
||||
loader/wine.inf.in | 2 ++
|
||||
5 files changed, 42 insertions(+)
|
||||
4 files changed, 40 insertions(+)
|
||||
create mode 100644 dlls/dxapi.sys/Makefile.in
|
||||
create mode 100644 dlls/dxapi.sys/dxapi.sys.spec
|
||||
create mode 100644 dlls/dxapi.sys/version.rc
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index da6ada3013b..47e8427f6b8 100644
|
||||
index d3cb3ed1fd6..86d6912b4e0 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3248,6 +3248,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests)
|
||||
@@ -3274,6 +3274,7 @@ WINE_CONFIG_MAKEFILE(dlls/dwmapi/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dwrite)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dwrite/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dx8vb)
|
||||
@ -84,26 +83,6 @@ index 00000000000..7ecd1565052
|
||||
+#define WINE_PRODUCTVERSION_STR "5.0.2180.1"
|
||||
+
|
||||
+#include "wine/wine_common_ver.rc"
|
||||
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
||||
index 20d5243aa4b..b4052b146b4 100644
|
||||
--- a/loader/wine.inf.in
|
||||
+++ b/loader/wine.inf.in
|
||||
@@ -2632,6 +2632,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
10,syswow64,stdole2.tlb
|
||||
11,,iexplore.exe
|
||||
11,,winetest.exe,-
|
||||
+12,,dxapi.sys,-
|
||||
12,,dxgkrnl.sys,-
|
||||
12,,dxgmms1.sys,-
|
||||
12,,fltmgr.sys,-
|
||||
@@ -2689,6 +2690,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
11,,iexplore.exe
|
||||
11,,notepad.exe
|
||||
11,,winetest.exe,-
|
||||
+12,,dxapi.sys,-
|
||||
12,,dxgkrnl.sys
|
||||
12,,dxgmms1.sys
|
||||
12,,fltmgr.sys
|
||||
--
|
||||
2.20.1
|
||||
2.30.1
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "2828d0820a1661e46f606f28db090d710cef11f4"
|
||||
echo "6d26689484070b2c4ad4e0e16812c6eb8176cd40"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -250,8 +250,6 @@ patch_enable_all ()
|
||||
enable_uxtheme_CloseThemeClass="$1"
|
||||
enable_version_VerQueryValue="$1"
|
||||
enable_widl_SLTG_Typelib_Support="$1"
|
||||
enable_windows_gaming_input_dll="$1"
|
||||
enable_windows_globalization_dll="$1"
|
||||
enable_windowscodecs_GIF_Encoder="$1"
|
||||
enable_windowscodecs_TIFF_Support="$1"
|
||||
enable_wine_inf_Directory_ContextMenuHandlers="$1"
|
||||
@ -817,12 +815,6 @@ patch_enable ()
|
||||
widl-SLTG_Typelib_Support)
|
||||
enable_widl_SLTG_Typelib_Support="$2"
|
||||
;;
|
||||
windows.gaming.input-dll)
|
||||
enable_windows_gaming_input_dll="$2"
|
||||
;;
|
||||
windows.globalization-dll)
|
||||
enable_windows_globalization_dll="$2"
|
||||
;;
|
||||
windowscodecs-GIF_Encoder)
|
||||
enable_windowscodecs_GIF_Encoder="$2"
|
||||
;;
|
||||
@ -1360,13 +1352,6 @@ if test "$enable_wineboot_ProxySettings" -eq 1; then
|
||||
enable_wineboot_drivers_etc_Stubs=1
|
||||
fi
|
||||
|
||||
if test "$enable_windows_globalization_dll" -eq 1; then
|
||||
if test "$enable_windows_gaming_input_dll" -gt 1; then
|
||||
abort "Patchset windows.gaming.input-dll disabled, but windows.globalization-dll depends on that."
|
||||
fi
|
||||
enable_windows_gaming_input_dll=1
|
||||
fi
|
||||
|
||||
if test "$enable_user32_rawinput_mouse_experimental" -eq 1; then
|
||||
if test "$enable_user32_rawinput_mouse" -gt 1; then
|
||||
abort "Patchset user32-rawinput-mouse disabled, but user32-rawinput-mouse-experimental depends on that."
|
||||
@ -4059,52 +4044,6 @@ if test "$enable_version_VerQueryValue" -eq 1; then
|
||||
patch_apply version-VerQueryValue/0001-version-Test-for-VerQueryValueA-try-2.patch
|
||||
fi
|
||||
|
||||
# Patchset windows.gaming.input-dll
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#49756] windows.gaming.input: New DLL
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/windows.gaming.input.dll/Makefile.in, dlls/windows.gaming.input.dll/windows.gaming.input.spec,
|
||||
# | dlls/windows.gaming.input.dll/windows.gaming.input_main.c, include/Makefile.in, include/asyncinfo.idl,
|
||||
# | include/windows.foundation.collections.idl, include/windows.foundation.idl,
|
||||
# | include/windows.gaming.input.forcefeedback.idl, include/windows.gaming.input.idl, include/windows.system.idl,
|
||||
# | loader/wine.inf.in
|
||||
# |
|
||||
if test "$enable_windows_gaming_input_dll" -eq 1; then
|
||||
patch_apply windows.gaming.input-dll/0001-windows.gaming.input-Add-stub-dll.patch
|
||||
patch_apply windows.gaming.input-dll/0002-windows.gaming.input-Implement-IGamepadStatics-stubs.patch
|
||||
patch_apply windows.gaming.input-dll/0003-windows.gaming.input-Implement-IGamepadStatics-Gamep.patch
|
||||
patch_apply windows.gaming.input-dll/0004-windows.gaming.input-Fake-empty-IGamepadStatics-Game.patch
|
||||
patch_apply windows.gaming.input-dll/0005-windows.gaming.input-Fake-IEventHandler_Gamepad-supp.patch
|
||||
patch_apply windows.gaming.input-dll/0006-windows.gaming.input-Implement-IRawGameControllerSta.patch
|
||||
patch_apply windows.gaming.input-dll/0007-windows.gaming.input-Implement-IRawGameControllerSta.patch
|
||||
patch_apply windows.gaming.input-dll/0008-windows.gaming.input-Fake-empty-IRawGameControllerSt.patch
|
||||
patch_apply windows.gaming.input-dll/0009-windows.gaming.input-Fake-IEventHandler_RawGameContr.patch
|
||||
fi
|
||||
|
||||
# Patchset windows.globalization-dll
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
# | * windows.gaming.input-dll
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#49740] windows.globalization: New DLL
|
||||
# | * [#49998] windows.globalization: New DLL
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/windows.globalization.dll/Makefile.in, dlls/windows.globalization.dll/windows.globalization.spec,
|
||||
# | dlls/windows.globalization.dll/windows.globalization_main.c, include/Makefile.in, include/windows.foundation.idl,
|
||||
# | include/windows.globalization.idl, include/windows.system.userprofile.idl, loader/wine.inf.in
|
||||
# |
|
||||
if test "$enable_windows_globalization_dll" -eq 1; then
|
||||
patch_apply windows.globalization-dll/0001-windows.globalization-Add-stub-dll.patch
|
||||
patch_apply windows.globalization-dll/0002-windows.globalization-Implement-IGlobalizationPrefer.patch
|
||||
patch_apply windows.globalization-dll/0003-windows.globalization-Implement-IGlobalizationPrefer.patch
|
||||
patch_apply windows.globalization-dll/0004-windows.globalization-Implement-IGlobalizationPrefer.patch
|
||||
patch_apply windows.globalization-dll/0005-windows.globalization-Fake-empty-IGlobalizationPrefe.patch
|
||||
fi
|
||||
|
||||
# Patchset windowscodecs-GIF_Encoder
|
||||
# |
|
||||
# | Modified files:
|
||||
|
||||
@ -5,3 +5,4 @@
|
||||
# https://source.winehq.org/patches/data/191192
|
||||
# To support Death Stranding
|
||||
Fixes: [49756] windows.gaming.input: New DLL
|
||||
Disabled: True
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
Fixes: [49740] windows.globalization: New DLL
|
||||
Fixes: [49998] windows.globalization: New DLL
|
||||
Depends: windows.gaming.input-dll
|
||||
Disabled: True
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 547a512a92e719ea5dc1c812e4505680c006b2a0 Mon Sep 17 00:00:00 2001
|
||||
From fb48a8c56b8d7007f4dfc2771c142efc72c432c7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 8 Jun 2017 23:41:02 +0200
|
||||
Subject: [PATCH] dxgkrnl.sys: Add stub driver.
|
||||
@ -8,17 +8,16 @@ Subject: [PATCH] dxgkrnl.sys: Add stub driver.
|
||||
dlls/dxgkrnl.sys/Makefile.in | 6 +++++
|
||||
dlls/dxgkrnl.sys/dxgkrnl.sys.spec | 26 +++++++++++++++++++++
|
||||
dlls/dxgkrnl.sys/main.c | 39 +++++++++++++++++++++++++++++++
|
||||
loader/wine.inf.in | 2 ++
|
||||
5 files changed, 74 insertions(+)
|
||||
4 files changed, 72 insertions(+)
|
||||
create mode 100644 dlls/dxgkrnl.sys/Makefile.in
|
||||
create mode 100644 dlls/dxgkrnl.sys/dxgkrnl.sys.spec
|
||||
create mode 100644 dlls/dxgkrnl.sys/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 27ab432a44a..0a6d1b0639e 100644
|
||||
index f52cfc1e2b6..4eff254d273 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3282,6 +3282,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
|
||||
@@ -3271,6 +3271,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr8)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxerr9)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgi)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
|
||||
@ -115,26 +114,6 @@ index 00000000000..c5639c237c8
|
||||
+ TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) );
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
||||
index 0a43cc779cb..f524f917243 100644
|
||||
--- a/loader/wine.inf.in
|
||||
+++ b/loader/wine.inf.in
|
||||
@@ -2611,6 +2611,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
10,syswow64,stdole2.tlb
|
||||
11,,iexplore.exe
|
||||
11,,winetest.exe,-
|
||||
+12,,dxgkrnl.sys,-
|
||||
12,,fltmgr.sys,-
|
||||
12,,hidclass.sys,-
|
||||
12,,http.sys,-
|
||||
@@ -2667,6 +2668,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
11,,iexplore.exe
|
||||
11,,notepad.exe
|
||||
11,,winetest.exe,-
|
||||
+12,,dxgkrnl.sys
|
||||
12,,fltmgr.sys
|
||||
12,,hidclass.sys
|
||||
12,,http.sys
|
||||
--
|
||||
2.26.2
|
||||
2.30.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 747017a3787d4ad68f26b1047cc097afe53133be Mon Sep 17 00:00:00 2001
|
||||
From dc0b6c029501ccaaaf558136280de80fd846b762 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 8 Jun 2017 23:42:32 +0200
|
||||
Subject: [PATCH] dxgmms1.sys: Add stub driver.
|
||||
@ -8,17 +8,16 @@ Subject: [PATCH] dxgmms1.sys: Add stub driver.
|
||||
dlls/dxgmms1.sys/Makefile.in | 6 +++++
|
||||
dlls/dxgmms1.sys/dxgmms1.sys.spec | 2 ++
|
||||
dlls/dxgmms1.sys/main.c | 39 +++++++++++++++++++++++++++++++
|
||||
loader/wine.inf.in | 2 ++
|
||||
5 files changed, 50 insertions(+)
|
||||
4 files changed, 48 insertions(+)
|
||||
create mode 100644 dlls/dxgmms1.sys/Makefile.in
|
||||
create mode 100644 dlls/dxgmms1.sys/dxgmms1.sys.spec
|
||||
create mode 100644 dlls/dxgmms1.sys/main.c
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0a6d1b0639e..6966f95ce88 100644
|
||||
index 4eff254d273..0a3a89e7720 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3283,6 +3283,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
|
||||
@@ -3272,6 +3272,7 @@ WINE_CONFIG_MAKEFILE(dlls/dxerr9)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgi)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgi/tests)
|
||||
WINE_CONFIG_MAKEFILE(dlls/dxgkrnl.sys)
|
||||
@ -91,26 +90,6 @@ index 00000000000..686493d3296
|
||||
+ TRACE( "(%p, %s)\n", driver, debugstr_w(path->Buffer) );
|
||||
+ return STATUS_SUCCESS;
|
||||
+}
|
||||
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
|
||||
index f524f917243..c62a360e1c1 100644
|
||||
--- a/loader/wine.inf.in
|
||||
+++ b/loader/wine.inf.in
|
||||
@@ -2612,6 +2612,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
11,,iexplore.exe
|
||||
11,,winetest.exe,-
|
||||
12,,dxgkrnl.sys,-
|
||||
+12,,dxgmms1.sys,-
|
||||
12,,fltmgr.sys,-
|
||||
12,,hidclass.sys,-
|
||||
12,,http.sys,-
|
||||
@@ -2669,6 +2670,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
|
||||
11,,notepad.exe
|
||||
11,,winetest.exe,-
|
||||
12,,dxgkrnl.sys
|
||||
+12,,dxgmms1.sys
|
||||
12,,fltmgr.sys
|
||||
12,,hidclass.sys
|
||||
12,,http.sys
|
||||
--
|
||||
2.26.2
|
||||
2.30.1
|
||||
|
||||
|
||||
@ -1 +1 @@
|
||||
2828d0820a1661e46f606f28db090d710cef11f4
|
||||
6d26689484070b2c4ad4e0e16812c6eb8176cd40
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user