April 2022 - Wine-Commits - list.winehq.org

Alexandre Julliard : user32: Pass a valid length to RtlUnicodeToMultiByteN/RtlMultiByteToUnicodeN.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: dee9a361c74d150bd04017bcc938ec49d8f5fb27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dee9a361c74d150bd04017bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 09:44:41 2022 +0200 user32: Pass a valid length to RtlUnicodeToMultiByteN/RtlMultiByteToUnicodeN. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/winproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 7b9b2000c06..9e90906bc5d 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -373,7 +373,7 @@ LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg, if (*result >= 0) { DWORD len; - RtlUnicodeToMultiByteN( (LPSTR)lParam, ~0u, &len, + RtlUnicodeToMultiByteN( (LPSTR)lParam, 512 * 3, &len, buffer, (lstrlenW(buffer) + 1) * sizeof(WCHAR) ); *result = len - 1; } @@ -633,7 +633,7 @@ static LRESULT WINPROC_CallProcWtoA( winproc_callback_t callback, HWND hwnd, UIN if (*result >= 0) { DWORD len; - RtlMultiByteToUnicodeN( (LPWSTR)lParam, ~0u, &len, buffer, strlen(buffer) + 1 ); + RtlMultiByteToUnicodeN( (LPWSTR)lParam, 512 * 3, &len, buffer, strlen(buffer) + 1 ); *result = len / sizeof(WCHAR) - 1; } }

1 0

Alexandre Julliard : ole32: Fix sign expansion of codepage values.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 1f71ea3106d41a0cc392fc626a3ecd7c890425fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=1f71ea3106d41a0cc392fc62… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 14 09:44:16 2022 +0200 ole32: Fix sign expansion of codepage values. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/stg_prop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/stg_prop.c b/dlls/ole32/stg_prop.c index 28793d7cbd5..8efb8ed5543 100644 --- a/dlls/ole32/stg_prop.c +++ b/dlls/ole32/stg_prop.c @@ -802,7 +802,7 @@ static HRESULT WINAPI IPropertyStorage_fnWriteMultiple( if (dictionary_num_entries(This->propid_to_prop) == 0 && rgpropvar[i].vt == VT_I2) { - This->codePage = rgpropvar[i].iVal; + This->codePage = (USHORT)rgpropvar[i].iVal; if (This->codePage == CP_UNICODE) This->grfFlags &= ~PROPSETFLAG_ANSI; else @@ -1868,7 +1868,7 @@ static HRESULT PropertyStorage_ReadFromStream(PropertyStorage_impl *This) { case PID_CODEPAGE: if (prop.vt == VT_I2) - This->codePage = (UINT)prop.iVal; + This->codePage = (USHORT)prop.iVal; break; case PID_LOCALE: if (prop.vt == VT_I4)

1 0

Austin English : dbghelp: Downgrade a FIXME to a WARN.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 8d3ca2130af3175c8f705b66c47542b9570af8e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d3ca2130af3175c8f705b66… Author: Austin English <austinenglish(a)gmail.com> Date: Wed Apr 13 16:05:58 2022 -0500 dbghelp: Downgrade a FIXME to a WARN. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52790 Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dwarf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index 5cc105d35c9..0076b19e5cb 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1248,7 +1248,7 @@ static BOOL dwarf2_read_range(dwarf2_parse_context_t* ctx, const dwarf2_debug_in if (low < *plow) *plow = low; if (high > *phigh) *phigh = high; } - if (*plow == UMAX || *phigh == 0) {FIXME("no entry found\n"); return FALSE;} + if (*plow == UMAX || *phigh == 0) {WARN("no entry found\n"); return FALSE;} if (*plow == *phigh) {WARN("entry found, but low=high %Ix %Ix\n", low, high); return FALSE;} return TRUE;

1 0

Huw Davies : wineoss: Move stop to the unixlib.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: dca18a115b304153b3df51997a466df227f8964e URL: https://source.winehq.org/git/wine.git/?a=commit;h=dca18a115b304153b3df5199… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 07:38:50 2022 +0100 wineoss: Move stop 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/wineoss.drv/mmdevdrv.c | 17 ++++------------- dlls/wineoss.drv/oss.c | 17 +++++++++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 28 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e50a7b32338..75661f917cc 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -961,26 +961,17 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct stop_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - if(!stream->playing){ - oss_unlock(stream); - return S_FALSE; - } - - stream->playing = FALSE; - stream->in_oss_frames = 0; - - oss_unlock(stream); + params.stream = This->stream; + OSS_CALL(stop, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 241b6d014ec..bcd07c2d2fc 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -645,6 +645,22 @@ static NTSTATUS start(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS stop(void *args) +{ + struct stop_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + if(!stream->playing) + return oss_unlock_result(stream, &params->result, S_FALSE); + + stream->playing = FALSE; + stream->in_oss_frames = 0; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) { WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; @@ -1008,6 +1024,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = create_stream, release_stream, start, + stop, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 7418261282d..c69ef1c3e4b 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -96,6 +96,12 @@ struct start_params HRESULT result; }; +struct stop_params +{ + struct oss_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct oss_stream *stream; @@ -147,6 +153,7 @@ enum oss_funcs oss_create_stream, oss_release_stream, oss_start, + oss_stop, oss_timer_loop, oss_is_format_supported, oss_get_mix_format,

1 0

Huw Davies : wineoss: Move timer_loop to the unixlib.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 93cc994be8403d5052995eccab2f3044392cbc7d URL: https://source.winehq.org/git/wine.git/?a=commit;h=93cc994be8403d5052995ecc… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 07:38:48 2022 +0100 wineoss: Move timer_loop 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/wineoss.drv/mmdevdrv.c | 199 +++++--------------------------------------- dlls/wineoss.drv/oss.c | 196 +++++++++++++++++++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 9 +- 3 files changed, 223 insertions(+), 181 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=93cc994be8403d505299…

1 0

Huw Davies : wineoss: Move get_latency to the unixlib.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: 984cae317b0d16e10eadf51444d6d9b388b23ee5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=984cae317b0d16e10eadf514… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 07:38:45 2022 +0100 wineoss: Move get_latency 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/wineoss.drv/mmdevdrv.c | 14 +++++--------- dlls/wineoss.drv/oss.c | 15 +++++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index a2f75d7a479..8a2329d1f04 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -806,7 +806,7 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, REFERENCE_TIME *latency) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct get_latency_params params; TRACE("(%p)->(%p)\n", This, latency); @@ -816,15 +816,11 @@ static HRESULT WINAPI AudioClient_GetStreamLatency(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - /* pretend we process audio in Period chunks, so max latency includes - * the period time. Some native machines add .6666ms in shared mode. */ - *latency = (REFERENCE_TIME)stream->period_us * 10 + 6666; - - oss_unlock(stream); + params.stream = This->stream; + params.latency = latency; + OSS_CALL(get_latency, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index fdad419abfa..a80557b2c15 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -762,6 +762,20 @@ static NTSTATUS get_buffer_size(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_latency(void *args) +{ + struct get_latency_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + /* pretend we process audio in Period chunks, so max latency includes + * the period time. Some native machines add .6666ms in shared mode. */ + *params->latency = (REFERENCE_TIME)stream->period_us * 10 + 6666; + + return oss_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -771,4 +785,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = is_format_supported, get_mix_format, get_buffer_size, + get_latency, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index b57798ef435..9f4c736fe4e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -113,6 +113,13 @@ struct get_buffer_size_params UINT32 *size; }; +struct get_latency_params +{ + struct oss_stream *stream; + HRESULT result; + REFERENCE_TIME *latency; +}; + enum oss_funcs { oss_test_connect, @@ -122,6 +129,7 @@ enum oss_funcs oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size, + oss_get_latency, }; extern unixlib_handle_t oss_handle;

1 0

Huw Davies : wineoss: Move get_current_padding to the unixlib.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: cdd19e3d1c92f233a075939641c9f7022e1c99cd URL: https://source.winehq.org/git/wine.git/?a=commit;h=cdd19e3d1c92f233a0759396… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 07:38:46 2022 +0100 wineoss: Move get_current_padding 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/wineoss.drv/mmdevdrv.c | 13 +++++-------- dlls/wineoss.drv/oss.c | 13 +++++++++++++ dlls/wineoss.drv/unixlib.h | 8 ++++++++ 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8a2329d1f04..fb71aa7562a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -827,7 +827,7 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, UINT32 *numpad) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct get_current_padding_params params; TRACE("(%p)->(%p)\n", This, numpad); @@ -837,15 +837,12 @@ static HRESULT WINAPI AudioClient_GetCurrentPadding(IAudioClient3 *iface, if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - *numpad = stream->held_frames; - + params.stream = This->stream; + params.padding = numpad; + OSS_CALL(get_current_padding, &params); TRACE("padding: %u\n", *numpad); - oss_unlock(stream); - - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_IsFormatSupported(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index a80557b2c15..7e716ef4704 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -776,6 +776,18 @@ static NTSTATUS get_latency(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS get_current_padding(void *args) +{ + struct get_current_padding_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + *params->padding = stream->held_frames; + + return oss_unlock_result(stream, &params->result, S_OK); +} + unixlib_entry_t __wine_unix_call_funcs[] = { test_connect, @@ -786,4 +798,5 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_mix_format, get_buffer_size, get_latency, + get_current_padding, }; diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 9f4c736fe4e..bc88be80db2 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -120,6 +120,13 @@ struct get_latency_params REFERENCE_TIME *latency; }; +struct get_current_padding_params +{ + struct oss_stream *stream; + HRESULT result; + UINT32 *padding; +}; + enum oss_funcs { oss_test_connect, @@ -130,6 +137,7 @@ enum oss_funcs oss_get_mix_format, oss_get_buffer_size, oss_get_latency, + oss_get_current_padding, }; extern unixlib_handle_t oss_handle;

1 0

Huw Davies : wineoss: Store the period in 100ns units.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: ebfd2e84954e4da13f9c48fad1e229bef7677e6b URL: https://source.winehq.org/git/wine.git/?a=commit;h=ebfd2e84954e4da13f9c48fa… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 07:38:47 2022 +0100 wineoss: Store the period in 100ns units. 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/wineoss.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/oss.c | 4 ++-- dlls/wineoss.drv/unixlib.h | 3 ++- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index fb71aa7562a..e61c3c95df2 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1120,7 +1120,7 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) if(!This->timer){ if(!CreateTimerQueueTimer(&This->timer, g_timer_q, - oss_period_callback, This, 0, stream->period_us / 1000, + oss_period_callback, This, 0, stream->period / 10000, WT_EXECUTEINTIMERTHREAD)) ERR("Unable to create period timer: %u\n", GetLastError()); } diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index 7e716ef4704..b00925d6e9b 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -564,7 +564,7 @@ static NTSTATUS create_stream(void *args) } stream->fmt = &fmtex->Format; - stream->period_us = params->period / 10; + stream->period = params->period; stream->period_frames = muldiv(params->fmt->nSamplesPerSec, params->period, 10000000); stream->bufsize_frames = muldiv(params->duration, params->fmt->nSamplesPerSec, 10000000); @@ -771,7 +771,7 @@ static NTSTATUS get_latency(void *args) /* pretend we process audio in Period chunks, so max latency includes * the period time. Some native machines add .6666ms in shared mode. */ - *params->latency = (REFERENCE_TIME)stream->period_us * 10 + 6666; + *params->latency = stream->period + 6666; return oss_unlock_result(stream, &params->result, S_OK); } diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index bc88be80db2..64c954cc769 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -30,8 +30,9 @@ struct oss_stream BOOL playing, mute; UINT64 written_frames, last_pos_frames; - UINT32 period_us, period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; + UINT32 period_frames, bufsize_frames, held_frames, tmp_buffer_frames, in_oss_frames; UINT32 oss_bufsize_bytes, lcl_offs_frames; /* offs into local_buffer where valid data starts */ + REFERENCE_TIME period; BYTE *local_buffer, *tmp_buffer; INT32 getbuf_last; /* <0 when using tmp_buffer */

1 0

Huw Davies : wineoss: Move reset to the unixlib.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: d0089b85c5e1586d1c5cd03548f72c2b9566ffc9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d0089b85c5e1586d1c5cd035… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Apr 13 07:38:51 2022 +0100 wineoss: Move reset 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/wineoss.drv/mmdevdrv.c | 29 ++++------------------------- dlls/wineoss.drv/oss.c | 27 +++++++++++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 38 insertions(+), 25 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 75661f917cc..77548045702 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -977,38 +977,17 @@ static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) static HRESULT WINAPI AudioClient_Reset(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct reset_params params; TRACE("(%p)\n", This); if(!This->stream) return AUDCLNT_E_NOT_INITIALIZED; - oss_lock(stream); - - if(stream->playing){ - oss_unlock(stream); - return AUDCLNT_E_NOT_STOPPED; - } - - if(stream->getbuf_last){ - oss_unlock(stream); - return AUDCLNT_E_BUFFER_OPERATION_PENDING; - } - - if(stream->flow == eRender){ - stream->written_frames = 0; - stream->last_pos_frames = 0; - }else{ - stream->written_frames += stream->held_frames; - } - stream->held_frames = 0; - stream->lcl_offs_frames = 0; - stream->in_oss_frames = 0; - - oss_unlock(stream); + params.stream = This->stream; + OSS_CALL(reset, &params); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_SetEventHandle(IAudioClient3 *iface, diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index bcd07c2d2fc..72e917dfd76 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -661,6 +661,32 @@ static NTSTATUS stop(void *args) return oss_unlock_result(stream, &params->result, S_OK); } +static NTSTATUS reset(void *args) +{ + struct reset_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + if(stream->playing) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + if(stream->getbuf_last) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_BUFFER_OPERATION_PENDING); + + if(stream->flow == eRender){ + stream->written_frames = 0; + stream->last_pos_frames = 0; + }else{ + stream->written_frames += stream->held_frames; + } + stream->held_frames = 0; + stream->lcl_offs_frames = 0; + stream->in_oss_frames = 0; + + return oss_unlock_result(stream, &params->result, S_OK); +} + static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) { WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; @@ -1025,6 +1051,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = release_stream, start, stop, + reset, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index c69ef1c3e4b..bd4b065c61e 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -102,6 +102,12 @@ struct stop_params HRESULT result; }; +struct reset_params +{ + struct oss_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct oss_stream *stream; @@ -154,6 +160,7 @@ enum oss_funcs oss_release_stream, oss_start, oss_stop, + oss_reset, oss_timer_loop, oss_is_format_supported, oss_get_mix_format,

1 0

Zebediah Figura : quartz/tests: Check for IAMVideoAccelerator.
by Alexandre Julliard April 14, 2022

April 14, 2022

Module: wine Branch: master Commit: fc88f4b38762eee53906eb170b93ab0bab7d8b0b URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc88f4b38762eee53906eb17… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Apr 13 17:02:02 2022 -0500 quartz/tests: Check for IAMVideoAccelerator. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 3 +++ dlls/quartz/tests/vmr7.c | 3 +++ dlls/quartz/tests/vmr9.c | 3 +++ 3 files changed, 9 insertions(+) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index 282d1ef7b12..c76dae15e91 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -20,6 +20,7 @@ #define COBJMACROS #include "dshow.h" +#include "videoacc.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -89,6 +90,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IVideoWindow, TRUE); check_interface(filter, &IID_IAMFilterMiscFlags, FALSE); + check_interface(filter, &IID_IAMVideoAccelerator, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDispatch, FALSE); check_interface(filter, &IID_IOverlay, FALSE); @@ -105,6 +107,7 @@ static void test_interfaces(void) todo_wine check_interface(pin, &IID_IQualityControl, TRUE); check_interface(pin, &IID_IUnknown, TRUE); + check_interface(pin, &IID_IAMVideoAccelerator, FALSE); check_interface(pin, &IID_IAsyncReader, FALSE); check_interface(pin, &IID_IMediaPosition, FALSE); check_interface(pin, &IID_IMediaSeeking, FALSE); diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 9049f8d726b..5e8866de5a2 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -23,6 +23,7 @@ #include "dshow.h" #include "d3d9.h" #include "vmr9.h" +#include "videoacc.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -239,6 +240,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IVMRFilterConfig, TRUE); todo_wine check_interface(filter, &IID_IVMRMixerBitmap, TRUE); + check_interface(filter, &IID_IAMVideoAccelerator, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); check_interface(filter, &IID_IPersistPropertyBag, FALSE); @@ -255,6 +257,7 @@ static void test_common_interfaces(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + todo_wine check_interface(pin, &IID_IAMVideoAccelerator, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IOverlay, TRUE); check_interface(pin, &IID_IPin, TRUE); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index 151c68cf6af..4fd8f35d4f8 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -27,6 +27,7 @@ #include "qedit.h" #include "d3d9.h" #include "vmr9.h" +#include "videoacc.h" #include "wmcodecdsp.h" #include "wine/strmbase.h" #include "wine/test.h" @@ -246,6 +247,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IVMRFilterConfig9, TRUE); check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); + check_interface(filter, &IID_IAMVideoAccelerator, FALSE); check_interface(filter, &IID_IBasicAudio, FALSE); check_interface(filter, &IID_IDirectDrawVideo, FALSE); check_interface(filter, &IID_IPersistPropertyBag, FALSE); @@ -262,6 +264,7 @@ static void test_common_interfaces(IBaseFilter *filter) IBaseFilter_FindPin(filter, L"VMR Input0", &pin); + todo_wine check_interface(pin, &IID_IAMVideoAccelerator, TRUE); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IOverlay, TRUE); check_interface(pin, &IID_IPin, TRUE);

1 0