Signed-off-by: Michael Stefaniuc mstefani@winehq.org --- dlls/d3dx9_36/effect.c | 75 ++++++++++++++++++++++-------------------- 1 file changed, 39 insertions(+), 36 deletions(-)
diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index bdc96e7972..39281b9d44 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -212,7 +212,7 @@ struct ID3DXEffectCompilerImpl
static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, unsigned int count, struct d3dx_parameter *parameters, const char *name); -static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_state *state, +static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects); static void free_parameter(struct d3dx_parameter *param, BOOL element, BOOL child);
@@ -5165,7 +5165,7 @@ static const struct ID3DXEffectCompilerVtbl ID3DXEffectCompiler_Vtbl = ID3DXEffectCompilerImpl_CompileShader, };
-static HRESULT d3dx9_parse_sampler(struct d3dx9_base_effect *base, struct d3dx_sampler *sampler, +static HRESULT d3dx_parse_sampler(struct d3dx_effect *effect, struct d3dx_sampler *sampler, const char *data, const char **ptr, struct d3dx_object *objects) { HRESULT hr; @@ -5183,7 +5183,7 @@ static HRESULT d3dx9_parse_sampler(struct d3dx9_base_effect *base, struct d3dx_s
for (i = 0; i < sampler->state_count; ++i) { - hr = d3dx9_parse_state(base, &sampler->states[i], data, ptr, objects); + hr = d3dx_parse_state(effect, &sampler->states[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse state %u\n", i); @@ -5205,7 +5205,7 @@ err_out: return hr; }
-static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static HRESULT d3dx_parse_value(struct d3dx_effect *effect, struct d3dx_parameter *param, void *value, const char *data, const char **ptr, struct d3dx_object *objects) { unsigned int i; @@ -5220,7 +5220,7 @@ static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_par { struct d3dx_parameter *member = ¶m->members[i];
- hr = d3dx9_parse_value(base, member, value ? (char *)value + old_size : NULL, data, ptr, objects); + hr = d3dx_parse_value(effect, member, value ? (char *)value + old_size : NULL, data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse value %u\n", i); @@ -5249,7 +5249,7 @@ static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_par { struct d3dx_parameter *member = ¶m->members[i];
- hr = d3dx9_parse_value(base, member, (char *)value + old_size, data, ptr, objects); + hr = d3dx_parse_value(effect, member, (char *)value + old_size, data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse value %u\n", i); @@ -5289,7 +5289,7 @@ static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_par if (!sampler) return E_OUTOFMEMORY;
- hr = d3dx9_parse_sampler(base, sampler, data, ptr, objects); + hr = d3dx_parse_sampler(effect, sampler, data, ptr, objects); if (hr != D3D_OK) { HeapFree(GetProcessHeap(), 0, sampler); @@ -5315,7 +5315,7 @@ static HRESULT d3dx9_parse_value(struct d3dx9_base_effect *base, struct d3dx_par return D3D_OK; }
-static HRESULT d3dx9_parse_init_value(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static HRESULT d3dx_parse_init_value(struct d3dx_effect *effect, struct d3dx_parameter *param, const char *data, const char *ptr, struct d3dx_object *objects) { UINT size = param->bytes; @@ -5353,7 +5353,7 @@ static HRESULT d3dx9_parse_init_value(struct d3dx9_base_effect *base, struct d3d } }
- hr = d3dx9_parse_value(base, param, value, data, &ptr, objects); + hr = d3dx_parse_value(effect, param, value, data, &ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -5507,7 +5507,7 @@ static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parame add_param_to_tree(base, ¶m->members[i], param, '.', 0); }
-static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx_parameter *param, const char *data, const char **ptr, struct d3dx_parameter *parent, UINT flags) { DWORD offset; @@ -5641,7 +5641,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct *ptr = save_ptr;
param_set_magic_number(¶m->members[i]); - hr = d3dx9_parse_effect_typedef(base, ¶m->members[i], data, ptr, param, flags); + hr = d3dx_parse_effect_typedef(effect, ¶m->members[i], data, ptr, param, flags); if (hr != D3D_OK) { WARN("Failed to parse member %u\n", i); @@ -5666,7 +5666,7 @@ static HRESULT d3dx9_parse_effect_typedef(struct d3dx9_base_effect *base, struct for (i = 0; i < param->member_count; ++i) { param_set_magic_number(¶m->members[i]); - hr = d3dx9_parse_effect_typedef(base, ¶m->members[i], data, ptr, NULL, flags); + hr = d3dx_parse_effect_typedef(effect, ¶m->members[i], data, ptr, NULL, flags); if (hr != D3D_OK) { WARN("Failed to parse member %u\n", i); @@ -5701,7 +5701,7 @@ err_out: return hr; }
-static HRESULT d3dx9_parse_effect_annotation(struct d3dx9_base_effect *base, struct d3dx_parameter *anno, +static HRESULT d3dx_parse_effect_annotation(struct d3dx_effect *effect, struct d3dx_parameter *anno, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5713,7 +5713,7 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx9_base_effect *base, str read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx9_parse_effect_typedef(base, anno, data, &ptr2, NULL, D3DX_PARAMETER_ANNOTATION); + hr = d3dx_parse_effect_typedef(effect, anno, data, &ptr2, NULL, D3DX_PARAMETER_ANNOTATION); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -5722,7 +5722,7 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx9_base_effect *base, str
read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx9_parse_init_value(base, anno, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, anno, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -5732,7 +5732,7 @@ static HRESULT d3dx9_parse_effect_annotation(struct d3dx9_base_effect *base, str return D3D_OK; }
-static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_state *state, +static HRESULT d3dx_parse_state(struct d3dx_effect *effect, struct d3dx_state *state, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5750,7 +5750,7 @@ static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_sta read_dword(ptr, &offset); TRACE("Typedef offset: %#x\n", offset); ptr2 = data + offset; - hr = d3dx9_parse_effect_typedef(base, &state->parameter, data, &ptr2, NULL, 0); + hr = d3dx_parse_effect_typedef(effect, &state->parameter, data, &ptr2, NULL, 0); if (hr != D3D_OK) { WARN("Failed to parse type definition\n"); @@ -5759,7 +5759,7 @@ static HRESULT d3dx9_parse_state(struct d3dx9_base_effect *base, struct d3dx_sta
read_dword(ptr, &offset); TRACE("Value offset: %#x\n", offset); - hr = d3dx9_parse_init_value(base, &state->parameter, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, &state->parameter, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value\n"); @@ -5775,7 +5775,7 @@ err_out: return hr; }
-static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, struct d3dx_top_level_parameter *param, +static HRESULT d3dx_parse_effect_parameter(struct d3dx_effect *effect, struct d3dx_top_level_parameter *param, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5796,14 +5796,14 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, stru read_dword(ptr, ¶m->annotation_count); TRACE("Annotation count: %u.\n", param->annotation_count);
- hr = d3dx9_parse_effect_typedef(base, ¶m->param, data, &ptr2, NULL, param->param.flags); + hr = d3dx_parse_effect_typedef(effect, ¶m->param, data, &ptr2, NULL, param->param.flags); if (hr != D3D_OK) { WARN("Failed to parse type definition.\n"); return hr; }
- hr = d3dx9_parse_init_value(base, ¶m->param, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, ¶m->param, data, data + offset, objects); if (hr != D3D_OK) { WARN("Failed to parse value.\n"); @@ -5824,7 +5824,7 @@ static HRESULT d3dx9_parse_effect_parameter(struct d3dx9_base_effect *base, stru for (i = 0; i < param->annotation_count; ++i) { param_set_magic_number(¶m->annotations[i]); - hr = d3dx9_parse_effect_annotation(base, ¶m->annotations[i], data, ptr, objects); + hr = d3dx_parse_effect_annotation(effect, ¶m->annotations[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse annotation.\n"); @@ -5848,7 +5848,7 @@ err_out: return hr; }
-static HRESULT d3dx9_parse_effect_pass(struct d3dx9_base_effect *base, struct d3dx_pass *pass, +static HRESULT d3dx_parse_effect_pass(struct d3dx_effect *effect, struct d3dx_pass *pass, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5886,7 +5886,7 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx9_base_effect *base, struct d3 for (i = 0; i < pass->annotation_count; ++i) { param_set_magic_number(&pass->annotations[i]); - hr = d3dx9_parse_effect_annotation(base, &pass->annotations[i], data, ptr, objects); + hr = d3dx_parse_effect_annotation(effect, &pass->annotations[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse annotation %u\n", i); @@ -5907,7 +5907,7 @@ static HRESULT d3dx9_parse_effect_pass(struct d3dx9_base_effect *base, struct d3
for (i = 0; i < pass->state_count; ++i) { - hr = d3dx9_parse_state(base, &states[i], data, ptr, objects); + hr = d3dx_parse_state(effect, &states[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse annotation %u\n", i); @@ -5945,7 +5945,7 @@ err_out: return hr; }
-static HRESULT d3dx9_parse_effect_technique(struct d3dx9_base_effect *base, struct d3dx_technique *technique, +static HRESULT d3dx_parse_effect_technique(struct d3dx_effect *effect, struct d3dx_technique *technique, const char *data, const char **ptr, struct d3dx_object *objects) { DWORD offset; @@ -5982,7 +5982,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx9_base_effect *base, stru for (i = 0; i < technique->annotation_count; ++i) { param_set_magic_number(&technique->annotations[i]); - hr = d3dx9_parse_effect_annotation(base, &technique->annotations[i], data, ptr, objects); + hr = d3dx_parse_effect_annotation(effect, &technique->annotations[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse annotation %u\n", i); @@ -6004,7 +6004,7 @@ static HRESULT d3dx9_parse_effect_technique(struct d3dx9_base_effect *base, stru
for (i = 0; i < technique->pass_count; ++i) { - hr = d3dx9_parse_effect_pass(base, &technique->passes[i], data, ptr, objects); + hr = d3dx_parse_effect_pass(effect, &technique->passes[i], data, ptr, objects); if (hr != D3D_OK) { WARN("Failed to parse pass %u\n", i); @@ -6082,9 +6082,10 @@ static HRESULT d3dx9_create_object(struct d3dx9_base_effect *base, struct d3dx_o return D3D_OK; }
-static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct d3dx_state *state, +static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx_state *state, const char **skip_constants, unsigned int skip_constants_count) { + struct d3dx9_base_effect *base = &effect->base_effect; DWORD string_size; struct d3dx_parameter *param = &state->parameter; struct d3dx_object *object = &base->objects[param->object_id]; @@ -6139,9 +6140,10 @@ static HRESULT d3dx9_parse_array_selector(struct d3dx9_base_effect *base, struct return ret; }
-static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char *data, const char **ptr, +static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, const char **ptr, const char **skip_constants, unsigned int skip_constants_count) { + struct d3dx9_base_effect *base = &effect->base_effect; DWORD technique_index; DWORD index, state_index, usage, element_index; struct d3dx_state *state; @@ -6308,7 +6310,7 @@ static HRESULT d3dx9_parse_resource(struct d3dx9_base_effect *base, const char * state->type = ST_ARRAY_SELECTOR; if (FAILED(hr = d3dx9_copy_data(base, param->object_id, ptr))) return hr; - hr = d3dx9_parse_array_selector(base, state, skip_constants, skip_constants_count); + hr = d3dx_parse_array_selector(effect, state, skip_constants, skip_constants_count); break;
default: @@ -6325,9 +6327,10 @@ static BOOL param_set_top_level_param(void *top_level_param, struct d3dx_paramet return FALSE; }
-static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *data, UINT data_size, +static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, UINT data_size, DWORD start, const char **skip_constants, unsigned int skip_constants_count) { + struct d3dx9_base_effect *base = &effect->base_effect; const char *ptr = data + start; UINT stringcount, resourcecount; HRESULT hr; @@ -6367,7 +6370,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da for (i = 0; i < base->parameter_count; ++i) { param_set_magic_number(&base->parameters[i].param); - hr = d3dx9_parse_effect_parameter(base, &base->parameters[i], data, &ptr, base->objects); + hr = d3dx_parse_effect_parameter(effect, &base->parameters[i], data, &ptr, base->objects); if (hr != D3D_OK) { WARN("Failed to parse parameter %u.\n", i); @@ -6393,7 +6396,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da for (i = 0; i < base->technique_count; ++i) { TRACE("Parsing technique %u.\n", i); - hr = d3dx9_parse_effect_technique(base, &base->techniques[i], data, &ptr, base->objects); + hr = d3dx_parse_effect_technique(effect, &base->techniques[i], data, &ptr, base->objects); if (hr != D3D_OK) { WARN("Failed to parse technique %u.\n", i); @@ -6429,7 +6432,7 @@ static HRESULT d3dx9_parse_effect(struct d3dx9_base_effect *base, const char *da { TRACE("parse resource %u.\n", i);
- hr = d3dx9_parse_resource(base, data, &ptr, skip_constants, skip_constants_count); + hr = d3dx_parse_resource(effect, data, &ptr, skip_constants, skip_constants_count); if (hr != D3D_OK) { WARN("Failed to parse resource %u.\n", i); @@ -6638,7 +6641,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, read_dword(&ptr, &offset); TRACE("Offset: %x\n", offset);
- hr = d3dx9_parse_effect(base, ptr, data_size, offset, skip_constants, skip_constants_count); + hr = d3dx_parse_effect(effect, ptr, data_size, offset, skip_constants, skip_constants_count); if (bytecode) ID3D10Blob_Release(bytecode); if (hr != D3D_OK)
Hi,
While running your changed tests on Windows, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check?
Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=48597
Your paranoid android.
=== debian9 (build log) ===
../../../wine/dlls/d3dx9_24/../d3dx9_36/effect.c:5790:16: error: conflicting types for ‘d3dx_parse_state’ ../../../wine/dlls/d3dx9_24/../d3dx9_36/effect.c:6143:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_24/../d3dx9_36/effect.c:6201:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_24/../d3dx9_36/effect.c:6388:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ Makefile:272: recipe for target 'effect.o' failed Makefile:8662: recipe for target 'dlls/d3dx9_24' failed ../../../wine/dlls/d3dx9_26/../d3dx9_36/effect.c:5790:16: error: conflicting types for ‘d3dx_parse_state’ ../../../wine/dlls/d3dx9_26/../d3dx9_36/effect.c:6143:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_26/../d3dx9_36/effect.c:6201:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_26/../d3dx9_36/effect.c:6388:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_25/../d3dx9_36/effect.c:5790:16: error: conflicting types for ‘d3dx_parse_state’ ../../../wine/dlls/d3dx9_25/../d3dx9_36/effect.c:6143:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_25/../d3dx9_36/effect.c:6201:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_25/../d3dx9_36/effect.c:6388:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ Makefile:272: recipe for target 'effect.o' failed Makefile:272: recipe for target 'effect.o' failed Makefile:8662: recipe for target 'dlls/d3dx9_25' failed Makefile:8662: recipe for target 'dlls/d3dx9_26' failed ../../../wine/dlls/d3dx9_27/../d3dx9_36/effect.c:5790:16: error: conflicting types for ‘d3dx_parse_state’ ../../../wine/dlls/d3dx9_27/../d3dx9_36/effect.c:6143:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_27/../d3dx9_36/effect.c:6201:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_27/../d3dx9_36/effect.c:6388:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ Makefile:272: recipe for target 'effect.o' failed Makefile:8662: recipe for target 'dlls/d3dx9_27' failed Task: The win32 build failed
=== debian9 (build log) ===
../../../wine/dlls/d3dx9_25/../d3dx9_36/effect.c:5790:16: error: conflicting types for ‘d3dx_parse_state’ ../../../wine/dlls/d3dx9_25/../d3dx9_36/effect.c:6143:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_25/../d3dx9_36/effect.c:6201:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_25/../d3dx9_36/effect.c:6388:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ Makefile:271: recipe for target 'effect.o' failed Makefile:8387: recipe for target 'dlls/d3dx9_25' failed ../../../wine/dlls/d3dx9_27/../d3dx9_36/effect.c:5790:16: error: conflicting types for ‘d3dx_parse_state’ ../../../wine/dlls/d3dx9_27/../d3dx9_36/effect.c:6143:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_27/../d3dx9_36/effect.c:6201:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_27/../d3dx9_36/effect.c:6388:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_24/../d3dx9_36/effect.c:5790:16: error: conflicting types for ‘d3dx_parse_state’ ../../../wine/dlls/d3dx9_24/../d3dx9_36/effect.c:6143:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_24/../d3dx9_36/effect.c:6201:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_24/../d3dx9_36/effect.c:6388:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ Makefile:271: recipe for target 'effect.o' failed Makefile:271: recipe for target 'effect.o' failed Makefile:8387: recipe for target 'dlls/d3dx9_24' failed Makefile:8387: recipe for target 'dlls/d3dx9_27' failed ../../../wine/dlls/d3dx9_26/../d3dx9_36/effect.c:5790:16: error: conflicting types for ‘d3dx_parse_state’ ../../../wine/dlls/d3dx9_26/../d3dx9_36/effect.c:6143:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_26/../d3dx9_36/effect.c:6201:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ ../../../wine/dlls/d3dx9_26/../d3dx9_36/effect.c:6388:45: error: dereferencing pointer to incomplete type ‘struct d3dx_effect’ Makefile:271: recipe for target 'effect.o' failed Makefile:8387: recipe for target 'dlls/d3dx9_26' failed Task: The wow64 build failed
-
Marvin -
Matteo Bruni -
Michael Stefaniuc