October 2021 - Wine-commits

Alexandre Julliard : windowscodecs: Remove the Unix library.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: eaa302e6d675c02fc98e7c6fe423aa923440a26a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaa302e6d675c02fc98e7c6f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 27 12:06:11 2021 +0200 windowscodecs: Remove the Unix library. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/Makefile.in | 2 - dlls/windowscodecs/unix_iface.c | 235 --------------------------------- dlls/windowscodecs/unix_lib.c | 106 --------------- dlls/windowscodecs/wincodecs_private.h | 33 ----- 4 files changed, 376 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eaa302e6d675c02fc98e…

1 0

Francisco Casas : gdi32: Avoid integer overflow in the obj map compare fn.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: d85b700df9667e00c1408297da605097ea628d82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d85b700df9667e00c1408297… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 27 09:47:06 2021 -0300 gdi32: Avoid integer overflow in the obj map compare fn. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 4b390aa0160..196cea9ba92 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -178,7 +178,11 @@ DWORD WINAPI GetObjectType( HGDIOBJ handle ) static int obj_map_cmp( const void *key, const struct wine_rb_entry *entry ) { struct obj_map_entry *obj_entry = WINE_RB_ENTRY_VALUE( entry, struct obj_map_entry, entry ); - return HandleToLong( key ) - HandleToLong( obj_entry->obj ); + UINT_PTR a = (UINT_PTR)key; + UINT_PTR b = (UINT_PTR)obj_entry->obj; + if (a > b) return 1; + if (a < b) return -1; + return 0; }; struct wine_rb_tree obj_map = { obj_map_cmp };

1 0

Francisco Casas : gdi32: Do not sign extend 64-bit gdi handles.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 379333e3c789573c6d1a7bdad2a785b43772d526 URL: https://source.winehq.org/git/wine.git/?a=commit;h=379333e3c789573c6d1a7bda… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Oct 27 09:47:07 2021 -0300 gdi32: Do not sign extend 64-bit gdi handles. Testing on Windows shows typically handles are not sign extended, however sometimes they are. It's not clear what triggers the change in behaviour. Signed-off-by: Francisco Casas <fcasas(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/objects.c | 2 +- dlls/win32u/gdiobj.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/objects.c b/dlls/gdi32/objects.c index 196cea9ba92..04b91cfd60f 100644 --- a/dlls/gdi32/objects.c +++ b/dlls/gdi32/objects.c @@ -102,7 +102,7 @@ static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle ) static HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { unsigned int idx = entry - get_gdi_shared()->Handles; - return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); + return ULongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } static DWORD get_object_type( HGDIOBJ obj ) diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index d097ba158fd..0310609afc0 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -55,7 +55,7 @@ const struct user_callbacks *user_callbacks = NULL; static inline HGDIOBJ entry_to_handle( GDI_HANDLE_ENTRY *entry ) { unsigned int idx = entry - gdi_shared->Handles; - return LongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); + return ULongToHandle( idx | (entry->Unique << NTGDI_HANDLE_TYPE_SHIFT) ); } static inline GDI_HANDLE_ENTRY *handle_entry( HGDIOBJ handle )

1 0

