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

Rémi Bernon : ntdll: Increase heap large block min size for sizeof(void *) == 8.
by Alexandre Julliard 18 May '22

18 May '22

Module: wine Branch: master Commit: 69c75b2b1da963add2e3208c5e67541dcbe23741 URL: https://source.winehq.org/git/wine.git/?a=commit;h=69c75b2b1da963add2e3208c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 2 13:21:28 2022 +0200 ntdll: Increase heap large block min size for sizeof(void *) == 8. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 374b4e1f209..75622da7a6a 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -134,7 +134,7 @@ C_ASSERT( sizeof(ARENA_LARGE) % LARGE_ALIGNMENT == 0 ); /* minimum size that must remain to shrink an allocated block */ #define HEAP_MIN_SHRINK_SIZE (HEAP_MIN_DATA_SIZE+sizeof(ARENA_FREE)) /* minimum size to start allocating large blocks */ -#define HEAP_MIN_LARGE_BLOCK_SIZE 0x7f000 +#define HEAP_MIN_LARGE_BLOCK_SIZE (0x10000 * ALIGNMENT - 0x1000) /* extra size to add at the end of block for tail checking */ #define HEAP_TAIL_EXTRA_SIZE(flags) \ ((flags & HEAP_TAIL_CHECKING_ENABLED) || RUNNING_ON_VALGRIND ? ALIGNMENT : 0)

1 0

Rémi Bernon : ntdll: Fail to allocate large blocks if heap isn't growable.
by Alexandre Julliard 18 May '22

18 May '22

Module: wine Branch: master Commit: 3728b2b7d280f2bcfb44ef50c13e248162a36787 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3728b2b7d280f2bcfb44ef50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon May 2 13:27:58 2022 +0200 ntdll: Fail to allocate large blocks if heap isn't growable. This tweaks the test sizes so that it passes on Wine too. The created heap should be large enough to hold the requested alloc size, but the allocation still fails. Windows seems to have a specific lower threshold for large blocks with non growable heaps, but it's probably not very useful to match it. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/heap.c | 6 ++---- dlls/ntdll/heap.c | 5 +++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 1b8e019c0ec..d9cae9f723b 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -456,7 +456,7 @@ static void test_HeapCreate(void) ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() ); - heap = HeapCreate( 0, 2 * alloc_size, 5 * alloc_size ); + heap = HeapCreate( 0, 8 * alloc_size, 8 * alloc_size ); ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() ); ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" ); @@ -470,10 +470,8 @@ static void test_HeapCreate(void) /* cannot allocate large blocks from fixed size heap */ SetLastError( 0xdeadbeef ); - ptr1 = HeapAlloc( heap, 0, 3 * alloc_size ); - todo_wine + ptr1 = HeapAlloc( heap, 0, 4 * alloc_size ); ok( !ptr1, "HeapAlloc succeeded\n" ); - todo_wine ok( GetLastError() == ERROR_NOT_ENOUGH_MEMORY, "got error %lu\n", GetLastError() ); ret = HeapFree( heap, 0, ptr1 ); ok( ret, "HeapFree failed, error %lu\n", GetLastError() ); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 75622da7a6a..fa9f617f482 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -841,6 +841,7 @@ static void *allocate_large_block( HEAP *heap, DWORD flags, SIZE_T size ) SIZE_T block_size = sizeof(*arena) + ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); LPVOID address = NULL; + if (!(flags & HEAP_GROWABLE)) return NULL; if (block_size < size) return NULL; /* overflow */ if (NtAllocateVirtualMemory( NtCurrentProcess(), &address, 0, &block_size, MEM_COMMIT, get_protection_type( flags ))) @@ -1561,7 +1562,7 @@ static NTSTATUS heap_allocate( HEAP *heap, ULONG flags, SIZE_T size, void **ret if (rounded_size < size) return STATUS_NO_MEMORY; /* overflow */ if (rounded_size < HEAP_MIN_DATA_SIZE) rounded_size = HEAP_MIN_DATA_SIZE; - if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE && (flags & HEAP_GROWABLE)) + if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE) { if (!(*ret = allocate_large_block( heap, flags, size ))) return STATUS_NO_MEMORY; return STATUS_SUCCESS; @@ -1685,7 +1686,7 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size { struct block *next; - if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE && (flags & HEAP_GROWABLE)) + if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE) { if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; if (!(*ret = allocate_large_block( heap, flags, size ))) return STATUS_NO_MEMORY;

1 0

Rémi Bernon : ntdll: Simplify the fallback case in heap_reallocate.
by Alexandre Julliard 18 May '22

18 May '22

