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

Davide Beatrici : mmdevapi: Adjust timing in AudioClient_Initialize.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 2d55bd5dbdaff60983dc9e043317b276dbc97a5f URL: https://gitlab.winehq.org/wine/wine/-/commit/2d55bd5dbdaff60983dc9e043317b2… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 2 02:02:27 2024 +0200 mmdevapi: Adjust timing in AudioClient_Initialize. --- dlls/mmdevapi/client.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) diff --git a/dlls/mmdevapi/client.c b/dlls/mmdevapi/client.c index e0c12b8e534..0b849e47e3d 100644 --- a/dlls/mmdevapi/client.c +++ b/dlls/mmdevapi/client.c @@ -99,6 +99,61 @@ static inline struct audio_client *impl_from_IAudioStreamVolume(IAudioStreamVolu return CONTAINING_RECORD(iface, struct audio_client, IAudioStreamVolume_iface); } +static HRESULT adjust_timing(struct audio_client *This, + REFERENCE_TIME *duration, REFERENCE_TIME *period, + const AUDCLNT_SHAREMODE mode, const DWORD flags, + const WAVEFORMATEX *fmt) +{ + struct get_device_period_params params; + REFERENCE_TIME def_period, min_period; + + TRACE("Requested duration %lu and period %lu\n", (ULONG)*duration, (ULONG)*period); + + params.device = This->device_name; + params.flow = This->dataflow; + params.def_period = &def_period; + params.min_period = &min_period; + + wine_unix_call(get_device_period, &params); + + if (FAILED(params.result)) + return params.result; + + TRACE("Device periods: %lu default and %lu minimum\n", (ULONG)def_period, (ULONG)min_period); + + if (mode == AUDCLNT_SHAREMODE_SHARED) { + *period = def_period; + if (*duration < 3 * *period) + *duration = 3 * *period; + } else { + const WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE *)fmt; + if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && + (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) + params.result = AUDCLNT_E_UNSUPPORTED_FORMAT; + else { + if (*period == 0) + *period = def_period; + if (*period < min_period || *period > 5000000) + params.result = AUDCLNT_E_INVALID_DEVICE_PERIOD; + else if (*duration > 20000000) /* The smaller the period, the lower this limit. */ + params.result = AUDCLNT_E_BUFFER_SIZE_ERROR; + else if (flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { + if (*duration != *period) + params.result = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; + + FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); + + params.result = AUDCLNT_E_DEVICE_IN_USE; + } else if (*duration < 8 * *period) + *duration = 8 * *period; /* May grow above 2s. */ + } + } + + TRACE("Adjusted duration %lu and period %lu\n", (ULONG)*duration, (ULONG)*period); + + return params.result; +} + static void dump_fmt(const WAVEFORMATEX *fmt) { TRACE("wFormatTag: 0x%x (", fmt->wFormatTag); @@ -502,6 +557,9 @@ static HRESULT WINAPI client_Initialize(IAudioClient3 *iface, AUDCLNT_SHAREMODE return E_INVALIDARG; } + if (FAILED(params.result = adjust_timing(This, &duration, &period, mode, flags, fmt))) + return params.result; + sessions_lock(); if (This->stream) {

1 0

Davide Beatrici : winealsa: Remove superfluous timing adjustment.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 42e471f5c6e02ebb79a1b24ce2489a9fdd4cce4e URL: https://gitlab.winehq.org/wine/wine/-/commit/42e471f5c6e02ebb79a1b24ce2489a… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 2 00:23:22 2024 +0200 winealsa: Remove superfluous timing adjustment. --- dlls/winealsa.drv/alsa.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/dlls/winealsa.drv/alsa.c b/dlls/winealsa.drv/alsa.c index 3172e1ece81..a24cb56d1d8 100644 --- a/dlls/winealsa.drv/alsa.c +++ b/dlls/winealsa.drv/alsa.c @@ -810,36 +810,6 @@ static NTSTATUS alsa_create_stream(void *args) params->result = S_OK; - if (params->share == AUDCLNT_SHAREMODE_SHARED) { - params->period = def_period; - if (params->duration < 3 * params->period) - params->duration = 3 * params->period; - } else { - if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) - params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; - else { - if (!params->period) - params->period = def_period; - if (params->period < min_period || params->period > 5000000) - params->result = AUDCLNT_E_INVALID_DEVICE_PERIOD; - else if (params->duration > 20000000) /* The smaller the period, the lower this limit. */ - params->result = AUDCLNT_E_BUFFER_SIZE_ERROR; - else if (params->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { - if (params->duration != params->period) - params->result = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; - - FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - - params->result = AUDCLNT_E_DEVICE_IN_USE; - } else if (params->duration < 8 * params->period) - params->duration = 8 * params->period; /* May grow above 2s. */ - } - } - - if (FAILED(params->result)) - return STATUS_SUCCESS; - stream = calloc(1, sizeof(*stream)); if(!stream){ params->result = E_OUTOFMEMORY;

