September 2022 - Wine-commits

Alexandre Julliard : d2d1/tests: Skip subsequent todo tests for unsupported properties.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 064edf1df476ef8ac1f0c8a11eb8ffb419ebd366 URL: https://gitlab.winehq.org/wine/wine/-/commit/064edf1df476ef8ac1f0c8a11eb8ff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 11:17:59 2022 +0200 d2d1/tests: Skip subsequent todo tests for unsupported properties. This reduces the number of printed todos in order to stay within the 32kB limit. --- dlls/d2d1/tests/d2d1.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 5043b8b02b3..08c7bc05224 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -10416,13 +10416,15 @@ static void check_system_properties_(unsigned int line, ID2D1Effect *effect, BOO name[0] = 0; hr = ID2D1Effect_GetPropertyName(effect, test->index, name, sizeof(name)); todo_wine_if((is_builtin && (test->type == D2D1_PROPERTY_TYPE_ARRAY || test->type == D2D1_PROPERTY_TYPE_STRING))) - { ok_(__FILE__, line)(hr == S_OK, "Failed to get property name, hr %#lx\n", hr); + if (hr == D2DERR_INVALID_PROPERTY) + { + winetest_pop_context(); + continue; + } ok_(__FILE__, line)(!wcscmp(name, test->name), "Got unexpected property name %s, expected %s.\n", debugstr_w(name), debugstr_w(test->name)); - } - type = D2D1_PROPERTY_TYPE_UNKNOWN; type = ID2D1Effect_GetType(effect, test->index); todo_wine_if((is_builtin && (test->type == D2D1_PROPERTY_TYPE_ARRAY || test->type == D2D1_PROPERTY_TYPE_STRING))) ok_(__FILE__, line)(type == test->type, "Got unexpected property type %#x, expected %#x.\n", @@ -11743,6 +11745,12 @@ static void test_effect_2d_affine(BOOL d3d11) D2D1_PROPERTY_TYPE_MATRIX_3X2, (const BYTE *)test->matrix, sizeof(*test->matrix)); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == D2DERR_INVALID_PROPERTY) + { + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + continue; + } ID2D1Effect_GetOutput(effect, &output); ID2D1DeviceContext_GetImageLocalBounds(context, output, &output_bounds); @@ -11858,6 +11866,12 @@ static void test_effect_crop(BOOL d3d11) (const BYTE *)&test->crop_rect, sizeof(test->crop_rect)); todo_wine ok(hr == S_OK, "Got unexpected hr %#lx.\n", hr); + if (hr == D2DERR_INVALID_PROPERTY) + { + ID2D1Bitmap1_Release(bitmap); + winetest_pop_context(); + continue; + } ID2D1Effect_GetOutput(effect, &output); set_rect(&output_bounds, -1.0f, -1.0f, -1.0f, -1.0f);

1 0

Henri Verbeet : wined3d: Fix the sub-resource index validation in wined3d_texture_update_overlay().
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 99a3bc3c2b295cb7dfbbec1468f95725451efd5e URL: https://gitlab.winehq.org/wine/wine/-/commit/99a3bc3c2b295cb7dfbbec1468f957… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Sep 14 15:43:21 2022 +0200 wined3d: Fix the sub-resource index validation in wined3d_texture_update_overlay(). This condition accidentally got inverted when wined3d_texture_validate_sub_resource_idx() was introduced in commit 44d6f2adbcca119faebc095f3cfbeeafc50d04f3. --- dlls/wined3d/texture.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 88404c9f8a8..a065d0ae54f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -4242,7 +4242,7 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un return WINEDDERR_NOTAOVERLAYSURFACE; if (!dst_texture || dst_texture->resource.type != WINED3D_RTYPE_TEXTURE_2D - || wined3d_texture_validate_sub_resource_idx(dst_texture, dst_sub_resource_idx)) + || !wined3d_texture_validate_sub_resource_idx(dst_texture, dst_sub_resource_idx)) return WINED3DERR_INVALIDCALL; overlay = &texture->overlay_info[sub_resource_idx];

1 0

