May 2024 - Wine-Commits - list.winehq.org

Ziqing Hui : winegstreamer/video_decoder: Make output_plane_align specific to h264.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 08478473b720e02a403a15b44462b15ebda0e40b URL: https://gitlab.winehq.org/wine/wine/-/commit/08478473b720e02a403a15b44462b1… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 8 11:15:23 2024 +0800 winegstreamer/video_decoder: Make output_plane_align specific to h264. If we set output align to wmv decoder, it will fail at copy_video_buffer(). The output size will larger than the sample we provided due to alignment. --- dlls/winegstreamer/video_decoder.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 60eca8ba6bd..6525cbff513 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -1500,7 +1500,6 @@ static HRESULT video_decoder_create_with_types(const GUID *const *input_types, U if (FAILED(hr = MFCreateSampleCopierMFT(&decoder->copier))) goto failed; - decoder->wg_transform_attrs.output_plane_align = 15; decoder->wg_transform_attrs.input_queue_length = 15; *out = decoder; @@ -1569,6 +1568,7 @@ HRESULT h264_decoder_create(REFIID riid, void **out) | MFT_OUTPUT_STREAM_FIXED_SAMPLE_SIZE; decoder->output_info.cbSize = 1920 * 1088 * 2; + decoder->wg_transform_attrs.output_plane_align = 15; decoder->wg_transform_attrs.allow_size_change = TRUE; TRACE("Created h264 transform %p.\n", &decoder->IMFTransform_iface);

1 0

Dmitry Timoshkov : user32/tests: Offset child CS_PARENTDC window from parent to make more bugs visible.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: fdc2caf6788c071f89d5b5f402d70a661987e47b URL: https://gitlab.winehq.org/wine/wine/-/commit/fdc2caf6788c071f89d5b5f402d70a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 8 19:58:12 2024 +0300 user32/tests: Offset child CS_PARENTDC window from parent to make more bugs visible. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/dce.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/dce.c b/dlls/user32/tests/dce.c index 613512d0f5f..18f31e3708c 100644 --- a/dlls/user32/tests/dce.c +++ b/dlls/user32/tests/dce.c @@ -369,6 +369,7 @@ static void test_dc_visrgn(void) /* parent DC */ hdc = GetDC( hwnd_parentdc ); GetClipBox( hdc, &rect ); + MapWindowPoints(hwnd_parentdc, hwnd_parent, (POINT *)&rect, 2); ReleaseDC( hwnd_parentdc, hdc ); hdc = GetDC( hwnd_parent ); @@ -508,18 +509,19 @@ static void test_begin_paint(void) RedrawWindow( hwnd_parentdc, NULL, 0, RDW_INVALIDATE ); hdc = BeginPaint( hwnd_parentdc, &ps ); GetClipBox( hdc, &rect ); + MapWindowPoints(hwnd_parentdc, hwnd_parent, (POINT *)&rect, 2); cr = SetPixel( hdc, 10, 10, RGB(255, 0, 0) ); ok( cr != -1, "error drawing outside of window client area\n" ); EndPaint( hwnd_parentdc, &ps ); GetClientRect( hwnd_parent, &parent_rect ); - ok( rect.left == parent_rect.left, "rect.left = %ld, expected %ld\n", rect.left, parent_rect.left ); - ok( rect.top == parent_rect.top, "rect.top = %ld, expected %ld\n", rect.top, parent_rect.top ); + todo_wine ok( rect.left == parent_rect.left, "rect.left = %ld, expected %ld\n", rect.left, parent_rect.left ); + todo_wine ok( rect.top == parent_rect.top, "rect.top = %ld, expected %ld\n", rect.top, parent_rect.top ); todo_wine ok( rect.right == parent_rect.right, "rect.right = %ld, expected %ld\n", rect.right, parent_rect.right ); todo_wine ok( rect.bottom == parent_rect.bottom, "rect.bottom = %ld, expected %ld\n", rect.bottom, parent_rect.bottom ); hdc = GetDC( hwnd_parent ); - todo_wine ok( GetPixel( hdc, 10, 10 ) == cr, "error drawing outside of window client area\n" ); + todo_wine ok( GetPixel( hdc, 60, 60 ) == cr, "error drawing outside of window client area\n" ); ReleaseDC( hwnd_parent, hdc ); } @@ -772,7 +774,7 @@ START_TEST(dce) hwnd_parent = CreateWindowA("static", NULL, WS_OVERLAPPED | WS_VISIBLE, 400, 0, 100, 100, 0, 0, 0, NULL ); hwnd_parentdc = CreateWindowA("parentdc_class", NULL, WS_CHILD | WS_VISIBLE, - 0, 0, 1, 1, hwnd_parent, 0, 0, NULL ); + 50, 50, 1, 1, hwnd_parent, 0, 0, NULL ); test_dc_attributes(); test_parameters();

1 0

