July 2021 - Wine-Devel - list.winehq.org

[PATCH 1/2] mshtml: Do not lock document mode in create_document_event().
by Paul Gofman July 22, 2021

July 22, 2021

Event may be created before the document is loaded. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 17f5fb35b71..5b040c4df62 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2334,7 +2334,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return E_FAIL; } - event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), event_id); + event = alloc_event(nsevent, doc->document_mode, event_id); if(!event) return E_OUTOFMEMORY; -- 2.31.1

2 3

[PATCH vkd3d 1/2] tests: Use multiple stream output slots in test_line_tessellation().
by Conor McCarthy July 22, 2021

July 22, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- tests/d3d12.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 04c1e2c8..ee9b55fe 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -28194,7 +28194,7 @@ static void test_line_tessellation(void) D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; ID3D12GraphicsCommandList *command_list; D3D12_QUERY_HEAP_DESC query_heap_desc; - D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv[2]; D3D12_INPUT_LAYOUT_DESC input_layout; struct test_context_desc desc; D3D12_VERTEX_BUFFER_VIEW vbv; @@ -28361,10 +28361,10 @@ static void test_line_tessellation(void) static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = { {0, "SV_POSITION", 0, 0, 4, 0}, - {0, "COLOR", 0, 0, 4, 0}, - {0, "PRIMITIVE_ID", 0, 0, 4, 0}, + {0, "COLOR", 0, 0, 4, 1}, + {0, "PRIMITIVE_ID", 0, 0, 4, 1}, }; - unsigned int strides[] = {48}; + unsigned int strides[] = {16, 32}; static const struct { struct vec4 position; @@ -28450,13 +28450,17 @@ static void test_line_tessellation(void) so_buffer = create_default_buffer(context.device, 4096, D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); - sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); - sobv.SizeInBytes = 1024; - sobv.BufferFilledSizeLocation = sobv.BufferLocation + sobv.SizeInBytes; + + for (i = 0; i < ARRAY_SIZE(sobv); ++i) + { + sobv[i].BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer) + i * 2048; + sobv[i].SizeInBytes = 1024; + sobv[i].BufferFilledSizeLocation = sobv[i].BufferLocation + sobv[i].SizeInBytes; + } ID3D12GraphicsCommandList_BeginQuery(command_list, query_heap, D3D12_QUERY_TYPE_SO_STATISTICS_STREAM0, 0); - ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 2, sobv); ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); @@ -28493,19 +28497,21 @@ static void test_line_tessellation(void) get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); for (i = 0; i < ARRAY_SIZE(expected_data) / 3 ; ++i) { - data = get_readback_data(&rb, i, 0, 0, 3 * sizeof(*data)); + data = get_readback_data(&rb, i, 0, 0, sizeof(*data)); expected = &expected_data[3 * i + 0]; ok(compare_vec4(data, expected, 1), "Got position {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); - ++data; + data = get_readback_data(&rb, i + 2048 / (2 * sizeof(*data)), 0, 0, 2 * sizeof(*data)); expected = &expected_data[3 * i + 1]; bug_if(is_nvidia_device(context.device)) + todo_if(i != 6) ok(compare_vec4(data, expected, 1), "Got color {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); ++data; expected = &expected_data[3 * i + 2]; + todo ok(compare_vec4(data, expected, 1), "Got primitive ID {%.8e, %.8e, %.8e, %.8e}, expected {%.8e, %.8e, %.8e, %.8e} at %u.\n", data->x, data->y, data->z, data->w, expected->x, expected->y, expected->z, expected->w, i); -- 2.32.0

3 3

[PATCH vkd3d 1/2] vkd3d: Introduce a pipeline state helper function for uav counter cleanup.
by Conor McCarthy July 22, 2021

July 22, 2021

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/state.c | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 4537e319..c60478be 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1190,6 +1190,18 @@ static void d3d12_pipeline_state_destroy_graphics(struct d3d12_pipeline_state *s } } +static void d3d12_pipeline_state_uav_counter_cleanup(struct d3d12_pipeline_state *state, struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + + if (state->vk_set_layout) + VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); + if (state->vk_pipeline_layout) + VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); + + vkd3d_free(state->uav_counters); +} + static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState *iface) { struct d3d12_pipeline_state *state = impl_from_ID3D12PipelineState(iface); @@ -1209,12 +1221,7 @@ static ULONG STDMETHODCALLTYPE d3d12_pipeline_state_Release(ID3D12PipelineState else if (d3d12_pipeline_state_is_compute(state)) VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); - if (state->vk_set_layout) - VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); - if (state->vk_pipeline_layout) - VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); - - vkd3d_free(state->uav_counters); + d3d12_pipeline_state_uav_counter_cleanup(state, device); vkd3d_free(state); @@ -1574,22 +1581,14 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st vk_pipeline_layout, &state->u.compute.vk_pipeline))) { WARN("Failed to create Vulkan compute pipeline, hr %#x.\n", hr); - if (state->vk_set_layout) - VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); - if (state->vk_pipeline_layout) - VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); - vkd3d_free(state->uav_counters); + d3d12_pipeline_state_uav_counter_cleanup(state, device); return hr; } if (FAILED(hr = vkd3d_private_store_init(&state->private_store))) { VK_CALL(vkDestroyPipeline(device->vk_device, state->u.compute.vk_pipeline, NULL)); - if (state->vk_set_layout) - VK_CALL(vkDestroyDescriptorSetLayout(device->vk_device, state->vk_set_layout, NULL)); - if (state->vk_pipeline_layout) - VK_CALL(vkDestroyPipelineLayout(device->vk_device, state->vk_pipeline_layout, NULL)); - vkd3d_free(state->uav_counters); + d3d12_pipeline_state_uav_counter_cleanup(state, device); return hr; } -- 2.32.0

