November 2022 - Wine-commits

Alexandre Julliard : win32u: Use int instead of long types for font sizes and flags.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 8bab39d946dccd5830a399d69abc34c1b96c56fa URL: https://gitlab.winehq.org/wine/wine/-/commit/8bab39d946dccd5830a399d69abc34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 12:29:38 2022 +0100 win32u: Use int instead of long types for font sizes and flags. To avoid typecasts in debug traces. --- dlls/win32u/font.c | 8 +++---- dlls/win32u/freetype.c | 55 ++++++++++++++++++++++----------------------- dlls/win32u/ntgdi_private.h | 17 +++++++------- 3 files changed, 39 insertions(+), 41 deletions(-)

1 0

Alexandre Julliard : win32u: Use int instead of long types for monitor index and flags.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: d38a4a23fb9f54aec728506d4e152a670f649cea URL: https://gitlab.winehq.org/wine/wine/-/commit/d38a4a23fb9f54aec728506d4e152a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 23 16:02:16 2022 +0100 win32u: Use int instead of long types for monitor index and flags. To avoid typecasts in debug traces. --- dlls/win32u/sysparams.c | 18 +++++++++--------- dlls/win32u/win32u_private.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/win32u/sysparams.c b/dlls/win32u/sysparams.c index db6d07110e3..bd5f521eb0d 100644 --- a/dlls/win32u/sysparams.c +++ b/dlls/win32u/sysparams.c @@ -438,7 +438,7 @@ static void adapter_release( struct adapter *adapter ) C_ASSERT(sizeof(DEVMODEW) - offsetof(DEVMODEW, dmFields) == 0x94); -static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *mode ) +static BOOL write_adapter_mode( HKEY adapter_key, UINT index, const DEVMODEW *mode ) { WCHAR bufferW[MAX_PATH] = {0}; char buffer[MAX_PATH]; @@ -448,7 +448,7 @@ static BOOL write_adapter_mode( HKEY adapter_key, DWORD index, const DEVMODEW *m return set_reg_value( adapter_key, bufferW, REG_BINARY, &mode->dmFields, sizeof(*mode) - offsetof(DEVMODEW, dmFields) ); } -static BOOL read_adapter_mode( HKEY adapter_key, DWORD index, DEVMODEW *mode ) +static BOOL read_adapter_mode( HKEY adapter_key, UINT index, DEVMODEW *mode ) { char value_buf[offsetof(KEY_VALUE_PARTIAL_INFORMATION, Data[sizeof(*mode)])]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)value_buf; @@ -712,7 +712,7 @@ static BOOL read_display_adapter_settings( unsigned int index, struct adapter *i return TRUE; } -static BOOL read_monitor_settings( struct adapter *adapter, DWORD index, struct monitor *monitor ) +static BOOL read_monitor_settings( struct adapter *adapter, UINT index, struct monitor *monitor ) { char buffer[4096]; KEY_VALUE_PARTIAL_INFORMATION *value = (void *)buffer; @@ -1998,7 +1998,7 @@ LONG WINAPI NtUserGetDisplayConfigBufferSizes( UINT32 flags, UINT32 *num_path_in } /* display_lock mutex must be held */ -static struct display_device *find_monitor_device( struct display_device *adapter, DWORD index ) +static struct display_device *find_monitor_device( struct display_device *adapter, UINT index ) { struct monitor *monitor; @@ -2011,7 +2011,7 @@ static struct display_device *find_monitor_device( struct display_device *adapte } /* display_lock mutex must be held */ -static struct display_device *find_adapter_device_by_id( DWORD index ) +static struct display_device *find_adapter_device_by_id( UINT index ) { struct adapter *adapter; @@ -2571,7 +2571,7 @@ LONG WINAPI NtUserChangeDisplaySettings( UNICODE_STRING *devname, DEVMODEW *devm return ret; } -static BOOL adapter_enum_display_settings( const struct adapter *adapter, DWORD index, DEVMODEW *devmode, DWORD flags ) +static BOOL adapter_enum_display_settings( const struct adapter *adapter, UINT index, DEVMODEW *devmode, UINT flags ) { DEVMODEW current_mode = {.dmSize = sizeof(DEVMODEW)}; const DEVMODEW *adapter_mode; @@ -2777,7 +2777,7 @@ BOOL get_monitor_info( HMONITOR handle, MONITORINFO *info ) return FALSE; } -HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) +HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) { HMONITOR primary = 0, nearest = 0, ret = 0; UINT max_area = 0, min_distance = ~0u; @@ -2843,7 +2843,7 @@ HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) return ret; } -HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) +HMONITOR monitor_from_point( POINT pt, UINT flags, UINT dpi ) { RECT rect; SetRect( &rect, pt.x, pt.y, pt.x + 1, pt.y + 1 ); @@ -2851,7 +2851,7 @@ HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) } /* see MonitorFromWindow */ -HMONITOR monitor_from_window( HWND hwnd, DWORD flags, UINT dpi ) +HMONITOR monitor_from_window( HWND hwnd, UINT flags, UINT dpi ) { RECT rect; WINDOWPLACEMENT wp; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index bc64bedb22b..3824918a055 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -351,9 +351,9 @@ extern BOOL message_beep( UINT i ) DECLSPEC_HIDDEN; extern POINT point_phys_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern POINT point_thread_to_win_dpi( HWND hwnd, POINT pt ) DECLSPEC_HIDDEN; extern RECT rect_thread_to_win_dpi( HWND hwnd, RECT rect ) DECLSPEC_HIDDEN; -extern HMONITOR monitor_from_point( POINT pt, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; -extern HMONITOR monitor_from_rect( const RECT *rect, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; -extern HMONITOR monitor_from_window( HWND hwnd, DWORD flags, UINT dpi ) DECLSPEC_HIDDEN; +extern HMONITOR monitor_from_point( POINT pt, UINT flags, UINT dpi ) DECLSPEC_HIDDEN; +extern HMONITOR monitor_from_rect( const RECT *rect, UINT flags, UINT dpi ) DECLSPEC_HIDDEN; +extern HMONITOR monitor_from_window( HWND hwnd, UINT flags, UINT dpi ) DECLSPEC_HIDDEN; extern void user_lock(void) DECLSPEC_HIDDEN; extern void user_unlock(void) DECLSPEC_HIDDEN; extern void user_check_not_lock(void) DECLSPEC_HIDDEN;