Module: wine Branch: master Commit: 419e4730ba81cb171eba6bc8920d940183d9597d URL: https://source.winehq.org/git/wine.git/?a=commit;h=419e4730ba81cb171eba6bc8… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 18 09:34:18 2022 +0200 ntdll: Simplify the fallback case in heap_reallocate. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 45 ++++++++------------------------------------- 1 file changed, 8 insertions(+), 37 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index fa9f617f482..eb45a94da95 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -1663,9 +1663,11 @@ BOOLEAN WINAPI DECLSPEC_HOTPATCH RtlFreeHeap( HANDLE heap, ULONG flags, void *pt static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size, void **ret ) { + struct block *next; ARENA_INUSE *pArena; SUBHEAP *subheap; SIZE_T oldBlockSize, oldActualSize, rounded_size; + NTSTATUS status; rounded_size = ROUND_SIZE(size) + HEAP_TAIL_EXTRA_SIZE(flags); if (rounded_size < size) return STATUS_NO_MEMORY; /* overflow */ @@ -1684,20 +1686,8 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size oldActualSize = (pArena->size & ARENA_SIZE_MASK) - pArena->unused_bytes; if (rounded_size > oldBlockSize) { - struct block *next; - - if (rounded_size >= HEAP_MIN_LARGE_BLOCK_SIZE) - { - if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; - if (!(*ret = allocate_large_block( heap, flags, size ))) return STATUS_NO_MEMORY; - memcpy( *ret, pArena + 1, oldActualSize ); - notify_free( pArena + 1 ); - HEAP_MakeInUseBlockFree( subheap, pArena ); - return STATUS_SUCCESS; - } - if ((next = next_block( subheap, pArena )) && (block_get_flags( next ) & ARENA_FLAG_FREE) && - (oldBlockSize + block_get_size( next ) >= rounded_size)) + rounded_size < HEAP_MIN_LARGE_BLOCK_SIZE && rounded_size <= oldBlockSize + block_get_size( next )) { /* The next block is free and large enough */ struct entry *entry = (struct entry *)next; @@ -1707,34 +1697,15 @@ static NTSTATUS heap_reallocate( HEAP *heap, ULONG flags, void *ptr, SIZE_T size notify_realloc( pArena + 1, oldActualSize, size ); HEAP_ShrinkBlock( subheap, pArena, rounded_size ); } - else /* Do it the hard way */ + else { - ARENA_FREE *pNew; - ARENA_INUSE *pInUse; - SUBHEAP *newsubheap; - if (flags & HEAP_REALLOC_IN_PLACE_ONLY) return STATUS_NO_MEMORY; - if (!(pNew = HEAP_FindFreeBlock( heap, rounded_size, &newsubheap ))) return STATUS_NO_MEMORY; - - /* Build the in-use arena */ - - list_remove( &pNew->entry ); - pInUse = (ARENA_INUSE *)pNew; - pInUse->size = (pInUse->size & ~ARENA_FLAG_FREE) - + sizeof(ARENA_FREE) - sizeof(ARENA_INUSE); - pInUse->magic = ARENA_INUSE_MAGIC; - HEAP_ShrinkBlock( newsubheap, pInUse, rounded_size ); - - mark_block_initialized( pInUse + 1, oldActualSize ); - notify_alloc( pInUse + 1, size, FALSE ); - memcpy( pInUse + 1, pArena + 1, oldActualSize ); - - /* Free the previous block */ - + if ((status = heap_allocate( heap, flags & ~HEAP_ZERO_MEMORY, size, ret ))) return status; + memcpy( *ret, pArena + 1, oldActualSize ); + if (flags & HEAP_ZERO_MEMORY) memset( (char *)*ret + oldActualSize, 0, size - oldActualSize ); notify_free( pArena + 1 ); HEAP_MakeInUseBlockFree( subheap, pArena ); - subheap = newsubheap; - pArena = pInUse; + return STATUS_SUCCESS; } } else

1 0

Rémi Bernon : ntdll: Create free block after updating the size in HEAP_ShrinkBlock.
by Alexandre Julliard 18 May '22

18 May '22