Rémi Bernon : winegstreamer: Introduce a new check_video_transform_support helper.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 067d4f047247b39a5866c1d7b22b5f16b5187d5b URL: https://gitlab.winehq.org/wine/wine/-/commit/067d4f047247b39a5866c1d7b22b5f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 30 17:51:49 2024 +0200 winegstreamer: Introduce a new check_video_transform_support helper. --- dlls/winegstreamer/color_convert.c | 31 +++++++-------------- dlls/winegstreamer/gst_private.h | 1 + dlls/winegstreamer/main.c | 25 +++++++++++++++++ dlls/winegstreamer/video_decoder.c | 53 +++++++++++++++--------------------- dlls/winegstreamer/video_processor.c | 31 +++++++-------------- 5 files changed, 68 insertions(+), 73 deletions(-) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index b5a1261b669..949b85943d0 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -907,39 +907,28 @@ static const IPropertyStoreVtbl property_store_vtbl = HRESULT color_convert_create(IUnknown *outer, IUnknown **out) { - static const struct wg_format input_format = + const MFVIDEOFORMAT input_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_I420, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_I420, }; - static const struct wg_format output_format = + const MFVIDEOFORMAT output_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_NV12, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_NV12, }; - struct wg_transform_attrs attrs = {0}; - wg_transform_t transform; struct color_convert *impl; HRESULT hr; TRACE("outer %p, out %p.\n", outer, out); - if (!(transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (FAILED(hr = check_video_transform_support(&input_format, &output_format))) { ERR_(winediag)("GStreamer doesn't support video conversion, please install appropriate plugins.\n"); - return E_FAIL; + return hr; } - wg_transform_destroy(transform); if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY; diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 91020e973ac..78b9c4c3aa0 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -96,6 +96,7 @@ void wg_transform_notify_qos(wg_transform_t transform, bool underflow, double proportion, int64_t diff, uint64_t timestamp); HRESULT check_audio_transform_support(const WAVEFORMATEX *input, const WAVEFORMATEX *output); +HRESULT check_video_transform_support(const MFVIDEOFORMAT *input, const MFVIDEOFORMAT *output); HRESULT wg_muxer_create(const char *format, wg_muxer_t *muxer); void wg_muxer_destroy(wg_muxer_t muxer); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 56c9fb04f0f..91397da8f69 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -661,6 +661,31 @@ HRESULT check_audio_transform_support(const WAVEFORMATEX *input, const WAVEFORMA return hr; } +HRESULT check_video_transform_support(const MFVIDEOFORMAT *input, const MFVIDEOFORMAT *output) +{ + IMFMediaType *input_type, *output_type; + struct wg_transform_attrs attrs = {0}; + wg_transform_t transform; + HRESULT hr; + + if (FAILED(hr = MFCreateMediaType(&input_type))) + return hr; + if (FAILED(hr = MFCreateMediaType(&output_type))) + { + IMFMediaType_Release(input_type); + return hr; + } + + if (SUCCEEDED(hr = MFInitMediaTypeFromMFVideoFormat(input_type, input, input->dwSize)) + && SUCCEEDED(hr = MFInitMediaTypeFromMFVideoFormat(output_type, output, output->dwSize)) + && SUCCEEDED(hr = wg_transform_create_mf(input_type, output_type, &attrs, &transform))) + wg_transform_destroy(transform); + + IMFMediaType_Release(output_type); + IMFMediaType_Release(input_type); + return hr; +} + #define ALIGN(n, alignment) (((n) + (alignment) - 1) & ~((alignment) - 1)) unsigned int wg_format_get_stride(const struct wg_format *format) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index d0ce9b407a8..60eca8ba6bd 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -1530,30 +1530,27 @@ static const GUID *const h264_decoder_input_types[] = HRESULT h264_decoder_create(REFIID riid, void **out) { - static const struct wg_format output_format = + const MFVIDEOFORMAT output_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_I420, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_I420, + }; + const MFVIDEOFORMAT input_format = + { + .dwSize = sizeof(MFVIDEOFORMAT), + .guidFormat = MFVideoFormat_H264, }; - static const struct wg_format input_format = {.major_type = WG_MAJOR_TYPE_VIDEO_H264}; - struct wg_transform_attrs attrs = {0}; struct video_decoder *decoder; - wg_transform_t transform; HRESULT hr; TRACE("riid %s, out %p.\n", debugstr_guid(riid), out); - if (!(transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (FAILED(hr = check_video_transform_support(&input_format, &output_format))) { ERR_(winediag)("GStreamer doesn't support H.264 decoding, please install appropriate plugins\n"); - return E_FAIL; + return hr; } - wg_transform_destroy(transform); if (FAILED(hr = video_decoder_create_with_types(h264_decoder_input_types, ARRAY_SIZE(h264_decoder_input_types), video_decoder_output_types, ARRAY_SIZE(video_decoder_output_types), NULL, &decoder))) @@ -1652,34 +1649,28 @@ static const GUID *const wmv_decoder_output_types[] = HRESULT wmv_decoder_create(IUnknown *outer, IUnknown **out) { - static const struct wg_format input_format = + const MFVIDEOFORMAT output_format = { - .major_type = WG_MAJOR_TYPE_VIDEO_WMV, - .u.video.format = WG_VIDEO_FORMAT_WMV3, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_I420, }; - static const struct wg_format output_format = + const MFVIDEOFORMAT input_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_NV12, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_WMV3, }; - struct wg_transform_attrs attrs = {0}; struct video_decoder *decoder; - wg_transform_t transform; HRESULT hr; TRACE("outer %p, out %p.\n", outer, out); - if (!(transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (FAILED(hr = check_video_transform_support(&input_format, &output_format))) { - ERR_(winediag)("GStreamer doesn't support WMV decoding, please install appropriate plugins.\n"); - return E_FAIL; + ERR_(winediag)("GStreamer doesn't support WMV decoding, please install appropriate plugins\n"); + return hr; } - wg_transform_destroy(transform); if (FAILED(hr = video_decoder_create_with_types(wmv_decoder_input_types, ARRAY_SIZE(wmv_decoder_input_types), wmv_decoder_output_types, ARRAY_SIZE(wmv_decoder_output_types), outer, &decoder))) diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index c4a3fcc6071..0fedfb8451e 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -700,39 +700,28 @@ static const IMFTransformVtbl video_processor_vtbl = HRESULT video_processor_create(REFIID riid, void **ret) { - static const struct wg_format input_format = + const MFVIDEOFORMAT input_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_I420, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_I420, }; - static const struct wg_format output_format = + const MFVIDEOFORMAT output_format = { - .major_type = WG_MAJOR_TYPE_VIDEO, - .u.video = - { - .format = WG_VIDEO_FORMAT_NV12, - .width = 1920, - .height = 1080, - }, + .dwSize = sizeof(MFVIDEOFORMAT), + .videoInfo = {.dwWidth = 1920, .dwHeight = 1080}, + .guidFormat = MFVideoFormat_NV12, }; - struct wg_transform_attrs attrs = {0}; - wg_transform_t transform; struct video_processor *impl; HRESULT hr; TRACE("riid %s, ret %p.\n", debugstr_guid(riid), ret); - if (!(transform = wg_transform_create(&input_format, &output_format, &attrs))) + if (FAILED(hr = check_video_transform_support(&input_format, &output_format))) { ERR_(winediag)("GStreamer doesn't support video conversion, please install appropriate plugins.\n"); - return E_FAIL; + return hr; } - wg_transform_destroy(transform); if (!(impl = calloc(1, sizeof(*impl)))) return E_OUTOFMEMORY;

