- wine-devel - winehq.org

[v2 PATCH 2/7] d3d10/tests: Add some tests for annotations.
by Matteo Bruni 13 Oct '21

13 Oct '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Drop a few duplicated tests. dlls/d3d10/tests/effect.c | 219 +++++++++++++++++++++++++++++++++++++- 1 file changed, 218 insertions(+), 1 deletion(-) diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 6ad3f7421f4..d4b3ff244d4 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -6097,18 +6097,149 @@ static void test_effect_resource_variable(void) ok(!refcount, "Device has %u references left.\n", refcount); } +#if 0 +cbuffer cb <string s = "cb_a"; > +{ + float f1 : COLOR0 <string s = "f1_a"; >; +}; + +BlendState blendstate <string s = "bs_a"; >; +Texture2D tex <string s = "tex_a"; >; +PixelShader ps <string s = "ps_a"; >; +VertexShader vs <string s = "vs_a"; >; +GeometryShader gs <string s = "gs_a"; >; +DepthStencilState ds <string s = "ds_a"; >; +RasterizerState rs <string s = "rs_a"; >; +SamplerState s <string s = "s_a"; >; +RenderTargetView rtv <string s = "rtv_a"; >; +DepthStencilView dsv <string s = "dsv_a"; >; + +technique10 tech <string s = "tech_a"; > +{ + pass P0 <string s = "P0_a"; > + { + } +}; +#endif +static DWORD fx_test_annotations[] = +{ + 0x43425844, 0x2b3e08d4, 0xe3eda7bb, 0x36982de8, 0x0dcab1aa, 0x00000001, 0x000004c6, 0x00000001, + 0x00000024, 0x30315846, 0x0000049a, 0xfeff1001, 0x00000001, 0x00000001, 0x0000000a, 0x00000000, + 0x00000000, 0x00000000, 0x00000001, 0x00000276, 0x00000000, 0x00000001, 0x00000001, 0x00000001, + 0x00000001, 0x00000001, 0x00000001, 0x00000001, 0x00000003, 0x00000000, 0x00000000, 0x53006263, + 0x6e697274, 0x00070067, 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00010000, + 0x00730000, 0x615f6263, 0x6f6c6600, 0x31007461, 0x01000000, 0x00000000, 0x04000000, 0x10000000, + 0x04000000, 0x09000000, 0x66000009, 0x4f430031, 0x30524f4c, 0x5f316600, 0x6c420061, 0x53646e65, + 0x65746174, 0x00006200, 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00000200, + 0x656c6200, 0x7473646e, 0x00657461, 0x615f7362, 0x78655400, 0x65727574, 0x99004432, 0x02000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x0c000000, 0x74000000, 0x74007865, 0x615f7865, + 0x78695000, 0x68536c65, 0x72656461, 0x0000c900, 0x00000200, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000500, 0x00737000, 0x615f7370, 0x72655600, 0x53786574, 0x65646168, 0x00f90072, + 0x00020000, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00060000, 0x73760000, 0x5f737600, + 0x65470061, 0x74656d6f, 0x68537972, 0x72656461, 0x00012a00, 0x00000200, 0x00000000, 0x00000000, + 0x00000000, 0x00000000, 0x00000700, 0x00736700, 0x615f7367, 0x70654400, 0x74536874, 0x69636e65, + 0x6174536c, 0x5d006574, 0x02000001, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x03000000, + 0x64000000, 0x73640073, 0x5200615f, 0x65747361, 0x657a6972, 0x61745372, 0x93006574, 0x02000001, + 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x04000000, 0x72000000, 0x73720073, 0x5300615f, + 0x6c706d61, 0x74537265, 0x00657461, 0x000001c7, 0x00000002, 0x00000000, 0x00000000, 0x00000000, + 0x00000000, 0x00000015, 0x00615f73, 0x646e6552, 0x61547265, 0x74656772, 0x77656956, 0x0001f400, + 0x00000200, 0x00000000, 0x00000000, 0x00000000, 0x00000000, 0x00001300, 0x76747200, 0x76747200, + 0x4400615f, 0x68747065, 0x6e657453, 0x566c6963, 0x00776569, 0x0000022b, 0x00000002, 0x00000000, + 0x00000000, 0x00000000, 0x00000000, 0x00000014, 0x00767364, 0x5f767364, 0x65740061, 0x74006863, + 0x5f686365, 0x30500061, 0x5f305000, 0x00040061, 0x00100000, 0x00000000, 0x00010000, 0xffff0000, + 0x0001ffff, 0x002a0000, 0x000e0000, 0x002c0000, 0x00530000, 0x00370000, 0x00560000, 0x00000000, + 0x00000000, 0x00000000, 0x00010000, 0x002a0000, 0x000e0000, 0x005d0000, 0x00890000, 0x006d0000, + 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, 0x002a0000, 0x000e0000, 0x00940000, 0x00bf0000, + 0x00a30000, 0x00000000, 0xffff0000, 0x0001ffff, 0x002a0000, 0x000e0000, 0x00c30000, 0x00f10000, + 0x00d50000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, 0x002a0000, 0x000e0000, 0x00f40000, + 0x01220000, 0x01060000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, 0x002a0000, 0x000e0000, + 0x01250000, 0x01550000, 0x01390000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, 0x002a0000, + 0x000e0000, 0x01580000, 0x018b0000, 0x016f0000, 0x00000000, 0xffff0000, 0x0000ffff, 0x00010000, + 0x002a0000, 0x000e0000, 0x018e0000, 0x01bf0000, 0x01a30000, 0x00000000, 0xffff0000, 0x0000ffff, + 0x00010000, 0x002a0000, 0x000e0000, 0x01c20000, 0x002a0000, 0x01d40000, 0x00000000, 0xffff0000, + 0x0000ffff, 0x00010000, 0x002a0000, 0x000e0000, 0x01f00000, 0x02210000, 0x02050000, 0x00000000, + 0xffff0000, 0x0001ffff, 0x002a0000, 0x000e0000, 0x02250000, 0x02580000, 0x023c0000, 0x00000000, + 0xffff0000, 0x0001ffff, 0x002a0000, 0x000e0000, 0x025c0000, 0x02620000, 0x00010000, 0x00010000, + 0x002a0000, 0x000e0000, 0x02670000, 0x026e0000, 0x00000000, 0x00010000, 0x002a0000, 0x000e0000, + 0x02710000, 0x00000000, +}; + +static void test_effect_annotations(void) +{ + D3D10_EFFECT_VARIABLE_DESC var_desc; + ID3D10EffectConstantBuffer *cb; + D3D10_EFFECT_DESC effect_desc; + ID3D10EffectTechnique *tech; + ID3D10EffectVariable *v, *a; + ID3D10EffectPass *pass; + ID3D10Effect *effect; + ID3D10Device *device; + ULONG i, refcount; + HRESULT hr; + + if (!(device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + + cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); + a = cb->lpVtbl->GetAnnotationByName(cb, "s"); + ok(a->lpVtbl->IsValid(a), "Expected valid variable.\n"); + a = cb->lpVtbl->GetAnnotationByName(cb, "S"); + ok(!a->lpVtbl->IsValid(a), "Unexpected valid variable.\n"); + + effect->lpVtbl->GetDesc(effect, &effect_desc); + for (i = 0; i < effect_desc.GlobalVariables; ++i) + { + v = effect->lpVtbl->GetVariableByIndex(effect, i); + hr = v->lpVtbl->GetDesc(v, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = v->lpVtbl->GetAnnotationByName(v, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + a = cb->lpVtbl->GetAnnotationByName(cb, "S"); + ok(!a->lpVtbl->IsValid(a), "Unexpected valid variable.\n"); + } + + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + ok(tech->lpVtbl->IsValid(tech), "Expected valid technique.\n"); + a = tech->lpVtbl->GetAnnotationByName(tech, "s"); + ok(a->lpVtbl->IsValid(a), "Expected valid variable.\n"); + a = tech->lpVtbl->GetAnnotationByName(tech, "S"); + ok(!a->lpVtbl->IsValid(a), "Unexpected valid variable.\n"); + + pass = tech->lpVtbl->GetPassByIndex(tech, 0); + ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); + a = pass->lpVtbl->GetAnnotationByName(pass, "s"); + ok(a->lpVtbl->IsValid(a), "Expected valid variable.\n"); + a = pass->lpVtbl->GetAnnotationByName(pass, "S"); + ok(!a->lpVtbl->IsValid(a), "Unexpected valid variable.\n"); + + effect->lpVtbl->Release(effect); + + refcount = ID3D10Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + static void test_effect_optimize(void) { D3D10_EFFECT_SHADER_DESC shaderdesc; + D3D10_EFFECT_VARIABLE_DESC var_desc; + ID3D10EffectConstantBuffer *cb; ID3D10EffectShaderVariable *gs; D3D10_TECHNIQUE_DESC tech_desc; + D3D10_EFFECT_DESC effect_desc; ID3D10EffectTechnique *tech; D3D10_PASS_DESC pass_desc; ID3D10EffectVariable *v; ID3D10EffectPass *pass; ID3D10Effect *effect; ID3D10Device *device; - ULONG refcount; + ULONG i, refcount; HRESULT hr; BOOL ret; @@ -6187,6 +6318,91 @@ static void test_effect_optimize(void) effect->lpVtbl->Release(effect); + /* Annotations are stripped. */ + hr = create_effect(fx_test_annotations, 0, device, NULL, &effect); + ok(SUCCEEDED(hr), "Failed to create an effect.\n"); + + cb = effect->lpVtbl->GetConstantBufferByName(effect, "cb"); + hr = cb->lpVtbl->GetDesc(cb, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = cb->lpVtbl->GetAnnotationByName(cb, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + + effect->lpVtbl->GetDesc(effect, &effect_desc); + + for (i = 0; i < effect_desc.GlobalVariables; ++i) + { + v = effect->lpVtbl->GetVariableByIndex(effect, i); + hr = v->lpVtbl->GetDesc(v, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(var_desc.Annotations == 1, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = v->lpVtbl->GetAnnotationByName(v, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + } + + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + hr = tech->lpVtbl->GetDesc(tech, &tech_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(tech_desc.Annotations == 1, "Unexpected annotations count %u.\n", tech_desc.Annotations); + v = tech->lpVtbl->GetAnnotationByName(tech, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + + pass = tech->lpVtbl->GetPassByIndex(tech, 0); + ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); + hr = pass->lpVtbl->GetDesc(pass, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(pass_desc.Annotations == 1, "Unexpected annotations count %u.\n", pass_desc.Annotations); + v = pass->lpVtbl->GetAnnotationByName(pass, "s"); + ok(v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + + hr = effect->lpVtbl->Optimize(effect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + cb = effect->lpVtbl->GetConstantBufferByIndex(effect, 0); + hr = cb->lpVtbl->GetDesc(cb, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = cb->lpVtbl->GetAnnotationByName(cb, "s"); + ok(!v->lpVtbl->IsValid(v), "Expected valid variable.\n"); +} + + effect->lpVtbl->GetDesc(effect, &effect_desc); + + for (i = 0; i < effect_desc.GlobalVariables; ++i) + { + v = effect->lpVtbl->GetVariableByIndex(effect, i); + hr = v->lpVtbl->GetDesc(v, &var_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + todo_wine { + ok(!var_desc.Annotations, "Unexpected annotations count %u.\n", var_desc.Annotations); + v = v->lpVtbl->GetAnnotationByName(v, "s"); + ok(!v->lpVtbl->IsValid(v), "Expected valid variable.\n"); + } + } + + tech = effect->lpVtbl->GetTechniqueByIndex(effect, 0); + hr = tech->lpVtbl->GetDesc(tech, &tech_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(!tech_desc.Annotations, "Unexpected annotations count %u.\n", tech_desc.Annotations); + v = tech->lpVtbl->GetAnnotationByName(tech, "s"); + ok(!v->lpVtbl->IsValid(v), "Expected valid variable.\n"); +} + + pass = tech->lpVtbl->GetPassByIndex(tech, 0); + ok(pass->lpVtbl->IsValid(pass), "Expected valid technique.\n"); + hr = pass->lpVtbl->GetDesc(pass, &pass_desc); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); +todo_wine { + ok(!pass_desc.Annotations, "Unexpected annotations count %u.\n", pass_desc.Annotations); + v = pass->lpVtbl->GetAnnotationByName(pass, "s"); + ok(!v->lpVtbl->IsValid(v), "Expected valid variable.\n"); +} + + effect->lpVtbl->Release(effect); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } @@ -7019,6 +7235,7 @@ START_TEST(effect) test_effect_vector_variable(); test_effect_matrix_variable(); test_effect_resource_variable(); + test_effect_annotations(); test_effect_optimize(); test_effect_shader_description(); test_effect_shader_object(); -- 2.26.3

1 0

[v3 PATCH 1/7] d3d10/effect: Use shader variable directly from pass structure on Apply().
by Matteo Bruni 13 Oct '21

13 Oct '21

