May 2022 - Wine-commits - list.winehq.org

Georg Lehmann : winevulkan: Update to VK spec version 1.3.215.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: d617eecc0f5c5412ee7e0d25a29443715fcbb85e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d617eecc0f5c5412ee7e0d25… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue May 24 13:41:42 2022 +0200 winevulkan: Update to VK spec version 1.3.215. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 39 ++++++++++++++++++++------------------- dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 26 +++++++++++++++++++------- 4 files changed, 41 insertions(+), 28 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index da4c7033c40..b031492fbfd 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -64,7 +64,7 @@ from enum import Enum LOGGER = logging.Logger("vulkan") LOGGER.addHandler(logging.StreamHandler()) -VK_XML_VERSION = "1.3.214" +VK_XML_VERSION = "1.3.215" WINE_VK_VERSION = (1, 3) # Filenames to create. diff --git a/dlls/winevulkan/vulkan_thunks.c b/dlls/winevulkan/vulkan_thunks.c index fac36046250..68fd1aa0449 100644 --- a/dlls/winevulkan/vulkan_thunks.c +++ b/dlls/winevulkan/vulkan_thunks.c @@ -3472,22 +3472,6 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_NV: - { - const VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV *in = (const VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV *)in_header; - VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV *out; - - if (!(out = malloc(sizeof(*out)))) goto out_of_memory; - - out->sType = in->sType; - out->pNext = NULL; - out->fragmentShaderBarycentric = in->fragmentShaderBarycentric; - - out_header->pNext = (VkBaseOutStructure *)out; - out_header = out_header->pNext; - break; - } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV: { const VkPhysicalDeviceShaderImageFootprintFeaturesNV *in = (const VkPhysicalDeviceShaderImageFootprintFeaturesNV *)in_header; @@ -4743,6 +4727,22 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR: + { + const VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR *in = (const VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR *)in_header; + VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR *out; + + if (!(out = malloc(sizeof(*out)))) goto out_of_memory; + + out->sType = in->sType; + out->pNext = NULL; + out->fragmentShaderBarycentric = in->fragmentShaderBarycentric; + + out_header->pNext = (VkBaseOutStructure *)out; + out_header = out_header->pNext; + break; + } + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_MOTION_BLUR_FEATURES_NV: { const VkPhysicalDeviceRayTracingMotionBlurFeaturesNV *in = (const VkPhysicalDeviceRayTracingMotionBlurFeaturesNV *)in_header; @@ -4938,10 +4938,10 @@ VkResult convert_VkDeviceCreateInfo_struct_chain(const void *pNext, VkDeviceCrea break; } - case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_FEATURES_EXT: + case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_FEATURES_AMD: { - const VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT *in = (const VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT *)in_header; - VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT *out; + const VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD *in = (const VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD *)in_header; + VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD *out; if (!(out = malloc(sizeof(*out)))) goto out_of_memory; @@ -9954,6 +9954,7 @@ static const char * const vk_device_extensions[] = "VK_KHR_external_memory", "VK_KHR_external_semaphore", "VK_KHR_format_feature_flags2", + "VK_KHR_fragment_shader_barycentric", "VK_KHR_fragment_shading_rate", "VK_KHR_get_memory_requirements2", "VK_KHR_global_priority", diff --git a/dlls/winevulkan/winevulkan.json b/dlls/winevulkan/winevulkan.json index dd9784d9e77..b0e825c6e3e 100644 --- a/dlls/winevulkan/winevulkan.json +++ b/dlls/winevulkan/winevulkan.json @@ -2,6 +2,6 @@ "file_format_version": "1.0.0", "ICD": { "library_path": ".\\winevulkan.dll", - "api_version": "1.3.214" + "api_version": "1.3.215" } } diff --git a/include/wine/vulkan.h b/include/wine/vulkan.h index 7f5c6b2091a..2edcf9d03cf 100644 --- a/include/wine/vulkan.h +++ b/include/wine/vulkan.h @@ -437,6 +437,8 @@ #define VK_EXT_GRAPHICS_PIPELINE_LIBRARY_EXTENSION_NAME "VK_EXT_graphics_pipeline_library" #define VK_AMD_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_SPEC_VERSION 1 #define VK_AMD_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_EXTENSION_NAME "VK_AMD_shader_early_and_late_fragment_tests" +#define VK_KHR_FRAGMENT_SHADER_BARYCENTRIC_SPEC_VERSION 1 +#define VK_KHR_FRAGMENT_SHADER_BARYCENTRIC_EXTENSION_NAME "VK_KHR_fragment_shader_barycentric" #define VK_KHR_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_SPEC_VERSION 1 #define VK_KHR_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_EXTENSION_NAME "VK_KHR_shader_subgroup_uniform_control_flow" #define VK_KHR_ZERO_INITIALIZE_WORKGROUP_MEMORY_SPEC_VERSION 1 @@ -539,7 +541,7 @@ #define VK_API_VERSION_1_1 VK_MAKE_API_VERSION(0, 1, 1, 0) #define VK_API_VERSION_1_2 VK_MAKE_API_VERSION(0, 1, 2, 0) #define VK_API_VERSION_1_3 VK_MAKE_API_VERSION(0, 1, 3, 0) -#define VK_HEADER_VERSION 214 +#define VK_HEADER_VERSION 215 #define VK_HEADER_VERSION_COMPLETE VK_MAKE_API_VERSION(0, 1, 3, VK_HEADER_VERSION) #define VK_DEFINE_HANDLE(object) typedef struct object##_T* object; #define VK_USE_64_BIT_PTR_DEFINES 0 @@ -3648,7 +3650,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_COMPUTE_SHADER_DERIVATIVES_FEATURES_NV = 1000201000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_FEATURES_NV = 1000202000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MESH_SHADER_PROPERTIES_NV = 1000202001, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_NV = 1000203000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR = 1000203000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_IMAGE_FOOTPRINT_FEATURES_NV = 1000204000, VK_STRUCTURE_TYPE_PIPELINE_VIEWPORT_EXCLUSIVE_SCISSOR_STATE_CREATE_INFO_NV = 1000205000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXCLUSIVE_SCISSOR_FEATURES_NV = 1000205002, @@ -3773,7 +3775,8 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_FEATURES_EXT = 1000320000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_GRAPHICS_PIPELINE_LIBRARY_PROPERTIES_EXT = 1000320001, VK_STRUCTURE_TYPE_GRAPHICS_PIPELINE_LIBRARY_CREATE_INFO_EXT = 1000320002, - VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_FEATURES_EXT = 1000321000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_EARLY_AND_LATE_FRAGMENT_TESTS_FEATURES_AMD = 1000321000, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_PROPERTIES_KHR = 1000322000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_SUBGROUP_UNIFORM_CONTROL_FLOW_FEATURES_KHR = 1000323000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_ZERO_INITIALIZE_WORKGROUP_MEMORY_FEATURES = 1000325000, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADING_RATE_ENUMS_PROPERTIES_NV = 1000326000, @@ -3960,6 +3963,7 @@ typedef enum VkStructureType VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FLOAT_CONTROLS_PROPERTIES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_STENCIL_RESOLVE_PROPERTIES, VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE_KHR = VK_STRUCTURE_TYPE_SUBPASS_DESCRIPTION_DEPTH_STENCIL_RESOLVE, + VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_NV = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_SHADER_BARYCENTRIC_FEATURES_KHR, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_FEATURES, VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES_KHR = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TIMELINE_SEMAPHORE_PROPERTIES, VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO_KHR = VK_STRUCTURE_TYPE_SEMAPHORE_TYPE_CREATE_INFO, @@ -6557,12 +6561,20 @@ typedef struct VkPhysicalDeviceFragmentDensityMapPropertiesEXT VkBool32 fragmentDensityInvocations; } VkPhysicalDeviceFragmentDensityMapPropertiesEXT; -typedef struct VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV +typedef struct VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR { VkStructureType sType; void *pNext; VkBool32 fragmentShaderBarycentric; -} VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV; +} VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR; +typedef VkPhysicalDeviceFragmentShaderBarycentricFeaturesKHR VkPhysicalDeviceFragmentShaderBarycentricFeaturesNV; + +typedef struct VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR +{ + VkStructureType sType; + void *pNext; + VkBool32 triStripVertexOrderIndependentOfProvokingVertex; +} VkPhysicalDeviceFragmentShaderBarycentricPropertiesKHR; typedef struct VkPhysicalDeviceFragmentShaderInterlockFeaturesEXT { @@ -7429,12 +7441,12 @@ typedef struct VkPhysicalDeviceShaderDrawParametersFeatures } VkPhysicalDeviceShaderDrawParametersFeatures; typedef VkPhysicalDeviceShaderDrawParametersFeatures VkPhysicalDeviceShaderDrawParameterFeatures; -typedef struct VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT +typedef struct VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD { VkStructureType sType; void *pNext; VkBool32 shaderEarlyAndLateFragmentTests; -} VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesEXT; +} VkPhysicalDeviceShaderEarlyAndLateFragmentTestsFeaturesAMD; typedef struct VkPhysicalDeviceShaderFloat16Int8Features {

