Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-30 02:58:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WINESYNC] d3dx9: Factor out free_parameter_object_data() function.

Browse source 
Signed-off-by: Paul Gofman <gofmanp@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

wine commit id 07562f1e3927b2aa1521811f0c16a7f05c175cba by Paul Gofman <gofmanp@gmail.com>
This commit is contained in:
winesync 2020-09-21 23:03:21 +02:00 committed by Jérôme Gardou
parent 0bc31de988
commit 3daf9d55e6
2 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -546,16 +546,21 @@ static void free_sampler(struct d3dx_sampler *sampler)
static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param); static void d3dx_pool_release_shared_parameter(struct d3dx_top_level_parameter *param);
static void free_parameter_data(struct d3dx_parameter *param, BOOL child) static void free_parameter_object_data(struct d3dx_parameter *param, const void *data, unsigned int bytes)
{ {
if (!param->data) unsigned int i, count;
if (param->class != D3DXPC_OBJECT)
return; return;
if (param->class == D3DXPC_OBJECT && !param->element_count)
count = min(param->element_count ? param->element_count : 1, bytes / sizeof(void *));
for (i = 0; i < count; ++i)
{ {
switch (param->type) switch (param->type)
{ {
case D3DXPT_STRING: case D3DXPT_STRING:
heap_free(*(char **)param->data); heap_free(((char **)data)[i]);
break; break;
case D3DXPT_TEXTURE: case D3DXPT_TEXTURE:
@ -565,7 +570,8 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child)
case D3DXPT_TEXTURECUBE: case D3DXPT_TEXTURECUBE:
case D3DXPT_PIXELSHADER: case D3DXPT_PIXELSHADER:
case D3DXPT_VERTEXSHADER: case D3DXPT_VERTEXSHADER:
if (*(IUnknown **)param->data) IUnknown_Release(*(IUnknown **)param->data); if (*(IUnknown **)data)
IUnknown_Release(((IUnknown **)data)[i]);
break; break;
case D3DXPT_SAMPLER: case D3DXPT_SAMPLER:
@ -573,7 +579,8 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child)
case D3DXPT_SAMPLER2D: case D3DXPT_SAMPLER2D:
case D3DXPT_SAMPLER3D: case D3DXPT_SAMPLER3D:
case D3DXPT_SAMPLERCUBE: case D3DXPT_SAMPLERCUBE:
free_sampler((struct d3dx_sampler *)param->data); assert(count == 1);
free_sampler((struct d3dx_sampler *)data);
return; return;
default: default:
@ -581,6 +588,16 @@ static void free_parameter_data(struct d3dx_parameter *param, BOOL child)
break; break;
} }
} }
}
static void free_parameter_data(struct d3dx_parameter *param, BOOL child)
{
if (!param->data)
return;
if (!param->element_count)
free_parameter_object_data(param, param->data, param->bytes);
if (!child || is_param_type_sampler(param->type)) if (!child || is_param_type_sampler(param->type))
heap_free(param->data); heap_free(param->data);
} }

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/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/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} include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h: sdk/include/dxsdk/d3dx9xof.h}
tags: {wine: 4020a38259774c64035e5783d595ff88097cedf8} tags: {wine: 07562f1e3927b2aa1521811f0c16a7f05c175cba}