From: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v3: Merge per-shader branches in d3d10_effect_pass_Apply(). dlls/d3d10/d3d10_private.h | 15 --- dlls/d3d10/effect.c | 188 +++++++++++++------------------------ dlls/d3d10/tests/effect.c | 22 +++++ 3 files changed, 89 insertions(+), 136 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 6979d2a114e..fbcc36e5e06 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -73,19 +73,6 @@ struct d3d10_matrix float m[4][4]; }; -struct d3d10_effect_object -{ - struct d3d10_effect_pass *pass; - enum d3d10_effect_object_type type; - union - { - ID3D10VertexShader *vs; - ID3D10PixelShader *ps; - ID3D10GeometryShader *gs; - IUnknown *object; - } object; -}; - struct d3d10_effect_shader_resource { D3D10_SHADER_INPUT_TYPE in_type; @@ -236,9 +223,7 @@ struct d3d10_effect_pass struct d3d10_effect_technique *technique; char *name; - DWORD object_count; DWORD annotation_count; - struct d3d10_effect_object *objects; struct d3d10_effect_variable *annotations; struct d3d10_effect_pass_shader_desc vs; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 0ba906375d7..68f91ade50f 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1734,17 +1734,17 @@ static BOOL parse_fx10_state_group(const char *data, size_t data_size, } static HRESULT parse_fx10_object(const char *data, size_t data_size, - const char **ptr, struct d3d10_effect_object *o) + const char **ptr, struct d3d10_effect_pass *pass) { ID3D10EffectVariable *variable = &null_variable.ID3D10EffectVariable_iface; const char *data_ptr = NULL; DWORD offset, sodecl_offset; enum d3d10_effect_object_operation operation; HRESULT hr; - struct d3d10_effect *effect = o->pass->technique->effect; + struct d3d10_effect *effect = pass->technique->effect; ID3D10Effect *e = &effect->ID3D10Effect_iface; struct d3d10_effect_variable *v; - DWORD tmp, variable_idx = 0; + DWORD tmp, object_type, variable_idx = 0; const char *name; size_t name_len; @@ -1754,8 +1754,8 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, return E_FAIL; } - read_dword(ptr, &o->type); - TRACE("Effect object is of type %#x.\n", o->type); + read_dword(ptr, &object_type); + TRACE("Effect object is of type %#x.\n", object_type); read_dword(ptr, &tmp); TRACE("Effect object index %#x.\n", tmp); @@ -1771,7 +1771,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, case D3D10_EOO_CONST: TRACE("Copy variable values\n"); - switch (o->type) + switch (object_type) { case D3D10_EOT_VERTEXSHADER: TRACE("Vertex shader\n"); @@ -1789,7 +1789,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_STENCIL_REF: - if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->stencil_ref)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &pass->stencil_ref)) { ERR("Failed to read stencil ref.\n"); return E_FAIL; @@ -1797,7 +1797,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_SAMPLE_MASK: - if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &o->pass->sample_mask)) + if (!read_value_list(data, data_size, offset, D3D10_SVT_UINT, 0, 1, &pass->sample_mask)) { FIXME("Failed to read sample mask.\n"); return E_FAIL; @@ -1805,7 +1805,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; case D3D10_EOT_BLEND_FACTOR: - if (!read_value_list(data, data_size, offset, D3D10_SVT_FLOAT, 0, 4, &o->pass->blend_factor[0])) + if (!read_value_list(data, data_size, offset, D3D10_SVT_FLOAT, 0, 4, &pass->blend_factor[0])) { FIXME("Failed to read blend factor.\n"); return E_FAIL; @@ -1813,7 +1813,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; default: - FIXME("Unhandled object type %#x\n", o->type); + FIXME("Unhandled object type %#x\n", object_type); return E_FAIL; } break; @@ -1873,7 +1873,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, read_dword(&data_ptr, &sodecl_offset); if (FAILED(hr = parse_fx10_anonymous_shader(effect, - &effect->anonymous_shaders[effect->anonymous_shader_current], o->type))) + &effect->anonymous_shaders[effect->anonymous_shader_current], object_type))) return hr; v = &effect->anonymous_shaders[effect->anonymous_shader_current].shader; @@ -1893,7 +1893,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, TRACE("Stream output declaration: %s.\n", debugstr_a(v->u.shader.stream_output_declaration)); } - switch (o->type) + switch (object_type) { case D3D10_EOT_VERTEXSHADER: case D3D10_EOT_PIXELSHADER: @@ -1903,7 +1903,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; default: - FIXME("Unhandled object type %#x\n", o->type); + FIXME("Unhandled object type %#x\n", object_type); return E_FAIL; } break; @@ -1913,7 +1913,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, return E_FAIL; } - switch (o->type) + switch (object_type) { case D3D10_EOT_RASTERIZER_STATE: { @@ -1927,10 +1927,10 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, if (v->type->element_count) { if (variable_idx >= v->type->element_count) return E_FAIL; - o->pass->rasterizer = &v->elements[variable_idx]; + pass->rasterizer = &v->elements[variable_idx]; } else - o->pass->rasterizer = v; + pass->rasterizer = v; break; } @@ -1946,10 +1946,10 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, if (v->type->element_count) { if (variable_idx >= v->type->element_count) return E_FAIL; - o->pass->depth_stencil = &v->elements[variable_idx]; + pass->depth_stencil = &v->elements[variable_idx]; } else - o->pass->depth_stencil = v; + pass->depth_stencil = v; break; } @@ -1965,40 +1965,34 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, if (v->type->element_count) { if (variable_idx >= v->type->element_count) return E_FAIL; - o->pass->blend = &v->elements[variable_idx]; + pass->blend = &v->elements[variable_idx]; } else - o->pass->blend = v; + pass->blend = v; break; } case D3D10_EOT_VERTEXSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); - if (FAILED(hr = sv->lpVtbl->GetVertexShader(sv, variable_idx, &o->object.vs))) - return hr; - o->pass->vs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); - o->pass->vs.index = variable_idx; + pass->vs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + pass->vs.index = variable_idx; break; } case D3D10_EOT_PIXELSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); - if (FAILED(hr = sv->lpVtbl->GetPixelShader(sv, variable_idx, &o->object.ps))) - return hr; - o->pass->ps.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); - o->pass->ps.index = variable_idx; + pass->ps.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + pass->ps.index = variable_idx; break; } case D3D10_EOT_GEOMETRYSHADER: { ID3D10EffectShaderVariable *sv = variable->lpVtbl->AsShader(variable); - if (FAILED(hr = sv->lpVtbl->GetGeometryShader(sv, variable_idx, &o->object.gs))) - return hr; - o->pass->gs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); - o->pass->gs.index = variable_idx; + pass->gs.shader = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)sv); + pass->gs.index = variable_idx; break; } @@ -2008,7 +2002,7 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, break; default: - FIXME("Unhandled object type %#x.\n", o->type); + FIXME("Unhandled object type %#x.\n", object_type); return E_FAIL; } @@ -2018,9 +2012,9 @@ static HRESULT parse_fx10_object(const char *data, size_t data_size, static HRESULT parse_fx10_pass(const char *data, size_t data_size, const char **ptr, struct d3d10_effect_pass *p) { + DWORD offset, object_count; HRESULT hr = S_OK; unsigned int i; - DWORD offset; read_dword(ptr, &offset); TRACE("Pass name at offset %#x.\n", offset); @@ -2032,8 +2026,8 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, } TRACE("Pass name: %s.\n", debugstr_a(p->name)); - read_dword(ptr, &p->object_count); - TRACE("Pass has %u effect objects.\n", p->object_count); + read_dword(ptr, &object_count); + TRACE("Pass has %u effect objects.\n", object_count); read_dword(ptr, &p->annotation_count); TRACE("Pass has %u annotations.\n", p->annotation_count); @@ -2045,23 +2039,13 @@ static HRESULT parse_fx10_pass(const char *data, size_t data_size, return hr; } - if (!(p->objects = heap_calloc(p->object_count, sizeof(*p->objects)))) - { - ERR("Failed to allocate effect objects memory.\n"); - return E_OUTOFMEMORY; - } - p->vs.shader = &null_shader_variable; p->ps.shader = &null_shader_variable; p->gs.shader = &null_shader_variable; - for (i = 0; i < p->object_count; ++i) + for (i = 0; i < object_count; ++i) { - struct d3d10_effect_object *o = &p->objects[i]; - - o->pass = p; - - if (FAILED(hr = parse_fx10_object(data, data_size, ptr, o))) + if (FAILED(hr = parse_fx10_object(data, data_size, ptr, p))) return hr; } @@ -2927,42 +2911,6 @@ HRESULT d3d10_effect_parse(struct d3d10_effect *This, const void *data, SIZE_T d return parse_dxbc(data, data_size, fx10_chunk_handler, This); } -static HRESULT d3d10_effect_object_apply(struct d3d10_effect_object *o) -{ - ID3D10Device *device = o->pass->technique->effect->device; - - TRACE("effect object %p, type %#x.\n", o, o->type); - - switch(o->type) - { - case D3D10_EOT_RASTERIZER_STATE: - case D3D10_EOT_DEPTH_STENCIL_STATE: - case D3D10_EOT_BLEND_STATE: - case D3D10_EOT_STENCIL_REF: - case D3D10_EOT_BLEND_FACTOR: - case D3D10_EOT_SAMPLE_MASK: - break; - - case D3D10_EOT_VERTEXSHADER: - ID3D10Device_VSSetShader(device, o->object.vs); - return S_OK; - - case D3D10_EOT_PIXELSHADER: - ID3D10Device_PSSetShader(device, o->object.ps); - return S_OK; - - case D3D10_EOT_GEOMETRYSHADER: - ID3D10Device_GSSetShader(device, o->object.gs); - return S_OK; - - default: - FIXME("Unhandled effect object type %#x.\n", o->type); - return E_FAIL; - } - - return S_OK; -} - static void d3d10_effect_shader_variable_destroy(struct d3d10_effect_shader_variable *s, D3D10_SHADER_VARIABLE_TYPE type) { @@ -3087,25 +3035,6 @@ static void d3d10_effect_variable_destroy(struct d3d10_effect_variable *v) } } -static void d3d10_effect_object_destroy(struct d3d10_effect_object *o) -{ - switch (o->type) - { - case D3D10_EOT_RASTERIZER_STATE: - case D3D10_EOT_DEPTH_STENCIL_STATE: - case D3D10_EOT_BLEND_STATE: - case D3D10_EOT_VERTEXSHADER: - case D3D10_EOT_PIXELSHADER: - case D3D10_EOT_GEOMETRYSHADER: - if (o->object.object) - IUnknown_Release(o->object.object); - break; - - default: - break; - } -} - static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) { unsigned int i; @@ -3114,15 +3043,6 @@ static void d3d10_effect_pass_destroy(struct d3d10_effect_pass *p) heap_free(p->name); - if (p->objects) - { - for (i = 0; i < p->object_count; ++i) - { - d3d10_effect_object_destroy(&p->objects[i]); - } - heap_free(p->objects); - } - if (p->annotations) { for (i = 0; i < p->annotation_count; ++i) @@ -4109,23 +4029,55 @@ static void apply_shader_resources(ID3D10Device *device, struct d3d10_effect_var } } +static void d3d10_effect_pass_set_shader(struct d3d10_effect_pass *pass, + const struct d3d10_effect_pass_shader_desc *shader_desc) +{ + ID3D10Device *device = pass->technique->effect->device; + struct d3d10_effect_variable *v = shader_desc->shader; + + if (v->type->element_count) + v = &v->elements[shader_desc->index]; + + switch (v->type->basetype) + { + case D3D10_SVT_VERTEXSHADER: + ID3D10Device_VSSetShader(device, v->u.shader.shader.vs); + break; + case D3D10_SVT_PIXELSHADER: + ID3D10Device_PSSetShader(device, v->u.shader.shader.ps); + break; + case D3D10_SVT_GEOMETRYSHADER: + ID3D10Device_GSSetShader(device, v->u.shader.shader.gs); + break; + default: + WARN("Unexpected shader type %u.\n", v->type->basetype); + } +} + static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface, UINT flags) { struct d3d10_effect_pass *pass = impl_from_ID3D10EffectPass(iface); ID3D10Device *device = pass->technique->effect->device; - HRESULT hr = S_OK; - unsigned int i; TRACE("iface %p, flags %#x\n", iface, flags); if (flags) FIXME("Ignoring flags (%#x)\n", flags); if (pass->vs.shader != &null_shader_variable) + { + d3d10_effect_pass_set_shader(pass, &pass->vs); apply_shader_resources(device, pass->vs.shader); + } if (pass->gs.shader != &null_shader_variable) + { + d3d10_effect_pass_set_shader(pass, &pass->gs); apply_shader_resources(device, pass->gs.shader); + } if (pass->ps.shader != &null_shader_variable) + { + d3d10_effect_pass_set_shader(pass, &pass->ps); apply_shader_resources(device, pass->ps.shader); + } if (pass->rasterizer) ID3D10Device_RSSetState(device, pass->rasterizer->u.state.object.rasterizer); if (pass->depth_stencil) @@ -4135,13 +4087,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_Apply(ID3D10EffectPass *iface ID3D10Device_OMSetBlendState(device, pass->blend->u.state.object.blend, pass->blend_factor, pass->sample_mask); - for (i = 0; i < pass->object_count; ++i) - { - hr = d3d10_effect_object_apply(&pass->objects[i]); - if (FAILED(hr)) break; - } - - return hr; + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_pass_ComputeStateBlockMask(ID3D10EffectPass *iface, diff --git a/dlls/d3d10/tests/effect.c b/dlls/d3d10/tests/effect.c index 781abb46745..6ad3f7421f4 100644 --- a/dlls/d3d10/tests/effect.c +++ b/dlls/d3d10/tests/effect.c @@ -2909,6 +2909,7 @@ static void test_effect_local_shader(void) D3D10_EFFECT_DESC effect_desc; ID3D10EffectShaderVariable *null_shader, *null_anon_vs, *null_anon_ps, *null_anon_gs, *p3_anon_vs, *p3_anon_ps, *p3_anon_gs, *p6_vs, *p6_ps, *p6_gs, *gs, *ps, *vs; + ID3D10PixelShader *ps_d3d, *ps_d3d_2; D3D10_EFFECT_SHADER_DESC shaderdesc; D3D10_SIGNATURE_PARAMETER_DESC sign; D3D10_STATE_BLOCK_MASK mask; @@ -3005,6 +3006,12 @@ if (0) hr = p->lpVtbl->GetGeometryShaderDesc(p, NULL); ok(hr == E_INVALIDARG, "GetGeometryShaderDesc got %x, expected %x\n", hr, E_INVALIDARG); + v = effect->lpVtbl->GetVariableByName(effect, "p"); + ps = v->lpVtbl->AsShader(v); + + hr = ps->lpVtbl->GetPixelShader(ps, 0, &ps_d3d); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* get the null_shader_variable */ v = effect->lpVtbl->GetVariableByIndex(effect, 10000); null_shader = v->lpVtbl->AsShader(v); @@ -3024,6 +3031,13 @@ if (0) ret = D3D10StateBlockMaskGetSetting(&mask, D3D10_DST_GS, 0); ok(!ret, "Unexpected mask.\n"); + ID3D10Device_PSSetShader(device, ps_d3d); + hr = p->lpVtbl->Apply(p, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_PSGetShader(device, &ps_d3d_2); + ok(ps_d3d_2 == ps_d3d, "Unexpected shader object.\n"); + ID3D10PixelShader_Release(ps_d3d_2); + hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); ok(pdesc.pShaderVariable == null_shader, "Got %p, expected %p\n", pdesc.pShaderVariable, null_shader); @@ -3051,6 +3065,12 @@ if (0) /* pass 1 */ p = t->lpVtbl->GetPassByIndex(t, 1); + ID3D10Device_PSSetShader(device, ps_d3d); + hr = p->lpVtbl->Apply(p, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ID3D10Device_PSGetShader(device, &ps_d3d_2); + ok(!ps_d3d_2, "Unexpected shader object.\n"); + /* pass 1 vertexshader */ hr = p->lpVtbl->GetVertexShaderDesc(p, &pdesc); ok(hr == S_OK, "GetVertexShaderDesc got %x, expected %x\n", hr, S_OK); @@ -3881,6 +3901,8 @@ todo_wine effect->lpVtbl->Release(effect); + ID3D10PixelShader_Release(ps_d3d); + refcount = ID3D10Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } -- 2.26.3

1 0

[PATCH 2/2] wbemprox: Add __DERIVATION to the list of system properties.
by Hans Leidekker 13 Oct '21

13 Oct '21

Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 28028474d59..63007565766 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1395,7 +1395,8 @@ HRESULT put_propval( const struct view *view, UINT index, const WCHAR *name, VAR HRESULT get_properties( const struct view *view, UINT index, LONG flags, SAFEARRAY **props ) { static const WCHAR * const system_props[] = - { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__SERVER", L"__NAMESPACE", L"__PATH" }; + { L"__GENUS", L"__CLASS", L"__RELPATH", L"__PROPERTY_COUNT", L"__DERIVATION", L"__SERVER", L"__NAMESPACE", + L"__PATH" }; SAFEARRAY *sa; BSTR str; UINT i, table_index, result_index, count = 0; -- 2.30.2

1 0

[PATCH 1/2] wbemprox: Return an empty array for __DERIVATION.
by Hans Leidekker 13 Oct '21

13 Oct '21

Based on a patch by Louis Lenders. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51871 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/wbemprox/query.c | 13 +++++++++++++ dlls/wbemprox/tests/query.c | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 77ed27e105d..28028474d59 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -1006,6 +1006,19 @@ static HRESULT get_system_propval( const struct view *view, UINT table_index, UI if (type) *type = CIM_STRING; return S_OK; } + if (!wcsicmp( name, L"__DERIVATION" )) + { + if (ret) + { + SAFEARRAY *sa; + FIXME( "returning empty array for __DERIVATION\n" ); + if (!(sa = SafeArrayCreateVector( VT_BSTR, 0, 0 ))) return E_OUTOFMEMORY; + V_VT( ret ) = VT_BSTR | VT_ARRAY; + V_ARRAY( ret ) = sa; + } + if (type) *type = CIM_STRING | CIM_FLAG_ARRAY; + return S_OK; + } FIXME("system property %s not implemented\n", debugstr_w(name)); return WBEM_E_NOT_FOUND; } diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index 69bb8e7977e..5ca61cff825 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1642,6 +1642,7 @@ static void test_Win32_VideoController( IWbemServices *services ) if (hr != S_OK) break; check_property( obj, L"__CLASS", VT_BSTR, CIM_STRING ); + check_property( obj, L"__DERIVATION", VT_BSTR | VT_ARRAY, CIM_STRING | CIM_FLAG_ARRAY ); check_property( obj, L"__GENUS", VT_I4, CIM_SINT32 ); check_property( obj, L"__NAMESPACE", VT_BSTR, CIM_STRING ); check_property( obj, L"__PATH", VT_BSTR, CIM_STRING ); -- 2.30.2

1 0

[PATCH] wbemprox: Add 'Manufacturer' and 'Name' properties to Win32_PnPEntity class.
by Eduard Permyakov 13 Oct '21

13 Oct '21

Signed-off-by: Eduard Permyakov <epermyakov(a)codeweavers.com> --- dlls/wbemprox/builtin.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index 442a9015951..d76602f4930 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -286,7 +286,9 @@ static const struct column col_physicalmemory[] = }; static const struct column col_pnpentity[] = { - { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"DeviceId", CIM_STRING|COL_FLAG_DYNAMIC }, + { L"Manufacturer", CIM_STRING }, + { L"Name", CIM_STRING }, }; static const struct column col_printer[] = { @@ -701,6 +703,8 @@ struct record_physicalmemory struct record_pnpentity { const WCHAR *device_id; + const WCHAR *manufacturer; + const WCHAR *name; }; struct record_printer { @@ -3063,6 +3067,8 @@ static enum fill_status fill_pnpentity( struct table *table, const struct expr * ARRAY_SIZE(device_id), NULL )) { rec->device_id = heap_strdupW( device_id ); + rec->manufacturer = L"The Wine Project"; + rec->name = L"Wine PnP Device"; table->num_rows++; if (!match_row( table, table->num_rows - 1, cond, &status )) -- 2.25.1

2 1

[PATCH] user32: Don't check active window state when handling SC_MINIMIZE/SC_MAXIMIZE/SC_RESTORE.
by Dmitry Timoshkov 13 Oct '21

13 Oct '21

An application I'm working on routes messages to a worker thread, and checking for an active window while processing WM_SYSCOMMAND in that thread breaks things. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/nonclient.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/user32/nonclient.c b/dlls/user32/nonclient.c index 02e6ad92320..b47616bb639 100644 --- a/dlls/user32/nonclient.c +++ b/dlls/user32/nonclient.c @@ -1560,19 +1560,18 @@ LRESULT NC_HandleSysCommand( HWND hwnd, WPARAM wParam, LPARAM lParam ) break; case SC_MINIMIZE: - if (hwnd == GetActiveWindow()) - ShowOwnedPopups(hwnd,FALSE); + ShowOwnedPopups(hwnd,FALSE); ShowWindow( hwnd, SW_MINIMIZE ); break; case SC_MAXIMIZE: - if (IsIconic(hwnd) && hwnd == GetActiveWindow()) + if (IsIconic(hwnd)) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_MAXIMIZE ); break; case SC_RESTORE: - if (IsIconic(hwnd) && hwnd == GetActiveWindow()) + if (IsIconic(hwnd)) ShowOwnedPopups(hwnd,TRUE); ShowWindow( hwnd, SW_RESTORE ); break; -- 2.31.1

1 0

[PATCH 1/9] dinput: Factor all GetDeviceInfo implementations together.
by Rémi Bernon 13 Oct '21

13 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/device.c | 20 ++++++++++++++++++ dlls/dinput/device_private.h | 3 +++ dlls/dinput/joystick_hid.c | 27 +++++-------------------- dlls/dinput/keyboard.c | 39 +++++++++++------------------------- dlls/dinput/mouse.c | 21 ++----------------- 5 files changed, 42 insertions(+), 68 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index d8bb5e84417..93236cf6bd0 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1176,6 +1176,25 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8 return hr; } +HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8W( iface ); + DWORD size; + + TRACE( "iface %p, instance %p.\n", iface, instance ); + + if (!instance) return E_POINTER; + if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && + instance->dwSize != sizeof(DIDEVICEINSTANCEW)) + return DIERR_INVALIDPARAM; + + size = instance->dwSize; + memcpy( instance, &impl->instance, size ); + instance->dwSize = size; + + return S_OK; +} + /****************************************************************************** * SetEventNotification : specifies event to be sent on state change */ @@ -1740,6 +1759,7 @@ HRESULT direct_input_device_alloc( SIZE_T size, const IDirectInputDevice8WVtbl * This->IDirectInputDevice8W_iface.lpVtbl = vtbl; This->ref = 1; This->guid = *guid; + This->instance.dwSize = sizeof(DIDEVICEINSTANCEW); This->data_format.wine_df = format; InitializeCriticalSection( &This->crit ); This->dinput = dinput; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 321a9702642..683db8d35ab 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -67,6 +67,7 @@ struct IDirectInputDeviceImpl IDirectInputImpl *dinput; struct list entry; /* entry into acquired device list */ HANDLE hEvent; + DIDEVICEINSTANCEW instance; DWORD dwCoopLevel; HWND win; int acquired; @@ -120,6 +121,8 @@ extern HRESULT WINAPI IDirectInputDevice2WImpl_Acquire(LPDIRECTINPUTDEVICE8W ifa extern HRESULT WINAPI IDirectInputDevice2WImpl_Unacquire(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_SetDataFormat(LPDIRECTINPUTDEVICE8W iface, LPCDIDATAFORMAT df) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_SetCooperativeLevel(LPDIRECTINPUTDEVICE8W iface, HWND hwnd, DWORD dwflags) DECLSPEC_HIDDEN; +extern HRESULT WINAPI IDirectInputDevice2WImpl_GetDeviceInfo( IDirectInputDevice8W *iface, + DIDEVICEINSTANCEW *instance ); extern HRESULT WINAPI IDirectInputDevice2WImpl_SetEventNotification(LPDIRECTINPUTDEVICE8W iface, HANDLE hnd) DECLSPEC_HIDDEN; extern ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W iface, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index 203a5d7788d..4b0a4861fb7 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -161,7 +161,6 @@ struct hid_joystick OVERLAPPED read_ovl; PHIDP_PREPARSED_DATA preparsed; - DIDEVICEINSTANCEW instance; WCHAR device_path[MAX_PATH]; HIDD_ATTRIBUTES attrs; DIDEVCAPS dev_caps; @@ -775,14 +774,14 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con { DIPROPSTRING *value = (DIPROPSTRING *)header; if (header->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW( value->wsz, impl->instance.tszProductName, MAX_PATH ); + lstrcpynW( value->wsz, impl->base.instance.tszProductName, MAX_PATH ); return DI_OK; } case (DWORD_PTR)DIPROP_INSTANCENAME: { DIPROPSTRING *value = (DIPROPSTRING *)header; if (header->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; - lstrcpynW( value->wsz, impl->instance.tszInstanceName, MAX_PATH ); + lstrcpynW( value->wsz, impl->base.instance.tszInstanceName, MAX_PATH ); return DI_OK; } case (DWORD_PTR)DIPROP_VIDPID: @@ -797,7 +796,7 @@ static HRESULT WINAPI hid_joystick_GetProperty( IDirectInputDevice8W *iface, con { DIPROPDWORD *value = (DIPROPDWORD *)header; if (header->dwSize != sizeof(DIPROPDWORD)) return DIERR_INVALIDPARAM; - value->dwData = impl->instance.guidInstance.Data3; + value->dwData = impl->base.instance.guidInstance.Data3; return DI_OK; } case (DWORD_PTR)DIPROP_GUIDANDPATH: @@ -1060,22 +1059,6 @@ static HRESULT WINAPI hid_joystick_GetObjectInfo( IDirectInputDevice8W *iface, D return DIERR_NOTFOUND; } -static HRESULT WINAPI hid_joystick_GetDeviceInfo( IDirectInputDevice8W *iface, DIDEVICEINSTANCEW *instance ) -{ - struct hid_joystick *impl = impl_from_IDirectInputDevice8W( iface ); - - TRACE( "iface %p, instance %p.\n", iface, instance ); - - if (!instance) return E_POINTER; - if (instance->dwSize != sizeof(DIDEVICEINSTANCE_DX3W) && - instance->dwSize != sizeof(DIDEVICEINSTANCEW)) - return DIERR_INVALIDPARAM; - - memcpy( instance, &impl->instance, instance->dwSize ); - - return S_OK; -} - static HRESULT hid_joystick_effect_create( struct hid_joystick *joystick, IDirectInputEffect **out ); static HRESULT WINAPI hid_joystick_CreateEffect( IDirectInputDevice8W *iface, const GUID *guid, @@ -1457,7 +1440,7 @@ static const IDirectInputDevice8WVtbl hid_joystick_vtbl = IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, hid_joystick_GetObjectInfo, - hid_joystick_GetDeviceInfo, + IDirectInputDevice2WImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, /*** IDirectInputDevice2 methods ***/ @@ -2277,7 +2260,7 @@ static HRESULT hid_joystick_create_device( IDirectInputImpl *dinput, const GUID if (hr != DI_OK) goto failed; impl->ref = 1; - impl->instance = instance; + impl->base.instance = instance; impl->attrs = attrs; impl->dev_caps.dwSize = sizeof(impl->dev_caps); impl->dev_caps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index f687eec5259..3d78fd4de54 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -43,7 +43,6 @@ struct SysKeyboardImpl { struct IDirectInputDeviceImpl base; BYTE DInputKeyState[WINE_DINPUT_KEYBOARD_MAX_KEYS]; - DWORD subtype; }; static inline SysKeyboardImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) @@ -89,9 +88,9 @@ static BYTE map_dik_code(DWORD scanCode, DWORD vkCode, DWORD subType, DWORD vers int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lparam ) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W( iface ); + BYTE new_diks, subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); int dik_code, ret = This->base.dwCoopLevel & DISCL_EXCLUSIVE; KBDLLHOOKSTRUCT *hook = (KBDLLHOOKSTRUCT *)lparam; - BYTE new_diks; if (wparam != WM_KEYDOWN && wparam != WM_KEYUP && wparam != WM_SYSKEYDOWN && wparam != WM_SYSKEYUP) @@ -108,7 +107,8 @@ int dinput_keyboard_hook( IDirectInputDevice8W *iface, WPARAM wparam, LPARAM lpa case VK_NUMLOCK : dik_code = DIK_NUMLOCK; break; case VK_SUBTRACT: dik_code = DIK_SUBTRACT; break; default: - dik_code = map_dik_code(hook->scanCode & 0xff, hook->vkCode, This->subtype, This->base.dinput->dwVersion); + dik_code = map_dik_code( hook->scanCode & 0xff, hook->vkCode, subtype, + This->base.dinput->dwVersion ); if (hook->flags & LLKHF_EXTENDED) dik_code |= 0x80; } new_diks = hook->flags & LLKHF_UP ? 0 : 0x80; @@ -193,6 +193,7 @@ static HRESULT keyboarddev_enum_device(DWORD dwDevType, DWORD dwFlags, LPDIDEVIC static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboardImpl **out ) { + BYTE subtype = get_keyboard_subtype(); SysKeyboardImpl* newDevice; LPDIDATAFORMAT df = NULL; int i, idx = 0; @@ -203,7 +204,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysKeyboardImpl*->base.crit"); - newDevice->subtype = get_keyboard_subtype(); + fill_keyboard_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion, subtype ); /* Create copy of default data format */ memcpy(df, &c_dfDIKeyboard, c_dfDIKeyboard.dwSize); @@ -217,7 +218,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysKeyboar if (!GetKeyNameTextA(((i & 0x7f) << 16) | ((i & 0x80) << 17), buf, sizeof(buf))) continue; - dik_code = map_dik_code(i, 0, newDevice->subtype, dinput->dwVersion); + dik_code = map_dik_code( i, 0, subtype, dinput->dwVersion ); memcpy(&df->rgodf[idx], &c_dfDIKeyboard.rgodf[dik_code], df->dwObjSize); df->rgodf[idx++].dwType = DIDFT_MAKEINSTANCE(dik_code) | DIDFT_PSHBUTTON; } @@ -294,6 +295,7 @@ static HRESULT WINAPI SysKeyboardWImpl_GetDeviceState(LPDIRECTINPUTDEVICE8W ifac static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + BYTE subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); DIDEVCAPS devcaps; TRACE("(this=%p,%p)\n",This,lpDIDevCaps); @@ -306,9 +308,9 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa devcaps.dwSize = lpDIDevCaps->dwSize; devcaps.dwFlags = DIDC_ATTACHED | DIDC_EMULATED; if (This->base.dinput->dwVersion >= 0x0800) - devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (This->subtype << 8); + devcaps.dwDevType = DI8DEVTYPE_KEYBOARD | (subtype << 8); else - devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (This->subtype << 8); + devcaps.dwDevType = DIDEVTYPE_KEYBOARD | (subtype << 8); devcaps.dwAxes = 0; devcaps.dwButtons = This->base.data_format.wine_df->dwNumObjs; devcaps.dwPOVs = 0; @@ -367,13 +369,14 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface DWORD dwHow) { SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); + BYTE subtype = GET_DIDEVICE_SUBTYPE( This->base.instance.dwDevType ); HRESULT res; LONG scan; res = IDirectInputDevice2WImpl_GetObjectInfo(iface, pdidoi, dwObj, dwHow); if (res != DI_OK) return res; - scan = map_dik_to_scan(DIDFT_GETINSTANCE(pdidoi->dwType), This->subtype); + scan = map_dik_to_scan( DIDFT_GETINSTANCE( pdidoi->dwType ), subtype ); if (!GetKeyNameTextW((scan & 0x80) << 17 | (scan & 0x7f) << 16, pdidoi->tszName, ARRAY_SIZE(pdidoi->tszName))) return DIERR_OBJECTNOTFOUND; @@ -382,24 +385,6 @@ static HRESULT WINAPI SysKeyboardWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface return res; } -/****************************************************************************** - * GetDeviceInfo : get information about a device's identity - */ -static HRESULT WINAPI SysKeyboardWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) -{ - SysKeyboardImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(this=%p,%p)\n", This, pdidi); - - if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) { - WARN(" dinput3 not supported yet...\n"); - return DI_OK; - } - - fill_keyboard_dideviceinstanceW(pdidi, This->base.dinput->dwVersion, This->subtype); - - return DI_OK; -} - /****************************************************************************** * GetProperty : Retrieves information about the input device. */ @@ -496,7 +481,7 @@ static const IDirectInputDevice8WVtbl SysKeyboardWvt = IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, SysKeyboardWImpl_GetObjectInfo, - SysKeyboardWImpl_GetDeviceInfo, + IDirectInputDevice2WImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, IDirectInputDevice2WImpl_CreateEffect, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 97e2b58c6cd..e11a9260fb2 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -148,6 +148,7 @@ static HRESULT alloc_device( REFGUID rguid, IDirectInputImpl *dinput, SysMouseIm df = newDevice->base.data_format.wine_df; newDevice->base.crit.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": SysMouseImpl*->base.crit"); + fill_mouse_dideviceinstanceW( &newDevice->base.instance, newDevice->base.dinput->dwVersion ); newDevice->base.dwCoopLevel = DISCL_NONEXCLUSIVE | DISCL_BACKGROUND; get_app_key(&hkey, &appkey); @@ -705,24 +706,6 @@ static HRESULT WINAPI SysMouseWImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, return res; } -/****************************************************************************** - * GetDeviceInfo : get information about a device's identity - */ -static HRESULT WINAPI SysMouseWImpl_GetDeviceInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEINSTANCEW pdidi) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8W(iface); - TRACE("(this=%p,%p)\n", This, pdidi); - - if (pdidi->dwSize != sizeof(DIDEVICEINSTANCEW)) { - WARN(" dinput3 not supported yet...\n"); - return DI_OK; - } - - fill_mouse_dideviceinstanceW(pdidi, This->base.dinput->dwVersion); - - return DI_OK; -} - static HRESULT WINAPI SysMouseWImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, LPCWSTR lpszUserName, @@ -761,7 +744,7 @@ static const IDirectInputDevice8WVtbl SysMouseWvt = IDirectInputDevice2WImpl_SetEventNotification, IDirectInputDevice2WImpl_SetCooperativeLevel, SysMouseWImpl_GetObjectInfo, - SysMouseWImpl_GetDeviceInfo, + IDirectInputDevice2WImpl_GetDeviceInfo, IDirectInputDevice2WImpl_RunControlPanel, IDirectInputDevice2WImpl_Initialize, IDirectInputDevice2WImpl_CreateEffect, -- 2.33.0

2 9

[PATCH] winemenubuilder: Introduce a reg_enum_keyW helper function
by Alex Henrie 13 Oct '21

13 Oct '21

The helper function reduces code duplication and makes the 'done' variable in the cleanup_associations function unnecessary. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/winemenubuilder/winemenubuilder.c | 91 +++++++++++----------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index 5b6fe071916..32d3945ad19 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1753,6 +1753,32 @@ static WCHAR *freedesktop_mime_type_for_extension(struct list *native_mime_types return match ? xwcsdup(match) : NULL; } +static WCHAR *reg_enum_keyW(HKEY key, DWORD index) +{ + WCHAR *subkey; + DWORD size = 1024 * sizeof(WCHAR); + LSTATUS ret; + + for (;;) + { + subkey = xmalloc(size); + ret = RegEnumKeyExW(key, index, subkey, &size, NULL, NULL, NULL, NULL); + if (ret == ERROR_SUCCESS) + { + return subkey; + } + if (ret != ERROR_MORE_DATA) + { + if (ret != ERROR_NO_MORE_ITEMS) + WINE_ERR("error %d while reading registry\n", ret); + heap_free(subkey); + return NULL; + } + size *= 2; + heap_free(subkey); + } +} + static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) { DWORD size; @@ -1857,47 +1883,31 @@ static BOOL cleanup_associations(void) BOOL hasChanged = FALSE; if ((assocKey = open_associations_reg_key())) { - int i; - BOOL done = FALSE; - for (i = 0; !done;) + int i = 0; + for (;;) { - WCHAR *extensionW = NULL; - DWORD size = 1024; - LSTATUS ret; + WCHAR *extensionW; + WCHAR *command; - do - { - heap_free(extensionW); - extensionW = xmalloc(size * sizeof(WCHAR)); - ret = RegEnumKeyExW(assocKey, i, extensionW, &size, NULL, NULL, NULL, NULL); - size *= 2; - } while (ret == ERROR_MORE_DATA); + if (!(extensionW = reg_enum_keyW(assocKey, i))) + break; - if (ret == ERROR_SUCCESS) + if (!(command = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"))) { - WCHAR *command; - command = assoc_query(ASSOCSTR_COMMAND, extensionW, L"open"); - if (command == NULL) + WCHAR *desktopFile = reg_get_valW(assocKey, extensionW, L"DesktopFile"); + if (desktopFile) { - WCHAR *desktopFile = reg_get_valW(assocKey, extensionW, L"DesktopFile"); - if (desktopFile) - { - WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); - DeleteFileW(desktopFile); - } - RegDeleteKeyW(assocKey, extensionW); - hasChanged = TRUE; - heap_free(desktopFile); + WINE_TRACE("removing file type association for %s\n", wine_dbgstr_w(extensionW)); + DeleteFileW(desktopFile); } - else - i++; - heap_free(command); + RegDeleteKeyW(assocKey, extensionW); + hasChanged = TRUE; + heap_free(desktopFile); } else { - if (ret != ERROR_NO_MORE_ITEMS) - WINE_ERR("error %d while reading registry\n", ret); - done = TRUE; + i++; + heap_free(command); } heap_free(extensionW); } @@ -1998,7 +2008,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic { struct wine_rb_tree mimeProgidTree = { winemenubuilder_rb_string_compare }; struct list nativeMimeTypes = LIST_INIT(nativeMimeTypes); - LSTATUS ret = 0; int i; BOOL hasChanged = FALSE; @@ -2010,18 +2019,12 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic for (i = 0; ; i++) { - WCHAR *extensionW = NULL; - DWORD size = 1024; + WCHAR *extensionW; - do - { - heap_free(extensionW); - extensionW = xmalloc(size * sizeof(WCHAR)); - ret = RegEnumKeyExW(HKEY_CLASSES_ROOT, i, extensionW, &size, NULL, NULL, NULL, NULL); - size *= 2; - } while (ret == ERROR_MORE_DATA); + if (!(extensionW = reg_enum_keyW(HKEY_CLASSES_ROOT, i))) + break; - if (ret == ERROR_SUCCESS && extensionW[0] == '.' && !is_extension_banned(extensionW)) + if (extensionW[0] == '.' && !is_extension_banned(extensionW)) { WCHAR *commandW = NULL; WCHAR *executableW = NULL; @@ -2129,8 +2132,6 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic heap_free(progIdW); } heap_free(extensionW); - if (ret != ERROR_SUCCESS) - break; } wine_rb_destroy(&mimeProgidTree, winemenubuilder_rb_destroy, NULL); -- 2.33.0

1 0

[PATCH 1/2] server: Zero-initialize rawinput_message structures before passing them to queue_rawinput_message() (Valgrind).
by Zebediah Figura 13 Oct '21

13 Oct '21

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- server/queue.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/server/queue.c b/server/queue.c index 0a29c8787c3..b6024dc22b5 100644 --- a/server/queue.c +++ b/server/queue.c @@ -1818,12 +1818,12 @@ static int queue_mouse_message( struct desktop *desktop, user_handle_t win, cons if ((foreground = get_foreground_thread( desktop, win ))) { + memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.foreground = foreground; raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; - raw_msg.hid_report = NULL; msg_data = &raw_msg.data; msg_data->info = input->mouse.info; @@ -1955,12 +1955,12 @@ static int queue_keyboard_message( struct desktop *desktop, user_handle_t win, c if ((foreground = get_foreground_thread( desktop, win ))) { + memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.foreground = foreground; raw_msg.desktop = desktop; raw_msg.source = source; raw_msg.time = time; raw_msg.message = WM_INPUT; - raw_msg.hid_report = NULL; msg_data = &raw_msg.data; msg_data->info = input->kbd.info; @@ -2026,12 +2026,10 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ { case WM_INPUT: case WM_INPUT_DEVICE_CHANGE: - raw_msg.foreground = NULL; - raw_msg.desktop = NULL; + memset( &raw_msg, 0, sizeof(raw_msg) ); raw_msg.source = source; raw_msg.time = get_tick_count(); raw_msg.message = input->hw.msg; - raw_msg.hid_report = NULL; if (input->hw.rawinput.type == RIM_TYPEHID) { @@ -2046,9 +2044,7 @@ static void queue_custom_hardware_message( struct desktop *desktop, user_handle_ } msg_data = &raw_msg.data; - msg_data->info = 0; msg_data->size = sizeof(*msg_data) + report_size; - msg_data->flags = 0; msg_data->rawinput = input->hw.rawinput; enum_processes( queue_rawinput_message, &raw_msg ); -- 2.33.0

1 1

[PATCH vkd3d v2 1/3] tests: Add more tests for invalid descriptor tables.
by Conor McCarthy 12 Oct '21

12 Oct '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Comment wording. --- tests/d3d12.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 27393eec..8ae40afa 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2703,6 +2703,26 @@ static void test_create_root_signature(void) hr = create_root_signature(device, &root_signature_desc, &root_signature); ok(hr == E_INVALIDARG, "Failed to create root signature, hr %#x.\n", hr); + /* empty descriptor table */ + descriptor_ranges[0].NumDescriptors = 0; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + + /* descriptor range overflow + * Windows results vary for overflowing to zero, but anything beyond that is invalid. */ + descriptor_ranges[0].NumDescriptors = 0x1000; + descriptor_ranges[0].BaseShaderRegister = 0xfffff001; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + /* empty root signature */ root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = NULL; -- 2.32.0

2 5

[PATCH v3 1/3] user32/tests: Add tests for monochrome icons
by Fabian Maurer 12 Oct '21

12 Oct '21

Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/user32/tests/cursoricon.c | 84 ++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/dlls/user32/tests/cursoricon.c b/dlls/user32/tests/cursoricon.c index 33ca2e3cb63..1f9a81e6d0a 100644 --- a/dlls/user32/tests/cursoricon.c +++ b/dlls/user32/tests/cursoricon.c @@ -3096,6 +3096,89 @@ static void test_copy_image(void) } } +/* The test the logic for the same function in user32 */ +static HBITMAP create_masked_bitmap( int width, int height, const void *and, const void *xor ) +{ + HDC dc = CreateCompatibleDC( 0 ); + HBITMAP bitmap; + int line_size = width/8; + const char* and2 = (const char*)and; + const char* xor2 = (const char*)xor; + char buffer[sizeof(BITMAPINFOHEADER) + sizeof(RGBQUAD) * 2] = {0}; + + BITMAPINFO *bitmap_info = (BITMAPINFO*)buffer; + bitmap_info->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + bitmap_info->bmiHeader.biWidth = width; + bitmap_info->bmiHeader.biHeight = height * 2; + bitmap_info->bmiHeader.biPlanes = 1; + bitmap_info->bmiHeader.biBitCount = 1; + bitmap_info->bmiColors[1].rgbRed = 255; + bitmap_info->bmiColors[1].rgbGreen = 255; + bitmap_info->bmiColors[1].rgbBlue = 255; + + bitmap = CreateBitmap( width, height * 2, 1, 1, NULL ); + + for (int i = 0; i < height; i++) + { + SetDIBits( dc, bitmap, height - i - 1, 1, &xor2[i*line_size], bitmap_info, FALSE ); + SetDIBits( dc, bitmap, 2*height - i - 1, 1, &and2[i*line_size], bitmap_info, FALSE ); + } + DeleteDC( dc ); + return bitmap; +} + +static void check_monochrome_icon(HICON icon, int draw_flag, int line, BOOL todo) +{ + HDC dc = CreateCompatibleDC(0); + HBITMAP canvas = CreateCompatibleBitmap(dc, 32, 32); + + SelectObject(dc, canvas); + + DrawIconEx(dc, 0, 0, icon, 16, 16, 0, NULL, draw_flag); + + for (int i = 0; i < 16; i++) + { + COLORREF color = GetPixel(dc, i, 8); + int expect = i % 2 == 0 ? 0 : 0xFFFFFF; + todo_wine_if(todo && (i%2 != 0)) + ok_(__FILE__,line)(color == expect, "At index %d got %x\n", i, color); + } + DeleteObject(canvas); + DeleteDC(dc); +} + +static void test_monochrome_icon_creation(void) +{ + HCURSOR cursor; + HICON icon; + ICONINFO iconinfo = {0}; + static const unsigned char monochrome_bits[] = + { + 0xFF, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + 0x55, 0x55, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, 0x55, 0x55, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, + 0x55, 0x55, 0x00, 0x00, 0xAA, 0xAA, 0x00, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, + }; + + iconinfo.fIcon = 1; + iconinfo.hbmMask = create_masked_bitmap(16, 16, monochrome_bits, &monochrome_bits[32]); + + cursor = CreateCursor(0, 8, 8, 16, 16, monochrome_bits, &monochrome_bits[32]); + ok(cursor != NULL, "CreateCursor failed\n"); + check_monochrome_icon(cursor, DI_NORMAL, __LINE__, TRUE); + DestroyCursor(cursor); + + icon = CreateIcon(0, 16, 16, 1, 1, monochrome_bits, &monochrome_bits[32]); + ok(icon != NULL, "CreateIcon failed\n"); + check_monochrome_icon(icon, DI_NORMAL, __LINE__, TRUE); + DestroyIcon(icon); + + icon = CreateIconIndirect(&iconinfo); + ok(icon != NULL, "CreateIconIndirect failed\n"); + check_monochrome_icon(icon, DI_NORMAL, __LINE__, FALSE); + DestroyIcon(icon); +} + START_TEST(cursoricon) { pGetCursorInfo = (void *)GetProcAddress( GetModuleHandleA("user32.dll"), "GetCursorInfo" ); @@ -3132,6 +3215,7 @@ START_TEST(cursoricon) test_DestroyCursor(); test_PrivateExtractIcons(); test_monochrome_icon(); + test_monochrome_icon_creation(); do_parent(); test_child_process(); finish_child_process(); -- 2.33.0

3 8

[PATCH] server: Use SO_BINDTODEVICE in bind_to_index() if possible.
by Paul Gofman 12 Oct '21

12 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Using SO_REUSEADDR is currently problematic when more than one UDP socket is bound to different interfaces. While that succeeds, it is unspecified which socket will receive a packet coming to INADDR_ANY. The filter being installed for each socket with SO_ATTACH_FILTER can only reject the packet coming for another interface but that rejected packed doesn't arrive to another socket. SO_BINDTODEVICE seems to do exactly what we want without installing any socket filters and without requiring SO_REUSEADDR or SO_REUSEPORT. It originally considered for implementing broadcast listen on interface bound sockets but it wasn't much useful by that time as the SO_BINDTODEVICE required CAP_NET_RAW privilege which is normally not available for a non-root user. However, that changed since Linux 5.7 [2]. This patch uses SO_BINDTODEVICE but falls back to the previous way if that fails. 1. https://www.winehq.org/pipermail/wine-devel/2011-October/092681.html 2. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?i… server/sock.c | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/server/sock.c b/server/sock.c index 03716cba90f..af08cd6be24 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1756,12 +1756,14 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) #ifdef IP_BOUND_IF -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_index( int fd, in_addr_t bind_addr, const char *name, unsigned int index, BOOL *need_reuse_addr ) { + *need_reuse_addr = TRUE; + return setsockopt( fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index) ); } -#elif defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) +#elif defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) && defined(SO_BINDTODEVICE) struct interface_filter { @@ -1794,13 +1796,26 @@ static struct interface_filter generic_interface_filter = BPF_STMT(BPF_RET+BPF_K, 0) /* dump packet */ }; -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_index( int fd, in_addr_t bind_addr, const char *name, unsigned int index, BOOL *need_reuse_addr ) { in_addr_t ifindex = htonl( index ); struct interface_filter specific_interface_filter; struct sock_fprog filter_prog; int ret; + if (!setsockopt( fd, SOL_SOCKET, SO_BINDTODEVICE, name, strlen( name ) + 1 )) + { + *need_reuse_addr = FALSE; + return 0; + } + /* SO_BINDTODEVICE requires NET_CAP_RAW until Linux 5.7. */ + + if (debug_level) + fprintf( stderr, "setsockopt SO_BINDTODEVICE fd %d, name %s failed: %s, falling back to SO_REUSE_ADDR\n", + fd, name, strerror( errno )); + + *need_reuse_addr = TRUE; + if ((ret = setsockopt( fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex) )) < 0) return ret; @@ -1814,7 +1829,7 @@ static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) #else -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_index( int fd, in_addr_t bind_addr, const char *name, unsigned int index, BOOL *need_reuse_addr ) { errno = EOPNOTSUPP; return -1; @@ -1841,6 +1856,7 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr struct ifaddrs *ifaddrs, *ifaddr; int fd = get_unix_fd( sock->fd ); static const int enable = 1; + BOOL need_reuse_addr; unsigned int index; if (bind_addr == htonl( INADDR_ANY ) || bind_addr == htonl( INADDR_LOOPBACK )) @@ -1866,14 +1882,14 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr freeifaddrs( ifaddrs ); - if (bind_to_index( fd, bind_addr, index ) < 0) + if (bind_to_index( fd, bind_addr, ifaddr->ifa_name, index, &need_reuse_addr ) < 0) { if (debug_level) fprintf( stderr, "failed to bind to interface: %s\n", strerror( errno ) ); return 0; } - if (setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ) < 0) + if (need_reuse_addr && setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ) < 0) { if (debug_level) fprintf( stderr, "failed to reuse address: %s\n", strerror( errno ) ); -- 2.31.1

4 13

[PATCH] dinput: Fix invalid use of post-incremented device_count value.
by Rémi Bernon 12 Oct '21

12 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b385cc7503c..bc35d6d77b3 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -833,7 +833,8 @@ static HRESULT WINAPI IDirectInput8WImpl_EnumDevicesBySemantics( if (enumSuccess == S_OK && should_enumerate_device(ptszUserName, dwFlags, &This->device_players, &didevi.guidInstance)) { - didevis = realloc( didevis, sizeof(DIDEVICEINSTANCEW) * device_count++ ); + device_count++; + didevis = realloc( didevis, sizeof(DIDEVICEINSTANCEW) * device_count ); didevis[device_count-1] = didevi; } } -- 2.33.0

1 0

[PATCH] oleaut32: Rescale result after overflow in VarDecAdd.
by Robert Wilhelm 12 Oct '21

12 Oct '21

Signed-off-by: Robert Wilhelm <robert.wilhelm(a)gmx.net> --- dlls/oleaut32/tests/vartype.c | 4 ++-- dlls/oleaut32/vartype.c | 37 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index bf31fde2b7a..995fd254208 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3967,14 +3967,14 @@ static void test_VarDecAdd(void) S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); SETDEC64(l,1,0,0xffffffff,0xffffffff,0xffffffff);SETDEC(r,1,0,0,1); MATH2(VarDecAdd); - todo_wine EXPECTDEC64(0,0,0x19999999,0x99999999,0x9999999A); + EXPECTDEC64(0,0,0x19999999,0x99999999,0x9999999A); SETDEC64(l,0,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,0,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); ok(hres == DISP_E_OVERFLOW,"Expected overflow, got (%d,%d,%d,(%8x,%8x)x) hres 0x%08x\n", S(U(out)).scale, S(U(out)).sign, out.Hi32, S1(U1(out)).Mid32, S1(U1(out)).Lo32, hres); SETDEC64(l,1,0,0xe22ea493,0xb30310a7,0x70000000);SETDEC64(r,1,0,0xe22ea493,0xb30310a7,0x70000000); MATH2(VarDecAdd); - todo_wine EXPECTDEC64(0,0,0x2d3c8750,0xbd670354,0xb0000000); + EXPECTDEC64(0,0,0x2d3c8750,0xbd670354,0xb0000000); SETDEC(l,3,128,0,123456); SETDEC64(r,0,0,0xFFFFFFFF,0xFFFFFFFF,0xFFFFFFFF); MATH2(VarDecAdd); EXPECTDEC64(0,0,-1,0xFFFFFFFF,0xFFFFFF84); diff --git a/dlls/oleaut32/vartype.c b/dlls/oleaut32/vartype.c index dfdb0a15c51..0c6249d48db 100644 --- a/dlls/oleaut32/vartype.c +++ b/dlls/oleaut32/vartype.c @@ -4643,6 +4643,43 @@ VarDecAdd_AsPositive: DEC_LO32(pDecOut) = VARIANT_Add(DEC_LO32(pDecLeft), DEC_LO32(pDecRight), &overflow); DEC_MID32(pDecOut) = VARIANT_Add(DEC_MID32(pDecLeft), DEC_MID32(pDecRight), &overflow); DEC_HI32(pDecOut) = VARIANT_Add(DEC_HI32(pDecLeft), DEC_HI32(pDecRight), &overflow); + + if (overflow) + { + int i; + DWORD n[4]; + unsigned char remainder; + + if (!DEC_SCALE(pDecLeft)) + return DISP_E_OVERFLOW; + + DEC_SCALE(pDecOut) = DEC_SCALE(pDecLeft) - 1; + DEC_SIGN(pDecOut) = sign; + + n[0] = DEC_LO32(pDecOut); + n[1] = DEC_MID32(pDecOut); + n[2] = DEC_HI32(pDecOut); + n[3] = overflow; + + remainder = VARIANT_int_divbychar(n,4,10); + + /* round up the result */ + if (remainder >= 5) + { + for (remainder = 1, i = 0; i < ARRAY_SIZE(n) && remainder; i++) + { + ULONGLONG digit = n[i] + 1; + remainder = (digit > 0xFFFFFFFF) ? 1 : 0; + n[i] = digit & 0xFFFFFFFF; + } + } + + DEC_LO32(pDecOut) = n[0] ; + DEC_MID32(pDecOut) = n[1]; + DEC_HI32(pDecOut) = n[2]; + + return S_OK; + } } if (overflow) -- 2.31.1

1 0

[PATCH 1/5] winemenubuilder: Return pointer from freedesktop_mime_type_for_extension
by Alex Henrie 12 Oct '21

12 Oct '21

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- programs/winemenubuilder/winemenubuilder.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/programs/winemenubuilder/winemenubuilder.c b/programs/winemenubuilder/winemenubuilder.c index e02d7bd787f..51d83aed971 100644 --- a/programs/winemenubuilder/winemenubuilder.c +++ b/programs/winemenubuilder/winemenubuilder.c @@ -1874,29 +1874,26 @@ static BOOL build_native_mime_types(struct list *mime_types) return ret; } -static BOOL freedesktop_mime_type_for_extension(struct list *native_mime_types, - LPCWSTR extensionW, - WCHAR **match) +static WCHAR *freedesktop_mime_type_for_extension(struct list *native_mime_types, + const WCHAR *extensionW) { struct xdg_mime_type *mime_type_entry; int matchLength = 0; - - *match = NULL; + const WCHAR* match = NULL; LIST_FOR_EACH_ENTRY(mime_type_entry, native_mime_types, struct xdg_mime_type, entry) { if (PathMatchSpecW( extensionW, mime_type_entry->glob )) { - if (*match == NULL || matchLength < lstrlenW(mime_type_entry->glob)) + if (match == NULL || matchLength < lstrlenW(mime_type_entry->glob)) { - *match = mime_type_entry->mimeType; + match = mime_type_entry->mimeType; matchLength = lstrlenW(mime_type_entry->glob); } } } - if (*match != NULL) *match = xwcsdup(*match); - return TRUE; + return match ? xwcsdup(match) : NULL; } static WCHAR* reg_get_valW(HKEY key, LPCWSTR subkey, LPCWSTR name) @@ -2190,8 +2187,7 @@ static BOOL generate_associations(const WCHAR *packages_dir, const WCHAR *applic if (contentTypeW) wcslwr(contentTypeW); - if (!freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionW, &mimeType)) - goto end; + mimeType = freedesktop_mime_type_for_extension(&nativeMimeTypes, extensionW); if (mimeType == NULL) { -- 2.33.0

3 11

[PATCH v2] server: Use SO_BINDTODEVICE in bind_to_index() if possible.
by Paul Gofman 12 Oct '21

12 Oct '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Using SO_REUSEADDR is currently problematic when more than one UDP socket is bound to different interfaces. While that succeeds, it is unspecified which socket will receive a packet coming to INADDR_ANY. The filter being installed for each socket with SO_ATTACH_FILTER can only reject the packet coming for another interface but that rejected packed doesn't arrive to another socket. SO_BINDTODEVICE seems to do exactly what we want without installing any socket filters and without requiring SO_REUSEADDR or SO_REUSEPORT. It originally considered for implementing broadcast listen on interface bound sockets but it wasn't much useful by that time as the SO_BINDTODEVICE required CAP_NET_RAW privilege which is normally not available for a non-root user [1]. However, that changed since Linux 5.7 [2]. This patch uses SO_BINDTODEVICE but falls back to the previous way if that fails. 1. https://www.winehq.org/pipermail/wine-devel/2011-October/092681.html 2. https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/patch/?i… server/sock.c | 74 +++++++++++++++++++++++++++------------------------ 1 file changed, 39 insertions(+), 35 deletions(-) diff --git a/server/sock.c b/server/sock.c index 03716cba90f..fd05ebd0f3c 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1756,12 +1756,21 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) #ifdef IP_BOUND_IF -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) { - return setsockopt( fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index) ); + static const int enable = 1; + unsigned int index; + + if (!(index = if_nametoindex( name ))) + return -1; + + if (setsockopt( fd, IPPROTO_IP, IP_BOUND_IF, &index, sizeof(index) )) + return -1; + + return setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ); } -#elif defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) +#elif defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) && defined(SO_BINDTODEVICE) struct interface_filter { @@ -1794,27 +1803,43 @@ static struct interface_filter generic_interface_filter = BPF_STMT(BPF_RET+BPF_K, 0) /* dump packet */ }; -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) { - in_addr_t ifindex = htonl( index ); struct interface_filter specific_interface_filter; struct sock_fprog filter_prog; - int ret; + static const int enable = 1; + unsigned int index; + in_addr_t ifindex; - if ((ret = setsockopt( fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex) )) < 0) - return ret; + if (!setsockopt( fd, SOL_SOCKET, SO_BINDTODEVICE, name, strlen( name ) + 1 )) + return 0; + + /* SO_BINDTODEVICE requires NET_CAP_RAW until Linux 5.7. */ + if (debug_level) + fprintf( stderr, "setsockopt SO_BINDTODEVICE fd %d, name %s failed: %s, falling back to SO_REUSE_ADDR\n", + fd, name, strerror( errno )); + + if (!(index = if_nametoindex( name ))) + return -1; + + ifindex = htonl( index ); + if (setsockopt( fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex) ) < 0) + return -1; specific_interface_filter = generic_interface_filter; specific_interface_filter.iface_rule.k = index; specific_interface_filter.ip_rule.k = htonl( bind_addr ); filter_prog.len = sizeof(generic_interface_filter) / sizeof(struct sock_filter); filter_prog.filter = (struct sock_filter *)&specific_interface_filter; - return setsockopt( fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog) ); + if (setsockopt( fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog) )) + return -1; + + return setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ); } #else -static int bind_to_index( int fd, in_addr_t bind_addr, unsigned int index ) +static int bind_to_iface_name( int fd, in_addr_t bind_addr, const char *name ) { errno = EOPNOTSUPP; return -1; @@ -1840,8 +1865,7 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr in_addr_t bind_addr = addr->sin_addr.s_addr; struct ifaddrs *ifaddrs, *ifaddr; int fd = get_unix_fd( sock->fd ); - static const int enable = 1; - unsigned int index; + int err = 0; if (bind_addr == htonl( INADDR_ANY ) || bind_addr == htonl( INADDR_LOOPBACK )) return 0; @@ -1855,36 +1879,16 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr if (ifaddr->ifa_addr && ifaddr->ifa_addr->sa_family == AF_INET && ((struct sockaddr_in *)ifaddr->ifa_addr)->sin_addr.s_addr == bind_addr) { - index = if_nametoindex( ifaddr->ifa_name ); - if (!index) - { - if (debug_level) - fprintf( stderr, "Unable to look up interface index for %s: %s\n", - ifaddr->ifa_name, strerror( errno ) ); - continue; - } - - freeifaddrs( ifaddrs ); - - if (bind_to_index( fd, bind_addr, index ) < 0) + if ((err = bind_to_iface_name( fd, bind_addr, ifaddr->ifa_name )) < 0) { if (debug_level) fprintf( stderr, "failed to bind to interface: %s\n", strerror( errno ) ); - return 0; } - - if (setsockopt( fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable) ) < 0) - { - if (debug_level) - fprintf( stderr, "failed to reuse address: %s\n", strerror( errno ) ); - return 0; - } - return 1; + break; } } - freeifaddrs( ifaddrs ); - return 0; + return !err; } #ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID -- 2.31.1

1 0

[PATCH 1/9] tools/winedump: fix incorrect alignment
by Eric Pouech 12 Oct '21

12 Oct '21

(BTW dbghelp is already doing the right thing) --- tools/winedump/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 2c3d406347e..b7b7eb435ff 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1161,7 +1161,7 @@ BOOL codeview_dump_types_from_block(const void* table, unsigned long len) codeview_dump_one_type(curr_type, type); curr_type++; - ptr += (type->generic.len + 2 + 3) & ~3; + ptr += type->generic.len + 2; } return TRUE;

3 10

[PATCH vkd3d 01/10] vkd3d: Use minimum width/height/layer framebuffer.
by Conor McCarthy 12 Oct '21

12 Oct '21

All attachments must be at least as large as the framebuffer; using a max operator is not compliant with Vulkan (VUID-VkFramebufferCreateInfo-flags-04533, etc). From: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 9f4a4149..e81feea4 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -4517,6 +4517,7 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi BOOL single_descriptor_handle, const D3D12_CPU_DESCRIPTOR_HANDLE *depth_stencil_descriptor) { struct d3d12_command_list *list = impl_from_ID3D12GraphicsCommandList2(iface); + const VkPhysicalDeviceLimits *limits = &list->device->vk_info.device_limits; const struct d3d12_rtv_desc *rtv_desc; const struct d3d12_dsv_desc *dsv_desc; VkFormat prev_dsv_format; @@ -4535,9 +4536,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi render_target_descriptor_count = ARRAY_SIZE(list->rtvs); } - list->fb_width = 0; - list->fb_height = 0; - list->fb_layer_count = 0; + list->fb_width = limits->maxFramebufferWidth; + list->fb_height = limits->maxFramebufferHeight; + list->fb_layer_count = limits->maxFramebufferLayers; for (i = 0; i < render_target_descriptor_count; ++i) { if (single_descriptor_handle) @@ -4567,9 +4568,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } list->rtvs[i] = view->u.vk_image_view; - list->fb_width = max(list->fb_width, rtv_desc->width); - list->fb_height = max(list->fb_height, rtv_desc->height); - list->fb_layer_count = max(list->fb_layer_count, rtv_desc->layer_count); + list->fb_width = min(list->fb_width, rtv_desc->width); + list->fb_height = min(list->fb_height, rtv_desc->height); + list->fb_layer_count = min(list->fb_layer_count, rtv_desc->layer_count); } prev_dsv_format = list->dsv_format; @@ -4591,9 +4592,9 @@ static void STDMETHODCALLTYPE d3d12_command_list_OMSetRenderTargets(ID3D12Graphi } list->dsv = view->u.vk_image_view; - list->fb_width = max(list->fb_width, dsv_desc->width); - list->fb_height = max(list->fb_height, dsv_desc->height); - list->fb_layer_count = max(list->fb_layer_count, dsv_desc->layer_count); + list->fb_width = min(list->fb_width, dsv_desc->width); + list->fb_height = min(list->fb_height, dsv_desc->height); + list->fb_layer_count = min(list->fb_layer_count, dsv_desc->layer_count); list->dsv_format = dsv_desc->format->vk_format; } else -- 2.32.0

2 10

[PATCH vkd3d 9/9] tests: Add a UINT_MAX layer count test to test_clear_depth_stencil_view().
by Henri Verbeet 12 Oct '21

12 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Unmodified resend of patch 215659. tests/d3d12.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 9e4dcb5b..5593393e 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4485,6 +4485,17 @@ static void test_clear_depth_stencil_view(void) reset_command_list(command_list, context.allocator); } + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); + dsv_desc.Texture2DArray.ArraySize = UINT_MAX; + ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, expected_values[4], 0, 0, NULL); + + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_float(ds.texture, 5, queue, command_list, expected_values[4], 1); + destroy_depth_stencil(&ds); destroy_test_context(&context); } -- 2.20.1

1 0

[PATCH vkd3d 8/9] tests: Add UINT_MAX layer count tests to test_clear_render_target_view().
by Henri Verbeet 12 Oct '21

12 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Unmodified resend of patch 215658. tests/d3d12.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index ac1e24da..9e4dcb5b 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4672,7 +4672,7 @@ static void test_clear_render_target_view(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DARRAY; rtv_desc.Texture2DArray.FirstArraySlice = i; - rtv_desc.Texture2DArray.ArraySize = 1; + rtv_desc.Texture2DArray.ArraySize = (i == ARRAY_SIZE(array_colors) - 1) ? UINT_MAX : 1; ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); @@ -4703,7 +4703,7 @@ static void test_clear_render_target_view(void) rtv_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; rtv_desc.ViewDimension = D3D12_RTV_DIMENSION_TEXTURE2DMSARRAY; rtv_desc.Texture2DMSArray.FirstArraySlice = i; - rtv_desc.Texture2DMSArray.ArraySize = 1; + rtv_desc.Texture2DMSArray.ArraySize = (i == ARRAY_SIZE(array_colors) - 1) ? UINT_MAX : 1; ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); @@ -4759,6 +4759,23 @@ static void test_clear_render_target_view(void) check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); release_resource_readback(&rb); + rtv_desc.Texture3D.FirstWSlice = 30; + rtv_desc.Texture3D.WSize = UINT_MAX; + ID3D12Device_CreateRenderTargetView(device, resource, &rtv_desc, rtv_handle); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, rtv_handle, green, 0, NULL); + transition_resource_state(command_list, resource, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_texture_readback_with_command_list(resource, 0, &rb, queue, command_list); + set_box(&box, 0, 0, 4, 32, 32, 30); + check_readback_data_uint(&rb, &box, 0xbf4c7f19, 1); + set_box(&box, 0, 0, 30, 32, 32, 32); + check_readback_data_uint(&rb, &box, 0xff00ff00, 1); + release_resource_readback(&rb); + ID3D12Resource_Release(resource); ID3D12DescriptorHeap_Release(rtv_heap); destroy_test_context(&context); -- 2.20.1

1 0

[PATCH vkd3d 7/9] tests: Test a UINT_MAX layer count in test_clear_unordered_access_view_image().
by Henri Verbeet 12 Oct '21

12 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Testing without the fixes in vkd3d_create_texture_uav() has nasty results in radv and possibly others. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Mostly unmodified resend of patch 215657. tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index d1337e27..ac1e24da 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5014,6 +5014,8 @@ static void test_clear_unordered_access_view_image(void) {0x3f000000, 0, 0, 0}, 0x3f000000, true}, {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 3, 2, 0, {}, {0x3f000000, 0, 0, 0}, 0x3f000000, true}, + /* Test clearing a UINT_MAX layer count. */ + {DXGI_FORMAT_R32_FLOAT, 1, IMAGE_SIZE, 0, 0, UINT_MAX, 0, {}, {1, 0, 0, 0}, 1}, /* Test a single clear rect. */ {DXGI_FORMAT_R32_FLOAT, 1, 1, 0, 0, 1, 1, {{1, 2, IMAGE_SIZE - 4, IMAGE_SIZE - 2}}, {1, 0, 0, 0}, 1}, -- 2.20.1