Brendan Shanks : server: Remove 32-bit-specific macOS #ifdefs.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 28ec3090fac903caedac0dcff985b5fe8c23804c URL: https://gitlab.winehq.org/wine/wine/-/commit/28ec3090fac903caedac0dcff985b5… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Sep 12 11:53:42 2022 -0700 server: Remove 32-bit-specific macOS #ifdefs. --- server/mach.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/server/mach.c b/server/mach.c index d31e4025776..0a51c3379e9 100644 --- a/server/mach.c +++ b/server/mach.c @@ -173,14 +173,9 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int if (!thread_get_state( port, x86_DEBUG_STATE, (thread_state_t)&state, &count )) { -#ifdef __x86_64__ assert( state.dsh.flavor == x86_DEBUG_STATE32 || state.dsh.flavor == x86_DEBUG_STATE64 ); -#else - assert( state.dsh.flavor == x86_DEBUG_STATE32 ); -#endif -#ifdef __x86_64__ if (state.dsh.flavor == x86_DEBUG_STATE64) { context->debug.x86_64_regs.dr0 = state.uds.ds64.__dr0; @@ -191,7 +186,6 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int context->debug.x86_64_regs.dr7 = state.uds.ds64.__dr7; } else -#endif { context->debug.i386_regs.dr0 = state.uds.ds32.__dr0; context->debug.i386_regs.dr1 = state.uds.ds32.__dr1; @@ -227,8 +221,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } - -#ifdef __x86_64__ if (thread->process->machine == IMAGE_FILE_MACHINE_AMD64) { /* Mac OS doesn't allow setting the global breakpoint flags */ @@ -246,7 +238,6 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.uds.ds64.__dr7 = dr7; } else -#endif { dr7 = (context->debug.i386_regs.dr7 & ~0xaa) | ((context->debug.i386_regs.dr7 & 0xaa) >> 1);

1 0

Brendan Shanks : server: Report errors on macOS when getting/setting debug registers.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 2075a78ed3b827fe1dd17645fd3db8e162ff46d3 URL: https://gitlab.winehq.org/wine/wine/-/commit/2075a78ed3b827fe1dd17645fd3db8… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Mon Sep 12 14:01:50 2022 -0700 server: Report errors on macOS when getting/setting debug registers. --- server/mach.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/server/mach.c b/server/mach.c index 0a51c3379e9..fa87bdbff38 100644 --- a/server/mach.c +++ b/server/mach.c @@ -159,6 +159,7 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int mach_msg_type_number_t count = sizeof(state) / sizeof(int); mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); + kern_return_t ret; /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); @@ -171,7 +172,8 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int return; } - if (!thread_get_state( port, x86_DEBUG_STATE, (thread_state_t)&state, &count )) + ret = thread_get_state( port, x86_DEBUG_STATE, (thread_state_t)&state, &count ); + if (!ret) { assert( state.dsh.flavor == x86_DEBUG_STATE32 || state.dsh.flavor == x86_DEBUG_STATE64 ); @@ -196,6 +198,8 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int } context->flags |= SERVER_CTX_DEBUG_REGISTERS; } + else + mach_set_error( ret ); mach_port_deallocate( mach_task_self(), port ); #endif } @@ -209,6 +213,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); unsigned int dr7; + kern_return_t ret; /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); @@ -252,7 +257,9 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign state.uds.ds32.__dr6 = context->debug.i386_regs.dr6; state.uds.ds32.__dr7 = dr7; } - thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count ); + ret = thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count ); + if (ret) + mach_set_error( ret ); mach_port_deallocate( mach_task_self(), port ); #endif }

1 0

