wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Michael Stefaniuc : d3dx9: Move parameter_count out of struct d3dx9_base_effect.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 58b87b0f3eb156718e297df6a64b96ff1f4e8621 URL: https://source.winehq.org/git/wine.git/?a=commit;h=58b87b0f3eb156718e297df6… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 19:48:04 2019 +0100 d3dx9: Move parameter_count out of struct d3dx9_base_effect. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index f010d26..2c4d664 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -152,7 +152,6 @@ struct d3dx9_base_effect { struct d3dx_effect *effect; - UINT parameter_count; UINT technique_count; UINT object_count; @@ -176,6 +175,7 @@ struct d3dx_effect LONG ref; struct d3dx9_base_effect base_effect; + unsigned int parameter_count; struct ID3DXEffectStateManager *manager; struct IDirect3DDevice9 *device; @@ -691,7 +691,7 @@ static void d3dx9_base_effect_cleanup(struct d3dx9_base_effect *base) if (base->parameters) { - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < base->effect->parameter_count; ++i) free_top_level_parameter(&base->parameters[i]); HeapFree(GetProcessHeap(), 0, base->parameters); base->parameters = NULL; @@ -3277,7 +3277,7 @@ static HRESULT WINAPI d3dx_effect_GetDesc(ID3DXEffect *iface, D3DXEFFECT_DESC *d /* TODO: add creator and function count. */ desc->Creator = NULL; desc->Functions = 0; - desc->Parameters = effect->base_effect.parameter_count; + desc->Parameters = effect->parameter_count; desc->Techniques = effect->base_effect.technique_count; return D3D_OK; @@ -3329,7 +3329,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameter(ID3DXEffect *iface, D3DXHANDLE if (!parameter) { - if (index < effect->base_effect.parameter_count) + if (index < effect->parameter_count) { TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); return get_parameter_handle(&effect->base_effect.parameters[index].param); @@ -3383,7 +3383,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterBySemantic(ID3DXEffect *iface, if (!parameter) { - for (i = 0; i < effect->base_effect.parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { temp_param = &effect->base_effect.parameters[i].param; @@ -3442,7 +3442,7 @@ static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3D if (!param) { - if (index < effect->base_effect.parameter_count) + if (index < effect->parameter_count) { TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); return get_parameter_handle(&effect->base_effect.parameters[index].param); @@ -4363,7 +4363,7 @@ static HRESULT WINAPI d3dx_effect_OnLostDevice(ID3DXEffect *iface) TRACE("iface %p.\n", iface); - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) walk_parameter_tree(&base->parameters[i].param, param_on_lost_device, NULL); return D3D_OK; @@ -6143,9 +6143,9 @@ static HRESULT d3dx_parse_resource(struct d3dx_effect *effect, const char *data, struct d3dx_parameter *parameter; struct d3dx_sampler *sampler; - if (index >= base->parameter_count) + if (index >= effect->parameter_count) { - FIXME("Index out of bounds: index %u >= parameter_count %u\n", index, base->parameter_count); + FIXME("Index out of bounds: index %u >= parameter_count %u\n", index, effect->parameter_count); return E_FAIL; } @@ -6308,8 +6308,8 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U HRESULT hr; UINT i; - read_dword(&ptr, &base->parameter_count); - TRACE("Parameter count: %u.\n", base->parameter_count); + read_dword(&ptr, &effect->parameter_count); + TRACE("Parameter count: %u.\n", effect->parameter_count); read_dword(&ptr, &base->technique_count); TRACE("Technique count: %u.\n", base->technique_count); @@ -6328,10 +6328,10 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } wine_rb_init(&base->param_tree, param_rb_compare); - if (base->parameter_count) + if (effect->parameter_count) { base->parameters = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - sizeof(*base->parameters) * base->parameter_count); + sizeof(*base->parameters) * effect->parameter_count); if (!base->parameters) { ERR("Out of memory.\n"); @@ -6339,7 +6339,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U goto err_out; } - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { param_set_magic_number(&base->parameters[i].param); hr = d3dx_parse_effect_parameter(effect, &base->parameters[i], data, &ptr, base->objects); @@ -6412,7 +6412,7 @@ static HRESULT d3dx_parse_effect(struct d3dx_effect *effect, const char *data, U } } - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { if (FAILED(hr = d3dx_pool_sync_shared_parameter(base->pool, &base->parameters[i]))) goto err_out; @@ -6435,7 +6435,7 @@ err_out: if (base->parameters) { - for (i = 0; i < base->parameter_count; ++i) + for (i = 0; i < effect->parameter_count; ++i) { free_top_level_parameter(&base->parameters[i]); }

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetParameterElement() helper.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 3899e79fc429b0c668166ccc98efbd60f5c63aa4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3899e79fc429b0c668166ccc… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 3 20:19:48 2019 +0100 d3dx9: Merge the d3dx_effect_GetParameterElement() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 491fbf9..f010d26 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,33 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_parameter_element(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT index) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!param) - { - if (index < base->parameter_count) - { - TRACE("Returning parameter %p.\n", &base->parameters[index]); - return get_parameter_handle(&base->parameters[index].param); - } - } - else - { - if (index < param->element_count) - { - TRACE("Returning parameter %p.\n", &param->members[index]); - return get_parameter_handle(&param->members[index]); - } - } - - WARN("Parameter not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_technique(struct d3dx9_base_effect *base, UINT index) { if (index >= base->technique_count) @@ -3463,10 +3436,30 @@ 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); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); - return d3dx9_base_effect_get_parameter_element(&effect->base_effect, parameter, index); + if (!param) + { + if (index < effect->base_effect.parameter_count) + { + TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); + return get_parameter_handle(&effect->base_effect.parameters[index].param); + } + } + else + { + if (index < param->element_count) + { + TRACE("Returning parameter %p.\n", &param->members[index]); + return get_parameter_handle(&param->members[index]); + } + } + + WARN("Parameter not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetTechnique(ID3DXEffect *iface, UINT index)

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetParameterBySemantic() helper.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 04c838fa605fe586e850b4ef2dd4f9f80d5daa2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=04c838fa605fe586e850b4ef… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Mar 4 19:48:02 2019 +0100 d3dx9: Merge the d3dx_effect_GetParameterBySemantic() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 113 +++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 60 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 41636ed..491fbf9 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,65 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, const char *semantic) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - struct d3dx_parameter *temp_param; - UINT i; - - if (!parameter) - { - for (i = 0; i < base->parameter_count; ++i) - { - temp_param = &base->parameters[i].param; - - if (!temp_param->semantic) - { - if (!semantic) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - continue; - } - - if (!strcasecmp(temp_param->semantic, semantic)) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - } - } - else if (param) - { - for (i = 0; i < param->member_count; ++i) - { - temp_param = &param->members[i]; - - if (!temp_param->semantic) - { - if (!semantic) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - continue; - } - - if (!strcasecmp(temp_param->semantic, semantic)) - { - TRACE("Returning parameter %p\n", temp_param); - return get_parameter_handle(temp_param); - } - } - } - - WARN("Parameter not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter_element(struct d3dx9_base_effect *base, D3DXHANDLE parameter, UINT index) { @@ -3461,10 +3402,62 @@ 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 *temp_param; + unsigned int i; TRACE("iface %p, parameter %p, semantic %s.\n", iface, parameter, debugstr_a(semantic)); - return d3dx9_base_effect_get_parameter_by_semantic(&effect->base_effect, parameter, semantic); + if (!parameter) + { + for (i = 0; i < effect->base_effect.parameter_count; ++i) + { + temp_param = &effect->base_effect.parameters[i].param; + + if (!temp_param->semantic) + { + if (!semantic) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + continue; + } + + if (!strcasecmp(temp_param->semantic, semantic)) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + } + } + else if (param) + { + for (i = 0; i < param->member_count; ++i) + { + temp_param = &param->members[i]; + + if (!temp_param->semantic) + { + if (!semantic) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + continue; + } + + if (!strcasecmp(temp_param->semantic, semantic)) + { + TRACE("Returning parameter %p\n", temp_param); + return get_parameter_handle(temp_param); + } + } + } + + WARN("Parameter not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetParameterElement(ID3DXEffect *iface, D3DXHANDLE parameter, UINT index)

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetParameter() helper.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 2f1ba910d133b93a3da55de4d0b3577936fd8224 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f1ba910d133b93a3da55de4… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 3 20:19:46 2019 +0100 d3dx9: Merge the d3dx_effect_GetParameter() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 49 +++++++++++++++++++++---------------------------- 1 file changed, 21 insertions(+), 28 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 22f098e..41636ed 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1177,33 +1177,6 @@ static HRESULT d3dx9_base_effect_get_pass_desc(struct d3dx9_base_effect *base, return D3D_OK; } -static D3DXHANDLE d3dx9_base_effect_get_parameter(struct d3dx9_base_effect *base, - D3DXHANDLE parameter, UINT index) -{ - struct d3dx_parameter *param = get_valid_parameter(base, parameter); - - if (!parameter) - { - if (index < base->parameter_count) - { - TRACE("Returning parameter %p.\n", &base->parameters[index]); - return get_parameter_handle(&base->parameters[index].param); - } - } - else - { - if (param && !param->element_count && index < param->member_count) - { - TRACE("Returning parameter %p.\n", &param->members[index]); - return get_parameter_handle(&param->members[index]); - } - } - - WARN("Parameter not found.\n"); - - return NULL; -} - static D3DXHANDLE d3dx9_base_effect_get_parameter_by_semantic(struct d3dx9_base_effect *base, D3DXHANDLE parameter, const char *semantic) { @@ -3436,10 +3409,30 @@ 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); TRACE("iface %p, parameter %p, index %u.\n", iface, parameter, index); - return d3dx9_base_effect_get_parameter(&effect->base_effect, parameter, index); + if (!parameter) + { + if (index < effect->base_effect.parameter_count) + { + TRACE("Returning parameter %p.\n", &effect->base_effect.parameters[index]); + return get_parameter_handle(&effect->base_effect.parameters[index].param); + } + } + else + { + if (param && !param->element_count && index < param->member_count) + { + TRACE("Returning parameter %p.\n", &param->members[index]); + return get_parameter_handle(&param->members[index]); + } + } + + WARN("Parameter not found.\n"); + + return NULL; } static D3DXHANDLE WINAPI d3dx_effect_GetParameterByName(ID3DXEffect *iface, D3DXHANDLE parameter,

1 0

Michael Stefaniuc : d3dx9: Merge the d3dx_effect_GetParameterByName() helper.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 78e067b0d0113f8f37c48366bda88d2454c8f841 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78e067b0d0113f8f37c48366… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 3 20:19:45 2019 +0100 d3dx9: Merge the d3dx_effect_GetParameterByName() helper. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(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 39281b9..22f098e 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,

1 0

Michael Stefaniuc : d3dx9: Pass a struct d3dx_effect to the d3dx_parse helpers.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: d265afcd8fb15438961d26f0160103846144a58e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d265afcd8fb15438961d26f0… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Sun Mar 3 20:19:44 2019 +0100 d3dx9: Pass a struct d3dx_effect to the d3dx_parse helpers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 75 ++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 36 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d265afcd8fb15438961d…

1 0

Michael Stefaniuc : d3dx9/tests: Remove useless cast to self.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 9b0258f5756ed60b334ac20ca2f6e7f64eb5077e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b0258f5756ed60b334ac20c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Mar 1 21:08:25 2019 +0100 d3dx9/tests: Remove useless cast to self. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(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 0c3e001..1b9e120 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______________________*/

1 0

Jacek Caban : mshtml: Add IHTMLDOMImplementation2 stub implementation.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: bd0c7c7af43fbeef2c28fc6fe7537cce9e5898fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd0c7c7af43fbeef2c28fc6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 18:14:10 2019 +0100 mshtml: Add IHTMLDOMImplementation2 stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/omnavigator.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) diff --git a/dlls/mshtml/omnavigator.c b/dlls/mshtml/omnavigator.c index e0b8f73..0f44004 100644 --- a/dlls/mshtml/omnavigator.c +++ b/dlls/mshtml/omnavigator.c @@ -47,6 +47,7 @@ typedef struct { typedef struct { DispatchEx dispex; IHTMLDOMImplementation IHTMLDOMImplementation_iface; + IHTMLDOMImplementation2 IHTMLDOMImplementation2_iface; LONG ref; } HTMLDOMImplementation; @@ -64,6 +65,8 @@ static HRESULT WINAPI HTMLDOMImplementation_QueryInterface(IHTMLDOMImplementatio if(IsEqualGUID(&IID_IUnknown, riid) || IsEqualGUID(&IID_IHTMLDOMImplementation, riid)) { *ppv = &This->IHTMLDOMImplementation_iface; + }else if(IsEqualGUID(&IID_IHTMLDOMImplementation2, riid)) { + *ppv = &This->IHTMLDOMImplementation2_iface; }else if(dispex_query_interface(&This->dispex, riid, ppv)) { return *ppv ? S_OK : E_NOINTERFACE; }else { @@ -157,6 +160,110 @@ static const IHTMLDOMImplementationVtbl HTMLDOMImplementationVtbl = { HTMLDOMImplementation_hasFeature }; +static inline HTMLDOMImplementation *impl_from_IHTMLDOMImplementation2(IHTMLDOMImplementation2 *iface) +{ + return CONTAINING_RECORD(iface, HTMLDOMImplementation, IHTMLDOMImplementation2_iface); +} + +static HRESULT WINAPI HTMLDOMImplementation2_QueryInterface(IHTMLDOMImplementation2 *iface, REFIID riid, void **ppv) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IHTMLDOMImplementation_QueryInterface(&This->IHTMLDOMImplementation_iface, riid, ppv); +} + +static ULONG WINAPI HTMLDOMImplementation2_AddRef(IHTMLDOMImplementation2 *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IHTMLDOMImplementation_AddRef(&This->IHTMLDOMImplementation_iface); +} + +static ULONG WINAPI HTMLDOMImplementation2_Release(IHTMLDOMImplementation2 *iface) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IHTMLDOMImplementation_Release(&This->IHTMLDOMImplementation_iface); +} + +static HRESULT WINAPI HTMLDOMImplementation2_GetTypeInfoCount(IHTMLDOMImplementation2 *iface, UINT *pctinfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_GetTypeInfoCount(&This->dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLDOMImplementation2_GetTypeInfo(IHTMLDOMImplementation2 *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLDOMImplementation2_GetIDsOfNames(IHTMLDOMImplementation2 *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLDOMImplementation2_Invoke(IHTMLDOMImplementation2 *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, + EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLDOMImplementation2_createDocumentType(IHTMLDOMImplementation2 *iface, BSTR name, + VARIANT *public_id, VARIANT *system_id, IDOMDocumentType **new_type) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + FIXME("(%p)->(%s %s %s %p)\n", This, debugstr_w(name), debugstr_variant(public_id), + debugstr_variant(system_id), new_type); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMImplementation2_createDocument(IHTMLDOMImplementation2 *iface, VARIANT *ns, + VARIANT *tag_name, IDOMDocumentType *document_type, IHTMLDocument7 **new_document) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + FIXME("(%p)->(%s %s %p %p)\n", This, debugstr_variant(ns), debugstr_variant(tag_name), + document_type, new_document); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMImplementation2_createHTMLDocument(IHTMLDOMImplementation2 *iface, BSTR title, + IHTMLDocument7 **new_document) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(title), new_document); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLDOMImplementation2_hasFeature(IHTMLDOMImplementation2 *iface, BSTR feature, + VARIANT version, VARIANT_BOOL *pfHasFeature) +{ + HTMLDOMImplementation *This = impl_from_IHTMLDOMImplementation2(iface); + + FIXME("(%p)->(%s %s %p) returning false\n", This, debugstr_w(feature), debugstr_variant(&version), pfHasFeature); + + *pfHasFeature = VARIANT_FALSE; + return S_OK; +} + +static const IHTMLDOMImplementation2Vtbl HTMLDOMImplementation2Vtbl = { + HTMLDOMImplementation2_QueryInterface, + HTMLDOMImplementation2_AddRef, + HTMLDOMImplementation2_Release, + HTMLDOMImplementation2_GetTypeInfoCount, + HTMLDOMImplementation2_GetTypeInfo, + HTMLDOMImplementation2_GetIDsOfNames, + HTMLDOMImplementation2_Invoke, + HTMLDOMImplementation2_createDocumentType, + HTMLDOMImplementation2_createDocument, + HTMLDOMImplementation2_createHTMLDocument, + HTMLDOMImplementation2_hasFeature +}; + static const tid_t HTMLDOMImplementation_iface_tids[] = { IHTMLDOMImplementation_tid, 0 @@ -176,6 +283,7 @@ HRESULT create_dom_implementation(IHTMLDOMImplementation **ret) return E_OUTOFMEMORY; dom_implementation->IHTMLDOMImplementation_iface.lpVtbl = &HTMLDOMImplementationVtbl; + dom_implementation->IHTMLDOMImplementation2_iface.lpVtbl = &HTMLDOMImplementation2Vtbl; dom_implementation->ref = 1; init_dispex(&dom_implementation->dispex, (IUnknown*)&dom_implementation->IHTMLDOMImplementation_iface,

1 0

Jacek Caban : mshtml.idl: Add IHTMLDOMImplementation2 and IDOMDocumentType declarations.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: d30e6c96c64b5532d1cb01261818ac0f57fab4aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d30e6c96c64b5532d1cb0126… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Mar 4 18:14:00 2019 +0100 mshtml.idl: Add IHTMLDOMImplementation2 and IDOMDocumentType declarations. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 15 ++++++++ include/mshtml.idl | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 123 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 01a2f5a..e16bf9e 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -119,6 +119,7 @@ #define DISPID_DOMRANGE DISPID_NORMAL_FIRST #define DISPID_MEDIA DISPID_NORMAL_FIRST #define DISPID_STYLEMEDIA DISPID_NORMAL_FIRST +#define DISPID_DOCUMENTTYPE DISPID_NORMAL_FIRST #define DISPID_DOMEVENT DISPID_NORMAL_FIRST #define DISPID_DOMUIEVENT (DISPID_DOMEVENT+25) @@ -3203,9 +3204,23 @@ #define DISPID_IHTMLRENDERSTYLE_DEFAULTTEXTSELECTION DISPID_A_DEFAULTTEXTSELECTION #define DISPID_IHTMLRENDERSTYLE_TEXTDECORATION DISPID_A_STYLETEXTDECORATION +/* IDOMDocumentType */ +#define DISPID_IDOMDOCUMENTTYPE_NAME DISPID_DOCUMENTTYPE +#define DISPID_IDOMDOCUMENTTYPE_ENTITIES DISPID_DOCUMENTTYPE+1 +#define DISPID_IDOMDOCUMENTTYPE_NOTATIONS DISPID_DOCUMENTTYPE+2 +#define DISPID_IDOMDOCUMENTTYPE_PUBLICID DISPID_DOCUMENTTYPE+3 +#define DISPID_IDOMDOCUMENTTYPE_SYSTEMID DISPID_DOCUMENTTYPE+4 +#define DISPID_IDOMDOCUMENTTYPE_INTERNALSUBSET DISPID_DOCUMENTTYPE+5 + /* IHTMLDOMImplementation */ #define DISPID_IHTMLDOMIMPLEMENTATION_HASFEATURE DISPID_DOMIMPLEMENTATION +/* IHTMLDOMImplementation2 */ +#define DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENTTYPE DISPID_DOMIMPLEMENTATION+1 +#define DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENT DISPID_DOMIMPLEMENTATION+2 +#define DISPID_IHTMLDOMIMPLEMENTATION2_CREATEHTMLDOCUMENT DISPID_DOMIMPLEMENTATION+3 +#define DISPID_IHTMLDOMIMPLEMENTATION2_IE9_HASFEATURE DISPID_DOMIMPLEMENTATION+4 + /* IHTMLDOMAttribute */ #define DISPID_IHTMLDOMATTRIBUTE_NODENAME DISPID_DOMATTRIBUTE #define DISPID_IHTMLDOMATTRIBUTE_NODEVALUE DISPID_DOMATTRIBUTE+2 diff --git a/include/mshtml.idl b/include/mshtml.idl index b92955c..cb80073 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -246,6 +246,7 @@ interface IHTMLDOMConstructor : IDispatch IDispatch *constructor() interface IHTMLDocument2; +interface IHTMLDocument7; interface IHTMLElement2; interface IHTMLStyleSheetsCollection; interface IHTMLFrameBase; @@ -5988,6 +5989,36 @@ coclass HTMLDOMTextNode } /***************************************************************************** + * IDOMDocumentType interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510738-98b5-11cf-bb82-00aa00bdce0b) + ] +interface IDOMDocumentType : IDispatch +{ + [propget, id(DISPID_IDOMDOCUMENTTYPE_NAME)] + HRESULT name([out, retval] BSTR *p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_ENTITIES)] + HRESULT entities([out, retval] IDispatch **p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_NOTATIONS)] + HRESULT notations([out, retval] IDispatch **p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_PUBLICID)] + HRESULT publicId([out, retval] VARIANT *p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_SYSTEMID)] + HRESULT systemId([out, retval] VARIANT *p); + + [propget, id(DISPID_IDOMDOCUMENTTYPE_INTERNALSUBSET)] + HRESULT internalSubset([out, retval] VARIANT *p); +} + +/***************************************************************************** * IHTMLDOMImplementation interface */ [ @@ -6006,6 +6037,83 @@ interface IHTMLDOMImplementation : IDispatch } /***************************************************************************** + * IHTMLDOMImplementation2 interface + */ +[ + odl, + oleautomation, + dual, + uuid(3051073c-98b5-11cf-bb82-00aa00bdce0b) + ] +interface IHTMLDOMImplementation2 : IDispatch +{ + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENTTYPE)] + HRESULT createDocumentType( + [in] BSTR bstrQualifiedName, + [in] VARIANT *pvarPublicId, + [in] VARIANT *pvarSystemId, + [out, retval] IDOMDocumentType **newDocumentType); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENT)] + HRESULT createDocument( + [in] VARIANT *pvarNS, + [in] VARIANT *pvarTagName, + [in] IDOMDocumentType *pDocumentType, + [out, retval] IHTMLDocument7 **ppnewDocument); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEHTMLDOCUMENT)] + HRESULT createHTMLDocument( + [in] BSTR bstrTitle, + [out, retval] IHTMLDocument7 **ppnewDocument); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_IE9_HASFEATURE)] + HRESULT hasFeature( + [in] BSTR bstrfeature, + [in, optional] VARIANT version, + [out, retval] VARIANT_BOOL *pfHasFeature); +} + +/***************************************************************************** + * DispHTMLDOMImplementation dispinterface + */ +[ + hidden, + uuid(3050f58f-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLDOMImplementation +{ +properties: +methods: + [id(DISPID_IHTMLDOMIMPLEMENTATION_HASFEATURE)] + VARIANT_BOOL hasFeature( + [in] BSTR bstrfeature, + [in, optional] VARIANT version); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENTTYPE)] + IDOMDocumentType *createDocumentType( + [in] BSTR bstrQualifiedName, + [in] VARIANT *pvarPublicId, + [in] VARIANT *pvarSystemId); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEDOCUMENT)] + IHTMLDocument7 *createDocument( + [in] VARIANT *pvarNS, + [in] VARIANT *pvarTagName, + [in] IDOMDocumentType *pDocumentType); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_CREATEHTMLDOCUMENT)] + IHTMLDocument7 *createHTMLDocument([in] BSTR bstrTitle); + + [id(DISPID_IHTMLDOMIMPLEMENTATION2_IE9_HASFEATURE)] + VARIANT_BOOL ie9_hasFeature( + [in] BSTR bstrfeature, + [in, optional] VARIANT version); + + [propget, id(DISPID_IHTMLDOMCONSTRUCTOR_CONSTRUCTOR), hidden] + IDispatch *constructor(); +} + +/***************************************************************************** * DispHTMLDOMAttribute dispinterface */ [

1 0

Gijs Vermeulen : d3d8: Improve ValidatePixelShader().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 740102f33256c0274f6dfb4a357e2127705c487e URL: https://source.winehq.org/git/wine.git/?a=commit;h=740102f33256c0274f6dfb4a… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Mar 4 22:18:06 2019 +0330 d3d8: Improve ValidatePixelShader(). 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> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 17f35c9..62e8d31 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 a647369..51dd3ae 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)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits March 2019