1 0

[PATCH vkd3d 6/9] vkd3d: Normalise layer counts in d3d12_desc_create_srv().
by Henri Verbeet 12 Oct '21

12 Oct '21

I'm not aware of any issue caused by not normalising SRV layer counts, but this makes it consistent with the other view types. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- libs/vkd3d/resource.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index bf01a64c..d6e5d4be 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2753,6 +2753,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); if (desc->u.Texture2DArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.Texture2DArray.ResourceMinLODClamp); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_SRV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -2761,6 +2762,7 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_SRV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; @@ -2783,10 +2785,11 @@ void d3d12_desc_create_srv(struct d3d12_desc *descriptor, vkd3d_desc.miplevel_count = desc->u.TextureCubeArray.MipLevels; vkd3d_desc.layer_idx = desc->u.TextureCubeArray.First2DArrayFace; vkd3d_desc.layer_count = desc->u.TextureCubeArray.NumCubes; - if (vkd3d_desc.layer_count != VK_REMAINING_ARRAY_LAYERS) + if (vkd3d_desc.layer_count != UINT_MAX) vkd3d_desc.layer_count *= 6; if (desc->u.TextureCubeArray.ResourceMinLODClamp) FIXME("Unhandled min LOD clamp %.8e.\n", desc->u.TextureCubeArray.ResourceMinLODClamp); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); -- 2.20.1

