wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Rémi Bernon : vkd3d: Do not report a root signature version higher than requested.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: vkd3d Branch: master Commit: 4576236199769eacadc6de49e03d05df999f9181 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=4576236199769eacadc6de4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Oct 31 16:55:03 2019 +0330 vkd3d: Do not report a root signature version higher than requested. This fixes Shadow of the Tomb Raider crashing because of NULL root signatures being passed since c002aee119b638d30eeb7cdc91099449ccafeafc. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/device.c | 3 ++- tests/d3d12.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4d6f7c9..13ebc70 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2665,7 +2665,8 @@ static HRESULT STDMETHODCALLTYPE d3d12_device_CheckFeatureSupport(ID3D12Device * return E_INVALIDARG; } - data->HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + TRACE("Root signature requested %#x.\n", data->HighestVersion); + data->HighestVersion = min(data->HighestVersion, D3D_ROOT_SIGNATURE_VERSION_1_1); TRACE("Root signature version %#x.\n", data->HighestVersion); return S_OK; diff --git a/tests/d3d12.c b/tests/d3d12.c index 6e0617d..858cf99 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -1039,6 +1039,7 @@ static void test_check_feature_support(void) { D3D12_FEATURE_DATA_GPU_VIRTUAL_ADDRESS_SUPPORT gpu_virtual_address; D3D12_FEATURE_DATA_FEATURE_LEVELS feature_levels; + D3D12_FEATURE_DATA_ROOT_SIGNATURE root_signature; D3D_FEATURE_LEVEL max_supported_feature_level; D3D12_FEATURE_DATA_ARCHITECTURE architecture; D3D12_FEATURE_DATA_FORMAT_INFO format_info; @@ -1229,6 +1230,21 @@ static void test_check_feature_support(void) trace("GPU virtual address bits per process: %u.\n", gpu_virtual_address.MaxGPUVirtualAddressBitsPerProcess); + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_0; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Failed to get root signature feature support, hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + + root_signature.HighestVersion = D3D_ROOT_SIGNATURE_VERSION_1_1; + hr = ID3D12Device_CheckFeatureSupport(device, D3D12_FEATURE_ROOT_SIGNATURE, + &root_signature, sizeof(root_signature)); + ok(hr == S_OK, "Failed to get root signature feature support, hr %#x.\n", hr); + ok(root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_0 + || root_signature.HighestVersion == D3D_ROOT_SIGNATURE_VERSION_1_1, + "Got unexpected root signature feature version %#x.\n", root_signature.HighestVersion); + refcount = ID3D12Device_Release(device); ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); }

1 0

