March 2019 - Wine-devel - list.winehq.org

[PATCH 7/7] d3dx9: Pass a struct d3dx_effect to d3dx9_base_effect_cleanup()
by Michael Stefaniuc 18 Mar '19

18 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index ae577d0f9b..51c7a37575 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -683,8 +683,9 @@ static void free_technique(struct d3dx_technique *technique) technique->name = NULL; } -static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) +static void d3dx9_base_effect_cleanup(struct d3dx_effect *effect) { + struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i; TRACE("base %p.\n", base); @@ -693,7 +694,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) if (base->parameters) { - for (i = 0; i < base->effect->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) free_top_level_parameter(&base->parameters[i]); HeapFree(GetProcessHeap(), 0, base->parameters); base->parameters = NULL; @@ -707,14 +708,14 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) base->techniques = NULL; } - if (base->effect->objects) + if (effect->objects) { - for (i = 0; i < base->effect->object_count; ++i) + for (i = 0; i < effect->object_count; ++i) { - free_object(&base->effect->objects[i]); + free_object(&effect->objects[i]); } - HeapFree(GetProcessHeap(), 0, base->effect->objects); - base->effect->objects = NULL; + heap_free(effect->objects); + effect->objects = NULL; } } @@ -722,7 +723,7 @@ static void free_effect(struct d3dx_effect *effect) { TRACE("Free effect %p\n", effect); - d3dx9_base_effect_cleanup(&effect->base_effect); + d3dx9_base_effect_cleanup(effect); if (effect->pool) { @@ -6302,7 +6303,7 @@ static HRESULT d3dx9_base_effect_init(struct d3dx9_base_effect *base, debugstr_a(skip_constants[i]), j); HeapFree(GetProcessHeap(), 0, skip_constants_buffer); HeapFree(GetProcessHeap(), 0, skip_constants); - d3dx9_base_effect_cleanup(base); + d3dx9_base_effect_cleanup(effect); return D3DERR_INVALIDCALL; } } -- 2.20.1

2 1

[PATCH 6/7] d3dx9: Pass a struct d3dx_effect to get_annotation_by_name()
by Michael Stefaniuc 18 Mar '19

18 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index a45f2890b2..ae577d0f9b 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -854,9 +854,10 @@ static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx9_base_ef return NULL; } -static struct d3dx_parameter *get_annotation_by_name(struct d3dx9_base_effect *base, - unsigned int count, struct d3dx_parameter *annotations, const char *name) +static struct d3dx_parameter *get_annotation_by_name(struct d3dx_effect *effect, unsigned int count, + struct d3dx_parameter *annotations, const char *name) { + struct d3dx9_base_effect *base = &effect->base_effect; UINT i, length; struct d3dx_parameter *temp_parameter; const char *part; @@ -2251,7 +2252,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetAnnotationByName(ID3DXEffect *iface, D3D annotation_count = get_annotation_from_object(effect, object, &annotations); - annotation = get_annotation_by_name(&effect->base_effect, annotation_count, annotations, name); + annotation = get_annotation_by_name(effect, annotation_count, annotations, name); if (annotation) { TRACE("Returning parameter %p\n", annotation); -- 2.20.1

2 1

[PATCH 5/7] d3dx9: Pass a struct d3dx_effect to add_param_to_tree()
by Michael Stefaniuc 18 Mar '19

18 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index e20c9c54ad..a45f2890b2 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -5072,7 +5072,7 @@ static int param_rb_compare(const void *key, const struct wine_rb_entry *entry) return strcmp(name, param->full_name); } -static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parameter *param, +static void add_param_to_tree(struct d3dx_effect *effect, struct d3dx_parameter *param, struct d3dx_parameter *parent, char separator, unsigned int element) { const char *parent_name = parent ? parent->full_name : NULL; @@ -5127,18 +5127,18 @@ static void add_param_to_tree(struct d3dx9_base_effect *base, struct d3dx_parame memcpy(param->full_name, param->name, len); } TRACE("Full name is %s.\n", param->full_name); - wine_rb_put(&base->param_tree, param->full_name, &param->rb_entry); + wine_rb_put(&effect->base_effect.param_tree, param->full_name, &param->rb_entry); if (is_top_level_parameter(param)) for (i = 0; i < param->top_level_param->annotation_count; ++i) - add_param_to_tree(base, &param->top_level_param->annotations[i], param, '@', 0); + add_param_to_tree(effect, &param->top_level_param->annotations[i], param, '@', 0); if (param->element_count) for (i = 0; i < param->element_count; ++i) - add_param_to_tree(base, &param->members[i], param, '[', i); + add_param_to_tree(effect, &param->members[i], param, '[', i); else for (i = 0; i < param->member_count; ++i) - add_param_to_tree(base, &param->members[i], param, '.', 0); + add_param_to_tree(effect, &param->members[i], param, '.', 0); } static HRESULT d3dx_parse_effect_typedef(struct d3dx_effect *effect, struct d3dx_parameter *param, @@ -6013,7 +6013,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } walk_parameter_tree(&base->parameters[i].param, param_set_top_level_param, &base->parameters[i]); - add_param_to_tree(base, &base->parameters[i].param, NULL, 0, 0); + add_param_to_tree(effect, &base->parameters[i].param, NULL, 0, 0); } } -- 2.20.1

