February 2022 - Wine-Commits

Alex Henrie : comctl32/tests: Drop mru test workarounds for Windows <= 2000.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 259557cdce3669e970d3ee523d1606cc8aa6630c URL: https://source.winehq.org/git/wine.git/?a=commit;h=259557cdce3669e970d3ee52… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Feb 14 00:11:52 2022 -0700 comctl32/tests: Drop mru test workarounds for Windows <= 2000. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/mru.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/mru.c b/dlls/comctl32/tests/mru.c index 87677b33902..6a9a04d9663 100644 --- a/dlls/comctl32/tests/mru.c +++ b/dlls/comctl32/tests/mru.c @@ -340,15 +340,11 @@ static void test_MRUListA(void) iRet, GetLastError()); /* Add (NULL string) */ - if (0) - { - /* Some native versions crash when passed NULL or fail to SetLastError() */ SetLastError(0); iRet = pAddMRUStringA(hMRU, NULL); - ok(iRet == 0 && GetLastError() == ERROR_INVALID_PARAMETER, - "AddMRUStringA(NULL str) expected 0,ERROR_INVALID_PARAMETER got %d,%d\n", + todo_wine ok(iRet == 0 && !GetLastError(), + "AddMRUStringA(NULL str) expected 0,0 got %d,%d\n", iRet, GetLastError()); - } /* Add 3 strings. Check the registry is correct after each add */ SetLastError(0); @@ -450,7 +446,7 @@ static void test_MRUListA(void) pFreeMRUList(hMRU); } - /* FreeMRUList(NULL) crashes on Win98 OSR0 */ + pFreeMRUList(NULL); /* should not crash */ } typedef struct { @@ -504,13 +500,9 @@ static void test_EnumMRUList(void) return; } - /* NULL handle */ - if (0) - { - /* crashes on NT4, passed on Win2k, XP, 2k3, Vista, 2k8 */ - pEnumMRUListA(NULL, 0, NULL, 0); - pEnumMRUListW(NULL, 0, NULL, 0); - } + /* NULL handle - should not crash */ + pEnumMRUListA(NULL, 0, NULL, 0); + pEnumMRUListW(NULL, 0, NULL, 0); } static void test_FindMRUData(void)

1 0

Eric Pouech : quartz: Always allocate the entire VIDEOINFO structure.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: e102068c0daab41f953d0594df1cdb92ae70de72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e102068c0daab41f953d0594… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 12:33:09 2022 -0600 quartz: Always allocate the entire VIDEOINFO structure. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/avidec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index f8660890273..f473c829cba 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -342,9 +342,12 @@ static HRESULT avi_decompressor_source_get_media_type(struct strmbase_pin *iface if (index < ARRAY_SIZE(formats)) { - if (!(format = CoTaskMemAlloc(offsetof(VIDEOINFO, dwBitMasks[3])))) + /* In theory we could allocate less than this, but gcc generates + * -Warray-bounds warnings if we access the structure through a + * VIDEOINFO pointer, even if we only access valid fields. */ + if (!(format = CoTaskMemAlloc(sizeof(*format)))) return E_OUTOFMEMORY; - memset(format, 0, offsetof(VIDEOINFO, dwBitMasks[3])); + memset(format, 0, sizeof(*format)); format->rcSource = sink_format->rcSource; format->rcTarget = sink_format->rcTarget;

1 0

Eric Pouech : kernel32/test: Fully allocate KEY_VALUE_*_INFORMATION.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 37a830916b76646ed6925f5053db3b8e896c8563 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37a830916b76646ed6925f50… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 17 11:16:36 2022 +0100 kernel32/test: Fully allocate KEY_VALUE_*_INFORMATION. This prevents a warning on mingw-gcc version 11 (-Warray-bounds). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/reg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/tests/reg.c b/dlls/ntdll/tests/reg.c index bd8d531edf0..7d069666604 100644 --- a/dlls/ntdll/tests/reg.c +++ b/dlls/ntdll/tests/reg.c @@ -742,7 +742,7 @@ static void test_NtQueryValueKey(void) ok(status == STATUS_SUCCESS, "NtOpenKey Failed: 0x%08x\n", status); len = FIELD_OFFSET(KEY_VALUE_BASIC_INFORMATION, Name[0]); - basic_info = HeapAlloc(GetProcessHeap(), 0, len); + basic_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*basic_info)); status = pNtQueryValueKey(key, &ValName, KeyValueBasicInformation, basic_info, len, &len); ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); ok(basic_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", basic_info->TitleIndex); @@ -761,7 +761,7 @@ static void test_NtQueryValueKey(void) HeapFree(GetProcessHeap(), 0, basic_info); len = FIELD_OFFSET(KEY_VALUE_PARTIAL_INFORMATION, Data[0]); - partial_info = HeapAlloc(GetProcessHeap(), 0, len); + partial_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*partial_info)); status = pNtQueryValueKey(key, &ValName, KeyValuePartialInformation, partial_info, len, &len); ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); ok(partial_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", partial_info->TitleIndex); @@ -780,7 +780,7 @@ static void test_NtQueryValueKey(void) HeapFree(GetProcessHeap(), 0, partial_info); len = FIELD_OFFSET(KEY_VALUE_FULL_INFORMATION, Name[0]); - full_info = HeapAlloc(GetProcessHeap(), 0, len); + full_info = HeapAlloc(GetProcessHeap(), 0, sizeof(*full_info)); status = pNtQueryValueKey(key, &ValName, KeyValueFullInformation, full_info, len, &len); ok(status == STATUS_BUFFER_OVERFLOW, "NtQueryValueKey should have returned STATUS_BUFFER_OVERFLOW instead of 0x%08x\n", status); ok(full_info->TitleIndex == 0, "NtQueryValueKey returned wrong TitleIndex %d\n", full_info->TitleIndex);