1 0

[PATCH vkd3d 5/9] vkd3d: Normalise layer counts in d3d12_dsv_desc_create_dsv().
by Henri Verbeet 12 Oct '21

12 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Adjusted for changes earlier in the series. This supersedes patch 215656. libs/vkd3d/resource.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 30d7d2cf..bf01a64c 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -3296,6 +3296,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.miplevel_idx = desc->u.Texture2DArray.MipSlice; vkd3d_desc.layer_idx = desc->u.Texture2DArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_DSV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -3304,6 +3305,7 @@ void d3d12_dsv_desc_create_dsv(struct d3d12_dsv_desc *dsv_desc, struct d3d12_dev vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); -- 2.20.1

1 0

[PATCH vkd3d 4/9] vkd3d: Normalise layer counts in d3d12_rtv_desc_create_rtv().
by Henri Verbeet 12 Oct '21

12 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: Take the mip-level into account when calculating the maximum layer count for 3D textures. This supersedes patch 215655. libs/vkd3d/resource.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 854e73a3..30d7d2cf 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2480,7 +2480,19 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, static void vkd3d_texture_view_desc_normalise(struct vkd3d_texture_view_desc *desc, const D3D12_RESOURCE_DESC *resource_desc) { - unsigned int max_layer_count = resource_desc->DepthOrArraySize; + unsigned int max_layer_count; + + if (resource_desc->Dimension == D3D12_RESOURCE_DIMENSION_TEXTURE3D) + { + if (desc->view_type == VK_IMAGE_VIEW_TYPE_2D_ARRAY) + max_layer_count = max(1, resource_desc->DepthOrArraySize >> desc->miplevel_idx); + else + max_layer_count = 1; + } + else + { + max_layer_count = resource_desc->DepthOrArraySize; + } if (desc->layer_idx >= max_layer_count) { @@ -3186,6 +3198,7 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_RTV_DIMENSION_TEXTURE2DMS: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D; @@ -3194,12 +3207,14 @@ void d3d12_rtv_desc_create_rtv(struct d3d12_rtv_desc *rtv_desc, struct d3d12_dev vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.layer_idx = desc->u.Texture2DMSArray.FirstArraySlice; vkd3d_desc.layer_count = desc->u.Texture2DMSArray.ArraySize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_RTV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_2D_ARRAY; vkd3d_desc.miplevel_idx = desc->u.Texture3D.MipSlice; vkd3d_desc.layer_idx = desc->u.Texture3D.FirstWSlice; vkd3d_desc.layer_count = desc->u.Texture3D.WSize; + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; default: FIXME("Unhandled view dimension %#x.\n", desc->ViewDimension); -- 2.20.1

1 0

[PATCH vkd3d 3/9] vkd3d: Normalise layer counts in vkd3d_create_texture_uav().
by Henri Verbeet 12 Oct '21

12 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Passing UINT_MAX as layer count to Direct3D behaves similar to passing VK_REMAINING_ARRAY_LAYERS to Vulkan. Since these have the same value, everything usually works out even without normalisation. However, there are some exceptions; for example, we calculate workgroup counts for UAV clears from layer counts using vkd3d_compute_workgroup_count(), which doesn't handle UINT_MAX. Normalising layer counts during view creation avoids having to handle this issue in the rest of the code. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v2: - Introduce a helper to normalise the view instead of a helper for the layer count. - Some improvements to the commit message. This supersedes patch 215654. libs/vkd3d/resource.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index a51f5795..854e73a3 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -2477,6 +2477,27 @@ static bool init_default_texture_view_desc(struct vkd3d_texture_view_desc *desc, return true; } +static void vkd3d_texture_view_desc_normalise(struct vkd3d_texture_view_desc *desc, + const D3D12_RESOURCE_DESC *resource_desc) +{ + unsigned int max_layer_count = resource_desc->DepthOrArraySize; + + if (desc->layer_idx >= max_layer_count) + { + WARN("Layer index %u exceeds maximum available layer %u.\n", desc->layer_idx, max_layer_count - 1); + desc->layer_count = 1; + return; + } + + max_layer_count -= desc->layer_idx; + if (desc->layer_count <= max_layer_count) + return; + + if (desc->layer_count != UINT_MAX) + WARN("Layer count %u exceeds maximum %u.\n", desc->layer_count, max_layer_count); + desc->layer_count = max_layer_count; +} + bool vkd3d_create_texture_view(struct d3d12_device *device, VkImage vk_image, const struct vkd3d_texture_view_desc *desc, struct vkd3d_view **view) { @@ -2920,6 +2941,7 @@ static void vkd3d_create_texture_uav(struct d3d12_desc *descriptor, vkd3d_desc.layer_count = desc->u.Texture2DArray.ArraySize; if (desc->u.Texture2DArray.PlaneSlice) FIXME("Ignoring plane slice %u.\n", desc->u.Texture2DArray.PlaneSlice); + vkd3d_texture_view_desc_normalise(&vkd3d_desc, &resource->desc); break; case D3D12_UAV_DIMENSION_TEXTURE3D: vkd3d_desc.view_type = VK_IMAGE_VIEW_TYPE_3D; -- 2.20.1

1 0

[PATCH vkd3d 2/9] vkd3d-shader/spirv: Correctly handle bit shifts greater than 31 bits.
by Henri Verbeet 12 Oct '21

12 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> This is undefined behaviour in SPIR-V, but well-defined in Direct3D, so we should explicitly 'and' the shift amount with 31. Based on a vkd3d-proton patch by Philip Rebohle. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Minor modifications to the comment and commit message. This supersedes patch 216958. libs/vkd3d-shader/spirv.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ebaf1631..58bf3d9c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -6840,6 +6840,21 @@ static void vkd3d_dxbc_compiler_emit_alu_instruction(struct vkd3d_dxbc_compiler for (i = 0; i < instruction->src_count; ++i) src_ids[i] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[i], dst->write_mask); + /* The SPIR-V specification states, "The resulting value is undefined if + * Shift is greater than or equal to the bit width of the components of + * Base." Direct3D applies only the lowest 5 bits of the shift. + * + * Microsoft fxc will compile immediate constants larger than 5 bits. + * Fixing up the constants would be more elegant, but the simplest way is + * to let this handle constants too. */ + if (instruction->handler_idx == VKD3DSIH_ISHL || instruction->handler_idx == VKD3DSIH_ISHR + || instruction->handler_idx == VKD3DSIH_USHR) + { + uint32_t mask_id = vkd3d_dxbc_compiler_get_constant_vector(compiler, + VKD3D_SHADER_COMPONENT_UINT, vkd3d_write_mask_component_count(dst->write_mask), 0x1f); + src_ids[1] = vkd3d_spirv_build_op_and(builder, type_id, src_ids[1], mask_id); + } + val_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream, op, type_id, src_ids, instruction->src_count); if (instruction->flags & VKD3DSI_PRECISE_XYZW) -- 2.20.1

1 0

[PATCH vkd3d 1/9] tests: Add a test for 5-bit masking of shader bit shift operands.
by Henri Verbeet 12 Oct '21

12 Oct '21

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- v3: Unmodified resend of patch 216957. tests/d3d12.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 38fab13c..d1337e27 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -8584,15 +8584,16 @@ static void test_shader_instructions(void) void main(out uint4 dst : SV_Target) { - dst = src << 2; + dst = src << uint4(2, 2, 0x22, 0x22); } #endif - 0x43425844, 0x5b749bf4, 0xe24de3dc, 0xbbd75bc9, 0xc6fc9eca, 0x00000001, 0x000000c0, 0x00000003, + 0x43425844, 0x999070b8, 0x623414f1, 0xb1ce04f4, 0x58554022, 0x00000001, 0x000000d0, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000048, 0x00000040, 0x00000012, - 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029, - 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000058, 0x00000050, 0x00000016, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x0b000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004002, 0x00000002, + 0x00000002, 0x00000022, 0x00000022, 0x0100003e, }; static struct named_shader ps_ishl_const = {"ishl_const", ps_ishl_const_code, sizeof(ps_ishl_const_code)}; static const DWORD ps_not_code[] = @@ -9913,6 +9914,8 @@ static void test_shader_instructions(void) {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}}, {&ps_ishl, {{{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}, {~0x1fu, 0, 32, 64}}}, {{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}}}, + {&ps_ishl, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, { 33, 34, 65, 66}}}, + {{0xfffffffe, 0xfffffffc, 0xfffffffe, 0xfffffffc}}}, {&ps_ishl, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, { 31, 7, 15, 11}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, {&ps_ishl, {{{0x80000000, 0x80000000, 0x80000000, 0x80000000}, { 31, 7, 15, 11}}}, -- 2.20.1

1 0

[PATCH 1/7] win32u: Use syscall interface for some path functions.
by Jacek Caban 12 Oct '21

12 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 3 --- dlls/win32u/syscall.c | 3 +++ dlls/win32u/win32u.spec | 6 +++--- dlls/win32u/win32u_private.h | 3 --- dlls/win32u/wrappers.c | 15 --------------- dlls/wow64win/gdi.c | 24 ++++++++++++++++++++++++ dlls/wow64win/syscall.h | 3 +++ 7 files changed, 33 insertions(+), 24 deletions(-)

3 3

[PATCH v5 1/2] mshtml: Implement HTMLDocument's toString using dispex_to_string.
by Gabriel Ivăncescu 12 Oct '21

12 Oct '21

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/mshtml/htmldoc.c | 7 +------ dlls/mshtml/tests/documentmode.js | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 12fce6d..d2caaef 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1703,12 +1703,7 @@ static HRESULT WINAPI HTMLDocument_toString(IHTMLDocument2 *iface, BSTR *String) TRACE("(%p)->(%p)\n", This, String); - if(!String) - return E_INVALIDARG; - - *String = SysAllocString(L"[object]"); - return *String ? S_OK : E_OUTOFMEMORY; - + return dispex_to_string(&This->doc_node->node.event_target.dispex, String); } static HRESULT WINAPI HTMLDocument_createStyleSheet(IHTMLDocument2 *iface, BSTR bstrHref, diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 2c11744..7f7fe87 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -210,6 +210,7 @@ sync_test("builtin_toString", function() { if(clientRects) test("clientRect", clientRects[0], "ClientRect"); if(clientRects) test("clientRects", clientRects, "ClientRectList"); if(currentStyle) test("currentStyle", currentStyle, "MSCurrentStyleCSSProperties"); + if(v >= 11 /* todo_wine */) test("document", document, v < 11 ? "Document" : "HTMLDocument"); test("elements", document.getElementsByTagName("body"), "HTMLCollection"); test("history", window.history, "History"); test("implementation", document.implementation, "DOMImplementation"); -- 2.31.1

3 5

[PATCH 3/7] win32u: Use syscall interface for spooler functions.
by Jacek Caban 12 Oct '21

12 Oct '21

2 1

[PATCH 2/7] win32u: Use syscall interface for pen constructors.
by Jacek Caban 12 Oct '21

12 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/gdiobj.c | 2 -- dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 4 ++-- dlls/win32u/win32u_private.h | 5 ----- dlls/win32u/wrappers.c | 14 -------------- dlls/wow64win/gdi.c | 29 +++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 2 ++ 7 files changed, 35 insertions(+), 23 deletions(-)

2 1

[PATCH vkd3d v2 1/5] vkd3d-shader: Introduce a shader interface extension for descriptor offset info.
by Conor McCarthy 12 Oct '21

12 Oct '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- include/vkd3d_shader.h | 38 ++++++++++++++++++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 12 +++++++++++- 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 37b5936d..77cc3751 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -64,6 +64,11 @@ enum vkd3d_shader_structure_type * \since 1.3 */ VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO, + /** + * The structure is a vkd3d_shader_descriptor_offset_info structure. + * \since 1.3 + */ + VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -452,6 +457,39 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +/* Extends vkd3d_shader_interface_info. */ +struct vkd3d_shader_descriptor_offset_info +{ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_DESCRIPTOR_OFFSET_INFO. */ + enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ + const void *next; + + /** + * Pointer to an array of offsets which define the location of each vkd3d + * shader resource descriptor binding within a Vulkan descriptor binding. + * This array correlates exactly to the 'bindings' array in struct + * vkd3d_shader_interface_info. Multiple vkd3d bindings may be merged into + * a single Vulkan binding, and these offsets will be used to address the + * correct location in a merged binding. This value may be NULL, but if + * merged bindings are not used (i.e. all offsets are zero), struct + * vkd3d_shader_descriptor_offset_info may be omitted. The 'count' field in + * struct vkd3d_shader_descriptor_binding begins at the offset location. + * Use of merged Vulkan bindings requires EXT_descriptor_indexing. Merged + * bindings are not supported for combined samplers. + */ + const unsigned int *descriptor_offsets; + + /** + * Pointer to an array of offsets into UAV counter descriptor bindings. + * These correlate exactly to the 'uav_counters' array in struct + * vkd3d_shader_interface_info, and will be used in the same way as + * \ref descriptor_offsets above. UAV counter arrays are not supported in + * this version of vkd3d-shader, so this value must be NULL. + */ + const unsigned int *uav_counter_offsets; +}; + /** The format of a shader to be compiled or scanned. */ enum vkd3d_shader_source_type { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ebaf1631..d04b1101 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2231,6 +2231,7 @@ struct vkd3d_dxbc_compiler size_t control_flow_info_size; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_descriptor_offset_info offset_info; struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_spirv_target_info *spirv_target_info; @@ -2292,6 +2293,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; const struct vkd3d_shader_interface_info *shader_interface; + const struct vkd3d_shader_descriptor_offset_info *offset_info; const struct vkd3d_shader_spirv_target_info *target_info; struct vkd3d_dxbc_compiler *compiler; unsigned int max_element_count; @@ -2385,6 +2387,13 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader for (i = 0; i < shader_interface->push_constant_buffer_count; ++i) compiler->push_constants[i].pc = shader_interface->push_constant_buffers[i]; } + + if ((offset_info = vkd3d_find_struct(shader_interface->next, DESCRIPTOR_OFFSET_INFO))) + { + compiler->offset_info = *offset_info; + if (offset_info->uav_counter_offsets) + WARN("Ignoring UAV counter offsets %p.\n", offset_info->uav_counter_offsets); + } } compiler->scan_descriptor_info = scan_descriptor_info; @@ -2546,6 +2555,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; unsigned int register_last = (range->last == ~0u) ? range->first : range->last; + const unsigned int *descriptor_offsets = compiler->offset_info.descriptor_offsets; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2626,7 +2636,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor || current->binding.count <= register_last - current->register_index) continue; - *binding_base_idx = current->register_index; + *binding_base_idx = current->register_index - (descriptor_offsets ? descriptor_offsets[i] : 0); return current->binding; } if (shader_interface->binding_count) -- 2.32.0

1 4

[PATCH 7/7] win32u/tests: Add NtUserCloseWindowStation test.
by Jacek Caban 12 Oct '21

12 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/win32u/tests/Makefile.in | 5 +++++ dlls/win32u/tests/win32u.c | 42 +++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 dlls/win32u/tests/Makefile.in create mode 100644 dlls/win32u/tests/win32u.c

1 0

[PATCH 6/7] win32u: Move NtUserCloseWindowStation from user32.
by Jacek Caban 12 Oct '21

12 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/user32/message.c | 2 +- dlls/user32/user32.spec | 2 +- dlls/user32/user_private.h | 2 +- dlls/user32/winstation.c | 16 -------------- dlls/win32u/Makefile.in | 1 + dlls/win32u/syscall.c | 2 ++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/winstation.c | 45 ++++++++++++++++++++++++++++++++++++++ dlls/wow64win/Makefile.in | 3 ++- dlls/wow64win/syscall.h | 3 ++- dlls/wow64win/user.c | 35 +++++++++++++++++++++++++++++ include/Makefile.in | 1 + include/ntuser.h | 27 +++++++++++++++++++++++ 13 files changed, 119 insertions(+), 22 deletions(-) create mode 100644 dlls/win32u/winstation.c create mode 100644 dlls/wow64win/user.c create mode 100644 include/ntuser.h

1 0

[PATCH 5/7] ntdll: Export RtlNtStatusToDosError from Unix lib.
by Jacek Caban 12 Oct '21

12 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This allows using wine_server_call_err from unix libs, which is convenient for win32u (where last error needs to be set inside syscalls). dlls/ntdll/unix/env.c | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+)

1 0

[PATCH 4/7] ntdll: Move error mapping to a header file.
by Jacek Caban 12 Oct '21

12 Oct '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/error.c | 1656 +-------------------------------------- dlls/ntdll/error.h | 1672 ++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/make_errors | 2 +- 3 files changed, 1674 insertions(+), 1656 deletions(-) create mode 100644 dlls/ntdll/error.h

1 0

[PATCH] tools/winedump: update a FIXME
by David Kahurani 12 Oct '21

12 Oct '21

It is not considered worthwhile freeing memory in short-lived programs Signed-off-by: David Kahurani <k.kahurani(a)gmail.com> --- tools/winedump/msmangle.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/winedump/msmangle.c b/tools/winedump/msmangle.c index d22f471..80247f8 100644 --- a/tools/winedump/msmangle.c +++ b/tools/winedump/msmangle.c @@ -531,7 +531,9 @@ static char *demangle_datatype (char **str, compound_type *ct, if (*iter == '6') { int sub_expressions = 0; - /* FIXME: there are tons of memory leaks here */ + /* FIXME: there are tons of memory leaks here which are not + * not worthwhile to fix since this program is short-lived. + */ /* FIXME: this is still broken in some cases and it has to be * merged with the function prototype parsing above... */ -- 2.33.0

1 0

[PATCH v2] dinput: Wait for the internal thread to complete unacquiring.
by Rémi Bernon 12 Oct '21

12 Oct '21

Otherwise we may close HID read event before it has finished removing it from the wait handles, causing MsgWaitForMultipleObjectsEx to return an error and terminate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 13 ++++--------- dlls/dinput8/tests/hid.c | 6 ------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index b385cc7503c..61cecb34b16 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1364,8 +1364,7 @@ static DWORD WINAPI hook_thread_proc(void *param) mouse_hook = NULL; } - if (finished_event) - SetEvent(finished_event); + SetEvent(finished_event); } } @@ -1487,17 +1486,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) WARN( "Unable to (un)register raw device %x:%x\n", dev->raw_device.usUsagePage, dev->raw_device.usUsage ); } - if (acquired) - hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); - if (acquired) - { - WaitForSingleObject(hook_change_finished_event, INFINITE); - CloseHandle(hook_change_finished_event); - } + WaitForSingleObject(hook_change_finished_event, INFINITE); + CloseHandle(hook_change_finished_event); } void check_dinput_events(void) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index a2719f65488..6408fd0c1f0 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4759,9 +4759,6 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_UNSUPPORTED, "Escape returned: %#x\n", hr ); - /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ - Sleep( 100 ); - ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "Release returned %d\n", ref ); @@ -7228,9 +7225,6 @@ static void test_force_feedback_joystick( void ) ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); - /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ - Sleep( 100 ); - ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "Release returned %d\n", ref ); -- 2.33.0

