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

Francois Gouget : iphlpapi/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 0028d8f0a7f69914dfe36135834de1e19b88b5eb URL: https://gitlab.winehq.org/wine/wine/-/commit/0028d8f0a7f69914dfe36135834de1… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 10 17:15:38 2023 +0200 iphlpapi/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/iphlpapi/tests/iphlpapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/iphlpapi/tests/iphlpapi.c b/dlls/iphlpapi/tests/iphlpapi.c index b8fa82d2a56..5301a409126 100644 --- a/dlls/iphlpapi/tests/iphlpapi.c +++ b/dlls/iphlpapi/tests/iphlpapi.c @@ -1932,7 +1932,7 @@ static void test_AllocateAndGetTcpExTableFromStack(void) if (!pAllocateAndGetTcpExTableFromStack) { - skip("AllocateAndGetTcpExTableFromStack not available\n"); + win_skip("AllocateAndGetTcpExTableFromStack not available\n"); return; }

1 0

Francois Gouget : ws2_32/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 98b7a56262c0ade70b80d2efee8aeedb12ec8373 URL: https://gitlab.winehq.org/wine/wine/-/commit/98b7a56262c0ade70b80d2efee8aee… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 3 11:39:55 2023 +0200 ws2_32/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/ws2_32/tests/protocol.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index b0259cfe47d..91356c43f7c 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -2881,7 +2881,7 @@ static void test_WSCGetProviderInfo(void) if (!pWSCGetProviderInfo) { - skip("WSCGetProviderInfo is not available.\n"); + win_skip("WSCGetProviderInfo is not available.\n"); return; }

1 0

Francois Gouget : wtsapi32/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 9428d66eed3784eb5bb138abab5df69ff7b7748e URL: https://gitlab.winehq.org/wine/wine/-/commit/9428d66eed3784eb5bb138abab5df6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 10 17:14:21 2023 +0200 wtsapi32/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/wtsapi32/tests/wtsapi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wtsapi32/tests/wtsapi.c b/dlls/wtsapi32/tests/wtsapi.c index 2023a21e938..396a3f4b1e7 100644 --- a/dlls/wtsapi32/tests/wtsapi.c +++ b/dlls/wtsapi32/tests/wtsapi.c @@ -157,7 +157,7 @@ static void test_WTSEnumerateProcessesW(void) if (!pWTSEnumerateProcessesExW) { - skip("WTSEnumerateProcessesEx is not available\n"); + win_skip("WTSEnumerateProcessesEx is not available\n"); return; }

1 0

Francois Gouget : wintab32/tests: Use win_skip() for missing dlls.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 25e64b06ded1945826195c661bc8aefecfd2f80e URL: https://gitlab.winehq.org/wine/wine/-/commit/25e64b06ded1945826195c661bc8ae… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed May 3 11:40:41 2023 +0200 wintab32/tests: Use win_skip() for missing dlls. A missing dll is a todo in Wine. --- dlls/wintab32/tests/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wintab32/tests/context.c b/dlls/wintab32/tests/context.c index 4359412785a..e16165c26b5 100644 --- a/dlls/wintab32/tests/context.c +++ b/dlls/wintab32/tests/context.c @@ -211,7 +211,7 @@ START_TEST(context) if (!hWintab) { - skip("Wintab32.dll not available\n"); + win_skip("Wintab32.dll not available\n"); return; }

1 0

