You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Added patch to improve stub for ID3DXEffectImpl_CloneEffect, mark upstream bug 25138 as fixes.
This commit is contained in:
@@ -1 +1 @@
|
||||
Fixes: Fix wrong version of ID3DXEffect interface for d3dx9_25
|
||||
Fixes: [25138] Fix wrong version of ID3DXEffect interface for d3dx9_25
|
||||
|
@@ -0,0 +1,30 @@
|
||||
From f820c1d1f8ef2a4d76f06515ecff8b45bae23d4e 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.
|
||||
|
||||
---
|
||||
dlls/d3dx9_36/effect.c | 7 ++++++-
|
||||
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
|
||||
--- a/dlls/d3dx9_36/effect.c
|
||||
+++ b/dlls/d3dx9_36/effect.c
|
||||
@@ -3363,7 +3363,12 @@ static HRESULT WINAPI ID3DXEffectImpl_CloneEffect(ID3DXEffect *iface,
|
||||
|
||||
FIXME("(%p)->(%p, %p): stub\n", This, device, effect);
|
||||
|
||||
- return E_NOTIMPL;
|
||||
+ if (!effect)
|
||||
+ return D3DXERR_INVALIDDATA;
|
||||
+
|
||||
+ iface->lpVtbl->AddRef(iface);
|
||||
+ *effect = iface;
|
||||
+ return S_OK;
|
||||
}
|
||||
|
||||
static HRESULT WINAPI ID3DXEffectImpl_SetRawValue(ID3DXEffect *iface,
|
||||
--
|
||||
2.3.2
|
||||
|
1
patches/d3dx9_36-CloneEffect/definition
Normal file
1
patches/d3dx9_36-CloneEffect/definition
Normal file
@@ -0,0 +1 @@
|
||||
Fixes: Improve stub for ID3DXEffectImpl_CloneEffect
|
@@ -78,6 +78,7 @@ patch_enable_all ()
|
||||
enable_d3dx9_25_ID3DXEffect="$1"
|
||||
enable_d3dx9_26_ID3DXEffect="$1"
|
||||
enable_d3dx9_36_AnimationController="$1"
|
||||
enable_d3dx9_36_CloneEffect="$1"
|
||||
enable_d3dx9_36_D3DXStubs="$1"
|
||||
enable_d3dx9_36_DDS="$1"
|
||||
enable_d3dx9_36_DXTn="$1"
|
||||
@@ -286,6 +287,9 @@ patch_enable ()
|
||||
d3dx9_36-AnimationController)
|
||||
enable_d3dx9_36_AnimationController="$2"
|
||||
;;
|
||||
d3dx9_36-CloneEffect)
|
||||
enable_d3dx9_36_CloneEffect="$2"
|
||||
;;
|
||||
d3dx9_36-D3DXStubs)
|
||||
enable_d3dx9_36_D3DXStubs="$2"
|
||||
;;
|
||||
@@ -1400,6 +1404,9 @@ fi
|
||||
|
||||
# Patchset d3dx9_25-ID3DXEffect
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#25138] Fix wrong version of ID3DXEffect interface for d3dx9_25
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3dx9_25/Makefile.in, dlls/d3dx9_25/d3dx9_25.spec, dlls/d3dx9_25/effect.c, include/d3dx9effect.h
|
||||
# |
|
||||
@@ -1489,6 +1496,18 @@ if test "$enable_d3dx9_36_AnimationController" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3dx9_36-CloneEffect
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3dx9_36/effect.c
|
||||
# |
|
||||
if test "$enable_d3dx9_36_CloneEffect" -eq 1; then
|
||||
patch_apply d3dx9_36-CloneEffect/0001-d3dx9_36-Improve-stub-for-ID3DXEffectImpl_CloneEffec.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "d3dx9_36: Improve stub for ID3DXEffectImpl_CloneEffect.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3dx9_36-D3DXStubs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
Reference in New Issue
Block a user