Module: wine Branch: master Commit: c56906599cdad729834a6807747ce2c928fc511d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c56906599cdad729834a68077...
Author: Michael Stefaniuc mstefani@winehq.org Date: Fri Mar 22 19:09:54 2019 +0100
d3dx9: Avoid using This in d3dx_effect_Clone().
Signed-off-by: Michael Stefaniuc mstefani@winehq.org Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/d3dx9_36/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 43cc32d..b98cab2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -4087,17 +4087,17 @@ static HRESULT WINAPI d3dx_effect_DeleteParameterBlock(ID3DXEffect *iface, D3DXH } #endif
-static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, struct IDirect3DDevice9 *device, - struct ID3DXEffect **effect) +static HRESULT WINAPI d3dx_effect_CloneEffect(ID3DXEffect *iface, IDirect3DDevice9 *device, + ID3DXEffect **new_effect) { - struct d3dx_effect *This = impl_from_ID3DXEffect(iface); + struct d3dx_effect *effect = impl_from_ID3DXEffect(iface);
- FIXME("(%p)->(%p, %p): stub\n", This, device, effect); + FIXME("iface %p, device %p, new_effect %p stub.\n", effect, device, new_effect);
- if (!effect) + if (!new_effect) return D3DERR_INVALIDCALL;
- if (This->base_effect.flags & D3DXFX_NOT_CLONEABLE) + if (effect->base_effect.flags & D3DXFX_NOT_CLONEABLE) return E_FAIL;
if (!device)