From 515c280579da01de38068cee670fbb725c7f3cd0 Mon Sep 17 00:00:00 2001 From: winesync Date: Mon, 21 Sep 2020 22:50:18 +0200 Subject: [PATCH] [WINESYNC] d3dx9: Pass a struct d3dx_effect to d3dx9_create_object(). Signed-off-by: Michael Stefaniuc Signed-off-by: Matteo Bruni Signed-off-by: Alexandre Julliard wine commit id 92d2f6d99429df4b5f132eca2fa8a2c1eae4a6d0 by Michael Stefaniuc --- dll/directx/wine/d3dx9_36/effect.c | 8 ++++---- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index c44bb37a96b..e98b717d62c 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -5678,10 +5678,10 @@ err_out: return hr; } -static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_object *object) +static HRESULT d3dx9_create_object(struct d3dx_effect *effect, struct d3dx_object *object) { struct d3dx_parameter *param = object->param; - struct IDirect3DDevice9 *device = base->effect->device; + IDirect3DDevice9 *device = effect->device; HRESULT hr; if (*(char **)param->data) @@ -5884,7 +5884,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, if (object->data) { - if (FAILED(hr = d3dx9_create_object(base, object))) + if (FAILED(hr = d3dx9_create_object(effect, object))) return hr; if (FAILED(hr = d3dx_create_param_eval(effect, object->data, object->size, param->type, ¶m->param_eval, get_version_counter_ptr(effect), @@ -6061,7 +6061,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U if (effect->objects[id].data) { - if (FAILED(hr = d3dx9_create_object(base, &effect->objects[id]))) + if (FAILED(hr = d3dx9_create_object(effect, &effect->objects[id]))) goto err_out; } } diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index c198d643911..f13123e57b1 100644 --- a/sdk/tools/winesync/d3dx9.cfg +++ b/sdk/tools/winesync/d3dx9.cfg @@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h: sdk/inc include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h: sdk/include/dxsdk/d3dx9of.h, include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h: sdk/include/dxsdk/d3dx9shape.h, include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h} -tags: {wine: de59a1297111dfd0be93dccaa2db31865c61b79a} +tags: {wine: 92d2f6d99429df4b5f132eca2fa8a2c1eae4a6d0}