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

[PATCH 2/7] d3dx9: Merge the d3dx_effect_GetParameterByName() helper
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/effect.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 39281b9d44..22f098ead6 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1204,25 +1204,6 @@ static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base return NULL; } -static D3DXHANDLE d3dx9_base_effect_get_parameter_by_name(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char *name) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - D3DXHANDLE handle; - - if (!name) - { - handle = get_parameter_handle(param); - TRACE("Returning parameter %p.\n", handle); - return handle; - } - - handle = get_parameter_handle(get_parameter_by_name(base, param, name)); - TRACE("Returning parameter %p.\n", handle); - - return handle; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *semantic) { @@ -3465,10 +3446,22 @@ 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); + D3DXHANDLE handle; TRACE("iface %p, parameter %p, name %s.\n", iface, parameter, debugstr_a(name)); - return d3dx9_base_effect_get_parameter_by_name(&effect->base_effect, parameter, name); + if (!name) + { + handle = get_parameter_handle(param); + TRACE("Returning parameter %p.\n", handle); + return handle; + } + + handle = get_parameter_handle(get_parameter_by_name(&effect->base_effect, param, name)); + TRACE("Returning parameter %p.\n", handle); + + return handle; } static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, D3DXHANDLE parameter, -- 2.20.1

3 2