1 0

Jacek Caban : winemac: Use NtUserSetClipboardData to import clipboard data.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 11ee4f3fabbf2f1fccad21dcb836d7c114b0f34f URL: https://source.winehq.org/git/wine.git/?a=commit;h=11ee4f3fabbf2f1fccad21dc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat May 21 23:02:29 2022 +0200 winemac: Use NtUserSetClipboardData to import clipboard data. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/clipboard.c | 153 ++++++++++++++++--------------------------- 1 file changed, 55 insertions(+), 98 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=11ee4f3fabbf2f1fccad…

1 0

Jacek Caban : winex11: Properly initialize set_clipboard_params struct.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 08f5d2adf9c6e9d9e479cc668bfa03e54fd5bedd URL: https://source.winehq.org/git/wine.git/?a=commit;h=08f5d2adf9c6e9d9e479cc66… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue May 24 01:28:51 2022 +0200 winex11: Properly initialize set_clipboard_params struct. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winex11.drv/clipboard.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 80c3e8520d3..f2be4386e65 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -1337,11 +1337,10 @@ static BOOL render_format( UINT id ) for (i = 0; i < nb_current_x11_formats; i++) { - struct set_clipboard_params params; + struct set_clipboard_params params = { 0 }; if (current_x11_formats[i]->id != id) continue; if (!(params.data = import_selection( display, import_window, current_selection, current_x11_formats[i], &params.size ))) continue; - params.seqno = 0; NtUserSetClipboardData( id, 0, &params ); if (params.size) free( params.data ); return TRUE;

