wine-commits

wine-commits@winehq.org

1 participants
187054 discussions

Giovanni Mascellani : vkd3d: Document how to install "Graphics Tools" to use the Agility SDK.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: 7eb63a7c0d23a83bbdfcfa5ed83b943437051138 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7eb63a7c0d23a83bbdfcfa5ed83b9… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 17 15:14:26 2024 +0200 vkd3d: Document how to install "Graphics Tools" to use the Agility SDK. This is a required step, otherwise the debug layer will not work. --- README | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README b/README index 86a2bf2e..f6ded1cd 100644 --- a/README +++ b/README @@ -134,6 +134,10 @@ these steps: [1] https://devblogs.microsoft.com/directx/directx12agility/ + * You also need to enable the "Graphics Tools" optional feature in Windows. + Open the "Settings" applications, then look for "Apps", "Optional features", + "View features" and install "Graphics Tools". + * Configure vkd3d with something like: 'CROSSCC64="x86_64-w64-mingw32-gcc -DVKD3D_AGILITY_SDK_VERSION=<version>"', as well as the equivalent CROSSCC32 variable for the 32-bit

1 0

Giovanni Mascellani : tests: Terminate the Agility SDK path with a slash.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: 7e557420b17cbf8b46153711813e2e872562ec58 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/7e557420b17cbf8b46153711813e2… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 17 14:55:07 2024 +0200 tests: Terminate the Agility SDK path with a slash. That's what the documentation recommends. It used to work for me without the slash, but maybe they changed something in recent versions. --- README | 2 +- tests/d3d12_crosstest.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README b/README index a3fcedde..86a2bf2e 100644 --- a/README +++ b/README @@ -153,4 +153,4 @@ these steps: * It's also possible to use '-DVKD3D_AGILITY_SDK_PATH=/path/to/sdk/' to specify the directory to load the Agility SDK DLLs from at runtime. If relative, the path is intended to be relative to the executable - path. If unspecified the path defaults to '.'. + path. If unspecified the path defaults to './'. diff --git a/tests/d3d12_crosstest.h b/tests/d3d12_crosstest.h index 8388a7a7..b42696a8 100644 --- a/tests/d3d12_crosstest.h +++ b/tests/d3d12_crosstest.h @@ -268,7 +268,7 @@ static void wait_queue_idle_(unsigned int line, ID3D12Device *device, ID3D12Comm VKD3D_EXPORT const char *D3D12SDKPath = VKD3D_EXPAND_AND_STRINGIFY(VKD3D_AGILITY_SDK_PATH); # else # define VKD3D_AGILITY_SDK_EXPORT_PATH \ - VKD3D_EXPORT const char *D3D12SDKPath = "."; + VKD3D_EXPORT const char *D3D12SDKPath = "./"; # endif # define VKD3D_AGILITY_SDK_EXPORTS \ VKD3D_AGILITY_SDK_EXPORT_VERSION \

1 0

Giovanni Mascellani : tests: Pad the constant buffer in test_update_compute_descriptor_tables() to 256 bytes.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: e4e7368c1c1881213a1f12e5db62211b8ec7aab8 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e4e7368c1c1881213a1f12e5db622… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Wed Jul 17 15:06:53 2024 +0200 tests: Pad the constant buffer in test_update_compute_descriptor_tables() to 256 bytes. The D3D12 debug layer signals an error otherwise. --- tests/d3d12.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index f72f3632..8ff6e6ef 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -17720,6 +17720,8 @@ static void test_update_compute_descriptor_tables(void) { struct uvec4 srv_size[2]; struct uvec4 uav_size[2]; + /* Constant buffers need to be padded to 256 bytes. */ + char pad[D3D12_CONSTANT_BUFFER_DATA_PLACEMENT_ALIGNMENT - 2 * sizeof(struct uvec4[2])]; }; D3D12_ROOT_SIGNATURE_DESC root_signature_desc;

1 0

Giovanni Mascellani : vkd3d: Allocate temporary arrays on the stack in d3d12_command_list_update_push_descriptors().
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: a876e0b1923fb39251d1b337dfd4481e541d530f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a876e0b1923fb39251d1b337dfd44… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Sun Jul 14 19:07:16 2024 +0200 vkd3d: Allocate temporary arrays on the stack in d3d12_command_list_update_push_descriptors(). --- libs/vkd3d/command.c | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 183f8e0c..a484da94 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2977,30 +2977,20 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list enum vkd3d_pipeline_bind_point bind_point) { struct vkd3d_pipeline_bindings *bindings = &list->pipeline_bindings[bind_point]; + VkWriteDescriptorSet descriptor_writes[ARRAY_SIZE(bindings->push_descriptors)] = {0}; + VkDescriptorBufferInfo buffer_infos[ARRAY_SIZE(bindings->push_descriptors)] = {0}; const struct d3d12_root_signature *root_signature = bindings->root_signature; - VkWriteDescriptorSet *descriptor_writes = NULL, *current_descriptor_write; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; - VkDescriptorBufferInfo *buffer_infos = NULL, *current_buffer_info; const struct d3d12_root_parameter *root_parameter; struct vkd3d_push_descriptor *push_descriptor; struct d3d12_device *device = list->device; VkDescriptorBufferInfo *vk_buffer_info; - unsigned int i, descriptor_count; + unsigned int i, descriptor_count = 0; VkBufferView *vk_buffer_view; if (!bindings->push_descriptor_dirty_mask) return; - descriptor_count = vkd3d_popcount(bindings->push_descriptor_dirty_mask); - - if (!(descriptor_writes = vkd3d_calloc(descriptor_count, sizeof(*descriptor_writes)))) - return; - if (!(buffer_infos = vkd3d_calloc(descriptor_count, sizeof(*buffer_infos)))) - goto done; - - descriptor_count = 0; - current_buffer_info = buffer_infos; - current_descriptor_write = descriptor_writes; for (i = 0; i < ARRAY_SIZE(bindings->push_descriptors); ++i) { if (!(bindings->push_descriptor_dirty_mask & (1u << i))) @@ -3012,7 +3002,7 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list if (root_parameter->parameter_type == D3D12_ROOT_PARAMETER_TYPE_CBV) { vk_buffer_view = NULL; - vk_buffer_info = current_buffer_info; + vk_buffer_info = &buffer_infos[descriptor_count]; vk_buffer_info->buffer = push_descriptor->u.cbv.vk_buffer; vk_buffer_info->offset = push_descriptor->u.cbv.offset; vk_buffer_info->range = VK_WHOLE_SIZE; @@ -3023,21 +3013,15 @@ static void d3d12_command_list_update_push_descriptors(struct d3d12_command_list vk_buffer_info = NULL; } - if (!vk_write_descriptor_set_from_root_descriptor(current_descriptor_write, + if (!vk_write_descriptor_set_from_root_descriptor(&descriptor_writes[descriptor_count], root_parameter, bindings->descriptor_sets[0], vk_buffer_view, vk_buffer_info)) continue; ++descriptor_count; - ++current_descriptor_write; - ++current_buffer_info; } VK_CALL(vkUpdateDescriptorSets(device->vk_device, descriptor_count, descriptor_writes, 0, NULL)); bindings->push_descriptor_dirty_mask = 0; - -done: - vkd3d_free(descriptor_writes); - vkd3d_free(buffer_infos); } static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_command_list *list,

1 0

Conor McCarthy : vkd3d: Limit the workgroup X count for buffer UAV clears to the supported max.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: ae0faf4500cf3b64a243f429cc75a89ba0610d1a URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/ae0faf4500cf3b64a243f429cc75a… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 5 15:29:11 2024 +1000 vkd3d: Limit the workgroup X count for buffer UAV clears to the supported max. --- libs/vkd3d/command.c | 32 ++++++++++++++++++++++++-------- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 2354938c..183f8e0c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -5289,11 +5289,13 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, struct d3d12_resource *resource, struct vkd3d_view *descriptor, const VkClearColorValue *clear_colour, unsigned int rect_count, const D3D12_RECT *rects) { + const VkPhysicalDeviceLimits *device_limits = &list->device->vk_info.device_limits; const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; unsigned int i, miplevel_idx, layer_count; struct vkd3d_uav_clear_pipeline pipeline; struct vkd3d_uav_clear_args clear_args; const struct vkd3d_resource_view *view; + uint32_t count_x, count_y, count_z; VkDescriptorImageInfo image_info; D3D12_RECT full_rect, curr_rect; VkWriteDescriptorSet write_set; @@ -5384,18 +5386,32 @@ static void d3d12_command_list_clear_uav(struct d3d12_command_list *list, if (curr_rect.left >= curr_rect.right || curr_rect.top >= curr_rect.bottom) continue; - clear_args.offset.x = curr_rect.left; clear_args.offset.y = curr_rect.top; - clear_args.extent.width = curr_rect.right - curr_rect.left; clear_args.extent.height = curr_rect.bottom - curr_rect.top; - VK_CALL(vkCmdPushConstants(list->vk_command_buffer, pipeline.vk_pipeline_layout, - VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(clear_args), &clear_args)); + count_y = vkd3d_compute_workgroup_count(clear_args.extent.height, pipeline.group_size.height); + count_z = vkd3d_compute_workgroup_count(layer_count, pipeline.group_size.depth); + if (count_y > device_limits->maxComputeWorkGroupCount[1]) + FIXME("Group Y count %u exceeds max %u.\n", count_y, device_limits->maxComputeWorkGroupCount[1]); + if (count_z > device_limits->maxComputeWorkGroupCount[2]) + FIXME("Group Z count %u exceeds max %u.\n", count_z, device_limits->maxComputeWorkGroupCount[2]); - VK_CALL(vkCmdDispatch(list->vk_command_buffer, - vkd3d_compute_workgroup_count(clear_args.extent.width, pipeline.group_size.width), - vkd3d_compute_workgroup_count(clear_args.extent.height, pipeline.group_size.height), - vkd3d_compute_workgroup_count(layer_count, pipeline.group_size.depth))); + do + { + clear_args.offset.x = curr_rect.left; + clear_args.extent.width = curr_rect.right - curr_rect.left; + + count_x = vkd3d_compute_workgroup_count(clear_args.extent.width, pipeline.group_size.width); + count_x = min(count_x, device_limits->maxComputeWorkGroupCount[0]); + + VK_CALL(vkCmdPushConstants(list->vk_command_buffer, pipeline.vk_pipeline_layout, + VK_SHADER_STAGE_COMPUTE_BIT, 0, sizeof(clear_args), &clear_args)); + + VK_CALL(vkCmdDispatch(list->vk_command_buffer, count_x, count_y, count_z)); + + curr_rect.left += count_x * pipeline.group_size.width; + } + while (curr_rect.right > curr_rect.left); } }

1 0

Conor McCarthy : tests: Add a test for clearing a large buffer UAV.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: 3e25356abbb2b3b49872d3e013b59fa02885691f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/3e25356abbb2b3b49872d3e013b59… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri Jul 5 15:27:35 2024 +1000 tests: Add a test for clearing a large buffer UAV. Large buffers can exceed the maximum workgroup X count. --- tests/d3d12.c | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 6fef405f..f72f3632 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -5728,6 +5728,66 @@ static void test_clear_unordered_access_view_buffer(void) #undef BUFFER_SIZE } +static void test_clear_unordered_access_view_large_buffer(void) +{ + D3D12_UNORDERED_ACCESS_VIEW_DESC uav_desc; + ID3D12DescriptorHeap *cpu_heap, *gpu_heap; + ID3D12GraphicsCommandList *command_list; + struct d3d12_resource_readback rb; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *buffer; + ID3D12Device *device; + D3D12_BOX box; + + static const UINT clear_value[4] = {0xcafef00d, 0, 0, 0}; + static const size_t buffer_size = 64 * 1024 * 1024; + + memset(&desc, 0, sizeof(desc)); + desc.no_render_target = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + cpu_heap = create_cpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + gpu_heap = create_gpu_descriptor_heap(device, D3D12_DESCRIPTOR_HEAP_TYPE_CBV_SRV_UAV, 1); + + buffer = create_default_buffer(device, buffer_size, + D3D12_RESOURCE_FLAG_ALLOW_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + + memset(&uav_desc, 0, sizeof(uav_desc)); + uav_desc.Format = DXGI_FORMAT_R32_UINT; + uav_desc.ViewDimension = D3D12_UAV_DIMENSION_BUFFER; + uav_desc.Buffer.NumElements = buffer_size / sizeof(uint32_t); + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, + get_cpu_descriptor_handle(&context, cpu_heap, 0)); + ID3D12Device_CreateUnorderedAccessView(device, buffer, NULL, &uav_desc, + get_cpu_descriptor_handle(&context, gpu_heap, 0)); + + ID3D12GraphicsCommandList_ClearUnorderedAccessViewUint(command_list, + get_gpu_descriptor_handle(&context, gpu_heap, 0), + get_cpu_descriptor_handle(&context, cpu_heap, 0), + buffer, clear_value, 0, NULL); + + uav_barrier(command_list, buffer); + + transition_resource_state(command_list, buffer, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + get_buffer_readback_with_command_list(buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + /* Check only the end to save test run time. */ + set_box(&box, uav_desc.Buffer.NumElements - 1024 * 1024, 0, 0, uav_desc.Buffer.NumElements, 1, 1); + check_readback_data_uint(&rb.rb, &box, 0xcafef00d, 0); + release_resource_readback(&rb); + + ID3D12Resource_Release(buffer); + ID3D12DescriptorHeap_Release(cpu_heap); + ID3D12DescriptorHeap_Release(gpu_heap); + destroy_test_context(&context); +} + static void test_clear_unordered_access_view_image(void) { unsigned int image_size, image_depth, texel_size; @@ -38899,6 +38959,7 @@ START_TEST(d3d12) run_test(test_clear_depth_stencil_view); run_test(test_clear_render_target_view); run_test(test_clear_unordered_access_view_buffer); + run_test(test_clear_unordered_access_view_large_buffer); run_test(test_clear_unordered_access_view_image); run_test(test_set_render_targets); run_test(test_draw_instanced);

1 0

Conor McCarthy : vkd3d: Create a descriptor pool for static samplers when Vulkan-backed heaps are used.
by Alexandre Julliard 17 Jul '24

17 Jul '24

Module: vkd3d Branch: master Commit: 15f8657d74aedf6f671d4151fffd6ea565ee25fd URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/15f8657d74aedf6f671d4151fffd6… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jun 5 00:33:10 2024 +1000 vkd3d: Create a descriptor pool for static samplers when Vulkan-backed heaps are used. Static samplers may be allocated from these pools. --- libs/vkd3d/device.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 2bbc1705..ff3e41e6 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2563,7 +2563,9 @@ static void device_init_descriptor_pool_sizes(struct d3d12_device *device) VKD3D_MAX_UAV_CLEAR_DESCRIPTORS_PER_TYPE); pool_sizes[1].type = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE; pool_sizes[1].descriptorCount = pool_sizes[0].descriptorCount; - device->vk_pool_count = 2; + pool_sizes[2].type = VK_DESCRIPTOR_TYPE_SAMPLER; + pool_sizes[2].descriptorCount = min(limits->sampler_max_descriptors, D3D12_MAX_LIVE_STATIC_SAMPLERS); + device->vk_pool_count = 3; return; }