[PATCH 1/7] d3dx9: Pass a struct d3dx_effect to the d3dx_parse helpers
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)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 = &param->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 = &param->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, &param->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(&param->members[i]); - hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, param, flags); + hr = d3dx_parse_effect_typedef(effect, &param->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(&param->members[i]); - hr = d3dx9_parse_effect_typedef(base, &param->members[i], data, ptr, NULL, flags); + hr = d3dx_parse_effect_typedef(effect, &param->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, &param->annotation_count); TRACE("Annotation count: %u.\n", param->annotation_count); - hr = d3dx9_parse_effect_typedef(base, &param->param, data, &ptr2, NULL, param->param.flags); + hr = d3dx_parse_effect_typedef(effect, &param->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, &param->param, data, data + offset, objects); + hr = d3dx_parse_init_value(effect, &param->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(&param->annotations[i]); - hr = d3dx9_parse_effect_annotation(base, &param->annotations[i], data, ptr, objects); + hr = d3dx_parse_effect_annotation(effect, &param->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) -- 2.20.1

3 2

[PATCH] d3dx9/tests: Remove useless cast to self
by Michael Stefaniuc 04 Mar '19

04 Mar '19

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/d3dx9_36/tests/math.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 0c3e001702..1b9e120f8d 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -2026,7 +2026,7 @@ static void D3DXVector2Test(void) D3DXVec2TransformCoord(&gotvec, &u, &mat); expect_vec2(&expectedvec, &gotvec, 1); gotvec.x = u.x; gotvec.y = u.y; - D3DXVec2TransformCoord(&gotvec, (D3DXVECTOR2 *)&gotvec, &mat); + D3DXVec2TransformCoord(&gotvec, &gotvec, &mat); expect_vec2(&expectedvec, &gotvec, 1); /*_______________D3DXVec2TransformNormal______________________*/ -- 2.20.1

2 1

[PATCH] d3d8: Improve ValidatePixelShader().
by Henri Verbeet 04 Mar '19

04 Mar '19

From: Gijs Vermeulen <gijsvrm(a)gmail.com> Based largely on a patch by Sebastian Lackner. Adapted from "Improve ValidateVertexShader()" by Henri Verbeet. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- This supersedes patch 159574. dlls/d3d8/d3d8_main.c | 72 +++++++++++++++++++++------------------ dlls/d3d8/tests/device.c | 87 ++++++++++++++++++++++++++++++++++-------------- 2 files changed, 102 insertions(+), 57 deletions(-) diff --git a/dlls/d3d8/d3d8_main.c b/dlls/d3d8/d3d8_main.c index 17f35c90894..62e8d31749e 100644 --- a/dlls/d3d8/d3d8_main.c +++ b/dlls/d3d8/d3d8_main.c @@ -103,41 +103,49 @@ done: return hr; } -/*********************************************************************** - * ValidatePixelShader (D3D8.@) - * - * PARAMS - * toto result? - */ -HRESULT WINAPI ValidatePixelShader(DWORD* pixelshader, DWORD* reserved1, BOOL boolean, DWORD* toto) +HRESULT WINAPI ValidatePixelShader(const DWORD *ps_code, + const D3DCAPS8 *caps, BOOL return_error, char **errors) { - HRESULT ret; - static BOOL warned; - - if (TRACE_ON(d3d8) || !warned) { - FIXME("(%p %p %d %p): stub\n", pixelshader, reserved1, boolean, toto); - warned = TRUE; - } - - if (!pixelshader) - return E_FAIL; - - if (reserved1) - return E_FAIL; - - switch(*pixelshader) { - case 0xFFFF0100: - case 0xFFFF0101: - case 0xFFFF0102: - case 0xFFFF0103: - case 0xFFFF0104: - ret=S_OK; + const char *message = ""; + SIZE_T message_size; + HRESULT hr = E_FAIL; + + TRACE("ps_code %p, caps %p, return_error %#x, errors %p.\n", + ps_code, caps, return_error, errors); + + if (!ps_code) + return E_FAIL; + + switch (*ps_code) + { + case D3DPS_VERSION(1, 4): + case D3DPS_VERSION(1, 3): + case D3DPS_VERSION(1, 2): + case D3DPS_VERSION(1, 1): + case D3DPS_VERSION(1, 0): break; + default: - WARN("Invalid shader version token %#x.\n", *pixelshader); - ret=E_FAIL; - } - return ret; + message = "Unsupported shader version.\n"; + goto done; + } + + if (caps && *ps_code > caps->PixelShaderVersion) + { + message = "Shader version not supported by caps.\n"; + goto done; + } + + hr = S_OK; + +done: + if (!return_error) + message = ""; + message_size = strlen(message) + 1; + if (errors && (*errors = heap_alloc(message_size))) + memcpy(*errors, message, message_size); + + return hr; } void d3d8_resource_cleanup(struct d3d8_resource *resource) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index a64736913da..51dd3aef579 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -53,7 +53,7 @@ struct device_desc static DEVMODEW registry_mode; static HRESULT (WINAPI *ValidateVertexShader)(const DWORD *, const DWORD *, const D3DCAPS8 *, BOOL, char **); -static HRESULT (WINAPI *ValidatePixelShader)(DWORD *, DWORD *, int, DWORD *); +static HRESULT (WINAPI *ValidatePixelShader)(const DWORD *, const D3DCAPS8 *, BOOL, char **); static BOOL (WINAPI *pGetCursorInfo)(PCURSORINFO); @@ -4506,43 +4506,80 @@ static void test_validate_vs(void) static void test_validate_ps(void) { - static DWORD ps[] = + static DWORD ps_1_1_code[] = { 0xffff0101, /* ps_1_1 */ - 0x00000051, 0xa00f0001, 0x3f800000, 0x00000000, 0x00000000, 0x00000000, /* def c1 = 1.0, 0.0, 0.0, 0.0 */ - 0x00000042, 0xb00f0000, /* tex t0 */ - 0x00000008, 0x800f0000, 0xa0e40001, 0xa0e40000, /* dp3 r0, c1, c0 */ - 0x00000005, 0x800f0000, 0x90e40000, 0x80e40000, /* mul r0, v0, r0 */ - 0x00000005, 0x800f0000, 0xb0e40000, 0x80e40000, /* mul r0, t0, r0 */ - 0x0000ffff, /* end */ + 0x00000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x00000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x0000ffff /* end */ + }; + static const DWORD ps_2_0_code[] = + { + 0xffff0200, /* ps_2_0 */ + 0x02000001, 0x800f0001, 0xa0e40001, /* mov r1, c1 */ + 0x03000002, 0x800f0000, 0x80e40001, 0xa0e40002, /* add r0, r1, c2 */ + 0x02000001, 0x800f0800, 0x80e40000, /* mov oC0, r0 */ + 0x0000ffff /* end */ }; + D3DCAPS8 caps; + char *errors; HRESULT hr; - hr = ValidatePixelShader(0, 0, 0, 0); + hr = ValidatePixelShader(NULL, NULL, FALSE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(NULL, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + errors = (void *)0xcafeface; + hr = ValidatePixelShader(NULL, NULL, FALSE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(0, 0, 1, 0); + ok(errors == (void *)0xcafeface, "Got unexpected errors %p.\n", errors); + errors = (void *)0xcafeface; + hr = ValidatePixelShader(NULL, NULL, TRUE, &errors); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - hr = ValidatePixelShader(ps, 0, 0, 0); + ok(errors == (void *)0xcafeface, "Got unexpected errors %p.\n", errors); + + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); - hr = ValidatePixelShader(ps, 0, 1, 0); + memset(&caps, 0, sizeof(caps)); + caps.PixelShaderVersion = D3DPS_VERSION(1, 1); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* Seems to do some version checking. */ - *ps = 0xffff0105; /* bogus version */ - hr = ValidatePixelShader(ps, 0, 1, 0); + caps.PixelShaderVersion = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen that applications always pass the 2nd parameter as 0. - * Simple test with a non-zero parameter. */ - *ps = 0xffff0101; /* ps_1_1 */ - hr = ValidatePixelShader(ps, ps, 1, 0); - ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); - /* I've seen the 3rd parameter always passed as either 0 or 1, but passing - * other values doesn't seem to hurt. */ - hr = ValidatePixelShader(ps, 0, 12345, 0); + caps.PixelShaderVersion = D3DPS_VERSION(1, 2); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + caps.PixelShaderVersion = D3DPS_VERSION(8, 8); + hr = ValidatePixelShader(ps_1_1_code, &caps, FALSE, NULL); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + *ps_1_1_code = D3DPS_VERSION(1, 0); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - /* What is the 4th parameter? The following seems to work ok. */ - hr = ValidatePixelShader(ps, 0, 1, ps); + *ps_1_1_code = D3DPS_VERSION(1, 4); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, NULL); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_2_0_code, NULL, FALSE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + *ps_1_1_code = D3DPS_VERSION(1, 5); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, NULL); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + hr = ValidatePixelShader(ps_1_1_code, NULL, FALSE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!*errors, "Got unexpected string \"%s\".\n", errors); + heap_free(errors); + hr = ValidatePixelShader(ps_1_1_code, NULL, TRUE, &errors); + ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); + ok(!!*errors, "Got unexpected empty string.\n"); + heap_free(errors); } static void test_volume_get_container(void) -- 2.11.0

