September 2021 - Wine-commits

Eric Pouech : dbghelp/dwarf: Add ability to get to a DIE in a different CU.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 8c22d665a87f17b3880fb9ba8614d4c76334fb24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8c22d665a87f17b3880fb9ba… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:10 2021 +0200 dbghelp/dwarf: Add ability to get to a DIE in a different CU. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 855168a6085..a2ee234f79f 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -188,6 +188,8 @@ enum unit_status UNIT_ERROR, UNIT_NOTLOADED, UNIT_LOADED, + UNIT_LOADED_FAIL, + UNIT_BEINGLOADED, }; /* this is the context used for parsing a compilation unit @@ -224,6 +226,8 @@ struct dwarf2_module_info_s /* forward declarations */ static struct symt* dwarf2_parse_enumeration_type(dwarf2_parse_context_t* ctx, dwarf2_debug_info_t* entry); +static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx); +static dwarf2_parse_context_t* dwarf2_locate_cu(dwarf2_parse_module_context_t* module_ctx, ULONG_PTR ref); static unsigned char dwarf2_get_byte(const unsigned char* ptr) { @@ -2450,6 +2454,22 @@ unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_co return TRUE; } +static inline dwarf2_parse_context_t* dwarf2_locate_cu(dwarf2_parse_module_context_t* module_ctx, ULONG_PTR ref) +{ + unsigned i; + dwarf2_parse_context_t* ctx; + const BYTE* where; + for (i = 0; i < module_ctx->unit_contexts.num_elts; ++i) + { + ctx = vector_at(&module_ctx->unit_contexts, i); + where = module_ctx->sections[ctx->section].address + ref; + if (where >= ctx->traverse_DIE.data && where < ctx->traverse_DIE.end_data) + return ctx; + } + FIXME("Couldn't find ref 0x%lx inside sect\n", ref); + return NULL; +} + static BOOL dwarf2_parse_compilation_unit_head(dwarf2_parse_context_t* ctx, dwarf2_traverse_context_t* mod_ctx) { @@ -2516,8 +2536,19 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) dwarf2_traverse_context_t cu_ctx = ctx->traverse_DIE; BOOL ret = FALSE; - if (ctx->status == UNIT_ERROR) return FALSE; + switch (ctx->status) + { + case UNIT_ERROR: return FALSE; + case UNIT_BEINGLOADED: + FIXME("Circular deps on CU\n"); + /* fall through */ + case UNIT_LOADED: + case UNIT_LOADED_FAIL: + return TRUE; + case UNIT_NOTLOADED: break; + } + ctx->status = UNIT_BEINGLOADED; if (dwarf2_read_one_debug_info(ctx, &cu_ctx, NULL, &di)) { if (di->abbrev->tag == DW_TAG_compile_unit) @@ -2558,6 +2589,7 @@ static BOOL dwarf2_parse_compilation_unit(dwarf2_parse_context_t* ctx) } else FIXME("Should have a compilation unit here\n"); } + if (ctx->status == UNIT_BEINGLOADED) ctx->status = UNIT_LOADED_FAIL; return ret; }

1 0

Eric Pouech : dbghelp/dwarf: Support DW_FORM_ref_addr in type DIE lookup using the new cross-CU DIE mechanisms.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 34b06f873ab8730e07464387555ce892ba5db250 URL: https://source.winehq.org/git/wine.git/?a=commit;h=34b06f873ab8730e07464387… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:17 2021 +0200 dbghelp/dwarf: Support DW_FORM_ref_addr in type DIE lookup using the new cross-CU DIE mechanisms. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index a2ee234f79f..eb0cfaf2f50 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1044,8 +1044,21 @@ static struct symt* dwarf2_lookup_type(dwarf2_parse_context_t* ctx, return ctx->module_ctx->symt_cache[sc_void]; if (!(type = sparse_array_find(&ctx->debug_info_table, attr.u.uvalue))) { - FIXME("Unable to find back reference to type %lx\n", attr.u.uvalue); - return ctx->module_ctx->symt_cache[sc_unknown]; + if (attr.form == DW_FORM_ref_addr) + { + dwarf2_parse_context_t* ref_ctx = dwarf2_locate_cu(ctx->module_ctx, attr.u.uvalue); + /* ensure CU is fully loaded */ + if (ref_ctx && dwarf2_parse_compilation_unit(ref_ctx)) + { + type = sparse_array_find(&ref_ctx->debug_info_table, attr.u.uvalue); + if (type) TRACE("Found type ref %lx in another CU %s\n", attr.u.uvalue, dwarf2_debug_ctx(ref_ctx)); + } + } + if (!type) + { + FIXME("Unable to find back reference to type 0x%lx (form=0x%lx)\n", attr.u.uvalue, attr.form); + return ctx->module_ctx->symt_cache[sc_unknown]; + } } if (type == di) { @@ -2454,7 +2467,7 @@ unsigned dwarf2_cache_cuhead(struct dwarf2_module_info_s* module, struct symt_co return TRUE; } -static inline dwarf2_parse_context_t* dwarf2_locate_cu(dwarf2_parse_module_context_t* module_ctx, ULONG_PTR ref) +static dwarf2_parse_context_t* dwarf2_locate_cu(dwarf2_parse_module_context_t* module_ctx, ULONG_PTR ref) { unsigned i; dwarf2_parse_context_t* ctx;

