wine-commits September 2021

wine-commits@winehq.org

2 participants
1030 discussions

Eric Pouech : dbghelp: Add a couple of more traces when querying an attribute's value.
by Alexandre Julliard 03 Sep '21

03 Sep '21

Module: wine Branch: master Commit: 598e5774750d2a1544802ccede16d7048a252f46 URL: https://source.winehq.org/git/wine.git/?a=commit;h=598e5774750d2a1544802cce… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:07 2021 +0200 dbghelp: Add a couple of more traces when querying an attribute's value. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index b62e1a2cce8..6d2c843fb94 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -550,6 +550,7 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, case DW_FORM_udata: attr->u.uvalue = dwarf2_get_leb128_as_unsigned(data, NULL); + TRACE("udata<0x%lx>\n", attr->u.uvalue); break; case DW_FORM_string: @@ -567,21 +568,25 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, case DW_FORM_block: attr->u.block.size = dwarf2_get_leb128_as_unsigned(data, &attr->u.block.ptr); + TRACE("block<%p,%u>\n", attr->u.block.ptr, attr->u.block.size); break; case DW_FORM_block1: attr->u.block.size = dwarf2_get_byte(data); attr->u.block.ptr = data + 1; + TRACE("block<%p,%u>\n", attr->u.block.ptr, attr->u.block.size); break; case DW_FORM_block2: attr->u.block.size = dwarf2_get_u2(data); attr->u.block.ptr = data + 2; + TRACE("block<%p,%u>\n", attr->u.block.ptr, attr->u.block.size); break; case DW_FORM_block4: attr->u.block.size = dwarf2_get_u4(data); attr->u.block.ptr = data + 4; + TRACE("block<%p,%u>\n", attr->u.block.ptr, attr->u.block.size); break; default:

1 0

Eric Pouech : dbghelp: Add dwarf support of DW_FORM_ref_udata.
by Alexandre Julliard 03 Sep '21

03 Sep '21