Nikolay Sivov : evr/mixer: Improve output type candidates attributes configuration.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 059a0c0b56bf2b03b705a8dc52aefb793576be09 URL: https://source.winehq.org/git/wine.git/?a=commit;h=059a0c0b56bf2b03b705a8dc… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 17:23:02 2021 +0300 evr/mixer: Improve output type candidates attributes configuration. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 35 ++++++++++++++++++++++++++++---- dlls/evr/tests/evr.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index f821dc7e6d9..1db2fd3a9f4 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -675,14 +675,27 @@ static unsigned int video_mixer_get_interlace_mode_from_video_desc(const DXVA2_V } } +static void mf_get_attribute_uint32(IMFMediaType *media_type, const GUID *key, UINT32 *value, + UINT32 default_value) +{ + if (FAILED(IMFMediaType_GetUINT32(media_type, key, value))) + *value = default_value; +} + +static void mf_get_attribute_uint64(IMFMediaType *media_type, const GUID *key, UINT64 *value, + UINT64 default_value) +{ + if (FAILED(IMFMediaType_GetUINT64(media_type, key, value))) + *value = default_value; +} + static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const DXVA2_VideoDesc *video_desc, IMFMediaType *media_type, IDirectXVideoProcessorService *service, unsigned int device_count, const GUID *devices, unsigned int flags) { - unsigned int i, j, format_count, count, interlace_mode; struct rt_format *rt_formats = NULL, *ptr; + unsigned int i, j, format_count, count; HRESULT hr = MF_E_INVALIDMEDIATYPE; - MFVideoArea aperture; D3DFORMAT *formats; GUID subtype; @@ -710,6 +723,10 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const if (count && !(flags & MFT_SET_TYPE_TEST_ONLY)) { + UINT32 fixed_samples, interlace_mode; + MFVideoArea aperture; + UINT64 par; + if (!(mixer->output.rt_formats = calloc(count, sizeof(*mixer->output.rt_formats)))) { free(rt_formats); @@ -718,9 +735,16 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const memcpy(&subtype, &MFVideoFormat_Base, sizeof(subtype)); memset(&aperture, 0, sizeof(aperture)); - aperture.Area.cx = video_desc->SampleWidth; - aperture.Area.cy = video_desc->SampleHeight; + if (FAILED(IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, + sizeof(aperture), NULL))) + { + aperture.Area.cx = video_desc->SampleWidth; + aperture.Area.cy = video_desc->SampleHeight; + } interlace_mode = video_mixer_get_interlace_mode_from_video_desc(video_desc); + mf_get_attribute_uint64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &par, (UINT64)1 << 32 | 1); + mf_get_attribute_uint32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, &fixed_samples, 1); + for (i = 0; i < count; ++i) { IMFMediaType *rt_media_type; @@ -731,9 +755,12 @@ static HRESULT video_mixer_collect_output_types(struct video_mixer *mixer, const MFCreateMediaType(&rt_media_type); IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)rt_media_type); IMFMediaType_SetGUID(rt_media_type, &MF_MT_SUBTYPE, &subtype); + IMFMediaType_SetUINT64(rt_media_type, &MF_MT_FRAME_SIZE, (UINT64)aperture.Area.cx << 32 | aperture.Area.cy); IMFMediaType_SetBlob(rt_media_type, &MF_MT_GEOMETRIC_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetBlob(rt_media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (const UINT8 *)&aperture, sizeof(aperture)); IMFMediaType_SetUINT32(rt_media_type, &MF_MT_INTERLACE_MODE, interlace_mode); + IMFMediaType_SetUINT64(rt_media_type, &MF_MT_PIXEL_ASPECT_RATIO, par); + IMFMediaType_SetUINT32(rt_media_type, &MF_MT_FIXED_SIZE_SAMPLES, fixed_samples); mixer->output.rt_formats[i].media_type = rt_media_type; } diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 5bf03fa49f8..818731e1e55 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -946,6 +946,7 @@ static void test_default_mixer_type_negotiation(void) IDirect3DDevice9 *device; IMFMediaType *video_type; IMFTransform *transform; + MFVideoArea aperture; DWORD index, count; IUnknown *unk; HWND window; @@ -1020,10 +1021,19 @@ static void test_default_mixer_type_negotiation(void) ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_SetUINT32(video_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, TRUE); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + memset(&aperture, 0, sizeof(aperture)); + aperture.Area.cx = 100; aperture.Area.cy = 200; + hr = IMFMediaType_SetBlob(video_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture)); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFMediaType_SetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, 2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFTransform_SetInputType(transform, 0, video_type, MFT_SET_TYPE_TEST_ONLY); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetOutputAvailableType(transform, 0, 0, &media_type); + ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); + hr = IMFTransform_GetInputCurrentType(transform, 0, &media_type); ok(hr == MF_E_TRANSFORM_TYPE_NOT_SET, "Unexpected hr %#x.\n", hr); @@ -1040,25 +1050,69 @@ static void test_default_mixer_type_negotiation(void) IMFMediaType_Release(media_type); IMFMediaType_Release(media_type2); + /* Modified after type was set. */ + hr = IMFMediaType_SetUINT64(video_type, &MF_MT_PIXEL_ASPECT_RATIO, (UINT64)56 << 32 | 55); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + /* Check attributes on available output types. */ index = 0; while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) { - UINT64 frame_size; + UINT64 frame_size, ratio; + MFVideoArea aperture; GUID subtype, major; UINT32 value; hr = IMFMediaType_GetGUID(media_type, &MF_MT_MAJOR_TYPE, &major); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(IsEqualGUID(&major, &MFMediaType_Video), "Unexpected major type.\n"); hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT64(media_type, &MF_MT_FRAME_SIZE, &frame_size); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(frame_size == ((UINT64)100 << 32 | 200), "Unexpected frame size %s.\n", wine_dbgstr_longlong(frame_size)); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_ALL_SAMPLES_INDEPENDENT, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); hr = IMFMediaType_GetUINT32(media_type, &MF_MT_INTERLACE_MODE, &value); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); ok(value == MFVideoInterlace_Progressive, "Unexpected interlace mode.\n"); + /* Ratio from input type */ + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(ratio == ((UINT64)1 << 32 | 1), "Unexpected PAR %s.\n", wine_dbgstr_longlong(ratio)); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&aperture, sizeof(aperture), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(aperture.Area.cx == 100 && aperture.Area.cy == 200, "Unexpected aperture area.\n"); + hr = IMFMediaType_GetBlob(media_type, &MF_MT_MINIMUM_DISPLAY_APERTURE, (UINT8 *)&aperture, sizeof(aperture), NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(aperture.Area.cx == 100 && aperture.Area.cy == 200, "Unexpected aperture area.\n"); + hr = IMFMediaType_GetUINT32(video_type, &MF_MT_FIXED_SIZE_SAMPLES, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 2, "Unexpected value %u.\n", value); + + IMFMediaType_Release(media_type); + } + ok(index > 1, "Unexpected number of available types.\n"); + + hr = IMFMediaType_DeleteItem(video_type, &MF_MT_FIXED_SIZE_SAMPLES); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTransform_SetInputType(transform, 0, video_type, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + index = 0; + while (SUCCEEDED(IMFTransform_GetOutputAvailableType(transform, 0, index++, &media_type))) + { + UINT32 value; + UINT64 ratio; + + hr = IMFMediaType_GetUINT64(media_type, &MF_MT_PIXEL_ASPECT_RATIO, &ratio); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(ratio == ((UINT64)56 << 32 | 55), "Unexpected PAR %s.\n", wine_dbgstr_longlong(ratio)); + + hr = IMFMediaType_GetUINT32(media_type, &MF_MT_FIXED_SIZE_SAMPLES, &value); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(value == 1, "Unexpected value %u.\n", value); IMFMediaType_Release(media_type); }