1 0

Eric Pouech : dbghelp/dwarf: Detect out of section sibling DIE information.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: f0c93974596ac45944c9aef9010f2937fc337148 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0c93974596ac45944c9aef9… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Sep 15 10:38:23 2021 +0200 dbghelp/dwarf: Detect out of section sibling DIE information. 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, 6 insertions(+) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index eb0cfaf2f50..e1702964efa 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1244,6 +1244,12 @@ static BOOL dwarf2_read_one_debug_info(dwarf2_parse_context_t* ctx, if (dwarf2_find_attribute(ctx, di, DW_AT_sibling, &sibling) && traverse->data != ctx->module_ctx->sections[ctx->section].address + sibling.u.uvalue) { + if (sibling.u.uvalue >= ctx->module_ctx->sections[ctx->section].size) + { + FIXME("cursor sibling after section end %s: 0x%lx 0x%x\n", + dwarf2_debug_ctx(ctx), sibling.u.uvalue, ctx->module_ctx->sections[ctx->section].size); + return FALSE; + } WARN("setting cursor for %s to next sibling <0x%lx>\n", dwarf2_debug_traverse_ctx(traverse), sibling.u.uvalue); traverse->data = ctx->module_ctx->sections[ctx->section].address + sibling.u.uvalue;

1 0

Nikolay Sivov : d3d10/effect: Handle object type D3D10_SVT_TEXTURE.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: d2d161d5075dcf2acfd36b941b3766c0f99f1428 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2d161d5075dcf2acfd36b94… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 15 09:43:22 2021 +0200 d3d10/effect: Handle object type D3D10_SVT_TEXTURE. 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 | 3 ++ dlls/d3d10/tests/effect.c | 127 +++++++++++++++++++++++++++++----------------- 2 files changed, 84 insertions(+), 46 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2d161d5075dcf2acfd3…

1 0

Nikolay Sivov : d3d10/effect: Release technique names on Optimize().
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: eb1f76caa615a1feeee4c4f7c127eced6665992a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb1f76caa615a1feeee4c4f7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 12 16:37:00 2021 +0300 d3d10/effect: Release technique names on Optimize(). 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 | 6 ++++++ dlls/d3d10/tests/effect.c | 17 +++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 6d2f862f252..d850928248a 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3435,6 +3435,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) v->u.shader.stream_output_declaration = NULL; } + for (i = 0; i < effect->technique_count; ++i) + { + heap_free(effect->techniques[i].name); + effect->techniques[i].name = NULL; + } + return S_OK; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 5e548a96172..ca96e6c20a2 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5996,6 +5996,8 @@ static void test_effect_optimize(void) { D3D10_EFFECT_SHADER_DESC shaderdesc; ID3D10EffectShaderVariable *gs; + D3D10_TECHNIQUE_DESC tech_desc; + ID3D10EffectTechnique *tech; ID3D10EffectVariable *v; ID3D10Effect *effect; ID3D10Device *device; @@ -6011,6 +6013,11 @@ static void test_effect_optimize(void) hr = create_effect(fx_local_shader, 0, device, NULL, &effect); ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + hr = tech->lpVtbl->GetDesc(tech, &tech_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(tech_desc.Name, "Render"), "Unexpected technique name %s.\n", tech_desc.Name); + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); @@ -6038,6 +6045,16 @@ static void test_effect_optimize(void) ok(!shaderdesc.NumInputSignatureEntries, "Unexpected input signature count.\n"); ok(!shaderdesc.NumOutputSignatureEntries, "Unexpected output signature count.\n"); + hr = tech->lpVtbl->GetDesc(tech, &tech_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!tech_desc.Name, "Unexpected technique name %p.\n", tech_desc.Name); + + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + ok(tech->lpVtbl->IsValid(tech), "Unexpected valid technique.\n"); + + tech = effect->lpVtbl->GetTechniqueByName(effect, "Render"); + ok(!tech->lpVtbl->IsValid(tech), "Unexpected valid technique.\n"); + effect->lpVtbl->Release(effect); refcount = ID3D10Device_Release(device);

