https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9ed5adb0c1b0ad02aec0e3...
commit 9ed5adb0c1b0ad02aec0e3ff0b78063be779ea1e Author: winesync ros-dev@reactos.org AuthorDate: Mon Sep 21 22:50:18 2020 +0200 Commit: Jérôme Gardou jerome.gardou@reactos.org CommitDate: Thu Feb 4 16:37:03 2021 +0100
[WINESYNC] d3dx9: Don't pass a struct d3dx9_base_effect to d3dx9_base_effect_init().
Signed-off-by: Michael Stefaniuc mstefani@winehq.org Signed-off-by: Matteo Bruni mbruni@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
wine commit id de59a1297111dfd0be93dccaa2db31865c61b79a by Michael Stefaniuc mstefani@winehq.org --- dll/directx/wine/d3dx9_36/effect.c | 18 +++++++++--------- sdk/tools/winesync/d3dx9.cfg | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/dll/directx/wine/d3dx9_36/effect.c b/dll/directx/wine/d3dx9_36/effect.c index a7341cef907..c44bb37a96b 100644 --- a/dll/directx/wine/d3dx9_36/effect.c +++ b/dll/directx/wine/d3dx9_36/effect.c @@ -6177,11 +6177,11 @@ static const char **parse_skip_constants_string(char *skip_constants_string, uns return new_alloc; }
-static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, - const char *data, SIZE_T data_size, const D3D_SHADER_MACRO *defines, ID3DInclude *include, - UINT eflags, ID3DBlob **errors, struct d3dx_effect *effect, struct d3dx_effect_pool *pool, - const char *skip_constants_string) +static HRESULT d3dx9_base_effect_init(struct d3dx_effect *effect, const char *data, SIZE_T data_size, + const D3D_SHADER_MACRO *defines, ID3DInclude *include, unsigned int eflags, ID3DBlob **errors, + struct d3dx_effect_pool *pool, const char *skip_constants_string) { + struct d3dx9_base_effect *base = &effect->base_effect; DWORD tag, offset; const char *ptr = data; HRESULT hr; @@ -6196,9 +6196,9 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, #endif unsigned int i, j;
- TRACE("base %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, " - "effect %p, pool %p, skip_constants %s.\n", - base, data, data_size, defines, include, eflags, errors, effect, pool, + TRACE("effect %p, data %p, data_size %lu, defines %p, include %p, eflags %#x, errors %p, " + "pool %p, skip_constants %s.\n", + effect, data, data_size, defines, include, eflags, errors, pool, debugstr_a(skip_constants_string));
base->effect = effect; @@ -6343,8 +6343,8 @@ static HRESULT d3dx9_effect_init(struct d3dx_effect *effect, struct IDirect3DDev IDirect3DDevice9_AddRef(device); effect->device = device;
- if (FAILED(hr = d3dx9_base_effect_init(&effect->base_effect, data, data_size, defines, include, - eflags, error_messages, effect, pool_impl, skip_constants))) + if (FAILED(hr = d3dx9_base_effect_init(effect, data, data_size, defines, include, eflags, + error_messages, pool_impl, skip_constants))) { FIXME("Failed to parse effect, hr %#x.\n", hr); free_effect(effect); diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg index baa8c8da5e7..c198d643911 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: baf4aaa359c75715e7840b4c045fdb22adf2bc8a} +tags: {wine: de59a1297111dfd0be93dccaa2db31865c61b79a}