September 2022 - Wine-Commits

Rémi Bernon : winegstreamer: Check WMA sample size before wrapping the sample.
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

Module: wine Branch: master Commit: 2c4fbd15316d46c1b856bd38670deda745167e41 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c4fbd15316d46c1b856bd38670ded… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Sep 14 21:59:51 2022 +0200 winegstreamer: Check WMA sample size before wrapping the sample. --- dlls/winegstreamer/wma_decoder.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/wma_decoder.c b/dlls/winegstreamer/wma_decoder.c index 2951d7cac4d..4374f5bdcdf 100644 --- a/dlls/winegstreamer/wma_decoder.c +++ b/dlls/winegstreamer/wma_decoder.c @@ -531,6 +531,7 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS struct wma_decoder *decoder = impl_from_IMFTransform(iface); struct wg_sample *wg_sample; MFT_INPUT_STREAM_INFO info; + DWORD total_length; HRESULT hr; TRACE("iface %p, id %lu, sample %p, flags %#lx.\n", iface, id, sample, flags); @@ -538,18 +539,16 @@ static HRESULT WINAPI transform_ProcessInput(IMFTransform *iface, DWORD id, IMFS if (!decoder->wg_transform) return MF_E_TRANSFORM_TYPE_NOT_SET; - if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info))) - return hr; - - if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) + if (FAILED(hr = IMFTransform_GetInputStreamInfo(iface, 0, &info)) + || FAILED(hr = IMFSample_GetTotalLength(sample, &total_length))) return hr; /* WMA transform uses fixed size input samples and ignores samples with invalid sizes */ - if (wg_sample->size % info.cbSize) - { - wg_sample_release(wg_sample); + if (total_length % info.cbSize) return S_OK; - } + + if (FAILED(hr = wg_sample_create_mf(sample, &wg_sample))) + return hr; return wg_transform_push_mf(decoder->wg_transform, wg_sample, decoder->wg_sample_queue); }

1 0

Rémi Bernon : winegstreamer: Avoid leaking attributes on video processor creation failure.
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

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

Floris Renaud : po: Update Dutch translation.
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

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 Sept. 15, 2022

Sept. 15, 2022

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

Brendan Shanks : server: Write to correct context struct when getting debug registers on macOS.
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

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 Sept. 15, 2022

Sept. 15, 2022

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

Brendan Shanks : server: Report errors on macOS when getting/setting debug registers.
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

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: Remove 32-bit-specific macOS #ifdefs.
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

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

Alexandre Julliard : ntdll/tests: Don't run the stack growth tests too many times.
by Alexandre Julliard Sept. 15, 2022

Sept. 15, 2022