1 0

Fabian Maurer : imm32: Prevent deadlock on unload.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 5be2a01ce69c19fa89c0dea0165ffe185c69e326 URL: https://gitlab.winehq.org/wine/wine/-/commit/5be2a01ce69c19fa89c0dea0165ffe… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Nov 20 01:04:49 2022 +0100 imm32: Prevent deadlock on unload. ole32 is delay loaded, which can cause race conditions against krnl386.exe when unloading. This is because imm32 tries to get the loader lock while holding the win16 mutex, and kernel386 does the opposite. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52511 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/imm32/imm.c | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 780d544c0e9..fa2e0705db1 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -80,6 +80,9 @@ typedef struct _tagImmHkl{ DWORD (WINAPI *pImeGetImeMenuItems)(HIMC, DWORD, DWORD, IMEMENUITEMINFOW *, IMEMENUITEMINFOW *, DWORD); } ImmHkl; +static HRESULT (WINAPI *pCoRevokeInitializeSpy)(ULARGE_INTEGER cookie); +static void (WINAPI *pCoUninitialize)(void); + typedef struct tagInputContextData { HIMC handle; @@ -249,7 +252,7 @@ static void imm_couninit_thread(BOOL cleanup) if (cleanup && spy->cookie.QuadPart) { - CoRevokeInitializeSpy(spy->cookie); + pCoRevokeInitializeSpy(spy->cookie); spy->cookie.QuadPart = 0; } @@ -261,7 +264,7 @@ static void imm_couninit_thread(BOOL cleanup) { spy->apt_flags &= ~IMM_APT_CREATED; if (spy->apt_flags & IMM_APT_CAN_FREE) - CoUninitialize(); + pCoUninitialize(); } if (cleanup) spy->apt_flags = 0; @@ -359,10 +362,19 @@ static const IInitializeSpyVtbl InitializeSpyVtbl = InitializeSpy_PostUninitialize, }; +static BOOL WINAPI init_ole32_funcs( INIT_ONCE *once, void *param, void **context ) +{ + HMODULE module_ole32 = GetModuleHandleA("ole32"); + pCoRevokeInitializeSpy = (void*)GetProcAddress(module_ole32, "CoRevokeInitializeSpy"); + pCoUninitialize = (void*)GetProcAddress(module_ole32, "CoUninitialize"); + return TRUE; +} + static void imm_coinit_thread(void) { struct coinit_spy *spy; HRESULT hr; + static INIT_ONCE init_ole32_once = INIT_ONCE_STATIC_INIT; TRACE("implicit COM initialization\n"); @@ -391,6 +403,8 @@ static void imm_coinit_thread(void) hr = CoInitializeEx(NULL, COINIT_APARTMENTTHREADED); if (SUCCEEDED(hr)) spy->apt_flags |= IMM_APT_CREATED; + + InitOnceExecuteOnce(&init_ole32_once, init_ole32_funcs, NULL, NULL); } static BOOL IMM_IsDefaultContext(HIMC imc)

1 0

Eric Pouech : wined3d: Change return value for *get_emul_mask() to unsigned int.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 4ae5d81932bbb1f8d86706b24aa31d87665cb756 URL: https://gitlab.winehq.org/wine/wine/-/commit/4ae5d81932bbb1f8d86706b24aa31d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 22 11:08:52 2022 +0100 wined3d: Change return value for *get_emul_mask() to unsigned int. This will simplify changes when using long types. (and returned values are defined as int:s anyway). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/shader_spirv.c | 4 ++-- dlls/wined3d/state.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index dcdee479e17..fff6841f4c7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5787,7 +5787,7 @@ static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragmen caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_TEXTURES); } -static DWORD arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int arbfp_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 7df79dcda74..5aa6c0697e6 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1315,7 +1315,7 @@ static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragmen caps->MaxSimultaneousTextures = 6; } -static DWORD atifs_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int atifs_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e9ada251749..994200b737c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11547,7 +11547,7 @@ static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter, caps->raster_caps = WINED3DPRASTERCAPS_FOGRANGE; } -static DWORD glsl_vertex_pipe_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int glsl_vertex_pipe_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) { if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) return GL_EXT_EMUL_ARB_MULTITEXTURE; @@ -12062,7 +12062,7 @@ static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, s caps->MaxSimultaneousTextures = min(gl_info->limits.samplers[WINED3D_SHADER_TYPE_PIXEL], WINED3D_MAX_TEXTURES); } -static DWORD glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int glsl_fragment_pipe_get_emul_mask(const struct wined3d_gl_info *gl_info) { if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) return GL_EXT_EMUL_ARB_MULTITEXTURE; diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index 18728e5422e..a0fdaa6a9ca 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -750,7 +750,7 @@ static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; } -static DWORD nvrc_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int nvrc_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } diff --git a/dlls/wined3d/shader_spirv.c b/dlls/wined3d/shader_spirv.c index fe1cc03e9f4..7a7cb44c15d 100644 --- a/dlls/wined3d/shader_spirv.c +++ b/dlls/wined3d/shader_spirv.c @@ -1118,7 +1118,7 @@ static void spirv_vertex_pipe_vk_vp_get_caps(const struct wined3d_adapter *adapt caps->ffp_generic_attributes = TRUE; } -static uint32_t spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int spirv_vertex_pipe_vk_vp_get_emul_mask(const struct wined3d_gl_info *gl_info) { return 0; } @@ -1194,7 +1194,7 @@ static void spirv_fragment_pipe_vk_fp_get_caps(const struct wined3d_adapter *ada memset(caps, 0, sizeof(*caps)); } -static uint32_t spirv_fragment_pipe_vk_fp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int spirv_fragment_pipe_vk_fp_get_emul_mask(const struct wined3d_gl_info *gl_info) { return 0; } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ee3e083e812..97e1e6b10ab 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5405,7 +5405,7 @@ static void vp_ffp_get_caps(const struct wined3d_adapter *adapter, struct wined3 caps->raster_caps |= WINED3DPRASTERCAPS_FOGRANGE; } -static DWORD vp_ffp_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int vp_ffp_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } @@ -5463,7 +5463,7 @@ static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; } -static DWORD ffp_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int ffp_fragment_get_emul_mask(const struct wined3d_gl_info *gl_info) { return GL_EXT_EMUL_ARB_MULTITEXTURE | GL_EXT_EMUL_EXT_FOG_COORD; } @@ -5510,7 +5510,7 @@ static void vp_none_get_caps(const struct wined3d_adapter *adapter, struct wined memset(caps, 0, sizeof(*caps)); } -static DWORD vp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int vp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) { return 0; } @@ -5530,7 +5530,7 @@ static void fp_none_get_caps(const struct wined3d_adapter *adapter, struct fragm memset(caps, 0, sizeof(*caps)); } -static DWORD fp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) +static unsigned int fp_none_get_emul_mask(const struct wined3d_gl_info *gl_info) { return 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cf82bebb972..bdf5783b0e5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2833,7 +2833,7 @@ struct wined3d_fragment_pipe_ops { void (*fp_enable)(const struct wined3d_context *context, BOOL enable); void (*get_caps)(const struct wined3d_adapter *adapter, struct fragment_caps *caps); - DWORD (*get_emul_mask)(const struct wined3d_gl_info *gl_info); + unsigned int (*get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*alloc_private)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*free_private)(struct wined3d_device *device, struct wined3d_context *context); BOOL (*allocate_context_data)(struct wined3d_context *context); @@ -2860,7 +2860,7 @@ struct wined3d_vertex_pipe_ops { void (*vp_enable)(const struct wined3d_context *context, BOOL enable); void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); - DWORD (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); + unsigned int (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*vp_free)(struct wined3d_device *device, struct wined3d_context *context); const struct wined3d_state_entry_template *vp_states;

1 0

Anton Baskanov : winegstreamer: Hold the streaming lock while destroying wg_transform.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: b89a01bff8326ee9b8f343b86d4c212286141624 URL: https://gitlab.winehq.org/wine/wine/-/commit/b89a01bff8326ee9b8f343b86d4c21… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Oct 29 18:28:25 2022 +0700 winegstreamer: Hold the streaming lock while destroying wg_transform. Otherwise, the streaming thread might try to access it while it's being destroyed. --- dlls/winegstreamer/quartz_transform.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index 6520f697ce4..ccdec9454a6 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -129,7 +129,9 @@ static HRESULT transform_cleanup_stream(struct strmbase_filter *iface) { IMemAllocator_Decommit(filter->source.pAllocator); + EnterCriticalSection(&filter->filter.stream_cs); wg_transform_destroy(filter->transform); + LeaveCriticalSection(&filter->filter.stream_cs); } return S_OK;

1 0

Anton Baskanov : winegstreamer: Destroy the sample queue when stopping the quartz transform.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: dfb161624f8b159e8b37b68682db58910675b876 URL: https://gitlab.winehq.org/wine/wine/-/commit/dfb161624f8b159e8b37b68682db58… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Sat Oct 29 18:30:07 2022 +0700 winegstreamer: Destroy the sample queue when stopping the quartz transform. This releases the samples wg_transform might have referenced before destruction. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=53342 --- dlls/winegstreamer/quartz_transform.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/quartz_transform.c b/dlls/winegstreamer/quartz_transform.c index ccdec9454a6..09ad4862410 100644 --- a/dlls/winegstreamer/quartz_transform.c +++ b/dlls/winegstreamer/quartz_transform.c @@ -78,7 +78,6 @@ static void transform_destroy(struct strmbase_filter *iface) strmbase_sink_cleanup(&filter->sink); strmbase_filter_cleanup(&filter->filter); - wg_sample_queue_destroy(filter->sample_queue); free(filter); } @@ -109,9 +108,15 @@ static HRESULT transform_init_stream(struct strmbase_filter *iface) if (!amt_to_wg_format(&filter->source.pin.mt, &output_format)) return E_FAIL; + if (FAILED(hr = wg_sample_queue_create(&filter->sample_queue))) + return hr; + filter->transform = wg_transform_create(&input_format, &output_format); if (!filter->transform) + { + wg_sample_queue_destroy(filter->sample_queue); return E_FAIL; + } hr = IMemAllocator_Commit(filter->source.pAllocator); if (FAILED(hr)) @@ -131,6 +136,7 @@ static HRESULT transform_cleanup_stream(struct strmbase_filter *iface) EnterCriticalSection(&filter->filter.stream_cs); wg_transform_destroy(filter->transform); + wg_sample_queue_destroy(filter->sample_queue); LeaveCriticalSection(&filter->filter.stream_cs); } @@ -538,18 +544,11 @@ static const IQualityControlVtbl source_quality_control_vtbl = static HRESULT transform_create(IUnknown *outer, const CLSID *clsid, const struct transform_ops *ops, struct transform **out) { struct transform *object; - HRESULT hr; object = calloc(1, sizeof(*object)); if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = wg_sample_queue_create(&object->sample_queue))) - { - free(object); - return hr; - } - strmbase_filter_init(&object->filter, outer, clsid, &filter_ops); strmbase_sink_init(&object->sink, &object->filter, L"In", &sink_ops, NULL); strmbase_source_init(&object->source, &object->filter, L"Out", &source_ops);

1 0

Anton Baskanov : winegstreamer: Allocate at least 3 buffers for MPEG audio in quartz parser.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 9add23322a9ff6a95a34130e06af95d47dc762e0 URL: https://gitlab.winehq.org/wine/wine/-/commit/9add23322a9ff6a95a34130e06af95… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Fri Nov 4 19:12:36 2022 +0700 winegstreamer: Allocate at least 3 buffers for MPEG audio in quartz parser. --- dlls/winegstreamer/quartz_parser.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/winegstreamer/quartz_parser.c b/dlls/winegstreamer/quartz_parser.c index 87185312585..2a7845be737 100644 --- a/dlls/winegstreamer/quartz_parser.c +++ b/dlls/winegstreamer/quartz_parser.c @@ -1649,6 +1649,7 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, IMemAllocator *allocator, ALLOCATOR_PROPERTIES *props) { struct parser_source *pin = impl_source_from_IPin(&iface->pin.IPin_iface); + unsigned int buffer_count = 1; unsigned int buffer_size = 16384; ALLOCATOR_PROPERTIES ret_props; @@ -1664,11 +1665,18 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, WAVEFORMATEX *format = (WAVEFORMATEX *)pin->pin.pin.mt.pbFormat; buffer_size = format->nAvgBytesPerSec; } + else if (IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_MPEG1AudioPayload) + || IsEqualGUID(&pin->pin.pin.mt.subtype, &MEDIASUBTYPE_MP3)) + { + /* mpg123audiodec requires at least 3 buffers as it will keep + * references to the last 2 samples. */ + buffer_count = 3; + } /* We do need to drop any buffers that might have been sent with the old * caps, but this will be handled in parser_init_stream(). */ - props->cBuffers = max(props->cBuffers, 1); + props->cBuffers = max(props->cBuffers, buffer_count); props->cbBuffer = max(props->cbBuffer, buffer_size); props->cbAlign = max(props->cbAlign, 1); return IMemAllocator_SetProperties(allocator, props, &ret_props);

1 0

Anton Baskanov : include: Add MFSampleExtension_Discontinuity to mfapi.h.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 5a80ace06009e262f6de038265cf3cae6e621c9a URL: https://gitlab.winehq.org/wine/wine/-/commit/5a80ace06009e262f6de038265cf3c… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Thu Nov 17 12:11:46 2022 +0700 include: Add MFSampleExtension_Discontinuity to mfapi.h. --- include/mfapi.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/mfapi.h b/include/mfapi.h index ab336a3f4e8..24f2d6dc560 100644 --- a/include/mfapi.h +++ b/include/mfapi.h @@ -393,6 +393,7 @@ DEFINE_GUID(MFMediaType_Video, 0x73646976, 0x0000, 0x0010, 0x80, 0x0 DEFINE_GUID(MFSampleExtension_DecodeTimestamp, 0x73a954d4, 0x09e2, 0x4861, 0xbe, 0xfc, 0x94, 0xbd, 0x97, 0xc0, 0x8e, 0x6e); DEFINE_GUID(MFSampleExtension_CleanPoint, 0x9cdf01d8, 0xa0f0, 0x43ba, 0xb0, 0x77, 0xea, 0xa0, 0x6c, 0xbd, 0x72, 0x8a); +DEFINE_GUID(MFSampleExtension_Discontinuity, 0x9cdf01d9, 0xa0f0, 0x43ba, 0xb0, 0x77, 0xea, 0xa0, 0x6c, 0xbd, 0x72, 0x8a); DEFINE_GUID(MFSampleExtension_Timestamp, 0x1e436999, 0x69be, 0x4c7a, 0x93, 0x69, 0x70, 0x06, 0x8c, 0x02, 0x60, 0xcb); DEFINE_GUID(MFSampleExtension_Token, 0x8294da66, 0xf328, 0x4805, 0xb5, 0x51, 0x00, 0xde, 0xb4, 0xc5, 0x7a, 0x61); DEFINE_GUID(MFSampleExtension_3DVideo, 0xf86f97a4, 0xdd54, 0x4e2e, 0x9a, 0x5e, 0x55, 0xfc, 0x2d, 0x74, 0xa0, 0x05);

