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

Rémi Bernon : ntdll: Mask block flags when computing HEAP_InsertFreeBlock size.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: ba21d8fd5472e7c304bb65775a954a16771f7442 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba21d8fd5472e7c304bb6577… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 18:31:28 2022 +0200 ntdll: Mask block flags when computing HEAP_InsertFreeBlock size. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 6e64d0d7dfb..8706b0f7774 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -586,7 +586,8 @@ static HEAP *HEAP_GetPtr( */ static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL last ) { - FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( pArena->size + sizeof(*pArena) ); + SIZE_T block_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); + FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( block_size ); if (last) { /* insert at end of free list, i.e. before the next free list entry */

1 0

Rémi Bernon : ntdll: Set ARENA_FLAG_FREE flag in HEAP_CreateFreeBlock.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 523da9157f7d202da43fed36424651b1ca37e734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=523da9157f7d202da43fed36… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 2 14:20:56 2022 +0200 ntdll: Set ARENA_FLAG_FREE flag in HEAP_CreateFreeBlock. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 8706b0f7774..89c32fe4fa9 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -600,7 +600,6 @@ static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL la /* insert at head of free list */ list_add_after( &pEntry->arena.entry, &pArena->entry ); } - pArena->size |= ARENA_FLAG_FREE; } @@ -726,7 +725,7 @@ static void HEAP_CreateFreeBlock( SUBHEAP *subheap, void *ptr, SIZE_T size ) /* Last, insert the new block into the free list */ - pFree->size = size - sizeof(*pFree); + pFree->size = (size - sizeof(*pFree)) | ARENA_FLAG_FREE; HEAP_InsertFreeBlock( subheap->heap, pFree, last ); }

1 0

Rémi Bernon : ntdll: Move the main subheap after the free lists.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: f00da96a0112f101f20a5213aa6568bb72c8d7bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=f00da96a0112f101f20a5213… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun May 1 17:48:06 2022 +0200 ntdll: Move the main subheap after the free lists. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 89c32fe4fa9..4425b0cd91e 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -186,7 +186,6 @@ typedef struct tagHEAP /* end of the Windows 10 compatible struct layout */ BOOL shared; /* System shared heap */ - SUBHEAP subheap; /* First sub-heap */ struct list entry; /* Entry in process heap list */ struct list subheap_list; /* Sub-heap list */ struct list large_list; /* Large blocks list */ @@ -195,7 +194,8 @@ typedef struct tagHEAP DWORD pending_pos; /* Position in pending free requests ring */ ARENA_INUSE **pending_free; /* Ring buffer for pending free requests */ RTL_CRITICAL_SECTION cs; - FREE_LIST_ENTRY *freeList; /* Free lists */ + FREE_LIST_ENTRY freeList[HEAP_NB_FREE_LISTS]; + SUBHEAP subheap; } HEAP; #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) @@ -1008,8 +1008,6 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, /* Build the free lists */ - heap->freeList = (FREE_LIST_ENTRY *)((char *)heap + subheap->headerSize); - subheap->headerSize += HEAP_NB_FREE_LISTS * sizeof(FREE_LIST_ENTRY); list_init( &heap->freeList[0].arena.entry ); for (i = 0, pEntry = heap->freeList; i < HEAP_NB_FREE_LISTS; i++, pEntry++) {

1 0