1 0

Nikolay Sivov : d3d10/effect: Release passes names on Optimize().
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: c00d42f4ba0ad6a2719ac76f2a5ad250c59a4cdb URL: https://source.winehq.org/git/wine.git/?a=commit;h=c00d42f4ba0ad6a2719ac76f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 12 16:37:01 2021 +0300 d3d10/effect: Release passes names on Optimize(). 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 | 8 +++++++- dlls/d3d10/tests/effect.c | 14 ++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index d850928248a..a9e97725659 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -3413,7 +3413,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) { struct d3d10_effect *effect = impl_from_ID3D10Effect(iface); struct d3d10_effect_variable *v; - unsigned int i; + unsigned int i, j; FIXME("iface %p semi-stub!\n", iface); @@ -3437,6 +3437,12 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_Optimize(ID3D10Effect *iface) for (i = 0; i < effect->technique_count; ++i) { + for (j = 0; j < effect->techniques[i].pass_count; ++j) + { + heap_free(effect->techniques[i].passes[j].name); + effect->techniques[i].passes[j].name = NULL; + } + heap_free(effect->techniques[i].name); effect->techniques[i].name = NULL; } diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index ca96e6c20a2..db4299c8a4c 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -5998,7 +5998,9 @@ static void test_effect_optimize(void) ID3D10EffectShaderVariable *gs; D3D10_TECHNIQUE_DESC tech_desc; ID3D10EffectTechnique *tech; + D3D10_PASS_DESC pass_desc; ID3D10EffectVariable *v; + ID3D10EffectPass *pass; ID3D10Effect *effect; ID3D10Device *device; ULONG refcount; @@ -6018,6 +6020,11 @@ static void test_effect_optimize(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!strcmp(tech_desc.Name, "Render"), "Unexpected technique name %s.\n", tech_desc.Name); + pass = tech->lpVtbl->GetPassByIndex(tech, 0); + hr = pass->lpVtbl->GetDesc(pass, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!strcmp(pass_desc.Name, "P0"), "Unexpected pass name %s.\n", pass_desc.Name); + v = effect->lpVtbl->GetVariableByName(effect, "g_so"); gs = v->lpVtbl->AsShader(v); @@ -6049,6 +6056,13 @@ static void test_effect_optimize(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(!tech_desc.Name, "Unexpected technique name %p.\n", tech_desc.Name); + hr = pass->lpVtbl->GetDesc(pass, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(!pass_desc.Name, "Unexpected pass name %p.\n", pass_desc.Name); + + pass = tech->lpVtbl->GetPassByName(tech, "P0"); + ok(!pass->lpVtbl->IsValid(pass), "Unexpected valid pass.\n"); + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); ok(tech->lpVtbl->IsValid(tech), "Unexpected valid technique.\n");

1 0

Nikolay Sivov : d3d10/tests: Add some tests for effect pools.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 20952bcd3d28f36a255c79bbd0f9b20c73458924 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20952bcd3d28f36a255c79bb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 15 09:43:25 2021 +0200 d3d10/tests: Add some tests for effect pools. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/tests/effect.c | 371 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 371 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=20952bcd3d28f36a255c…

1 0