2 2

[PATCH vkd3d v2 1/6] vkd3d-shader: Find bindings for descriptor arrays.
by Conor McCarthy July 22, 2021

July 22, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 22 ++++++++++------------ tests/d3d12.c | 1 + 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index bd231124..6576aca4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2463,9 +2463,10 @@ static void VKD3D_PRINTF_FUNC(3, 4) vkd3d_dxbc_compiler_error(struct vkd3d_dxbc_ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor_binding( struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, const struct vkd3d_shader_register_range *range, enum vkd3d_shader_resource_type resource_type, - bool is_uav_counter) + bool is_uav_counter, unsigned int *binding_base_idx) { const struct vkd3d_shader_interface_info *shader_interface = &compiler->shader_interface; + unsigned int register_last = (range->last == ~0u) ? range->first : range->last; enum vkd3d_shader_descriptor_type descriptor_type; enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; @@ -2519,6 +2520,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor range->first, range->space, current->binding.count); } + *binding_base_idx = current->register_index; return current->binding; } if (shader_interface->uav_counter_count) @@ -2541,18 +2543,11 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor continue; if (current->type != descriptor_type || current->register_space != range->space - || current->register_index != range->first) + || current->register_index > range->first + || current->binding.count <= register_last - current->register_index) continue; - if (current->binding.count != 1) - { - FIXME("Descriptor arrays are not supported.\n"); - vkd3d_dxbc_compiler_error(compiler, VKD3D_SHADER_ERROR_SPV_INVALID_DESCRIPTOR_BINDING, - "Descriptor binding for type %#x, space %u, register %u, " - "shader type %#x has unsupported ‘count’ %u.", - descriptor_type, range->space, range->first, compiler->shader_type, current->binding.count); - } - + *binding_base_idx = current->register_index; return current->binding; } if (shader_interface->binding_count) @@ -2566,6 +2561,7 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor } done: + *binding_base_idx = range->first; binding.set = 0; binding.count = 1; binding.binding = compiler->binding_idx++; @@ -2586,8 +2582,10 @@ static void vkd3d_dxbc_compiler_emit_descriptor_binding_for_reg(struct vkd3d_dxb enum vkd3d_shader_resource_type resource_type, bool is_uav_counter) { struct vkd3d_shader_descriptor_binding binding; + unsigned int binding_base_idx; /* Value not used. */ - binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range, resource_type, is_uav_counter); + binding = vkd3d_dxbc_compiler_get_descriptor_binding(compiler, reg, range, + resource_type, is_uav_counter, &binding_base_idx); vkd3d_dxbc_compiler_emit_descriptor_binding(compiler, variable_id, &binding); } diff --git a/tests/d3d12.c b/tests/d3d12.c index 3892c1db..a84a8e28 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -34103,6 +34103,7 @@ static void test_resource_arrays(void) get_cpu_descriptor_handle(&context, heap, ARRAY_SIZE(input_buffers) + i)); } + todo context.pipeline_state = create_compute_pipeline_state(device, context.root_signature, shader_bytecode(cs_code, sizeof(cs_code))); if (!context.pipeline_state) -- 2.31.1

2 10

[PATCH vkd3d v2] vkd3d-shader: Implement DEQ instruction.
by Conor McCarthy July 22, 2021

July 22, 2021