1 0

Jacek Caban : winemac: Store driver thread data pointer in TEB.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 47e5a0bb5d8aef98557ddf65d10674e3b03877f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47e5a0bb5d8aef98557ddf65… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 23 20:32:11 2022 +0200 winemac: Store driver thread data pointer in TEB. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winemac.drv/macdrv.h | 4 +--- dlls/winemac.drv/macdrv_main.c | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h index 68ab74dc56e..04a8af81c53 100644 --- a/dlls/winemac.drv/macdrv.h +++ b/dlls/winemac.drv/macdrv.h @@ -114,13 +114,11 @@ struct macdrv_thread_data WORD keyc2scan[128]; }; -extern DWORD thread_data_tls_index DECLSPEC_HIDDEN; - extern struct macdrv_thread_data *macdrv_init_thread_data(void) DECLSPEC_HIDDEN; static inline struct macdrv_thread_data *macdrv_thread_data(void) { - return TlsGetValue(thread_data_tls_index); + return NtUserGetThreadInfo()->driver_data; } diff --git a/dlls/winemac.drv/macdrv_main.c b/dlls/winemac.drv/macdrv_main.c index 2f05e55cb23..8c101576e99 100644 --- a/dlls/winemac.drv/macdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -46,8 +46,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(macdrv); C_ASSERT(NUM_EVENT_TYPES <= sizeof(macdrv_event_mask) * 8); -DWORD thread_data_tls_index = TLS_OUT_OF_INDEXES; - int topmost_float_inactive = TOPMOST_FLOAT_INACTIVE_NONFULLSCREEN; int capture_displays_for_fullscreen = 0; BOOL skip_single_buffer_flushes = FALSE; @@ -463,8 +461,6 @@ static BOOL process_attach(void) setup_options(); load_strings(macdrv_module); - if ((thread_data_tls_index = TlsAlloc()) == TLS_OUT_OF_INDEXES) return FALSE; - macdrv_err_on = ERR_ON(macdrv); if (macdrv_start_cocoa_app(GetTickCount64())) { @@ -493,7 +489,7 @@ void macdrv_ThreadDetach(void) CFRelease(data->keyboard_layout_uchr); HeapFree(GetProcessHeap(), 0, data); /* clear data in case we get re-entered from user32 before the thread is truly dead */ - TlsSetValue(thread_data_tls_index, NULL); + NtUserGetThreadInfo()->driver_data = 0; } } @@ -556,7 +552,7 @@ struct macdrv_thread_data *macdrv_init_thread_data(void) macdrv_compute_keyboard_layout(data); set_queue_display_fd(macdrv_get_event_queue_fd(data->queue)); - TlsSetValue(thread_data_tls_index, data); + NtUserGetThreadInfo()->driver_data = data; NtUserActivateKeyboardLayout(data->active_keyboard_layout, 0); return data;