Nikolay Sivov : d3d10/tests: Add a test for default numeric variable values.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: 4a3e038022d73b5d7ca3f6b4d0881f2f3497c39c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a3e038022d73b5d7ca3f6b4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 12 16:37:03 2021 +0300 d3d10/tests: Add a test for default numeric variable values. 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/tests/effect.c | 112 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 88b6b2e170d..9223fdf51ef 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6638,6 +6638,117 @@ todo_wine ok(!refcount, "Device has %u references left.\n", refcount); } +#if 0 +float4 f4 = {1,2,3,4}; +float2 f2 = {1,2}; +float1 f1 = {1}; +int i = 10; +int i2[2] = {9,12}; +float f = 0.2f; +#endif +static DWORD fx_test_default_variable_value[] = +{ + 0x43425844, 0xe57b41f2, 0x98392802, 0xed3d94b4, 0xc4074c4f, 0x00000001, 0x00000248, 0x00000001, + 0x00000024, 0x30315846, 0x0000021c, 0xfeff1001, 0x00000001, 0x00000006, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000110, 0x00000000, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x6f6c4724, + 0x736c6162, 0x6f6c6600, 0x00347461, 0x0000000d, 0x00000001, 0x00000000, 0x00000010, 0x00000010, + 0x00000010, 0x0000210a, 0x00003466, 0x003f8000, 0x00400000, 0x00404000, 0x66408000, 0x74616f6c, + 0x00430032, 0x00010000, 0x00000000, 0x00080000, 0x00100000, 0x00080000, 0x110a0000, 0x32660000, + 0x80000000, 0x0000003f, 0x6f6c6640, 0x00317461, 0x00000071, 0x00000001, 0x00000000, 0x00000004, + 0x00000010, 0x00000004, 0x0000090a, 0x00003166, 0x693f8000, 0x9b00746e, 0x01000000, 0x00000000, + 0x04000000, 0x10000000, 0x04000000, 0x11000000, 0x69000009, 0x00000a00, 0x00009b00, 0x00000100, + 0x00000200, 0x00001400, 0x00001000, 0x00000800, 0x00091100, 0x00326900, 0x00000009, 0x0000000c, + 0x616f6c66, 0x00e80074, 0x00010000, 0x00000000, 0x00040000, 0x00100000, 0x00040000, 0x09090000, + 0x00660000, 0x3e4ccccd, 0x00000004, 0x00000040, 0x00000000, 0x00000006, 0xffffffff, 0x00000000, + 0x00000030, 0x00000014, 0x00000000, 0x00000000, 0x00000033, 0x00000000, 0x00000000, 0x00000066, + 0x0000004a, 0x00000000, 0x00000010, 0x00000069, 0x00000000, 0x00000000, 0x00000094, 0x00000078, + 0x00000000, 0x00000018, 0x00000097, 0x00000000, 0x00000000, 0x000000bb, 0x0000009f, 0x00000000, + 0x0000001c, 0x000000bd, 0x00000000, 0x00000000, 0x000000dd, 0x000000c1, 0x00000000, 0x00000020, + 0x000000e0, 0x00000000, 0x00000000, 0x0000010a, 0x000000ee, 0x00000000, 0x00000034, 0x0000010c, + 0x00000000, 0x00000000, +}; + +static void test_effect_default_variable_value(void) +{ + ID3D10EffectVectorVariable *vector; + ID3D10EffectScalarVariable *scalar; + float float_v[4], float_s; + ID3D10EffectVariable *v; + ID3D10Effect *effect; + ID3D10Device *device; + int int_v[2], int_s; + ULONG refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_test_default_variable_value, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "D3D10CreateEffectFromMemory failed (%x)\n", hr); + + memset(float_v, 0, sizeof(float_v)); + v = effect->lpVtbl->GetVariableByName(effect, "f4"); + vector = v->lpVtbl->AsVector(v); + hr = vector->lpVtbl->GetFloatVector(vector, float_v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 3.0f && float_v[3] == 4.0f, + "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); + + memset(float_v, 0, sizeof(float_v)); + float_v[2] = float_v[3] = 5.0f; + v = effect->lpVtbl->GetVariableByName(effect, "f2"); + vector = v->lpVtbl->AsVector(v); + hr = vector->lpVtbl->GetFloatVector(vector, float_v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(float_v[0] == 1.0f && float_v[1] == 2.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, + "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); + + memset(float_v, 0, sizeof(float_v)); + float_v[1] = float_v[2] = float_v[3] = 5.0f; + v = effect->lpVtbl->GetVariableByName(effect, "f1"); + vector = v->lpVtbl->AsVector(v); + hr = vector->lpVtbl->GetFloatVector(vector, float_v); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(float_v[0] == 1.0f && float_v[1] == 5.0f && float_v[2] == 5.0f && float_v[3] == 5.0f, + "Unexpected vector {%.8e,%.8e,%.8e,%.8e}\n", float_v[0], float_v[1], float_v[2], float_v[3]); + + int_s = 0; + v = effect->lpVtbl->GetVariableByName(effect, "i"); + scalar = v->lpVtbl->AsScalar(v); + hr = scalar->lpVtbl->GetInt(scalar, &int_s); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(int_s == 10, "Unexpected value %d.\n", int_s); + + memset(int_v, 0, sizeof(int_v)); + v = effect->lpVtbl->GetVariableByName(effect, "i2"); + scalar = v->lpVtbl->AsScalar(v); + hr = scalar->lpVtbl->GetIntArray(scalar, int_v, 0, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(int_v[0] == 9 && int_v[1] == 12, "Unexpected vector {%d,%d}\n", int_v[0], int_v[1]); + + float_s = 0.0f; + v = effect->lpVtbl->GetVariableByName(effect, "f"); + scalar = v->lpVtbl->AsScalar(v); + hr = scalar->lpVtbl->GetFloat(scalar, &float_s); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine + ok(float_s == 0.2f, "Unexpected value %.8e.\n", float_s); + + 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(); @@ -6658,4 +6769,5 @@ START_TEST(effect) test_effect_shader_description(); test_effect_shader_object(); test_effect_pool(); + test_effect_default_variable_value(); }