Rémi Bernon : ntdll: Return an entry pointer when looking for a free list.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 1bb92df7c437c83cd0a23b9a6c9691af68dc70da URL: https://source.winehq.org/git/wine.git/?a=commit;h=1bb92df7c437c83cd0a23b9a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 19:54:00 2022 +0200 ntdll: Return an entry pointer when looking for a free list. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 4425b0cd91e..55eb6a328fd 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -401,16 +401,19 @@ static void notify_free_all( SUBHEAP *subheap ) /* locate a free list entry of the appropriate size */ /* size is the size of the whole block including the arena header */ -static inline unsigned int get_freelist_index( SIZE_T size ) +static inline struct entry *find_free_list( HEAP *heap, SIZE_T size, BOOL last ) { + FREE_LIST_ENTRY *list, *end = heap->freeList + ARRAY_SIZE(heap->freeList); unsigned int i; if (size <= HEAP_MAX_SMALL_FREE_LIST) - return (size - HEAP_MIN_ARENA_SIZE) / ALIGNMENT; - - for (i = HEAP_NB_SMALL_FREE_LISTS; i < HEAP_NB_FREE_LISTS - 1; i++) + i = (size - HEAP_MIN_ARENA_SIZE) / ALIGNMENT; + else for (i = HEAP_NB_SMALL_FREE_LISTS; i < HEAP_NB_FREE_LISTS - 1; i++) if (size <= HEAP_freeListSizes[i - HEAP_NB_SMALL_FREE_LISTS]) break; - return i; + + list = heap->freeList + i; + if (last && ++list == end) list = heap->freeList; + return &list->arena; } /* get the memory protection type to use for a given heap */ @@ -587,18 +590,16 @@ static HEAP *HEAP_GetPtr( static inline void HEAP_InsertFreeBlock( HEAP *heap, ARENA_FREE *pArena, BOOL last ) { SIZE_T block_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(*pArena); - FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( block_size ); + 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 */ - pEntry++; - if (pEntry == &heap->freeList[HEAP_NB_FREE_LISTS]) pEntry = heap->freeList; - list_add_before( &pEntry->arena.entry, &pArena->entry ); + list_add_before( &list->entry, &pArena->entry ); } else { /* insert at head of free list */ - list_add_after( &pEntry->arena.entry, &pArena->entry ); + list_add_after( &list->entry, &pArena->entry ); } } @@ -1065,14 +1066,14 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, */ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T data_size, SUBHEAP **ppSubHeap ) { + struct entry *entry = find_free_list( heap, data_size + sizeof(ARENA_INUSE), FALSE ); SUBHEAP *subheap; struct list *ptr; SIZE_T total_size; - FREE_LIST_ENTRY *pEntry = heap->freeList + get_freelist_index( data_size + sizeof(ARENA_INUSE) ); /* Find a suitable free list, and in it find a block large enough */ - ptr = &pEntry->arena.entry; + ptr = &entry->entry; while ((ptr = list_next( &heap->freeList[0].arena.entry, ptr ))) { ARENA_FREE *pArena = LIST_ENTRY( ptr, ARENA_FREE, entry );

1 0

Rémi Bernon : ntdll: Remove entries from the free list in HEAP_FindFreeBlock.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 47f7dfcc2c726885951ae72223f7956f2183a965 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47f7dfcc2c726885951ae722… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue May 3 19:54:27 2022 +0200 ntdll: Remove entries from the free list in HEAP_FindFreeBlock. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 55eb6a328fd..472f8f11adc 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1067,23 +1067,24 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T data_size, SUBHEAP **ppSubHeap ) { struct entry *entry = find_free_list( heap, data_size + sizeof(ARENA_INUSE), FALSE ); + SIZE_T total_size, arena_size; + ARENA_FREE *pArena; SUBHEAP *subheap; struct list *ptr; - SIZE_T total_size; /* Find a suitable free list, and in it find a block large enough */ ptr = &entry->entry; while ((ptr = list_next( &heap->freeList[0].arena.entry, ptr ))) { - ARENA_FREE *pArena = LIST_ENTRY( ptr, ARENA_FREE, entry ); - SIZE_T arena_size = (pArena->size & ARENA_SIZE_MASK) + - sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); + pArena = LIST_ENTRY( ptr, ARENA_FREE, entry ); + arena_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); if (arena_size >= data_size) { subheap = find_subheap( heap, (struct block *)pArena, FALSE ); if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, data_size )) return NULL; *ppSubHeap = subheap; + list_remove( &pArena->entry ); return pArena; } } @@ -1120,7 +1121,9 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T data_size, SUBHEAP **p subheap, subheap->size, heap ); *ppSubHeap = subheap; - return (ARENA_FREE *)((char *)subheap->base + subheap->headerSize); + pArena = (ARENA_FREE *)((char *)subheap->base + subheap->headerSize); + list_remove( &pArena->entry ); + return pArena; } @@ -1553,10 +1556,6 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret if (!(entry = HEAP_FindFreeBlock( heap, data_size, &subheap ))) return STATUS_NO_MEMORY; - /* Remove the arena from the free list */ - - list_remove( &entry->entry ); - /* Build the in-use arena */ block = (struct block *)entry;