2 1

[PATCH 4/7] d3dx9: Pass a struct d3dx_effect to the version helpers
by Michael Stefaniuc 18 Mar '19

18 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 71965460b6..e20c9c54ad 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1143,14 +1143,14 @@ static BOOL walk_parameter_tree(struct d3dx_parameter *param, walk_parameter_dep return FALSE; } -static ULONG64 *get_version_counter_ptr(struct d3dx9_base_effect *base) +static ULONG64 *get_version_counter_ptr(struct d3dx_effect *effect) { - return base->pool ? &base->pool->version_counter : &base->version_counter; + return effect->base_effect.pool ? &effect->base_effect.pool->version_counter : &effect->base_effect.version_counter; } -static ULONG64 next_effect_update_version(struct d3dx9_base_effect *base) +static ULONG64 next_effect_update_version(struct d3dx_effect *effect) { - return next_update_version(get_version_counter_ptr(base)); + return next_update_version(get_version_counter_ptr(effect)); } static void set_dirty(struct d3dx_parameter *param) @@ -1577,7 +1577,7 @@ static HRESULT d3dx9_apply_pass_states(struct d3dx_effect *effect, struct d3dx_p unsigned int i; HRESULT ret; HRESULT hr; - ULONG64 new_update_version = next_effect_update_version(&effect->base_effect); + ULONG64 new_update_version = next_effect_update_version(effect); TRACE("effect %p, pass %p, state_count %u.\n", effect, pass, pass->state_count); @@ -5745,7 +5745,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx FIXME("Unaligned string_size %u.\n", string_size); if (FAILED(ret = d3dx_create_param_eval(base, (DWORD *)(ptr + string_size) + 1, object->size - (string_size + sizeof(DWORD)), D3DXPT_INT, &param->param_eval, - get_version_counter_ptr(base), NULL, 0))) + get_version_counter_ptr(effect), NULL, 0))) return ret; ret = D3D_OK; param = state->referenced_param; @@ -5765,7 +5765,7 @@ static HRESULT d3dx_parse_array_selector(struct d3dx_effect *effect, struct d3dx TRACE("Creating preshader for object %u.\n", param->members[i].object_id); object = &effect->objects[param->members[i].object_id]; if (FAILED(ret = d3dx_create_param_eval(base, object->data, object->size, param->type, - &param->members[i].param_eval, get_version_counter_ptr(base), + &param->members[i].param_eval, get_version_counter_ptr(effect), skip_constants, skip_constants_count))) break; } @@ -5884,7 +5884,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, if (FAILED(hr = d3dx9_create_object(base, object))) return hr; if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type, - &param->param_eval, get_version_counter_ptr(base), + &param->param_eval, get_version_counter_ptr(effect), skip_constants, skip_constants_count))) return hr; } @@ -5898,7 +5898,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, if (FAILED(hr = d3dx9_copy_data(effect, param->object_id, ptr))) return hr; if (FAILED(hr = d3dx_create_param_eval(base, object->data, object->size, param->type, - &param->param_eval, get_version_counter_ptr(base), NULL, 0))) + &param->param_eval, get_version_counter_ptr(effect), NULL, 0))) return hr; break; @@ -5927,7 +5927,7 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, if (!refpar->param_eval) { if (FAILED(hr = d3dx_create_param_eval(base, refobj->data, refobj->size, - refpar->type, &refpar->param_eval, get_version_counter_ptr(base), + refpar->type, &refpar->param_eval, get_version_counter_ptr(effect), skip_constants, skip_constants_count))) return hr; } -- 2.20.1

