July 2023 - Wine-Commits - list.winehq.org

Esme Povirk : user32/tests: Add optional message sequence from win7.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 1dc8cdae25cf42cceae04274688f4ed1260fe14b URL: https://gitlab.winehq.org/wine/wine/-/commit/1dc8cdae25cf42cceae04274688f4e… Author: Esme Povirk <esme(a)codeweavers.com> Date: Fri Jul 28 11:35:23 2023 -0500 user32/tests: Add optional message sequence from win7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55354 --- dlls/user32/tests/msg.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 23957a7adf8..7d1f796e53f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15194,6 +15194,9 @@ static const struct message WmCreateDialogParamSeq_1[] = { { WM_PALETTEISCHANGING, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, { WM_WINDOWPOSCHANGED, sent|wparam|optional, SWP_NOMOVE|SWP_NOSIZE|SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOREDRAW }, + { WM_GETTEXT, sent|optional }, /* win7 */ + { WM_NCCALCSIZE, sent|optional }, /* win7 */ + { EVENT_OBJECT_LOCATIONCHANGE, winevent_hook|wparam|lparam|optional, 0, 0 }, /* win7 */ { WM_ACTIVATEAPP, sent|wparam, 1 }, { WM_NCACTIVATE, sent }, { WM_ACTIVATE, sent|wparam, 1 },

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.260.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 08499d17e1be37bafe8a3bdea9971998217efa86 URL: https://gitlab.winehq.org/wine/wine/-/commit/08499d17e1be37bafe8a3bdea99719… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Fri Jul 28 14:22:36 2023 +0200 winevulkan: Update to VK spec version 1.3.260. --- dlls/winevulkan/loader_thunks.c | 51 ++- dlls/winevulkan/loader_thunks.h | 39 ++- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 753 +++++++++++++++++++++++++++++++--------- dlls/winevulkan/vulkan_thunks.h | 10 +- dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 159 ++++++++- 7 files changed, 838 insertions(+), 178 deletions(-)

1 0

Sven Baars : uiautomationcore: Fix a sizeof() argument (Coverity).
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 753b5b3582d466eb766618ed5e14cbc88369b60d URL: https://gitlab.winehq.org/wine/wine/-/commit/753b5b3582d466eb766618ed5e14cb… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Fri Jul 28 15:59:27 2023 +0200 uiautomationcore: Fix a sizeof() argument (Coverity). --- dlls/uiautomationcore/uia_utils.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/uiautomationcore/uia_utils.c b/dlls/uiautomationcore/uia_utils.c index 8e034916397..2b6f42fa520 100644 --- a/dlls/uiautomationcore/uia_utils.c +++ b/dlls/uiautomationcore/uia_utils.c @@ -169,7 +169,7 @@ static HRESULT uia_condition_clone(struct UiaCondition **dst, struct UiaConditio { case ConditionType_True: case ConditionType_False: - if (!(*dst = heap_alloc_zero(sizeof(*dst)))) + if (!(*dst = heap_alloc_zero(sizeof(**dst)))) return E_OUTOFMEMORY; (*dst)->ConditionType = src->ConditionType;

1 0