1 0

Rémi Bernon : ntdll: Merge HEAP_InsertFreeBlock with create_free_block.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 66036effdf8f017a0e0f2bea0f830f6054691ee7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=66036effdf8f017a0e0f2bea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 4 20:50:48 2022 +0200 ntdll: Merge HEAP_InsertFreeBlock with create_free_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 767a010d93e..5fe23a3502e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -595,28 +595,6 @@ static HEAP *HEAP_GetPtr( } -/*********************************************************************** - * HEAP_InsertFreeBlock - * - * Insert a free block into the free list. - */ -static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL last ) -{ - SIZE_T block_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); - struct entry *list = find_free_list( heap, block_size, last ); - if (last) - { - /* insert at end of free list, i.e. before the next free list entry */ - list_add_before( &list->entry, &pArena->entry ); - } - else - { - /* insert at head of free list */ - list_add_after( &list->entry, &pArena->entry ); - } -} - - static SUBHEAP *find_subheap( const HEAP *heap, const struct block *block, BOOL heap_walk ) { SUBHEAP *subheap; @@ -692,7 +670,7 @@ static inline BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr ) static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T block_size ) { const char *end = (char *)block + block_size, *commit_end = subheap_commit_end( subheap ); - struct entry *entry = (struct entry *)block; + struct entry *entry = (struct entry *)block, *list; HEAP *heap = subheap->heap; DWORD flags = heap->flags; struct block *next; @@ -724,7 +702,9 @@ static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T blo *((struct block **)next - 1) = block; } - HEAP_InsertFreeBlock( heap, entry, !next ); + list = find_free_list( heap, block_get_size( block ), !next ); + if (!next) list_add_before( &list->entry, &entry->entry ); + else list_add_after( &list->entry, &entry->entry ); }

1 0