2 1

[PATCH 3/7] d3dx9: Pass a struct d3dx_effect to get_valid_pass()
by Michael Stefaniuc 18 Mar '19

18 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3d90cc6cb3..71965460b6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -483,8 +483,9 @@ static struct d3dx_technique *get_valid_technique(struct d3dx_effect *effect, D3 return get_technique_by_name(effect, technique); } -static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHANDLE pass) +static struct d3dx_pass *get_valid_pass(struct d3dx_effect *effect, D3DXHANDLE pass) { + struct d3dx9_base_effect *base = &effect->base_effect; unsigned int i, k; for (i = 0; i < base->technique_count; ++i) @@ -1087,9 +1088,8 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXHANDLE object, struct d3dx_parameter **annotations) { - struct d3dx9_base_effect *base = &effect->base_effect; struct d3dx_parameter *param = get_valid_parameter(effect, object); - struct d3dx_pass *pass = get_valid_pass(base, object); + struct d3dx_pass *pass = get_valid_pass(effect, object); struct d3dx_technique *technique = get_valid_technique(effect, object); if (pass) @@ -1918,7 +1918,7 @@ static HRESULT WINAPI d3dx_effect_GetTechniqueDesc(ID3DXEffect *iface, D3DXHANDL static HRESULT WINAPI d3dx_effect_GetPassDesc(ID3DXEffect *iface, D3DXHANDLE pass_handle, D3DXPASS_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_pass *pass = get_valid_pass(&effect->base_effect, pass_handle); + struct d3dx_pass *pass = get_valid_pass(effect, pass_handle); unsigned int i; TRACE("iface %p, pass %p, desc %p.\n", iface, pass, desc); -- 2.20.1

2 1

[PATCH 2/7] d3dx9: Pass a struct d3dx_effect to get_valid_parameter()
by Michael Stefaniuc 18 Mar '19

18 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 91 +++++++++++++++++++++--------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index d2e03f50d4..3d90cc6cb3 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -501,7 +501,7 @@ static struct d3dx_pass *get_valid_pass(struct d3dx9_base_effect *base, D3DXHAND return NULL; } -static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base, D3DXHANDLE parameter) +static struct d3dx_parameter *get_valid_parameter(struct d3dx_effect *effect, D3DXHANDLE parameter) { struct d3dx_parameter *handle_param = (struct d3dx_parameter *)parameter; @@ -509,7 +509,8 @@ static struct d3dx_parameter *get_valid_parameter(struct d3dx9_base_effect *base sizeof(parameter_magic_string))) return handle_param; - return base->flags & D3DXFX_LARGEADDRESSAWARE ? NULL : get_parameter_by_name(base, NULL, parameter); + return effect->base_effect.flags & D3DXFX_LARGEADDRESSAWARE + ? NULL : get_parameter_by_name(&effect->base_effect, NULL, parameter); } static void free_state(struct d3dx_state *state) @@ -1087,7 +1088,7 @@ static unsigned int get_annotation_from_object(struct d3dx_effect *effect, D3DXH struct d3dx_parameter **annotations) { struct d3dx9_base_effect *base = &effect->base_effect; - struct d3dx_parameter *param = get_valid_parameter(base, object); + struct d3dx_parameter *param = get_valid_parameter(effect, object); struct d3dx_pass *pass = get_valid_pass(base, object); struct d3dx_technique *technique = get_valid_technique(effect, object); @@ -1867,7 +1868,7 @@ static HRESULT WINAPI d3dx_effect_GetParameterDesc(ID3DXEffect *iface, D3DXHANDL D3DXPARAMETER_DESC *desc) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, desc %p.\n", iface, parameter, desc); @@ -1976,7 +1977,7 @@ static HRESULT WINAPI d3dx_effect_GetFunctionDesc(ID3DXEffect *iface, D3DXHANDLE static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); @@ -2006,7 +2007,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DX const char *name) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); D3DXHANDLE handle; TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name)); @@ -2028,7 +2029,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, const char *semantic) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); struct d3dx_parameter *temp_param; unsigned int i; @@ -2089,7 +2090,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); @@ -2266,7 +2267,7 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame const void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); unsigned int i; TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); @@ -2341,7 +2342,7 @@ static HRESULT WINAPI d3dx_effect_SetValue(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parameter, void *data, UINT bytes) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, data %p, bytes %u.\n", iface, parameter, data, bytes); @@ -2406,7 +2407,7 @@ static HRESULT WINAPI d3dx_effect_GetValue(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL b) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, b %#x.\n", iface, parameter, b); @@ -2425,7 +2426,7 @@ static HRESULT WINAPI d3dx_effect_SetBool(ID3DXEffect *iface, D3DXHANDLE paramet static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, b %p.\n", iface, parameter, b); @@ -2444,7 +2445,7 @@ static HRESULT WINAPI d3dx_effect_GetBool(ID3DXEffect *iface, D3DXHANDLE paramet static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, const BOOL *b, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); @@ -2485,7 +2486,7 @@ static HRESULT WINAPI d3dx_effect_SetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, b %p, count %u.\n", iface, parameter, b, count); @@ -2511,7 +2512,7 @@ static HRESULT WINAPI d3dx_effect_GetBoolArray(ID3DXEffect *iface, D3DXHANDLE pa static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, n %d.\n", iface, parameter, n); @@ -2553,7 +2554,7 @@ static HRESULT WINAPI d3dx_effect_SetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, n %p.\n", iface, parameter, n); @@ -2591,7 +2592,7 @@ static HRESULT WINAPI d3dx_effect_GetInt(ID3DXEffect *iface, D3DXHANDLE paramete static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, const INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); @@ -2629,7 +2630,7 @@ static HRESULT WINAPI d3dx_effect_SetIntArray(ID3DXEffect *iface, D3DXHANDLE par static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE parameter, INT *n, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, n %p, count %u.\n", iface, parameter, n, count); @@ -2653,7 +2654,7 @@ static HRESULT WINAPI d3dx_effect_GetIntArray(ID3DXEffect *iface, D3DXHANDLE par static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float f) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, f %.8e.\n", iface, parameter, f); @@ -2676,7 +2677,7 @@ static HRESULT WINAPI d3dx_effect_SetFloat(ID3DXEffect *iface, D3DXHANDLE parame static HRESULT WINAPI d3dx_effect_GetFloat(ID3DXEffect *iface, D3DXHANDLE parameter, float *f) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, f %p.\n", iface, parameter, f); @@ -2696,7 +2697,7 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p const float *f, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); @@ -2734,7 +2735,7 @@ static HRESULT WINAPI d3dx_effect_SetFloatArray(ID3DXEffect *iface, D3DXHANDLE p static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE parameter, float *f, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, f %p, count %u.\n", iface, parameter, f, count); @@ -2758,7 +2759,7 @@ static HRESULT WINAPI d3dx_effect_GetFloatArray(ID3DXEffect *iface, D3DXHANDLE p static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXVECTOR4 *vector) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); @@ -2812,7 +2813,7 @@ static HRESULT WINAPI d3dx_effect_SetVector(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetVector(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXVECTOR4 *vector) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, vector %p.\n", iface, parameter, vector); @@ -2856,7 +2857,7 @@ static HRESULT WINAPI d3dx_effect_SetVectorArray(ID3DXEffect *iface, D3DXHANDLE const D3DXVECTOR4 *vector, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); @@ -2906,7 +2907,7 @@ static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE D3DXVECTOR4 *vector, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, vector %p, count %u.\n", iface, parameter, vector, count); @@ -2946,7 +2947,7 @@ static HRESULT WINAPI d3dx_effect_GetVectorArray(ID3DXEffect *iface, D3DXHANDLE static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, const D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); @@ -2981,7 +2982,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrix(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetMatrix(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); @@ -3016,7 +3017,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixArray(ID3DXEffect *iface, D3DXHANDLE const D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); @@ -3055,7 +3056,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixArray(ID3DXEffect *iface, D3DXHANDLE D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); @@ -3096,7 +3097,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixPointerArray(ID3DXEffect *iface, D3DX const D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); @@ -3132,7 +3133,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixPointerArray(ID3DXEffect *iface, D3DX D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); @@ -3172,7 +3173,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTranspose(ID3DXEffect *iface, D3DXHAN const D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); @@ -3208,7 +3209,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTranspose(ID3DXEffect *iface, D3DXHAN D3DXMATRIX *matrix) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p.\n", iface, parameter, matrix); @@ -3246,7 +3247,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposeArray(ID3DXEffect *iface, D3 const D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); @@ -3285,7 +3286,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposeArray(ID3DXEffect *iface, D3 D3DXMATRIX *matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); @@ -3326,7 +3327,7 @@ static HRESULT WINAPI d3dx_effect_SetMatrixTransposePointerArray(ID3DXEffect *if const D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); @@ -3362,7 +3363,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if D3DXMATRIX **matrix, UINT count) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, matrix %p, count %u.\n", iface, parameter, matrix, count); @@ -3401,7 +3402,7 @@ static HRESULT WINAPI d3dx_effect_GetMatrixTransposePointerArray(ID3DXEffect *if static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char *string) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, string %s.\n", iface, parameter, debugstr_a(string)); @@ -3419,7 +3420,7 @@ static HRESULT WINAPI d3dx_effect_SetString(ID3DXEffect *iface, D3DXHANDLE param static HRESULT WINAPI d3dx_effect_GetString(ID3DXEffect *iface, D3DXHANDLE parameter, const char **string) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, string %p.\n", iface, parameter, string); @@ -3439,7 +3440,7 @@ static HRESULT WINAPI d3dx_effect_SetTexture(ID3DXEffect *iface, D3DXHANDLE para IDirect3DBaseTexture9 *texture) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); @@ -3473,7 +3474,7 @@ static HRESULT WINAPI d3dx_effect_GetTexture(ID3DXEffect *iface, D3DXHANDLE para IDirect3DBaseTexture9 **texture) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, texture %p.\n", iface, parameter, texture); @@ -3498,7 +3499,7 @@ static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE IDirect3DPixelShader9 **shader) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); @@ -3519,7 +3520,7 @@ static HRESULT WINAPI d3dx_effect_GetVertexShader(ID3DXEffect *iface, D3DXHANDLE IDirect3DVertexShader9 **shader) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); @@ -3797,7 +3798,7 @@ static BOOL is_parameter_used(struct d3dx_parameter *param, struct d3dx_techniqu static BOOL WINAPI d3dx_effect_IsParameterUsed(ID3DXEffect *iface, D3DXHANDLE parameter, D3DXHANDLE technique) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); - struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); + struct d3dx_parameter *param = get_valid_parameter(effect, parameter); struct d3dx_technique *tech = get_valid_technique(effect, technique); BOOL ret; -- 2.20.1

2 1

[PATCH 1/7] d3dx9: Merge the d3dx_effect_GetVertexShader() helper
by Michael Stefaniuc 18 Mar '19

18 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 35 ++++++++++++++--------------------- 1 file changed, 14 insertions(+), 21 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 0a5294099e..d2e03f50d4 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,24 +1177,6 @@ static HRESULT set_string(char **param_data, const char *string) return D3D_OK; } -static HRESULT d3dx9_base_effect_get_vertex_shader(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, struct IDirect3DVertexShader9 **shader) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) - { - if ((*shader = *(struct IDirect3DVertexShader9 **)param->data)) - IDirect3DVertexShader9_AddRef(*shader); - TRACE("Returning %p.\n", *shader); - return D3D_OK; - } - - WARN("Parameter not found.\n"); - - return D3DERR_INVALIDCALL; -} - static void d3dx9_set_light_parameter(enum LIGHT_TYPE op, D3DLIGHT9 *light, void *value) { static const struct @@ -3533,14 +3515,25 @@ static HRESULT WINAPI d3dx_effect_GetPixelShader(ID3DXEffect *iface, D3DXHANDLE return D3DERR_INVALIDCALL; } -static HRESULT WINAPI d3dx_effect_GetVertexShader(struct ID3DXEffect *iface, D3DXHANDLE parameter, - struct IDirect3DVertexShader9 **shader) +static HRESULT WINAPI d3dx_effect_GetVertexShader(ID3DXEffect *iface, D3DXHANDLE parameter, + IDirect3DVertexShader9 **shader) { struct d3dx_effect *effect = impl_from_ID3DXEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(&effect->base_effect, parameter); TRACE("iface %p, parameter %p, shader %p.\n", iface, parameter, shader); - return d3dx9_base_effect_get_vertex_shader(&effect->base_effect, parameter, shader); + if (shader && param && !param->element_count && param->type == D3DXPT_VERTEXSHADER) + { + if ((*shader = *(IDirect3DVertexShader9 **)param->data)) + IDirect3DVertexShader9_AddRef(*shader); + TRACE("Returning %p.\n", *shader); + return D3D_OK; + } + + WARN("Parameter not found.\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI d3dx_effect_SetArrayRange(ID3DXEffect *iface, D3DXHANDLE parameter, UINT start, UINT end) -- 2.20.1

2 1

[PATCH 1/3] explorerframe: return S_OK in ITaskbarList3 SetThumbnailTooltip method
by Louis Lenders 18 Mar '19

18 Mar '19

Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=45429 Signed-off-by: Louis Lenders <xerox.xerox2000x(a)gmail.com> --- dlls/explorerframe/taskbarlist.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/explorerframe/taskbarlist.c b/dlls/explorerframe/taskbarlist.c index a50f8a97d3..afcd7bfb03 100644 --- a/dlls/explorerframe/taskbarlist.c +++ b/dlls/explorerframe/taskbarlist.c @@ -234,9 +234,9 @@ static HRESULT STDMETHODCALLTYPE taskbar_list_SetThumbnailTooltip(ITaskbarList4 HWND hwnd, LPCWSTR pszTip) { - FIXME("iface %p, hwnd %p, pszTip %s stub!\n", iface, hwnd, debugstr_w(pszTip)); + FIXME("iface %p, hwnd %p, pszTip %s stub, faking success!\n", iface, hwnd, debugstr_w(pszTip)); - return E_NOTIMPL; + return S_OK; } static HRESULT STDMETHODCALLTYPE taskbar_list_SetThumbnailClip(ITaskbarList4 *iface, -- 2.20.1

1 2

[PATCH] testbot/WineRunWineTest: Fix a typo in an error message.
by Francois Gouget 18 Mar '19

18 Mar '19

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineRunWineTest.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/bin/WineRunWineTest.pl b/testbot/bin/WineRunWineTest.pl index 8792be39..a74877a8 100755 --- a/testbot/bin/WineRunWineTest.pl +++ b/testbot/bin/WineRunWineTest.pl @@ -423,7 +423,7 @@ if (defined $FileName) my $Dst = $Step->FileType eq "patch" ? "patch.diff" : $FileName; if (!$TA->SendFile($Step->GetFullFileName(), "staging/$Dst", 0)) { - FatalTAError($TA, "Could send '$FileName' to the VM"); + FatalTAError($TA, "Could not send '$FileName' to the VM"); } } -- 2.20.1

1 0

[PATCH vkd3d] build: Depend on the Makefile for .pc files.
by Henri Verbeet 18 Mar '19

18 Mar '19

Since we substitute PACKAGE_VERSION in particular. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0bd7889..9ad7b2e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -179,7 +179,7 @@ endif EXTRA_DIST += $(vkd3d_demos_shaders) -libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in +libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in Makefile $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ -e 's![@]includedir[@]!$(includedir)!g' \ @@ -187,7 +187,7 @@ libvkd3d-utils.pc: $(srcdir)/libs/vkd3d-utils/libvkd3d-utils.pc.in -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ $< > $@ -libvkd3d-shader.pc: $(srcdir)/libs/vkd3d-shader/libvkd3d-shader.pc.in +libvkd3d-shader.pc: $(srcdir)/libs/vkd3d-shader/libvkd3d-shader.pc.in Makefile $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ -e 's![@]includedir[@]!$(includedir)!g' \ @@ -195,7 +195,7 @@ libvkd3d-shader.pc: $(srcdir)/libs/vkd3d-shader/libvkd3d-shader.pc.in -e 's![@]PACKAGE_VERSION[@]!$(PACKAGE_VERSION)!g' \ $< > $@ -libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in +libvkd3d.pc: $(srcdir)/libs/vkd3d/libvkd3d.pc.in Makefile $(AM_V_GEN)$(SED) -e 's![@]prefix[@]!$(prefix)!g' \ -e 's![@]exec_prefix[@]!$(exec_prefix)!g' \ -e 's![@]includedir[@]!$(includedir)!g' \ -- 2.11.0

1 0