1 0

Eric Pouech : include/mscvpdb.h: Use flexible array members for the rest of structures.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 88a28aa5757ae74d9997b470d70216f10974247f URL: https://gitlab.winehq.org/wine/wine/-/commit/88a28aa5757ae74d9997b470d70216… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Tue Jun 18 16:57:51 2024 +0200 include/mscvpdb.h: Use flexible array members for the rest of structures. Removing the migration helpers. Adding some documentation bits. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 16 +++++++--------- include/wine/mscvpdb.h | 17 +++++++++++------ 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 73d5a8e23f4..6250061296e 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -269,9 +269,7 @@ static void codeview_init_basic_types(struct module* module) cv_basic_types[T_PUINT8] = &symt_new_pointer(module, cv_basic_types[T_UINT8], ptrsz)->symt; } -/* wrapper for migration to FAM */ -#define leaf_as_variant(v, l) _leaf_as_variant((v), (const unsigned char*)(l)) -static int _leaf_as_variant(VARIANT *v, const unsigned char *leaf) +static int leaf_as_variant(VARIANT *v, const unsigned char *leaf) { unsigned short int type = *(const unsigned short *)leaf; int length = 2; @@ -397,9 +395,7 @@ static int _leaf_as_variant(VARIANT *v, const unsigned char *leaf) return length; } -/* wrapper for migration to FAM */ -#define numeric_leaf(v, l) _numeric_leaf(v, (const unsigned char *)(l)) -static int _numeric_leaf(int *value, const unsigned char *leaf) +static int numeric_leaf(int *value, const unsigned char *leaf) { unsigned short int type = *(const unsigned short int *)leaf; int length = 2; @@ -1581,6 +1577,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B unsigned int k; const unsigned int* filetab; const unsigned int* lt_ptr; + const unsigned int* offsets; const unsigned short* linenos; const struct startend* start; unsigned source; @@ -1609,13 +1606,14 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B for (j = 0; j < nseg; j++) { ltb = (const struct codeview_linetab_block*)(linetab + *lt_ptr++); - linenos = (const unsigned short*)&ltb->offsets[ltb->num_lines]; + offsets = (const unsigned int*)&ltb->data; + linenos = (const unsigned short*)&offsets[ltb->num_lines]; func_addr0 = codeview_get_address(msc_dbg, ltb->seg, start[j].start); if (!func_addr0) continue; for (func = NULL, k = 0; k < ltb->num_lines; k++) { /* now locate function (if any) */ - addr = func_addr0 + ltb->offsets[k] - start[j].start; + addr = func_addr0 + offsets[k] - start[j].start; /* unfortunately, we can have several functions in the same block, if there's no * gap between them... find the new function if needed */ @@ -1626,7 +1624,7 @@ static void codeview_snarf_linetab(const struct msc_debug_info* msc_dbg, const B if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) { WARN("--not a func at %04x:%08x %Ix tag=%d\n", - ltb->seg, ltb->offsets[k], addr, func ? func->symt.tag : -1); + ltb->seg, offsets[k], addr, func ? func->symt.tag : -1); func = NULL; break; } diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 560d3cc08d6..d389d5d22d0 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -83,10 +83,11 @@ * symbol size (to be greater than 256), which was likely needed for * complex C++ types (nested + templates). * - * It's somehow difficult to represent the layout of those types on - * disk because: - * - some integral values are stored as numeric leaf, which size is - * variable depending on its value + * It's not possible to represent some disk layout with C structures + * as there are several contiguous entries of variable length. + * Of example of them is called 'numeric leaf' and represent several + * leaf values (integers, reals...). + * All of these contiguous values are packed in a flexible array member. * * Symbols internal stream * ----------------------- @@ -101,6 +102,9 @@ * Internal types * ======================================== */ +/* First versions (v1, v2) of CV data is stored as Pascal strings. + * Third version uses C string instead. + */ struct p_string { unsigned char namelen; @@ -2342,8 +2346,9 @@ struct codeview_linetab_block { unsigned short seg; unsigned short num_lines; - unsigned int offsets[1]; /* in fact num_lines */ -/* unsigned short linenos[]; */ + unsigned char data[]; + /* unsigned int offsets[num_lines]; */ + /* unsigned short linenos[]; */ }; struct startend