1 0

Davide Beatrici : winecoreaudio: Remove superfluous timing adjustment.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: f8d374e8ed1aed600b3553af6df39945319b7862 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8d374e8ed1aed600b3553af6df399… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 2 00:24:18 2024 +0200 winecoreaudio: Remove superfluous timing adjustment. --- dlls/winecoreaudio.drv/coreaudio.c | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/dlls/winecoreaudio.drv/coreaudio.c b/dlls/winecoreaudio.drv/coreaudio.c index a79a0d16839..deb9df1b45a 100644 --- a/dlls/winecoreaudio.drv/coreaudio.c +++ b/dlls/winecoreaudio.drv/coreaudio.c @@ -725,37 +725,6 @@ static NTSTATUS unix_create_stream(void *args) params->result = S_OK; - if (params->share == AUDCLNT_SHAREMODE_SHARED) { - params->period = def_period; - if (params->duration < 3 * params->period) - params->duration = 3 * params->period; - } else { - const WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE *)params->fmt; - if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) - params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; - else { - if (!params->period) - params->period = def_period; - if (params->period < min_period || params->period > 5000000) - params->result = AUDCLNT_E_INVALID_DEVICE_PERIOD; - else if (params->duration > 20000000) /* The smaller the period, the lower this limit. */ - params->result = AUDCLNT_E_BUFFER_SIZE_ERROR; - else if (params->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { - if (params->duration != params->period) - params->result = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; - - FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - - params->result = AUDCLNT_E_DEVICE_IN_USE; - } else if (params->duration < 8 * params->period) - params->duration = 8 * params->period; /* May grow above 2s. */ - } - } - - if (FAILED(params->result)) - return STATUS_SUCCESS; - if (!(stream = calloc(1, sizeof(*stream)))) { params->result = E_OUTOFMEMORY; return STATUS_SUCCESS;

1 0

Davide Beatrici : wineoss: Remove superfluous timing adjustment.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 53a636b034e172115d47e33dc4da35b5148c76fb URL: https://gitlab.winehq.org/wine/wine/-/commit/53a636b034e172115d47e33dc4da35… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 2 00:24:38 2024 +0200 wineoss: Remove superfluous timing adjustment. --- dlls/wineoss.drv/oss.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 89e626f39d6..819e876606c 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -576,36 +576,6 @@ static NTSTATUS oss_create_stream(void *args) params->result = S_OK; - if (params->share == AUDCLNT_SHAREMODE_SHARED) { - params->period = def_period; - if (params->duration < 3 * params->period) - params->duration = 3 * params->period; - } else { - if (fmtex->Format.wFormatTag == WAVE_FORMAT_EXTENSIBLE && - (fmtex->dwChannelMask == 0 || fmtex->dwChannelMask & SPEAKER_RESERVED)) - params->result = AUDCLNT_E_UNSUPPORTED_FORMAT; - else { - if (!params->period) - params->period = def_period; - if (params->period < min_period || params->period > 5000000) - params->result = AUDCLNT_E_INVALID_DEVICE_PERIOD; - else if (params->duration > 20000000) /* The smaller the period, the lower this limit. */ - params->result = AUDCLNT_E_BUFFER_SIZE_ERROR; - else if (params->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) { - if (params->duration != params->period) - params->result = AUDCLNT_E_BUFDURATION_PERIOD_NOT_EQUAL; - - FIXME("EXCLUSIVE mode with EVENTCALLBACK\n"); - - params->result = AUDCLNT_E_DEVICE_IN_USE; - } else if (params->duration < 8 * params->period) - params->duration = 8 * params->period; /* May grow above 2s. */ - } - } - - if (FAILED(params->result)) - return STATUS_SUCCESS; - stream = calloc(1, sizeof(*stream)); if(!stream){ params->result = E_OUTOFMEMORY;

1 0

Davide Beatrici : winepulse: Remove superfluous timing adjustment.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: fc9525a6211f853bdf211546fff4f69b31ba3b89 URL: https://gitlab.winehq.org/wine/wine/-/commit/fc9525a6211f853bdf211546fff4f6… Author: Davide Beatrici <git(a)davidebeatrici.dev> Date: Thu May 2 00:30:56 2024 +0200 winepulse: Remove superfluous timing adjustment. Please note that exclusive mode is not supported in this driver. --- dlls/winepulse.drv/pulse.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/dlls/winepulse.drv/pulse.c b/dlls/winepulse.drv/pulse.c index 62658fc98e6..dd8d0b4441d 100644 --- a/dlls/winepulse.drv/pulse.c +++ b/dlls/winepulse.drv/pulse.c @@ -1116,7 +1116,6 @@ static HRESULT get_device_period_helper(EDataFlow flow, const char *pulse_name, static NTSTATUS pulse_create_stream(void *args) { struct create_stream_params *params = args; - REFERENCE_TIME period, duration = params->duration; struct pulse_stream *stream; unsigned int i, bufsize_bytes; HRESULT hr; @@ -1156,21 +1155,15 @@ static NTSTATUS pulse_create_stream(void *args) if (FAILED(hr)) goto exit; - period = 0; - hr = get_device_period_helper(params->flow, params->device, &period, NULL); - if (FAILED(hr)) - goto exit; - - if (duration < 3 * period) - duration = 3 * period; - - stream->def_period = period; + stream->def_period = params->period; - stream->period_bytes = pa_frame_size(&stream->ss) * muldiv(period, stream->ss.rate, 10000000); + stream->period_bytes = pa_frame_size(&stream->ss) * muldiv(params->period, + stream->ss.rate, + 10000000); - stream->bufsize_frames = ceil((duration / 10000000.) * params->fmt->nSamplesPerSec); + stream->bufsize_frames = ceil((params->duration / 10000000.) * params->fmt->nSamplesPerSec); bufsize_bytes = stream->bufsize_frames * pa_frame_size(&stream->ss); - stream->mmdev_period_usec = period / 10; + stream->mmdev_period_usec = params->period / 10; stream->share = params->share; stream->flags = params->flags;

1 0

Rémi Bernon : win32u: Initialize window surfaces with a hwnd.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: d2ad7c937429ab010acb8d0f9d8cd6fbe78d1b38 URL: https://gitlab.winehq.org/wine/wine/-/commit/d2ad7c937429ab010acb8d0f9d8cd6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 29 14:39:25 2024 +0200 win32u: Initialize window surfaces with a hwnd. --- dlls/win32u/dce.c | 21 ++++++++++++++------- dlls/win32u/win32u_private.h | 2 +- dlls/win32u/window.c | 2 +- dlls/wineandroid.drv/window.c | 12 +++++------- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/surface.c | 4 ++-- dlls/winemac.drv/window.c | 4 ++-- dlls/winewayland.drv/window_surface.c | 7 ++----- dlls/winex11.drv/bitblt.c | 4 ++-- dlls/winex11.drv/window.c | 4 ++-- dlls/winex11.drv/x11drv.h | 2 +- include/wine/gdi_driver.h | 3 ++- 12 files changed, 35 insertions(+), 32 deletions(-)

1 0

Rémi Bernon : win32u: Split update_surface_region into get_window_region helper.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 5481415d438d41ac2b9fe42beb669d19af3af974 URL: https://gitlab.winehq.org/wine/wine/-/commit/5481415d438d41ac2b9fe42beb669d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Mar 17 20:20:09 2024 +0100 win32u: Split update_surface_region into get_window_region helper. --- dlls/win32u/window.c | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index bafceb1a22a..ee0d3001762 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1717,23 +1717,16 @@ static BOOL get_window_info( HWND hwnd, WINDOWINFO *info ) return TRUE; } -/*********************************************************************** - * update_surface_region - */ -static void update_surface_region( HWND hwnd ) +static NTSTATUS get_window_region( HWND hwnd, HRGN *region ) { NTSTATUS status; - HRGN region = 0; RGNDATA *data; size_t size = 256; - WND *win = get_win_ptr( hwnd ); - - if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) return; - if (!win->surface) goto done; + *region = 0; do { - if (!(data = malloc( FIELD_OFFSET( RGNDATA, Buffer[size] )))) goto done; + if (!(data = malloc( FIELD_OFFSET( RGNDATA, Buffer[size] )))) return STATUS_NO_MEMORY; SERVER_START_REQ( get_surface_region ) { @@ -1748,20 +1741,38 @@ static void update_surface_region( HWND hwnd ) data->rdh.iType = RDH_RECTANGLES; data->rdh.nCount = reply_size / sizeof(RECT); data->rdh.nRgnSize = reply_size; - region = NtGdiExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); - NtGdiOffsetRgn( region, -reply->visible_rect.left, -reply->visible_rect.top ); + *region = NtGdiExtCreateRegion( NULL, data->rdh.dwSize + data->rdh.nRgnSize, data ); + NtGdiOffsetRgn( *region, -reply->visible_rect.left, -reply->visible_rect.top ); } } else size = reply->total_size; } SERVER_END_REQ; + free( data ); } while (status == STATUS_BUFFER_OVERFLOW); - if (status) goto done; + return status; +} - win->surface->funcs->set_region( win->surface, region ); - if (region) NtGdiDeleteObjectApp( region ); +/*********************************************************************** + * update_surface_region + */ +static void update_surface_region( HWND hwnd ) +{ + WND *win = get_win_ptr( hwnd ); + HRGN region; + + if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) return; + if (!win->surface) goto done; + + if (get_window_region( hwnd, &region )) goto done; + if (!region) win->surface->funcs->set_region( win->surface, 0 ); + else + { + win->surface->funcs->set_region( win->surface, region ); + NtGdiDeleteObjectApp( region ); + } done: release_win_ptr( win );

1 0

Rémi Bernon : server: Merge get_surface_region / get_window_region requests together.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 7cdf20267cf31f6c493f9b99433e0a12388b9962 URL: https://gitlab.winehq.org/wine/wine/-/commit/7cdf20267cf31f6c493f9b99433e0a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Mar 17 20:20:09 2024 +0100 server: Merge get_surface_region / get_window_region requests together. --- dlls/win32u/window.c | 52 ++++++++++++++---------------------------- include/wine/server_protocol.h | 26 ++++----------------- server/protocol.def | 12 ++-------- server/request.h | 15 ++++-------- server/trace.c | 19 +++------------ server/window.c | 30 ++++++++++++------------ 6 files changed, 46 insertions(+), 108 deletions(-)

1 0

Rémi Bernon : win32u: Intersect the clipping region with the window shape region.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: 046d55ab6af2367ea91c7b1967c8d4baefef61d0 URL: https://gitlab.winehq.org/wine/wine/-/commit/046d55ab6af2367ea91c7b1967c8d4… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 26 14:35:50 2024 +0200 win32u: Intersect the clipping region with the window shape region. --- dlls/win32u/window.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 4d310edcbb2..ea4399b4293 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -1765,22 +1765,33 @@ static NTSTATUS get_window_region( HWND hwnd, BOOL surface, HRGN *region, RECT * static void update_surface_region( HWND hwnd ) { WND *win = get_win_ptr( hwnd ); - HRGN region; + HRGN region, shape = 0; RECT visible; if (!win || win == WND_DESKTOP || win == WND_OTHER_PROCESS) return; if (!win->surface) goto done; + if (get_window_region( hwnd, FALSE, &shape, &visible )) goto done; + if (shape) + { + region = NtGdiCreateRectRgn( 0, 0, visible.right - visible.left, visible.bottom - visible.top ); + NtGdiCombineRgn( shape, shape, region, RGN_AND ); + if (win->dwExStyle & WS_EX_LAYOUTRTL) NtUserMirrorRgn( hwnd, shape ); + NtGdiDeleteObjectApp( region ); + } + if (get_window_region( hwnd, TRUE, &region, &visible )) goto done; - if (!region) win->surface->funcs->set_region( win->surface, 0 ); + if (!region) win->surface->funcs->set_region( win->surface, shape ); else { NtGdiOffsetRgn( region, -visible.left, -visible.top ); + if (shape) NtGdiCombineRgn( region, region, shape, RGN_AND ); win->surface->funcs->set_region( win->surface, region ); NtGdiDeleteObjectApp( region ); } done: + if (shape) NtGdiDeleteObjectApp( shape ); release_win_ptr( win ); }

1 0

Rémi Bernon : server: Update window surface regions when the window is shaped.
by Alexandre Julliard 30 May '24

30 May '24

Module: wine Branch: master Commit: ee8f0b6c5d33ff03032baf77c8bb3ca74a588159 URL: https://gitlab.winehq.org/wine/wine/-/commit/ee8f0b6c5d33ff03032baf77c8bb3c… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Apr 26 14:35:50 2024 +0200 server: Update window surface regions when the window is shaped. --- server/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/window.c b/server/window.c index 50d6ae5dbcc..4ebfec3da12 100644 --- a/server/window.c +++ b/server/window.c @@ -2485,7 +2485,8 @@ DECL_HANDLER(set_window_pos) if (is_visible( top ) && (top->paint_flags & PAINT_HAS_SURFACE)) { reply->surface_win = top->handle; - reply->needs_update = !!(top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD)); + reply->needs_update = !!(top->paint_flags & (PAINT_HAS_PIXEL_FORMAT | PAINT_PIXEL_FORMAT_CHILD)) || + !!top->win_region; } }

1 0