Rebase against 568e3e8b697a960881c162671a33c28727921797.

This commit is contained in:
Alistair Leslie-Hughes
2020-10-06 09:34:01 +11:00
parent 194669052e
commit 87a40ed683
6 changed files with 49 additions and 87 deletions

View File

@@ -1,7 +1,7 @@
From c1a8b6dfd1f105a1e9f151b0fafecc928c2d0e8f Mon Sep 17 00:00:00 2001
From ba450b20147db9af677e2388c7b3b43995967ce8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Fri, 21 Aug 2020 08:58:34 +0200
Subject: [PATCH 3/4] windows.gaming.input: Implement IGamepadStatics stubs.
Subject: [PATCH] windows.gaming.input: Implement IGamepadStatics stubs.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@@ -9,12 +9,11 @@ Content-Transfer-Encoding: 8bit
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
---
.../windows.gaming.input_main.c | 358 ++++++++++++++++++
include/objidl.idl | 9 +
loader/wine.inf.in | 1 +
3 files changed, 368 insertions(+)
3 files changed, 370 insertions(+)
diff --git a/dlls/windows.gaming.input.dll/windows.gaming.input_main.c b/dlls/windows.gaming.input.dll/windows.gaming.input_main.c
index f345fbffb5..44ad92980e 100644
index f345fbffb50..44ad92980e5 100644
--- a/dlls/windows.gaming.input.dll/windows.gaming.input_main.c
+++ b/dlls/windows.gaming.input.dll/windows.gaming.input_main.c
@@ -20,9 +20,140 @@ static const char *debugstr_hstring(HSTRING hstr)
@@ -403,31 +402,11 @@ index f345fbffb5..44ad92980e 100644
0
};
diff --git a/include/objidl.idl b/include/objidl.idl
index a86ceb8b1d..cb814f5564 100644
--- a/include/objidl.idl
+++ b/include/objidl.idl
@@ -37,6 +37,15 @@ typedef struct _COSERVERINFO {
/******************** Fundamentals ********************/
+[
+ local,
+ object,
+ uuid(94ea2b94-e9cc-49e0-c0ff-ee64ca8f5b90)
+]
+interface IAgileObject : IUnknown
+{
+}
+
[
local,
object,
diff --git a/loader/wine.inf.in b/loader/wine.inf.in
index 8777377002..a5b9e866bd 100644
index f1f1563ac53..1d372f457ee 100644
--- a/loader/wine.inf.in
+++ b/loader/wine.inf.in
@@ -705,6 +705,7 @@ HKLM,%MciExtStr%,"wmx",,"MPEGVideo"
@@ -717,6 +717,7 @@ HKLM,%MciExtStr%,"wmx",,"MPEGVideo"
HKLM,%MciExtStr%,"wvx",,"MPEGVideo"
[Misc]