Module: wine Branch: master Commit: 0020265286beec7e1cb73b2e126cb878c7bf36d8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0020265286beec7e1cb73b2e… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:22:01 2021 +0200 dbghelp: Add dwarf support of DW_FORM_ref_udata. DW_FORM_ref_udata value is an offset from current unit (as the others DW_FORM_ref[1,2,3,4] are) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 9d8d2756258..b62e1a2cce8 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -544,7 +544,8 @@ static void dwarf2_fill_attr(const dwarf2_parse_context_t* ctx, break; case DW_FORM_ref_udata: - attr->u.uvalue = dwarf2_get_leb128_as_unsigned(data, NULL); + attr->u.uvalue = ctx->ref_offset + dwarf2_get_leb128_as_unsigned(data, NULL); + TRACE("ref_udata<0x%lx>\n", attr->u.uvalue); break; case DW_FORM_udata:

1 0

Eric Pouech : dbghelp: Fix dwarf2 subprogram handling.
by Alexandre Julliard 03 Sep '21

03 Sep '21

Module: wine Branch: master Commit: 7790b395ceccce5d0936d2e10411999b0cc1c6e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7790b395ceccce5d0936d2e1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:21:55 2021 +0200 dbghelp: Fix dwarf2 subprogram handling. Fix dwarf2_parse_subprogram_block when looking for inner information to use the child's debug_info (not the lexical_block one!) Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 93baf10ba44..9d8d2756258 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1833,13 +1833,13 @@ static void dwarf2_parse_subprogram_block(dwarf2_subprogram_t* subpgm, dwarf2_parse_variable(subpgm, block, child); break; case DW_TAG_pointer_type: - dwarf2_parse_pointer_type(subpgm->ctx, di); + dwarf2_parse_pointer_type(subpgm->ctx, child); break; case DW_TAG_subroutine_type: - dwarf2_parse_subroutine_type(subpgm->ctx, di); + dwarf2_parse_subroutine_type(subpgm->ctx, child); break; case DW_TAG_const_type: - dwarf2_parse_const_type(subpgm->ctx, di); + dwarf2_parse_const_type(subpgm->ctx, child); break; case DW_TAG_lexical_block: dwarf2_parse_subprogram_block(subpgm, block, child);

1 0

Eric Pouech : winedbg: Allow debugging a 32bit target from a 64bit winedbg.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: b99d7db835b8ed22d8b685a04c0fc0242f61c657 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b99d7db835b8ed22d8b685a0… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Sep 2 11:08:19 2021 +0200 winedbg: Allow debugging a 32bit target from a 64bit winedbg. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/winedbg.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/programs/winedbg/winedbg.c b/programs/winedbg/winedbg.c index 6b363168cd7..35b7642b733 100644 --- a/programs/winedbg/winedbg.c +++ b/programs/winedbg/winedbg.c @@ -657,7 +657,8 @@ int main(int argc, char** argv) dbg_init_console(); SymSetOptions((SymGetOptions() & ~(SYMOPT_UNDNAME)) | - SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS); + SYMOPT_LOAD_LINES | SYMOPT_DEFERRED_LOADS | SYMOPT_AUTO_PUBLICS | + SYMOPT_INCLUDE_32BIT_MODULES); if (argc && !strcmp(argv[0], "--auto")) {

1 0

Nikolay Sivov : d3dx10/sprite: Store projection matrix.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 66d7ba2d8cec7640e7fd6b9d24110660f970312d URL: https://source.winehq.org/git/wine.git/?a=commit;h=66d7ba2d8cec7640e7fd6b9d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:09:36 2021 +0300 d3dx10/sprite: Store projection matrix. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/sprite.c | 27 +++++++++++++++++++++++---- dlls/d3dx10_43/tests/d3dx10.c | 14 ++++++++------ 2 files changed, 31 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx10_43/sprite.c b/dlls/d3dx10_43/sprite.c index 5fc9b9edaa2..b2045e72a27 100644 --- a/dlls/d3dx10_43/sprite.c +++ b/dlls/d3dx10_43/sprite.c @@ -32,6 +32,7 @@ struct d3dx10_sprite ID3DX10Sprite ID3DX10Sprite_iface; LONG refcount; + D3DXMATRIX projection; ID3D10Device *device; }; @@ -139,16 +140,30 @@ static HRESULT WINAPI d3dx10_sprite_SetViewTransform(ID3DX10Sprite *iface, D3DXM static HRESULT WINAPI d3dx10_sprite_GetProjectionTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); - return E_NOTIMPL; + TRACE("iface %p, transform %p.\n", iface, transform); + + if (!transform) + return E_FAIL; + + *transform = sprite->projection; + + return S_OK; } static HRESULT WINAPI d3dx10_sprite_SetProjectionTransform(ID3DX10Sprite *iface, D3DXMATRIX *transform) { - FIXME("iface %p, transform %p stub!\n", iface, transform); + struct d3dx10_sprite *sprite = impl_from_ID3DX10Sprite(iface); - return E_NOTIMPL; + TRACE("iface %p, transform %p.\n", iface, transform); + + if (!transform) + return E_FAIL; + + sprite->projection = *transform; + + return S_OK; } static HRESULT WINAPI d3dx10_sprite_GetDevice(ID3DX10Sprite *iface, ID3D10Device **device) @@ -201,6 +216,10 @@ HRESULT WINAPI D3DX10CreateSprite(ID3D10Device *device, UINT size, ID3DX10Sprite object->refcount = 1; object->device = device; ID3D10Device_AddRef(device); + object->projection._11 = 1.0f; + object->projection._22 = 1.0f; + object->projection._33 = 1.0f; + object->projection._44 = 1.0f; *sprite = &object->ID3DX10Sprite_iface; diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index c7aa3eccd24..bc5ca6747f5 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2968,6 +2968,13 @@ static void test_sprite(void) D3DXMATRIX mat, mat2; ULONG refcount; HRESULT hr; + static const D3DXMATRIX identity = + { + ._11 = 1.0f, + ._22 = 1.0f, + ._33 = 1.0f, + ._44 = 1.0f, + }; if (!(device = create_device())) { @@ -3020,11 +3027,10 @@ static void test_sprite(void) /* Projection transform */ hr = ID3DX10Sprite_GetProjectionTransform(sprite, NULL); -todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_GetProjectionTransform(sprite, &mat); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!memcmp(&mat, &identity, sizeof(mat)), "Unexpected projection transform.\n"); /* Set a transform and test if it gets returned correctly */ mat.m[0][0] = 2.1f; mat.m[0][1] = 6.5f; mat.m[0][2] =-9.6f; mat.m[0][3] = 1.7f; @@ -3033,18 +3039,14 @@ todo_wine mat.m[3][0] = 6.7f; mat.m[3][1] =-5.1f; mat.m[3][2] = 6.1f; mat.m[3][3] = 2.2f; hr = ID3DX10Sprite_SetProjectionTransform(sprite, NULL); -todo_wine ok(hr == E_FAIL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_SetProjectionTransform(sprite, &mat); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Sprite_GetProjectionTransform(sprite, &mat2); -todo_wine { ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!memcmp(&mat, &mat2, sizeof(mat)), "Unexpected matrix.\n"); -} /* View transform */ hr = ID3DX10Sprite_SetViewTransform(sprite, NULL);

1 0

Nikolay Sivov : d3dx10/font: Add PreloadCharacters().
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: c09f114319d6ed7bb260b8677156cfaad0884146 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c09f114319d6ed7bb260b867… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:09:35 2021 +0300 d3dx10/font: Add PreloadCharacters(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/font.c | 45 +++++++++++++++++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 3 --- 2 files changed, 43 insertions(+), 5 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 51704e2bbbe..1a95dbeca02 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -168,9 +168,50 @@ static HRESULT WINAPI d3dx_font_GetGlyphData(ID3DX10Font *iface, UINT glyph, static HRESULT WINAPI d3dx_font_PreloadCharacters(ID3DX10Font *iface, UINT first, UINT last) { - FIXME("iface %p, first %u, last %u stub!\n", iface, first, last); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + unsigned int i, count, start, end; + WORD *indices; + WCHAR *chars; - return E_NOTIMPL; + TRACE("iface %p, first %u, last %u.\n", iface, first, last); + + if (last < first) + return S_OK; + + count = last - first + 1; + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + chars = heap_alloc(count * sizeof(*chars)); + if (!chars) + { + heap_free(indices); + return E_OUTOFMEMORY; + } + + for (i = 0; i < count; ++i) + chars[i] = first + i; + + GetGlyphIndicesW(font->hdc, chars, count, indices, 0); + + start = end = indices[0]; + for (i = 1; i < count; ++i) + { + if (indices[i] == end + 1) + { + end = indices[i]; + continue; + } + ID3DX10Font_PreloadGlyphs(iface, start, end); + start = end = indices[i]; + } + ID3DX10Font_PreloadGlyphs(iface, start, end); + + heap_free(chars); + heap_free(indices); + + return S_OK; } static HRESULT WINAPI d3dx_font_PreloadGlyphs(ID3DX10Font *iface, UINT first, UINT last) diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 65bccb71521..c7aa3eccd24 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2307,14 +2307,12 @@ todo_wine ID3D10ShaderResourceView_Release(srv); hr = ID3DX10Font_PreloadCharacters(font, 'b', 'a'); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadGlyphs(font, 1, 0); todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadCharacters(font, 'a', 'a'); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); for (c = 'b'; c <= 'z'; ++c) @@ -2376,7 +2374,6 @@ todo_wine } hr = ID3DX10Font_PreloadCharacters(font, 'a', 'z'); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); /* Test multiple textures */