1 0

Nikolay Sivov : d3d10/effect: Remove no longer used fourcc symbols.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: edf965389b8e2672c48a8f2b96f05d4950bff622 URL: https://source.winehq.org/git/wine.git/?a=commit;h=edf965389b8e2672c48a8f2b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sun Sep 12 16:37:04 2021 +0300 d3d10/effect: Remove no longer used fourcc symbols. 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 | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index a9e97725659..e77d0691fcf 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -29,9 +29,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d10); ((DWORD)(ch2) << 16) | ((DWORD)(ch3) << 24 )) #define TAG_DXBC MAKE_TAG('D', 'X', 'B', 'C') #define TAG_FX10 MAKE_TAG('F', 'X', '1', '0') -#define TAG_ISGN MAKE_TAG('I', 'S', 'G', 'N') -#define TAG_OSGN MAKE_TAG('O', 'S', 'G', 'N') -#define TAG_SHDR MAKE_TAG('S', 'H', 'D', 'R') #define D3D10_FX10_TYPE_COLUMN_SHIFT 11 #define D3D10_FX10_TYPE_COLUMN_MASK (0x7 << D3D10_FX10_TYPE_COLUMN_SHIFT)

1 0

Nikolay Sivov : d3dx10_36/tests: Enable tests.
by Alexandre Julliard 15 Sep '21

15 Sep '21

Module: wine Branch: master Commit: fbb8ab801ef13f422cc73a169478d4eb4623fe56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbb8ab801ef13f422cc73a16… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Sep 14 15:39:00 2021 +0300 d3dx10_36/tests: Enable tests. 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> --- configure | 1 + configure.ac | 1 + dlls/d3dx10_36/Makefile.in | 1 + dlls/d3dx10_36/tests/Makefile.in | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/configure b/configure index 4306ea70100..00a5be6a504 100755 --- a/configure +++ b/configure @@ -20341,6 +20341,7 @@ wine_fn_config_makefile dlls/d3dx10_33 enable_d3dx10_33 wine_fn_config_makefile dlls/d3dx10_34 enable_d3dx10_34 wine_fn_config_makefile dlls/d3dx10_35 enable_d3dx10_35 wine_fn_config_makefile dlls/d3dx10_36 enable_d3dx10_36 +wine_fn_config_makefile dlls/d3dx10_36/tests enable_tests wine_fn_config_makefile dlls/d3dx10_37 enable_d3dx10_37 wine_fn_config_makefile dlls/d3dx10_37/tests enable_tests wine_fn_config_makefile dlls/d3dx10_38 enable_d3dx10_38 diff --git a/configure.ac b/configure.ac index 6ca4eb5c923..dea5fe61bf3 100644 --- a/configure.ac +++ b/configure.ac @@ -3065,6 +3065,7 @@ WINE_CONFIG_MAKEFILE(dlls/d3dx10_33) WINE_CONFIG_MAKEFILE(dlls/d3dx10_34) WINE_CONFIG_MAKEFILE(dlls/d3dx10_35) WINE_CONFIG_MAKEFILE(dlls/d3dx10_36) +WINE_CONFIG_MAKEFILE(dlls/d3dx10_36/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37) WINE_CONFIG_MAKEFILE(dlls/d3dx10_37/tests) WINE_CONFIG_MAKEFILE(dlls/d3dx10_38) diff --git a/dlls/d3dx10_36/Makefile.in b/dlls/d3dx10_36/Makefile.in index efd498f7e2c..a15593f62f1 100644 --- a/dlls/d3dx10_36/Makefile.in +++ b/dlls/d3dx10_36/Makefile.in @@ -1,4 +1,5 @@ MODULE = d3dx10_36.dll +IMPORTLIB = d3dx10_36 EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native diff --git a/dlls/d3dx10_36/tests/Makefile.in b/dlls/d3dx10_36/tests/Makefile.in new file mode 100644 index 00000000000..22e9a91f581 --- /dev/null +++ b/dlls/d3dx10_36/tests/Makefile.in @@ -0,0 +1,6 @@ +TESTDLL = d3dx10_36.dll +IMPORTS = d3dx10_36 ole32 gdi32 +PARENTSRC = ../../d3dx10_43/tests + +C_SRCS = \ + d3dx10.c

1 0