1 0

Rémi Bernon : winegstreamer: Introduce a new check_audio_transform_support helper.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: cc82780c22db31fed4da8b84e85c01652a995490 URL: https://gitlab.winehq.org/wine/wine/-/commit/cc82780c22db31fed4da8b84e85c01… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 5 23:03:31 2024 +0100 winegstreamer: Introduce a new check_audio_transform_support helper. --- dlls/winegstreamer/aac_decoder.c | 27 ++++----------- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/main.c | 26 +++++++++++++++ dlls/winegstreamer/mfplat.c | 3 +- dlls/winegstreamer/quartz_transform.c | 63 +++++++++-------------------------- dlls/winegstreamer/resampler.c | 29 ++++------------ dlls/winegstreamer/wma_decoder.c | 26 ++++++--------- 7 files changed, 69 insertions(+), 107 deletions(-)

1 0

Rémi Bernon : mf/tests: Test video processor D3D11 awareness.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: c4fb3900bcd84287b4eabe2426f6824d478665d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/c4fb3900bcd84287b4eabe2426f682… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 10 09:28:45 2024 +0200 mf/tests: Test video processor D3D11 awareness. --- dlls/mf/tests/mf.c | 2 + dlls/mf/tests/mf_test.h | 1 + dlls/mf/tests/transform.c | 309 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 312 insertions(+)

1 0

Rémi Bernon : winegstreamer: Introduce a new wg_transform_create_mf helper.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: c1158337ab95462118aef966204597d908d30e59 URL: https://gitlab.winehq.org/wine/wine/-/commit/c1158337ab95462118aef966204597… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 5 23:03:31 2024 +0100 winegstreamer: Introduce a new wg_transform_create_mf helper. --- dlls/winegstreamer/aac_decoder.c | 18 ++++-------------- dlls/winegstreamer/color_convert.c | 18 ++++-------------- dlls/winegstreamer/gst_private.h | 2 ++ dlls/winegstreamer/main.c | 18 ++++++++++++++++++ dlls/winegstreamer/resampler.c | 18 ++++-------------- dlls/winegstreamer/video_decoder.c | 22 ++++------------------ dlls/winegstreamer/video_processor.c | 18 ++++-------------- 7 files changed, 40 insertions(+), 74 deletions(-) diff --git a/dlls/winegstreamer/aac_decoder.c b/dlls/winegstreamer/aac_decoder.c index 5844de33ceb..8e5d76f516a 100644 --- a/dlls/winegstreamer/aac_decoder.c +++ b/dlls/winegstreamer/aac_decoder.c @@ -73,25 +73,15 @@ static struct aac_decoder *impl_from_IMFTransform(IMFTransform *iface) static HRESULT try_create_wg_transform(struct aac_decoder *decoder) { - struct wg_format input_format, output_format; struct wg_transform_attrs attrs = {0}; if (decoder->wg_transform) + { wg_transform_destroy(decoder->wg_transform); - decoder->wg_transform = 0; - - mf_media_type_to_wg_format(decoder->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(decoder->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) - return E_FAIL; + decoder->wg_transform = 0; + } - return S_OK; + return wg_transform_create_mf(decoder->input_type, decoder->output_type, &attrs, &decoder->wg_transform); } static HRESULT WINAPI transform_QueryInterface(IMFTransform *iface, REFIID iid, void **out) diff --git a/dlls/winegstreamer/color_convert.c b/dlls/winegstreamer/color_convert.c index 41e5bcf3b60..b5a1261b669 100644 --- a/dlls/winegstreamer/color_convert.c +++ b/dlls/winegstreamer/color_convert.c @@ -97,25 +97,15 @@ static inline struct color_convert *impl_from_IUnknown(IUnknown *iface) static HRESULT try_create_wg_transform(struct color_convert *impl) { - struct wg_format input_format, output_format; struct wg_transform_attrs attrs = {0}; if (impl->wg_transform) + { wg_transform_destroy(impl->wg_transform); - impl->wg_transform = 0; - - mf_media_type_to_wg_format(impl->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(impl->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - if (!(impl->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) - return E_FAIL; + impl->wg_transform = 0; + } - return S_OK; + return wg_transform_create_mf(impl->input_type, impl->output_type, &attrs, &impl->wg_transform); } static HRESULT WINAPI unknown_QueryInterface(IUnknown *iface, REFIID iid, void **out) diff --git a/dlls/winegstreamer/gst_private.h b/dlls/winegstreamer/gst_private.h index 92805818ff4..c594ab99f3f 100644 --- a/dlls/winegstreamer/gst_private.h +++ b/dlls/winegstreamer/gst_private.h @@ -83,6 +83,8 @@ void wg_parser_stream_seek(wg_parser_stream_t stream, double rate, wg_transform_t wg_transform_create(const struct wg_format *input_format, const struct wg_format *output_format, const struct wg_transform_attrs *attrs); +HRESULT wg_transform_create_mf(IMFMediaType *input_type, IMFMediaType *output_type, + const struct wg_transform_attrs *attrs, wg_transform_t *transform); HRESULT wg_transform_create_quartz(const AM_MEDIA_TYPE *input_format, const AM_MEDIA_TYPE *output_format, const struct wg_transform_attrs *attrs, wg_transform_t *transform); void wg_transform_destroy(wg_transform_t transform); diff --git a/dlls/winegstreamer/main.c b/dlls/winegstreamer/main.c index 8c5ad931e83..03f8d658fe6 100644 --- a/dlls/winegstreamer/main.c +++ b/dlls/winegstreamer/main.c @@ -31,6 +31,7 @@ #include "dmoreg.h" #include "gst_guids.h" #include "wmcodecdsp.h" +#include "mferror.h" WINE_DEFAULT_DEBUG_CHANNEL(quartz); WINE_DECLARE_DEBUG_CHANNEL(mfplat); @@ -357,6 +358,23 @@ wg_transform_t wg_transform_create(const struct wg_format *input_format, return params.transform; } +HRESULT wg_transform_create_mf(IMFMediaType *input_type, IMFMediaType *output_type, + const struct wg_transform_attrs *attrs, wg_transform_t *transform) +{ + struct wg_format input_format, output_format; + + mf_media_type_to_wg_format(input_type, &input_format); + if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) + return MF_E_INVALIDMEDIATYPE; + mf_media_type_to_wg_format(output_type, &output_format); + if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) + return MF_E_INVALIDMEDIATYPE; + + if (!(*transform = wg_transform_create(&input_format, &output_format, attrs))) + return E_FAIL; + return S_OK; +} + HRESULT wg_transform_create_quartz(const AM_MEDIA_TYPE *input_type, const AM_MEDIA_TYPE *output_type, const struct wg_transform_attrs *attrs, wg_transform_t *transform) { diff --git a/dlls/winegstreamer/resampler.c b/dlls/winegstreamer/resampler.c index b5b62d58800..12da0d35c8e 100644 --- a/dlls/winegstreamer/resampler.c +++ b/dlls/winegstreamer/resampler.c @@ -56,25 +56,15 @@ struct resampler static HRESULT try_create_wg_transform(struct resampler *impl) { - struct wg_format input_format, output_format; struct wg_transform_attrs attrs = {0}; if (impl->wg_transform) + { wg_transform_destroy(impl->wg_transform); - impl->wg_transform = 0; - - mf_media_type_to_wg_format(impl->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(impl->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - if (!(impl->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) - return E_FAIL; + impl->wg_transform = 0; + } - return S_OK; + return wg_transform_create_mf(impl->input_type, impl->output_type, &attrs, &impl->wg_transform); } static inline struct resampler *impl_from_IUnknown(IUnknown *iface) diff --git a/dlls/winegstreamer/video_decoder.c b/dlls/winegstreamer/video_decoder.c index 5b5d0ec6d97..d0ce9b407a8 100644 --- a/dlls/winegstreamer/video_decoder.c +++ b/dlls/winegstreamer/video_decoder.c @@ -245,32 +245,18 @@ static HRESULT try_create_wg_transform(struct video_decoder *decoder) * transform to be able to queue its input buffers. We need to use a buffer list * to match its expectations. */ - struct wg_format input_format; - struct wg_format output_format; UINT32 low_latency; if (decoder->wg_transform) + { wg_transform_destroy(decoder->wg_transform); - decoder->wg_transform = 0; - - mf_media_type_to_wg_format(decoder->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(decoder->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; + decoder->wg_transform = 0; + } if (SUCCEEDED(IMFAttributes_GetUINT32(decoder->attributes, &MF_LOW_LATENCY, &low_latency))) decoder->wg_transform_attrs.low_latency = !!low_latency; - if (!(decoder->wg_transform = wg_transform_create(&input_format, &output_format, &decoder->wg_transform_attrs))) - { - ERR("Failed to create transform with input major_type %u.\n", input_format.major_type); - return E_FAIL; - } - - return S_OK; + return wg_transform_create_mf(decoder->input_type, decoder->output_type, &decoder->wg_transform_attrs, &decoder->wg_transform); } static HRESULT create_output_media_type(struct video_decoder *decoder, const GUID *subtype, diff --git a/dlls/winegstreamer/video_processor.c b/dlls/winegstreamer/video_processor.c index a5f72dd8a86..c4a3fcc6071 100644 --- a/dlls/winegstreamer/video_processor.c +++ b/dlls/winegstreamer/video_processor.c @@ -90,25 +90,15 @@ struct video_processor static HRESULT try_create_wg_transform(struct video_processor *impl) { - struct wg_format input_format, output_format; struct wg_transform_attrs attrs = {0}; if (impl->wg_transform) + { wg_transform_destroy(impl->wg_transform); - impl->wg_transform = 0; - - mf_media_type_to_wg_format(impl->input_type, &input_format); - if (input_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - mf_media_type_to_wg_format(impl->output_type, &output_format); - if (output_format.major_type == WG_MAJOR_TYPE_UNKNOWN) - return MF_E_INVALIDMEDIATYPE; - - if (!(impl->wg_transform = wg_transform_create(&input_format, &output_format, &attrs))) - return E_FAIL; + impl->wg_transform = 0; + } - return S_OK; + return wg_transform_create_mf(impl->input_type, impl->output_type, &attrs, &impl->wg_transform); } static HRESULT video_processor_init_allocator(struct video_processor *processor)