From: Conor McCarthy <cmccarthy(a)codeweavers.com> Source modifiers and immediate constants are not supported. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d-shader/dxbc.c | 5 +++++ libs/vkd3d-shader/spirv.c | 10 ++++++++-- libs/vkd3d-shader/trace.c | 1 + libs/vkd3d-shader/vkd3d_shader_private.h | 8 ++++++++ tests/d3d12.c | 4 ++-- 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index b81ac976..e57cc413 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -310,6 +310,7 @@ enum vkd3d_sm4_opcode VKD3D_SM5_OP_IMM_ATOMIC_UMAX = 0xbc, VKD3D_SM5_OP_IMM_ATOMIC_UMIN = 0xbd, VKD3D_SM5_OP_SYNC = 0xbe, + VKD3D_SM5_OP_DEQ = 0xc3, VKD3D_SM5_OP_EVAL_SAMPLE_INDEX = 0xcc, VKD3D_SM5_OP_EVAL_CENTROID = 0xcd, VKD3D_SM5_OP_DCL_GS_INSTANCES = 0xce, @@ -1011,6 +1012,7 @@ static void shader_sm5_read_sync(struct vkd3d_shader_instruction *ins, } /* + * d -> VKD3D_DATA_DOUBLE * f -> VKD3D_DATA_FLOAT * i -> VKD3D_DATA_INT * u -> VKD3D_DATA_UINT @@ -1247,6 +1249,7 @@ static const struct vkd3d_sm4_opcode_info opcode_table[] = {VKD3D_SM5_OP_IMM_ATOMIC_UMIN, VKD3DSIH_IMM_ATOMIC_UMIN, "uU", "iu"}, {VKD3D_SM5_OP_SYNC, VKD3DSIH_SYNC, "", "", shader_sm5_read_sync}, + {VKD3D_SM5_OP_DEQ, VKD3DSIH_DEQ, "u", "dd"}, {VKD3D_SM5_OP_EVAL_SAMPLE_INDEX, VKD3DSIH_EVAL_SAMPLE_INDEX, "f", "fi"}, {VKD3D_SM5_OP_EVAL_CENTROID, VKD3DSIH_EVAL_CENTROID, "f", "f"}, {VKD3D_SM5_OP_DCL_GS_INSTANCES, VKD3DSIH_DCL_GS_INSTANCES, "", "", @@ -1338,6 +1341,8 @@ static enum vkd3d_data_type map_data_type(char t) { switch (t) { + case 'd': + return VKD3D_DATA_DOUBLE; case 'f': return VKD3D_DATA_FLOAT; case 'i': diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 65834696..33e664cf 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3308,6 +3308,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co enum vkd3d_shader_component_type component_type; struct vkd3d_shader_register_info reg_info; unsigned int component_count; + unsigned int write_mask32; uint32_t type_id, val_id; if (reg->type == VKD3DSPR_IMMCONST) @@ -3320,14 +3321,17 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); return vkd3d_spirv_build_op_undef(builder, &builder->global_stream, type_id); } + assert(reg_info.component_type != VKD3D_SHADER_COMPONENT_DOUBLE); vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); + write_mask32 = (reg->data_type == VKD3D_DATA_DOUBLE) ? vkd3d_write_mask_32_from_64(write_mask) : write_mask; + /* Intermediate value (no storage class). */ if (reg_info.storage_class == SpvStorageClassMax) { val_id = reg_info.id; } - else if (component_count == 1) + else if (vkd3d_write_mask_component_count(write_mask32) == 1) { return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask, &reg_info); } @@ -3339,7 +3343,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co } val_id = vkd3d_dxbc_compiler_emit_swizzle(compiler, - val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask); + val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask32); if (component_type != reg_info.component_type) { @@ -7066,6 +7070,7 @@ static void vkd3d_dxbc_compiler_emit_comparison_instruction(struct vkd3d_dxbc_co switch (instruction->handler_idx) { + case VKD3DSIH_DEQ: case VKD3DSIH_EQ: op = SpvOpFOrdEqual; break; case VKD3DSIH_GE: op = SpvOpFOrdGreaterThanEqual; break; case VKD3DSIH_IEQ: op = SpvOpIEqual; break; @@ -9249,6 +9254,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_UDIV: vkd3d_dxbc_compiler_emit_udiv(compiler, instruction); break; + case VKD3DSIH_DEQ: case VKD3DSIH_EQ: case VKD3DSIH_GE: case VKD3DSIH_IEQ: diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c index 9f8cf020..d06c18d9 100644 --- a/libs/vkd3d-shader/trace.c +++ b/libs/vkd3d-shader/trace.c @@ -103,6 +103,7 @@ static const char * const shader_opcode_names[] = /* VKD3DSIH_DEFAULT */ "default", /* VKD3DSIH_DEFB */ "defb", /* VKD3DSIH_DEFI */ "defi", + /* VKD3DSIH_DEQ */ "deq", /* VKD3DSIH_DIV */ "div", /* VKD3DSIH_DP2 */ "dp2", /* VKD3DSIH_DP2ADD */ "dp2add", diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h index 033d8f07..f5d22c5c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_private.h +++ b/libs/vkd3d-shader/vkd3d_shader_private.h @@ -190,6 +190,7 @@ enum vkd3d_shader_opcode VKD3DSIH_DEFAULT, VKD3DSIH_DEFB, VKD3DSIH_DEFI, + VKD3DSIH_DEQ, VKD3DSIH_DIV, VKD3DSIH_DP2, VKD3DSIH_DP2ADD, @@ -1032,6 +1033,13 @@ static inline unsigned int vkd3d_write_mask_from_component_count(unsigned int co return (VKD3DSP_WRITEMASK_0 << component_count) - 1; } +static inline unsigned int vkd3d_write_mask_32_from_64(unsigned int write_mask64) +{ + unsigned int write_mask32 = (write_mask64 | (write_mask64 << 1)) + & (VKD3DSP_WRITEMASK_0 | VKD3DSP_WRITEMASK_2); + return write_mask32 | (write_mask32 << 1); +} + static inline unsigned int vkd3d_swizzle_get_component(DWORD swizzle, unsigned int idx) { diff --git a/tests/d3d12.c b/tests/d3d12.c index 55148615..a59f4c8d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -9879,8 +9879,8 @@ static void test_shader_instructions(void) {&ps_dmovc, {.d = {{1.5, 0.0}}}, {.d = {1.5, 0.0}}, true, true}, {&ps_dmodifier, {.d = {{1.5, 0.0}}}, {.d = {1.5f, 2.5f}}, true, true}, {&ps_dmodifier, {.d = {{-1.5, 0.0}}}, {.d = {1.5f, 1.5f}}, true, true}, - {&ps_deq, {.d = {{0.0, 0.0}}}, {{0xffffffff}}, true, true}, - {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true, true}, + {&ps_deq, {.d = {{0.0, 0.0}}}, {{0xffffffff}}, true}, + {&ps_deq, {.d = {{1.0, 0.0}}}, {{0x00000000}}, true}, {&ps_dne, {.d = {{0.0, 0.0}}}, {{0x00000000}}, true, true}, {&ps_dne, {.d = {{1.0, 0.0}}}, {{0xffffffff}}, true, true}, {&ps_dtou, {.d = {{ -NAN}}}, {{ 0, 0 }}, true, true}, -- 2.31.1

2 1

Fwd: TestBot job 94380 results: [PATCH] dbghelp: use a buffer ring instead of single buffer for fetch_buffer
by Eric Pouech July 22, 2021

July 22, 2021

Marvin reports an existing bug in dbghelp tests, not related to this patch there's a fix for that very bug in v2 patch series for dbghelp I've sent last week Alexandre, any progress / comments on those? A+ On Thu, 22 Jul 2021 at 09:59, Marvin <testbot(a)winehq.org> wrote: > VM Status Failures Command > debiant2 failed 2 > debiant2 failed 1 > > You can also see the results at: > https://testbot.winehq.org/JobDetails.pl?Key=94380 > > > === debiant2 (32 bit report) === > > dbghelp: > dbghelp.c:116: Test failed: got wrong name EntryPoint > > === debiant2 (32 bit Chinese:China report) === > > dbghelp: > dbghelp.c:116: Test failed: got wrong name EntryPoint > > === debiant2 (32 bit WoW report) === > > dbghelp: > dbghelp.c:116: Test failed: got wrong name EntryPoint > -- -- Eric Pouech

1 0

[PATCH] dbghelp: Reimplement SymGetLineFromAddrW64
by Alistair Leslie-Hughes July 22, 2021

July 22, 2021

There is an issue with copy_line_W64_from_64 where converting to unicode the string would be truncated. This issue is caused by the use of the pointer return by fetch_buffer, in this cause both arguments passed to MultiByteToWideChar would be the same pointer. SymGetLineFromAddrW64 - Call SymGetLineFromAddr64 - returns il64->Filename = fetch_buffer; - Call copy_line_W64_from_64 - Line->Filename = fetch_buffer; - Calls MultiByteToWideChar (.., il64->Filename, .. Line->Filename..) Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dbghelp/symbol.c | 69 ++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index b2b4d578910..c701a973c2a 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1528,6 +1528,38 @@ BOOL symt_fill_func_line_info(const struct module* module, const struct symt_fun return FALSE; } +static BOOL symt_fill_func_line_info_w(const struct module* module, const struct symt_function* func, + DWORD64 addr, IMAGEHLP_LINEW64* line) +{ + struct line_info* dli = NULL; + BOOL found = FALSE; + int i; + + assert(func->symt.tag == SymTagFunction); + + for (i=vector_length(&func->vlines)-1; i>=0; i--) + { + dli = vector_at(&func->vlines, i); + if (!dli->is_source_file) + { + if (found || dli->u.pc_offset > addr) continue; + line->LineNumber = dli->line_number; + line->Address = dli->u.pc_offset; + line->Key = dli; + found = TRUE; + continue; + } + if (found) + { + WCHAR *dospath = wine_get_dos_file_name(source_get(module, dli->u.source_file)); + wcscpy(line->FileName, dospath); + HeapFree( GetProcessHeap(), 0, dospath ); + return TRUE; + } + } + return FALSE; +} + /*********************************************************************** * SymGetSymNext64 (DBGHELP.@) */ @@ -1587,22 +1619,6 @@ static void copy_line_64_from_32(IMAGEHLP_LINE64* l64, const IMAGEHLP_LINE* l32) l64->Address = l32->Address; } -/****************************************************************** - * copy_line_W64_from_32 (internal) - * - */ -static void copy_line_W64_from_64(struct process* pcs, IMAGEHLP_LINEW64* l64w, const IMAGEHLP_LINE64* l64) -{ - unsigned len; - - l64w->Key = l64->Key; - l64w->LineNumber = l64->LineNumber; - len = MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, NULL, 0); - if ((l64w->FileName = fetch_buffer(pcs, len * sizeof(WCHAR)))) - MultiByteToWideChar(CP_ACP, 0, l64->FileName, -1, l64w->FileName, len); - l64w->Address = l64->Address; -} - /****************************************************************** * copy_line_32_from_64 (internal) * @@ -1666,12 +1682,23 @@ BOOL WINAPI SymGetLineFromAddr64(HANDLE hProcess, DWORD64 dwAddr, BOOL WINAPI SymGetLineFromAddrW64(HANDLE hProcess, DWORD64 dwAddr, PDWORD pdwDisplacement, PIMAGEHLP_LINEW64 Line) { - IMAGEHLP_LINE64 il64; + struct module_pair pair; + struct symt_ht* symt; - il64.SizeOfStruct = sizeof(il64); - if (!SymGetLineFromAddr64(hProcess, dwAddr, pdwDisplacement, &il64)) - return FALSE; - copy_line_W64_from_64(process_find_by_handle(hProcess), Line, &il64); + TRACE("%p %s %p %p\n", hProcess, wine_dbgstr_longlong(dwAddr), pdwDisplacement, Line); + + if (Line->SizeOfStruct < sizeof(*Line)) return FALSE; + + pair.pcs = process_find_by_handle(hProcess); + if (!pair.pcs) return FALSE; + pair.requested = module_find_by_addr(pair.pcs, dwAddr, DMT_UNKNOWN); + if (!module_get_debug(&pair)) return FALSE; + if ((symt = symt_find_nearest(pair.effective, dwAddr)) == NULL) return FALSE; + + if (symt->symt.tag != SymTagFunction) return FALSE; + if (!symt_fill_func_line_info_w(pair.effective, (struct symt_function*)symt, + dwAddr, Line)) return FALSE; + *pdwDisplacement = dwAddr - Line->Address; return TRUE; } -- 2.30.2

2 1

[PATCH] widl: Improve temp file creation and error logging
by Andrew Boyarshin July 22, 2021

July 22, 2021

* Make temp file names more descriptive. * Add a way to identify failing mkstemps by using specialized log messages for each call to mkstemps. Signed-off-by: Andrew Boyarshin <andrew.boyarshin(a)gmail.com> --- First part of the 199498 patch split into 2 separate patches. --- tools/widl/parser.l | 15 +++++++++++---- tools/widl/widl.c | 9 ++++++--- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/tools/widl/parser.l b/tools/widl/parser.l index 4d3b9d683e82..278042520585 100644 --- a/tools/widl/parser.l +++ b/tools/widl/parser.l @@ -536,6 +536,7 @@ int do_import(char *fname) struct imports *import; int ptr = import_stack_ptr; int ret, fd; + char *base_fname = dup_basename(fname, ".idl"); import = first_import; while (import && strcmp(import->name, fname)) @@ -564,9 +565,15 @@ int do_import(char *fname) input_name = path; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); + name = xmalloc( strlen(base_fname) + 15); + + strcpy( name, base_fname ); + strcat( name, "_import.XXXXXX" ); + + free(base_fname); + if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate an import temp name from %s\n", name); temp_name = name; if (!(f = fdopen(fd, "wt"))) @@ -605,9 +612,9 @@ static void switch_to_acf(void) acf_name = NULL; line_number = 1; - name = xstrdup( "widl.XXXXXX" ); + name = xstrdup( "widl_acf.XXXXXX" ); if((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate an ACF temp name from %s\n", name); temp_name = name; if (!(f = fdopen(fd, "wt"))) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index b40745a49f8e..b3b60da00169 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -967,13 +967,16 @@ int main(int argc,char *argv[]) { FILE *output; int fd; - char *name = xmalloc( strlen(header_name) + 8 ); + char *base_input_name = dup_basename(input_name, ".idl"); + char *name = xmalloc(strlen(base_input_name) + 8); - strcpy( name, header_name ); + strcpy( name, base_input_name ); strcat( name, ".XXXXXX" ); + free(base_input_name); + if ((fd = mkstemps( name, 0 )) == -1) - error("Could not generate a temp name from %s\n", name); + error("Could not generate a root temp name from %s\n", name); temp_name = name; if (!(output = fdopen(fd, "wt"))) -- 2.32.0.windows.1

1 0

[PATCH 1/4] cryptnet: Specify half of the remaining timeout for each CRL if CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG was specified.
by Zebediah Figura July 22, 2021

July 22, 2021

Instead of wasting the whole timeout on the first CRL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/cryptnet/cryptnet_main.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/cryptnet/cryptnet_main.c b/dlls/cryptnet/cryptnet_main.c index 06c468bd655..565302957d6 100644 --- a/dlls/cryptnet/cryptnet_main.c +++ b/dlls/cryptnet/cryptnet_main.c @@ -1539,22 +1539,24 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * if (urlArray) { - DWORD j, retrievalFlags = 0, startTime, endTime, timeout; + DWORD j, retrievalFlags = 0, timeout = 0; BOOL ret; ret = CRYPT_GetUrlFromCRLDistPointsExt(value, urlArray, &cbUrlArray, NULL, NULL); if (dwFlags & CERT_VERIFY_CACHE_ONLY_BASED_REVOCATION) retrievalFlags |= CRYPT_CACHE_ONLY_RETRIEVAL; + if ((dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) && pRevPara && pRevPara->cbSize >= RTL_SIZEOF_THROUGH_FIELD(CERT_REVOCATION_PARA, dwUrlRetrievalTimeout)) - { - startTime = GetTickCount(); - endTime = startTime + pRevPara->dwUrlRetrievalTimeout; timeout = pRevPara->dwUrlRetrievalTimeout; - } - else - endTime = timeout = 0; + + /* Yes, this is a weird algorithm, but the documentation for + * CERT_CHAIN_REVOCATION_ACCUMULATIVE_TIMEOUT specifies this, and + * tests seem to bear it out for CertVerifyRevocation() as well. */ + if (dwFlags & CERT_VERIFY_REV_ACCUMULATIVE_TIMEOUT_FLAG) + timeout /= 2; + if (!ret) error = GetLastError(); /* continue looping if one was offline; break if revoked or timed out */ @@ -1568,19 +1570,17 @@ static DWORD verify_cert_revocation_from_dist_points_ext(const CRYPT_DATA_BLOB * if (ret) { error = verify_cert_revocation_with_crl_online(cert, crl, pTime, pRevStatus); - if (!error && timeout) - { - DWORD time = GetTickCount(); - - if ((int)(endTime - time) <= 0) - error = ERROR_TIMEOUT; - else - timeout = endTime - time; - } CertFreeCRLContext(crl); } else + { + /* We don't check the current time here. This may result in + * less accurate timeouts, but this too seems to be true of + * Windows. */ + if (GetLastError() == ERROR_TIMEOUT) + timeout /= 2; error = CRYPT_E_REVOCATION_OFFLINE; + } } CryptMemFree(urlArray); } -- 2.30.2

1 3

[PATCH 1/6] ws2_32/tests: Add more tests for bind() and getsockname().
by Zebediah Figura July 22, 2021

July 22, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 149 +++++++++++++++++++++++++++++++++------ dlls/ws2_32/tests/sock.c | 84 ++++++++++++++++++++++ 2 files changed, 211 insertions(+), 22 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index 4b8796157aa..32daab0beab 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -1414,9 +1414,14 @@ static void test_get_events(void) static void test_bind(void) { + const struct sockaddr_in6 bind_addr6 = {.sin6_family = AF_INET6, .sin6_addr.s6_words = {0, 0, 0, 0, 0, 0, 0, htons(1)}}; + const struct sockaddr_in6 invalid_addr6 = {.sin6_family = AF_INET6, .sin6_addr.s6_words = {htons(0x0100)}}; const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; - struct afd_bind_params params = {0}; + static const size_t params6_size = offsetof(struct afd_bind_params, addr) + sizeof(struct sockaddr_in6); + static const size_t params4_size = offsetof(struct afd_bind_params, addr) + sizeof(struct sockaddr_in); + struct afd_bind_params *params = malloc(params6_size); + struct sockaddr_in6 addr6, addr6_2; struct sockaddr_in addr, addr2; struct hostent *host; IO_STATUS_BLOCK io; @@ -1427,47 +1432,48 @@ static void test_bind(void) event = CreateEventW(NULL, TRUE, FALSE, NULL); memset(&addr, 0xcc, sizeof(addr)); + memset(params, 0, params6_size); s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - params.addr.sa_family = 0xdead; + params->addr.sa_family = 0xdead; ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params) - 1, &addr, sizeof(addr)); + params, params4_size - 1, &addr, sizeof(addr)); ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, offsetof(struct afd_bind_params, addr.sa_data), &addr, sizeof(addr)); + params, offsetof(struct afd_bind_params, addr.sa_data), &addr, sizeof(addr)); ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, offsetof(struct afd_bind_params, addr.sa_data) - 1, &addr, sizeof(addr)); + params, offsetof(struct afd_bind_params, addr.sa_data) - 1, &addr, sizeof(addr)); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - memcpy(&params.addr, &invalid_addr, sizeof(invalid_addr)); + memcpy(&params->addr, &invalid_addr, sizeof(invalid_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); ok(io.Status == STATUS_INVALID_ADDRESS_COMPONENT, "got %#x\n", io.Status); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr) - 1); + params, params4_size, &addr, sizeof(addr) - 1); ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); memset(&io, 0xcc, sizeof(io)); memset(&addr, 0xcc, sizeof(addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); @@ -1485,16 +1491,16 @@ static void test_bind(void) ok(!memcmp(&addr, &addr2, sizeof(addr)), "addresses didn't match\n"); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); s2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - memcpy(&params.addr, &addr2, sizeof(addr2)); + memcpy(&params->addr, &addr2, sizeof(addr2)); memset(&io, 0xcc, sizeof(io)); memset(&addr, 0xcc, sizeof(addr)); ret = NtDeviceIoControlFile((HANDLE)s2, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); @@ -1508,11 +1514,11 @@ static void test_bind(void) s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - memcpy(&params.addr, &bind_addr, sizeof(bind_addr)); + memcpy(&params->addr, &bind_addr, sizeof(bind_addr)); memset(&io, 0xcc, sizeof(io)); memset(&addr, 0xcc, sizeof(addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); @@ -1539,11 +1545,11 @@ static void test_bind(void) s = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); - ((struct sockaddr_in *)&params.addr)->sin_addr.s_addr = in_addr; + ((struct sockaddr_in *)&params->addr)->sin_addr.s_addr = in_addr; memset(&io, 0xcc, sizeof(io)); memset(&addr, 0xcc, sizeof(addr)); ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, - &params, sizeof(params), &addr, sizeof(addr)); + params, params4_size, &addr, sizeof(addr)); todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 0); ok(!ret, "got %#x\n", ret); @@ -1563,7 +1569,106 @@ static void test_bind(void) } } + /* test IPv6 */ + + s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + ok(s != -1, "failed to create IPv6 socket\n"); + + params->addr.sa_family = 0xdead; + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size - 1, &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, offsetof(struct afd_bind_params, addr) + sizeof(struct sockaddr_in6_old), &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, offsetof(struct afd_bind_params, addr.sa_data), &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, offsetof(struct afd_bind_params, addr.sa_data) - 1, &addr6, sizeof(addr6)); + ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + memcpy(&params->addr, &invalid_addr6, sizeof(invalid_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); + ret = WaitForSingleObject(event, 0); + todo_wine ok(!ret, "got %#x\n", ret); + todo_wine ok(io.Status == STATUS_INVALID_ADDRESS_COMPONENT, "got %#x\n", io.Status); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6) - 1); + todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size - 1, &addr6, sizeof(addr6) - 1); + todo_wine ok(ret == STATUS_INVALID_ADDRESS, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(struct sockaddr_in6_old)); + todo_wine ok(ret == STATUS_INVALID_PARAMETER, "got %#x\n", ret); + + memcpy(&params->addr, &bind_addr6, sizeof(bind_addr6)); + memset(&io, 0xcc, sizeof(io)); + memset(&addr6, 0xcc, sizeof(addr6)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); + ret = WaitForSingleObject(event, 0); + todo_wine + { + ok(!ret, "got %#x\n", ret); + ok(!io.Status, "got %#x\n", io.Status); + ok(io.Information == sizeof(addr6), "got %#Ix\n", io.Information); + ok(addr6.sin6_family == AF_INET6, "got family %u\n", addr6.sin6_family); + ok(!memcmp(&addr6.sin6_addr, &bind_addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); + ok(!addr6.sin6_flowinfo, "got flow info %#x\n", addr6.sin6_flowinfo); + } + ok(addr6.sin6_port, "expected nonzero port\n"); + + /* getsockname() returns EINVAL here. Possibly the socket name is cached (in shared memory?) */ + memset(&addr6_2, 0xcc, sizeof(addr6_2)); + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, + IOCTL_AFD_GETSOCKNAME, NULL, 0, &addr6_2, sizeof(addr6_2)); + ok(!ret, "got %#x\n", ret); + todo_wine ok(!memcmp(&addr6, &addr6_2, sizeof(addr6)), "addresses didn't match\n"); + + ret = NtDeviceIoControlFile((HANDLE)s, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + ok(ret == STATUS_ADDRESS_ALREADY_ASSOCIATED, "got %#x\n", ret); + + s2 = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); + + memcpy(&params->addr, &addr6_2, sizeof(addr6_2)); + memset(&io, 0xcc, sizeof(io)); + memset(&addr6, 0xcc, sizeof(addr6)); + ret = NtDeviceIoControlFile((HANDLE)s2, event, NULL, NULL, &io, IOCTL_AFD_BIND, + params, params6_size, &addr6, sizeof(addr6)); + todo_wine ok(ret == STATUS_PENDING, "got %#x\n", ret); + ret = WaitForSingleObject(event, 0); + ok(!ret, "got %#x\n", ret); + ok(io.Status == STATUS_SHARING_VIOLATION, "got %#x\n", io.Status); + ok(!io.Information, "got %#Ix\n", io.Information); + + closesocket(s2); + closesocket(s); + CloseHandle(event); + free(params); } static void test_getsockname(void) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index e7bd3b8fe15..f5c5acf161e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -26,6 +26,7 @@ #include <winsock2.h> #include <windows.h> #include <winternl.h> +#include <iphlpapi.h> #include <ws2tcpip.h> #include <wsipx.h> #include <wsnwlink.h> @@ -3779,9 +3780,13 @@ static void test_getsockname(void) ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); WSASetLastError(0xdeadbeef); + memset(&sa_get, 0, sizeof(sa_get)); ret = getsockname(sock, (struct sockaddr *) &sa_get, &sa_get_len); ok(!ret, "got %d\n", ret); ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", WSAGetLastError()); + ok(sa_get.sin_family == AF_INET, "got family %#x\n", sa_get.sin_family); + ok(sa_get.sin_port != 0, "got zero port\n"); + ok(sa_get.sin_addr.s_addr == INADDR_ANY, "got addr %08x\n", sa_get.sin_addr.s_addr); ret = memcmp(sa_get.sin_zero, null_padding, 8); ok(ret == 0, "getsockname did not zero the sockaddr_in structure\n"); @@ -10566,6 +10571,8 @@ static void test_bind(void) { const struct sockaddr_in invalid_addr = {.sin_family = AF_INET, .sin_addr.s_addr = inet_addr("192.0.2.0")}; const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; + IP_ADAPTER_ADDRESSES *adapters = NULL, *adapter; + ULONG ip_addrs_size = 0; struct sockaddr addr; SOCKET s, s2; int ret, len; @@ -10625,6 +10632,83 @@ static void test_bind(void) ok(!WSAGetLastError() || WSAGetLastError() == 0xdeadbeef /* win <7 */, "got error %u\n", WSAGetLastError()); closesocket(s); + + ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &ip_addrs_size); + ok(ret == ERROR_BUFFER_OVERFLOW, "got error %u\n", ret); + adapters = malloc(ip_addrs_size); + ret = GetAdaptersAddresses(AF_UNSPEC, 0, NULL, adapters, &ip_addrs_size); + ok(!ret, "got error %u\n", ret); + + for (adapter = adapters; adapter != NULL; adapter = adapter->Next) + { + const IP_ADAPTER_UNICAST_ADDRESS *unicast_addr; + + for (unicast_addr = adapter->FirstUnicastAddress; unicast_addr != NULL; unicast_addr = unicast_addr->Next) + { + short family = unicast_addr->Address.lpSockaddr->sa_family; + + s = socket(family, SOCK_STREAM, IPPROTO_TCP); + ok(s != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = bind(s, unicast_addr->Address.lpSockaddr, unicast_addr->Address.iSockaddrLength); + ok(!ret, "got error %u\n", WSAGetLastError()); + + closesocket(s); + + if (family == AF_INET6) + { + struct sockaddr_in6 addr6, ret_addr6; + + memcpy(&addr6, unicast_addr->Address.lpSockaddr, sizeof(addr6)); + + ok(unicast_addr->Address.iSockaddrLength == sizeof(struct sockaddr_in6), + "got unexpected length %u\n", unicast_addr->Address.iSockaddrLength); + + s = socket(family, SOCK_STREAM, IPPROTO_TCP); + ok(s != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = bind(s, unicast_addr->Address.lpSockaddr, sizeof(struct sockaddr_in6_old)); + todo_wine_if (!addr6.sin6_scope_id) + { + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + } + + addr6.sin6_scope_id = 0xabacab; + ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); + + addr6.sin6_scope_id = 0; + ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); + todo_wine ok(!ret, "got error %u\n", WSAGetLastError()); + + memcpy(&addr6, unicast_addr->Address.lpSockaddr, sizeof(addr6)); + + len = sizeof(struct sockaddr_in6_old); + ret = getsockname(s, (struct sockaddr *)&ret_addr6, &len); + ok(ret == -1, "expected failure\n"); + todo_wine_if (addr6.sin6_scope_id) + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + + len = sizeof(ret_addr6); + memset(&ret_addr6, 0, sizeof(ret_addr6)); + ret = getsockname(s, (struct sockaddr *)&ret_addr6, &len); + todo_wine_if (addr6.sin6_scope_id) + { + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(ret_addr6.sin6_family == AF_INET6, "got family %u\n", ret_addr6.sin6_family); + ok(ret_addr6.sin6_port != 0, "expected nonzero port\n"); + ok(!memcmp(&ret_addr6.sin6_addr, &addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); + ok(ret_addr6.sin6_scope_id == addr6.sin6_scope_id, "got scope %u\n", ret_addr6.sin6_scope_id); + } + + closesocket(s); + } + } + } + + free(adapters); } /* Test calling methods on a socket which is currently connecting. */ -- 2.30.2

2 7