Rémi Bernon : ntdll: Cleanup and rename HEAP_MakeInUseBlockFree to free_used_block.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: a87d0211487a61eda3821c345b44880603d46b54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a87d0211487a61eda3821c34… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 08:59:57 2022 +0200 ntdll: Cleanup and rename HEAP_MakeInUseBlockFree to free_used_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 71 ++++++++++++++++++++----------------------------------- 1 file changed, 26 insertions(+), 45 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 5fe23a3502e..51fdbc370f5 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -708,70 +708,51 @@ static void create_free_block( SUBHEAP *subheap, struct block *block, SIZE_T blo } -/*********************************************************************** - * HEAP_MakeInUseBlockFree - * - * Turn an in-use block into a free block. Can also decommit the end of - * the heap, and possibly even free the sub-heap altogether. - */ -static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) +static void free_used_block( SUBHEAP *subheap, struct block *block ) { HEAP *heap = subheap->heap; - ARENA_FREE *pFree; - SIZE_T size; + struct entry *entry; + SIZE_T block_size; if (heap->pending_free) { - ARENA_INUSE *prev = heap->pending_free[heap->pending_pos]; - heap->pending_free[heap->pending_pos] = pArena; + struct block *tmp = heap->pending_free[heap->pending_pos]; + heap->pending_free[heap->pending_pos] = block; heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; - block_set_type( pArena, ARENA_PENDING_MAGIC ); - mark_block_free( pArena + 1, pArena->size & ARENA_SIZE_MASK, heap->flags ); - if (!prev) return; - pArena = prev; - subheap = find_subheap( heap, pArena, FALSE ); + block_set_type( block, ARENA_PENDING_MAGIC ); + mark_block_free( block + 1, block->size & ARENA_SIZE_MASK, heap->flags ); + if (!(block = tmp) || !(subheap = find_subheap( heap, block, FALSE ))) return; } - /* Check if we can merge with previous block */ - - size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); - if (pArena->size & ARENA_FLAG_PREV_FREE) + block_size = (block->size & ARENA_SIZE_MASK) + sizeof(*block); + if (block->size & ARENA_FLAG_PREV_FREE) { - pFree = *((ARENA_FREE **)pArena - 1); - size += (pFree->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE); - /* Remove it from the free list */ - list_remove( &pFree->entry ); + /* merge with previous block if it is free */ + block = *((struct block **)block - 1); + block_size += (block->size & ARENA_SIZE_MASK) + sizeof(*entry); + entry = (struct entry *)block; + list_remove( &entry->entry ); } - else pFree = (ARENA_FREE *)pArena; - - /* Create a free block */ - - create_free_block( subheap, (struct block *)pFree, size ); - size = (pFree->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE); - if ((char *)pFree + size < (char *)subheap->base + subheap->size) - return; /* Not the last block, so nothing more to do */ + else entry = (struct entry *)block; - /* Free the whole sub-heap if it's empty and not the original one */ + create_free_block( subheap, block, block_size ); + block_size = (block->size & ARENA_SIZE_MASK) + sizeof(*entry); + if ((char *)block + block_size < (char *)subheap->base + subheap->size) return; /* not the last block */ - if (((char *)pFree == (char *)subheap->base + subheap->headerSize) && + if (((char *)block == (char *)subheap->base + subheap->headerSize) && (subheap != &subheap->heap->subheap)) { + /* free the subheap if it's empty and not the main one */ void *addr = subheap->base; + SIZE_T size = 0; - size = 0; - /* Remove the free block from the list */ - list_remove( &pFree->entry ); - /* Remove the subheap from the list */ + list_remove( &entry->entry ); list_remove( &subheap->entry ); - /* Free the memory */ - subheap->magic = 0; NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); return; } - /* Decommit the end of the heap */ - - if (!(subheap->heap->shared)) HEAP_Decommit( subheap, pFree + 1 ); + if (!heap->shared) HEAP_Decommit( subheap, entry + 1 ); } @@ -1568,7 +1549,7 @@ static NTSTATUS heap_free( HEAP *heap, void *ptr ) if (!(block = unsafe_block_from_ptr( heap, ptr, &subheap ))) return STATUS_INVALID_PARAMETER; if (!subheap) free_large_block( heap, ptr ); - else HEAP_MakeInUseBlockFree( subheap, block ); + else free_used_block( subheap, block ); return STATUS_SUCCESS; } @@ -1640,7 +1621,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size memcpy( *ret, block + 1, old_size ); if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + old_size, 0, size - old_size ); notify_free( ptr ); - HEAP_MakeInUseBlockFree( subheap, block ); + free_used_block( subheap, block ); return STATUS_SUCCESS; } }

1 0

Rémi Bernon : ntdll: Use block helpers in free_used_block.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: d0ad5d6a9c68449b999247e42a8a38c61bcdac53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0ad5d6a9c68449b999247e4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 24 08:44:11 2022 +0200 ntdll: Use block helpers in free_used_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 51fdbc370f5..1093fde41ca 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -720,39 +720,35 @@ static void free_used_block( SUBHEAP *subheap, struct block *block ) heap->pending_free[heap->pending_pos] = block; heap->pending_pos = (heap->pending_pos + 1) % MAX_FREE_PENDING; block_set_type( block, ARENA_PENDING_MAGIC ); - mark_block_free( block + 1, block->size & ARENA_SIZE_MASK, heap->flags ); + mark_block_free( block + 1, block_get_size( block ) - sizeof(*block), heap->flags ); if (!(block = tmp) || !(subheap = find_subheap( heap, block, FALSE ))) return; } - block_size = (block->size & ARENA_SIZE_MASK) + sizeof(*block); - if (block->size & ARENA_FLAG_PREV_FREE) + block_size = block_get_size( block ); + if (block_get_flags( block ) & ARENA_FLAG_PREV_FREE) { /* merge with previous block if it is free */ block = *((struct block **)block - 1); - block_size += (block->size & ARENA_SIZE_MASK) + sizeof(*entry); + block_size += block_get_size( block ); entry = (struct entry *)block; list_remove( &entry->entry ); } else entry = (struct entry *)block; create_free_block( subheap, block, block_size ); - block_size = (block->size & ARENA_SIZE_MASK) + sizeof(*entry); - if ((char *)block + block_size < (char *)subheap->base + subheap->size) return; /* not the last block */ + if (next_block( subheap, block )) return; /* not the last block */ - if (((char *)block == (char *)subheap->base + subheap->headerSize) && - (subheap != &subheap->heap->subheap)) + if (block == first_block( subheap ) && subheap != &heap->subheap) { /* free the subheap if it's empty and not the main one */ - void *addr = subheap->base; + void *addr = subheap_base( subheap ); SIZE_T size = 0; list_remove( &entry->entry ); list_remove( &subheap->entry ); NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); - return; } - - if (!heap->shared) HEAP_Decommit( subheap, entry + 1 ); + else if (!heap->shared) HEAP_Decommit( subheap, entry + 1 ); }

1 0

Rémi Bernon : ntdll: Move subheap decommit hysteresis to free_used_block.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 2c46ee18904b6fef0110d61dabf95046e9e88f2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c46ee18904b6fef0110d61d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 24 08:54:04 2022 +0200 ntdll: Move subheap decommit hysteresis to free_used_block. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 1093fde41ca..8e578d19d05 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -649,8 +649,7 @@ static inline BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr ) SIZE_T decommit_size; SIZE_T size = (char *)ptr - (char *)subheap->base; - /* round to next block and add one full block */ - size = ((size + COMMIT_MASK) & ~COMMIT_MASK) + COMMIT_MASK + 1; + size = ((size + COMMIT_MASK) & ~COMMIT_MASK); size = max( size, subheap->min_commit ); if (size >= subheap->commitSize) return TRUE; decommit_size = subheap->commitSize - size; @@ -748,7 +747,11 @@ static void free_used_block( SUBHEAP *subheap, struct block *block ) list_remove( &subheap->entry ); NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_RELEASE ); } - else if (!heap->shared) HEAP_Decommit( subheap, entry + 1 ); + else if (!heap->shared) + { + /* keep room for a full commited block as hysteresis */ + HEAP_Decommit( subheap, (char *)(entry + 1) + (COMMIT_MASK + 1) ); + } }

1 0

