=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: dxgi: Fix dxgi_output_QueryInterface().
Alexandre Julliard
julliard at winehq.org
Fri Sep 7 16:49:26 CDT 2018
Module: wine
Branch: master
Commit: b3d819a1d7a406176e343ebfc9ef74341a2f098b
URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3d819a1d7a406176e343ebfc9ef74341a2f098b
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Thu Sep 6 22:01:54 2018 +0200
dxgi: Fix dxgi_output_QueryInterface().
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44655
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/dxgi/output.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/dlls/dxgi/output.c b/dlls/dxgi/output.c
index 2b168fb..868a368 100644
--- a/dlls/dxgi/output.c
+++ b/dlls/dxgi/output.c
@@ -41,20 +41,24 @@ static inline struct dxgi_output *impl_from_IDXGIOutput4(IDXGIOutput4 *iface)
/* IUnknown methods */
-static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID riid, void **object)
+static HRESULT STDMETHODCALLTYPE dxgi_output_QueryInterface(IDXGIOutput4 *iface, REFIID iid, void **object)
{
- TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object);
-
- if (IsEqualGUID(riid, &IID_IDXGIOutput)
- || IsEqualGUID(riid, &IID_IDXGIObject)
- || IsEqualGUID(riid, &IID_IUnknown))
+ TRACE("iface %p, iid %s, object %p.\n", iface, debugstr_guid(iid), object);
+
+ if (IsEqualGUID(iid, &IID_IDXGIOutput4)
+ || IsEqualGUID(iid, &IID_IDXGIOutput3)
+ || IsEqualGUID(iid, &IID_IDXGIOutput2)
+ || IsEqualGUID(iid, &IID_IDXGIOutput1)
+ || IsEqualGUID(iid, &IID_IDXGIOutput)
+ || IsEqualGUID(iid, &IID_IDXGIObject)
+ || IsEqualGUID(iid, &IID_IUnknown))
{
IUnknown_AddRef(iface);
*object = iface;
return S_OK;
}
- WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid));
+ WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(iid));
*object = NULL;
return E_NOINTERFACE;
More information about the wine-cvs
mailing list