Module: wine Branch: master Commit: c662992de413c466517b4a6a34bb8511ca52f3cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=c662992de413c466517b4a6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 18 09:42:28 2022 +0200 ntdll: Create free block after updating the size in HEAP_ShrinkBlock. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/heap.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index eb45a94da95..3a1a4268683 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -815,17 +815,17 @@ static void HEAP_MakeInUseBlockFree( SUBHEAP *subheap, ARENA_INUSE *pArena ) */ static void HEAP_ShrinkBlock(SUBHEAP *subheap, ARENA_INUSE *pArena, SIZE_T size) { - if ((pArena->size & ARENA_SIZE_MASK) >= size + HEAP_MIN_SHRINK_SIZE) + SIZE_T old_data_size = pArena->size & ARENA_SIZE_MASK; + if (old_data_size >= size + HEAP_MIN_SHRINK_SIZE) { - HEAP_CreateFreeBlock( subheap, (char *)(pArena + 1) + size, - (pArena->size & ARENA_SIZE_MASK) - size ); /* assign size plus previous arena flags */ pArena->size = size | (pArena->size & ~ARENA_SIZE_MASK); + HEAP_CreateFreeBlock( subheap, (char *)(pArena + 1) + size, old_data_size - size ); } else { /* Turn off PREV_FREE flag in next block */ - char *pNext = (char *)(pArena + 1) + (pArena->size & ARENA_SIZE_MASK); + char *pNext = (char *)(pArena + 1) + old_data_size; if (pNext < (char *)subheap->base + subheap->size) *(DWORD *)pNext &= ~ARENA_FLAG_PREV_FREE; }

1 0

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

17 May '22

Module: wine Branch: master Commit: af8b466f7199046484ed8e997533a6b094448df3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=af8b466f7199046484ed8e99… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue May 17 18:28:29 2022 +0200 winevulkan: Update to VK spec version 1.3.214. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 11 ++++ dlls/winevulkan/loader_thunks.h | 9 +++ dlls/winevulkan/make_vulkan | 6 +- dlls/winevulkan/vulkan_thunks.c | 92 ++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 13 ++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 142 +++++++++++++++++++++++++++++++++++----- 7 files changed, 252 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=af8b466f7199046484ed…

1 0

Rémi Bernon : dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: b5b71d9aed01ee195a8e131ff866e81c909431f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5b71d9aed01ee195a8e131f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 26 22:34:41 2022 +0200 dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.PeriodicForceEffect tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 529 +++++++++++++++++++++++++++++++++++-- 1 file changed, 507 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b5b71d9aed01ee195a8e…

1 0

Rémi Bernon : dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.RampForceEffect tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: e9f430d955d347be484b8a10f41bb3a7b6c0fa4e URL: https://source.winehq.org/git/wine.git/?a=commit;h=e9f430d955d347be484b8a10… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 11:22:34 2022 +0200 dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.RampForceEffect tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 172 +++++++++++++++++++++++++++++++++++-- 1 file changed, 167 insertions(+), 5 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e9f430d955d347be484b…

1 0

Rémi Bernon : dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.ConditionForceEffect tests.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: ea71b9f81b527496fd1027eaa724e0b62281b037 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea71b9f81b527496fd1027ea… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 11:25:54 2022 +0200 dinput/tests: Add some Windows.Gaming.Input.ForceFeedback.ConditionForceEffect tests. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 172 ++++++++++++++++++++++++++++++++++--- 1 file changed, 160 insertions(+), 12 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ea71b9f81b527496fd10…

1 0

Rémi Bernon : windows.gaming.input: Implement Windows.Gaming.Input.RampForceEffect runtimeclass.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 569036b1f087c4f69766d972665e35dd078f6ef8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=569036b1f087c4f69766d972… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 11:58:17 2022 +0200 windows.gaming.input: Implement Windows.Gaming.Input.RampForceEffect runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 3 - dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/force_feedback.c | 8 + dlls/windows.gaming.input/main.c | 2 + dlls/windows.gaming.input/private.h | 1 + dlls/windows.gaming.input/provider.idl | 1 + dlls/windows.gaming.input/ramp_effect.c | 240 +++++++++++++++++++++++++++++ 7 files changed, 253 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=569036b1f087c4f69766…

1 0

Rémi Bernon : windows.gaming.input: Implement Windows.Gaming.Input.PeriodicForceEffect runtimeclass.
by Alexandre Julliard 17 May '22

17 May '22

Module: wine Branch: master Commit: 8d45305400404e0a80dcd9c41bc6c3058617cc89 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d45305400404e0a80dcd9c4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 12 12:01:46 2022 +0200 windows.gaming.input: Implement Windows.Gaming.Input.PeriodicForceEffect runtimeclass. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/force_feedback.c | 3 - dlls/windows.gaming.input/Makefile.in | 1 + dlls/windows.gaming.input/force_feedback.c | 21 ++ dlls/windows.gaming.input/main.c | 2 + dlls/windows.gaming.input/periodic_effect.c | 284 ++++++++++++++++++++++++++++ dlls/windows.gaming.input/private.h | 1 + dlls/windows.gaming.input/provider.idl | 8 + 7 files changed, 317 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=8d45305400404e0a80dc…

1 0