2 2

[PATCH] dinput: Wait for internal thread to compelte unacquiring.
by Rémi Bernon 12 Oct '21

12 Oct '21

Otherwise we may close the read event before it has finished removing it from the wait handles, causing the internal thread wait to return an error and terminate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/dinput_main.c | 13 ++++--------- dlls/dinput8/tests/hid.c | 6 ------ 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/dlls/dinput/dinput_main.c b/dlls/dinput/dinput_main.c index 534e0ca8f86..12bc3a1f1dc 100644 --- a/dlls/dinput/dinput_main.c +++ b/dlls/dinput/dinput_main.c @@ -1379,8 +1379,7 @@ static DWORD WINAPI hook_thread_proc(void *param) mouse_hook = NULL; } - if (finished_event) - SetEvent(finished_event); + SetEvent(finished_event); } } @@ -1502,17 +1501,13 @@ void check_dinput_hooks(LPDIRECTINPUTDEVICE8W iface, BOOL acquired) WARN( "Unable to (un)register raw device %x:%x\n", dev->raw_device.usUsagePage, dev->raw_device.usUsage ); } - if (acquired) - hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); + hook_change_finished_event = CreateEventW( NULL, FALSE, FALSE, NULL ); PostThreadMessageW( hook_thread_id, WM_USER+0x10, 1, (LPARAM)hook_change_finished_event ); LeaveCriticalSection(&dinput_hook_crit); - if (acquired) - { - WaitForSingleObject(hook_change_finished_event, INFINITE); - CloseHandle(hook_change_finished_event); - } + WaitForSingleObject(hook_change_finished_event, INFINITE); + CloseHandle(hook_change_finished_event); } void check_dinput_events(void) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cd6ce5c425b..8242544f0f9 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -4759,9 +4759,6 @@ static void test_simple_joystick(void) todo_wine ok( hr == DIERR_UNSUPPORTED, "Escape returned: %#x\n", hr ); - /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ - Sleep( 100 ); - ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "Release returned %d\n", ref ); @@ -7228,9 +7225,6 @@ static void test_force_feedback_joystick( void ) ok( hr == DI_OK, "Unacquire returned: %#x\n", hr ); set_hid_expect( file, NULL, 0 ); - /* FIXME: we have to wait a bit because Wine DInput internal thread keeps a reference */ - Sleep( 100 ); - ref = IDirectInputDevice8_Release( device ); ok( ref == 0, "Release returned %d\n", ref ); -- 2.33.0

