system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-16 04:46:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ntdll: Implement HeapCompatibilityInformation.

Browse source
This commit is contained in:
Rémi Bernon 2022-12-01 11:18:27 +01:00 committed by Alexandre Julliard
parent 805247ace3
commit 7314029c90
2 changed files with 73 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
dlls/kernel32/tests/heap.c
View file

@ -827,11 +827,8 @@ static void test_HeapCreate(void)
size = 0;
SetLastError( 0xdeadbeef );
ret = pHeapQueryInformation( 0, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size );
todo_wine
ok( !ret, "HeapQueryInformation succeeded\n" );
todo_wine
ok( GetLastError() == ERROR_NOACCESS, "got error %lu\n", GetLastError() );
todo_wine
ok( size == 0, "got size %Iu\n", size );
size = 0;
@ -871,7 +868,6 @@ static void test_HeapCreate(void)
ok( ret, "HeapSetInformation failed, error %lu\n", GetLastError() );
ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size );
ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() );
todo_wine
ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info );
/* cannot be undone */
@ -879,25 +875,44 @@ static void test_HeapCreate(void)
compat_info = 0;
SetLastError( 0xdeadbeef );
ret = pHeapSetInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info) );
todo_wine
ok( !ret, "HeapSetInformation succeeded\n" );
todo_wine
ok( GetLastError() == ERROR_GEN_FAILURE, "got error %lu\n", GetLastError() );
compat_info = 1;
SetLastError( 0xdeadbeef );
ret = pHeapSetInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info) );
todo_wine
ok( !ret, "HeapSetInformation succeeded\n" );
todo_wine
ok( GetLastError() == ERROR_GEN_FAILURE, "got error %lu\n", GetLastError() );
ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size );
ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() );
todo_wine
ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info );
ret = HeapDestroy( heap );
ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() );
/* cannot set LFH with HEAP_NO_SERIALIZE */
heap = HeapCreate( HEAP_NO_SERIALIZE, 0, 0 );
ok( !!heap, "HeapCreate failed, error %lu\n", GetLastError() );
ok( !((ULONG_PTR)heap & 0xffff), "wrong heap alignment\n" );
ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size );
ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() );
ok( compat_info == 0, "got HeapCompatibilityInformation %lu\n", compat_info );
compat_info = 2;
SetLastError( 0xdeadbeef );
ret = pHeapSetInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info) );
ok( !ret, "HeapSetInformation succeeded\n" );
ok( GetLastError() == ERROR_INVALID_PARAMETER, "got error %lu\n", GetLastError() );
ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size );
ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() );
ok( compat_info == 0, "got HeapCompatibilityInformation %lu\n", compat_info );
ret = HeapDestroy( heap );
ok( ret, "HeapDestroy failed, error %lu\n", GetLastError() );
/* some allocation pattern automatically enables LFH */
heap = HeapCreate( 0, 0, 0 );
@ -931,7 +946,6 @@ static void test_HeapCreate(void)
ok( ret, "HeapSetInformation failed, error %lu\n", GetLastError() );
ret = pHeapQueryInformation( heap, HeapCompatibilityInformation, &compat_info, sizeof(compat_info), &size );
ok( ret, "HeapQueryInformation failed, error %lu\n", GetLastError() );
todo_wine
ok( compat_info == 2, "got HeapCompatibilityInformation %lu\n", compat_info );
for (i = 0; i < 0x11; i++) ptrs[i] = pHeapAlloc( heap, 0, 24 + 2 * sizeof(void *) );

58
dlls/ntdll/heap.c
View file

@ -39,6 +39,13 @@
WINE_DEFAULT_DEBUG_CHANNEL(heap);
/* HeapCompatibilityInformation values */
#define HEAP_STD 0
#define HEAP_LAL 1
#define HEAP_LFH 2
/* undocumented RtlWalkHeap structure */
struct rtl_heap_entry
@ -194,6 +201,7 @@ struct heap
DWORD force_flags; /* 0044/0074 */
/* end of the Windows 10 compatible struct layout */
LONG compat_info; /* HeapCompatibilityInformation / heap frontend type */
struct list entry; /* Entry in process heap list */
struct list subheap_list; /* Sub-heap list */
struct list large_list; /* Large blocks list */
@ -1378,6 +1386,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T
heap->ffeeffee = 0xffeeffee;
heap->auto_flags = (flags & HEAP_GROWABLE);
heap->flags = (flags & ~HEAP_SHARED);
heap->compat_info = HEAP_STD;
heap->magic = HEAP_MAGIC;
heap->grow_size = max( HEAP_DEF_SIZE, total_size );
heap->min_size = commit_size;
@ -2039,21 +2048,24 @@ ULONG WINAPI RtlGetProcessHeaps( ULONG count, HANDLE *heaps )
* RtlQueryHeapInformation (NTDLL.@)
*/
NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE handle, HEAP_INFORMATION_CLASS info_class,
void *info, SIZE_T size_in, PSIZE_T size_out )
void *info, SIZE_T size_in, SIZE_T *size_out )
{
struct heap *heap;
ULONG flags;
TRACE( "handle %p, info_class %u, info %p, size_in %Iu, size_out %p.\n", handle, info_class, info, size_in, size_out );
switch (info_class)
{
case HeapCompatibilityInformation:
if (!(heap = unsafe_heap_from_handle( handle, 0, &flags ))) return STATUS_ACCESS_VIOLATION;
if (size_out) *size_out = sizeof(ULONG);
if (size_in < sizeof(ULONG))
return STATUS_BUFFER_TOO_SMALL;
*(ULONG *)info = 0; /* standard heap */
if (size_in < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL;
*(ULONG *)info = ReadNoFence( &heap->compat_info );
return STATUS_SUCCESS;
default:
FIXME("Unknown heap information class %u\n", info_class);
FIXME( "HEAP_INFORMATION_CLASS %u not implemented!\n", info_class );
return STATUS_INVALID_INFO_CLASS;
}
}
@ -2063,8 +2075,36 @@ NTSTATUS WINAPI RtlQueryHeapInformation( HANDLE handle, HEAP_INFORMATION_CLASS i
*/
NTSTATUS WINAPI RtlSetHeapInformation( HANDLE handle, HEAP_INFORMATION_CLASS info_class, void *info, SIZE_T size )
{
FIXME( "handle %p, info_class %d, info %p, size %Id stub!\n", handle, info_class, info, size );
return STATUS_SUCCESS;
struct heap *heap;
ULONG flags;
TRACE( "handle %p, info_class %u, info %p, size %Iu.\n", handle, info_class, info, size );
switch (info_class)
{
case HeapCompatibilityInformation:
{
ULONG compat_info;
if (size < sizeof(ULONG)) return STATUS_BUFFER_TOO_SMALL;
if (!(heap = unsafe_heap_from_handle( handle, 0, &flags ))) return STATUS_INVALID_HANDLE;
if (heap->flags & HEAP_NO_SERIALIZE) return STATUS_INVALID_PARAMETER;
compat_info = *(ULONG *)info;
if (compat_info != HEAP_STD && compat_info != HEAP_LFH)
{
FIXME( "HeapCompatibilityInformation %lu not implemented!\n", compat_info );
return STATUS_UNSUCCESSFUL;
}
if (InterlockedCompareExchange( &heap->compat_info, compat_info, HEAP_STD ) != HEAP_STD)
return STATUS_UNSUCCESSFUL;
return STATUS_SUCCESS;
}
default:
FIXME( "HEAP_INFORMATION_CLASS %u not implemented!\n", info_class );
return STATUS_SUCCESS;
}
}
/***********************************************************************