Rémi Bernon : ntdll: Use the subheap helpers in HEAP_Commit / HEAP_Decommit.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: 37b1011135b590e9ce885f23454ec16b6f786b01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37b1011135b590e9ce885f23… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 24 08:47:11 2022 +0200 ntdll: Use the subheap helpers in HEAP_Commit / HEAP_Decommit. And rename them to subheap_commit / subheap_decommit. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 81 +++++++++++++++++++++++++++---------------------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 8e578d19d05..40fbd379772 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -125,6 +125,7 @@ typedef struct C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); +#define ROUND_ADDR(addr, mask) ((void *)((UINT_PTR)(addr) & ~(UINT_PTR)(mask))) #define ROUND_SIZE(size) ((((size) + ALIGNMENT - 1) & ~(ALIGNMENT-1)) + ARENA_OFFSET) /* minimum data size (without arenas) of an allocated block */ @@ -612,56 +613,54 @@ static SUBHEAP *find_subheap( const HEAP *heap, const struct block *block, BOOL } -/*********************************************************************** - * HEAP_Commit - * - * Make sure the heap storage is committed for a given size in the specified arena. - */ -static inline BOOL HEAP_Commit( SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T data_size ) -{ - void *ptr = (char *)(pArena + 1) + data_size + sizeof(ARENA_FREE); - SIZE_T size = (char *)ptr - (char *)subheap->base; - size = (size + COMMIT_MASK) & ~COMMIT_MASK; - if (size > subheap->size) size = subheap->size; - if (size <= subheap->commitSize) return TRUE; - size -= subheap->commitSize; - ptr = (char *)subheap->base + subheap->commitSize; - if (NtAllocateVirtualMemory( NtCurrentProcess(), &ptr, 0, - &size, MEM_COMMIT, get_protection_type( subheap->heap->flags ) )) - { - WARN("Could not commit %08lx bytes at %p for heap %p\n", - size, ptr, subheap->heap ); +static inline BOOL subheap_commit( SUBHEAP *subheap, const struct block *block, SIZE_T data_size ) +{ + const char *end = (char *)subheap_base( subheap ) + subheap_size( subheap ), *commit_end; + HEAP *heap = subheap->heap; + ULONG flags = heap->flags; + SIZE_T size; + void *addr; + + commit_end = (char *)(block + 1) + data_size + sizeof(ARENA_FREE); + commit_end = ROUND_ADDR((char *)commit_end + COMMIT_MASK, COMMIT_MASK); + + if (commit_end > end) commit_end = end; + if (commit_end <= (char *)subheap_commit_end( subheap )) return TRUE; + + addr = (void *)subheap_commit_end( subheap ); + size = commit_end - (char *)addr; + + if (NtAllocateVirtualMemory( NtCurrentProcess(), &addr, 0, &size, MEM_COMMIT, + get_protection_type( flags ) )) + { + WARN( "Could not commit %#Ix bytes at %p for heap %p\n", size, addr, heap ); return FALSE; } - subheap->commitSize += size; + + subheap->commitSize = (char *)commit_end - (char *)subheap_base( subheap ); return TRUE; } - -/*********************************************************************** - * HEAP_Decommit - * - * If possible, decommit the heap storage from (including) 'ptr'. - */ -static inline BOOL HEAP_Decommit( SUBHEAP *subheap, void *ptr ) +static inline BOOL subheap_decommit( SUBHEAP *subheap, const void *commit_end ) { + HEAP *heap = subheap->heap; + SIZE_T size; void *addr; - SIZE_T decommit_size; - SIZE_T size = (char *)ptr - (char *)subheap->base; - size = ((size + COMMIT_MASK) & ~COMMIT_MASK); - size = max( size, subheap->min_commit ); - if (size >= subheap->commitSize) return TRUE; - decommit_size = subheap->commitSize - size; - addr = (char *)subheap->base + size; + commit_end = ROUND_ADDR((char *)commit_end + COMMIT_MASK, COMMIT_MASK); + commit_end = max( (char *)commit_end, (char *)subheap_base( subheap ) + subheap->min_commit ); + if (commit_end >= subheap_commit_end( subheap )) return TRUE; - if (NtFreeVirtualMemory( NtCurrentProcess(), &addr, &decommit_size, MEM_DECOMMIT )) + size = (char *)subheap_commit_end( subheap ) - (char *)commit_end; + addr = (void *)commit_end; + + if (NtFreeVirtualMemory( NtCurrentProcess(), &addr, &size, MEM_DECOMMIT )) { - WARN("Could not decommit %08lx bytes at %p for heap %p\n", - decommit_size, (char *)subheap->base + size, subheap->heap ); + WARN( "Could not decommit %#Ix bytes at %p for heap %p\n", size, addr, heap ); return FALSE; } - subheap->commitSize -= decommit_size; + + subheap->commitSize = (char *)commit_end - (char *)subheap_base( subheap ); return TRUE; } @@ -750,7 +749,7 @@ static void free_used_block( SUBHEAP *subheap, struct block *block ) else if (!heap->shared) { /* keep room for a full commited block as hysteresis */ - HEAP_Decommit( subheap, (char *)(entry + 1) + (COMMIT_MASK + 1) ); + subheap_decommit( subheap, (char *)(entry + 1) + (COMMIT_MASK + 1) ); } } @@ -1032,7 +1031,7 @@ static struct block *find_free_block( HEAP *heap, SIZE_T data_size, SUBHEAP **su if (block_get_size( block ) - sizeof(*block) >= data_size) { *subheap = find_subheap( heap, block, FALSE ); - if (!HEAP_Commit( *subheap, block, data_size )) return NULL; + if (!subheap_commit( *subheap, block, data_size )) return NULL; list_remove( &entry->entry ); return block; } @@ -1609,7 +1608,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size struct entry *entry = (struct entry *)next; list_remove( &entry->entry ); old_data_size += block_get_size( next ); - if (!HEAP_Commit( subheap, block, data_size )) return STATUS_NO_MEMORY; + if (!subheap_commit( subheap, block, data_size )) return STATUS_NO_MEMORY; notify_realloc( block + 1, old_size, size ); shrink_used_block( subheap, block, block_get_flags( block ), old_data_size, data_size, size ); }