2 1

[PATCH 1/3] dinput8/tests: Add some more polled read tests.
by Rémi Bernon 12 Oct '21

12 Oct '21

Showing that we should probably not queue reports in this mode. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput8/tests/hid.c | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/dlls/dinput8/tests/hid.c b/dlls/dinput8/tests/hid.c index cdb19808fcd..7f933df3b06 100644 --- a/dlls/dinput8/tests/hid.c +++ b/dlls/dinput8/tests/hid.c @@ -2174,6 +2174,40 @@ static void test_hidp( HANDLE file, HANDLE async_file, int report_id, BOOL polle "expected different report\n" ); ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + value = 10; + SetLastError( 0xdeadbeef ); + ret = sync_ioctl( file, IOCTL_HID_SET_POLL_FREQUENCY_MSEC, &value, sizeof(ULONG), NULL, NULL ); + ok( ret, "IOCTL_HID_SET_POLL_FREQUENCY_MSEC failed last error %u\n", GetLastError() ); + + Sleep( 600 ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, report, caps.InputReportByteLength, NULL, &overlapped ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + SetLastError( 0xdeadbeef ); + ret = ReadFile( async_file, buffer, caps.InputReportByteLength, NULL, &overlapped2 ); + todo_wine + ok( !ret, "ReadFile succeeded\n" ); + todo_wine + ok( GetLastError() == ERROR_IO_PENDING, "ReadFile returned error %u\n", GetLastError() ); + + /* wait for second report to be ready */ + ret = GetOverlappedResult( async_file, &overlapped2, &value, TRUE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + /* first report should be ready and the same */ + ret = GetOverlappedResult( async_file, &overlapped, &value, FALSE ); + ok( ret, "GetOverlappedResult failed, last error %u\n", GetLastError() ); + ok( value == (report_id ? 3 : 4), "GetOverlappedResult returned length %u, expected %u\n", + value, (report_id ? 3 : 4) ); + todo_wine + ok( !memcmp( report, buffer, caps.InputReportByteLength ), "expected identical reports\n" ); + CloseHandle( overlapped.hEvent ); CloseHandle( overlapped2.hEvent ); } -- 2.33.0

1 2

[PATCH 1/7] wined3d: Don't call wined3d_texture_decref() in the CS thread.
by Jan Sikorski 12 Oct '21

12 Oct '21

Signed-off-by: Jan Sikorski <jsikorski(a)codeweavers.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/surface.c | 2 +- dlls/wined3d/texture.c | 217 ++++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 117 insertions(+), 107 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index eeb51448b01..31ca3fca853 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7947,7 +7947,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl context_gl->gl_info->gl_ops.gl.p_glFlush(); if (staging_texture) - wined3d_texture_decref(staging_texture); + wined3d_texture_destroy_temporary(staging_texture); return dst_location; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index adfbf60e726..c38aadac39e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13276,7 +13276,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli gl_info->gl_ops.gl.p_glFlush(); if (staging_texture) - wined3d_texture_decref(staging_texture); + wined3d_texture_destroy_temporary(staging_texture); return dst_location; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8a4ca4f5781..68238c7bed3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1219,7 +1219,7 @@ release: dst_texture->swapchain->swapchain_ops->swapchain_frontbuffer_updated(dst_texture->swapchain); } if (converted_texture) - wined3d_texture_decref(converted_texture); + wined3d_texture_destroy_temporary(converted_texture); context_release(context); return hr; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 339bf4e205a..608348a377a 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -332,6 +332,116 @@ static bool fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win return true; } +static void wined3d_texture_destroy_dc(void *object) +{ + const struct wined3d_texture_idx *idx = object; + D3DKMT_DESTROYDCFROMMEMORY destroy_desc; + struct wined3d_context *context; + struct wined3d_texture *texture; + struct wined3d_dc_info *dc_info; + struct wined3d_bo_address data; + unsigned int sub_resource_idx; + struct wined3d_device *device; + struct wined3d_range range; + NTSTATUS status; + + TRACE("texture %p, sub_resource_idx %u.\n", idx->texture, idx->sub_resource_idx); + + texture = idx->texture; + sub_resource_idx = idx->sub_resource_idx; + device = texture->resource.device; + dc_info = &texture->dc_info[sub_resource_idx]; + + if (!dc_info->dc) + { + ERR("Sub-resource {%p, %u} has no DC.\n", texture, sub_resource_idx); + return; + } + + TRACE("dc %p, bitmap %p.\n", dc_info->dc, dc_info->bitmap); + + destroy_desc.hDc = dc_info->dc; + destroy_desc.hBitmap = dc_info->bitmap; + if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) + ERR("Failed to destroy dc, status %#x.\n", status); + dc_info->dc = NULL; + dc_info->bitmap = NULL; + + wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); + if (data.buffer_object) + { + context = context_acquire(device, NULL, 0); + range.offset = 0; + range.size = texture->sub_resources[sub_resource_idx].size; + wined3d_context_unmap_bo_address(context, &data, 1, &range); + context_release(context); + } +} + +static void wined3d_texture_destroy_object(void *object) +{ + struct wined3d_texture *texture = object; + struct wined3d_resource *resource; + struct wined3d_dc_info *dc_info; + unsigned int sub_count; + unsigned int i; + + TRACE("texture %p.\n", texture); + + resource = &texture->resource; + sub_count = texture->level_count * texture->layer_count; + + if ((dc_info = texture->dc_info)) + { + for (i = 0; i < sub_count; ++i) + { + if (dc_info[i].dc) + { + struct wined3d_texture_idx texture_idx = {texture, i}; + + wined3d_texture_destroy_dc(&texture_idx); + } + } + heap_free(dc_info); + } + + if (texture->overlay_info) + { + for (i = 0; i < sub_count; ++i) + { + struct wined3d_overlay_info *info = &texture->overlay_info[i]; + struct wined3d_overlay_info *overlay, *cur; + + list_remove(&info->entry); + LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &info->overlays, struct wined3d_overlay_info, entry) + { + list_remove(&overlay->entry); + } + } + heap_free(texture->overlay_info); + } + + if (texture->dirty_regions) + { + for (i = 0; i < texture->layer_count; ++i) + { + heap_free(texture->dirty_regions[i].boxes); + } + heap_free(texture->dirty_regions); + } + + resource->resource_ops->resource_unload(resource); +} + +void wined3d_texture_destroy_temporary(struct wined3d_texture *texture) +{ + assert(texture->resource.ref == 1); + wined3d_texture_destroy_object(texture); + wined3d_resource_free_sysmem(&texture->resource); + context_resource_released(texture->resource.device, &texture->resource); + heap_free(texture); +} + /* Blit between surface locations. Onscreen on different swapchains is not supported. * Depth / stencil is not supported. Context activation is done by the caller. */ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_context *context, @@ -571,10 +681,10 @@ static void texture2d_blt_fbo(struct wined3d_device *device, struct wined3d_cont done: if (dst_texture != dst_save_texture) - wined3d_texture_decref(dst_texture); + wined3d_texture_destroy_temporary(dst_texture); if (src_staging_texture) - wined3d_texture_decref(src_staging_texture); + wined3d_texture_destroy_temporary(src_staging_texture); if (restore_texture) context_restore(context, restore_texture, restore_idx); @@ -1118,52 +1228,6 @@ static void wined3d_texture_create_dc(void *object) TRACE("Created DC %p, bitmap %p for texture %p, %u.\n", dc_info->dc, dc_info->bitmap, texture, sub_resource_idx); } -static void wined3d_texture_destroy_dc(void *object) -{ - const struct wined3d_texture_idx *idx = object; - D3DKMT_DESTROYDCFROMMEMORY destroy_desc; - struct wined3d_context *context; - struct wined3d_texture *texture; - struct wined3d_dc_info *dc_info; - struct wined3d_bo_address data; - unsigned int sub_resource_idx; - struct wined3d_device *device; - struct wined3d_range range; - NTSTATUS status; - - TRACE("texture %p, sub_resource_idx %u.\n", idx->texture, idx->sub_resource_idx); - - texture = idx->texture; - sub_resource_idx = idx->sub_resource_idx; - device = texture->resource.device; - dc_info = &texture->dc_info[sub_resource_idx]; - - if (!dc_info->dc) - { - ERR("Sub-resource {%p, %u} has no DC.\n", texture, sub_resource_idx); - return; - } - - TRACE("dc %p, bitmap %p.\n", dc_info->dc, dc_info->bitmap); - - destroy_desc.hDc = dc_info->dc; - destroy_desc.hBitmap = dc_info->bitmap; - if ((status = D3DKMTDestroyDCFromMemory(&destroy_desc))) - ERR("Failed to destroy dc, status %#x.\n", status); - dc_info->dc = NULL; - dc_info->bitmap = NULL; - - wined3d_texture_get_memory(texture, sub_resource_idx, &data, texture->resource.map_binding); - if (data.buffer_object) - { - context = context_acquire(device, NULL, 0); - range.offset = 0; - range.size = texture->sub_resources[sub_resource_idx].size; - wined3d_context_unmap_bo_address(context, &data, 1, &range); - context_release(context); - } -} - void wined3d_texture_set_swapchain(struct wined3d_texture *texture, struct wined3d_swapchain *swapchain) { texture->swapchain = swapchain; @@ -1453,61 +1517,6 @@ ULONG CDECL wined3d_texture_incref(struct wined3d_texture *texture) return refcount; } -static void wined3d_texture_destroy_object(void *object) -{ - struct wined3d_texture *texture = object; - struct wined3d_resource *resource; - struct wined3d_dc_info *dc_info; - unsigned int sub_count; - unsigned int i; - - TRACE("texture %p.\n", texture); - - resource = &texture->resource; - sub_count = texture->level_count * texture->layer_count; - - if ((dc_info = texture->dc_info)) - { - for (i = 0; i < sub_count; ++i) - { - if (dc_info[i].dc) - { - struct wined3d_texture_idx texture_idx = {texture, i}; - - wined3d_texture_destroy_dc(&texture_idx); - } - } - heap_free(dc_info); - } - - if (texture->overlay_info) - { - for (i = 0; i < sub_count; ++i) - { - struct wined3d_overlay_info *info = &texture->overlay_info[i]; - struct wined3d_overlay_info *overlay, *cur; - - list_remove(&info->entry); - LIST_FOR_EACH_ENTRY_SAFE(overlay, cur, &info->overlays, struct wined3d_overlay_info, entry) - { - list_remove(&overlay->entry); - } - } - heap_free(texture->overlay_info); - } - - if (texture->dirty_regions) - { - for (i = 0; i < texture->layer_count; ++i) - { - heap_free(texture->dirty_regions[i].boxes); - } - heap_free(texture->dirty_regions); - } - - resource->resource_ops->resource_unload(resource); -} - void wined3d_texture_cleanup(struct wined3d_texture *texture) { wined3d_cs_destroy_object(texture->resource.device->cs, wined3d_texture_destroy_object, texture); @@ -5961,7 +5970,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit (old_colour_key_flags & WINED3D_CKEY_SRC_BLT) ? &old_blt_key : NULL); if (staging_texture) - wined3d_texture_decref(staging_texture); + wined3d_texture_destroy_temporary(staging_texture); return dst_location; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0c169ec344b..fe7a8dff55e 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4462,6 +4462,7 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un void wined3d_texture_validate_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, DWORD location) DECLSPEC_HIDDEN; void wined3d_texture_clear_dirty_regions(struct wined3d_texture *texture) DECLSPEC_HIDDEN; +void wined3d_texture_destroy_temporary(struct wined3d_texture *texture) DECLSPEC_HIDDEN; HRESULT wined3d_texture_no3d_init(struct wined3d_texture *texture_no3d, struct wined3d_device *device, const struct wined3d_resource_desc *desc, unsigned int layer_count, unsigned int level_count, -- 2.30.2

4 19

[PATCH 1/3] maintainers: Add hidparse.sys under HID support.
by Rémi Bernon 12 Oct '21

12 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- MAINTAINERS | 1 + 1 file changed, 1 insertion(+) diff --git a/MAINTAINERS b/MAINTAINERS index 18478a8871f..f4bdae8842b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -143,6 +143,7 @@ M: Aric Stewart <aric(a)codeweavers.com> P: Rémi Bernon <rbernon(a)codeweavers.com> F: dlls/hid/ F: dlls/hidclass.sys/ +F: dlls/hidparse.sys/ F: dlls/winehid.sys/ HTTP server -- 2.33.0

1 2

[PATCH] hidparse.sys: Ignore unknown item types, rather than failing.
by Rémi Bernon 12 Oct '21

12 Oct '21

Some DS4 controllers have a trailing NUL byte when accessed over bluetooth. This causes parse_descriptor to return an error where we can instead ignore it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/hidparse.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidparse.sys/main.c b/dlls/hidparse.sys/main.c index 18ee23974f0..d455049d9b1 100644 --- a/dlls/hidparse.sys/main.c +++ b/dlls/hidparse.sys/main.c @@ -628,7 +628,7 @@ struct hid_preparsed_data *parse_descriptor( BYTE *descriptor, unsigned int leng default: FIXME( "item type %x not implemented!\n", *ptr ); - goto done; + break; } #undef SHORT_ITEM } -- 2.33.0

1 0

[PATCH] winebus.sys: Do not parse bluetooth "PRODUCT=" uevent field.
by Rémi Bernon 12 Oct '21

12 Oct '21

These contain the bluetooth dongle VID / PID instead. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winebus.sys/bus_udev.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index c56273a6b23..2f85c86694c 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -1103,12 +1103,12 @@ static const struct hid_device_vtbl lnxev_device_vtbl = }; #endif /* HAS_PROPER_INPUT_HEADER */ -static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc) +static void get_device_subsystem_info(struct udev_device *dev, char const *subsystem, struct device_desc *desc, + int *bus) { struct udev_device *parent = NULL; const char *ptr, *next, *tmp; char buffer[MAX_PATH]; - DWORD bus = 0; if (!(parent = udev_device_get_parent_with_subsystem_devtype(dev, subsystem, NULL))) return; @@ -1139,16 +1139,16 @@ static void get_device_subsystem_info(struct udev_device *dev, char const *subsy } if (!strncmp(ptr, "HID_ID=", 7)) { - if (bus || desc->vid || desc->pid) continue; - sscanf(ptr, "HID_ID=%x:%x:%x\n", &bus, &desc->vid, &desc->pid); + if (*bus || desc->vid || desc->pid) continue; + sscanf(ptr, "HID_ID=%x:%x:%x\n", bus, &desc->vid, &desc->pid); } - if (!strncmp(ptr, "PRODUCT=", 8)) + if (!strncmp(ptr, "PRODUCT=", 8) && *bus != BUS_BLUETOOTH) { if (desc->version) continue; if (!strcmp(subsystem, "usb")) sscanf(ptr, "PRODUCT=%x/%x/%x\n", &desc->vid, &desc->pid, &desc->version); else - sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", &bus, &desc->vid, &desc->pid, &desc->version); + sscanf(ptr, "PRODUCT=%x/%x/%x/%x\n", bus, &desc->vid, &desc->pid, &desc->version); } } } @@ -1172,7 +1172,7 @@ static void udev_add_device(struct udev_device *dev) struct base_device *impl; const char *subsystem; const char *devnode; - int fd; + int fd, bus = 0; if (!(devnode = udev_device_get_devnode(dev))) return; @@ -1194,9 +1194,9 @@ static void udev_add_device(struct udev_device *dev) } #endif - get_device_subsystem_info(dev, "hid", &desc); - get_device_subsystem_info(dev, "input", &desc); - get_device_subsystem_info(dev, "usb", &desc); + get_device_subsystem_info(dev, "hid", &desc, &bus); + get_device_subsystem_info(dev, "input", &desc, &bus); + get_device_subsystem_info(dev, "usb", &desc, &bus); subsystem = udev_device_get_subsystem(dev); if (!strcmp(subsystem, "hidraw")) -- 2.33.0