1 0

Rémi Bernon : winegstreamer/video_processor: Implement D3D awareness.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: cf3134a841bf2c6a54e3d005c9cc5d05547e84c5 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf3134a841bf2c6a54e3d005c9cc5d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Apr 2 21:57:49 2024 +0200 winegstreamer/video_processor: Implement D3D awareness. --- dlls/mf/tests/transform.c | 24 ++++--- dlls/mfreadwrite/tests/mfplat.c | 6 +- dlls/winegstreamer/video_processor.c | 120 ++++++++++++++++++++++++++++++++--- 3 files changed, 127 insertions(+), 23 deletions(-)

1 0

Rémi Bernon : mfreadwrite/tests: Add some source reader D3D11 awareness tests.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 54ff5bdf85f2b635acc1e055db6b11c6e0d5bd0a URL: https://gitlab.winehq.org/wine/wine/-/commit/54ff5bdf85f2b635acc1e055db6b11… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 09:59:47 2024 +0200 mfreadwrite/tests: Add some source reader D3D11 awareness tests. --- dlls/mfreadwrite/tests/Makefile.in | 2 +- dlls/mfreadwrite/tests/mfplat.c | 342 ++++++++++++++++++++++++++++++++++--- 2 files changed, 324 insertions(+), 20 deletions(-)

1 0