Hans-Kristian Arntzen : tests: Test ClearUnorderedAccessView() with placed resources.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: vkd3d Branch: master Commit: 1b66138006c25ae921bedd868dc05fdf98c52c3f URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1b66138006c25ae921bedd8… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Thu Oct 31 16:55:02 2019 +0330 tests: Test ClearUnorderedAccessView() with placed resources. Catches certain implementation issues which committed resources do not. Signed-off-by: Hans-Kristian Arntzen <post(a)arntzen-software.no> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 14 +++++++++++++- tests/d3d12_test_utils.h | 27 +++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 999e22c..6e0617d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4688,11 +4688,14 @@ static void test_clear_unordered_access_view(void) struct test_context context; struct resource_readback rb; ID3D12CommandQueue *queue; + D3D12_HEAP_DESC heap_desc; ID3D12Resource *buffer; ID3D12Device *device; UINT clear_value[4]; unsigned int i, j; + ID3D12Heap *heap; D3D12_BOX box; + HRESULT hr; #define BUFFER_SIZE (1024 * 1024) static const struct @@ -4749,11 +4752,19 @@ static void test_clear_unordered_access_view(void) cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2); gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 2); + heap_desc.SizeInBytes = 2 * BUFFER_SIZE; + memset(&heap_desc.Properties, 0, sizeof(heap_desc.Properties)); + heap_desc.Properties.Type = D3D12_HEAP_TYPE_DEFAULT; + heap_desc.Alignment = D3D12_DEFAULT_RESOURCE_PLACEMENT_ALIGNMENT; + heap_desc.Flags = D3D12_HEAP_FLAG_ALLOW_ONLY_BUFFERS; + hr = ID3D12Device_CreateHeap(device, &heap_desc, &IID_ID3D12Heap, (void **)&heap); + ok(hr == S_OK, "Failed to create heap, hr %#x.\n", hr); + for (i = 0; i < ARRAY_SIZE(tests); ++i) { vkd3d_test_set_context("Test %u", i); - buffer = create_default_buffer(device, BUFFER_SIZE, + buffer = create_placed_buffer(device, heap, BUFFER_SIZE, BUFFER_SIZE, D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); for (j = 0; j < ARRAY_SIZE(clear_value); ++j) @@ -4810,6 +4821,7 @@ static void test_clear_unordered_access_view(void) ID3D12DescriptorHeap_Release(cpu_heap); ID3D12DescriptorHeap_Release(gpu_heap); + ID3D12Heap_Release(heap); destroy_test_context(&context); #undef BUFFER_SIZE } diff --git a/tests/d3d12_test_utils.h b/tests/d3d12_test_utils.h index ec6f839..024cf87 100644 --- a/tests/d3d12_test_utils.h +++ b/tests/d3d12_test_utils.h @@ -111,6 +111,33 @@ static inline void queue_wait_(unsigned int line, ID3D12CommandQueue *queue, ID3 ok_(line)(hr == S_OK, "Failed to submit wait operation to queue, hr %#x.\n", hr); } +#define create_placed_buffer(a, b, c, d, e, f) create_placed_buffer_(__LINE__, a, b, c, d, e, f) +static inline ID3D12Resource *create_placed_buffer_(unsigned int line, ID3D12Device *device, + ID3D12Heap *heap, size_t offset, size_t size, D3D12_RESOURCE_FLAGS resource_flags, + D3D12_RESOURCE_STATES initial_resource_state) +{ + D3D12_RESOURCE_DESC resource_desc; + ID3D12Resource *buffer; + HRESULT hr; + + resource_desc.Dimension = D3D12_RESOURCE_DIMENSION_BUFFER; + resource_desc.Alignment = 0; + resource_desc.Width = size; + resource_desc.Height = 1; + resource_desc.DepthOrArraySize = 1; + resource_desc.MipLevels = 1; + resource_desc.Format = DXGI_FORMAT_UNKNOWN; + resource_desc.SampleDesc.Count = 1; + resource_desc.SampleDesc.Quality = 0; + resource_desc.Layout = D3D12_TEXTURE_LAYOUT_ROW_MAJOR; + resource_desc.Flags = resource_flags; + + hr = ID3D12Device_CreatePlacedResource(device, heap, offset, &resource_desc, + initial_resource_state, NULL, &IID_ID3D12Resource, (void **)&buffer); + assert_that_(line)(SUCCEEDED(hr), "Failed to create buffer, hr %#x.\n", hr); + return buffer; +} + #define create_buffer(a, b, c, d, e) create_buffer_(__LINE__, a, b, c, d, e) static ID3D12Resource *create_buffer_(unsigned int line, ID3D12Device *device, D3D12_HEAP_TYPE heap_type, size_t size, D3D12_RESOURCE_FLAGS resource_flags,

1 0

Philip Rebohle : vkd3d-shader: Support vicp inputs for hull shader fork/join phases.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: vkd3d Branch: master Commit: 6c65f1b8142b1a6a86e314ffab81f4c0e5ce635a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=6c65f1b8142b1a6a86e314f… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed Oct 16 21:55:45 2019 +0200 vkd3d-shader: Support vicp inputs for hull shader fork/join phases. This case needs special care since both VKD3DSPR_INPUT in the control point phase and VKD3DSPR_INCONTROLPOINT in fork/join phases refer to the same set of input variables, and we should not declare input variables with the same location twice. Encountered in Shadow of the Tomb Raider. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 13c6fd2..a949e4a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3917,6 +3917,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi enum vkd3d_component_type component_type; uint32_t val_id, input_id, var_id; struct vkd3d_symbol reg_symbol; + struct vkd3d_symbol tmp_symbol; SpvStorageClass storage_class; struct rb_entry *entry = NULL; bool use_private_var = false; @@ -4001,19 +4002,39 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi } else { - unsigned int location = reg_idx; + input_id = 0; - if (reg->type == VKD3DSPR_PATCHCONST) - location += compiler->input_signature->element_count; + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL && reg->type == VKD3DSPR_INCONTROLPOINT) + { + tmp_symbol = reg_symbol; + tmp_symbol.key.reg.type = VKD3DSPR_INPUT; - input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, - storage_class, component_type, input_component_count, array_size); - vkd3d_spirv_add_iface_variable(builder, input_id); - vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, location); - if (component_idx) - vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); + if ((entry = rb_get(&compiler->symbol_table, &tmp_symbol))) + { + tmp_symbol = *RB_ENTRY_VALUE(entry, const struct vkd3d_symbol, entry); + tmp_symbol.key.reg.type = VKD3DSPR_INCONTROLPOINT; + vkd3d_dxbc_compiler_put_symbol(compiler, &tmp_symbol); + + input_id = tmp_symbol.id; + } + } + + if (!entry) + { + unsigned int location = reg_idx; - vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, interpolation_mode); + if (reg->type == VKD3DSPR_PATCHCONST) + location += compiler->input_signature->element_count; + + input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + storage_class, component_type, input_component_count, array_size); + vkd3d_spirv_add_iface_variable(builder, input_id); + vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, location); + if (component_idx) + vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); + + vkd3d_dxbc_compiler_emit_interpolation_decorations(compiler, input_id, interpolation_mode); + } } if (reg->type == VKD3DSPR_PATCHCONST) @@ -4122,6 +4143,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { case VKD3DSPR_INPUT: + case VKD3DSPR_INCONTROLPOINT: vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE, VKD3DSIM_NONE); return; case VKD3DSPR_PRIMID:

1 0

Philip Rebohle : tests: Test bindings after changing root signature.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: vkd3d Branch: master Commit: 1707042e624f9598d3bf3b87356f0d32be892f00 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1707042e624f9598d3bf3b8… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed Oct 30 19:34:12 2019 +0100 tests: Test bindings after changing root signature. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 2ec74a1..999e22c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -16496,6 +16496,36 @@ static void test_update_descriptor_tables_after_root_signature_change(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + 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); + + ID3D12GraphicsCommandList_SetDescriptorHeaps(command_list, ARRAY_SIZE(heaps), heaps); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, false, NULL); + ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state2); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, root_signature2); + + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 0, + get_gpu_descriptor_handle(&context, heap, 0)); + ID3D12GraphicsCommandList_SetGraphicsRootDescriptorTable(command_list, 1, + ID3D12DescriptorHeap_GetGPUDescriptorHandleForHeapStart(sampler_heap)); + + ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, root_signature); + + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + ID3D12PipelineState_Release(pipeline_state); ID3D12PipelineState_Release(pipeline_state2); ID3D12RootSignature_Release(root_signature);

1 0

Philip Rebohle : vkd3d: Keep active bindings after changing root signature.
by Alexandre Julliard 31 Oct '19

31 Oct '19

Module: vkd3d Branch: master Commit: 8cb42d6971ad59f74ceba15096283c7c4126b146 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=8cb42d6971ad59f74ceba15… Author: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Date: Wed Oct 30 19:34:11 2019 +0100 vkd3d: Keep active bindings after changing root signature. Shadow of the Tomb Raider does not re-bind all descriptor tables after setting a new root signature if tessellation is enabled, which causes some descriptors to be left undefined. Signed-off-by: Philip Rebohle <philip.rebohle(a)tu-dortmund.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 10 ++++------ libs/vkd3d/state.c | 8 ++++++++ libs/vkd3d/vkd3d_private.h | 3 +++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index c401349..0532ec0 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2539,8 +2539,8 @@ static void d3d12_command_list_prepare_descriptors(struct d3d12_command_list *li root_signature->vk_set_layout); bindings->in_use = false; - bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask; - bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask; + bindings->descriptor_table_dirty_mask |= bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask; + bindings->push_descriptor_dirty_mask |= bindings->push_descriptor_active_mask & root_signature->push_descriptor_mask; } static bool vk_write_descriptor_set_from_d3d12_desc(VkWriteDescriptorSet *vk_descriptor_write, @@ -4030,10 +4030,8 @@ static void d3d12_command_list_set_root_signature(struct d3d12_command_list *lis bindings->root_signature = root_signature; bindings->descriptor_set = VK_NULL_HANDLE; - bindings->descriptor_table_dirty_mask = 0; - bindings->descriptor_table_active_mask = 0; - bindings->push_descriptor_dirty_mask = 0; - bindings->push_descriptor_active_mask = 0; + bindings->descriptor_table_dirty_mask = bindings->descriptor_table_active_mask & root_signature->descriptor_table_mask; + bindings->push_descriptor_dirty_mask = bindings->push_descriptor_active_mask & root_signature->push_descriptor_mask; } static void STDMETHODCALLTYPE d3d12_command_list_SetComputeRootSignature(ID3D12GraphicsCommandList1 *iface, diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 9dc5cff..a321fa4 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -600,12 +600,16 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo unsigned int i, j, k, range_count; uint32_t vk_binding; + root_signature->descriptor_table_mask = 0; + for (i = 0; i < desc->NumParameters; ++i) { const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; if (p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_DESCRIPTOR_TABLE) continue; + root_signature->descriptor_table_mask |= 1ull << i; + table = &root_signature->parameters[i].u.descriptor_table; range_count = p->u.DescriptorTable.NumDescriptorRanges; @@ -666,6 +670,8 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign VkDescriptorSetLayoutBinding *cur_binding = context->current_binding; unsigned int i; + root_signature->push_descriptor_mask = 0; + for (i = 0; i < desc->NumParameters; ++i) { const D3D12_ROOT_PARAMETER *p = &desc->pParameters[i]; @@ -674,6 +680,8 @@ static HRESULT d3d12_root_signature_init_root_descriptors(struct d3d12_root_sign && p->ParameterType != D3D12_ROOT_PARAMETER_TYPE_UAV) continue; + root_signature->push_descriptor_mask |= 1u << i; + if (p->u.Descriptor.RegisterSpace) { FIXME("Unhandled register space %u for parameter %u.\n", p->u.Descriptor.RegisterSpace, i); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 1cb40f2..2d62fda 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -678,6 +678,9 @@ struct d3d12_root_signature unsigned int parameter_count; uint32_t main_set; + uint64_t descriptor_table_mask; + uint32_t push_descriptor_mask; + D3D12_ROOT_SIGNATURE_FLAGS flags; unsigned int descriptor_count;

1 0

Nikolay Sivov : po: Fix Russian strings for page setup dialog.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 931408698859360e56cd85d532b142e789a6c274 URL: https://source.winehq.org/git/wine.git/?a=commit;h=931408698859360e56cd85d5… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 30 21:10:12 2019 +0300 po: Fix Russian strings for page setup dialog. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index 9dabdc22c5..cd03d2d5e7 100644 --- a/po/ru.po +++ b/po/ru.po @@ -803,15 +803,15 @@ msgstr "&Слева:" #: comdlg32.rc:447 notepad.rc:112 msgid "&Right:" -msgstr "&Правое:" +msgstr "Сп&рава:" #: comdlg32.rc:449 msgid "T&op:" -msgstr "Спр&ава:" +msgstr "Св&ерху:" #: comdlg32.rc:451 notepad.rc:114 msgid "&Bottom:" -msgstr "&Нижнее:" +msgstr "С&низу:" #: comdlg32.rc:455 msgid "P&rinter..."

1 0

Piotr Caban : ntdll: Use SIZE_T to store passed buffer size in sprintf.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 92731ccbbe7681b10c40cd69d2cbb12c95ca211f URL: https://source.winehq.org/git/wine.git/?a=commit;h=92731ccbbe7681b10c40cd69… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 30 12:16:20 2019 +0100 ntdll: Use SIZE_T to store passed buffer size in sprintf. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/printf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/printf.c b/dlls/ntdll/printf.c index 018f774dc0..4176f945f5 100644 --- a/dlls/ntdll/printf.c +++ b/dlls/ntdll/printf.c @@ -43,8 +43,8 @@ static const SIZE_T size_max = ~(SIZE_T)0 >> 1; typedef struct pf_output_t { - int used; - int len; + SIZE_T used; + SIZE_T len; BOOL unicode; union { LPWSTR W; @@ -68,7 +68,7 @@ typedef struct pf_flags_t */ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) { - int space = out->len - out->used; + SIZE_T space = out->len - out->used; if( len < 0 ) len = strlenW( str ); @@ -122,7 +122,7 @@ static inline int pf_output_stringW( pf_output *out, LPCWSTR str, int len ) static inline int pf_output_stringA( pf_output *out, LPCSTR str, int len ) { - int space = out->len - out->used; + SIZE_T space = out->len - out->used; if( len < 0 ) len = strlen( str );

1 0

Alexandre Julliard : rpcrt4/tests: Increase some timeouts.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 822e2773d45544e3972c3d0e9dd60a6598d7a84f URL: https://source.winehq.org/git/wine.git/?a=commit;h=822e2773d45544e3972c3d0e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 22:32:54 2019 +0100 rpcrt4/tests: Increase some timeouts. These are too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/cstub.c | 2 +- dlls/rpcrt4/tests/server.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/tests/cstub.c b/dlls/rpcrt4/tests/cstub.c index 6b99e82408..e0f519fa1d 100644 --- a/dlls/rpcrt4/tests/cstub.c +++ b/dlls/rpcrt4/tests/cstub.c @@ -1383,7 +1383,7 @@ static void test_delegated_methods(void) ready_event = CreateEventA(NULL, TRUE, FALSE, "wine_cstub_test_server_ready"); process = create_process("server"); - ok(!WaitForSingleObject(ready_event, 1000), "wait failed\n"); + ok(!WaitForSingleObject(ready_event, 5000), "wait failed\n"); hr = NdrDllGetClassObject(&CLSID_test_ps, &IID_IPSFactoryBuffer, (void **)&ps, &aProxyFileList, &CLSID_test_ps, &gPFactory); diff --git a/dlls/rpcrt4/tests/server.c b/dlls/rpcrt4/tests/server.c index e6555fa18b..a07e2f1787 100644 --- a/dlls/rpcrt4/tests/server.c +++ b/dlls/rpcrt4/tests/server.c @@ -2290,7 +2290,7 @@ static void run_server(HANDLE ready_event) ret = SetEvent(ready_event); ok(ret, "SetEvent failed: %u\n", GetLastError()); - ret = WaitForSingleObject(stop_event, 1000); + ret = WaitForSingleObject(stop_event, 5000); ok(WAIT_OBJECT_0 == ret, "WaitForSingleObject\n"); status = RpcMgmtWaitServerListen();

1 0

Alexandre Julliard : psapi/tests: Increase some timeouts.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: 3f61f905ba3f12e83acfb8b82c1da7f8ac4d5227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f61f905ba3f12e83acfb8b8… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 22:35:35 2019 +0100 psapi/tests: Increase some timeouts. These are too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/psapi/tests/psapi_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/psapi/tests/psapi_main.c b/dlls/psapi/tests/psapi_main.c index b02ceed5ec..9799d2ffae 100644 --- a/dlls/psapi/tests/psapi_main.c +++ b/dlls/psapi/tests/psapi_main.c @@ -125,7 +125,7 @@ static void test_EnumProcessModules(void) ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed: %u\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 1000); + ret = WaitForInputIdle(pi.hProcess, 5000); ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef); @@ -146,7 +146,7 @@ static void test_EnumProcessModules(void) ret = CreateProcessA(NULL, buffer, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi); ok(ret, "CreateProcess failed: %u\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 1000); + ret = WaitForInputIdle(pi.hProcess, 5000); ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef); @@ -180,7 +180,7 @@ todo_wine pWow64RevertWow64FsRedirection(cookie); ok(ret, "CreateProcess failed: %u\n", GetLastError()); - ret = WaitForInputIdle(pi.hProcess, 1000); + ret = WaitForInputIdle(pi.hProcess, 5000); ok(!ret, "wait timed out\n"); SetLastError(0xdeadbeef);

1 0

Alexandre Julliard : ole32/tests: Increase a timeout.
by Alexandre Julliard 30 Oct '19

30 Oct '19

Module: wine Branch: master Commit: bb22b55e6db927deff4aecf4c65ed06801f8b073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb22b55e6db927deff4aecf4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 30 22:33:15 2019 +0100 ole32/tests: Increase a timeout. It's too short when running under QEMU. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/tests/compobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ole32/tests/compobj.c b/dlls/ole32/tests/compobj.c index 6361f5f0da..69a38d48b2 100644 --- a/dlls/ole32/tests/compobj.c +++ b/dlls/ole32/tests/compobj.c @@ -3031,7 +3031,7 @@ static void test_CoWaitForMultipleHandles(void) /* test message pumping when CoWaitForMultipleHandles is called from non main apartment thread */ thread = CreateThread(NULL, 0, test_CoWaitForMultipleHandles_thread, handles, 0, &tid); - index = WaitForSingleObject(thread, 500); + index = WaitForSingleObject(thread, 5000); ok(index == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); CloseHandle(thread);

1 0

← Newer
1
2
3
4
5
6
7
8
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019