1 0

[PATCH] dinput: Only dump the HID report data that has been read.
by Rémi Bernon 12 Oct '21

12 Oct '21

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/dinput/joystick_hid.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_hid.c b/dlls/dinput/joystick_hid.c index ef082ca1282..0661affecbc 100644 --- a/dlls/dinput/joystick_hid.c +++ b/dlls/dinput/joystick_hid.c @@ -1629,14 +1629,14 @@ static HRESULT hid_joystick_read_state( IDirectInputDevice8W *iface ) if (ret && TRACE_ON(dinput)) { TRACE( "read size %u report:\n", count ); - for (i = 0; i < report_len;) + for (i = 0; i < count;) { char buffer[256], *buf = buffer; buf += sprintf(buf, "%08x ", i); do { buf += sprintf(buf, " %02x", (BYTE)report_buf[i] ); - } while (++i % 16 && i < report_len); + } while (++i % 16 && i < count); TRACE("%s\n", buffer); } } -- 2.33.0

1 0

[PATCH 0/3] Remove ancient codepaths
by Emil Velikov 12 Oct '21

12 Oct '21

Hey everyone, Here's a small series which removes compatibility glue for ancient distros. In particular - we bump to using 16 year old libxslt and 5 year old gnutls. Amazing "update" right :-) Joking aside, these are covered by all supported distros, including the distro packages linked on the winehq.org site. Any questions or comments, do let me know Emil Emil Velikov (3): msxml3: remove workaround for libxslt =< 1.1.14 bcrypt: bump gnutls version to 3.5.0 secur32: remove gnutls < 3.5.0 defines dlls/bcrypt/gnutls.c | 189 ++++++--------------------------- dlls/msxml3/main.c | 38 ++++--- dlls/secur32/schannel_gnutls.c | 17 --- 3 files changed, 52 insertions(+), 192 deletions(-) -- 2.33.0