1 0

Rémi Bernon : ntdll: Cleanup HEAP_FindFreeBlock and rename it to find_free_block.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: fd5c680abec09d1dbccb06a7a14b070a27deeca2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd5c680abec09d1dbccb06a7… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 20 00:11:36 2022 +0200 ntdll: Cleanup HEAP_FindFreeBlock and rename it to find_free_block. Returning a struct block pointer directly. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 57 +++++++++++++++++++------------------------------------ 1 file changed, 20 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 472f8f11adc..96bb0d0c027 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1058,34 +1058,24 @@ static SUBHEAP *HEAP_CreateSubHeap( HEAP *heap, LPVOID address, DWORD flags, } -/*********************************************************************** - * HEAP_FindFreeBlock - * - * Find a free block at least as large as the requested size, and make sure - * the requested size is committed. - */ -static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T data_size, SUBHEAP **ppSubHeap ) +static struct block *find_free_block( HEAP *heap, SIZE_T data_size, SUBHEAP **subheap ) { - struct entry *entry = find_free_list( heap, data_size + sizeof(ARENA_INUSE), FALSE ); + struct list *ptr = &find_free_list( heap, data_size + sizeof(ARENA_INUSE), FALSE )->entry; SIZE_T total_size, arena_size; - ARENA_FREE *pArena; - SUBHEAP *subheap; - struct list *ptr; + struct entry *entry; /* Find a suitable free list, and in it find a block large enough */ - ptr = &entry->entry; while ((ptr = list_next( &heap->freeList[0].arena.entry, ptr ))) { - pArena = LIST_ENTRY( ptr, ARENA_FREE, entry ); - arena_size = (pArena->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); + entry = LIST_ENTRY( ptr, struct entry, entry ); + arena_size = (entry->size & ARENA_SIZE_MASK) + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); if (arena_size >= data_size) { - subheap = find_subheap( heap, (struct block *)pArena, FALSE ); - if (!HEAP_Commit( subheap, (ARENA_INUSE *)pArena, data_size )) return NULL; - *ppSubHeap = subheap; - list_remove( &pArena->entry ); - return pArena; + *subheap = find_subheap( heap, (struct block *)entry, FALSE ); + if (!HEAP_Commit( *subheap, (struct block *)entry, data_size )) return NULL; + list_remove( &entry->entry ); + return (struct block *)entry; } } @@ -1104,26 +1094,24 @@ static ARENA_FREE *HEAP_FindFreeBlock( HEAP *heap, SIZE_T data_size, SUBHEAP **p total_size = data_size + ROUND_SIZE(sizeof(SUBHEAP)) + sizeof(ARENA_INUSE) + sizeof(ARENA_FREE); if (total_size < data_size) return NULL; /* overflow */ - if ((subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, - max( heap->grow_size, total_size ) ))) + if ((*subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, + max( heap->grow_size, total_size ) ))) { if (heap->grow_size < 128 * 1024 * 1024) heap->grow_size *= 2; } - else while (!subheap) /* shrink the grow size again if we are running out of space */ + else while (!*subheap) /* shrink the grow size again if we are running out of space */ { if (heap->grow_size <= total_size || heap->grow_size <= 4 * 1024 * 1024) return NULL; heap->grow_size /= 2; - subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, - max( heap->grow_size, total_size ) ); + *subheap = HEAP_CreateSubHeap( heap, NULL, heap->flags, total_size, + max( heap->grow_size, total_size ) ); } - TRACE("created new sub-heap %p of %08lx bytes for heap %p\n", - subheap, subheap->size, heap ); + TRACE( "created new sub-heap %p of %08lx bytes for heap %p\n", *subheap, subheap_size( *subheap ), heap ); - *ppSubHeap = subheap; - pArena = (ARENA_FREE *)((char *)subheap->base + subheap->headerSize); - list_remove( &pArena->entry ); - return pArena; + entry = first_block( *subheap ); + list_remove( &entry->entry ); + return (struct block *)entry; } @@ -1538,7 +1526,6 @@ HANDLE WINAPI RtlDestroyHeap( HANDLE heap ) static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret ) { struct block *block; - struct entry *entry; SIZE_T data_size; SUBHEAP *subheap; @@ -1554,15 +1541,11 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret /* Locate a suitable free block */ - if (!(entry = HEAP_FindFreeBlock( heap, data_size, &subheap ))) return STATUS_NO_MEMORY; - - /* Build the in-use arena */ - - block = (struct block *)entry; + if (!(block = find_free_block( heap, data_size, &subheap ))) return STATUS_NO_MEMORY; /* in-use arena is smaller than free arena, * so we have to add the difference to the size */ - block->size = (block->size & ~ARENA_FLAG_FREE) + sizeof(*entry) - sizeof(*block); + block->size = (block->size & ~ARENA_FLAG_FREE) + sizeof(struct entry) - sizeof(*block); block->magic = ARENA_INUSE_MAGIC; /* Shrink the block */

1 0

Torge Matthies : ntdll: Use correct output buffer size in RtlpNtEnumerateSubKey.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: cf7cb993b8527008cc28a0c8f92f8710c2d258b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf7cb993b8527008cc28a0c8… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Sun May 1 02:48:23 2022 +0200 ntdll: Use correct output buffer size in RtlpNtEnumerateSubKey. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 294b724a5e5..106ee620cda 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -91,9 +91,9 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG DWORD dwLen, dwResultLen; NTSTATUS ret; - if (out->Length) + if (out->MaximumLength) { - dwLen = out->Length + sizeof(KEY_BASIC_INFORMATION); + dwLen = out->MaximumLength + sizeof(KEY_BASIC_INFORMATION); info = RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); if (!info) return STATUS_NO_MEMORY; @@ -111,7 +111,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG out->Length = dwResultLen; else if (!ret) { - if (out->Length < info->NameLength) + if (out->MaximumLength < info->NameLength) { out->Length = dwResultLen; ret = STATUS_BUFFER_OVERFLOW;

1 0

Torge Matthies : ntdll: Calculate buffer sizes from registry structs correctly.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 4e19373c2fc049b7d4f4b215ad10513ee161edfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e19373c2fc049b7d4f4b215… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Sun May 1 01:57:07 2022 +0200 ntdll: Calculate buffer sizes from registry structs correctly. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/reg.c | 6 +++--- dlls/ntdll/unix/system.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/reg.c b/dlls/ntdll/reg.c index 106ee620cda..283238559d1 100644 --- a/dlls/ntdll/reg.c +++ b/dlls/ntdll/reg.c @@ -93,7 +93,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG if (out->MaximumLength) { - dwLen = out->MaximumLength + sizeof(KEY_BASIC_INFORMATION); + dwLen = out->MaximumLength + offsetof(KEY_BASIC_INFORMATION, Name); info = RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); if (!info) return STATUS_NO_MEMORY; @@ -105,7 +105,7 @@ NTSTATUS WINAPI RtlpNtEnumerateSubKey( HANDLE handle, UNICODE_STRING *out, ULONG } ret = NtEnumerateKey( handle, index, KeyBasicInformation, info, dwLen, &dwResultLen ); - dwResultLen -= sizeof(KEY_BASIC_INFORMATION); + dwResultLen -= offsetof(KEY_BASIC_INFORMATION, Name); if (ret == STATUS_BUFFER_OVERFLOW) out->Length = dwResultLen; @@ -138,7 +138,7 @@ NTSTATUS WINAPI RtlpNtQueryValueKey( HANDLE handle, ULONG *result_type, PBYTE de UNICODE_STRING name; NTSTATUS ret; DWORD dwResultLen; - DWORD dwLen = sizeof (KEY_VALUE_PARTIAL_INFORMATION) + (result_len ? *result_len : 0); + DWORD dwLen = offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[result_len ? *result_len : 0]); info = RtlAllocateHeap( GetProcessHeap(), 0, dwLen ); if (!info) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index ee91441794e..87cc8b9c3a4 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2095,7 +2095,7 @@ static BOOL reg_query_value( HKEY key, LPCWSTR name, DWORD type, void *data, DWO UNICODE_STRING nameW; KEY_VALUE_PARTIAL_INFORMATION *info = (KEY_VALUE_PARTIAL_INFORMATION *)buf; - if (count > sizeof(buf) - sizeof(KEY_VALUE_PARTIAL_INFORMATION)) return FALSE; + if (count > sizeof(buf) - offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data)) return FALSE; nameW.Buffer = (WCHAR *)name; nameW.Length = wcslen( name ) * sizeof(WCHAR);

1 0

Torge Matthies : win32u: Calculate buffer sizes from registry structs correctly.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 32d557142cc6a0f4140911561d4e553f3891243f URL: https://source.winehq.org/git/wine.git/?a=commit;h=32d557142cc6a0f414091156… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Sun May 1 02:03:20 2022 +0200 win32u: Calculate buffer sizes from registry structs correctly. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 8a99e4095f9..136f47672d0 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1258,7 +1258,8 @@ static BOOL update_display_cache_from_registry(void) sizeof(devicemap_video_keyW) ))) return FALSE; - status = NtQueryKey( video_key, KeyFullInformation, &key, sizeof(key), &size ); + status = NtQueryKey( video_key, KeyFullInformation, &key, + offsetof(KEY_FULL_INFORMATION, Class), &size ); if (status && status != STATUS_BUFFER_OVERFLOW) return FALSE; @@ -3210,7 +3211,7 @@ void sysparams_init(void) if ((hkey = reg_open_key( config_key, software_fontsW, sizeof(software_fontsW) ))) { - char buffer[sizeof(KEY_VALUE_PARTIAL_INFORMATION) + sizeof(DWORD)]; + char buffer[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(DWORD)])]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; if (query_reg_value( hkey, log_pixelsW, value, sizeof(buffer) ) && value->Type == REG_DWORD)

1 0

Torge Matthies : win32u: Query basic instead of full key information to get the LastWriteTime.
by Alexandre Julliard 20 May '22

20 May '22

Module: wine Branch: master Commit: 970405df1c71973bb1c0c089d3dbac6004bea81c URL: https://source.winehq.org/git/wine.git/?a=commit;h=970405df1c71973bb1c0c089… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Sun May 1 02:11:27 2022 +0200 win32u: Query basic instead of full key information to get the LastWriteTime. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/sysparams.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index 136f47672d0..b68bfa3a7ce 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -1246,7 +1246,7 @@ static void clear_display_devices(void) static BOOL update_display_cache_from_registry(void) { DWORD adapter_id, monitor_id, monitor_count = 0, size; - KEY_FULL_INFORMATION key; + KEY_BASIC_INFORMATION key; struct adapter *adapter; struct monitor *monitor; HANDLE mutex = NULL; @@ -1258,8 +1258,8 @@ static BOOL update_display_cache_from_registry(void) sizeof(devicemap_video_keyW) ))) return FALSE; - status = NtQueryKey( video_key, KeyFullInformation, &key, - offsetof(KEY_FULL_INFORMATION, Class), &size ); + status = NtQueryKey( video_key, KeyBasicInformation, &key, + offsetof(KEY_BASIC_INFORMATION, Name), &size ); if (status && status != STATUS_BUFFER_OVERFLOW) return FALSE;

1 0