1 0

Nikolay Sivov : evr/tests: Skip tests if default presenter can't be created.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 393ea6c60854eeebd0b86ca3265a2892ffc6996d URL: https://source.winehq.org/git/wine.git/?a=commit;h=393ea6c60854eeebd0b86ca3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 17:23:03 2021 +0300 evr/tests: Skip tests if default presenter can't be created. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 818731e1e55..6fb92d9ced1 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1246,9 +1246,7 @@ static void test_default_presenter(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); - ok(hr == S_OK || broken(hr == E_FAIL) /* WinXP */, "Failed to create default presenter, hr %#x.\n", hr); - if (FAILED(hr)) - return; + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); check_interface(presenter, &IID_IQualProp, TRUE); check_interface(presenter, &IID_IMFVideoPositionMapper, TRUE); @@ -2820,8 +2818,19 @@ static void test_MFIsFormatYUV(void) START_TEST(evr) { + IMFVideoPresenter *presenter; + HRESULT hr; + CoInitialize(NULL); + if (FAILED(hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter))) + { + win_skip("Failed to create default presenter, hr %#x. Skipping tests.\n", hr); + CoUninitialize(); + return; + } + IMFVideoPresenter_Release(presenter); + test_aggregation(); test_interfaces(); test_enum_pins();