1 0

Jacek Caban : win32u: Move primary palette handling from user32.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 4b0c0a6b23378d46f580591655c7e613a6808afc URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b0c0a6b23378d46f5805916… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 17 15:43:40 2022 +0100 win32u: Move primary palette handling from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/user_main.c | 72 +++----------------------------------------- dlls/win32u/ntuser_private.h | 1 + dlls/win32u/palette.c | 26 ++++++++++++++-- 3 files changed, 29 insertions(+), 70 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index 8ca55b283f7..ea30772067d 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -44,10 +44,6 @@ static CRITICAL_SECTION_DEBUG critsect_debug = }; static CRITICAL_SECTION user_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static HPALETTE (WINAPI *pfnGDISelectPalette)( HDC hdc, HPALETTE hpal, WORD bkgnd ); -static UINT (WINAPI *pfnGDIRealizePalette)( HDC hdc ); -static HPALETTE hPrimaryPalette; - static DWORD exiting_thread_id; extern void WDML_NotifyThreadDetach(void); @@ -86,69 +82,11 @@ void USER_CheckNotLock(void) /*********************************************************************** - * UserSelectPalette (Not a Windows API) + * UserRealizePalette (USER32.@) */ -static HPALETTE WINAPI UserSelectPalette( HDC hDC, HPALETTE hPal, BOOL bForceBackground ) +UINT WINAPI UserRealizePalette( HDC hdc ) { - WORD wBkgPalette = 1; - - if (!bForceBackground && (hPal != GetStockObject(DEFAULT_PALETTE))) - { - HWND hwnd = WindowFromDC( hDC ); - if (hwnd) - { - HWND hForeground = NtUserGetForegroundWindow(); - /* set primary palette if it's related to current active */ - if (hForeground == hwnd || IsChild(hForeground,hwnd)) - { - wBkgPalette = 0; - hPrimaryPalette = hPal; - } - } - } - return pfnGDISelectPalette( hDC, hPal, wBkgPalette); -} - - -/*********************************************************************** - * UserRealizePalette (USER32.@) - */ -UINT WINAPI UserRealizePalette( HDC hDC ) -{ - UINT realized = pfnGDIRealizePalette( hDC ); - - /* do not send anything if no colors were changed */ - if (realized && GetCurrentObject( hDC, OBJ_PAL ) == hPrimaryPalette) - { - /* send palette change notification */ - HWND hWnd = WindowFromDC( hDC ); - if (hWnd) SendMessageTimeoutW( HWND_BROADCAST, WM_PALETTECHANGED, (WPARAM)hWnd, 0, - SMTO_ABORTIFHUNG, 2000, NULL ); - } - return realized; -} - - -/*********************************************************************** - * palette_init - * - * Patch the function pointers in GDI for SelectPalette and RealizePalette - */ -static void palette_init(void) -{ - void **ptr; - HMODULE module = GetModuleHandleA( "gdi32" ); - if (!module) - { - ERR( "cannot get GDI32 handle\n" ); - return; - } - if ((ptr = (void**)GetProcAddress( module, "pfnSelectPalette" ))) - pfnGDISelectPalette = InterlockedExchangePointer( ptr, UserSelectPalette ); - else ERR( "cannot find pfnSelectPalette in GDI32\n" ); - if ((ptr = (void**)GetProcAddress( module, "pfnRealizePalette" ))) - pfnGDIRealizePalette = InterlockedExchangePointer( ptr, UserRealizePalette ); - else ERR( "cannot find pfnRealizePalette in GDI32\n" ); + return NtUserCallOneParam( HandleToUlong(hdc), NtUserRealizePalette ); } @@ -212,6 +150,7 @@ static const struct user_callbacks user_funcs = { GetDesktopWindow, GetWindowRect, + IsChild, RedrawWindow, SendMessageTimeoutW, WindowFromDC, @@ -240,9 +179,6 @@ static BOOL process_attach(void) /* Initialize system colors and metrics */ SYSPARAMS_Init(); - /* Setup palette function pointers */ - palette_init(); - return TRUE; } diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index f0e0f8835bf..e9d19744976 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -28,6 +28,7 @@ struct user_callbacks { HWND (WINAPI *pGetDesktopWindow)(void); BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect ); + BOOL (WINAPI *pIsChild)( HWND, HWND ); BOOL (WINAPI *pRedrawWindow)( HWND, const RECT*, HRGN, UINT ); LRESULT (WINAPI *pSendMessageTimeoutW)( HWND, UINT, WPARAM, LPARAM, UINT, UINT, PDWORD_PTR ); HWND (WINAPI *pWindowFromDC)( HDC ); diff --git a/dlls/win32u/palette.c b/dlls/win32u/palette.c index 1c2f2c70434..d09fc9d4d73 100644 --- a/dlls/win32u/palette.c +++ b/dlls/win32u/palette.c @@ -508,12 +508,22 @@ static BOOL PALETTE_DeleteObject( HGDIOBJ handle ) */ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) { + BOOL is_primary = FALSE; HPALETTE ret = 0; DC *dc; TRACE("%p %p\n", hdc, hpal ); - /* FIXME: move primary palette handling from user32 */ + if (!bkg && hpal != get_stock_object( DEFAULT_PALETTE )) + { + HWND hwnd = user_callbacks->pWindowFromDC( hdc ); + if (hwnd) + { + /* set primary palette if it's related to current active */ + HWND foreground = NtUserGetForegroundWindow(); + is_primary = foreground == hwnd || user_callbacks->pIsChild( foreground, hwnd ); + } + } if (get_gdi_object_type(hpal) != NTGDI_OBJ_PAL) { @@ -524,7 +534,7 @@ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) { ret = dc->hPalette; dc->hPalette = hpal; - if (!bkg) hPrimaryPalette = hpal; + if (is_primary) hPrimaryPalette = hpal; release_dc_ptr( dc ); } return ret; @@ -536,6 +546,7 @@ HPALETTE WINAPI NtUserSelectPalette( HDC hdc, HPALETTE hpal, WORD bkg ) */ UINT realize_palette( HDC hdc ) { + BOOL is_primary = FALSE; UINT realized = 0; DC* dc = get_dc_ptr( hdc ); @@ -559,12 +570,23 @@ UINT realize_palette( HDC hdc ) (dc->hPalette == hPrimaryPalette) ); palPtr->unrealize = physdev->funcs->pUnrealizePalette; GDI_ReleaseObj( dc->hPalette ); + is_primary = dc->hPalette == hPrimaryPalette; } } else TRACE(" skipping (hLastRealizedPalette = %p)\n", hLastRealizedPalette); release_dc_ptr( dc ); TRACE(" realized %i colors.\n", realized ); + + /* do not send anything if no colors were changed */ + if (realized && is_primary) + { + /* send palette change notification */ + HWND hwnd = user_callbacks->pWindowFromDC( hdc ); + if (hwnd) user_callbacks->pSendMessageTimeoutW( HWND_BROADCAST, WM_PALETTECHANGED, + HandleToUlong(hwnd), 0, SMTO_ABORTIFHUNG, + 2000, NULL ); + } return realized; }