Francois Gouget : gdi32/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: d84077c226069d84c9e606b228f158637ea98675 URL: https://gitlab.winehq.org/wine/wine/-/commit/d84077c226069d84c9e606b228f158… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 5 03:00:50 2023 +0200 gdi32/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/gdi32/tests/driver.c | 6 +++--- dlls/gdi32/tests/font.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/gdi32/tests/driver.c b/dlls/gdi32/tests/driver.c index a618b5e51a4..162208c26ca 100644 --- a/dlls/gdi32/tests/driver.c +++ b/dlls/gdi32/tests/driver.c @@ -399,7 +399,7 @@ static void test_D3DKMTCheckVidPnExclusiveOwnership(void) if (!pD3DKMTCheckVidPnExclusiveOwnership || pD3DKMTCheckVidPnExclusiveOwnership(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); + win_skip("D3DKMTCheckVidPnExclusiveOwnership() is unavailable.\n"); return; } @@ -623,7 +623,7 @@ static void test_D3DKMTSetVidPnSourceOwner(void) if (!pD3DKMTSetVidPnSourceOwner || pD3DKMTSetVidPnSourceOwner(&set_owner_desc) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); + win_skip("D3DKMTSetVidPnSourceOwner() is unavailable.\n"); return; } @@ -650,7 +650,7 @@ static void test_D3DKMTCheckOcclusion(void) if (!pD3DKMTCheckOcclusion || pD3DKMTCheckOcclusion(NULL) == STATUS_PROCEDURE_NOT_FOUND) { - skip("D3DKMTCheckOcclusion() is unavailable.\n"); + todo_wine win_skip("D3DKMTCheckOcclusion() is unavailable.\n"); return; } diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7be8d6f2c66..82cec09e982 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2750,7 +2750,7 @@ static void test_GdiGetCodePage(void) if (!pGdiGetCodePage) { - skip("GdiGetCodePage not available on this platform\n"); + win_skip("GdiGetCodePage not available on this platform\n"); return; }

1 0

Francois Gouget : sti/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: e36e8d4ae1ca7af4eaef39126874a60cdb60be90 URL: https://gitlab.winehq.org/wine/wine/-/commit/e36e8d4ae1ca7af4eaef39126874a6… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 5 02:29:01 2023 +0200 sti/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/sti/tests/sti.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/sti/tests/sti.c b/dlls/sti/tests/sti.c index fdfff62b3f6..e43604a8b67 100644 --- a/dlls/sti/tests/sti.c +++ b/dlls/sti/tests/sti.c @@ -116,7 +116,7 @@ static void test_version_flag_versus_aw(void) ok(0, "could not create StillImageW, hr = 0x%lX\n", hr); } else - skip("No StiCreateInstance function\n"); + win_skip("No StiCreateInstance function\n"); if (pStiCreateInstanceA) { @@ -137,7 +137,7 @@ static void test_version_flag_versus_aw(void) todo_wine ok(0, "could not create StillImageA, hr = 0x%lX\n", hr); } else - skip("No StiCreateInstanceA function\n"); + win_skip("No StiCreateInstanceA function\n"); if (pStiCreateInstanceW) { @@ -158,7 +158,7 @@ static void test_version_flag_versus_aw(void) ok(0, "could not create StillImageW, hr = 0x%lX\n", hr); } else - skip("No StiCreateInstanceW function\n"); + win_skip("No StiCreateInstanceW function\n"); } static void test_stillimage_aggregation(void) @@ -225,7 +225,7 @@ static void test_stillimage_aggregation(void) IUnknown_Release(pUnknown); } else - skip("No StiCreateInstanceW function\n"); + win_skip("No StiCreateInstanceW function\n"); } static void test_launch_app_registry(void) @@ -271,7 +271,7 @@ START_TEST(sti) FreeLibrary(sti_dll); } else - skip("could not load sti.dll\n"); + win_skip("could not load sti.dll\n"); CoUninitialize(); } else

1 0

