Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 21:21:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Don't pass a struct d3dx9_base_effect to d3dx9_base_effect_init().

Browse source 
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>
This commit is contained in:
winesync 2020-09-21 22:50:18 +02:00 committed by Jérôme Gardou
parent a639b63404
commit 9ed5adb0c1
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
dll/directx/wine/d3dx9_36/effect.c
View file

@ -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);

2
sdk/tools/winesync/d3dx9.cfg
View file

@ -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}