Module: wine Branch: master Commit: d35c361e4bff13f6be6f9ad59269a5db4c18dc82 URL: https://gitlab.winehq.org/wine/wine/-/commit/d35c361e4bff13f6be6f9ad59269a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 15 12:45:37 2022 +0200 ntdll/tests: Don't run the stack growth tests too many times. This reduces the number of printed todos in order to stay within the 32kB limit. --- dlls/ntdll/tests/virtual.c | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index e2b6d0d3fb8..83ea35590f1 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -436,14 +436,12 @@ static void force_stack_grow(void) (void)buffer[0]; } -#ifdef _WIN64 static void force_stack_grow_small(void) { volatile int buffer[0x400]; buffer[0] = 0xdeadbeef; (void)buffer[0]; } -#endif static DWORD WINAPI test_stack_size_thread(void *ptr) { @@ -453,10 +451,6 @@ static DWORD WINAPI test_stack_size_thread(void *ptr) SIZE_T size, guard_size; DWORD committed, reserved; void *addr; -#ifdef _WIN64 - DWORD prot; - void *tmp; -#endif committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; reserved = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->DeallocationStack; @@ -521,8 +515,29 @@ static DWORD WINAPI test_stack_size_thread(void *ptr) ok( mbi.Protect == PAGE_READWRITE, "unexpected Protect %#lx, expected %#x\n", mbi.Protect, PAGE_READWRITE ); ok( mbi.Type == MEM_PRIVATE, "unexpected Type %#lx, expected %#x\n", mbi.Type, MEM_PRIVATE ); + return 0; +} + +static DWORD WINAPI test_stack_growth_thread(void *ptr) +{ + MEMORY_BASIC_INFORMATION mbi; + NTSTATUS status; + SIZE_T size, guard_size; + DWORD committed; + void *addr; + DWORD prot; + void *tmp; + + test_stack_size_thread( ptr ); + if (!is_win64) return 0; + + addr = (char *)NtCurrentTeb()->DeallocationStack; + status = NtQueryVirtualMemory( NtCurrentProcess(), addr, MemoryBasicInformation, &mbi, sizeof(mbi), &size ); + ok( !status, "NtQueryVirtualMemory returned %08lx\n", status ); + + guard_size = (char *)NtCurrentTeb()->Tib.StackLimit - (char *)NtCurrentTeb()->DeallocationStack - mbi.RegionSize; + ok( guard_size == 0x1000 || guard_size == 0x2000 || guard_size == 0x3000, "unexpected guard_size %I64x, expected 1000, 2000 or 3000\n", (UINT64)guard_size ); -#ifdef _WIN64 /* setting a guard page shrinks stack automatically */ addr = (char *)NtCurrentTeb()->Tib.StackLimit + 0x2000; @@ -668,7 +683,6 @@ static DWORD WINAPI test_stack_size_thread(void *ptr) committed = (char *)NtCurrentTeb()->Tib.StackBase - (char *)NtCurrentTeb()->Tib.StackLimit; todo_wine ok( committed == 0x6000, "unexpected stack committed size %lx, expected 6000\n", committed ); -#endif ExitThread(0); } @@ -745,13 +759,13 @@ static void test_RtlCreateUserStack(void) args.expect_committed = 0x4000; args.expect_reserved = default_reserve; - thread = CreateThread(NULL, 0x3f00, test_stack_size_thread, &args, 0, NULL); + thread = CreateThread(NULL, 0x3f00, test_stack_growth_thread, &args, 0, NULL); WaitForSingleObject(thread, INFINITE); CloseHandle(thread); args.expect_committed = default_commit < 0x2000 ? 0x2000 : default_commit; args.expect_reserved = 0x400000; - thread = CreateThread(NULL, 0x3ff000, test_stack_size_thread, &args, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); + thread = CreateThread(NULL, 0x3ff000, test_stack_growth_thread, &args, STACK_SIZE_PARAM_IS_A_RESERVATION, NULL); WaitForSingleObject(thread, INFINITE); CloseHandle(thread);

1 0

Rémi Bernon : maintainers: Assume maintainership of MF transforms.
by Alexandre Julliard Sept. 14, 2022

Sept. 14, 2022

Module: wine Branch: master Commit: 7feaa6795a26c97b5ce4327a23129eb20a049859 URL: https://gitlab.winehq.org/wine/wine/-/commit/7feaa6795a26c97b5ce4327a23129e… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Sep 8 10:25:14 2022 +0200 maintainers: Assume maintainership of MF transforms. --- MAINTAINERS | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index c7bd1f0c02c..4f0cd37ad5d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -202,6 +202,19 @@ P: Andrew Eikum <coldpie(a)fastmail.com> F: dlls/*.acm/ F: dlls/msacm32/ +Media Foundation transforms +M: Rémi Bernon <rbernon(a)codeweavers.com> +P: Nikolay Sivov <nsivov(a)codeweavers.com> +P: Zebediah Figura <z.figura12(a)gmail.com> +F: dlls/mf/tests/transform.c +F: dlls/winegstreamer/color_convert.c +F: dlls/winegstreamer/h264_decoder.c +F: dlls/winegstreamer/resampler.c +F: dlls/winegstreamer/video_processor.c +F: dlls/winegstreamer/wg_sample.c +F: dlls/winegstreamer/wg_transform.c +F: dlls/winegstreamer/wma_decoder.c + Microsoft C Runtime M: Piotr Caban <piotr(a)codeweavers.com> F: dlls/msvc*/

1 0