- Wine-Commits - list.winehq.org

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

May 15, 2023

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

Paul Gofman : ntdll: Better match Windows subheap sizes.
by Alexandre Julliard May 15, 2023

May 15, 2023

Module: wine Branch: master Commit: 354a8bb1f4a65bdec052606f2799db9e2907b5b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/354a8bb1f4a65bdec052606f2799db… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu May 11 21:53:02 2023 -0600 ntdll: Better match Windows subheap sizes. --- dlls/kernel32/tests/heap.c | 8 ++------ dlls/ntdll/heap.c | 13 +++++++++---- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/heap.c b/dlls/kernel32/tests/heap.c index fead409960c..59a82c0c579 100644 --- a/dlls/kernel32/tests/heap.c +++ b/dlls/kernel32/tests/heap.c @@ -578,7 +578,6 @@ static void test_HeapCreate(void) todo_wine ok( entries[0].Region.dwCommittedSize == 0x400 * sizeof(void *), "got Region.dwCommittedSize %#lx\n", entries[0].Region.dwCommittedSize ); - todo_wine ok( entries[0].Region.dwUnCommittedSize == 0x10000 - entries[0].Region.dwCommittedSize || entries[0].Region.dwUnCommittedSize == 0x10000 * sizeof(void *) - entries[0].Region.dwCommittedSize /* win7 */, "got Region.dwUnCommittedSize %#lx\n", entries[0].Region.dwUnCommittedSize ); @@ -3019,9 +3018,9 @@ static void test_block_layout( HANDLE heap, DWORD global_flags, DWORD heap_flags expect_size = max( alloc_size, 2 * sizeof(void *) ); expect_size = ALIGN_BLOCK_SIZE( expect_size + extra_size ); diff = min( llabs( ptr2 - ptr1 ), llabs( ptr1 - ptr0 ) ); - todo_wine_if( (!(global_flags & ~FLG_HEAP_ENABLE_FREE_CHECK) && alloc_size < 2 * sizeof(void *)) ) + todo_wine_if( (!global_flags && alloc_size < 2 * sizeof(void *)) || + ((heap_flags & HEAP_FREE_CHECKING_ENABLED) && diff >= 0x100000) ) ok( diff == expect_size, "got diff %#Ix exp %#Ix\n", diff, expect_size ); - ok( !memcmp( ptr0 + alloc_size, tail_buf, tail_size ), "missing block tail\n" ); 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" ); @@ -3661,7 +3660,6 @@ static void test_heap_size( SIZE_T 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 ); @@ -3687,11 +3685,9 @@ static void test_heap_size( SIZE_T initial_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 ); diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c index ce3419734ee..bbb4cbf8a99 100644 --- a/dlls/ntdll/heap.c +++ b/dlls/ntdll/heap.c @@ -311,7 +311,12 @@ C_ASSERT( offsetof(struct heap, subheap) <= REGION_ALIGN - 1 ); #define HEAP_MAGIC ((DWORD)('H' | ('E'<<8) | ('A'<<16) | ('P'<<24))) -#define HEAP_DEF_SIZE (0x40000 * BLOCK_ALIGN) +#define HEAP_INITIAL_SIZE 0x10000 +#define HEAP_INITIAL_GROW_SIZE 0x100000 +#define HEAP_MAX_GROW_SIZE 0xfd0000 + +C_ASSERT( HEAP_MIN_LARGE_BLOCK_SIZE <= HEAP_INITIAL_GROW_SIZE ); + #define MAX_FREE_PENDING 1024 /* max number of free requests to delay */ /* some undocumented flags (names are made up) */ @@ -1133,7 +1138,7 @@ static struct block *find_free_block( struct heap *heap, ULONG flags, SIZE_T blo if ((subheap = create_subheap( heap, flags, max( heap->grow_size, total_size ), total_size ))) { - if (heap->grow_size <= HEAP_MAX_FREE_BLOCK_SIZE / 2) heap->grow_size *= 2; + heap->grow_size = min( heap->grow_size * 2, HEAP_MAX_GROW_SIZE ); } else while (!subheap) /* shrink the grow size again if we are running out of space */ { @@ -1517,7 +1522,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T flags &= ~(HEAP_TAIL_CHECKING_ENABLED|HEAP_FREE_CHECKING_ENABLED); if (process_heap) flags |= HEAP_PRIVATE; if (!process_heap || !total_size || (flags & HEAP_SHARED)) flags |= HEAP_GROWABLE; - if (!total_size) total_size = HEAP_DEF_SIZE; + if (!total_size) total_size = commit_size + HEAP_INITIAL_SIZE; if (!(heap = addr)) { @@ -1532,7 +1537,7 @@ HANDLE WINAPI RtlCreateHeap( ULONG flags, void *addr, SIZE_T total_size, SIZE_T heap->flags = (flags & ~HEAP_SHARED); heap->compat_info = HEAP_STD; heap->magic = HEAP_MAGIC; - heap->grow_size = max( HEAP_DEF_SIZE, total_size ); + heap->grow_size = HEAP_INITIAL_GROW_SIZE; heap->min_size = commit_size; list_init( &heap->subheap_list ); list_init( &heap->large_list );

1 0

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

May 15, 2023

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

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

May 15, 2023

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

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

May 15, 2023

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 : wintab32/tests: Use win_skip() for missing dlls.
by Alexandre Julliard May 15, 2023

May 15, 2023

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 : wtsapi32/tests: Use win_skip() for missing APIs.
by Alexandre Julliard May 15, 2023

May 15, 2023

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 : gdi32/tests: Use win_skip() for missing APIs.
by Alexandre Julliard May 15, 2023

May 15, 2023

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 : iphlpapi/tests: Use win_skip() for missing APIs.
by Alexandre Julliard May 15, 2023

May 15, 2023

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

Davide Beatrici : wineoss: Use mmdevapi's AudioCaptureClient.
by Alexandre Julliard May 15, 2023

May 15, 2023

Module: wine Branch: master Commit: 652574f115dd97c767f816d5116b60c4a9e41d5b URL: https://gitlab.winehq.org/wine/wine/-/commit/652574f115dd97c767f816d5116b60… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Sat May 13 08:28:39 2023 +0200 wineoss: Use mmdevapi's AudioCaptureClient. --- dlls/wineoss.drv/mmdevdrv.c | 115 +------------------------------------------- 1 file changed, 1 insertion(+), 114 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 014592f26c5..323e96359c4 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -79,7 +79,7 @@ static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client); static const IAudioClient3Vtbl AudioClient3_Vtbl; static const IAudioRenderClientVtbl AudioRenderClient_Vtbl; -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; +extern const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl; extern const IAudioSessionControl2Vtbl AudioSessionControl2_Vtbl; extern const ISimpleAudioVolumeVtbl SimpleAudioVolume_Vtbl; extern const IAudioClockVtbl AudioClock_Vtbl; @@ -107,11 +107,6 @@ static inline ACImpl *impl_from_IAudioRenderClient(IAudioRenderClient *iface) return CONTAINING_RECORD(iface, ACImpl, IAudioRenderClient_iface); } -static inline ACImpl *impl_from_IAudioCaptureClient(IAudioCaptureClient *iface) -{ - return CONTAINING_RECORD(iface, ACImpl, IAudioCaptureClient_iface); -} - BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) { switch (reason) @@ -1170,114 +1165,6 @@ static const IAudioRenderClientVtbl AudioRenderClient_Vtbl = { AudioRenderClient_ReleaseBuffer }; -static HRESULT WINAPI AudioCaptureClient_QueryInterface( - IAudioCaptureClient *iface, REFIID riid, void **ppv) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ppv); - - if(!ppv) - return E_POINTER; - *ppv = NULL; - - if(IsEqualIID(riid, &IID_IUnknown) || - IsEqualIID(riid, &IID_IAudioCaptureClient)) - *ppv = iface; - else if(IsEqualIID(riid, &IID_IMarshal)) - return IUnknown_QueryInterface(This->marshal, riid, ppv); - if(*ppv){ - IUnknown_AddRef((IUnknown*)*ppv); - return S_OK; - } - - WARN("Unknown interface %s\n", debugstr_guid(riid)); - return E_NOINTERFACE; -} - -static ULONG WINAPI AudioCaptureClient_AddRef(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_AddRef(&This->IAudioClient3_iface); -} - -static ULONG WINAPI AudioCaptureClient_Release(IAudioCaptureClient *iface) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - return IAudioClient3_Release(&This->IAudioClient3_iface); -} - -static HRESULT WINAPI AudioCaptureClient_GetBuffer(IAudioCaptureClient *iface, - BYTE **data, UINT32 *frames, DWORD *flags, UINT64 *devpos, - UINT64 *qpcpos) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_capture_buffer_params params; - - TRACE("(%p)->(%p, %p, %p, %p, %p)\n", This, data, frames, flags, - devpos, qpcpos); - - if(!data) - return E_POINTER; - - *data = NULL; - - if(!frames || !flags) - return E_POINTER; - - params.stream = This->stream; - params.data = data; - params.frames = frames; - params.flags = (UINT*)flags; - params.devpos = devpos; - params.qpcpos = qpcpos; - OSS_CALL(get_capture_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_ReleaseBuffer( - IAudioCaptureClient *iface, UINT32 done) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct release_capture_buffer_params params; - - TRACE("(%p)->(%u)\n", This, done); - - params.stream = This->stream; - params.done = done; - OSS_CALL(release_capture_buffer, &params); - - return params.result; -} - -static HRESULT WINAPI AudioCaptureClient_GetNextPacketSize( - IAudioCaptureClient *iface, UINT32 *frames) -{ - ACImpl *This = impl_from_IAudioCaptureClient(iface); - struct get_next_packet_size_params params; - - TRACE("(%p)->(%p)\n", This, frames); - - if(!frames) - return E_POINTER; - - params.stream = This->stream; - params.frames = frames; - OSS_CALL(get_next_packet_size, &params); - - return params.result; -} - -static const IAudioCaptureClientVtbl AudioCaptureClient_Vtbl = -{ - AudioCaptureClient_QueryInterface, - AudioCaptureClient_AddRef, - AudioCaptureClient_Release, - AudioCaptureClient_GetBuffer, - AudioCaptureClient_ReleaseBuffer, - AudioCaptureClient_GetNextPacketSize -}; - static AudioSessionWrapper *AudioSessionWrapper_Create(ACImpl *client) { AudioSessionWrapper *ret;

1 0