1 0

Eric Pouech : include/mscvpdb.h: Use flexible array members for codeview_type with variable.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 9e43076913d717d9d049b55310c8254858c45382 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e43076913d717d9d049b55310c825… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 8 10:38:32 2024 +0200 include/mscvpdb.h: Use flexible array members for codeview_type with variable. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 60 +++++++++++++++++++++++------------------------ include/wine/mscvpdb.h | 63 ++++++++++++++++++++++---------------------------- tools/winedump/msc.c | 46 +++++++++++++++++------------------- 3 files changed, 78 insertions(+), 91 deletions(-)

1 0

Eric Pouech : include/mscvpdb.h: Use flexible array members for codeview_symbol union.
by Alexandre Julliard 16 Jul '24

16 Jul '24

Module: wine Branch: master Commit: 7d7ce1dc205ed48e0201d5193e370d01fde49601 URL: https://gitlab.winehq.org/wine/wine/-/commit/7d7ce1dc205ed48e0201d5193e370d… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Sat Jun 8 10:29:18 2024 +0200 include/mscvpdb.h: Use flexible array members for codeview_symbol union. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 12 ++++++------ include/wine/mscvpdb.h | 36 ++++++++++++++++-------------------- tools/winedump/msc.c | 18 +++++++++++------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 04de7f6491f..815bcedb04a 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2585,8 +2585,8 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, struct symt* se; VARIANT v; - vlen = leaf_as_variant(&v, &sym->constant_v1.cvalue); - name = (const struct p_string*)((const char*)&sym->constant_v1.cvalue + vlen); + vlen = leaf_as_variant(&v, sym->constant_v1.data); + name = (const struct p_string*)&sym->constant_v1.data[vlen]; se = codeview_get_type(sym->constant_v1.type, FALSE); TRACE("S-Constant-V1 %u %s %x\n", V_INT(&v), terminate_string(name), sym->constant_v1.type); @@ -2601,8 +2601,8 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, struct symt* se; VARIANT v; - vlen = leaf_as_variant(&v, &sym->constant_v2.cvalue); - name = (const struct p_string*)((const char*)&sym->constant_v2.cvalue + vlen); + vlen = leaf_as_variant(&v, sym->constant_v2.data); + name = (const struct p_string*)&sym->constant_v2.data[vlen]; se = codeview_get_type(sym->constant_v2.type, FALSE); TRACE("S-Constant-V2 %u %s %x\n", V_INT(&v), terminate_string(name), sym->constant_v2.type); @@ -2617,8 +2617,8 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, struct symt* se; VARIANT v; - vlen = leaf_as_variant(&v, &sym->constant_v3.cvalue); - name = (const char*)&sym->constant_v3.cvalue + vlen; + vlen = leaf_as_variant(&v, sym->constant_v3.data); + name = (const char*)&sym->constant_v3.data[vlen]; se = codeview_get_type(sym->constant_v3.type, FALSE); TRACE("S-Constant-V3 %u %s %x\n", V_INT(&v), name, sym->constant_v3.type); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index da66b2c2416..4d0380ee429 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -1661,10 +1661,9 @@ union codeview_symbol unsigned short int len; unsigned short int id; cv_typ16_t type; - unsigned short cvalue; /* numeric leaf */ -#if 0 - struct p_string p_name; -#endif + unsigned char data[]; + /* <numeric leaf> cvalue; */ + /* struct p_string p_name; */ } constant_v1; struct @@ -1672,10 +1671,9 @@ union codeview_symbol unsigned short int len; unsigned short int id; cv_typ_t type; - unsigned short cvalue; /* numeric leaf */ -#if 0 - struct p_string p_name; -#endif + unsigned char data[]; + /* <numeric leaf> cvalue; */ + /* struct p_string p_name; */ } constant_v2; struct @@ -1683,10 +1681,9 @@ union codeview_symbol unsigned short int len; unsigned short int id; cv_typ_t type; - unsigned short cvalue; -#if 0 - char name[1]; -#endif + unsigned char data[]; + /* <numeric leaf> cvalue; */ + /* char name; */ } constant_v3; struct @@ -1896,7 +1893,7 @@ union codeview_symbol unsigned short int id; unsigned int program; struct cv_addr_range range; - struct cv_addr_gap gaps[0]; + struct cv_addr_gap gaps[]; } defrange_v3; struct @@ -1906,7 +1903,7 @@ union codeview_symbol unsigned int program; unsigned int offParent; struct cv_addr_range range; - struct cv_addr_gap gaps[0]; + struct cv_addr_gap gaps[]; } defrange_subfield_v3; struct @@ -1916,7 +1913,7 @@ union codeview_symbol unsigned short reg; unsigned short attr; struct cv_addr_range range; - struct cv_addr_gap gaps[0]; + struct cv_addr_gap gaps[]; } defrange_register_v3; struct @@ -1925,7 +1922,7 @@ union codeview_symbol unsigned short int id; int offFramePointer; struct cv_addr_range range; - struct cv_addr_gap gaps[0]; + struct cv_addr_gap gaps[]; } defrange_frameptrrel_v3; struct @@ -2003,10 +2000,9 @@ union codeview_symbol unsigned short int len; unsigned short int id; unsigned int count; - cv_typ_t funcs[0]; /* array of cuntions, count entries */ -#if 0 - unsigned int invocations[0]; /* array of count entries, paires with funcs */ -#endif + unsigned char data[]; + /* cv_typ_t functions[count]; */ + /* unsigned int invocations[count]; */ } function_list_v3; struct diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 5e274b730dd..0a638d4bf9f 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -1703,9 +1703,9 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long int vlen; struct full_value fv; - vlen = full_numeric_leaf(&fv, &sym->constant_v2.cvalue); + vlen = full_numeric_leaf(&fv, sym->constant_v2.data); printf("Constant V2 '%s' = %s type:%x\n", - p_string(PSTRING(&sym->constant_v2.cvalue, vlen)), + p_string((const struct p_string *)&sym->constant_v2.data[vlen]), full_value_string(&fv), sym->constant_v2.type); } break; @@ -1715,9 +1715,9 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long int vlen; struct full_value fv; - vlen = full_numeric_leaf(&fv, &sym->constant_v3.cvalue); + vlen = full_numeric_leaf(&fv, sym->constant_v3.data); printf("Constant V3 '%s' = %s type:%x\n", - (const char*)&sym->constant_v3.cvalue + vlen, + (const char*)&sym->constant_v3.data[vlen], full_value_string(&fv), sym->constant_v3.type); } break; @@ -1893,6 +1893,7 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long case S_INLINEES: { unsigned i, ninvoc; + const cv_typ_t *functions; const unsigned* invoc; const char* tag; @@ -1900,12 +1901,15 @@ BOOL codeview_dump_symbols(const void* root, unsigned long start, unsigned long else if (sym->generic.id == S_CALLEES) tag = "Callees"; else tag = "Inlinees"; printf("%s V3 count:%u\n", tag, sym->function_list_v3.count); - invoc = (const unsigned*)&sym->function_list_v3.funcs[sym->function_list_v3.count]; + functions = (const cv_typ_t *)&sym->function_list_v3.data; + invoc = (const unsigned*)&functions[sym->function_list_v3.count]; ninvoc = (const unsigned*)get_last(sym) - invoc; + if (ninvoc < sym->function_list_v3.count) ninvoc = sym->function_list_v3.count; - for (i = 0; i < sym->function_list_v3.count; ++i) + for (i = 0; i < ninvoc; ++i) printf("%*s| func:%x invoc:%u\n", - indent, "", sym->function_list_v3.funcs[i], i < ninvoc ? invoc[i] : 0); + indent, "", functions[i], invoc[i]); + if (i < sym->function_list_v3.count) printf("Number of entries exceed symbol serialized size\n"); } break;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits