- Wine-Devel - list.winehq.org

[PATCH 1/2] webservices: Set proper minor version for .NET Message Framing Protocol.
by Connor McAdams April 14, 2022

April 14, 2022

According to MC-NMF, the .Net Framing Protocol, "An implementation conforming to this specification MUST set this field to 0x00." Signed-off-by: Connor McAdams <cmcadams(a)codeweavers.com> --- dlls/webservices/channel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/webservices/channel.c b/dlls/webservices/channel.c index a9142bedee9..1148744346c 100644 --- a/dlls/webservices/channel.c +++ b/dlls/webservices/channel.c @@ -1415,7 +1415,7 @@ static enum known_encoding map_channel_encoding( struct channel *channel ) } #define FRAME_VERSION_MAJOR 1 -#define FRAME_VERSION_MINOR 1 +#define FRAME_VERSION_MINOR 0 static HRESULT write_preamble( struct channel *channel ) { -- 2.25.1

2 3

[PATCH 1/6] conhost: Move console registry key path into 'struct console'
by Hugh McMaster April 14, 2022

April 14, 2022

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/conhost/conhost.h | 1 + programs/conhost/window.c | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/conhost/conhost.h b/programs/conhost/conhost.h index 8ca09bb80d0..2cb9515037a 100644 --- a/programs/conhost/conhost.h +++ b/programs/conhost/conhost.h @@ -77,6 +77,7 @@ struct console HANDLE server; /* console server handle */ unsigned int mode; /* input mode */ struct screen_buffer *active; /* active screen buffer */ + WCHAR *config_key; /* registry key name for app-specific settings */ int is_unix; /* UNIX terminal mode */ int use_relative_cursor; /* use relative cursor positionning */ INPUT_RECORD *records; /* input records */ diff --git a/programs/conhost/window.c b/programs/conhost/window.c index fb02ef9fd94..77e17313f9b 100644 --- a/programs/conhost/window.c +++ b/programs/conhost/window.c @@ -49,7 +49,6 @@ struct console_window COORD selection_start; /* selection coordinates */ COORD selection_end; unsigned int ui_charset; /* default UI charset */ - WCHAR *config_key; /* config registry key name */ LONG ext_leading; /* external leading for font */ BOOL quick_edit; /* whether mouse ops are sent to app or used for content selection */ @@ -820,7 +819,7 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW /* since we've modified the current config with new font information, * set this information as the new default. */ - load_config( fc->console->window->config_key, &config ); + load_config( fc->console->config_key, &config ); config.cell_width = fc->console->active->font.width; config.cell_height = fc->console->active->font.height; memcpy( config.face_name, fc->console->active->font.face_name, @@ -830,7 +829,7 @@ static int WINAPI get_first_font_sub_enum( const LOGFONTW *lf, const TEXTMETRICW /* Force also its writing back to the registry so that we can get it * the next time. */ - save_config( fc->console->window->config_key, &config ); + save_config( fc->console->config_key, &config ); return 0; } } @@ -1955,7 +1954,7 @@ static BOOL config_dialog( struct console *console, BOOL current ) update_window( di.console ); } if (save) - save_config( current ? console->window->config_key : NULL, &di.config ); + save_config( current ? console->config_key : NULL, &di.config ); return TRUE; } @@ -2405,14 +2404,14 @@ BOOL init_window( struct console *console ) if (si.lpTitle) { size_t i, title_len = wcslen( si.lpTitle ); - if (!(console->window->config_key = malloc( (title_len + 1) * sizeof(WCHAR) ))) + if (!(console->config_key = malloc( (title_len + 1) * sizeof(WCHAR) ))) return FALSE; for (i = 0; i < title_len; i++) - console->window->config_key[i] = si.lpTitle[i] == '\\' ? '_' : si.lpTitle[i]; - console->window->config_key[title_len] = 0; + console->config_key[i] = si.lpTitle[i] == '\\' ? '_' : si.lpTitle[i]; + console->config_key[title_len] = 0; } - load_config( console->window->config_key, &config ); + load_config( console->config_key, &config ); if (si.dwFlags & STARTF_USECOUNTCHARS) { config.sb_width = si.dwXCountChars; -- 2.35.1

2 7

[PATCH] server: clear area when file size is not full page.
by Chao Long April 13, 2022

April 13, 2022

From: chenjiangyi <chenjiangyi(a)uniontech.com> Signed-off-by: chenjiangyi <chenjiangyi(a)uniontech.com> --- server/mapping.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/server/mapping.c b/server/mapping.c index 8d4332d240f..4730d93be90 100644 --- a/server/mapping.c +++ b/server/mapping.c @@ -558,7 +558,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, struct file *file; unsigned int i; mem_size_t total_size; - size_t file_size, map_size, max_size; + size_t file_size, map_size, max_size, file_roundsize; off_t shared_pos, read_pos, write_pos; char *buffer = NULL; int shared_fd; @@ -595,6 +595,7 @@ static int build_shared_mapping( struct mapping *mapping, int fd, { if (!(sec[i].Characteristics & IMAGE_SCN_MEM_SHARED)) continue; if (!(sec[i].Characteristics & IMAGE_SCN_MEM_WRITE)) continue; + memset(buffer, 0, max_size); get_section_sizes( &sec[i], &map_size, &read_pos, &file_size ); write_pos = shared_pos; shared_pos += map_size; @@ -612,7 +613,16 @@ static int build_shared_mapping( struct mapping *mapping, int fd, toread -= res; read_pos += res; } - if (pwrite( shared_fd, buffer, file_size, write_pos ) != file_size) goto error; + if (file_size & page_mask) + { + file_roundsize = ROUND_SIZE( file_size ); + if (file_roundsize > map_size) file_roundsize = map_size; + if (pwrite( shared_fd, buffer, file_roundsize, write_pos ) != file_roundsize) goto error; + } + else + { + if (pwrite( shared_fd, buffer, file_size, write_pos ) != file_size) goto error; + } } if (!(shared = alloc_object( &shared_map_ops ))) goto error; -- 2.20.1

1 0

[PATCH 1/5] include: Add amva.h.
by Zebediah Figura April 13, 2022

April 13, 2022

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/Makefile.in | 1 + include/amva.h | 74 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 include/amva.h diff --git a/include/Makefile.in b/include/Makefile.in index 047e7ff9146..c76e2ec7d0d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -14,6 +14,7 @@ SOURCES = \ amaudio.h \ amsi.idl \ amstream.idl \ + amva.h \ amvideo.idl \ appcompatapi.h \ appmgmt.h \ diff --git a/include/amva.h b/include/amva.h new file mode 100644 index 00000000000..faf103270fc --- /dev/null +++ b/include/amva.h @@ -0,0 +1,74 @@ +/* + * Copyright (C) 2022 Zebediah Figura for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __AMVA_INCLUDED__ +#define __AMVA_INCLUDED__ + +typedef struct _tag_AMVABeginFrameInfo +{ + DWORD dwDestSurfaceIndex; + void *pInputData; + DWORD dwSizeInputData; + void *pOutputData; + DWORD dwSizeOutputData; +} AMVABeginFrameInfo, *LPAMVABeginFrameInfo; + +typedef struct _tag_AMVABUFFERINFO +{ + DWORD dwTypeIndex; + DWORD dwBufferIndex; + DWORD dwDataOffset; + DWORD dwDataSize; +} AMVABUFFERINFO, *LPAMVABUFFERINFO; + +typedef struct _tag_AMVACompBufferInfo +{ + DWORD dwNumCompBuffers; + DWORD dwWidthToCreate; + DWORD dwHeightToCreate; + DWORD dwBytesToAllocate; + DDSCAPS2 ddCompCaps; + DDPIXELFORMAT ddPixelFormat; +} AMVACompBufferInfo, *LPAMVACompBufferInfo; + +typedef struct _tag_AMVAEndFrameInfo +{ + DWORD dwSizeMiscData; + void *pMiscData; +} AMVAEndFrameInfo, *LPAMVAEndFrameInfo; + +typedef struct _tag_AMVAInternalMemInfo +{ + DWORD dwScratchMemAlloc; +} AMVAInternalMemInfo, *LPAMVAInternalMemInfo; + +typedef struct _tag_AMVAUncompBufferInfo +{ + DWORD dwMinNumSurfaces; + DWORD dwMaxNumSurfaces; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompBufferInfo, *LPAMVAUncompBufferInfo; + +typedef struct _tag_AMVAUncompDataInfo +{ + DWORD dwUncompWidth; + DWORD dwUncompHeight; + DDPIXELFORMAT ddUncompPixelFormat; +} AMVAUncompDataInfo, *LPAMVAUncompDataInfo; + +#endif -- 2.35.1

1 4

[PATCH 1/1] dbghelp: downgrade a FIXME to a WARN
by Austin English April 13, 2022

April 13, 2022

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52790 Signed-off-by: Austin English <austinenglish(a)gmail.com> --- 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; -- 2.35.1

1 0

[PATCH 8/8] wineoss: Move reset to the unixlib.
by Huw Davies April 13, 2022

April 13, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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, -- 2.25.1

2 1

[PATCH 7/8] wineoss: Move stop to the unixlib.
by Huw Davies April 13, 2022

April 13, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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, -- 2.25.1

2 1

[PATCH 6/8] wineoss: Move start to the unixlib.
by Huw Davies April 13, 2022

April 13, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/wineoss.drv/mmdevdrv.c | 24 +++++------------------- dlls/wineoss.drv/oss.c | 19 +++++++++++++++++++ dlls/wineoss.drv/unixlib.h | 7 +++++++ 3 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 8f2b19c8faa..e50a7b32338 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -934,7 +934,7 @@ static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frame static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); - struct oss_stream *stream = This->stream; + struct start_params params; TRACE("(%p)\n", This); @@ -945,31 +945,17 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_INITIALIZED; } - oss_lock(stream); - - if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event){ - oss_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_EVENTHANDLE_NOT_SET; - } - - if(stream->playing){ - oss_unlock(stream); - LeaveCriticalSection(&g_sessions_lock); - return AUDCLNT_E_NOT_STOPPED; - } + params.stream = This->stream; + OSS_CALL(start, &params); - if(!This->timer_thread){ + if(SUCCEEDED(params.result) && !This->timer_thread){ This->timer_thread = CreateThread(NULL, 0, timer_thread, This->stream, 0, NULL); SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } - stream->playing = TRUE; - - oss_unlock(stream); LeaveCriticalSection(&g_sessions_lock); - return S_OK; + return params.result; } static HRESULT WINAPI AudioClient_Stop(IAudioClient3 *iface) diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index b0dc22a500f..241b6d014ec 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -627,6 +627,24 @@ static NTSTATUS release_stream(void *args) return STATUS_SUCCESS; } +static NTSTATUS start(void *args) +{ + struct start_params *params = args; + struct oss_stream *stream = params->stream; + + oss_lock(stream); + + if((stream->flags & AUDCLNT_STREAMFLAGS_EVENTCALLBACK) && !stream->event) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_EVENTHANDLE_NOT_SET); + + if(stream->playing) + return oss_unlock_result(stream, &params->result, AUDCLNT_E_NOT_STOPPED); + + stream->playing = TRUE; + + 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; @@ -989,6 +1007,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_endpoint_ids, create_stream, release_stream, + start, timer_loop, is_format_supported, get_mix_format, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 2902bceb949..7418261282d 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -90,6 +90,12 @@ struct release_stream_params HRESULT result; }; +struct start_params +{ + struct oss_stream *stream; + HRESULT result; +}; + struct timer_loop_params { struct oss_stream *stream; @@ -140,6 +146,7 @@ enum oss_funcs oss_get_endpoint_ids, oss_create_stream, oss_release_stream, + oss_start, oss_timer_loop, oss_is_format_supported, oss_get_mix_format, -- 2.25.1

2 1

[PATCH 5/8] wineoss: Move timer_loop to the unixlib.
by Huw Davies April 13, 2022

April 13, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index e61c3c95df2..8f2b19c8faa 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -114,7 +114,7 @@ struct ACImpl { UINT32 channel_count; struct oss_stream *stream; - HANDLE timer; + HANDLE timer_thread; AudioSession *session; AudioSessionWrapper *session_wrapper; @@ -147,8 +147,6 @@ static const WCHAR drv_key_devicesW[] = {'S','o','f','t','w','a','r','e','\\', 'w','i','n','e','o','s','s','.','d','r','v','\\','d','e','v','i','c','e','s',0}; static const WCHAR guidW[] = {'g','u','i','d',0}; -static HANDLE g_timer_q; - static CRITICAL_SECTION g_sessions_lock; static CRITICAL_SECTION_DEBUG g_sessions_lock_debug = { @@ -230,9 +228,6 @@ BOOL WINAPI DllMain(HINSTANCE dll, DWORD reason, void *reserved) if(NtQueryVirtualMemory(GetCurrentProcess(), dll, MemoryWineUnixFuncs, &oss_handle, sizeof(oss_handle), NULL)) return FALSE; - g_timer_q = CreateTimerQueue(); - if(!g_timer_q) - return FALSE; break; case DLL_PROCESS_DETACH: @@ -260,16 +255,28 @@ int WINAPI AUDDRV_GetPriority(void) return params.priority; } -static HRESULT stream_release(struct oss_stream *stream) +static HRESULT stream_release(struct oss_stream *stream, HANDLE timer_thread) { struct release_stream_params params; params.stream = stream; + params.timer_thread = timer_thread; OSS_CALL(release_stream, &params); return params.result; } +static DWORD WINAPI timer_thread(void *user) +{ + struct oss_stream *stream = user; + struct timer_loop_params params; + + params.stream = stream; + OSS_CALL(timer_loop, &params); + + return 0; +} + static void oss_lock(struct oss_stream *stream) { pthread_mutex_lock(&stream->lock); @@ -532,17 +539,6 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) ref = InterlockedDecrement(&This->ref); TRACE("(%p) Refcount now %u\n", This, ref); if(!ref){ - if(This->timer){ - HANDLE event; - DWORD wait; - event = CreateEventW(NULL, TRUE, FALSE, NULL); - wait = !DeleteTimerQueueTimer(g_timer_q, This->timer, event); - wait = wait && GetLastError() == ERROR_IO_PENDING; - if(event && wait) - WaitForSingleObject(event, INFINITE); - CloseHandle(event); - } - IAudioClient3_Stop(iface); IMMDevice_Release(This->parent); IUnknown_Release(This->pUnkFTMarshal); @@ -553,7 +549,7 @@ static ULONG WINAPI AudioClient_Release(IAudioClient3 *iface) } HeapFree(GetProcessHeap(), 0, This->vols); if(This->stream) - stream_release(This->stream); + stream_release(This->stream, This->timer_thread); HeapFree(GetProcessHeap(), 0, This); } return ref; @@ -765,7 +761,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient3 *iface, exit: if(FAILED(params.result)){ - stream_release(stream); + stream_release(stream, NULL); HeapFree(GetProcessHeap(), 0, This->vols); This->vols = NULL; } else { @@ -935,161 +931,6 @@ static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frame memset(buffer, 0, frames * stream->fmt->nBlockAlign); } -static void oss_write_data(struct oss_stream *stream) -{ - ssize_t written_bytes; - UINT32 written_frames, in_oss_frames, write_limit, max_period, write_offs_frames, new_frames; - SIZE_T to_write_frames, to_write_bytes, advanced; - audio_buf_info bi; - BYTE *buf; - - if(ioctl(stream->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){ - WARN("GETOSPACE failed: %d (%s)\n", errno, strerror(errno)); - return; - } - - max_period = max(bi.fragsize / stream->fmt->nBlockAlign, stream->period_frames); - - if(bi.bytes > stream->oss_bufsize_bytes){ - TRACE("New buffer size (%u) is larger than old buffer size (%u)\n", - bi.bytes, stream->oss_bufsize_bytes); - stream->oss_bufsize_bytes = bi.bytes; - in_oss_frames = 0; - }else - in_oss_frames = (stream->oss_bufsize_bytes - bi.bytes) / stream->fmt->nBlockAlign; - - if(in_oss_frames > stream->in_oss_frames){ - TRACE("Capping reported frames from %u to %u\n", - in_oss_frames, stream->in_oss_frames); - in_oss_frames = stream->in_oss_frames; - } - - write_limit = 0; - while(write_limit + in_oss_frames < max_period * 3) - write_limit += max_period; - if(write_limit == 0) - return; - - /* vvvvvv - in_oss_frames - * [--xxxxxxxxxx] - * [xxxxxxxxxx--] - * ^^^^^^^^^^ - held_frames - * ^ - lcl_offs_frames - */ - advanced = stream->in_oss_frames - in_oss_frames; - if(advanced > stream->held_frames) - advanced = stream->held_frames; - stream->lcl_offs_frames += advanced; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->held_frames -= advanced; - stream->in_oss_frames = in_oss_frames; - TRACE("advanced by %lu, lcl_offs: %u, held: %u, in_oss: %u\n", - advanced, stream->lcl_offs_frames, stream->held_frames, stream->in_oss_frames); - - - if(stream->held_frames == stream->in_oss_frames) - return; - - write_offs_frames = (stream->lcl_offs_frames + stream->in_oss_frames) % stream->bufsize_frames; - new_frames = stream->held_frames - stream->in_oss_frames; - - if(write_offs_frames + new_frames > stream->bufsize_frames) - to_write_frames = stream->bufsize_frames - write_offs_frames; - else - to_write_frames = new_frames; - - to_write_frames = min(to_write_frames, write_limit); - to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; - TRACE("going to write %lu frames from %u (%lu of %u)\n", to_write_frames, - write_offs_frames, to_write_frames + write_offs_frames, - stream->bufsize_frames); - - buf = stream->local_buffer + write_offs_frames * stream->fmt->nBlockAlign; - - if(stream->mute) - silence_buffer(stream, buf, to_write_frames); - - written_bytes = write(stream->fd, buf, to_write_bytes); - if(written_bytes < 0){ - /* EAGAIN is OSS buffer full, log that too */ - WARN("write failed: %d (%s)\n", errno, strerror(errno)); - return; - } - written_frames = written_bytes / stream->fmt->nBlockAlign; - - stream->in_oss_frames += written_frames; - - if(written_frames < to_write_frames){ - /* OSS buffer probably full */ - return; - } - - if(new_frames > written_frames && written_frames < write_limit){ - /* wrapped and have some data back at the start to write */ - - to_write_frames = min(write_limit - written_frames, new_frames - written_frames); - to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; - - if(stream->mute) - silence_buffer(stream, stream->local_buffer, to_write_frames); - - TRACE("wrapping to write %lu frames from beginning\n", to_write_frames); - - written_bytes = write(stream->fd, stream->local_buffer, to_write_bytes); - if(written_bytes < 0){ - WARN("write failed: %d (%s)\n", errno, strerror(errno)); - return; - } - written_frames = written_bytes / stream->fmt->nBlockAlign; - stream->in_oss_frames += written_frames; - } -} - -static void oss_read_data(struct oss_stream *stream) -{ - UINT64 pos, readable; - ssize_t nread; - - pos = (stream->held_frames + stream->lcl_offs_frames) % stream->bufsize_frames; - readable = (stream->bufsize_frames - pos) * stream->fmt->nBlockAlign; - - nread = read(stream->fd, stream->local_buffer + pos * stream->fmt->nBlockAlign, - readable); - if(nread < 0){ - WARN("read failed: %d (%s)\n", errno, strerror(errno)); - return; - } - - stream->held_frames += nread / stream->fmt->nBlockAlign; - - if(stream->held_frames > stream->bufsize_frames){ - WARN("Overflow of unread data\n"); - stream->lcl_offs_frames += stream->held_frames; - stream->lcl_offs_frames %= stream->bufsize_frames; - stream->held_frames = stream->bufsize_frames; - } -} - -static void CALLBACK oss_period_callback(void *user, BOOLEAN timer) -{ - ACImpl *This = user; - struct oss_stream *stream = This->stream; - - oss_lock(stream); - - if(stream->playing){ - if(stream->flow == eRender && stream->held_frames) - oss_write_data(stream); - else if(stream->flow == eCapture) - oss_read_data(stream); - } - - if(stream->event) - SetEvent(stream->event); - - oss_unlock(stream); -} - static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) { ACImpl *This = impl_from_IAudioClient3(iface); @@ -1118,11 +959,9 @@ static HRESULT WINAPI AudioClient_Start(IAudioClient3 *iface) return AUDCLNT_E_NOT_STOPPED; } - if(!This->timer){ - if(!CreateTimerQueueTimer(&This->timer, g_timer_q, - oss_period_callback, This, 0, stream->period / 10000, - WT_EXECUTEINTIMERTHREAD)) - ERR("Unable to create period timer: %u\n", GetLastError()); + if(!This->timer_thread){ + This->timer_thread = CreateThread(NULL, 0, timer_thread, This->stream, 0, NULL); + SetThreadPriority(This->timer_thread, THREAD_PRIORITY_TIME_CRITICAL); } stream->playing = TRUE; diff --git a/dlls/wineoss.drv/oss.c b/dlls/wineoss.drv/oss.c index b00925d6e9b..b0dc22a500f 100644 --- a/dlls/wineoss.drv/oss.c +++ b/dlls/wineoss.drv/oss.c @@ -604,6 +604,12 @@ static NTSTATUS release_stream(void *args) struct oss_stream *stream = params->stream; SIZE_T size; + if(params->timer_thread){ + stream->please_quit = TRUE; + NtWaitForSingleObject(params->timer_thread, FALSE, NULL); + NtClose(params->timer_thread); + } + close(stream->fd); if(stream->local_buffer){ size = 0; @@ -621,6 +627,195 @@ static NTSTATUS release_stream(void *args) return STATUS_SUCCESS; } +static void silence_buffer(struct oss_stream *stream, BYTE *buffer, UINT32 frames) +{ + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)stream->fmt; + if((stream->fmt->wFormatTag == WAVE_FORMAT_PCM || + (stream->fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))) && + stream->fmt->wBitsPerSample == 8) + memset(buffer, 128, frames * stream->fmt->nBlockAlign); + else + memset(buffer, 0, frames * stream->fmt->nBlockAlign); +} + +static void oss_write_data(struct oss_stream *stream) +{ + ssize_t written_bytes; + UINT32 written_frames, in_oss_frames, write_limit, max_period, write_offs_frames, new_frames; + SIZE_T to_write_frames, to_write_bytes, advanced; + audio_buf_info bi; + BYTE *buf; + + if(ioctl(stream->fd, SNDCTL_DSP_GETOSPACE, &bi) < 0){ + WARN("GETOSPACE failed: %d (%s)\n", errno, strerror(errno)); + return; + } + + max_period = max(bi.fragsize / stream->fmt->nBlockAlign, stream->period_frames); + + if(bi.bytes > stream->oss_bufsize_bytes){ + TRACE("New buffer size (%u) is larger than old buffer size (%u)\n", + bi.bytes, stream->oss_bufsize_bytes); + stream->oss_bufsize_bytes = bi.bytes; + in_oss_frames = 0; + }else + in_oss_frames = (stream->oss_bufsize_bytes - bi.bytes) / stream->fmt->nBlockAlign; + + if(in_oss_frames > stream->in_oss_frames){ + TRACE("Capping reported frames from %u to %u\n", + in_oss_frames, stream->in_oss_frames); + in_oss_frames = stream->in_oss_frames; + } + + write_limit = 0; + while(write_limit + in_oss_frames < max_period * 3) + write_limit += max_period; + if(write_limit == 0) + return; + + /* vvvvvv - in_oss_frames + * [--xxxxxxxxxx] + * [xxxxxxxxxx--] + * ^^^^^^^^^^ - held_frames + * ^ - lcl_offs_frames + */ + advanced = stream->in_oss_frames - in_oss_frames; + if(advanced > stream->held_frames) + advanced = stream->held_frames; + stream->lcl_offs_frames += advanced; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->held_frames -= advanced; + stream->in_oss_frames = in_oss_frames; + TRACE("advanced by %lu, lcl_offs: %u, held: %u, in_oss: %u\n", + advanced, stream->lcl_offs_frames, stream->held_frames, stream->in_oss_frames); + + + if(stream->held_frames == stream->in_oss_frames) + return; + + write_offs_frames = (stream->lcl_offs_frames + stream->in_oss_frames) % stream->bufsize_frames; + new_frames = stream->held_frames - stream->in_oss_frames; + + if(write_offs_frames + new_frames > stream->bufsize_frames) + to_write_frames = stream->bufsize_frames - write_offs_frames; + else + to_write_frames = new_frames; + + to_write_frames = min(to_write_frames, write_limit); + to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; + TRACE("going to write %lu frames from %u (%lu of %u)\n", to_write_frames, + write_offs_frames, to_write_frames + write_offs_frames, + stream->bufsize_frames); + + buf = stream->local_buffer + write_offs_frames * stream->fmt->nBlockAlign; + + if(stream->mute) + silence_buffer(stream, buf, to_write_frames); + + written_bytes = write(stream->fd, buf, to_write_bytes); + if(written_bytes < 0){ + /* EAGAIN is OSS buffer full, log that too */ + WARN("write failed: %d (%s)\n", errno, strerror(errno)); + return; + } + written_frames = written_bytes / stream->fmt->nBlockAlign; + + stream->in_oss_frames += written_frames; + + if(written_frames < to_write_frames){ + /* OSS buffer probably full */ + return; + } + + if(new_frames > written_frames && written_frames < write_limit){ + /* wrapped and have some data back at the start to write */ + + to_write_frames = min(write_limit - written_frames, new_frames - written_frames); + to_write_bytes = to_write_frames * stream->fmt->nBlockAlign; + + if(stream->mute) + silence_buffer(stream, stream->local_buffer, to_write_frames); + + TRACE("wrapping to write %lu frames from beginning\n", to_write_frames); + + written_bytes = write(stream->fd, stream->local_buffer, to_write_bytes); + if(written_bytes < 0){ + WARN("write failed: %d (%s)\n", errno, strerror(errno)); + return; + } + written_frames = written_bytes / stream->fmt->nBlockAlign; + stream->in_oss_frames += written_frames; + } +} + +static void oss_read_data(struct oss_stream *stream) +{ + UINT64 pos, readable; + ssize_t nread; + + pos = (stream->held_frames + stream->lcl_offs_frames) % stream->bufsize_frames; + readable = (stream->bufsize_frames - pos) * stream->fmt->nBlockAlign; + + nread = read(stream->fd, stream->local_buffer + pos * stream->fmt->nBlockAlign, + readable); + if(nread < 0){ + WARN("read failed: %d (%s)\n", errno, strerror(errno)); + return; + } + + stream->held_frames += nread / stream->fmt->nBlockAlign; + + if(stream->held_frames > stream->bufsize_frames){ + WARN("Overflow of unread data\n"); + stream->lcl_offs_frames += stream->held_frames; + stream->lcl_offs_frames %= stream->bufsize_frames; + stream->held_frames = stream->bufsize_frames; + } +} + +static NTSTATUS timer_loop(void *args) +{ + struct timer_loop_params *params = args; + struct oss_stream *stream = params->stream; + LARGE_INTEGER delay, now, next; + int adjust; + + oss_lock(stream); + + delay.QuadPart = -stream->period; + NtQueryPerformanceCounter(&now, NULL); + next.QuadPart = now.QuadPart + stream->period; + + while(!stream->please_quit){ + if(stream->playing){ + if(stream->flow == eRender && stream->held_frames) + oss_write_data(stream); + else if(stream->flow == eCapture) + oss_read_data(stream); + } + if(stream->event) + NtSetEvent(stream->event, NULL); + oss_unlock(stream); + + NtDelayExecution(FALSE, &delay); + + oss_lock(stream); + NtQueryPerformanceCounter(&now, NULL); + adjust = next.QuadPart - now.QuadPart; + if(adjust > stream->period / 2) + adjust = stream->period / 2; + else if(adjust < -stream->period / 2) + adjust = -stream->period / 2; + delay.QuadPart = -(stream->period + adjust); + next.QuadPart += stream->period; + } + + oss_unlock(stream); + + return STATUS_SUCCESS; +} + static NTSTATUS is_format_supported(void *args) { struct is_format_supported_params *params = args; @@ -794,6 +989,7 @@ unixlib_entry_t __wine_unix_call_funcs[] = get_endpoint_ids, create_stream, release_stream, + timer_loop, is_format_supported, get_mix_format, get_buffer_size, diff --git a/dlls/wineoss.drv/unixlib.h b/dlls/wineoss.drv/unixlib.h index 64c954cc769..2902bceb949 100644 --- a/dlls/wineoss.drv/unixlib.h +++ b/dlls/wineoss.drv/unixlib.h @@ -28,7 +28,7 @@ struct oss_stream int fd; - BOOL playing, mute; + BOOL playing, mute, please_quit; UINT64 written_frames, last_pos_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 */ @@ -86,9 +86,15 @@ struct create_stream_params struct release_stream_params { struct oss_stream *stream; + HANDLE timer_thread; HRESULT result; }; +struct timer_loop_params +{ + struct oss_stream *stream; +}; + struct is_format_supported_params { const char *device; @@ -134,6 +140,7 @@ enum oss_funcs oss_get_endpoint_ids, oss_create_stream, oss_release_stream, + oss_timer_loop, oss_is_format_supported, oss_get_mix_format, oss_get_buffer_size, -- 2.25.1

2 1

[PATCH 4/8] wineoss: Store the period in 100ns units.
by Huw Davies April 13, 2022

April 13, 2022

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- 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 */ -- 2.25.1

2 1