2 6

[PATCH vkd3d v2 1/2] tests: Add tests for 5-bit masking of shader bit shift operands.
by Conor McCarthy 12 Oct '21

12 Oct '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Also test immediate constants. --- tests/d3d12.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 70f73b79..a393401c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -8598,15 +8598,16 @@ static void test_shader_instructions(void) void main(out uint4 dst : SV_Target) { - dst = src << 2; + dst = src << uint4(2, 2, 0x22, 0x22); } #endif - 0x43425844, 0x5b749bf4, 0xe24de3dc, 0xbbd75bc9, 0xc6fc9eca, 0x00000001, 0x000000c0, 0x00000003, + 0x43425844, 0x999070b8, 0x623414f1, 0xb1ce04f4, 0x58554022, 0x00000001, 0x000000d0, 0x00000003, 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000001, 0x00000000, - 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x52444853, 0x00000048, 0x00000040, 0x00000012, - 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x08000029, - 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004001, 0x00000002, 0x0100003e, + 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x00000058, 0x00000050, 0x00000016, + 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, + 0x0b000029, 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x00004002, 0x00000002, + 0x00000002, 0x00000022, 0x00000022, 0x0100003e, }; static struct named_shader ps_ishl_const = {"ishl_const", ps_ishl_const_code, sizeof(ps_ishl_const_code)}; static const DWORD ps_not_code[] = @@ -9927,6 +9928,8 @@ static void test_shader_instructions(void) {{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}}}, {&ps_ishl, {{{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}, {~0x1fu, 0, 32, 64}}}, {{0xfefefefe, 0x0fefefef, 0x0f0f0f0f, 0x12345678}}}, + {&ps_ishl, {{{0xffffffff, 0xffffffff, 0xffffffff, 0xffffffff}, { 33, 34, 65, 66}}}, + {{0xfffffffe, 0xfffffffc, 0xfffffffe, 0xfffffffc}}}, {&ps_ishl, {{{0x00000000, 0x00000000, 0x00000000, 0x00000000}, { 31, 7, 15, 11}}}, {{0x00000000, 0x00000000, 0x00000000, 0x00000000}}}, {&ps_ishl, {{{0x80000000, 0x80000000, 0x80000000, 0x80000000}, { 31, 7, 15, 11}}}, -- 2.32.0

1 1

[PATCH vkd3d 1/9] tests: Add tests for sample_c texel offset.
by Conor McCarthy 12 Oct '21

12 Oct '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 106 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 76 insertions(+), 30 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 89b1f000..09cc0e98 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -14417,11 +14417,11 @@ static void test_gather_c(void) static void test_sample_c_lz(void) { + struct depth_stencil_resource ds, ds_offset; D3D12_SHADER_RESOURCE_VIEW_DESC srv_desc; ID3D12GraphicsCommandList *command_list; D3D12_DEPTH_STENCIL_VIEW_DESC dsv_desc; D3D12_CPU_DESCRIPTOR_HANDLE cpu_handle; - struct depth_stencil_resource ds; struct test_context_desc desc; struct resource_readback rb; struct test_context context; @@ -14429,7 +14429,7 @@ static void test_sample_c_lz(void) ID3D12CommandQueue *queue; struct vec4 ps_constant; ID3D12Device *device; - unsigned int i; + unsigned int i, j; RECT rect; static const D3D12_STATIC_SAMPLER_DESC sampler_desc = @@ -14472,6 +14472,36 @@ static void test_sample_c_lz(void) 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, 0x00100006, 0x00000000, 0x0100003e, }; static const D3D12_SHADER_BYTECODE ps_array = {ps_array_code, sizeof(ps_array_code)}; + static const DWORD ps_array_offset_code[] = + { +#if 0 + Texture2DArray t; + SamplerComparisonState s; + + float ref; + float layer; + + float4 main(float4 position : SV_Position) : SV_Target + { + return t.SampleCmpLevelZero(s, float3(position.x / 5120.0f, position.y / 3840.0f, layer), ref, + int2(4, 4)); + } +#endif + 0x43425844, 0xdf99ade1, 0x420d8d11, 0x3abe4b31, 0x116badd9, 0x00000001, 0x0000018c, 0x00000003, + 0x0000002c, 0x00000060, 0x00000094, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, + 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000030f, 0x505f5653, 0x7469736f, 0x006e6f69, + 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, + 0x00000000, 0x0000000f, 0x545f5653, 0x65677261, 0xabab0074, 0x58454853, 0x000000f0, 0x00000050, + 0x0000003c, 0x0100086a, 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x0300085a, 0x00106000, + 0x00000000, 0x04004058, 0x00107000, 0x00000000, 0x00005555, 0x04002064, 0x00101032, 0x00000000, + 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x02000068, 0x00000001, 0x0a000038, 0x00100032, + 0x00000000, 0x00101046, 0x00000000, 0x00004002, 0x394ccccd, 0x39888889, 0x00000000, 0x00000000, + 0x06000036, 0x00100042, 0x00000000, 0x0020801a, 0x00000000, 0x00000000, 0x8f000047, 0x80008801, + 0x80000202, 0x00155543, 0x00100012, 0x00000000, 0x00100246, 0x00000000, 0x00107006, 0x00000000, + 0x00106000, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x05000036, 0x001020f2, 0x00000000, + 0x00100006, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ps_array_offset = {ps_array_offset_code, sizeof(ps_array_offset_code)}; static const DWORD ps_cube_code[] = { #if 0 @@ -14590,15 +14620,15 @@ static void test_sample_c_lz(void) heap = create_gpu_descriptor_heap(context.device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 6); cpu_handle = ID3D12DescriptorHeap_GetCPUDescriptorHandleForHeapStart(heap); - /* 2D array texture */ - context.pipeline_state = create_pipeline_state(context.device, - context.root_signature, context.render_target_desc.Format, NULL, &ps_array, NULL); - init_depth_stencil(&ds, device, 32, 32, ARRAY_SIZE(depth_values), 2, DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); + init_depth_stencil(&ds_offset, device, 32, 32, ARRAY_SIZE(depth_values), 2, + DXGI_FORMAT_R32_TYPELESS, DXGI_FORMAT_D32_FLOAT, NULL); for (i = 0; i < ARRAY_SIZE(depth_values); ++i) { + static const D3D12_RECT rects[] = {{0, 0, 3, 3}, {3, 3, 32, 32}}; + memset(&dsv_desc, 0, sizeof(dsv_desc)); dsv_desc.Format = DXGI_FORMAT_D32_FLOAT; dsv_desc.ViewDimension = D3D12_DSV_DIMENSION_TEXTURE2DARRAY; @@ -14607,6 +14637,11 @@ static void test_sample_c_lz(void) ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds.dsv_handle, D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 0, NULL); + ID3D12Device_CreateDepthStencilView(device, ds_offset.texture, &dsv_desc, ds_offset.dsv_handle); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds_offset.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, 1.0f, 0, 1, &rects[0]); + ID3D12GraphicsCommandList_ClearDepthStencilView(command_list, ds_offset.dsv_handle, + D3D12_CLEAR_FLAG_DEPTH, depth_values[i], 0, 1, &rects[1]); dsv_desc.Texture2DArray.MipSlice = 1; ID3D12Device_CreateDepthStencilView(device, ds.texture, &dsv_desc, ds.dsv_handle); @@ -14623,44 +14658,54 @@ static void test_sample_c_lz(void) srv_desc.Texture2DArray.FirstArraySlice = 0; srv_desc.Texture2DArray.ArraySize = ARRAY_SIZE(depth_values); ID3D12Device_CreateShaderResourceView(context.device, ds.texture, &srv_desc, cpu_handle); + ID3D12Device_CreateShaderResourceView(context.device, ds_offset.texture, &srv_desc, + get_cpu_descriptor_handle(&context, heap, 1)); transition_resource_state(command_list, ds.texture, D3D12_RESOURCE_STATE_DEPTH_WRITE, D3D12_RESOURCE_STATE_PIXEL_SHADER_RESOURCE); memset(&ps_constant, 0, sizeof(ps_constant)); - for (i = 0; i < ARRAY_SIZE(tests); ++i) + for (j = 0; j < 2; ++j) { - vkd3d_test_set_context("test %u", i); + /* 2D array texture */ + context.pipeline_state = create_pipeline_state(context.device, + context.root_signature, context.render_target_desc.Format, NULL, + j ? &ps_array_offset : &ps_array, NULL); - ps_constant.x = tests[i].d_ref; - ps_constant.y = tests[i].layer; + for (i = 0; i < ARRAY_SIZE(tests); ++i) + { + vkd3d_test_set_context("test %u%s", i, j ? " offset" : ""); - ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, clear_color, 0, NULL); - ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); - ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); - ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); - ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); - ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, - get_gpu_descriptor_handle(&context, heap, 0)); - ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_constant.x, 0); - ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); - ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); - ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); - ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + ps_constant.x = tests[i].d_ref; + ps_constant.y = tests[i].layer; - transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, clear_color, 0, NULL); + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, 1, &heap); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, heap, j)); + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 1, 4, &ps_constant.x, 0); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); - check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); - reset_command_list(command_list, context.allocator); - transition_resource_state(command_list, context.render_target, - D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + todo_if(j && tests[i].d_ref > 0.0f) + check_sub_resource_float(context.render_target, 0, queue, command_list, tests[i].expected, 2); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + } + ID3D12PipelineState_Release(context.pipeline_state); } vkd3d_test_set_context(NULL); - ID3D12PipelineState_Release(context.pipeline_state); - /* cube texture */ context.pipeline_state = create_pipeline_state(context.device, context.root_signature, context.render_target_desc.Format, NULL, &ps_cube, NULL); @@ -14709,6 +14754,7 @@ static void test_sample_c_lz(void) vkd3d_test_set_context(NULL); destroy_depth_stencil(&ds); + destroy_depth_stencil(&ds_offset); ID3D12DescriptorHeap_Release(heap); destroy_test_context(&context); } -- 2.32.0

2 10

[PATCH vkd3d 1/3] tests: Add more tests for invalid descriptor tables.
by Conor McCarthy 11 Oct '21

11 Oct '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 27393eec..8ae40afa 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2703,6 +2703,26 @@ static void test_create_root_signature(void) hr = create_root_signature(device, &root_signature_desc, &root_signature); ok(hr == E_INVALIDARG, "Failed to create root signature, hr %#x.\n", hr); + /* empty descriptor table */ + descriptor_ranges[0].NumDescriptors = 0; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + + /* descriptor register range overflow + * Windows results vary for overflowing to zero, but anything beyond that is invalid. */ + descriptor_ranges[0].NumDescriptors = 0x1000; + descriptor_ranges[0].BaseShaderRegister = 0xfffff001; + root_parameters[0].DescriptorTable.NumDescriptorRanges = 1; + hr = create_root_signature(device, &root_signature_desc, &root_signature); + todo + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (SUCCEEDED(hr)) + ID3D12RootSignature_Release(root_signature); + /* empty root signature */ root_signature_desc.NumParameters = 0; root_signature_desc.pParameters = NULL; -- 2.32.0

2 3

[PATCH vkd3d 1/3] vkd3d-shader: Introduce a shader interface extension for binding offset info.
by Conor McCarthy 11 Oct '21

11 Oct '21

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- include/vkd3d_shader.h | 22 ++++++++++++++++++++++ libs/vkd3d-shader/spirv.c | 8 +++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 37b5936d..8d813d85 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -64,6 +64,11 @@ enum vkd3d_shader_structure_type * \since 1.3 */ VKD3D_SHADER_STRUCTURE_TYPE_PREPROCESS_INFO, + /** + * The structure is a vkd3d_shader_binding_offset_info structure. + * \since 1.3 + */ + VKD3D_SHADER_STRUCTURE_TYPE_BINDING_OFFSET_INFO, VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_STRUCTURE_TYPE), }; @@ -452,6 +457,23 @@ struct vkd3d_shader_transform_feedback_info unsigned int buffer_stride_count; }; +/* Extends vkd3d_shader_interface_info. */ +struct vkd3d_shader_binding_offset_info +{ + /** Must be set to VKD3D_SHADER_STRUCTURE_TYPE_BINDING_OFFSET_INFO. */ + enum vkd3d_shader_structure_type type; + /** Optional pointer to a structure containing further parameters. */ + const void *next; + + /** + * Pointer to an array of offsets into shader resource descriptor bindings. + * These correlate 1:1 to the 'bindings' array in struct + * vkd3d_shader_interface_info, and will be added to the register index to + * address the correct location in a merged binding. + */ + const unsigned int *binding_offsets; +}; + /** The format of a shader to be compiled or scanned. */ enum vkd3d_shader_source_type { diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ebaf1631..fab92059 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2231,6 +2231,7 @@ struct vkd3d_dxbc_compiler size_t control_flow_info_size; struct vkd3d_shader_interface_info shader_interface; + struct vkd3d_shader_binding_offset_info offset_info; struct vkd3d_push_constant_buffer_binding *push_constants; const struct vkd3d_shader_spirv_target_info *spirv_target_info; @@ -2292,6 +2293,7 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader const struct vkd3d_shader_signature *patch_constant_signature = &shader_desc->patch_constant_signature; const struct vkd3d_shader_signature *output_signature = &shader_desc->output_signature; const struct vkd3d_shader_interface_info *shader_interface; + const struct vkd3d_shader_binding_offset_info *offset_info; const struct vkd3d_shader_spirv_target_info *target_info; struct vkd3d_dxbc_compiler *compiler; unsigned int max_element_count; @@ -2385,6 +2387,9 @@ struct vkd3d_dxbc_compiler *vkd3d_dxbc_compiler_create(const struct vkd3d_shader for (i = 0; i < shader_interface->push_constant_buffer_count; ++i) compiler->push_constants[i].pc = shader_interface->push_constant_buffers[i]; } + + if ((offset_info = vkd3d_find_struct(shader_interface->next, BINDING_OFFSET_INFO))) + compiler->offset_info = *offset_info; } compiler->scan_descriptor_info = scan_descriptor_info; @@ -2546,6 +2551,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; unsigned int register_last = (range->last == ~0u) ? range->first : range->last; + const unsigned int *binding_offsets = compiler->offset_info.binding_offsets; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2626,7 +2632,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor || current->binding.count <= register_last - current->register_index) continue; - *binding_base_idx = current->register_index; + *binding_base_idx = current->register_index - (binding_offsets ? binding_offsets[i] : 0); return current->binding; } if (shader_interface->binding_count) -- 2.32.0

2 4

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-devel