2 1

[PATCH v2] ieframe: add implementation for WebBrowser_get_LocationName
by Vijay Kiran Kamuju 04 Mar '19

04 Mar '19

Based on patch from Andrey Turkin Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=12457 Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/ieframe/tests/webbrowser.c | 26 ++++++++++++++++++++++---- dlls/ieframe/webbrowser.c | 20 ++++++++++++++++++-- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 706d5071a9cf..a7d752f34c21 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -166,7 +166,7 @@ static HWND container_hwnd, shell_embedding_hwnd; static BOOL is_downloading, do_download, is_first_load, use_container_olecmd, test_close, is_http, use_container_dochostui; static HRESULT hr_dochost_TranslateAccelerator = E_NOTIMPL; static HRESULT hr_site_TranslateAccelerator = E_NOTIMPL; -static const char *current_url; +static const char *current_url, *current_title; static int wb_version, expect_update_commands_enable, set_update_commands_enable; static BOOL nav_back_todo, nav_forward_todo; /* FIXME */ @@ -267,6 +267,22 @@ static void _test_LocationURL(unsigned line, IWebBrowser2 *wb, const char *exurl } } +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) +static void _test_LocationName(unsigned line, IWebBrowser2 *unk, const char *exname) +{ + BSTR name = (void*)0xdeadbeef; + static const char wine_title[] = "WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; + HRESULT hres; + + hres = IWebBrowser2_get_LocationName(wb, &name); + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); + if (SUCCEEDED(hres)) + { + ok_(__FILE__,line) (!strcmp_wa(name, exname) || !strcmp_wa(name,wine_title), "unexpected name: %s\n", wine_dbgstr_w(name)); + SysFreeString(name); + } +} + #define test_ready_state(ex) _test_ready_state(__LINE__,ex) static void _test_ready_state(unsigned line, READYSTATE exstate) { @@ -2744,14 +2760,15 @@ static void test_Navigate2(IWebBrowser2 *webbrowser, const char *nav_url) HRESULT hres; test_LocationURL(webbrowser, is_first_load ? "" : current_url); + test_LocationName(webbrowser, is_first_load ? "" : current_title); test_ready_state(is_first_load ? READYSTATE_UNINITIALIZED : READYSTATE_COMPLETE); is_http = !memcmp(nav_url, "http:", 5); V_VT(&url) = VT_BSTR; - V_BSTR(&url) = a2bstr(current_url = nav_url); + V_BSTR(&url) = a2bstr(current_title = current_url = nav_url); if((is_file = !strncasecmp(nav_url, "file://", 7))) - current_url = nav_url + 7; + current_title = current_url = nav_url + 7; if(is_first_load) { SET_EXPECT(Invoke_AMBIENT_USERMODE); @@ -3182,7 +3199,7 @@ static void test_put_href(IWebBrowser2 *unk, const char *url) dwl_flags = DWL_FROM_PUT_HREF; - str = a2bstr(current_url = url); + str = a2bstr(current_title = current_url = url); is_first_load = FALSE; hres = IHTMLLocation_put_href(location, str); @@ -3728,6 +3745,7 @@ static void test_WebBrowser(DWORD flags, BOOL do_close) test_ClassInfo(webbrowser); test_EnumVerbs(webbrowser); test_LocationURL(webbrowser, ""); + test_LocationName(webbrowser, ""); test_ConnectionPoint(webbrowser, TRUE); test_ClientSite(webbrowser, &ClientSite, !do_download); test_Extent(webbrowser); diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 03acf3886989..9e34cab51bdb 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -503,8 +503,24 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) { WebBrowser *This = impl_from_IWebBrowser2(iface); - FIXME("(%p)->(%p)\n", This, LocationName); - return E_NOTIMPL; + HRESULT hres; + + TRACE("(%p)->(%p)\n", This, LocationName); + + hres = get_location_url(&This->doc_host, LocationName); + if (This->doc_host.document) + { + IHTMLDocument2 *doc = NULL; + hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc); + if (SUCCEEDED(hres)) + { + IHTMLDocument2_get_title(doc, LocationName); + if (SysStringLen(*LocationName) == 0) + hres = get_location_url(&This->doc_host, LocationName); + IHTMLDocument2_Release(doc); + } + } + return hres; } static HRESULT WINAPI WebBrowser_get_LocationURL(IWebBrowser2 *iface, BSTR *LocationURL) -- 2.17.0

3 3

Fwd: [PATCH v2] ieframe: add implementation for WebBrowser_get_LocationName
by Vijay Kiran Kamuju 04 Mar '19

04 Mar '19

Hi Jacek, Can you send the tests with todo block? The tests looks good to me. If the url doesn't implement IHTMLDocument2, It should return the url. Hence I was calling get_location_url at the start to cover the empty string case, which is causing a leak. eg:"about:blank" The same holds true for null/empty string as input. Meanwhile, I will see how I can improve the implementation. Thanks, Vijay On Mon, Mar 4, 2019 at 5:56 PM Jacek Caban <jacek(a)codeweavers.com> wrote: > > Hi Vijay, > > On 3/1/19 2:58 AM, Vijay Kiran Kamuju wrote: > > > +#define test_LocationName(a,b) _test_LocationName(__LINE__,a,b) > +static void _test_LocationName(unsigned line, IWebBrowser2 *unk, const char *exname) > +{ > + BSTR name = (void*)0xdeadbeef; > + static const char wine_title[] = "WineHQ - Run Windows applications on Linux, BSD, Solaris and Mac OS X"; > + HRESULT hres; > + > + hres = IWebBrowser2_get_LocationName(wb, &name); > + ok_(__FILE__,line) (hres == (*exname ? S_OK : S_FALSE), "get_LocationName failed: %08x\n", hres); > + if (SUCCEEDED(hres)) > + { > + ok_(__FILE__,line) (!strcmp_wa(name, exname) || !strcmp_wa(name,wine_title), "unexpected name: %s\n", wine_dbgstr_w(name)); > > > This || here makes the test pass even if you'd always simply return URL. See the attached patch for how it could be improved. > > > diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c > index 03acf3886989..9e34cab51bdb 100644 > --- a/dlls/ieframe/webbrowser.c > +++ b/dlls/ieframe/webbrowser.c > @@ -503,8 +503,24 @@ static HRESULT WINAPI WebBrowser_put_Height(IWebBrowser2 *iface, LONG Height) > static HRESULT WINAPI WebBrowser_get_LocationName(IWebBrowser2 *iface, BSTR *LocationName) > { > WebBrowser *This = impl_from_IWebBrowser2(iface); > - FIXME("(%p)->(%p)\n", This, LocationName); > - return E_NOTIMPL; > + HRESULT hres; > + > + TRACE("(%p)->(%p)\n", This, LocationName); > + > + hres = get_location_url(&This->doc_host, LocationName); > + if (This->doc_host.document) > + { > + IHTMLDocument2 *doc = NULL; > + hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IHTMLDocument2, (void **)&doc); > + if (SUCCEEDED(hres)) > + { > + IHTMLDocument2_get_title(doc, LocationName); > + if (SysStringLen(*LocationName) == 0) > > > You leak LocationName in this case (even an empty string is allocated). > > > + hres = get_location_url(&This->doc_host, LocationName); > > > What happens if have a document that doesn't implement IHTMLDocument2? I guess it should just return URL here, but it will fail with your patch. > > > Thanks, > > Jacek

1 0

[PATCH 2/2] mshtml: Add IHTMLDOMImplementation2 stub implementation.
by Jacek Caban 04 Mar '19

04 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/omnavigator.c | 108 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+)

1 0

[PATCH 1/2] mshtml.idl: Add IHTMLDOMImplementation2 and IDOMDocumentType declarations.
by Jacek Caban 04 Mar '19

04 Mar '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/mshtmdid.h | 15 +++++++ include/mshtml.idl | 108 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+)

1 0

[PATCH 8/8] wined3d: Rename state entry structures.
by Józef Kucia 04 Mar '19

04 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 26 +++++++++++++------------- 7 files changed, 29 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 49d06455f74e..aab047cc023f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -6673,7 +6673,7 @@ static void textransform(struct wined3d_context *context, const struct wined3d_s fragment_prog_arbfp(context, state, state_id); } -static const struct StateEntryTemplate arbfp_fragmentstate_template[] = +static const struct wined3d_state_entry_template arbfp_fragmentstate_template[] = { {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), state_texfactor_arbfp }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), { STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index ff2f711f4e8f..05ec44a0cf3b 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1099,7 +1099,8 @@ static void atifs_srgbwriteenable(struct wined3d_context *context, const struct WARN("sRGB writes are not supported by this fragment pipe.\n"); } -static const struct StateEntryTemplate atifs_fragmentstate_template[] = { +static const struct wined3d_state_entry_template atifs_fragmentstate_template[] = +{ {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), { STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), atifs_tfactor }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAFUNC), { STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_ALPHAREF), { STATE_RENDER(WINED3D_RS_ALPHATESTENABLE), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 37264a08ef06..267238dafa42 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3945,7 +3945,7 @@ static void context_load_stream_output_buffers(struct wined3d_context *context, static BOOL context_apply_draw_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { - const struct StateEntry *state_table = context->state_table; + const struct wined3d_state_entry *state_table = context->state_table; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_fb_state *fb = state->fb; unsigned int i; @@ -4059,7 +4059,7 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, static void context_apply_compute_state(struct wined3d_context *context, const struct wined3d_device *device, const struct wined3d_state *state) { - const struct StateEntry *state_table = context->state_table; + const struct wined3d_state_entry *state_table = context->state_table; const struct wined3d_gl_info *gl_info = context->gl_info; unsigned int state_id, i; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4613d78f94c2..fa6e302a4b9d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -12001,7 +12001,7 @@ static void glsl_vertex_pipe_clip_plane(struct wined3d_context *context, context->constant_update_mask |= WINED3D_SHADER_CONST_VS_CLIP_PLANES; } -static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = +static const struct wined3d_state_entry_template glsl_vertex_pipe_vp_states[] = { {STATE_VDECL, {STATE_VDECL, glsl_vertex_pipe_vdecl }, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_vertex_pipe_vs }, WINED3D_GL_EXT_NONE }, @@ -12370,7 +12370,7 @@ static void glsl_fragment_pipe_shademode(struct wined3d_context *context, context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; } -static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = +static const struct wined3d_state_entry_template glsl_fragment_pipe_state_template[] = { {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_fragment_pipe_vs }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 14cb73f2c3b4..323484ab43b4 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -768,7 +768,7 @@ static BOOL nvts_color_fixup_supported(struct color_fixup_desc fixup) return is_identity_fixup(fixup); } -static const struct StateEntryTemplate nvrc_fragmentstate_template[] = +static const struct wined3d_state_entry_template nvrc_fragmentstate_template[] = { { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), nvrc_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 9dc98047cfde..f071f30b5759 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4488,7 +4488,7 @@ static void state_so_warn(struct wined3d_context *context, const struct wined3d_ WARN("Transform feedback not supported.\n"); } -const struct StateEntryTemplate misc_state_template[] = +const struct wined3d_state_entry_template misc_state_template[] = { { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb, }, ARB_UNIFORM_BUFFER_OBJECT }, { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), { STATE_CONSTANT_BUFFER(WINED3D_SHADER_TYPE_VERTEX), state_cb_warn, }, WINED3D_GL_EXT_NONE }, @@ -4707,7 +4707,7 @@ const struct StateEntryTemplate misc_state_template[] = {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; -static const struct StateEntryTemplate vp_ffp_states[] = +static const struct wined3d_state_entry_template vp_ffp_states[] = { { STATE_VDECL, { STATE_VDECL, vertexdeclaration }, WINED3D_GL_EXT_NONE }, { STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), { STATE_VDECL, NULL }, WINED3D_GL_EXT_NONE }, @@ -5082,7 +5082,7 @@ static const struct StateEntryTemplate vp_ffp_states[] = {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; -static const struct StateEntryTemplate ffp_fragmentstate_template[] = { +static const struct wined3d_state_entry_template ffp_fragmentstate_template[] = { { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), tex_colorop }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG2), { STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), NULL }, WINED3D_GL_EXT_NONE }, @@ -5386,7 +5386,7 @@ static void multistate_apply_3(struct wined3d_context *context, const struct win context->device->multistate_funcs[state_id][2](context, state, state_id); } -static void prune_invalid_states(struct StateEntry *state_table, const struct wined3d_d3d_info *d3d_info) +static void prune_invalid_states(struct wined3d_state_entry *state_table, const struct wined3d_d3d_info *d3d_info) { unsigned int start, last, i; @@ -5415,7 +5415,7 @@ static void prune_invalid_states(struct StateEntry *state_table, const struct wi } } -static void validate_state_table(struct StateEntry *state_table) +static void validate_state_table(struct wined3d_state_entry *state_table) { static const struct { @@ -5519,13 +5519,13 @@ static void validate_state_table(struct StateEntry *state_table) } } -HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct wined3d_state_entry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, - const struct StateEntryTemplate *misc) + const struct wined3d_state_entry_template *misc) { APPLYSTATEFUNC multistate_funcs[STATE_HIGHEST + 1][3]; - const struct StateEntryTemplate *cur; + const struct wined3d_state_entry_template *cur; unsigned int i, type, handlers; BOOL set[STATE_HIGHEST + 1]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8fe331065768..6907c7b2e926 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1873,7 +1873,7 @@ struct wined3d_context { const struct wined3d_gl_info *gl_info; const struct wined3d_d3d_info *d3d_info; - const struct StateEntry *state_table; + const struct wined3d_state_entry *state_table; /* State dirtification * dirtyArray is an array that contains markers for dirty states. numDirtyEntries states are dirty, their numbers are in indices * 0...numDirtyEntries - 1. isStateDirty is a redundant copy of the dirtyArray. Technically only one of them would be needed, @@ -2027,16 +2027,16 @@ struct wined3d_fb_state typedef void (*APPLYSTATEFUNC)(struct wined3d_context *ctx, const struct wined3d_state *state, DWORD state_id); -struct StateEntry +struct wined3d_state_entry { - DWORD representative; + unsigned int representative; APPLYSTATEFUNC apply; }; -struct StateEntryTemplate +struct wined3d_state_entry_template { DWORD state; - struct StateEntry content; + struct wined3d_state_entry content; unsigned int extension; }; @@ -2066,7 +2066,7 @@ struct fragment_pipeline BOOL (*allocate_context_data)(struct wined3d_context *context); void (*free_context_data)(struct wined3d_context *context); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); - const struct StateEntryTemplate *states; + const struct wined3d_state_entry_template *states; }; struct wined3d_vertex_caps @@ -2090,10 +2090,10 @@ struct wined3d_vertex_pipe_ops DWORD (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*vp_free)(struct wined3d_device *device); - const struct StateEntryTemplate *vp_states; + const struct wined3d_state_entry_template *vp_states; }; -extern const struct StateEntryTemplate misc_state_template[] DECLSPEC_HIDDEN; +extern const struct wined3d_state_entry_template misc_state_template[] DECLSPEC_HIDDEN; extern const struct fragment_pipeline none_fragment_pipe DECLSPEC_HIDDEN; extern const struct fragment_pipeline ffp_fragment_pipeline DECLSPEC_HIDDEN; extern const struct fragment_pipeline atifs_fragment_pipeline DECLSPEC_HIDDEN; @@ -2107,10 +2107,10 @@ extern const struct wined3d_vertex_pipe_ops ffp_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ -HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct wined3d_state_entry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, - const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; + const struct wined3d_state_entry_template *misc) DECLSPEC_HIDDEN; enum wined3d_blit_op { @@ -3038,7 +3038,7 @@ struct wined3d_device void *shader_priv; void *fragment_priv; void *vertex_priv; - struct StateEntry state_table[STATE_HIGHEST + 1]; + struct wined3d_state_entry state_table[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; struct wined3d_blitter *blitter; @@ -4597,8 +4597,8 @@ static inline BOOL use_ps(const struct wined3d_state *state) static inline void context_apply_state(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - const struct StateEntry *state_table = context->state_table; - DWORD rep = state_table[state_id].representative; + const struct wined3d_state_entry *state_table = context->state_table; + unsigned int rep = state_table[state_id].representative; state_table[rep].apply(context, state, rep); } -- 2.19.2

2 1

[PATCH 7/8] wined3d: Rename StateTable.
by Józef Kucia 04 Mar '19

04 Mar '19

Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 10 +++---- dlls/wined3d/state.c | 49 +++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 4 +-- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 122ed709610c..37264a08ef06 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1953,7 +1953,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, context->win_handle = swapchain->win_handle; context->gl_info = &device->adapter->gl_info; context->d3d_info = &device->adapter->d3d_info; - context->state_table = device->StateTable; + context->state_table = device->state_table; /* Mark all states dirty to force a proper initialization of the states on * the first use of the context. Compute states do not need initialization. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 61896a254f85..79a5b68c6f77 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5357,7 +5357,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wine_rb_init(&device->samplers, wined3d_sampler_compare); if (vertex_pipeline->vp_states && fragment_pipeline->states - && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, + && FAILED(hr = compile_state_table(device->state_table, device->multistate_funcs, &adapter->d3d_info, adapter->gl_info.supported, vertex_pipeline, fragment_pipeline, misc_state_template))) { @@ -5396,11 +5396,9 @@ err: void device_invalidate_state(const struct wined3d_device *device, DWORD state) { - DWORD rep = device->StateTable[state].representative; + DWORD rep = device->state_table[state].representative; struct wined3d_context *context; - DWORD idx; - BYTE shift; - UINT i; + unsigned int i, idx, shift; wined3d_from_cs(device->cs); @@ -5414,7 +5412,7 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) for (i = 0; i < device->context_count; ++i) { context = device->contexts[i]; - if(isStateDirty(context, rep)) continue; + if (isStateDirty(context, rep)) continue; context->dirtyArray[context->numDirtyEntries++] = rep; idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 969dfc2e12a4..9dc98047cfde 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5519,39 +5519,43 @@ static void validate_state_table(struct StateEntry *state_table) } } -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) { - unsigned int i, type, handlers; APPLYSTATEFUNC multistate_funcs[STATE_HIGHEST + 1][3]; const struct StateEntryTemplate *cur; + unsigned int i, type, handlers; BOOL set[STATE_HIGHEST + 1]; memset(multistate_funcs, 0, sizeof(multistate_funcs)); - for(i = 0; i < STATE_HIGHEST + 1; i++) { - StateTable[i].representative = 0; - StateTable[i].apply = state_undefined; + for (i = 0; i < STATE_HIGHEST + 1; ++i) + { + state_table[i].representative = 0; + state_table[i].apply = state_undefined; } - for(type = 0; type < 3; type++) { + for (type = 0; type < 3; ++type) + { /* This switch decides the order in which the states are applied */ - switch(type) { + switch (type) + { case 0: cur = misc; break; case 1: cur = fragment->states; break; case 2: cur = vertex->vp_states; break; default: cur = NULL; /* Stupid compiler */ } - if(!cur) continue; + if (!cur) continue; /* GL extension filtering should not prevent multiple handlers being applied from different * pipeline parts */ memset(set, 0, sizeof(set)); - for(i = 0; cur[i].state; i++) { + for (i = 0; cur[i].state; ++i) + { APPLYSTATEFUNC *funcs_array; /* Only use the first matching state with the available extension from one template. @@ -5561,7 +5565,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ * * if GL_XYZ_fancy is supported, ignore the 2nd line */ - if(set[cur[i].state]) continue; + if (set[cur[i].state]) continue; /* Skip state lines depending on unsupported extensions */ if (!supported_extensions[cur[i].extension]) continue; set[cur[i].state] = TRUE; @@ -5576,12 +5580,13 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ handlers = num_handlers(multistate_funcs[cur[i].state]); multistate_funcs[cur[i].state][handlers] = cur[i].content.apply; - switch(handlers) { + switch (handlers) + { case 0: - StateTable[cur[i].state].apply = cur[i].content.apply; + state_table[cur[i].state].apply = cur[i].content.apply; break; case 1: - StateTable[cur[i].state].apply = multistate_apply_2; + state_table[cur[i].state].apply = multistate_apply_2; if (!(dev_multistate_funcs[cur[i].state] = heap_calloc(2, sizeof(**dev_multistate_funcs)))) goto out_of_mem; @@ -5589,7 +5594,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][1] = multistate_funcs[cur[i].state][1]; break; case 2: - StateTable[cur[i].state].apply = multistate_apply_3; + state_table[cur[i].state].apply = multistate_apply_3; if (!(funcs_array = heap_realloc(dev_multistate_funcs[cur[i].state], sizeof(**dev_multistate_funcs) * 3))) goto out_of_mem; @@ -5598,22 +5603,22 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][2] = multistate_funcs[cur[i].state][2]; break; default: - ERR("Unexpected amount of state handlers for state %u: %u\n", - cur[i].state, handlers + 1); + ERR("Unexpected amount of state handlers for state %u: %u.\n", + cur[i].state, handlers + 1); } - if (StateTable[cur[i].state].representative - && StateTable[cur[i].state].representative != cur[i].content.representative) + if (state_table[cur[i].state].representative + && state_table[cur[i].state].representative != cur[i].content.representative) { FIXME("State %s (%#x) has different representatives in different pipeline parts.\n", debug_d3dstate(cur[i].state), cur[i].state); } - StateTable[cur[i].state].representative = cur[i].content.representative; + state_table[cur[i].state].representative = cur[i].content.representative; } } - prune_invalid_states(StateTable, d3d_info); - validate_state_table(StateTable); + prune_invalid_states(state_table, d3d_info); + validate_state_table(state_table); return WINED3D_OK; @@ -5623,7 +5628,7 @@ out_of_mem: heap_free(dev_multistate_funcs[i]); } - memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1)*sizeof(*dev_multistate_funcs)); + memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1) * sizeof(*dev_multistate_funcs)); return E_OUTOFMEMORY; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 51b86a7646b0..8fe331065768 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2107,7 +2107,7 @@ extern const struct wined3d_vertex_pipe_ops ffp_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; @@ -3038,7 +3038,7 @@ struct wined3d_device void *shader_priv; void *fragment_priv; void *vertex_priv; - struct StateEntry StateTable[STATE_HIGHEST + 1]; + struct StateEntry state_table[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; struct wined3d_blitter *blitter; -- 2.19.2

2 1