1 0

Nikolay Sivov : d3dx10/font: Add PreloadTextW().
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: abbab131b84b8ccfb8ce814a3a5928531262d081 URL: https://source.winehq.org/git/wine.git/?a=commit;h=abbab131b84b8ccfb8ce814a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:09:34 2021 +0300 d3dx10/font: Add PreloadTextW(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/font.c | 28 ++++++++++++++++++++++++++-- dlls/d3dx10_43/tests/d3dx10.c | 9 --------- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/dlls/d3dx10_43/font.c b/dlls/d3dx10_43/font.c index 2145b1c6f1e..51704e2bbbe 100644 --- a/dlls/d3dx10_43/font.c +++ b/dlls/d3dx10_43/font.c @@ -210,9 +210,33 @@ static HRESULT WINAPI d3dx_font_PreloadTextA(ID3DX10Font *iface, const char *str static HRESULT WINAPI d3dx_font_PreloadTextW(ID3DX10Font *iface, const WCHAR *string, INT count) { - FIXME("iface %p, string %s, count %d stub!\n", iface, debugstr_wn(string, count), count); + struct d3dx_font *font = impl_from_ID3DX10Font(iface); + WORD *indices; + int i; - return E_NOTIMPL; + TRACE("iface %p, string %s, count %d.\n", iface, debugstr_wn(string, count), count); + + if (!string && !count) + return S_OK; + + if (!string) + return D3DERR_INVALIDCALL; + + if (count < 0) + count = lstrlenW(string); + + indices = heap_alloc(count * sizeof(*indices)); + if (!indices) + return E_OUTOFMEMORY; + + GetGlyphIndicesW(font->hdc, string, count, indices, 0); + + for (i = 0; i < count; ++i) + ID3DX10Font_PreloadGlyphs(iface, indices[i], indices[i]); + + heap_free(indices); + + return S_OK; } static INT WINAPI d3dx_font_DrawTextA(ID3DX10Font *iface, ID3DX10Sprite *sprite, diff --git a/dlls/d3dx10_43/tests/d3dx10.c b/dlls/d3dx10_43/tests/d3dx10.c index 8c55dd5810b..65bccb71521 100644 --- a/dlls/d3dx10_43/tests/d3dx10.c +++ b/dlls/d3dx10_43/tests/d3dx10.c @@ -2263,32 +2263,23 @@ static void test_font(void) hr = ID3DX10Font_PreloadTextA(font, NULL, 1); ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "test", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextA(font, "", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, -1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, NULL, 1); -todo_wine ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, testW, -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", 0); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = ID3DX10Font_PreloadTextW(font, L"", -1); -todo_wine ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ID3DX10Font_Release(font);

