Rebase against 1c8c9308e74abe5e5d85dfe722dea10e60092e7c

This commit is contained in:
Alistair Leslie-Hughes
2018-03-15 09:54:36 +11:00
parent cea60071d1
commit ebe4142fc3
10 changed files with 67 additions and 571 deletions

View File

@@ -1,4 +1,4 @@
From 9d0ef03a1986a1dc29ff6b509d21183725617e93 Mon Sep 17 00:00:00 2001
From a625d57a2c3d125604ec3c8fe1381ed2df3d72ac Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 16 Mar 2015 08:18:33 +0100
Subject: [PATCH] d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
@@ -8,10 +8,10 @@ Subject: [PATCH] d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 965caa8..5160f3a 100644
index 87eaf86..fd4635e 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -4378,7 +4378,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
@@ -4381,7 +4381,9 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
if (!device)
return D3DERR_INVALIDCALL;
@@ -21,7 +21,7 @@ index 965caa8..5160f3a 100644
+ return S_OK;
}
#if _D3DX9_VER >= 27
#if D3DX_SDK_VERSION >= 27
--
1.9.1

View File

@@ -1,2 +1 @@
Fixes: [44635] Improve stub for ID3DXEffectImpl_CloneEffect
Depends: d3dx9_25-ID3DXEffect