Francois Gouget : ntdll/tests: Use win_skip() for missing APIs.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: c8362ef8d1cb625d2ac9e947a62564358217bb75 URL: https://gitlab.winehq.org/wine/wine/-/commit/c8362ef8d1cb625d2ac9e947a62564… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 5 02:36:15 2023 +0200 ntdll/tests: Use win_skip() for missing APIs. A missing API is a todo in Wine. --- dlls/ntdll/tests/exception.c | 6 +++--- dlls/ntdll/tests/om.c | 2 +- dlls/ntdll/tests/port.c | 2 +- dlls/ntdll/tests/rtl.c | 8 ++++---- dlls/ntdll/tests/rtlstr.c | 4 ++-- dlls/ntdll/tests/virtual.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c index a70faef6676..128b2adde3b 100644 --- a/dlls/ntdll/tests/exception.c +++ b/dlls/ntdll/tests/exception.c @@ -9509,7 +9509,7 @@ static void test_extended_context(void) if (!pRtlGetEnabledExtendedFeatures) { - skip("RtlGetEnabledExtendedFeatures is not available.\n"); + win_skip("RtlGetEnabledExtendedFeatures is not available.\n"); return; } @@ -10492,7 +10492,7 @@ static void test_copy_context(void) if (!pRtlGetEnabledExtendedFeatures) { - skip("RtlGetEnabledExtendedFeatures is not available.\n"); + win_skip("RtlGetEnabledExtendedFeatures is not available.\n"); return; } @@ -10969,7 +10969,7 @@ START_TEST(exception) if (pRtlAddFunctionTable && pRtlDeleteFunctionTable && pRtlInstallFunctionTableCallback && pRtlLookupFunctionEntry) test_dynamic_unwind(); else - skip( "Dynamic unwind functions not found\n" ); + win_skip( "Dynamic unwind functions not found\n" ); test_extended_context(); test_copy_context(); test_unwind_from_apc(); diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index 6e5a9ef64b1..c03b5e4cfca 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -2523,7 +2523,7 @@ static void test_object_identity(void) if (!pNtCompareObjects) { - skip("NtCompareObjects is not available.\n"); + win_skip("NtCompareObjects is not available.\n"); return; } diff --git a/dlls/ntdll/tests/port.c b/dlls/ntdll/tests/port.c index 942f00b1b76..80c60d09683 100644 --- a/dlls/ntdll/tests/port.c +++ b/dlls/ntdll/tests/port.c @@ -155,7 +155,7 @@ static BOOL init_function_ptrs(void) !pNtRequestPort || !pNtRegisterThreadTerminatePort || !pNtConnectPort || !pRtlInitUnicodeString) { - skip("Needed port functions are not available\n"); + todo_wine win_skip("Needed port functions are not available\n"); FreeLibrary(hntdll); return FALSE; } diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c index b1ef492627a..76cecebae34 100644 --- a/dlls/ntdll/tests/rtl.c +++ b/dlls/ntdll/tests/rtl.c @@ -1133,7 +1133,7 @@ static void test_RtlIpv4StringToAddressEx(void) if (!pRtlIpv4StringToAddressExA) { - skip("RtlIpv4StringToAddressEx not available\n"); + win_skip("RtlIpv4StringToAddressEx not available\n"); return; } @@ -1780,7 +1780,7 @@ static void test_RtlIpv6AddressToStringEx(void) if (!pRtlIpv6AddressToStringExA) { - skip("RtlIpv6AddressToStringExA not available\n"); + win_skip("RtlIpv6AddressToStringExA not available\n"); return; } @@ -2066,13 +2066,13 @@ static void test_RtlIpv6StringToAddressEx(void) if (!pRtlIpv6StringToAddressExW) { - skip("RtlIpv6StringToAddressExW not available\n"); + win_skip("RtlIpv6StringToAddressExW not available\n"); /* we can continue, just not test W */ } if (!pRtlIpv6StringToAddressExA) { - skip("RtlIpv6StringToAddressExA not available\n"); + win_skip("RtlIpv6StringToAddressExA not available\n"); return; } diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c index 8988aadeac4..53ac223980e 100644 --- a/dlls/ntdll/tests/rtlstr.c +++ b/dlls/ntdll/tests/rtlstr.c @@ -2136,7 +2136,7 @@ static void test_RtlUnicodeToUTF8N(void) if (!pRtlUnicodeToUTF8N) { - skip("RtlUnicodeToUTF8N unavailable\n"); + win_skip("RtlUnicodeToUTF8N is not available\n"); return; } @@ -2469,7 +2469,7 @@ static void test_RtlUTF8ToUnicodeN(void) if (!pRtlUTF8ToUnicodeN) { - skip("RtlUTF8ToUnicodeN unavailable\n"); + win_skip("RtlUTF8ToUnicodeN is not available\n"); return; } diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index ffa462f579f..c125fdff0d7 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -1658,7 +1658,7 @@ static void test_user_shared_data(void) if (!pRtlGetEnabledExtendedFeatures) { - skip("RtlGetEnabledExtendedFeatures is not available.\n"); + win_skip("RtlGetEnabledExtendedFeatures is not available.\n"); return; }