1 0

Nikolay Sivov : d3d10/effect: Fix indexing in GetVertexShader().
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 293484af6016e87f2109a128173e257961936777 URL: https://source.winehq.org/git/wine.git/?a=commit;h=293484af6016e87f2109a128… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:04:34 2021 +0300 d3d10/effect: Fix indexing in GetVertexShader(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 24 +++++++++++++------- dlls/d3d10/tests/effect.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 8 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7e583ea956b..180d36ce65b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -6983,7 +6983,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetRawValue( /* ID3D10EffectShaderVariable methods */ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT shader_index, - struct d3d10_effect_shader_variable **s) + struct d3d10_effect_shader_variable **s, D3D10_SHADER_VARIABLE_TYPE *basetype) { unsigned int i; @@ -6993,6 +6993,7 @@ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT s if (!shader_index) { *s = &v->u.shader; + if (basetype) *basetype = v->type->basetype; return S_OK; } @@ -7010,6 +7011,8 @@ static HRESULT d3d10_get_shader_variable(struct d3d10_effect_variable *v, UINT s } *s = &v->effect->used_shaders[i + shader_index]->u.shader; + if (basetype) *basetype = v->effect->used_shaders[i + shader_index]->type->basetype; + return S_OK; } @@ -7023,7 +7026,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetShaderDesc( TRACE("iface %p, index %u, desc %p.\n", iface, index, desc); - if (FAILED(hr = d3d10_get_shader_variable(v, index, &s))) + if (FAILED(hr = d3d10_get_shader_variable(v, index, &s, NULL))) return hr; memset(desc, 0, sizeof(*desc)); @@ -7052,19 +7055,24 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_shader_variable_GetVertexShader( ID3D10EffectShaderVariable *iface, UINT index, ID3D10VertexShader **shader) { struct d3d10_effect_variable *v = impl_from_ID3D10EffectShaderVariable(iface); + struct d3d10_effect_shader_variable *s; + D3D10_SHADER_VARIABLE_TYPE basetype; + HRESULT hr; TRACE("iface %p, index %u, shader %p.\n", iface, index, shader); - if (v->type->element_count) - v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + *shader = NULL; - if (v->type->basetype != D3D10_SVT_VERTEXSHADER) + if (FAILED(hr = d3d10_get_shader_variable(v, index, &s, &basetype))) + return hr; + + if (basetype != D3D10_SVT_VERTEXSHADER) { WARN("Shader is not a vertex shader.\n"); - return E_FAIL; + return D3DERR_INVALIDCALL; } - if ((*shader = v->u.shader.shader.vs)) + if ((*shader = s->shader.vs)) ID3D10VertexShader_AddRef(*shader); return S_OK; @@ -7120,7 +7128,7 @@ static HRESULT d3d10_get_shader_variable_signature(struct d3d10_effect_variable struct d3d10_effect_shader_variable *s; HRESULT hr; - if (FAILED(hr = d3d10_get_shader_variable(v, shader_index, &s))) + if (FAILED(hr = d3d10_get_shader_variable(v, shader_index, &s, NULL))) return hr; if (!s->reflection) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index a9d077566e0..4583863d59b 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6010,6 +6010,62 @@ static void test_effect_shader_description(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_effect_shader_object(void) +{ + ID3D10EffectShaderVariable *s; + ID3D10EffectVariable *v; + ID3D10VertexShader *vs; + ID3D10Effect* effect; + ID3D10Device *device; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_local_shader, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect!\n"); + + v = effect->lpVtbl->GetVariableByName(effect, "v0"); + + s = v->lpVtbl->AsShader(v); + + vs = (void *)0xdeadbeef; + hr = s->lpVtbl->GetVertexShader(s, 0, &vs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!vs, "Unexpected shader object.\n"); + + vs = (void *)0xdeadbeef; + hr = s->lpVtbl->GetVertexShader(s, 1, &vs); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!vs, "Unexpected shader object.\n"); + + vs = (void *)0xdeadbeef; + hr = s->lpVtbl->GetVertexShader(s, 2, &vs); + ok(hr == D3DERR_INVALIDCALL, "Unexpected hr %#x.\n", hr); + ok(!vs, "Unexpected shader object.\n"); + + vs = NULL; + hr = s->lpVtbl->GetVertexShader(s, 3, &vs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!vs, "Unexpected shader object.\n"); + ID3D10VertexShader_Release(vs); + + vs = NULL; + hr = s->lpVtbl->GetVertexShader(s, 4, &vs); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!!vs, "Unexpected shader object.\n"); + ID3D10VertexShader_Release(vs); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(effect) { test_effect_constant_buffer_type(); @@ -6028,4 +6084,5 @@ START_TEST(effect) test_effect_resource_variable(); test_effect_optimize(); test_effect_shader_description(); + test_effect_shader_object(); }