Brendan Shanks : server: Write to correct context struct when getting debug registers on macOS.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 774769671cc7a911b778d42ac8fff17a2103e1ab URL: https://gitlab.winehq.org/wine/wine/-/commit/774769671cc7a911b778d42ac8fff1… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 14 12:14:36 2022 -0700 server: Write to correct context struct when getting debug registers on macOS. --- server/mach.c | 49 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 12 deletions(-) diff --git a/server/mach.c b/server/mach.c index fa87bdbff38..08dbbb7d96f 100644 --- a/server/mach.c +++ b/server/mach.c @@ -160,6 +160,7 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); kern_return_t ret; + unsigned long dr[8]; /* all other regs are handled on the client side */ assert( flags == SERVER_CTX_DEBUG_REGISTERS ); @@ -180,26 +181,50 @@ void get_thread_context( struct thread *thread, context_t *context, unsigned int if (state.dsh.flavor == x86_DEBUG_STATE64) { - context->debug.x86_64_regs.dr0 = state.uds.ds64.__dr0; - context->debug.x86_64_regs.dr1 = state.uds.ds64.__dr1; - context->debug.x86_64_regs.dr2 = state.uds.ds64.__dr2; - context->debug.x86_64_regs.dr3 = state.uds.ds64.__dr3; - context->debug.x86_64_regs.dr6 = state.uds.ds64.__dr6; - context->debug.x86_64_regs.dr7 = state.uds.ds64.__dr7; + dr[0] = state.uds.ds64.__dr0; + dr[1] = state.uds.ds64.__dr1; + dr[2] = state.uds.ds64.__dr2; + dr[3] = state.uds.ds64.__dr3; + dr[6] = state.uds.ds64.__dr6; + dr[7] = state.uds.ds64.__dr7; } else { - context->debug.i386_regs.dr0 = state.uds.ds32.__dr0; - context->debug.i386_regs.dr1 = state.uds.ds32.__dr1; - context->debug.i386_regs.dr2 = state.uds.ds32.__dr2; - context->debug.i386_regs.dr3 = state.uds.ds32.__dr3; - context->debug.i386_regs.dr6 = state.uds.ds32.__dr6; - context->debug.i386_regs.dr7 = state.uds.ds32.__dr7; + dr[0] = state.uds.ds32.__dr0; + dr[1] = state.uds.ds32.__dr1; + dr[2] = state.uds.ds32.__dr2; + dr[3] = state.uds.ds32.__dr3; + dr[6] = state.uds.ds32.__dr6; + dr[7] = state.uds.ds32.__dr7; + } + + switch (context->machine) + { + case IMAGE_FILE_MACHINE_I386: + context->debug.i386_regs.dr0 = dr[0]; + context->debug.i386_regs.dr1 = dr[1]; + context->debug.i386_regs.dr2 = dr[2]; + context->debug.i386_regs.dr3 = dr[3]; + context->debug.i386_regs.dr6 = dr[6]; + context->debug.i386_regs.dr7 = dr[7]; + break; + case IMAGE_FILE_MACHINE_AMD64: + context->debug.x86_64_regs.dr0 = dr[0]; + context->debug.x86_64_regs.dr1 = dr[1]; + context->debug.x86_64_regs.dr2 = dr[2]; + context->debug.x86_64_regs.dr3 = dr[3]; + context->debug.x86_64_regs.dr6 = dr[6]; + context->debug.x86_64_regs.dr7 = dr[7]; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + goto done; } context->flags |= SERVER_CTX_DEBUG_REGISTERS; } else mach_set_error( ret ); +done: mach_port_deallocate( mach_task_self(), port ); #endif }

1 0

Brendan Shanks : server: Use correct context struct and thread flavor when setting debug registers on macOS.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 5cf574998ecb069bacb3f130bfcd1f0ec27c9308 URL: https://gitlab.winehq.org/wine/wine/-/commit/5cf574998ecb069bacb3f130bfcd1f… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Wed Sep 14 12:15:10 2022 -0700 server: Use correct context struct and thread flavor when setting debug registers on macOS. --- server/mach.c | 70 ++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 20 deletions(-) diff --git a/server/mach.c b/server/mach.c index 08dbbb7d96f..6051396a1bf 100644 --- a/server/mach.c +++ b/server/mach.c @@ -237,7 +237,7 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign mach_msg_type_number_t count = sizeof(state) / sizeof(int); mach_msg_type_name_t type; mach_port_t port, process_port = get_process_port( thread->process ); - unsigned int dr7; + unsigned long dr[8]; kern_return_t ret; /* all other regs are handled on the client side */ @@ -251,40 +251,70 @@ void set_thread_context( struct thread *thread, const context_t *context, unsign return; } - if (thread->process->machine == IMAGE_FILE_MACHINE_AMD64) + /* get the debug state to determine which flavor to use */ + ret = thread_get_state(port, x86_DEBUG_STATE, (thread_state_t)&state, &count); + if (ret) { - /* Mac OS doesn't allow setting the global breakpoint flags */ - dr7 = (context->debug.x86_64_regs.dr7 & ~0xaa) | ((context->debug.x86_64_regs.dr7 & 0xaa) >> 1); + mach_set_error( ret ); + goto done; + } + assert( state.dsh.flavor == x86_DEBUG_STATE32 || + state.dsh.flavor == x86_DEBUG_STATE64 ); + + switch (context->machine) + { + case IMAGE_FILE_MACHINE_I386: + dr[0] = context->debug.i386_regs.dr0; + dr[1] = context->debug.i386_regs.dr1; + dr[2] = context->debug.i386_regs.dr2; + dr[3] = context->debug.i386_regs.dr3; + dr[6] = context->debug.i386_regs.dr6; + dr[7] = context->debug.i386_regs.dr7; + break; + case IMAGE_FILE_MACHINE_AMD64: + dr[0] = context->debug.x86_64_regs.dr0; + dr[1] = context->debug.x86_64_regs.dr1; + dr[2] = context->debug.x86_64_regs.dr2; + dr[3] = context->debug.x86_64_regs.dr3; + dr[6] = context->debug.x86_64_regs.dr6; + dr[7] = context->debug.x86_64_regs.dr7; + break; + default: + set_error( STATUS_INVALID_PARAMETER ); + goto done; + } - state.dsh.flavor = x86_DEBUG_STATE64; + /* Mac OS doesn't allow setting the global breakpoint flags */ + dr[7] = (dr[7] & ~0xaa) | ((dr[7] & 0xaa) >> 1); + + if (state.dsh.flavor == x86_DEBUG_STATE64) + { state.dsh.count = sizeof(state.uds.ds64) / sizeof(int); - state.uds.ds64.__dr0 = context->debug.x86_64_regs.dr0; - state.uds.ds64.__dr1 = context->debug.x86_64_regs.dr1; - state.uds.ds64.__dr2 = context->debug.x86_64_regs.dr2; - state.uds.ds64.__dr3 = context->debug.x86_64_regs.dr3; + state.uds.ds64.__dr0 = dr[0]; + state.uds.ds64.__dr1 = dr[1]; + state.uds.ds64.__dr2 = dr[2]; + state.uds.ds64.__dr3 = dr[3]; state.uds.ds64.__dr4 = 0; state.uds.ds64.__dr5 = 0; - state.uds.ds64.__dr6 = context->debug.x86_64_regs.dr6; - state.uds.ds64.__dr7 = dr7; + state.uds.ds64.__dr6 = dr[6]; + state.uds.ds64.__dr7 = dr[7]; } else { - dr7 = (context->debug.i386_regs.dr7 & ~0xaa) | ((context->debug.i386_regs.dr7 & 0xaa) >> 1); - - state.dsh.flavor = x86_DEBUG_STATE32; state.dsh.count = sizeof(state.uds.ds32) / sizeof(int); - state.uds.ds32.__dr0 = context->debug.i386_regs.dr0; - state.uds.ds32.__dr1 = context->debug.i386_regs.dr1; - state.uds.ds32.__dr2 = context->debug.i386_regs.dr2; - state.uds.ds32.__dr3 = context->debug.i386_regs.dr3; + state.uds.ds32.__dr0 = dr[0]; + state.uds.ds32.__dr1 = dr[1]; + state.uds.ds32.__dr2 = dr[2]; + state.uds.ds32.__dr3 = dr[3]; state.uds.ds32.__dr4 = 0; state.uds.ds32.__dr5 = 0; - state.uds.ds32.__dr6 = context->debug.i386_regs.dr6; - state.uds.ds32.__dr7 = dr7; + state.uds.ds32.__dr6 = dr[6]; + state.uds.ds32.__dr7 = dr[7]; } ret = thread_set_state( port, x86_DEBUG_STATE, (thread_state_t)&state, count ); if (ret) mach_set_error( ret ); +done: mach_port_deallocate( mach_task_self(), port ); #endif }