1 0

Anton Baskanov : winegstreamer: Set the discontinuity flag in wg_transform.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 13059c229e7a41b7210f58ddb2a853b74eca92df URL: https://gitlab.winehq.org/wine/wine/-/commit/13059c229e7a41b7210f58ddb2a853… Author: Anton Baskanov <baskanov(a)gmail.com> Date: Tue Oct 11 14:06:52 2022 +0700 winegstreamer: Set the discontinuity flag in wg_transform. This is required to avoid glitches when seeking, as some formats (e.g. MP3) may use data from previous frames. --- dlls/winegstreamer/unixlib.h | 1 + dlls/winegstreamer/wg_sample.c | 8 ++++++++ dlls/winegstreamer/wg_transform.c | 4 ++++ 3 files changed, 13 insertions(+) diff --git a/dlls/winegstreamer/unixlib.h b/dlls/winegstreamer/unixlib.h index be76d366cae..09aa68eb4cc 100644 --- a/dlls/winegstreamer/unixlib.h +++ b/dlls/winegstreamer/unixlib.h @@ -135,6 +135,7 @@ enum wg_sample_flag WG_SAMPLE_FLAG_HAS_PTS = 2, WG_SAMPLE_FLAG_HAS_DURATION = 4, WG_SAMPLE_FLAG_SYNC_POINT = 8, + WG_SAMPLE_FLAG_DISCONTINUITY = 0x10, }; struct wg_sample diff --git a/dlls/winegstreamer/wg_sample.c b/dlls/winegstreamer/wg_sample.c index f48639a6822..eb4af86c381 100644 --- a/dlls/winegstreamer/wg_sample.c +++ b/dlls/winegstreamer/wg_sample.c @@ -277,6 +277,8 @@ HRESULT wg_transform_push_mf(struct wg_transform *transform, IMFSample *sample, } if (SUCCEEDED(IMFSample_GetUINT32(sample, &MFSampleExtension_CleanPoint, &value)) && value) wg_sample->flags |= WG_SAMPLE_FLAG_SYNC_POINT; + if (SUCCEEDED(IMFSample_GetUINT32(sample, &MFSampleExtension_Discontinuity, &value)) && value) + wg_sample->flags |= WG_SAMPLE_FLAG_DISCONTINUITY; wg_sample_queue_begin_append(queue, wg_sample); hr = wg_transform_push_data(transform, wg_sample); @@ -320,6 +322,8 @@ HRESULT wg_transform_read_mf(struct wg_transform *transform, IMFSample *sample, IMFSample_SetSampleDuration(sample, wg_sample->duration); if (wg_sample->flags & WG_SAMPLE_FLAG_SYNC_POINT) IMFSample_SetUINT32(sample, &MFSampleExtension_CleanPoint, 1); + if (wg_sample->flags & WG_SAMPLE_FLAG_DISCONTINUITY) + IMFSample_SetUINT32(sample, &MFSampleExtension_Discontinuity, 1); if (SUCCEEDED(hr = IMFSample_ConvertToContiguousBuffer(sample, &buffer))) { @@ -354,6 +358,8 @@ HRESULT wg_transform_push_quartz(struct wg_transform *transform, struct wg_sampl if (IMediaSample_IsSyncPoint(sample->u.quartz.sample) == S_OK) wg_sample->flags |= WG_SAMPLE_FLAG_SYNC_POINT; + if (IMediaSample_IsDiscontinuity(sample->u.quartz.sample) == S_OK) + wg_sample->flags |= WG_SAMPLE_FLAG_DISCONTINUITY; wg_sample_queue_begin_append(queue, wg_sample); hr = wg_transform_push_data(transform, wg_sample); @@ -397,6 +403,8 @@ HRESULT wg_transform_read_quartz(struct wg_transform *transform, struct wg_sampl value = !!(wg_sample->flags & WG_SAMPLE_FLAG_SYNC_POINT); IMediaSample_SetSyncPoint(sample->u.quartz.sample, value); + value = !!(wg_sample->flags & WG_SAMPLE_FLAG_DISCONTINUITY); + IMediaSample_SetDiscontinuity(sample->u.quartz.sample, value); return S_OK; } diff --git a/dlls/winegstreamer/wg_transform.c b/dlls/winegstreamer/wg_transform.c index 34b8d25c2e5..a52d7e1f722 100644 --- a/dlls/winegstreamer/wg_transform.c +++ b/dlls/winegstreamer/wg_transform.c @@ -648,6 +648,8 @@ NTSTATUS wg_transform_push_data(void *args) GST_BUFFER_DURATION(buffer) = sample->duration * 100; if (!(sample->flags & WG_SAMPLE_FLAG_SYNC_POINT)) GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT); + if (sample->flags & WG_SAMPLE_FLAG_DISCONTINUITY) + GST_BUFFER_FLAG_SET(buffer, GST_BUFFER_FLAG_DISCONT); gst_atomic_queue_push(transform->input_queue, buffer); params->result = S_OK; @@ -781,6 +783,8 @@ static NTSTATUS read_transform_output_data(GstBuffer *buffer, GstCaps *caps, gsi } if (!GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DELTA_UNIT)) sample->flags |= WG_SAMPLE_FLAG_SYNC_POINT; + if (GST_BUFFER_FLAG_IS_SET(buffer, GST_BUFFER_FLAG_DISCONT)) + sample->flags |= WG_SAMPLE_FLAG_DISCONTINUITY; if (needs_copy) {

