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 acd2f1e59bd22197b63eb5ae4ac0d621a0b8cce0

Browse Source
This commit is contained in:
Alistair Leslie-Hughes
2018-03-06 09:29:38 +11:00
parent e09e1fd366
commit fcca2476bf
42 changed files with 395 additions and 976 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
patches/d3dx9_36-CloneEffect/0001-d3dx9_36-Improve-stub-for-ID3DXEffectImpl_CloneEffec.patch
View File

@@ -1,24 +1,21 @@
From 8577047f9cdde21a8eb190eed9cc794132155830 Mon Sep 17 00:00:00 2001
From 9d0ef03a1986a1dc29ff6b509d21183725617e93 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 16 Mar 2015 08:18:33 +0100
Subject: d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
Subject: [PATCH] d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
---
dlls/d3dx9_36/effect.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
dlls/d3dx9_36/effect.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 5b140fe..efbcb92 100644
index 965caa8..5160f3a 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3906,7 +3906,12 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
FIXME("(%p)->(%p, %p): stub\n", This, device, effect);
@@ -4378,7 +4378,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
if (!device)
return D3DERR_INVALIDCALL;
- return E_NOTIMPL;
+ if (!effect)
+ return D3DXERR_INVALIDDATA;
+
+ iface->lpVtbl->AddRef(iface);
+ *effect = iface;
+ return S_OK;
@@ -26,5 +23,5 @@ index 5b140fe..efbcb92 100644
#if _D3DX9_VER >= 27
--
2.8.0
1.9.1