Rémi Bernon : mfreadwrite/reader: Pass the device manager to the stream transforms.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: 11c47925f0aa397cab117215f6c4563102b373b1 URL: https://gitlab.winehq.org/wine/wine/-/commit/11c47925f0aa397cab117215f6c456… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Apr 4 12:37:03 2024 +0200 mfreadwrite/reader: Pass the device manager to the stream transforms. --- dlls/mfreadwrite/reader.c | 59 +++++++++++++++++++++++++++++++++++++++++ dlls/mfreadwrite/tests/mfplat.c | 17 ++++++------ 2 files changed, 67 insertions(+), 9 deletions(-) diff --git a/dlls/mfreadwrite/reader.c b/dlls/mfreadwrite/reader.c index ab8c3993570..a9d25848e7b 100644 --- a/dlls/mfreadwrite/reader.c +++ b/dlls/mfreadwrite/reader.c @@ -79,6 +79,7 @@ struct transform_entry UINT32 pending_flags; GUID category; BOOL hidden; + BOOL attributes_initialized; }; struct media_stream @@ -816,6 +817,35 @@ static HRESULT transform_entry_update_input_type(struct transform_entry *entry, return hr; } +static void transform_entry_initialize_attributes(struct source_reader *reader, struct transform_entry *entry) +{ + IMFAttributes *attributes; + + if (SUCCEEDED(IMFTransform_GetAttributes(entry->transform, &attributes))) + { + if (FAILED(IMFAttributes_GetItem(attributes, &MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, NULL))) + IMFAttributes_SetUINT32(attributes, &MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, 6); + + IMFAttributes_Release(attributes); + } + + if (SUCCEEDED(IMFTransform_GetOutputStreamAttributes(entry->transform, 0, &attributes))) + { + UINT32 shared, shared_without_mutex, bind_flags; + + if (SUCCEEDED(IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED, &shared))) + IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED, shared); + if (SUCCEEDED(IMFAttributes_GetUINT32(reader->attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, &shared_without_mutex))) + IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_SHARED_WITHOUT_MUTEX, shared_without_mutex); + if (SUCCEEDED(IMFAttributes_GetUINT32(reader->attributes, &MF_SOURCE_READER_D3D11_BIND_FLAGS, &bind_flags))) + IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, bind_flags); + else if ((reader->flags & SOURCE_READER_DXGI_DEVICE_MANAGER) && FAILED(IMFAttributes_GetItem(attributes, &MF_SA_D3D11_BINDFLAGS, NULL))) + IMFAttributes_SetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, 1024); + + IMFAttributes_Release(attributes); + } +} + static HRESULT source_reader_pull_transform_samples(struct source_reader *reader, struct media_stream *stream, struct transform_entry *entry) { @@ -828,6 +858,12 @@ static HRESULT source_reader_pull_transform_samples(struct source_reader *reader if ((ptr = list_next(&stream->transforms, &entry->entry))) next = LIST_ENTRY(ptr, struct transform_entry, entry); + if (!entry->attributes_initialized) + { + transform_entry_initialize_attributes(reader, entry); + entry->attributes_initialized = TRUE; + } + if (FAILED(hr = IMFTransform_GetOutputStreamInfo(entry->transform, 0, &stream_info))) return hr; stream_info.cbSize = max(stream_info.cbSize, entry->min_buffer_size); @@ -2011,10 +2047,33 @@ static HRESULT source_reader_create_transform(struct source_reader *reader, BOOL for (i = 0; i < count; i++) { + IMFAttributes *attributes; IMFMediaType *media_type; if (FAILED(hr = IMFActivate_ActivateObject(activates[i], &IID_IMFTransform, (void **)&transform))) continue; + + if (!reader->device_manager || FAILED(IMFTransform_GetAttributes(transform, &attributes))) + entry->attributes_initialized = TRUE; + else + { + UINT32 d3d_aware = FALSE; + + if (reader->flags & SOURCE_READER_DXGI_DEVICE_MANAGER) + { + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_AWARE, &d3d_aware)) && d3d_aware) + IMFTransform_ProcessMessage(transform, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)reader->device_manager); + } + else if (reader->flags & SOURCE_READER_D3D9_DEVICE_MANAGER) + { + if (SUCCEEDED(IMFAttributes_GetUINT32(attributes, &MF_SA_D3D_AWARE, &d3d_aware)) && d3d_aware) + IMFTransform_ProcessMessage(transform, MFT_MESSAGE_SET_D3D_MANAGER, (ULONG_PTR)reader->device_manager); + } + + entry->attributes_initialized = !d3d_aware; + IMFAttributes_Release(attributes); + } + if (SUCCEEDED(hr = IMFTransform_SetInputType(transform, 0, input_type, 0)) && SUCCEEDED(hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type))) { diff --git a/dlls/mfreadwrite/tests/mfplat.c b/dlls/mfreadwrite/tests/mfplat.c index d6e99e47f89..b51c9739afe 100644 --- a/dlls/mfreadwrite/tests/mfplat.c +++ b/dlls/mfreadwrite/tests/mfplat.c @@ -3070,7 +3070,7 @@ static void test_source_reader_transforms_d3d9(void) hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); - todo_wine ok(!!test_decoder_got_d3d_manager, "d3d manager not received\n"); + ok(!!test_decoder_got_d3d_manager, "d3d manager not received\n"); hr = IMFSourceReader_GetCurrentMediaType(reader, 0, &media_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); @@ -3147,10 +3147,9 @@ static void test_source_reader_transforms_d3d9(void) hr = IMFTransform_GetAttributes(video_processor, &attributes); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, &value); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value == 6, "got %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 6, "got %u.\n", value); IMFAttributes_Release(attributes); hr = IMFTransform_GetOutputStreamAttributes(video_processor, 0, &attributes); @@ -3204,7 +3203,7 @@ static void test_source_reader_transforms_d3d9(void) hr = IMFSourceReader_SetCurrentMediaType(reader, 0, NULL, media_type); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); IMFMediaType_Release(media_type); - todo_wine ok(!!test_decoder_got_d3d_manager, "d3d manager not received\n"); + ok(!!test_decoder_got_d3d_manager, "d3d manager not received\n"); hr = IMFSourceReader_QueryInterface(reader, &IID_IMFSourceReaderEx, (void **)&reader_ex); @@ -3463,16 +3462,16 @@ static void test_source_reader_transforms_d3d11(void) ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_SA_MINIMUM_OUTPUT_SAMPLE_COUNT, &value); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value == 6, "got %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 6, "got %u.\n", value); IMFAttributes_Release(attributes); hr = IMFTransform_GetOutputStreamAttributes(video_processor, 0, &attributes); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); value = 0xdeadbeef; hr = IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &value); - todo_wine ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine ok(value == 1024, "got %u.\n", value); + ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(value == 1024, "got %u.\n", value); IMFAttributes_Release(attributes); IMFTransform_Release(video_processor);

1 0

Billy Laws : ntdll: Don't restore PC from LR after unwinding through frame switches.
by Alexandre Julliard May 8, 2024

May 8, 2024