1 0

Ziqing Hui : wmvcore/tests: Add tests for IWMProfile_GetStreamByNumber.
by Alexandre Julliard 23 Nov '22

23 Nov '22

Module: wine Branch: master Commit: 64debc9b1d6df218d27ac67e121f58ea5aadee24 URL: https://gitlab.winehq.org/wine/wine/-/commit/64debc9b1d6df218d27ac67e121f58… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Thu Nov 17 10:08:06 2022 +0800 wmvcore/tests: Add tests for IWMProfile_GetStreamByNumber. --- dlls/wmvcore/tests/wmvcore.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 401856eb744..a2f92e66e40 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1204,6 +1204,16 @@ static void test_sync_reader_streaming(void) ref = IWMStreamConfig_Release(config2); ok(!ref, "Got outstanding refcount %ld.\n", ref); + hr = IWMProfile_GetStreamByNumber(profile, i + 1, &config2); + todo_wine + ok(hr == S_OK, "Got hr %#lx.\n", hr); + if (hr == S_OK) + { + ok(config2 != config, "Expected different objects.\n"); + ref = IWMStreamConfig_Release(config2); + ok(!ref, "Got outstanding refcount %ld.\n", ref); + } + stream_numbers[i] = 0xdead; hr = IWMStreamConfig_GetStreamNumber(config, &stream_numbers[i]); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1215,6 +1225,12 @@ static void test_sync_reader_streaming(void) hr = IWMProfile_GetStream(profile, 2, &config); ok(hr == E_INVALIDARG, "Got hr %#lx.\n", hr); + hr = IWMProfile_GetStreamByNumber(profile, 0, &config); + todo_wine + ok(hr == NS_E_NO_STREAM, "Got hr %#lx.\n", hr); + hr = IWMProfile_GetStreamByNumber(profile, 3, &config); + todo_wine + ok(hr == NS_E_NO_STREAM, "Got hr %#lx.\n", hr); while (!eos[0] || !eos[1]) {

1 0