Rebase against e3bd659be9b2868b121857fb2643d775bbf0d8c7.

[d3dx9_33-Share_Source]
Removed patch to share source of d3dx9_36 with d3dx9_33 to avoid Wine DLL
forwards (accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-06-23 16:16:20 +02:00
parent a8976086e5
commit 1d08851c35
15 changed files with 466 additions and 2657 deletions

View File

@@ -1,4 +1,4 @@
From f820c1d1f8ef2a4d76f06515ecff8b45bae23d4e Mon Sep 17 00:00:00 2001
From 8577047f9cdde21a8eb190eed9cc794132155830 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.
@@ -8,10 +8,10 @@ Subject: d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c
index 8e2f850..18d952f 100644
index 5b140fe..efbcb92 100644
--- a/dlls/d3dx9_36/effect.c
+++ b/dlls/d3dx9_36/effect.c
@@ -3363,7 +3363,12 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
@@ -3906,7 +3906,12 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
FIXME("(%p)->(%p, %p): stub\n", This, device, effect);
@@ -24,7 +24,7 @@ index 8e2f850..18d952f 100644
+ return S_OK;
}
static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface,
#if _D3DX9_VER >= 27
--
2.3.2
2.8.0

View File

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