1 0

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: d4e6a01faed45a020e357bc79ff6df7a151cb569 URL: https://gitlab.winehq.org/wine/wine/-/commit/d4e6a01faed45a020e357bc79ff6df… Author: Floris Renaud <jkfloris(a)dds.nl> Date: Thu Sep 15 00:38:27 2022 +0200 po: Update Dutch translation. --- po/nl.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/nl.po b/po/nl.po index 8622f6bdd4e..fe01ba64020 100644 --- a/po/nl.po +++ b/po/nl.po @@ -15307,7 +15307,7 @@ msgstr "" #: programs/notepad/notepad.rc:89 msgid "Ln %ld, Col %ld" -msgstr "" +msgstr "Rij %ld, Kol %ld" #: programs/oleview/oleview.rc:32 msgid "&Bind to file..."

1 0

Rémi Bernon : winegstreamer: Support MFT_SET_TYPE_TEST_ONLY flag in the MF transforms.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: ddf7026d4c19a645c51fb439de8f817bb688924f URL: https://gitlab.winehq.org/wine/wine/-/commit/ddf7026d4c19a645c51fb439de8f81… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sat Sep 3 17:53:03 2022 +0200 winegstreamer: Support MFT_SET_TYPE_TEST_ONLY flag in the MF transforms. --- dlls/mf/tests/transform.c | 2 -- dlls/winegstreamer/color_convert.c | 4 ++++ dlls/winegstreamer/h264_decoder.c | 4 ++++ dlls/winegstreamer/resampler.c | 4 ++++ dlls/winegstreamer/video_processor.c | 4 ++++ dlls/winegstreamer/wma_decoder.c | 10 +++++++--- 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index d088bead46a..9756cd29070 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -278,7 +278,6 @@ static void check_mft_set_input_type_required_(int line, IMFTransform *transform hr = IMFTransform_SetInputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); ok_(__FILE__, line)(hr == S_OK, "SetInputType returned %#lx.\n", hr); ref = IMFMediaType_Release(media_type); - todo_wine_if(ref == 1) ok_(__FILE__, line)(!ref, "Release returned %lu\n", ref); } @@ -309,7 +308,6 @@ static void check_mft_set_output_type_required_(int line, IMFTransform *transfor hr = IMFTransform_SetOutputType(transform, 0, media_type, MFT_SET_TYPE_TEST_ONLY); ok_(__FILE__, line)(hr == S_OK, "SetOutputType returned %#lx.\n", hr); ref = IMFMediaType_Release(media_type); - todo_wine_if(ref == 1) ok_(__FILE__, line)(!ref, "Release returned %lu\n", ref); } diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index b47832b2c30..81067d052f7 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -401,6 +401,8 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM break; if (i == ARRAY_SIZE(input_types)) return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; if (!impl->input_type && FAILED(hr = MFCreateMediaType(&impl->input_type))) return hr; @@ -444,6 +446,8 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF break; if (i == ARRAY_SIZE(output_types)) return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; if (!impl->output_type && FAILED(hr = MFCreateMediaType(&impl->output_type))) return hr; diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index 43b8f83a20c..c6098aee302 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -419,6 +419,8 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM break; if (i == ARRAY_SIZE(h264_decoder_input_types)) return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; if (decoder->output_type) { @@ -469,6 +471,8 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF || (frame_size >> 32) != decoder->wg_format.u.video.width || (UINT32)frame_size != decoder->wg_format.u.video.height) return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; if (decoder->output_type) IMFMediaType_Release(decoder->output_type); diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index 65a29d96794..1d35775af68 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -383,6 +383,8 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (FAILED(hr = check_media_type(type))) return hr; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; if (!impl->input_type && FAILED(hr = MFCreateMediaType(&impl->input_type))) return hr; @@ -414,6 +416,8 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF if (FAILED(hr = check_media_type(type))) return hr; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; if (!impl->output_type && FAILED(hr = MFCreateMediaType(&impl->output_type))) return hr; diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index a271ca9231f..4094ecd2bdd 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -376,6 +376,8 @@ static HRESULT WINAPI video_processor_SetInputType(IMFTransform *iface, DWORD id break; if (i == ARRAY_SIZE(input_types)) return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; if (impl->input_type) IMFMediaType_Release(impl->input_type); @@ -413,6 +415,8 @@ static HRESULT WINAPI video_processor_SetOutputType(IMFTransform *iface, DWORD i break; if (i == ARRAY_SIZE(output_types)) return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; if (impl->output_type) IMFMediaType_Release(impl->output_type); diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index e2a7a770826..31fb49df1f7 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -387,6 +387,8 @@ static HRESULT WINAPI transform_SetInputType(IMFTransform *iface, DWORD id, IMFM if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_NUM_CHANNELS, &item_type)) || item_type != MF_ATTRIBUTE_UINT32) return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; if (!decoder->input_type && FAILED(hr = MFCreateMediaType(&decoder->input_type))) return hr; @@ -443,9 +445,6 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF return hr; } - if (FAILED(IMFMediaType_SetUINT32(decoder->input_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, sample_size))) - return MF_E_INVALIDMEDIATYPE; - if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_AVG_BYTES_PER_SECOND, &item_type)) || item_type != MF_ATTRIBUTE_UINT32) return MF_E_INVALIDMEDIATYPE; @@ -461,6 +460,11 @@ static HRESULT WINAPI transform_SetOutputType(IMFTransform *iface, DWORD id, IMF if (FAILED(IMFMediaType_GetItemType(type, &MF_MT_AUDIO_BLOCK_ALIGNMENT, &item_type)) || item_type != MF_ATTRIBUTE_UINT32) return MF_E_INVALIDMEDIATYPE; + if (flags & MFT_SET_TYPE_TEST_ONLY) + return S_OK; + + if (FAILED(IMFMediaType_SetUINT32(decoder->input_type, &MF_MT_AUDIO_BITS_PER_SAMPLE, sample_size))) + return MF_E_INVALIDMEDIATYPE; if (!decoder->output_type && FAILED(hr = MFCreateMediaType(&decoder->output_type))) return hr;