1 0

Nikolay Sivov : evr/presenter: Handle type invalidation calls without attached mixer.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 3de246a383d8ce00c75c3f836760a038f61029ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=3de246a383d8ce00c75c3f83… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 17:23:04 2021 +0300 evr/presenter: Handle type invalidation calls without attached mixer. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 5 +++- dlls/evr/tests/evr.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++----- 2 files changed, 72 insertions(+), 7 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 5b262e7c663..027d0338896 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -348,6 +348,9 @@ static HRESULT video_presenter_invalidate_media_type(struct video_presenter *pre RECT rect; HRESULT hr; + if (!presenter->mixer) + return MF_E_TRANSFORM_TYPE_NOT_SET; + if (FAILED(hr = MFCreateMediaType(&media_type))) return hr; @@ -965,7 +968,7 @@ static HRESULT WINAPI video_presenter_ProcessMessage(IMFVideoPresenter *iface, M switch (message) { case MFVP_MESSAGE_INVALIDATEMEDIATYPE: - hr = video_presenter_invalidate_media_type(presenter); + hr = presenter->mixer ? video_presenter_invalidate_media_type(presenter) : MF_E_INVALIDREQUEST; break; case MFVP_MESSAGE_BEGINSTREAMING: hr = video_presenter_start_streaming(presenter); diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 6fb92d9ced1..8e3288afaec 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -1754,12 +1754,41 @@ static void test_presenter_video_position(void) DWORD count; HWND hwnd; + hwnd = create_window(); + ok(!!hwnd, "Failed to create a test window.\n"); + + /* Setting position without the mixer. */ + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + SetRect(&dst_rect, 0, 0, 10, 10); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, hwnd); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); + ok(hr == MF_E_INVALIDREQUEST, "Unexpected hr %#x.\n", hr); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &dst_rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFVideoDisplayControl_Release(display_control); + IMFVideoPresenter_Release(presenter); + + /* With the mixer. */ hr = MFCreateVideoMixer(NULL, &IID_IDirect3DDevice9, &IID_IMFTransform, (void **)&mixer); ok(hr == S_OK, "Failed to create a mixer, hr %#x.\n", hr); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -1785,9 +1814,6 @@ static void test_presenter_video_position(void) ok(src_rect.left == 0.0f && src_rect.top == 0.0f && src_rect.right == 1.0f && src_rect.bottom == 1.0f, "Unexpected source rectangle.\n"); - hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); - ok(hr == S_OK, "Unexpected hr %#x.\n", hr); - hr = IMFVideoDisplayControl_GetVideoPosition(display_control, NULL, &dst_rect); ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); @@ -1806,9 +1832,6 @@ static void test_presenter_video_position(void) ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); /* Setting position requires a window. */ - hwnd = create_window(); - ok(!!hwnd, "Failed to create a test window.\n"); - SetRect(&dst_rect, 0, 0, 10, 10); memset(&src_rect, 0, sizeof(src_rect)); hr = IMFVideoDisplayControl_SetVideoPosition(display_control, &src_rect, &dst_rect); @@ -2297,6 +2320,44 @@ done: DestroyWindow(window); } +static void test_presenter_shutdown(void) +{ + IMFTopologyServiceLookupClient *lookup_client; + IMFVideoPresenter *presenter; + HRESULT hr; + + hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); + ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_INVALIDATEMEDIATYPE, 0); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_BEGINSTREAMING, 0); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_ENDSTREAMING, 0); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_ProcessMessage(presenter, MFVP_MESSAGE_PROCESSINPUTNOTIFY, 0); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + IMFTopologyServiceLookupClient_Release(lookup_client); + + IMFVideoPresenter_Release(presenter); +} + static void test_mixer_output_rectangle(void) { IMFVideoMixerControl *mixer_control; @@ -2848,6 +2909,7 @@ START_TEST(evr) test_presenter_video_window(); test_presenter_quality_control(); test_presenter_media_type(); + test_presenter_shutdown(); test_mixer_output_rectangle(); test_mixer_zorder(); test_mixer_samples();

1 0

Nikolay Sivov : evr/tests: Add some more presenter tests for shutdown state.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: f7e31f715df557288ba02265580c7dbc6fca1ce5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7e31f715df557288ba02265… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Oct 27 17:23:05 2021 +0300 evr/tests: Add some more presenter tests for shutdown state. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/tests/evr.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/dlls/evr/tests/evr.c b/dlls/evr/tests/evr.c index 8e3288afaec..b7e3ad174df 100644 --- a/dlls/evr/tests/evr.c +++ b/dlls/evr/tests/evr.c @@ -2323,8 +2323,19 @@ done: static void test_presenter_shutdown(void) { IMFTopologyServiceLookupClient *lookup_client; + IMFVideoDisplayControl *display_control; + IMFVideoMediaType *media_type; IMFVideoPresenter *presenter; + IMFVideoDeviceID *deviceid; + HWND window, window2; HRESULT hr; + DWORD mode; + RECT rect; + SIZE size; + IID iid; + + window = create_window(); + ok(!!window, "Failed to create test window.\n"); hr = MFCreateVideoPresenter(NULL, &IID_IDirect3DDevice9, &IID_IMFVideoPresenter, (void **)&presenter); ok(hr == S_OK, "Failed to create default presenter, hr %#x.\n", hr); @@ -2332,6 +2343,12 @@ static void test_presenter_shutdown(void) hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFTopologyServiceLookupClient, (void **)&lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDeviceID, (void **)&deviceid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoPresenter_QueryInterface(presenter, &IID_IMFVideoDisplayControl, (void **)&display_control); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); @@ -2350,12 +2367,56 @@ todo_wine todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFVideoPresenter_GetCurrentMediaType(presenter, &media_type); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDeviceID_GetDeviceID(deviceid, &iid); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetNativeVideoSize(display_control, &size, &size); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetIdealVideoSize(display_control, &size, &size); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + SetRect(&rect, 0, 0, 10, 10); + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &rect); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetVideoPosition(display_control, NULL, &rect); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetAspectRatioMode(display_control, MFVideoARMode_None); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetAspectRatioMode(display_control, &mode); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetVideoWindow(display_control, window); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_SetVideoPosition(display_control, NULL, &rect); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_GetVideoWindow(display_control, &window2); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + + hr = IMFVideoDisplayControl_RepaintVideo(display_control); +todo_wine + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + hr = IMFTopologyServiceLookupClient_ReleaseServicePointers(lookup_client); ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + IMFVideoDeviceID_Release(deviceid); + IMFVideoDisplayControl_Release(display_control); IMFTopologyServiceLookupClient_Release(lookup_client); IMFVideoPresenter_Release(presenter); + + DestroyWindow(window); } static void test_mixer_output_rectangle(void)