1 0

Paul Gofman : ntdll: Fix tail padding in mark_block_tail().
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 0fc9a9e426499693c6c91552e20fed40c406e864 URL: https://gitlab.winehq.org/wine/wine/-/commit/0fc9a9e426499693c6c91552e20fed… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 11 21:57:52 2023 -0600 ntdll: Fix tail padding in mark_block_tail(). --- dlls/kernel32/tests/heap.c | 1 - dlls/ntdll/heap.c | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index d2742b55495..8c101e1c47d 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -3127,7 +3127,6 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags ok( !memcmp( ptr1 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); ok( !memcmp( ptr2 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); - todo_wine_if( global_flags & FLG_HEAP_ENABLE_FREE_CHECK ) ok( !memcmp( ptr0 + alloc_size + tail_size, padd_buf, 2 * sizeof(void *) ), "unexpected padding\n" ); tmp_ptr = (void *)0xdeadbeef; diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ef1a9c3f3b1..54aa1a8960d 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -500,8 +500,8 @@ static inline void mark_block_tail( struct block *block, DWORD flags ) if (flags & HEAP_ADD_USER_INFO) { if (flags & HEAP_TAIL_CHECKING_ENABLED || RUNNING_ON_VALGRIND) tail += BLOCK_ALIGN; - valgrind_make_writable( tail + sizeof(void *), sizeof(void *) ); - memset( tail + sizeof(void *), 0, sizeof(void *) ); + valgrind_make_writable( tail, BLOCK_ALIGN ); + memset( tail, 0, BLOCK_ALIGN ); } }

1 0

Paul Gofman : ntdll: Fix last block detection in heap_walk_blocks().
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 74b04b763397dc06620863ea97c8cab2304c7d45 URL: https://gitlab.winehq.org/wine/wine/-/commit/74b04b763397dc06620863ea97c8ca… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 11 22:08:07 2023 -0600 ntdll: Fix last block detection in heap_walk_blocks(). --- dlls/ntdll/heap.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index 54aa1a8960d..ce3419734ee 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -2399,7 +2399,6 @@ BOOLEAN WINAPI RtlValidateHeap( HANDLE handle, ULONG flags, const void *ptr ) return ret; } - static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subheap, const struct block *block, struct rtl_heap_entry *entry ) { @@ -2423,8 +2422,8 @@ static NTSTATUS heap_walk_blocks( const struct heap *heap, const SUBHEAP *subhea entry->lpData = (char *)block + block_get_overhead( block ); entry->cbData = block_get_size( block ) - block_get_overhead( block ); /* FIXME: last free block should not include uncommitted range, which also has its own overhead */ - if (!contains( blocks, commit_end - (char *)blocks, block, block_get_size( block ) )) - entry->cbData = commit_end - (char *)entry->lpData - 4 * BLOCK_ALIGN; + if (!contains( blocks, commit_end - 4 * BLOCK_ALIGN - (char *)blocks, block, block_get_size( block ) )) + entry->cbData = commit_end - 4 * BLOCK_ALIGN - (char *)entry->lpData; entry->cbOverhead = 2 * BLOCK_ALIGN; entry->iRegionIndex = 0; entry->wFlags = 0;

