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 03ee99b43c2a01ce0e6f77fc0bbc71570a695336.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-03-15 17:10:26 +01:00
parent c11992eadd
commit 51601eed6f
6 changed files with 36 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
patches/d3dx9_26-ID3DXEffect/0001-d3dx9_36-Allow-to-query-for-d3dx9_26-specific-ID3DXE.patch
View File

@@ -1,4 +1,4 @@
From 5dfbc3b61422b52ee6763b39b60d0e6bce6cc63b Mon Sep 17 00:00:00 2001
From 95470685fda5c2e5e74c88d2d689159c3af478e8 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 14 Mar 2015 17:00:08 +0100
Subject: d3dx9_36: Allow to query for d3dx9_26 specific ID3DXEffect interface.
@@ -8,12 +8,12 @@ Subject: d3dx9_36: Allow to query for d3dx9_26 specific ID3DXEffect interface.
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 8e2f850..0cb220a 100644
index 8f82784..384af3f 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -27,6 +27,11 @@
#include "wingdi.h"
#include "d3dx9_36_private.h"
@@ -22,6 +22,11 @@
#include "d3dx9_private.h"
#include "d3dcompiler.h"
+#include "initguid.h"
+
@@ -23,7 +23,7 @@ index 8e2f850..0cb220a 100644
/* Constants for special INT/FLOAT conversation */
#define INT_FLOAT_MULTI 255.0f
@@ -2501,7 +2506,8 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID
@@ -2862,7 +2867,8 @@ static HRESULT WINAPI ID3DXEffectImpl_QueryInterface(ID3DXEffect *iface, REFIID
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), object);
if (IsEqualGUID(riid, &IID_IUnknown) ||
@@ -34,5 +34,5 @@ index 8e2f850..0cb220a 100644
iface->lpVtbl->AddRef(iface);
*object = iface;
--
2.3.2
2.7.1