1 0

Nikolay Sivov : d3d10/effect: Remove unnecessary early returns.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 0b3e2400aa11be6b0385740d4e976cd7a3f70db2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b3e2400aa11be6b0385740d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:04:33 2021 +0300 d3d10/effect: Remove unnecessary early returns. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 71468bd4d3c..7e583ea956b 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -765,12 +765,10 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse { case D3D10_SVT_VERTEXSHADER: hr = ID3D10Device_CreateVertexShader(device, ptr, dxbc_size, &v->u.shader.shader.vs); - if (FAILED(hr)) return hr; break; case D3D10_SVT_PIXELSHADER: hr = ID3D10Device_CreatePixelShader(device, ptr, dxbc_size, &v->u.shader.shader.ps); - if (FAILED(hr)) return hr; break; case D3D10_SVT_GEOMETRYSHADER:

1 0

Nikolay Sivov : d3d10/effect: Create shaders with stream output when declaration string is present.
by Alexandre Julliard 02 Sep '21

02 Sep '21

Module: wine Branch: master Commit: 2327ae70aef79fb90ccb399caa2c5f5167bd02c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2327ae70aef79fb90ccb399c… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 1 16:04:32 2021 +0300 d3d10/effect: Create shaders with stream output when declaration string is present. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/effect.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 48df10acff5..71468bd4d3c 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -774,7 +774,7 @@ static HRESULT parse_fx10_shader(const char *data, size_t data_size, DWORD offse break; case D3D10_SVT_GEOMETRYSHADER: - if (v->type->flags & D3D10_EOT_FLAG_GS_SO) + if (v->u.shader.stream_output_declaration) { struct d3d10_effect_so_decl so_decl;

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 September 2021