Module: wine Branch: master Commit: a2b4924db5d0167c8b6d6807e161569f5aa70c30 URL: https://gitlab.winehq.org/wine/wine/-/commit/a2b4924db5d0167c8b6d6807e16156… Author: Billy Laws <blaws05(a)gmail.com> Date: Mon May 6 14:29:25 2024 +0000 ntdll: Don't restore PC from LR after unwinding through frame switches. Fixes unwinds from within a consolidation callback on ARM64EC, as the context frame could be x64 with UNWOUND_TO_CALL set, in which case LR contains garbage. See: https://github.com/dotnet/runtime/blob/71abc26cf8f14f5d15665d7f580365ddfa29… --- dlls/ntdll/tests/unwind.c | 45 ++++++++++++++++++++++++--------------------- dlls/ntdll/unwind.c | 23 +++++++++++++++-------- 2 files changed, 39 insertions(+), 29 deletions(-) diff --git a/dlls/ntdll/tests/unwind.c b/dlls/ntdll/tests/unwind.c index 61fbed1e017..daa90c19a11 100644 --- a/dlls/ntdll/tests/unwind.c +++ b/dlls/ntdll/tests/unwind.c @@ -1566,6 +1566,8 @@ struct unwind_test_arm64 unsigned int nb_results; int unwound_clear; int last_set_reg_ptr; + int stack_value_index; + ULONG64 stack_value; }; enum regs_arm64 @@ -1630,6 +1632,7 @@ static void call_virtual_unwind_arm64( void *code_mem, int testnum, const struct memset( &context, 0x55, sizeof(context) ); memset( &unset_reg, 0x55, sizeof(unset_reg) ); for (j = 0; j < 256; j++) fake_stack[j] = j * 8; + if (test->stack_value_index != -1) fake_stack[test->stack_value_index] = test->stack_value; context.Sp = (ULONG_PTR)fake_stack; context.Lr = (ULONG_PTR)ORIG_LR; @@ -2598,27 +2601,27 @@ static void test_virtual_unwind_arm64(void) static const struct unwind_test_arm64 tests[] = { -#define TEST(func, unwind, size, results, unwound_clear, last_ptr) \ - { func, sizeof(func), unwind, size, results, ARRAY_SIZE(results), unwound_clear, last_ptr } - TEST(function_0, unwind_info_0, sizeof(unwind_info_0), results_0, 0, 0), - TEST(function_1, unwind_info_1, 0, results_1, 0, 0), - TEST(function_2, unwind_info_2, sizeof(unwind_info_2), results_2, 1, 0), - TEST(function_3, unwind_info_3, sizeof(unwind_info_3), results_3, 1, x28), - TEST(function_4, unwind_info_4, sizeof(unwind_info_4), results_4, 0, 0), - TEST(function_5, unwind_info_5, sizeof(unwind_info_5), results_5, 0, 0), - TEST(function_6, unwind_info_6, 0, results_6, 0, 0), - TEST(function_7, unwind_info_7, 0, results_7, 0, 0), - TEST(function_8, unwind_info_8, 0, results_8, 0, 0), - TEST(function_9, unwind_info_9, 0, results_9, 0, 0), - TEST(function_10, unwind_info_10, 0, results_10, 0, 0), - TEST(function_11, unwind_info_11, 0, results_11, 0, 0), - TEST(function_12, unwind_info_12, 0, results_12, 0, 0), - TEST(function_13, unwind_info_13, 0, results_13, 0, 0), - TEST(function_14, unwind_info_14, sizeof(unwind_info_14), results_14, 0, 0), - TEST(function_15, unwind_info_15, sizeof(unwind_info_15), results_15, 0, 0), - TEST(function_16, unwind_info_16, sizeof(unwind_info_16), results_16, 1, x18), - TEST(function_17, unwind_info_17, sizeof(unwind_info_17), results_17, 2, 0), - TEST(function_18, NULL, 0, results_18, 0, 0), +#define TEST(func, unwind, size, results, unwound_clear, last_ptr, stack_value_index, stack_value) \ + { func, sizeof(func), unwind, size, results, ARRAY_SIZE(results), unwound_clear, last_ptr, stack_value_index, stack_value } + TEST(function_0, unwind_info_0, sizeof(unwind_info_0), results_0, 0, 0, -1, 0), + TEST(function_1, unwind_info_1, 0, results_1, 0, 0, -1, 0), + TEST(function_2, unwind_info_2, sizeof(unwind_info_2), results_2, 1, 0, -1, 0), + TEST(function_3, unwind_info_3, sizeof(unwind_info_3), results_3, 2, x28, 0, CONTEXT_ARM64_UNWOUND_TO_CALL), + TEST(function_4, unwind_info_4, sizeof(unwind_info_4), results_4, 0, 0, -1, 0), + TEST(function_5, unwind_info_5, sizeof(unwind_info_5), results_5, 0, 0, -1, 0), + TEST(function_6, unwind_info_6, 0, results_6, 0, 0, -1, 0), + TEST(function_7, unwind_info_7, 0, results_7, 0, 0, -1, 0), + TEST(function_8, unwind_info_8, 0, results_8, 0, 0, -1, 0), + TEST(function_9, unwind_info_9, 0, results_9, 0, 0, -1, 0), + TEST(function_10, unwind_info_10, 0, results_10, 0, 0, -1, 0), + TEST(function_11, unwind_info_11, 0, results_11, 0, 0, -1, 0), + TEST(function_12, unwind_info_12, 0, results_12, 0, 0, -1, 0), + TEST(function_13, unwind_info_13, 0, results_13, 0, 0, -1, 0), + TEST(function_14, unwind_info_14, sizeof(unwind_info_14), results_14, 0, 0, -1, 0), + TEST(function_15, unwind_info_15, sizeof(unwind_info_15), results_15, 0, 0, -1, 0), + TEST(function_16, unwind_info_16, sizeof(unwind_info_16), results_16, 2, x18, 6, CONTEXT_ARM64_UNWOUND_TO_CALL), + TEST(function_17, unwind_info_17, sizeof(unwind_info_17), results_17, 2, 0, -1, 0), + TEST(function_18, NULL, 0, results_18, 0, 0, -1, 0), #undef TEST }; unsigned int i; diff --git a/dlls/ntdll/unwind.c b/dlls/ntdll/unwind.c index 5d830536688..04c843baefd 100644 --- a/dlls/ntdll/unwind.c +++ b/dlls/ntdll/unwind.c @@ -402,7 +402,8 @@ static void do_pac_auth( ARM64_NT_CONTEXT *context ) } static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *context, - KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs, int skip ) + KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs, int skip, + BOOLEAN *final_pc_from_lr ) { unsigned int i, val, len, save_next = 2; @@ -482,6 +483,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex context->Pc = ((DWORD64 *)context->Sp)[1]; context->Sp = ((DWORD64 *)context->Sp)[0]; context->ContextFlags &= ~CONTEXT_UNWOUND_TO_CALL; + *final_pc_from_lr = FALSE; } else if (*ptr == 0xea) /* MSFT_OP_CONTEXT */ { @@ -494,6 +496,7 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex for (i = 19; i < 29; i++) (&ptrs->X19)[i - 19] = &src_ctx->X[i]; for (i = 8; i < 16; i++) (&ptrs->D8)[i - 8] = &src_ctx->V[i].Low; } + *final_pc_from_lr = FALSE; } else if (*ptr == 0xeb) /* MSFT_OP_EC_CONTEXT */ { @@ -502,11 +505,13 @@ static void process_unwind_codes( BYTE *ptr, BYTE *end, ARM64_NT_CONTEXT *contex context_x64_to_arm( context, src_ctx ); context->ContextFlags = flags | (src_ctx->ContextFlags & CONTEXT_UNWOUND_TO_CALL); if (ptrs) for (i = 8; i < 16; i++) (&ptrs->D8)[i - 8] = &src_ctx->V[i].Low; + *final_pc_from_lr = FALSE; } else if (*ptr == 0xec) /* MSFT_OP_CLEAR_UNWOUND_TO_CALL */ { context->Pc = context->Lr; context->ContextFlags &= ~CONTEXT_UNWOUND_TO_CALL; + *final_pc_from_lr = FALSE; } else if (*ptr == 0xfc) /* pac_sign_lr */ { @@ -675,7 +680,8 @@ static void *unwind_packed_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUN static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUNCTION *func, ARM64_NT_CONTEXT *context, PVOID *handler_data, - KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs ) + KNONVOLATILE_CONTEXT_POINTERS_ARM64 *ptrs, + BOOLEAN *final_pc_from_lr ) { IMAGE_ARM64_RUNTIME_FUNCTION_ENTRY_XDATA *info; struct unwind_info_epilog *info_epilog; @@ -711,7 +717,7 @@ static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUNCT len = get_sequence_len( data, end ); if (offset < len) { - process_unwind_codes( data, end, context, ptrs, len - offset ); + process_unwind_codes( data, end, context, ptrs, len - offset, final_pc_from_lr ); return NULL; } } @@ -728,7 +734,7 @@ static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUNCT len = get_sequence_len( ptr, end ); if (offset <= info_epilog[i].offset + len) { - process_unwind_codes( ptr, end, context, ptrs, offset - info_epilog[i].offset ); + process_unwind_codes( ptr, end, context, ptrs, offset - info_epilog[i].offset, final_pc_from_lr ); return NULL; } } @@ -740,12 +746,12 @@ static void *unwind_full_data( ULONG_PTR base, ULONG_PTR pc, ARM64_RUNTIME_FUNCT len = get_sequence_len( ptr, end ) + 1; if (offset >= info->FunctionLength - len) { - process_unwind_codes( ptr, end, context, ptrs, offset - (info->FunctionLength - len) ); + process_unwind_codes( ptr, end, context, ptrs, offset - (info->FunctionLength - len), final_pc_from_lr ); return NULL; } } - process_unwind_codes( data, end, context, ptrs, 0 ); + process_unwind_codes( data, end, context, ptrs, 0, final_pc_from_lr ); /* get handler since we are inside the main code */ if (info->ExceptionDataPresent) @@ -797,6 +803,7 @@ NTSTATUS WINAPI RtlVirtualUnwind2( ULONG type, ULONG_PTR base, ULONG_PTR pc, ULONG_PTR *limit_low, ULONG_PTR *limit_high, PEXCEPTION_ROUTINE *handler_ret, ULONG flags ) { + BOOLEAN final_pc_from_lr = TRUE; TRACE( "type %lx base %I64x pc %I64x rva %I64x sp %I64x\n", type, base, pc, pc - base, context->Sp ); if (limit_low || limit_high) FIXME( "limits not supported\n" ); @@ -810,9 +817,9 @@ NTSTATUS WINAPI RtlVirtualUnwind2( ULONG type, ULONG_PTR base, ULONG_PTR pc, else if (func->Flag) *handler_ret = unwind_packed_data( base, pc, func, context, ctx_ptr ); else - *handler_ret = unwind_full_data( base, pc, func, context, handler_data, ctx_ptr ); + *handler_ret = unwind_full_data( base, pc, func, context, handler_data, ctx_ptr, &final_pc_from_lr ); - if (context->ContextFlags & CONTEXT_UNWOUND_TO_CALL) context->Pc = context->Lr; + if (final_pc_from_lr) context->Pc = context->Lr; TRACE( "ret: pc=%I64x lr=%I64x sp=%I64x handler=%p\n", context->Pc, context->Lr, context->Sp, *handler_ret ); *frame_ret = context->Sp;

1 0