1 0

Rémi Bernon : winegstreamer: Avoid leaking attributes on video processor creation failure.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 5db72186206a5fb6a480a16438a3436566be2981 URL: https://gitlab.winehq.org/wine/wine/-/commit/5db72186206a5fb6a480a16438a343… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Sun Sep 4 23:43:36 2022 +0200 winegstreamer: Avoid leaking attributes on video processor creation failure. --- dlls/winegstreamer/video_processor.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index 4094ecd2bdd..b513b1e52b5 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -667,6 +667,10 @@ HRESULT video_processor_create(REFIID riid, void **ret) return S_OK; failed: + if (impl->output_attributes) + IMFAttributes_Release(impl->output_attributes); + if (impl->attributes) + IMFAttributes_Release(impl->attributes); free(impl); return hr; }

1 0

Rémi Bernon : winegstreamer: Better implement H264 MFT GetAttributes and GetOutputStreamAttributes.
by Alexandre Julliard 15 Sep '22

15 Sep '22

Module: wine Branch: master Commit: 61783928625e35b1088e7c75674150a0fc4e3ee7 URL: https://gitlab.winehq.org/wine/wine/-/commit/61783928625e35b1088e7c75674150… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Sep 6 07:51:15 2022 +0200 winegstreamer: Better implement H264 MFT GetAttributes and GetOutputStreamAttributes. --- dlls/mf/tests/transform.c | 1 - dlls/winegstreamer/h264_decoder.c | 53 +++++++++++++++++++++++++++++++-------- 2 files changed, 43 insertions(+), 11 deletions(-) diff --git a/dlls/mf/tests/transform.c b/dlls/mf/tests/transform.c index 9756cd29070..c5dbea290bc 100644 --- a/dlls/mf/tests/transform.c +++ b/dlls/mf/tests/transform.c @@ -2326,7 +2326,6 @@ static void test_h264_decoder(void) hr = IMFAttributes_SetUINT32(attributes, &MF_LOW_LATENCY, 1); ok(hr == S_OK, "SetUINT32 returned %#lx\n", hr); ret = IMFAttributes_Release(attributes); - todo_wine ok(ret == 1, "Release returned %ld\n", ret); /* no output type is available before an input type is set */ diff --git a/dlls/winegstreamer/h264_decoder.c b/dlls/winegstreamer/h264_decoder.c index c6098aee302..3e29a7bafd9 100644 --- a/dlls/winegstreamer/h264_decoder.c +++ b/dlls/winegstreamer/h264_decoder.c @@ -47,6 +47,9 @@ struct h264_decoder { IMFTransform IMFTransform_iface; LONG refcount; + + IMFAttributes *attributes; + IMFAttributes *output_attributes; IMFMediaType *input_type; IMFMediaType *output_type; @@ -238,6 +241,10 @@ static ULONG WINAPI transform_Release(IMFTransform *iface) IMFMediaType_Release(decoder->input_type); if (decoder->output_type) IMFMediaType_Release(decoder->output_type); + if (decoder->output_attributes) + IMFAttributes_Release(decoder->output_attributes); + if (decoder->attributes) + IMFAttributes_Release(decoder->attributes); wg_sample_queue_destroy(decoder->wg_sample_queue); free(decoder); @@ -305,8 +312,15 @@ static HRESULT WINAPI transform_GetOutputStreamInfo(IMFTransform *iface, DWORD i static HRESULT WINAPI transform_GetAttributes(IMFTransform *iface, IMFAttributes **attributes) { - FIXME("iface %p, attributes %p stub!\n", iface, attributes); - return MFCreateAttributes(attributes, 0); + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + + FIXME("iface %p, attributes %p semi-stub!\n", iface, attributes); + + if (!attributes) + return E_POINTER; + + IMFAttributes_AddRef((*attributes = decoder->attributes)); + return S_OK; } static HRESULT WINAPI transform_GetInputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) @@ -315,11 +329,19 @@ static HRESULT WINAPI transform_GetInputStreamAttributes(IMFTransform *iface, DW return E_NOTIMPL; } -static HRESULT WINAPI transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, - IMFAttributes **attributes) +static HRESULT WINAPI transform_GetOutputStreamAttributes(IMFTransform *iface, DWORD id, IMFAttributes **attributes) { - FIXME("iface %p, id %#lx, attributes %p stub!\n", iface, id, attributes); - return E_NOTIMPL; + struct h264_decoder *decoder = impl_from_IMFTransform(iface); + + FIXME("iface %p, id %#lx, attributes %p semi-stub!\n", iface, id, attributes); + + if (!attributes) + return E_POINTER; + if (id) + return MF_E_INVALIDSTREAMNUMBER; + + IMFAttributes_AddRef((*attributes = decoder->output_attributes)); + return S_OK; } static HRESULT WINAPI transform_DeleteInputStream(IMFTransform *iface, DWORD id) @@ -708,13 +730,24 @@ HRESULT h264_decoder_create(REFIID riid, void **ret) decoder->wg_format.u.video.fps_n = 30000; decoder->wg_format.u.video.fps_d = 1001; + if (FAILED(hr = MFCreateAttributes(&decoder->attributes, 16))) + goto failed; + if (FAILED(hr = IMFAttributes_SetUINT32(decoder->attributes, &MF_LOW_LATENCY, 0))) + goto failed; + if (FAILED(hr = MFCreateAttributes(&decoder->output_attributes, 0))) + goto failed; if (FAILED(hr = wg_sample_queue_create(&decoder->wg_sample_queue))) - { - free(decoder); - return hr; - } + goto failed; *ret = &decoder->IMFTransform_iface; TRACE("Created decoder %p\n", *ret); return S_OK; + +failed: + if (decoder->output_attributes) + IMFAttributes_Release(decoder->output_attributes); + if (decoder->attributes) + IMFAttributes_Release(decoder->attributes); + free(decoder); + return hr; }

1 0