1 0

Rémi Bernon : ntdll: Introduce a new subheap_overhead helper.
by Alexandre Julliard 24 May '22

24 May '22

Module: wine Branch: master Commit: c2b89fd77615334d1c4abd3cd81905731657b6fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2b89fd77615334d1c4abd3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat May 21 08:54:03 2022 +0200 ntdll: Introduce a new subheap_overhead helper. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/ntdll/heap.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 40fbd379772..540625bff27 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -271,6 +271,11 @@ static inline SIZE_T subheap_size( const SUBHEAP *subheap ) return subheap->size; } +static inline SIZE_T subheap_overhead( const SUBHEAP *subheap ) +{ + return subheap->headerSize; +} + static inline const void *subheap_commit_end( const SUBHEAP *subheap ) { return (char *)subheap_base( subheap ) + subheap->commitSize; @@ -499,7 +504,7 @@ static void heap_dump( const HEAP *heap ) if (!check_subheap( subheap )) return; - overhead += (char *)first_block( subheap ) - base; + overhead += subheap_overhead( subheap ); for (block = first_block( subheap ); block; block = next_block( subheap, block )) { if (block_get_flags( block ) & ARENA_FLAG_FREE) @@ -1008,7 +1013,7 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* Create the first free block */ - create_free_block( subheap, first_block( subheap ), subheap->size - subheap->headerSize ); + create_free_block( subheap, first_block( subheap ), subheap_size( subheap ) - subheap_overhead( subheap ) ); return subheap; } @@ -1863,7 +1868,7 @@ static NTSTATUS heap_walk( const HEAP *heap, struct rtl_heap_entry *entry ) subheap = LIST_ENTRY( next, SUBHEAP, entry ); base = subheap_base( subheap ); entry->lpData = base; - entry->cbData = (char *)first_block( subheap ) - base; + entry->cbData = subheap_overhead( subheap ); entry->cbOverhead = 0; entry->iRegionIndex = 0; entry->wFlags = RTL_HEAP_ENTRY_REGION;

1 0