1 0

Paul Gofman : kernel32/tests: Add tests for subheap sizes.
by Alexandre Julliard 15 May '23

15 May '23

Module: wine Branch: master Commit: 76fc73f311f31f068f7d1c75418b98f9d4dd89b4 URL: https://gitlab.winehq.org/wine/wine/-/commit/76fc73f311f31f068f7d1c75418b98… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 11 22:27:11 2023 -0600 kernel32/tests: Add tests for subheap sizes. --- dlls/kernel32/tests/heap.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index 8c101e1c47d..fead409960c 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -3621,6 +3621,90 @@ static void test_GlobalMemoryStatus(void) #undef IS_WITHIN_RANGE } +static void get_valloc_info( void *mem, char **base, SIZE_T *alloc_size ) +{ + MEMORY_BASIC_INFORMATION info, info2; + SIZE_T size; + char *p; + + size = VirtualQuery( mem, &info, sizeof(info) ); + ok( size == sizeof(info), "got %Iu.\n", size ); + + info2 = info; + p = info.AllocationBase; + while (1) + { + size = VirtualQuery( p, &info2, sizeof(info2) ); + ok( size == sizeof(info), "got %Iu.\n", size ); + if (info2.AllocationBase != info.AllocationBase) + break; + ok( info2.State == MEM_RESERVE || info2.State == MEM_COMMIT, "got %#lx.\n", info2.State ); + p += info2.RegionSize; + } + + *base = info.AllocationBase; + *alloc_size = p - *base; +} + +static void test_heap_size( SIZE_T initial_size ) +{ + static const SIZE_T default_heap_size = 0x10000, init_grow_size = 0x100000, max_grow_size = 0xfd0000; + + BOOL initial_subheap = TRUE, max_size_reached = FALSE; + SIZE_T alloc_size, current_subheap_size; + char *base, *current_base; + unsigned int i; + HANDLE heap; + void *p; + + winetest_push_context( "init size %#Ix", initial_size ); + heap = HeapCreate( HEAP_NO_SERIALIZE, initial_size, 0 ); + get_valloc_info( heap, &current_base, &alloc_size ); + + todo_wine + ok( alloc_size == initial_size + default_heap_size || broken( (initial_size && alloc_size == initial_size) + || (!initial_size && (alloc_size == default_heap_size * sizeof(void*))) ) /* Win7 */, + "got %#Ix.\n", alloc_size ); + + current_subheap_size = alloc_size; + for (i = 0; i < 100; ++i) + { + winetest_push_context( "i %u, current_subheap_size %#Ix", i, current_subheap_size ); + p = HeapAlloc( heap, 0, 0x60000 ); + get_valloc_info( p, &base, &alloc_size ); + if (base != current_base) + { + current_base = base; + if (initial_subheap) + { + current_subheap_size = init_grow_size; + initial_subheap = FALSE; + } + else + { + current_subheap_size = min( current_subheap_size * 2, max_grow_size ); + if (current_subheap_size == max_grow_size) + max_size_reached = TRUE; + } + } + todo_wine_if( !initial_subheap ) + ok( alloc_size == current_subheap_size, "got %#Ix.\n", alloc_size ); + winetest_pop_context(); + } + todo_wine_if( sizeof(void *) == 8 ) + ok( max_size_reached, "Did not reach maximum subheap size.\n" ); + + HeapDestroy( heap ); + winetest_pop_context(); +} + +static void test_heap_sizes(void) +{ + test_heap_size( 0 ); + test_heap_size( 0x80000 ); + test_heap_size( 0x150000 ); +} + START_TEST(heap) { int argc; @@ -3657,4 +3741,5 @@ START_TEST(heap) test_debug_heap( argv[0], 0xdeadbeef ); } else win_skip( "RtlGetNtGlobalFlags not found, skipping heap debug tests\n" ); + test_heap_sizes(); }

1 0