Rebase against 23ffd0a7986421958c23cffce138afa389209920.

This commit is contained in:
Zebediah Figura
2021-03-15 18:28:35 -05:00
parent 7ec998e17a
commit 1f89c15143
13 changed files with 32 additions and 659 deletions

View File

@@ -1,4 +1,4 @@
From 101a33fbffa02e2437d4ef62bc830c6b72e29280 Mon Sep 17 00:00:00 2001
From 029200956d78cda3fc27514adaf8d52541881367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 9 Oct 2020 13:38:18 +0200
Subject: [PATCH] windows.gaming.input: Add stub dll.
@@ -17,17 +17,17 @@ Subject: [PATCH] windows.gaming.input: Add stub dll.
create mode 100644 include/windows.gaming.input.idl
diff --git a/configure.ac b/configure.ac
index 78720ab188f..405d1a6ecc4 100644
index 8c092fb020c..558d2e906a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3796,6 +3796,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16)
@@ -3801,6 +3801,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/win87em.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/winaspi.dll16,enable_win16)
WINE_CONFIG_MAKEFILE(dlls/windebug.dll16,enable_win16)
+WINE_CONFIG_MAKEFILE(dlls/windows.gaming.input.dll)
WINE_CONFIG_MAKEFILE(dlls/windows.media.speech.dll)
WINE_CONFIG_MAKEFILE(dlls/windows.media.speech)
WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests)
WINE_CONFIG_MAKEFILE(dlls/windowscodecs)
WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests)
diff --git a/dlls/windows.gaming.input.dll/Makefile.in b/dlls/windows.gaming.input.dll/Makefile.in
new file mode 100644
index 00000000000..d9478342294
@@ -195,10 +195,10 @@ index 00000000000..2b6abc4dd84
+ return S_OK;
+}
diff --git a/include/Makefile.in b/include/Makefile.in
index 6c16e01a271..ac403a78a4d 100644
index d3494dde7a0..71afc8c0c99 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -748,6 +748,7 @@ SOURCES = \
@@ -749,6 +749,7 @@ SOURCES = \
windns.h \
windows.foundation.collections.idl \
windows.foundation.idl \

View File

@@ -1,4 +1,4 @@
From ad17bb4a309b632d3075f427d46afa8870720184 Mon Sep 17 00:00:00 2001
From c198ba64a5ccf37f06e61b2baf523773e1cdb350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Sat, 20 Feb 2021 00:51:48 +0100
Subject: [PATCH] windows.gaming.input: Implement IGamepadStatics stubs.
@@ -346,17 +346,17 @@ index 575f34ccb58..b5af4e24a66 100644
+ }
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index db816327a51..79a7b2c0503 100644
index 4cef944fb88..a1cc73d6e57 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -713,6 +713,7 @@ HKLM,%MciExtStr%,"wmx",,"MPEGVideo"
@@ -711,6 +711,7 @@ HKLM,%MciExtStr%,"wmx",,"MPEGVideo"
HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
[Misc]
+HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Gaming.Input.Gamepad,"DllPath",2,"Windows.Gaming.Input.dll"
HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Media.SpeechSynthesis.SpeechSynthesizer,"DllPath",2,"Windows.Media.Speech.dll"
HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000
HKLM,Software\Clients\Mail,,2,"Native Mail Client"
HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client"
--
2.20.1

View File

@@ -1,4 +1,4 @@
From 12605782b6c72810d35780e522dfd86d9b11a89d Mon Sep 17 00:00:00 2001
From 3398500d3ed2a90361d431d2fb630b60a6d7e8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Mon, 12 Oct 2020 12:50:32 +0200
Subject: [PATCH] windows.gaming.input: Implement IRawGameControllerStatics
@@ -189,7 +189,7 @@ index dec9d39e7a3..1a40a8ddc35 100644
0
};
diff --git a/include/Makefile.in b/include/Makefile.in
index ac403a78a4d..90e9b660633 100644
index 71afc8c0c99..22ed5f3a2d5 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -20,6 +20,7 @@ SOURCES = \
@@ -200,7 +200,7 @@ index ac403a78a4d..90e9b660633 100644
asynot.idl \
asysta.idl \
atlbase.h \
@@ -749,8 +750,10 @@ SOURCES = \
@@ -750,8 +751,10 @@ SOURCES = \
windows.foundation.collections.idl \
windows.foundation.idl \
windows.gaming.input.idl \
@@ -783,17 +783,17 @@ index 00000000000..824441eaff9
+ }
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 79a7b2c0503..71c6cac0366 100644
index a1cc73d6e57..c10cb37a172 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -714,6 +714,7 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
@@ -712,6 +712,7 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
[Misc]
HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Gaming.Input.Gamepad,"DllPath",2,"Windows.Gaming.Input.dll"
+HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Gaming.Input.RawGameController,"DllPath",2,"Windows.Gaming.Input.dll"
HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Media.SpeechSynthesis.SpeechSynthesizer,"DllPath",2,"Windows.Media.Speech.dll"
HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000
HKLM,Software\Clients\Mail,,2,"Native Mail Client"
HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client"
--
2.20.1

View File

@@ -5,4 +5,3 @@
# https://source.winehq.org/patches/data/191192
# To support Death Stranding
Fixes: [49756] windows.gaming.input: New DLL
Depends: windows.media.speech.dll