1 0

Huw Davies : winealsa: Move is_format_supported to the unixlib.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: d2339bb4c92d46fc0f696e08dbdee672b33142a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2339bb4c92d46fc0f696e08… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:52 2022 +0000 winealsa: Move is_format_supported to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 291 +++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 150 +++------------------- dlls/winealsa.drv/unixlib.h | 11 ++ 3 files changed, 317 insertions(+), 135 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d2339bb4c92d46fc0f69…

1 0

Huw Davies : winealsa: Move get_mix_format to the unixlib.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 7920275c56d39d773e5eb1354da1e5b0318cbae9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7920275c56d39d773e5eb135… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:51 2022 +0000 winealsa: Move get_mix_format to the unixlib. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/alsa.c | 178 +++++++++++++++++++++++++++++++++++++++++++ dlls/winealsa.drv/mmdevdrv.c | 126 +++--------------------------- dlls/winealsa.drv/unixlib.h | 9 +++ 3 files changed, 199 insertions(+), 114 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=7920275c56d39d773e5e…

1 0

Nikolay Sivov : mfplat: Fix playback rate handling in system time source.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 6971e7e021f03c119f806b386adbdfce002686a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6971e7e021f03c119f806b38… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 17 12:15:28 2022 +0300 mfplat: Fix playback rate handling in system time source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 49 ++++++++++++++++++++-------------------------- dlls/mfplat/tests/mfplat.c | 25 +++++++++++++++++++++++ 2 files changed, 46 insertions(+), 28 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 1992776595d..7991152f7a7 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -124,17 +124,20 @@ struct system_time_source MFCLOCK_STATE state; IMFClock *clock; LONGLONG start_offset; + LONGLONG system_time; + LONGLONG clock_time; float rate; int i_rate; CRITICAL_SECTION cs; }; -static void system_time_source_apply_rate(const struct system_time_source *source, LONGLONG *value) +static void system_time_source_update_clock_time(struct system_time_source *source, LONGLONG system_time) { - if (source->i_rate) - *value *= source->i_rate; - else - *value *= source->rate; + LONGLONG diff = system_time - source->system_time; + if (source->i_rate) diff *= source->i_rate; + else if (source->rate != 1.0f) diff *= source->rate; + source->clock_time += diff; + source->system_time = system_time; } static struct system_time_source *impl_from_IMFPresentationTimeSource(IMFPresentationTimeSource *iface) @@ -8076,12 +8079,8 @@ static HRESULT WINAPI system_time_source_GetCorrelatedTime(IMFPresentationTimeSo if (SUCCEEDED(hr = IMFClock_GetCorrelatedTime(source->clock, 0, clock_time, system_time))) { if (source->state == MFCLOCK_STATE_RUNNING) - { - system_time_source_apply_rate(source, clock_time); - *clock_time += source->start_offset; - } - else - *clock_time = source->start_offset; + system_time_source_update_clock_time(source, *system_time); + *clock_time = source->start_offset + source->clock_time; } LeaveCriticalSection(&source->cs); @@ -8220,25 +8219,19 @@ static HRESULT WINAPI system_time_source_sink_OnClockStart(IMFClockStateSink *if state = source->state; if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_START))) { - system_time_source_apply_rate(source, &system_time); if (start_offset == PRESENTATION_CURRENT_POSITION) { - switch (state) + if (state != MFCLOCK_STATE_RUNNING) { - case MFCLOCK_STATE_RUNNING: - break; - case MFCLOCK_STATE_PAUSED: - source->start_offset -= system_time; - break; - default: - source->start_offset = -system_time; - break; - ; + source->start_offset -= system_time; + source->system_time = 0; } } else { - source->start_offset = -system_time + start_offset; + source->start_offset = start_offset; + source->system_time = system_time; + source->clock_time = 0; } } LeaveCriticalSection(&source->cs); @@ -8255,7 +8248,9 @@ static HRESULT WINAPI system_time_source_sink_OnClockStop(IMFClockStateSink *ifa EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_STOP))) - source->start_offset = 0; + { + source->start_offset = source->system_time = source->clock_time = 0; + } LeaveCriticalSection(&source->cs); return hr; @@ -8271,8 +8266,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockPause(IMFClockStateSink *if EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_PAUSE))) { - system_time_source_apply_rate(source, &system_time); - source->start_offset += system_time; + system_time_source_update_clock_time(source, system_time); } LeaveCriticalSection(&source->cs); @@ -8289,8 +8283,7 @@ static HRESULT WINAPI system_time_source_sink_OnClockRestart(IMFClockStateSink * EnterCriticalSection(&source->cs); if (SUCCEEDED(hr = system_time_source_change_state(source, CLOCK_CMD_RESTART))) { - system_time_source_apply_rate(source, &system_time); - source->start_offset -= system_time; + source->system_time = system_time; } LeaveCriticalSection(&source->cs); diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index c013b7b5c23..91c9d971a3b 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -3641,6 +3641,31 @@ static void test_system_time_source(void) hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + hr = IMFClockStateSink_OnClockSetRate(statesink, 5, 2.0f); + ok(hr == S_OK, "Failed to set rate, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockPause(statesink, 6); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 12 && !!systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockRestart(statesink, 7); + ok(hr == S_OK, "Failed to restart source, hr %#x.\n", hr); + + hr = IMFClockStateSink_OnClockPause(statesink, 8); + ok(hr == S_OK, "Failed to pause source, hr %#x.\n", hr); + + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); + ok(hr == S_OK, "Failed to get time %#x.\n", hr); + ok(time == 14 && !!systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time), + wine_dbgstr_longlong(systime)); + + hr = IMFClockStateSink_OnClockStart(statesink, 0, 0); + ok(hr == S_OK, "Failed to start source, hr %#x.\n", hr); + hr = IMFPresentationTimeSource_GetCorrelatedTime(time_source, 0, &time, &systime); ok(hr == S_OK, "Failed to get time %#x.\n", hr); ok(time == 2 * systime, "Unexpected time stamp %s, %s.\n", wine_dbgstr_longlong(time),

1 0

Huw Davies : winealsa: Use the stream ptr to indicate the init state.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 10987172f4d73db1957fc2d4079dd352edff8b60 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10987172f4d73db1957fc2d4… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:54 2022 +0000 winealsa: Use the stream ptr to indicate the init state. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 10f2951a0e6..48694710719 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -109,8 +109,6 @@ struct ACImpl { UINT32 channel_count; struct alsa_stream *stream; - BOOL initted; - HANDLE timer; CRITICAL_SECTION lock; @@ -578,7 +576,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - if(This->initted){ + if(This->session){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); @@ -969,7 +967,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, EnterCriticalSection(&g_sessions_lock); EnterCriticalSection(&This->lock); - if(This->initted){ + if(This->stream){ LeaveCriticalSection(&This->lock); LeaveCriticalSection(&g_sessions_lock); return AUDCLNT_E_ALREADY_INITIALIZED; @@ -1201,7 +1199,6 @@ exit: This->vols = NULL; }else{ This->stream = stream; - This->initted = TRUE; } LeaveCriticalSection(&This->lock); @@ -1223,7 +1220,7 @@ static HRESULT WINAPI AudioClient_GetBufferSize(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1248,7 +1245,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1282,7 +1279,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1873,7 +1870,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1942,7 +1939,7 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -1971,7 +1968,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -2023,7 +2020,7 @@ static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; } @@ -2059,7 +2056,7 @@ static HRESULT WINAPI AudioClient_GetService(IAudioClient3 *iface, REFIID riid, EnterCriticalSection(&This->lock); - if(!This->initted){ + if(!This->stream){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_NOT_INITIALIZED; }

1 0

Huw Davies : winealsa: Move the pcm device opening to a helper.
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 2df122934ebf29b9b595a0a0e3091942c2bae1ec URL: https://source.winehq.org/git/wine.git/?a=commit;h=2df122934ebf29b9b595a0a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:50 2022 +0000 winealsa: Move the pcm device opening to a helper. This will allow GetMixFormat and IsFormatSupported to share this code without needing a stream. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 50 +++++++++++++++++++++++++++----------------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index f1bc2fd0247..ecd74d373aa 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -442,10 +442,37 @@ static BOOL get_alsa_name_by_guid(GUID *guid, char *name, DWORD name_size, EData return FALSE; } +static HRESULT alsa_open_device(const char *alsa_name, EDataFlow flow, snd_pcm_t **pcm_handle, + snd_pcm_hw_params_t **hw_params) +{ + int err; + + if(flow != eRender && flow != eCapture) + return E_UNEXPECTED; + + err = snd_pcm_open(pcm_handle, alsa_name, alsa_get_direction(flow), SND_PCM_NONBLOCK); + if(err < 0){ + WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); + switch(err){ + case -EBUSY: + return AUDCLNT_E_DEVICE_IN_USE; + default: + return AUDCLNT_E_ENDPOINT_CREATE_FAILED; + } + } + + *hw_params = HeapAlloc(GetProcessHeap(), 0, snd_pcm_hw_params_sizeof()); + if(!*hw_params){ + snd_pcm_close(*pcm_handle); + return E_OUTOFMEMORY; + } + + return S_OK; +} + HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient **out) { ACImpl *This; - int err; char alsa_name[256]; EDataFlow dataflow; HRESULT hr; @@ -486,26 +513,11 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient return E_OUTOFMEMORY; } - err = snd_pcm_open(&This->stream->pcm_handle, alsa_name, alsa_get_direction(dataflow), SND_PCM_NONBLOCK); - if(err < 0){ - HeapFree(GetProcessHeap(), 0, This->stream); - HeapFree(GetProcessHeap(), 0, This); - WARN("Unable to open PCM \"%s\": %d (%s)\n", alsa_name, err, snd_strerror(err)); - switch(err){ - case -EBUSY: - return AUDCLNT_E_DEVICE_IN_USE; - default: - return AUDCLNT_E_ENDPOINT_CREATE_FAILED; - } - } - - This->stream->hw_params = HeapAlloc(GetProcessHeap(), 0, - snd_pcm_hw_params_sizeof()); - if(!This->stream->hw_params){ - snd_pcm_close(This->stream->pcm_handle); + hr = alsa_open_device(alsa_name, dataflow, &This->stream->pcm_handle, &This->stream->hw_params); + if(FAILED(hr)){ HeapFree(GetProcessHeap(), 0, This->stream); HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; + return hr; } InitializeCriticalSection(&This->lock);

1 0

Huw Davies : winealsa: Move the stream creation to AudioClient_Initialize().
by Alexandre Julliard Feb. 17, 2022

Feb. 17, 2022

Module: wine Branch: master Commit: 1ad8978f4068ad91b43d35345297f2c00d6710e3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ad8978f4068ad91b43d3534… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Feb 16 09:34:53 2022 +0000 winealsa: Move the stream creation to AudioClient_Initialize(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winealsa.drv/mmdevdrv.c | 56 ++++++++++++++++++++++++-------------------- 1 file changed, 31 insertions(+), 25 deletions(-) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 8a80acd871a..10f2951a0e6 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -507,19 +507,6 @@ HRESULT WINAPI AUDDRV_GetAudioEndpoint(GUID *guid, IMMDevice *dev, IAudioClient This->dataflow = dataflow; memcpy(This->alsa_name, alsa_name, len + 1); - This->stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); - if(!This->stream){ - HeapFree(GetProcessHeap(), 0, This); - return E_OUTOFMEMORY; - } - - hr = alsa_open_device(alsa_name, dataflow, &This->stream->pcm_handle, &This->stream->hw_params); - if(FAILED(hr)){ - HeapFree(GetProcessHeap(), 0, This->stream); - HeapFree(GetProcessHeap(), 0, This); - return hr; - } - InitializeCriticalSection(&This->lock); This->lock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": ACImpl.lock"); @@ -591,21 +578,23 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) IUnknown_Release(This->pUnkFTMarshal); This->lock.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&This->lock); - snd_pcm_drop(stream->pcm_handle); - snd_pcm_close(stream->pcm_handle); if(This->initted){ EnterCriticalSection(&g_sessions_lock); list_remove(&This->entry); LeaveCriticalSection(&g_sessions_lock); } HeapFree(GetProcessHeap(), 0, This->vols); - HeapFree(GetProcessHeap(), 0, stream->local_buffer); - HeapFree(GetProcessHeap(), 0, stream->remapping_buf); - HeapFree(GetProcessHeap(), 0, stream->silence_buf); - HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); - HeapFree(GetProcessHeap(), 0, stream->hw_params); - CoTaskMemFree(stream->fmt); - HeapFree(GetProcessHeap(), 0, stream); + if (stream){ + snd_pcm_drop(stream->pcm_handle); + snd_pcm_close(stream->pcm_handle); + HeapFree(GetProcessHeap(), 0, stream->local_buffer); + HeapFree(GetProcessHeap(), 0, stream->remapping_buf); + HeapFree(GetProcessHeap(), 0, stream->silence_buf); + HeapFree(GetProcessHeap(), 0, stream->tmp_buffer); + HeapFree(GetProcessHeap(), 0, stream->hw_params); + CoTaskMemFree(stream->fmt); + HeapFree(GetProcessHeap(), 0, stream); + } HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -919,7 +908,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, const GUID *sessionguid) { ACImpl *This = impl_from_IAudioClient3(iface); - struct alsa_stream *stream = This->stream; + struct alsa_stream *stream; snd_pcm_sw_params_t *sw_params = NULL; snd_pcm_format_t format; unsigned int rate, alsa_period_us; @@ -988,6 +977,20 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, dump_fmt(fmt); + stream = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->stream)); + if(!stream){ + LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); + return E_OUTOFMEMORY; + } + + hr = alsa_open_device(This->alsa_name, This->dataflow, &stream->pcm_handle, &stream->hw_params); + if(FAILED(hr)){ + LeaveCriticalSection(&This->lock); + LeaveCriticalSection(&g_sessions_lock); + return hr; + } + stream->need_remapping = map_channels(This, fmt, &stream->alsa_channels, stream->alsa_channel_map) == S_OK; if((err = snd_pcm_hw_params_any(stream->pcm_handle, stream->hw_params)) < 0){ @@ -1180,8 +1183,6 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, list_add_tail(&This->session->clients, &This->entry); - This->initted = TRUE; - TRACE("ALSA period: %lu frames\n", stream->alsa_period_frames); TRACE("ALSA buffer: %lu frames\n", stream->alsa_bufsize_frames); TRACE("MMDevice period: %u frames\n", stream->mmdev_period_frames); @@ -1190,12 +1191,17 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, exit: HeapFree(GetProcessHeap(), 0, sw_params); if(FAILED(hr)){ + snd_pcm_close(stream->pcm_handle); HeapFree(GetProcessHeap(), 0, stream->local_buffer); stream->local_buffer = NULL; CoTaskMemFree(stream->fmt); stream->fmt = NULL; + HeapFree(GetProcessHeap(), 0, stream); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; + }else{ + This->stream = stream; + This->initted = TRUE; } LeaveCriticalSection(&This->lock);

1 0