wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against a952453888fb5df3c70edf357820bc924b4f3e7f.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2021-01-21 12:00:14 +11:00
parent 76f8eb15f1
commit 2f619b2a53
8 changed files with 53 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
patches/windows.gaming.input-dll/0001-windows.gaming.input-Add-stub-dll.patch
View File

@@ -1,7 +1,7 @@
From 0a5e3bf90552df0bbf21ecec922bd91fe8a27a3a Mon Sep 17 00:00:00 2001
From 57e813244a401d27959d8689942e787fafcaa15b 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 1/9] windows.gaming.input: Add stub dll.
Subject: [PATCH] windows.gaming.input: Add stub dll.
---
configure.ac | 1 +
@@ -17,10 +17,10 @@ Subject: [PATCH 1/9] windows.gaming.input: Add stub dll.
create mode 100644 include/windows.gaming.input.idl
diff --git a/configure.ac b/configure.ac
index a8649a2e40b..3e717d5191f 100644
index 6fbf7f2d4e5..bdcfe84f87d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3822,6 +3822,7 @@ WINE_CONFIG_MAKEFILE(dlls/win32s16.dll16,enable_win16)
@@ -3850,6 +3850,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)
@@ -195,16 +195,16 @@ index 00000000000..2b6abc4dd84
+ return S_OK;
+}
diff --git a/include/Makefile.in b/include/Makefile.in
index 91297753b12..8ae1091b8b7 100644
index 466ac6fd5dc..24cc64a3407 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -735,6 +735,7 @@ SOURCES = \
@@ -753,6 +753,7 @@ SOURCES = \
windef.h \
windns.h \
windows.foundation.idl \
+ windows.gaming.input.idl \
windows.media.speechsynthesis.idl \
windows.h \
windows.media.speechsynthesis.idl \
windowscontracts.idl \
diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl
new file mode 100644
@@ -237,5 +237,5 @@ index 00000000000..575f34ccb58
+import "inspectable.idl";
+import "windows.foundation.idl";
--
2.28.0
2.29.2

19
patches/windows.gaming.input-dll/0006-windows.gaming.input-Implement-IRawGameControllerSta.patch
View File

@@ -1,7 +1,7 @@
From 1f000cd4305f627a8ab8b725581075fa7a3d82ab Mon Sep 17 00:00:00 2001
From 3d6807e5da2a30f33b7517a3d3a3457c53a4ebc7 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 6/9] windows.gaming.input: Implement IRawGameControllerStatics
Subject: [PATCH] windows.gaming.input: Implement IRawGameControllerStatics
stubs.
---
@@ -215,10 +215,10 @@ index dad5a196214..078043b0963 100644
0
};
diff --git a/include/Makefile.in b/include/Makefile.in
index 8ae1091b8b7..e26eafb7f6a 100644
index 24cc64a3407..2f68c258f1b 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -20,6 +20,7 @@ SOURCES = \
@@ -21,6 +21,7 @@ SOURCES = \
appmodel.h \
asferr.h \
asptlb.idl \
@@ -226,16 +226,17 @@ index 8ae1091b8b7..e26eafb7f6a 100644
asynot.idl \
asysta.idl \
atlbase.h \
@@ -736,7 +737,9 @@ SOURCES = \
@@ -754,8 +755,10 @@ SOURCES = \
windns.h \
windows.foundation.idl \
windows.gaming.input.idl \
+ windows.gaming.input.forcefeedback.idl \
windows.h \
windows.media.speechsynthesis.idl \
+ windows.system.idl \
windows.h \
windowscontracts.idl \
windowsx.h \
wine/debug.h \
diff --git a/include/asyncinfo.idl b/include/asyncinfo.idl
new file mode 100644
index 00000000000..61784bc65ac
@@ -791,10 +792,10 @@ index 00000000000..824441eaff9
+ }
+}
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 9d738859b81..ab18ab97e4c 100644
index 8d65bfb72d1..9e02369f341 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -714,6 +714,7 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
@@ -718,6 +718,7 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
[Misc]
HKLM,Software\Microsoft\WindowsRuntime\ActivatableClassId\Windows.Gaming.Input.Gamepad,"DllPath",2,"Windows.Gaming.Input.dll"
@@ -803,5 +804,5 @@ index 9d738859b81..ab18ab97e4c 100644
HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000
HKLM,Software\Clients\Mail,,2,"Native Mail Client"
--
2.28.0
2.29.2