1 0

Zebediah Figura : ntdll/tests: Move some tests to a new sync.c file.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 127ad286ce019e70ef3243844c9bd6a2e4669de3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=127ad286ce019e70ef324384… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 27 10:01:19 2021 -0500 ntdll/tests: Move some tests to a new sync.c file. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/Makefile.in | 1 + dlls/ntdll/tests/om.c | 574 --------------------------------------- dlls/ntdll/tests/sync.c | 631 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 632 insertions(+), 574 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=127ad286ce019e70ef32…

1 0

Zebediah Figura : ntdll/tests: Add some tests for Rtl* resources.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 17f625284948a424d63c58e08ad3ef32f8d749f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17f625284948a424d63c58e0… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Oct 27 10:01:20 2021 -0500 ntdll/tests: Add some tests for Rtl* resources. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/sync.c | 164 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/dlls/ntdll/tests/sync.c b/dlls/ntdll/tests/sync.c index 7e389c9762b..f2499ea648a 100644 --- a/dlls/ntdll/tests/sync.c +++ b/dlls/ntdll/tests/sync.c @@ -44,7 +44,12 @@ static NTSTATUS (WINAPI *pNtReleaseSemaphore)( HANDLE, ULONG, ULONG * ); static NTSTATUS (WINAPI *pNtResetEvent)( HANDLE, LONG * ); static NTSTATUS (WINAPI *pNtSetEvent)( HANDLE, LONG * ); static NTSTATUS (WINAPI *pNtWaitForKeyedEvent)( HANDLE, const void *, BOOLEAN, const LARGE_INTEGER * ); +static BOOLEAN (WINAPI *pRtlAcquireResourceExclusive)( RTL_RWLOCK *, BOOLEAN ); +static BOOLEAN (WINAPI *pRtlAcquireResourceShared)( RTL_RWLOCK *, BOOLEAN ); +static void (WINAPI *pRtlDeleteResource)( RTL_RWLOCK * ); +static void (WINAPI *pRtlInitializeResource)( RTL_RWLOCK * ); static void (WINAPI *pRtlInitUnicodeString)( UNICODE_STRING *, const WCHAR * ); +static void (WINAPI *pRtlReleaseResource)( RTL_RWLOCK * ); static NTSTATUS (WINAPI *pRtlWaitOnAddress)( const void *, const void *, SIZE_T, const LARGE_INTEGER * ); static void (WINAPI *pRtlWakeAddressAll)( const void * ); static void (WINAPI *pRtlWakeAddressSingle)( const void * ); @@ -596,6 +601,159 @@ static void test_wait_on_address(void) ok(address == 0, "got %s\n", wine_dbgstr_longlong(address)); } +static HANDLE thread_ready, thread_done; + +static DWORD WINAPI resource_shared_thread(void *arg) +{ + RTL_RWLOCK *resource = arg; + BOOLEAN ret; + + ret = pRtlAcquireResourceShared(resource, TRUE); + ok(ret == TRUE, "got %u\n", ret); + + SetEvent(thread_ready); + ok(!WaitForSingleObject(thread_done, 1000), "wait failed\n"); + pRtlReleaseResource(resource); + return 0; +} + +static DWORD WINAPI resource_exclusive_thread(void *arg) +{ + RTL_RWLOCK *resource = arg; + BOOLEAN ret; + + ret = pRtlAcquireResourceExclusive(resource, TRUE); + ok(ret == TRUE, "got %u\n", ret); + + SetEvent(thread_ready); + ok(!WaitForSingleObject(thread_done, 1000), "wait failed\n"); + pRtlReleaseResource(resource); + return 0; +} + +static void test_resource(void) +{ + HANDLE thread, thread2; + RTL_RWLOCK resource; + BOOLEAN ret; + + pRtlInitializeResource(&resource); + thread_ready = CreateEventA(NULL, FALSE, FALSE, NULL); + thread_done = CreateEventA(NULL, FALSE, FALSE, NULL); + + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == FALSE, "got %u\n", ret); + pRtlReleaseResource(&resource); + pRtlReleaseResource(&resource); + + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + pRtlReleaseResource(&resource); + pRtlReleaseResource(&resource); + + /* Do not acquire the resource ourselves, but spawn a shared thread holding it. */ + + thread = CreateThread(NULL, 0, resource_shared_thread, &resource, 0, NULL); + ok(!WaitForSingleObject(thread_ready, 1000), "wait failed\n"); + + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == FALSE, "got %u\n", ret); + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + + SetEvent(thread_done); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + CloseHandle(thread); + + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + + /* Acquire the resource as exclusive, and then spawn a shared thread. */ + + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + thread = CreateThread(NULL, 0, resource_shared_thread, &resource, 0, NULL); + ok(WaitForSingleObject(thread_ready, 100) == WAIT_TIMEOUT, "expected timeout\n"); + + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + + pRtlReleaseResource(&resource); + ok(!WaitForSingleObject(thread_ready, 1000), "wait failed\n"); + SetEvent(thread_done); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + CloseHandle(thread); + + /* Acquire the resource as shared, and then spawn an exclusive thread. */ + + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + thread = CreateThread(NULL, 0, resource_exclusive_thread, &resource, 0, NULL); + ok(WaitForSingleObject(thread_ready, 100) == WAIT_TIMEOUT, "expected timeout\n"); + + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == FALSE, "got %u\n", ret); + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + + pRtlReleaseResource(&resource); + ok(!WaitForSingleObject(thread_ready, 1000), "wait failed\n"); + SetEvent(thread_done); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + CloseHandle(thread); + + /* Spawn a shared and then exclusive waiter. */ + thread = CreateThread(NULL, 0, resource_shared_thread, &resource, 0, NULL); + ok(!WaitForSingleObject(thread_ready, 1000), "wait failed\n"); + thread2 = CreateThread(NULL, 0, resource_exclusive_thread, &resource, 0, NULL); + ok(WaitForSingleObject(thread_ready, 100) == WAIT_TIMEOUT, "expected timeout\n"); + + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == FALSE, "got %u\n", ret); + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + + SetEvent(thread_done); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + CloseHandle(thread); + + ok(!WaitForSingleObject(thread_ready, 1000), "wait failed\n"); + SetEvent(thread_done); + ok(!WaitForSingleObject(thread2, 1000), "wait failed\n"); + CloseHandle(thread2); + + ret = pRtlAcquireResourceExclusive(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + ret = pRtlAcquireResourceShared(&resource, FALSE); + ok(ret == TRUE, "got %u\n", ret); + pRtlReleaseResource(&resource); + + CloseHandle(thread_ready); + CloseHandle(thread_done); + pRtlDeleteResource(&resource); +} + START_TEST(sync) { HMODULE module = GetModuleHandleA("ntdll.dll"); @@ -618,7 +776,12 @@ START_TEST(sync) pNtResetEvent = (void *)GetProcAddress(module, "NtResetEvent"); pNtSetEvent = (void *)GetProcAddress(module, "NtSetEvent"); pNtWaitForKeyedEvent = (void *)GetProcAddress(module, "NtWaitForKeyedEvent"); + pRtlAcquireResourceExclusive = (void *)GetProcAddress(module, "RtlAcquireResourceExclusive"); + pRtlAcquireResourceShared = (void *)GetProcAddress(module, "RtlAcquireResourceShared"); + pRtlDeleteResource = (void *)GetProcAddress(module, "RtlDeleteResource"); + pRtlInitializeResource = (void *)GetProcAddress(module, "RtlInitializeResource"); pRtlInitUnicodeString = (void *)GetProcAddress(module, "RtlInitUnicodeString"); + pRtlReleaseResource = (void *)GetProcAddress(module, "RtlReleaseResource"); pRtlWaitOnAddress = (void *)GetProcAddress(module, "RtlWaitOnAddress"); pRtlWakeAddressAll = (void *)GetProcAddress(module, "RtlWakeAddressAll"); pRtlWakeAddressSingle = (void *)GetProcAddress(module, "RtlWakeAddressSingle"); @@ -628,4 +791,5 @@ START_TEST(sync) test_mutant(); test_semaphore(); test_keyed_events(); + test_resource(); }

1 0

Eric Pouech : dbghelp: Let StackWalkEx() succeed even when inline mode is requested.
by Alexandre Julliard 27 Oct '21

27 Oct '21

Module: wine Branch: master Commit: 2a0495743b90d7ce00d71ac5703a84d2e48480a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a0495743b90d7ce00d71ac5… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Oct 26 11:45:14 2021 +0200 dbghelp: Let StackWalkEx() succeed even when inline mode is requested. Fallback to regular StackWalk64() behavior. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/stack.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/stack.c b/dlls/dbghelp/stack.c index 6c70fc805cb..a93c454036c 100644 --- a/dlls/dbghelp/stack.c +++ b/dlls/dbghelp/stack.c @@ -298,9 +298,13 @@ BOOL WINAPI StackWalkEx(DWORD MachineType, HANDLE hProcess, HANDLE hThread, } if (frame->InlineFrameContext != INLINE_FRAME_CONTEXT_IGNORE) { - FIXME("Inlined contexts are not supported yet\n"); - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + static BOOL once; + if (!once) + { + FIXME("Inlined contexts are not supported yet\n"); + once = TRUE; + } + frame->InlineFrameContext = INLINE_FRAME_CONTEXT_IGNORE; } csw.hProcess = hProcess;

1 0