Conor McCarthy : vkd3d: Implement ID3D12Device::GetResourceTiling() for textures.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: vkd3d Branch: master Commit: 4433dacb4f84346365d3be086eb1088a7c33c810 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4433dacb4f84346365d3be086eb10… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 25 16:45:04 2023 +1000 vkd3d: Implement ID3D12Device::GetResourceTiling() for textures. --- include/vkd3d_d3d12.idl | 1 + libs/vkd3d/resource.c | 124 +++++++++++++++++++++++++++++++++++++++------ libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 110 insertions(+), 16 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 9af75f40..4db9e10f 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -45,6 +45,7 @@ const UINT D3D12_DEFAULT_STENCIL_WRITE_MASK = 0xff; const UINT D3D12_DESCRIPTOR_RANGE_OFFSET_APPEND = 0xffffffff; cpp_quote("#define D3D12_FLOAT32_MAX (3.402823466e+38f)") const UINT D3D12_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT = 32; +const UINT D3D12_PACKED_TILE = 0xffffffff; const UINT D3D12_UAV_SLOT_COUNT = 64; const UINT D3D12_REQ_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; const UINT D3D12_REQ_IMMEDIATE_CONSTANT_BUFFER_ELEMENT_COUNT = 4096; diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 7550e21f..cd3856c2 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -1064,29 +1064,38 @@ static void d3d12_resource_get_level_box(const struct d3d12_resource *resource, box->back = d3d12_resource_desc_get_depth(&resource->desc, level); } +static void compute_image_subresource_size_in_tiles(const VkExtent3D *tile_extent, + const struct D3D12_RESOURCE_DESC *desc, unsigned int miplevel_idx, + struct vkd3d_tiled_region_extent *size) +{ + unsigned int width, height, depth; + + width = d3d12_resource_desc_get_width(desc, miplevel_idx); + height = d3d12_resource_desc_get_height(desc, miplevel_idx); + depth = d3d12_resource_desc_get_depth(desc, miplevel_idx); + size->width = (width + tile_extent->width - 1) / tile_extent->width; + size->height = (height + tile_extent->height - 1) / tile_extent->height; + size->depth = (depth + tile_extent->depth - 1) / tile_extent->depth; +} + void d3d12_resource_get_tiling(struct d3d12_device *device, const struct d3d12_resource *resource, UINT *total_tile_count, D3D12_PACKED_MIP_INFO *packed_mip_info, D3D12_TILE_SHAPE *standard_tile_shape, UINT *subresource_tiling_count, UINT first_subresource_tiling, D3D12_SUBRESOURCE_TILING *subresource_tilings) { - unsigned int i, subresource, subresource_count, count; + unsigned int i, subresource, subresource_count, miplevel_idx, count; const struct vkd3d_subresource_tile_info *tile_info; const VkExtent3D *tile_extent; - if (d3d12_resource_is_texture(resource)) - { - FIXME("Not implemented for textures.\n"); - return; - } - tile_extent = &resource->tiles.tile_extent; if (packed_mip_info) { packed_mip_info->NumStandardMips = resource->tiles.standard_mip_count; - packed_mip_info->NumPackedMips = 0; - packed_mip_info->NumTilesForPackedMips = 0; - packed_mip_info->StartTileIndexInOverallResource = 0; + packed_mip_info->NumPackedMips = resource->desc.MipLevels - packed_mip_info->NumStandardMips; + packed_mip_info->NumTilesForPackedMips = !!resource->tiles.packed_mip_tile_count; /* non-zero dummy value */ + packed_mip_info->StartTileIndexInOverallResource = packed_mip_info->NumPackedMips + ? resource->tiles.subresources[resource->tiles.standard_mip_count].offset : 0; } if (standard_tile_shape) @@ -1111,6 +1120,14 @@ void d3d12_resource_get_tiling(struct d3d12_device *device, const struct d3d12_r for (i = 0; i < count; ++i) { subresource = i + first_subresource_tiling; + miplevel_idx = subresource % resource->desc.MipLevels; + if (miplevel_idx >= resource->tiles.standard_mip_count) + { + memset(&subresource_tilings[i], 0, sizeof(subresource_tilings[i])); + subresource_tilings[i].StartTileIndexInOverallResource = D3D12_PACKED_TILE; + continue; + } + tile_info = &resource->tiles.subresources[subresource]; subresource_tilings[i].StartTileIndexInOverallResource = tile_info->offset; subresource_tilings[i].WidthInTiles = tile_info->extent.width; @@ -1122,21 +1139,26 @@ void d3d12_resource_get_tiling(struct d3d12_device *device, const struct d3d12_r static bool d3d12_resource_init_tiles(struct d3d12_resource *resource, struct d3d12_device *device) { + unsigned int i, start_idx, subresource_count, tile_count, miplevel_idx; const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + VkSparseImageMemoryRequirements *sparse_requirements_array; + VkSparseImageMemoryRequirements sparse_requirements = {0}; struct vkd3d_subresource_tile_info *tile_info; VkMemoryRequirements requirements; - unsigned int subresource_count; + const VkExtent3D *tile_extent; + uint32_t requirement_count; subresource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + if (!(resource->tiles.subresources = vkd3d_calloc(subresource_count, sizeof(*resource->tiles.subresources)))) + { + ERR("Failed to allocate subresource info array.\n"); + return false; + } + if (d3d12_resource_is_buffer(resource)) { assert(subresource_count == 1); - if (!(resource->tiles.subresources = vkd3d_calloc(subresource_count, sizeof(*resource->tiles.subresources)))) - { - ERR("Failed to allocate subresource info array.\n"); - return false; - } VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, resource->u.vk_buffer, &requirements)); if (requirements.alignment > D3D12_TILED_RESOURCE_TILE_SIZE_IN_BYTES) @@ -1156,6 +1178,76 @@ static bool d3d12_resource_init_tiles(struct d3d12_resource *resource, struct d3 resource->tiles.total_count = tile_info->extent.width; resource->tiles.subresource_count = 1; resource->tiles.standard_mip_count = 1; + resource->tiles.packed_mip_tile_count = 0; + } + else + { + VK_CALL(vkGetImageMemoryRequirements(device->vk_device, resource->u.vk_image, &requirements)); + if (requirements.alignment > D3D12_TILED_RESOURCE_TILE_SIZE_IN_BYTES) + FIXME("Vulkan device tile size is greater than the standard D3D12 tile size.\n"); + + requirement_count = 0; + VK_CALL(vkGetImageSparseMemoryRequirements(device->vk_device, resource->u.vk_image, &requirement_count, NULL)); + if (!(sparse_requirements_array = vkd3d_calloc(requirement_count, sizeof(*sparse_requirements_array)))) + { + ERR("Failed to allocate sparse requirements array.\n"); + return false; + } + VK_CALL(vkGetImageSparseMemoryRequirements(device->vk_device, resource->u.vk_image, + &requirement_count, sparse_requirements_array)); + + for (i = 0; i < requirement_count; ++i) + { + if (sparse_requirements_array[i].formatProperties.aspectMask & resource->format->vk_aspect_mask) + { + if (sparse_requirements.formatProperties.aspectMask) + { + WARN("Ignoring properties for aspect mask %#x.\n", + sparse_requirements_array[i].formatProperties.aspectMask); + } + else + { + sparse_requirements = sparse_requirements_array[i]; + } + } + } + vkd3d_free(sparse_requirements_array); + if (!sparse_requirements.formatProperties.aspectMask) + { + WARN("Failed to get sparse requirements.\n"); + return false; + } + + resource->tiles.tile_extent = sparse_requirements.formatProperties.imageGranularity; + resource->tiles.subresource_count = subresource_count; + resource->tiles.standard_mip_count = sparse_requirements.imageMipTailSize + ? sparse_requirements.imageMipTailFirstLod : resource->desc.MipLevels; + resource->tiles.packed_mip_tile_count = (resource->tiles.standard_mip_count < resource->desc.MipLevels) + ? sparse_requirements.imageMipTailSize / requirements.alignment : 0; + + for (i = 0, start_idx = 0; i < subresource_count; ++i) + { + miplevel_idx = i % resource->desc.MipLevels; + + tile_extent = &sparse_requirements.formatProperties.imageGranularity; + tile_info = &resource->tiles.subresources[i]; + compute_image_subresource_size_in_tiles(tile_extent, &resource->desc, miplevel_idx, &tile_info->extent); + tile_info->offset = start_idx; + tile_info->count = 0; + + if (miplevel_idx < resource->tiles.standard_mip_count) + { + tile_count = tile_info->extent.width * tile_info->extent.height * tile_info->extent.depth; + start_idx += tile_count; + tile_info->count = tile_count; + } + else if (miplevel_idx == resource->tiles.standard_mip_count) + { + tile_info->count = 1; /* Non-zero dummy value */ + start_idx += 1; + } + } + resource->tiles.total_count = start_idx; } return true; diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index 4f9177d2..e1127799 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -706,6 +706,7 @@ struct d3d12_resource_tile_info VkExtent3D tile_extent; unsigned int total_count; unsigned int standard_mip_count; + unsigned int packed_mip_tile_count; unsigned int subresource_count; struct vkd3d_subresource_tile_info *subresources; };

1 0

Conor McCarthy : vkd3d: Implement ID3D12GraphicsCommandList3 with a stub.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: vkd3d Branch: master Commit: 0d1bc77b2a48ae75aa7383dbc658e745da265293 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/0d1bc77b2a48ae75aa7383dbc658e… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jul 25 16:53:15 2023 +1000 vkd3d: Implement ID3D12GraphicsCommandList3 with a stub. --- include/vkd3d_d3d12.idl | 53 +++++++++ libs/vkd3d/command.c | 265 +++++++++++++++++++++++---------------------- libs/vkd3d/device.c | 4 +- libs/vkd3d/vkd3d_private.h | 2 +- 4 files changed, 193 insertions(+), 131 deletions(-)

1 0

Conor McCarthy : vkd3d: Implement ID3D12Device::GetResourceTiling() for buffers.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: vkd3d Branch: master Commit: 71a9feac8efc8106e8cb70b9c66826a78a3f44ab URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/71a9feac8efc8106e8cb70b9c6682… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Thu May 25 16:40:03 2023 +1000 vkd3d: Implement ID3D12Device::GetResourceTiling() for buffers. --- include/vkd3d_d3d12.idl | 1 + libs/vkd3d/device.c | 10 ++++- libs/vkd3d/resource.c | 109 +++++++++++++++++++++++++++++++++++++++++++-- libs/vkd3d/vkd3d_private.h | 22 +++++++++ 4 files changed, 137 insertions(+), 5 deletions(-) diff --git a/include/vkd3d_d3d12.idl b/include/vkd3d_d3d12.idl index 06287f5a..9af75f40 100644 --- a/include/vkd3d_d3d12.idl +++ b/include/vkd3d_d3d12.idl @@ -72,6 +72,7 @@ const UINT D3D12_SMALL_RESOURCE_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_STANDARD_MAXIMUM_ELEMENT_ALIGNMENT_BYTE_MULTIPLE = 4; const UINT D3D12_TEXTURE_DATA_PITCH_ALIGNMENT = 256; const UINT D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT = 512; +const UINT D3D12_TILED_RESOURCE_TILE_SIZE_IN_BYTES = 65536; const UINT D3D12_UAV_COUNTER_PLACEMENT_ALIGNMENT = 4096; const UINT D3D12_VS_INPUT_REGISTER_COUNT = 32; const UINT D3D12_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE = 16; diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 025a60fc..a8cfffcd 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -3893,12 +3893,18 @@ static void STDMETHODCALLTYPE d3d12_device_GetResourceTiling(ID3D12Device *iface UINT *sub_resource_tiling_count, UINT first_sub_resource_tiling, D3D12_SUBRESOURCE_TILING *sub_resource_tilings) { - FIXME("iface %p, resource %p, total_tile_count %p, packed_mip_info %p, " + const struct d3d12_resource *resource_impl = impl_from_ID3D12Resource(resource); + struct d3d12_device *device = impl_from_ID3D12Device(iface); + + TRACE("iface %p, resource %p, total_tile_count %p, packed_mip_info %p, " "standard_title_shape %p, sub_resource_tiling_count %p, " - "first_sub_resource_tiling %u, sub_resource_tilings %p stub!\n", + "first_sub_resource_tiling %u, sub_resource_tilings %p.\n", iface, resource, total_tile_count, packed_mip_info, standard_tile_shape, sub_resource_tiling_count, first_sub_resource_tiling, sub_resource_tilings); + + d3d12_resource_get_tiling(device, resource_impl, total_tile_count, packed_mip_info, standard_tile_shape, + sub_resource_tiling_count, first_sub_resource_tiling, sub_resource_tilings); } static LUID * STDMETHODCALLTYPE d3d12_device_GetAdapterLuid(ID3D12Device *iface, LUID *luid) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index f2fe1250..7550e21f 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -971,6 +971,11 @@ HRESULT vkd3d_get_image_allocation_info(struct d3d12_device *device, return hr; } +static void d3d12_resource_tile_info_cleanup(struct d3d12_resource *resource) +{ + vkd3d_free(resource->tiles.subresources); +} + static void d3d12_resource_destroy(struct d3d12_resource *resource, struct d3d12_device *device) { const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; @@ -986,6 +991,8 @@ static void d3d12_resource_destroy(struct d3d12_resource *resource, struct d3d12 else VK_CALL(vkDestroyImage(device->vk_device, resource->u.vk_image, NULL)); + d3d12_resource_tile_info_cleanup(resource); + if (resource->heap) d3d12_heap_resource_destroyed(resource->heap); } @@ -1057,9 +1064,101 @@ static void d3d12_resource_get_level_box(const struct d3d12_resource *resource, box->back = d3d12_resource_desc_get_depth(&resource->desc, level); } -static void d3d12_resource_init_tiles(struct d3d12_resource *resource) +void d3d12_resource_get_tiling(struct d3d12_device *device, const struct d3d12_resource *resource, + UINT *total_tile_count, D3D12_PACKED_MIP_INFO *packed_mip_info, D3D12_TILE_SHAPE *standard_tile_shape, + UINT *subresource_tiling_count, UINT first_subresource_tiling, + D3D12_SUBRESOURCE_TILING *subresource_tilings) { - resource->tiles.subresource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + unsigned int i, subresource, subresource_count, count; + const struct vkd3d_subresource_tile_info *tile_info; + const VkExtent3D *tile_extent; + + if (d3d12_resource_is_texture(resource)) + { + FIXME("Not implemented for textures.\n"); + return; + } + + tile_extent = &resource->tiles.tile_extent; + + if (packed_mip_info) + { + packed_mip_info->NumStandardMips = resource->tiles.standard_mip_count; + packed_mip_info->NumPackedMips = 0; + packed_mip_info->NumTilesForPackedMips = 0; + packed_mip_info->StartTileIndexInOverallResource = 0; + } + + if (standard_tile_shape) + { + /* D3D12 docs say tile shape is cleared to zero if there is no standard mip, but drivers don't to do this. */ + standard_tile_shape->WidthInTexels = tile_extent->width; + standard_tile_shape->HeightInTexels = tile_extent->height; + standard_tile_shape->DepthInTexels = tile_extent->depth; + } + + if (total_tile_count) + *total_tile_count = resource->tiles.total_count; + + if (!subresource_tiling_count) + return; + + subresource_count = resource->tiles.subresource_count; + + count = subresource_count - min(first_subresource_tiling, subresource_count); + count = min(count, *subresource_tiling_count); + + for (i = 0; i < count; ++i) + { + subresource = i + first_subresource_tiling; + tile_info = &resource->tiles.subresources[subresource]; + subresource_tilings[i].StartTileIndexInOverallResource = tile_info->offset; + subresource_tilings[i].WidthInTiles = tile_info->extent.width; + subresource_tilings[i].HeightInTiles = tile_info->extent.height; + subresource_tilings[i].DepthInTiles = tile_info->extent.depth; + } + *subresource_tiling_count = i; +} + +static bool d3d12_resource_init_tiles(struct d3d12_resource *resource, struct d3d12_device *device) +{ + const struct vkd3d_vk_device_procs *vk_procs = &device->vk_procs; + struct vkd3d_subresource_tile_info *tile_info; + VkMemoryRequirements requirements; + unsigned int subresource_count; + + subresource_count = d3d12_resource_desc_get_sub_resource_count(&resource->desc); + + if (d3d12_resource_is_buffer(resource)) + { + assert(subresource_count == 1); + if (!(resource->tiles.subresources = vkd3d_calloc(subresource_count, sizeof(*resource->tiles.subresources)))) + { + ERR("Failed to allocate subresource info array.\n"); + return false; + } + + VK_CALL(vkGetBufferMemoryRequirements(device->vk_device, resource->u.vk_buffer, &requirements)); + if (requirements.alignment > D3D12_TILED_RESOURCE_TILE_SIZE_IN_BYTES) + FIXME("Vulkan device tile size is greater than the standard D3D12 tile size.\n"); + + tile_info = &resource->tiles.subresources[0]; + tile_info->offset = 0; + tile_info->extent.width = align(resource->desc.Width, D3D12_TILED_RESOURCE_TILE_SIZE_IN_BYTES) + / D3D12_TILED_RESOURCE_TILE_SIZE_IN_BYTES; + tile_info->extent.height = 1; + tile_info->extent.depth = 1; + tile_info->count = tile_info->extent.width; + + resource->tiles.tile_extent.width = D3D12_TILED_RESOURCE_TILE_SIZE_IN_BYTES; + resource->tiles.tile_extent.height = 1; + resource->tiles.tile_extent.depth = 1; + resource->tiles.total_count = tile_info->extent.width; + resource->tiles.subresource_count = 1; + resource->tiles.standard_mip_count = 1; + } + + return true; } /* ID3D12Resource */ @@ -2013,7 +2112,11 @@ HRESULT d3d12_reserved_resource_create(struct d3d12_device *device, desc, initial_state, optimized_clear_value, &object))) return hr; - d3d12_resource_init_tiles(object); + if (!d3d12_resource_init_tiles(object, device)) + { + d3d12_resource_Release(&object->ID3D12Resource_iface); + return E_OUTOFMEMORY; + } TRACE("Created reserved resource %p.\n", object); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a5eed59a..4f9177d2 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -687,9 +687,27 @@ struct d3d12_heap *unsafe_impl_from_ID3D12Heap(ID3D12Heap *iface); #define VKD3D_RESOURCE_DEDICATED_HEAP 0x00000008 #define VKD3D_RESOURCE_LINEAR_TILING 0x00000010 +struct vkd3d_tiled_region_extent +{ + unsigned int width; + unsigned int height; + unsigned int depth; +}; + +struct vkd3d_subresource_tile_info +{ + unsigned int offset; + unsigned int count; + struct vkd3d_tiled_region_extent extent; +}; + struct d3d12_resource_tile_info { + VkExtent3D tile_extent; + unsigned int total_count; + unsigned int standard_mip_count; unsigned int subresource_count; + struct vkd3d_subresource_tile_info *subresources; }; /* ID3D12Resource */ @@ -742,6 +760,10 @@ static inline bool d3d12_resource_is_texture(const struct d3d12_resource *resour bool d3d12_resource_is_cpu_accessible(const struct d3d12_resource *resource); HRESULT d3d12_resource_validate_desc(const D3D12_RESOURCE_DESC *desc, struct d3d12_device *device); +void d3d12_resource_get_tiling(struct d3d12_device *device, const struct d3d12_resource *resource, + UINT *total_tile_count, D3D12_PACKED_MIP_INFO *packed_mip_info, D3D12_TILE_SHAPE *standard_tile_shape, + UINT *sub_resource_tiling_count, UINT first_sub_resource_tiling, + D3D12_SUBRESOURCE_TILING *sub_resource_tilings); HRESULT d3d12_committed_resource_create(struct d3d12_device *device, const D3D12_HEAP_PROPERTIES *heap_properties, D3D12_HEAP_FLAGS heap_flags,

1 0

Conor McCarthy : tests/d3d12: Add tests for GetResourceTiling().
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: vkd3d Branch: master Commit: 1e178efa01208f3a93a6c4a87f5400a2d286a51b URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/1e178efa01208f3a93a6c4a87f540… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Fri May 26 11:47:43 2023 +1000 tests/d3d12: Add tests for GetResourceTiling(). Based on vkd3d-proton patches by Philip Rebohle and Hans-Kristian Arntzen. --- tests/d3d12.c | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 279 insertions(+)

1 0

Hans Leidekker : klist: Match native output for encryption type.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 0a880e57067632bb11c32488920de25a57728390 URL: https://gitlab.winehq.org/wine/wine/-/commit/0a880e57067632bb11c32488920de2… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Jul 28 11:40:26 2023 +0200 klist: Match native output for encryption type. --- programs/klist/main.c | 84 +++++++++++++++++++++++---------------------------- 1 file changed, 37 insertions(+), 47 deletions(-) diff --git a/programs/klist/main.c b/programs/klist/main.c index ef8d440e05f..973909a47ed 100644 --- a/programs/klist/main.c +++ b/programs/klist/main.c @@ -37,43 +37,42 @@ static const WCHAR *load_resource(UINT id) static const WCHAR *get_etype_text(LONG encryption_type) { - switch (encryption_type) { -#define EXPAND_ETYPE(x) case KERB_ETYPE_##x: return L ## #x - EXPAND_ETYPE(NULL); - EXPAND_ETYPE(DES_CBC_CRC); - EXPAND_ETYPE(DES_CBC_MD4); - EXPAND_ETYPE(DES_CBC_MD5); - EXPAND_ETYPE(AES128_CTS_HMAC_SHA1_96); - EXPAND_ETYPE(AES256_CTS_HMAC_SHA1_96); - EXPAND_ETYPE(RC4_MD4); - EXPAND_ETYPE(RC4_PLAIN2); - EXPAND_ETYPE(RC4_LM); - EXPAND_ETYPE(RC4_SHA); - EXPAND_ETYPE(DES_PLAIN); - EXPAND_ETYPE(RC4_HMAC_OLD); - EXPAND_ETYPE(RC4_PLAIN_OLD); - EXPAND_ETYPE(RC4_HMAC_OLD_EXP); - EXPAND_ETYPE(RC4_PLAIN_OLD_EXP); - EXPAND_ETYPE(RC4_PLAIN); - EXPAND_ETYPE(RC4_PLAIN_EXP); - EXPAND_ETYPE(AES128_CTS_HMAC_SHA1_96_PLAIN); - EXPAND_ETYPE(AES256_CTS_HMAC_SHA1_96_PLAIN); - EXPAND_ETYPE(DSA_SHA1_CMS); - EXPAND_ETYPE(RSA_MD5_CMS); - EXPAND_ETYPE(RSA_SHA1_CMS); - EXPAND_ETYPE(RC2_CBC_ENV); - EXPAND_ETYPE(RSA_ENV); - EXPAND_ETYPE(RSA_ES_OEAP_ENV); - EXPAND_ETYPE(DES_EDE3_CBC_ENV); - EXPAND_ETYPE(DSA_SIGN); - EXPAND_ETYPE(DES3_CBC_MD5); - EXPAND_ETYPE(DES3_CBC_SHA1); - EXPAND_ETYPE(DES3_CBC_SHA1_KD); - EXPAND_ETYPE(DES_CBC_MD5_NT); - EXPAND_ETYPE(RC4_HMAC_NT); - EXPAND_ETYPE(RC4_HMAC_NT_EXP); -#undef EXPAND_ETYPE - default: return NULL; + switch (encryption_type) + { + case KERB_ETYPE_NULL: return L"NULL"; + case KERB_ETYPE_DES_CBC_CRC: return L"DES-CBC-CRC"; + case KERB_ETYPE_DES_CBC_MD4: return L"DES-CBC-MD4"; + case KERB_ETYPE_DES_CBC_MD5: return L"DES-CBC-MD5"; + case KERB_ETYPE_AES128_CTS_HMAC_SHA1_96: return L"AES-128-CTS-HMAC-SHA1-96"; + case KERB_ETYPE_AES256_CTS_HMAC_SHA1_96: return L"AES-256-CTS-HMAC-SHA1-96"; + case KERB_ETYPE_RC4_MD4: return L"RC4-MD4"; + case KERB_ETYPE_RC4_PLAIN2: return L"RC4-PLAIN2"; + case KERB_ETYPE_RC4_LM: return L"RC4-LM"; + case KERB_ETYPE_RC4_SHA: return L"RC4-SHA"; + case KERB_ETYPE_DES_PLAIN: return L"DES-PLAIN"; + case KERB_ETYPE_RC4_HMAC_OLD: return L"RC4-HMAC-OLD"; + case KERB_ETYPE_RC4_PLAIN_OLD: return L"RC4-PLAIN-OLD"; + case KERB_ETYPE_RC4_HMAC_OLD_EXP: return L"RC4-HMAC-OLD-EXP"; + case KERB_ETYPE_RC4_PLAIN_OLD_EXP: return L"RC4-PLAIN-OLD-EXP"; + case KERB_ETYPE_RC4_PLAIN: return L"RC4-PLAIN"; + case KERB_ETYPE_RC4_PLAIN_EXP: return L"RC4-PLAIN-EXP"; + case KERB_ETYPE_AES128_CTS_HMAC_SHA1_96_PLAIN: return L"AES-128-CTS-HMAC-SHA1-96-PLAIN"; + case KERB_ETYPE_AES256_CTS_HMAC_SHA1_96_PLAIN: return L"AES-256-CTS-HMAC-SHA1-96-PLAIN"; + case KERB_ETYPE_DSA_SHA1_CMS: return L"DSA-SHA1-CMS"; + case KERB_ETYPE_RSA_MD5_CMS: return L"RSA-MD5-CMS"; + case KERB_ETYPE_RSA_SHA1_CMS: return L"RSA-SHA1-CMS"; + case KERB_ETYPE_RC2_CBC_ENV: return L"RC2-CBC-ENV"; + case KERB_ETYPE_RSA_ENV: return L"RSA-ENV"; + case KERB_ETYPE_RSA_ES_OEAP_ENV: return L"RSA-ES-OEAP-ENV"; + case KERB_ETYPE_DES_EDE3_CBC_ENV: return L"DES-EDE3-CBC-ENV"; + case KERB_ETYPE_DSA_SIGN: return L"DSA-SIGN"; + case KERB_ETYPE_DES3_CBC_MD5: return L"DES3-CBC-MD5"; + case KERB_ETYPE_DES3_CBC_SHA1: return L"DES3-CBC-SHA1"; + case KERB_ETYPE_DES3_CBC_SHA1_KD: return L"DES3-CBC-SHA1-KD"; + case KERB_ETYPE_DES_CBC_MD5_NT: return L"DES-CBC-MD5-NT"; + case KERB_ETYPE_RC4_HMAC_NT: return L"RC4-HMAC-NT"; + case KERB_ETYPE_RC4_HMAC_NT_EXP: return L"RC4-HMAC-NT-EXP"; + default: return L"unknown"; } } @@ -200,7 +199,6 @@ static int tickets(void) const FILETIME *const filetimes[] = { (FILETIME*)&ticket.StartTime, (FILETIME*)&ticket.EndTime, (FILETIME*)&ticket.RenewTime }; const WCHAR *dates[3]; - const WCHAR *etype_text; format_dates_and_times(filetimes, dates, 3); @@ -211,16 +209,8 @@ static int tickets(void) ticket.ServerName.Length / sizeof(WCHAR), ticket.ServerName.Buffer, ticket.RealmName.Length / sizeof(WCHAR), ticket.RealmName.Buffer); - etype_text = get_etype_text(ticket.EncryptionType); wprintf(L" %ls: ", load_resource(STRING_ENCRYPTION_TYPE)); - if (etype_text) - { - wprintf(L"%s\n", etype_text); - } - else - { - wprintf(L"%ld\n", ticket.EncryptionType); - } + wprintf(L"%s\n", get_etype_text(ticket.EncryptionType)); wprintf(L" %ls: 0x%lx ->", load_resource(STRING_TICKET_FLAGS), ticket.TicketFlags); #define EXPAND_TICKET_FLAG(x) if (ticket.TicketFlags & KERB_TICKET_FLAGS_##x) wprintf(L" %ls", L ## #x)

1 0

Jacek Caban : win32u: Use user message packing for messages passing RECT struct.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: 1e409563c7f358bbedc9224b5d950fb6f2e66c21 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e409563c7f358bbedc9224b5d950f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 14:23:46 2023 +0200 win32u: Use user message packing for messages passing RECT struct. --- dlls/user32/winproc.c | 15 ++++++++------- dlls/win32u/message.c | 28 +++++++++++++++++++++++++--- dlls/win32u/tests/win32u.c | 16 ++++++++++++++-- dlls/wow64win/user.c | 5 +++++ 4 files changed, 52 insertions(+), 12 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 9f073fabb70..5d0e4eb5205 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -869,18 +869,11 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case SBM_SETSCROLLINFO: case SBM_GETSCROLLINFO: case SBM_GETSCROLLBARINFO: - break; - case WM_NOTIFY: - /* WM_NOTIFY cannot be sent across processes (MSDN) */ - return FALSE; case EM_GETRECT: case LB_GETITEMRECT: case CB_GETDROPPEDCONTROLRECT: - if (!get_buffer_space( buffer, sizeof(RECT), size )) return FALSE; - break; case EM_SETRECT: case EM_SETRECTNP: - minsize = sizeof(RECT); break; case EM_GETLINE: { @@ -982,6 +975,9 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, if (!(*wparam & 0x8000)) return TRUE; minsize = sizeof(DEV_BROADCAST_HDR); break; + case WM_NOTIFY: + /* WM_NOTIFY cannot be sent across processes (MSDN) */ + return FALSE; case WM_NCPAINT: if (*wparam <= 1) return TRUE; FIXME( "WM_NCPAINT hdc unpacking not supported\n" ); @@ -1089,6 +1085,11 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) case EM_GETSEL: case SBM_GETRANGE: case CB_GETEDITSEL: + case EM_GETRECT: + case LB_GETITEMRECT: + case CB_GETDROPPEDCONTROLRECT: + case EM_SETRECT: + case EM_SETRECTNP: { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 540c58797b9..cb6dac39bb6 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -574,6 +574,15 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa if (*lparam) *lparam = (LPARAM)((DWORD *)*buffer + 1); } return TRUE; + case EM_GETRECT: + case LB_GETITEMRECT: + case CB_GETDROPPEDCONTROLRECT: + if (!get_buffer_space( buffer, sizeof(RECT), size )) return FALSE; + break; + case EM_SETRECT: + case EM_SETRECTNP: + minsize = sizeof(RECT); + break; case WM_WINE_SETWINDOWPOS: { WINDOWPOS wp; @@ -1380,6 +1389,13 @@ size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL other case CB_GETEDITSEL: size = 2 * sizeof(DWORD); break; + case EM_GETRECT: + case LB_GETITEMRECT: + case CB_GETDROPPEDCONTROLRECT: + case EM_SETRECT: + case EM_SETRECTNP: + size = sizeof(RECT); + break; } return size; @@ -1442,6 +1458,8 @@ void pack_user_message( void *buffer, size_t size, UINT message, case EM_GETSEL: case SBM_GETRANGE: case CB_GETEDITSEL: + case EM_GETRECT: + case CB_GETDROPPEDCONTROLRECT: return; } @@ -1531,6 +1549,13 @@ static void copy_user_result( void *buffer, size_t size, LRESULT result, UINT me if (lparam) *(DWORD *)lparam = ptr[1]; break; } + case EM_GETRECT: + case EM_SETRECT: + case EM_SETRECTNP: + case LB_GETITEMRECT: + case CB_GETDROPPEDCONTROLRECT: + copy_size = sizeof(RECT); + break; default: return; } @@ -1558,9 +1583,6 @@ static void copy_reply( LRESULT result, HWND hwnd, UINT message, WPARAM wparam, case CB_GETCOMBOBOXINFO: copy_size = sizeof(COMBOBOXINFO); break; - case EM_GETRECT: - case LB_GETITEMRECT: - case CB_GETDROPPEDCONTROLRECT: case WM_SIZING: case WM_MOVING: copy_size = sizeof(RECT); diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index d2a298436d9..5ff755745f1 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1685,16 +1685,28 @@ static void test_wndproc_hook(void) .check_size = sizeof(RECT), .todo = TRUE }, + { + "EM_GETRECT", EM_GETRECT, + .lparam = &rect_in, .lparam_size = sizeof(RECT), .change_lparam = &rect_out, + }, + { + "EM_SETRECT", EM_SETRECT, + .lparam = &rect_in, .lparam_size = sizeof(RECT), .change_lparam = &rect_out, + .check_size = sizeof(RECT), + }, + { + "EM_SETRECTNP", EM_SETRECTNP, + .lparam = &rect_in, .lparam_size = sizeof(RECT), .change_lparam = &rect_out, + .check_size = sizeof(RECT), + }, { "LB_GETITEMRECT", LB_GETITEMRECT, .lparam = &rect_in, .lparam_size = sizeof(RECT), .change_lparam = &rect_out, .check_size = sizeof(RECT), - .todo = TRUE }, { "CB_GETDROPPEDCONTROLRECT", CB_GETDROPPEDCONTROLRECT, .lparam = &rect_in, .lparam_size = sizeof(RECT), .change_lparam = &rect_out, - .todo = TRUE }, { "WM_GETTEXT", WM_GETTEXT, .wparam = 8, diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 9685a51029d..37cb0caeae9 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -838,6 +838,11 @@ static size_t packed_result_32to64( UINT message, WPARAM wparam, const void *par case EM_GETSEL: case SBM_GETRANGE: case CB_GETEDITSEL: + case EM_SETRECT: + case EM_GETRECT: + case EM_SETRECTNP: + case LB_GETITEMRECT: + case CB_GETDROPPEDCONTROLRECT: break; default:

1 0

Jacek Caban : win32u: Use user message packing for EM_GETLINE.
by Alexandre Julliard July 31, 2023

July 31, 2023

Module: wine Branch: master Commit: a5c909221e3c17b59271f3d3cd50b151ae565232 URL: https://gitlab.winehq.org/wine/wine/-/commit/a5c909221e3c17b59271f3d3cd50b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 18 20:17:36 2023 +0200 win32u: Use user message packing for EM_GETLINE. --- dlls/user32/winproc.c | 11 ++--------- dlls/win32u/message.c | 26 ++++++++++++++++++++------ dlls/win32u/tests/win32u.c | 18 ++++++++++++++++++ dlls/wow64win/user.c | 1 + 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 5d0e4eb5205..202c955e152 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -874,16 +874,8 @@ BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lparam, case CB_GETDROPPEDCONTROLRECT: case EM_SETRECT: case EM_SETRECTNP: - break; case EM_GETLINE: - { - WORD len; - if (size < sizeof(WORD)) return FALSE; - len = *(WORD *)*buffer; - if (!get_buffer_space( buffer, (len + 1) * sizeof(WCHAR), size )) return FALSE; - *lparam = (LPARAM)*buffer + sizeof(WORD); /* don't erase WORD at start of buffer */ - return TRUE; - } + break; case EM_SETTABSTOPS: case LB_SETTABSTOPS: if (!*wparam) return TRUE; @@ -1090,6 +1082,7 @@ BOOL WINAPI User32CallWindowProc( struct win_proc_params *params, ULONG size ) case CB_GETDROPPEDCONTROLRECT: case EM_SETRECT: case EM_SETRECTNP: + case EM_GETLINE: { LRESULT *result_ptr = (LRESULT *)buffer - 1; *result_ptr = result; diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index cb6dac39bb6..d37b05ca1eb 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -583,6 +583,17 @@ static BOOL unpack_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM *lpa case EM_SETRECTNP: minsize = sizeof(RECT); break; + case EM_GETLINE: + { + WORD *len_ptr, len; + if (size < sizeof(WORD)) return FALSE; + len = *(WORD *)*buffer; + if (!get_buffer_space( buffer, (len + 1) * sizeof(WCHAR), size )) return FALSE; + len_ptr = *buffer; + len_ptr[0] = len_ptr[1] = len; + *lparam = (LPARAM)(len_ptr + 1); + return TRUE; + } case WM_WINE_SETWINDOWPOS: { WINDOWPOS wp; @@ -1396,6 +1407,9 @@ size_t user_message_size( UINT message, WPARAM wparam, LPARAM lparam, BOOL other case EM_SETRECTNP: size = sizeof(RECT); break; + case EM_GETLINE: + size = max( *(WORD *)lparam * char_size( ansi ), sizeof(WORD) ); + break; } return size; @@ -1461,6 +1475,9 @@ void pack_user_message( void *buffer, size_t size, UINT message, case EM_GETRECT: case CB_GETDROPPEDCONTROLRECT: return; + case EM_GETLINE: + size = sizeof(WORD); + break; } if (size) memcpy( buffer, lparam_ptr, size ); @@ -1556,6 +1573,9 @@ static void copy_user_result( void *buffer, size_t size, LRESULT result, UINT me case CB_GETDROPPEDCONTROLRECT: copy_size = sizeof(RECT); break; + case EM_GETLINE: + copy_size = string_size( buffer, ansi ); + break; default: return; } @@ -1587,12 +1607,6 @@ static void copy_reply( LRESULT result, HWND hwnd, UINT message, WPARAM wparam, case WM_MOVING: copy_size = sizeof(RECT); break; - case EM_GETLINE: - { - WORD *ptr = (WORD *)lparam; - copy_size = ptr[-1] * sizeof(WCHAR); - break; - } case LB_GETSELITEMS: copy_size = wparam * sizeof(UINT); break; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 5ff755745f1..4d88eeaee8b 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -1413,6 +1413,14 @@ static void check_params( const struct lparam_hook_test *test, UINT message, ok( wparam, "wparam = 0\n" ); break; + case EM_GETLINE: + if (!is_ret) + { + WCHAR *buf = (WCHAR *)lparam; + ok(buf[0] == 8, "buf[0] = %x\n", buf[0]); + } + break; + default: if (test->check_size) { const void *expected = is_ret && test->change_lparam ? test->change_lparam : test->lparam; @@ -1867,6 +1875,16 @@ static void test_wndproc_hook(void) .lparam_size = sizeof(DWORD), .lparam = &dw_in, .change_lparam = &dw_out, .check_size = sizeof(DWORD), }, + { + "EM_GETLINE", EM_GETLINE, .msg_result = 5, + .lparam = L"\x8""2345678", .lparam_size = sizeof(strbufW), .change_lparam = L"abc\0defg", + .check_size = sizeof(WCHAR), .check_lparam = L"abc\0""5678", + }, + { + "EM_GETLINE-2", EM_GETLINE, .msg_result = 1, + .lparam = L"\x8""2345678", .lparam_size = sizeof(strbufW), .change_lparam = L"abc\0defg", + .check_size = sizeof(WCHAR), .check_lparam = L"abc\0""5678", + }, /* messages that don't change lparam */ { "WM_USER", WM_USER }, { "WM_NOTIFY", WM_NOTIFY }, diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 37cb0caeae9..14b76649709 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -843,6 +843,7 @@ static size_t packed_result_32to64( UINT message, WPARAM wparam, const void *par case EM_SETRECTNP: case LB_GETITEMRECT: case CB_GETDROPPEDCONTROLRECT: + case EM_GETLINE: break; default:

1 0