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

Georg Lehmann : winevulkan: Update to VK spec version 1.3.213.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: d20d5d0737115537fe76086b17394092c6fe2c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=d20d5d0737115537fe76086b… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue May 10 19:55:24 2022 +0200 winevulkan: Update to VK spec version 1.3.213. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 19 +++++++ dlls/winevulkan/loader_thunks.h | 15 ++++++ dlls/winevulkan/make_vulkan | 6 ++- dlls/winevulkan/vulkan_thunks.c | 91 +++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 16 ++++++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 117 +++++++++++++++++++++++++++++++++++++++- 7 files changed, 263 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d20d5d0737115537fe76…

1 0

Georg Lehmann : winevulkan: Prevent infinite recursion in make_vulkan.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: 3d824d11dbde45299963a758b97d1e417dca36e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3d824d11dbde45299963a758… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue May 10 19:54:35 2022 +0200 winevulkan: Prevent infinite recursion in make_vulkan. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/make_vulkan | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index c26951d06b9..4348201810b 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -2043,6 +2043,8 @@ class VkStruct(Sequence): """ for m in self.members: + if self.name == m.type: + continue if m.needs_alignment(): return True return False @@ -2057,6 +2059,8 @@ class VkStruct(Sequence): return True for m in self.members: + if self.name == m.type: + continue if m.needs_conversion(): return True return False @@ -2065,6 +2069,8 @@ class VkStruct(Sequence): """ Returns if struct members need unwrapping of handle. """ for m in self.members: + if self.name == m.type: + continue if m.needs_unwrapping(): return True return False @@ -2073,11 +2079,11 @@ class VkStruct(Sequence): """ Check if any struct member needs some memory freeing.""" for m in self.members: + if self.name == m.type: + continue if m.needs_free(): return True - continue - return False def needs_struct_extensions_conversion(self): @@ -3350,7 +3356,7 @@ class VkRegistry(object): if "data" in type_info: types[m.type]["data"].required = True - if type_info["category"] == "struct": + if type_info["category"] == "struct" and struct.name != m.type: # Yay, recurse mark_struct_dependencies(type_info["data"], types) elif type_info["category"] == "funcpointer":

1 0

Rémi Bernon : dinput/tests: Wait for the expected report to actually be pending.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: 606dc246ff0e6ac710288e4d9dc2fcf55568b1af URL: https://source.winehq.org/git/wine.git/?a=commit;h=606dc246ff0e6ac710288e4d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 15:10:03 2022 +0200 dinput/tests: Wait for the expected report to actually be pending. There is a race otherwise where we try to complete a pending IRP but because the async is writing the report from another thread we didn't find it and instead ignored it. Instead we need to atomically check if there was a pending IRP, and if the queue is empty, or queue the wait. Later, when a report is going to be marked as pending, and if there's someone waiting for it already, we instead complete it immediately. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/tests/dinput_test.h | 5 +++-- dlls/dinput/tests/driver_bus.c | 45 ++++++++++++++++++++++++++++---------- dlls/dinput/tests/driver_hid.h | 7 +++++- dlls/dinput/tests/force_feedback.c | 4 ++-- dlls/dinput/tests/hid.c | 6 +++-- 5 files changed, 48 insertions(+), 19 deletions(-) diff --git a/dlls/dinput/tests/dinput_test.h b/dlls/dinput/tests/dinput_test.h index 0adbd0b1ac8..c4ee42ca1c8 100644 --- a/dlls/dinput/tests/dinput_test.h +++ b/dlls/dinput/tests/dinput_test.h @@ -103,8 +103,9 @@ BOOL sync_ioctl_( const char *file, int line, HANDLE device, DWORD code, void *i #define set_hid_expect( a, b, c ) set_hid_expect_( __FILE__, __LINE__, a, b, c ) void set_hid_expect_( const char *file, int line, HANDLE device, struct hid_expect *expect, DWORD expect_size ); -#define wait_hid_expect( a, b ) wait_hid_expect_( __FILE__, __LINE__, a, b, FALSE ) -void wait_hid_expect_( const char *file, int line, HANDLE device, DWORD timeout, BOOL todo ); +#define wait_hid_expect( a, b ) wait_hid_expect_( __FILE__, __LINE__, a, b, FALSE, FALSE ) +#define wait_hid_pending( a, b ) wait_hid_expect_( __FILE__, __LINE__, a, b, TRUE, FALSE ) +void wait_hid_expect_( const char *file, int line, HANDLE device, DWORD timeout, BOOL wait_pending, BOOL todo ); #define send_hid_input( a, b, c ) send_hid_input_( __FILE__, __LINE__, a, b, c ) void send_hid_input_( const char *file, int line, HANDLE device, struct hid_expect *expect, DWORD expect_size ); diff --git a/dlls/dinput/tests/driver_bus.c b/dlls/dinput/tests/driver_bus.c index 6554d50c14b..6a1994e509c 100644 --- a/dlls/dinput/tests/driver_bus.c +++ b/dlls/dinput/tests/driver_bus.c @@ -188,26 +188,34 @@ static NTSTATUS expect_queue_add_pending( struct expect_queue *queue, IRP *irp ) return status; } -static void expect_queue_clear_pending( struct expect_queue *queue ) +/* complete an expect report previously marked as pending, or wait for one and then for the queue to empty */ +static NTSTATUS expect_queue_wait_pending( struct expect_queue *queue, IRP *irp ) { + NTSTATUS status; + IRP *pending; KIRQL irql; - IRP *irp; KeAcquireSpinLock( &queue->lock, &irql ); - if ((irp = queue->pending_wait)) + if ((pending = queue->pending_wait)) { queue->pending_wait = NULL; - if (!IoSetCancelRoutine( irp, NULL )) irp = NULL; + if (!IoSetCancelRoutine( pending, NULL )) pending = NULL; } + + if (pending && queue->pos == queue->end) status = STATUS_SUCCESS; + else status = expect_queue_add_pending_locked( queue, irp ); KeReleaseSpinLock( &queue->lock, irql ); - if (irp) + if (pending) { - irp->IoStatus.Status = STATUS_SUCCESS; - IoCompleteRequest( irp, IO_NO_INCREMENT ); + pending->IoStatus.Status = STATUS_SUCCESS; + IoCompleteRequest( pending, IO_NO_INCREMENT ); } + + return status; } +/* wait for the expect queue to empty */ static NTSTATUS expect_queue_wait( struct expect_queue *queue, IRP *irp ) { NTSTATUS status; @@ -257,11 +265,21 @@ static void expect_queue_next( struct expect_queue *queue, ULONG code, HID_XFER_ if (running_under_wine || !queue->pos->wine_only) break; queue->pos++; } - if (queue->pos == queue->end && (irp = queue->pending_wait)) + + if ((irp = queue->pending_wait)) { - queue->pending_wait = NULL; - if (!IoSetCancelRoutine( irp, NULL )) irp = NULL; + /* don't mark the IRP as pending if someone's already waiting */ + if (expect->ret_status == STATUS_PENDING) expect->ret_status = STATUS_SUCCESS; + + /* complete the pending wait IRP if the queue is now empty */ + if (queue->pos != queue->end) irp = NULL; + else + { + queue->pending_wait = NULL; + if (!IoSetCancelRoutine( irp, NULL )) irp = NULL; + } } + memcpy( context, queue->context, context_size ); KeReleaseSpinLock( &queue->lock, irql ); @@ -1244,9 +1262,12 @@ static NTSTATUS WINAPI pdo_ioctl( DEVICE_OBJECT *device, IRP *irp ) status = STATUS_SUCCESS; break; case IOCTL_WINETEST_HID_WAIT_EXPECT: - expect_queue_clear_pending( &impl->expect_queue ); - status = expect_queue_wait( &impl->expect_queue, irp ); + { + struct wait_expect_params wait_params = *(struct wait_expect_params *)irp->AssociatedIrp.SystemBuffer; + if (!wait_params.wait_pending) status = expect_queue_wait( &impl->expect_queue, irp ); + else status = expect_queue_wait_pending( &impl->expect_queue, irp ); break; + } case IOCTL_WINETEST_HID_SEND_INPUT: input_queue_reset( &impl->input_queue, irp->AssociatedIrp.SystemBuffer, in_size ); status = STATUS_SUCCESS; diff --git a/dlls/dinput/tests/driver_hid.h b/dlls/dinput/tests/driver_hid.h index 4711d391bfe..c5641097df3 100644 --- a/dlls/dinput/tests/driver_hid.h +++ b/dlls/dinput/tests/driver_hid.h @@ -42,7 +42,7 @@ DEFINE_GUID(control_class,0xdeadbeef,0x29ef,0x4538,0xa5,0xfd,0xb6,0x95,0x73,0xa3,0x62,0xc0); #define IOCTL_WINETEST_HID_SET_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x800, METHOD_IN_DIRECT, FILE_ANY_ACCESS) -#define IOCTL_WINETEST_HID_WAIT_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x801, METHOD_NEITHER, FILE_ANY_ACCESS) +#define IOCTL_WINETEST_HID_WAIT_EXPECT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x801, METHOD_IN_DIRECT, FILE_ANY_ACCESS) #define IOCTL_WINETEST_HID_SEND_INPUT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x802, METHOD_IN_DIRECT, FILE_ANY_ACCESS) #define IOCTL_WINETEST_HID_SET_CONTEXT CTL_CODE(FILE_DEVICE_KEYBOARD, 0x803, METHOD_IN_DIRECT, FILE_ANY_ACCESS) #define IOCTL_WINETEST_CREATE_DEVICE CTL_CODE(FILE_DEVICE_KEYBOARD, 0x804, METHOD_IN_DIRECT, FILE_ANY_ACCESS) @@ -61,6 +61,11 @@ struct hid_expect BYTE report_buf[128]; }; +struct wait_expect_params +{ + BOOL wait_pending; +}; + /* create/remove device */ #define MAX_HID_DESCRIPTOR_LEN 2048 diff --git a/dlls/dinput/tests/force_feedback.c b/dlls/dinput/tests/force_feedback.c index f5b387f3566..976b1b93863 100644 --- a/dlls/dinput/tests/force_feedback.c +++ b/dlls/dinput/tests/force_feedback.c @@ -5536,7 +5536,7 @@ static void test_windows_gaming_input(void) ok( !bool_async_handler.invoked, "handler invoked\n" ); IAsyncInfo_Release( async_info ); - wait_hid_expect( file, 100 ); + wait_hid_pending( file, 100 ); ret = WaitForSingleObject( bool_async_handler.event, 100 ); ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); CloseHandle( bool_async_handler.event ); @@ -5581,7 +5581,7 @@ static void test_windows_gaming_input(void) ok( !bool_async_handler.invoked, "handler invoked\n" ); IAsyncInfo_Release( async_info ); - wait_hid_expect( file, 500 ); + wait_hid_pending( file, 100 ); ret = WaitForSingleObject( bool_async_handler.event, 100 ); ok( ret == 0, "WaitForSingleObject returned %#lx\n", ret ); CloseHandle( bool_async_handler.event ); diff --git a/dlls/dinput/tests/hid.c b/dlls/dinput/tests/hid.c index 7e2d9cf86cf..00a3d65fe4d 100644 --- a/dlls/dinput/tests/hid.c +++ b/dlls/dinput/tests/hid.c @@ -911,10 +911,12 @@ void set_hid_expect_( const char *file, int line, HANDLE device, struct hid_expe ok_(file, line)( ret, "IOCTL_WINETEST_HID_SET_EXPECT failed, last error %lu\n", GetLastError() ); } -void wait_hid_expect_( const char *file, int line, HANDLE device, DWORD timeout, BOOL todo ) +void wait_hid_expect_( const char *file, int line, HANDLE device, DWORD timeout, BOOL wait_pending, BOOL todo ) { + struct wait_expect_params params = {.wait_pending = wait_pending}; + todo_wine_if(todo) { - BOOL ret = sync_ioctl_( file, line, device, IOCTL_WINETEST_HID_WAIT_EXPECT, NULL, 0, NULL, 0, timeout ); + BOOL ret = sync_ioctl_( file, line, device, IOCTL_WINETEST_HID_WAIT_EXPECT, &params, sizeof(params), NULL, 0, timeout ); ok_(file, line)( ret, "IOCTL_WINETEST_HID_WAIT_EXPECT failed, last error %lu\n", GetLastError() ); }

1 0

Rémi Bernon : winegstreamer: Move MFT registration list out of static scope.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: 529efbb4c91365f2f555b3c09ffda946f3843f5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=529efbb4c91365f2f555b3c0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed Apr 27 09:19:21 2022 +0200 winegstreamer: Move MFT registration list out of static scope. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 178 ++++++++++++++++++++------------------------ 1 file changed, 79 insertions(+), 99 deletions(-) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 4b177f79924..395b4239924 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -437,114 +437,93 @@ HRESULT mfplat_get_class_object(REFCLSID rclsid, REFIID riid, void **obj) return CLASS_E_CLASSNOTAVAILABLE; } -static WCHAR audio_converterW[] = L"Audio Converter"; -static const GUID *const audio_converter_supported_types[] = +HRESULT mfplat_DllRegisterServer(void) { - &MFAudioFormat_PCM, - &MFAudioFormat_Float, -}; + MFT_REGISTER_TYPE_INFO audio_converter_supported_types[] = + { + {MFMediaType_Audio, MFAudioFormat_PCM}, + {MFMediaType_Audio, MFAudioFormat_Float}, + }; -static WCHAR wma_decoderW[] = L"WMAudio Decoder MFT"; -static const GUID *const wma_decoder_input_types[] = -{ - &MEDIASUBTYPE_MSAUDIO1, - &MFAudioFormat_WMAudioV8, - &MFAudioFormat_WMAudioV9, - &MFAudioFormat_WMAudio_Lossless, -}; -static const GUID *const wma_decoder_output_types[] = -{ - &MFAudioFormat_PCM, - &MFAudioFormat_Float, -}; + MFT_REGISTER_TYPE_INFO wma_decoder_input_types[] = + { + {MFMediaType_Audio, MEDIASUBTYPE_MSAUDIO1}, + {MFMediaType_Audio, MFAudioFormat_WMAudioV8}, + {MFMediaType_Audio, MFAudioFormat_WMAudioV9}, + {MFMediaType_Audio, MFAudioFormat_WMAudio_Lossless}, + }; + MFT_REGISTER_TYPE_INFO wma_decoder_output_types[] = + { + {MFMediaType_Audio, MFAudioFormat_PCM}, + {MFMediaType_Audio, MFAudioFormat_Float}, + }; -static WCHAR h264_decoderW[] = L"Microsoft H264 Video Decoder MFT"; -static const GUID *const h264_decoder_input_types[] = -{ - &MFVideoFormat_H264, - &MFVideoFormat_H264_ES, -}; -static const GUID *const h264_decoder_output_types[] = -{ - &MFVideoFormat_NV12, - &MFVideoFormat_YV12, - &MFVideoFormat_IYUV, - &MFVideoFormat_I420, - &MFVideoFormat_YUY2, -}; + MFT_REGISTER_TYPE_INFO h264_decoder_input_types[] = + { + {MFMediaType_Video, MFVideoFormat_H264}, + {MFMediaType_Video, MFVideoFormat_H264_ES}, + }; + MFT_REGISTER_TYPE_INFO h264_decoder_output_types[] = + { + {MFMediaType_Video, MFVideoFormat_NV12}, + {MFMediaType_Video, MFVideoFormat_YV12}, + {MFMediaType_Video, MFVideoFormat_IYUV}, + {MFMediaType_Video, MFVideoFormat_I420}, + {MFMediaType_Video, MFVideoFormat_YUY2}, + }; -static const struct mft -{ - const GUID *clsid; - const GUID *category; - LPWSTR name; - const UINT32 flags; - const GUID *major_type; - const UINT32 input_types_count; - const GUID *const *input_types; - const UINT32 output_types_count; - const GUID *const *output_types; -} -mfts[] = -{ - { - &CLSID_WINEAudioConverter, - &MFT_CATEGORY_AUDIO_EFFECT, - audio_converterW, - MFT_ENUM_FLAG_SYNCMFT, - &MFMediaType_Audio, - ARRAY_SIZE(audio_converter_supported_types), - audio_converter_supported_types, - ARRAY_SIZE(audio_converter_supported_types), - audio_converter_supported_types, - }, - { - &CLSID_WMADecMediaObject, - &MFT_CATEGORY_AUDIO_DECODER, - wma_decoderW, - MFT_ENUM_FLAG_SYNCMFT, - &MFMediaType_Audio, - ARRAY_SIZE(wma_decoder_input_types), - wma_decoder_input_types, - ARRAY_SIZE(wma_decoder_output_types), - wma_decoder_output_types, - }, - { - &CLSID_MSH264DecoderMFT, - &MFT_CATEGORY_VIDEO_DECODER, - h264_decoderW, - MFT_ENUM_FLAG_SYNCMFT, - &MFMediaType_Video, - ARRAY_SIZE(h264_decoder_input_types), - h264_decoder_input_types, - ARRAY_SIZE(h264_decoder_output_types), - h264_decoder_output_types, - }, -}; + struct mft + { + GUID clsid; + GUID category; + WCHAR name[MAX_PATH]; + UINT32 flags; + UINT32 input_types_count; + MFT_REGISTER_TYPE_INFO *input_types; + UINT32 output_types_count; + MFT_REGISTER_TYPE_INFO *output_types; + } + mfts[] = + { + { + CLSID_WINEAudioConverter, + MFT_CATEGORY_AUDIO_EFFECT, + L"Audio Converter", + MFT_ENUM_FLAG_SYNCMFT, + ARRAY_SIZE(audio_converter_supported_types), + audio_converter_supported_types, + ARRAY_SIZE(audio_converter_supported_types), + audio_converter_supported_types, + }, + { + CLSID_WMADecMediaObject, + MFT_CATEGORY_AUDIO_DECODER, + L"WMAudio Decoder MFT", + MFT_ENUM_FLAG_SYNCMFT, + ARRAY_SIZE(wma_decoder_input_types), + wma_decoder_input_types, + ARRAY_SIZE(wma_decoder_output_types), + wma_decoder_output_types, + }, + { + CLSID_MSH264DecoderMFT, + MFT_CATEGORY_VIDEO_DECODER, + L"Microsoft H264 Video Decoder MFT", + MFT_ENUM_FLAG_SYNCMFT, + ARRAY_SIZE(h264_decoder_input_types), + h264_decoder_input_types, + ARRAY_SIZE(h264_decoder_output_types), + h264_decoder_output_types, + }, + }; -HRESULT mfplat_DllRegisterServer(void) -{ - unsigned int i, j; + unsigned int i; HRESULT hr; - MFT_REGISTER_TYPE_INFO input_types[4], output_types[5]; for (i = 0; i < ARRAY_SIZE(mfts); i++) { - const struct mft *cur = &mfts[i]; - - for (j = 0; j < cur->input_types_count; j++) - { - input_types[j].guidMajorType = *(cur->major_type); - input_types[j].guidSubtype = *(cur->input_types[j]); - } - for (j = 0; j < cur->output_types_count; j++) - { - output_types[j].guidMajorType = *(cur->major_type); - output_types[j].guidSubtype = *(cur->output_types[j]); - } - - hr = MFTRegister(*(cur->clsid), *(cur->category), cur->name, cur->flags, cur->input_types_count, - input_types, cur->output_types_count, output_types, NULL); + hr = MFTRegister(mfts[i].clsid, mfts[i].category, mfts[i].name, mfts[i].flags, mfts[i].input_types_count, + mfts[i].input_types, mfts[i].output_types_count, mfts[i].output_types, NULL); if (FAILED(hr)) { @@ -552,6 +531,7 @@ HRESULT mfplat_DllRegisterServer(void) return hr; } } + return S_OK; }

1 0

Rémi Bernon : mf/tests: Tweak topology loader tests results based on the video processor presence.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: bd527c1946cc92dfeee072542815e71b2e3d1861 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd527c1946cc92dfeee07254… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 09:17:50 2022 +0200 mf/tests: Tweak topology loader tests results based on the video processor presence. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index a32005863d3..cc6bec40234 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -65,6 +65,7 @@ DEFINE_GUID(DMOVideoFormat_RGB8, D3DFMT_P8, 0x524f, 0x11ce, 0x9f, 0x53, 0x00, 0x static HRESULT (WINAPI *pMFCreateSampleCopierMFT)(IMFTransform **copier); static HRESULT (WINAPI *pMFGetTopoNodeCurrentType)(IMFTopologyNode *node, DWORD stream, BOOL output, IMFMediaType **type); +static BOOL has_video_processor; static BOOL is_vista(void) { return !pMFGetTopoNodeCurrentType; @@ -1885,6 +1886,7 @@ enum loader_test_flags LOADER_EXPECTED_DECODER = 0x1, LOADER_EXPECTED_CONVERTER = 0x2, LOADER_TODO = 0x4, + LOADER_NEEDS_VIDEO_PROCESSOR = 0x8, }; static void test_topology_loader(void) @@ -1972,7 +1974,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_CONVERTER, S_OK, - LOADER_EXPECTED_CONVERTER | LOADER_TODO, + LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_EXPECTED_CONVERTER | LOADER_TODO, }, { @@ -2021,7 +2023,7 @@ static void test_topology_loader(void) MF_CONNECT_ALLOW_CONVERTER, MF_E_TRANSFORM_NOT_POSSIBLE_FOR_CURRENT_MEDIATYPE_COMBINATION, - LOADER_TODO, + LOADER_NEEDS_VIDEO_PROCESSOR | LOADER_TODO, }, { @@ -2185,9 +2187,14 @@ static void test_topology_loader(void) ok(!count, "Unexpected count %u.\n", count); hr = IMFTopoLoader_Load(loader, topology, &full_topology, NULL); - todo_wine_if(test->flags & LOADER_TODO) - ok(hr == test->expected_result, "Unexpected hr %#lx on test %u.\n", hr, i); - ok(full_topology != topology, "Unexpected instance.\n"); + if (test->flags & LOADER_NEEDS_VIDEO_PROCESSOR && !has_video_processor) + ok(hr == MF_E_INVALIDMEDIATYPE, "Unexpected hr %#lx on test %u.\n", hr, i); + else + { + todo_wine_if(test->flags & LOADER_TODO) + ok(hr == test->expected_result, "Unexpected hr %#lx on test %u.\n", hr, i); + ok(full_topology != topology, "Unexpected instance.\n"); + } if (test->expected_result == S_OK && hr == S_OK) { @@ -3629,6 +3636,7 @@ static void test_video_processor(void) transform_inputs, ARRAY_SIZE(transform_inputs), transform_outputs, ARRAY_SIZE(transform_outputs), &transform, &CLSID_VideoProcessorMFT, &class_id)) goto failed; + has_video_processor = TRUE; todo_wine check_interface(transform, &IID_IMFVideoProcessorControl, TRUE); @@ -8183,6 +8191,7 @@ START_TEST(mf) return; } + test_video_processor(); test_topology(); test_topology_tee_node(); test_topology_loader(); @@ -8195,7 +8204,6 @@ START_TEST(mf) test_presentation_clock(); test_sample_grabber(); test_sample_grabber_is_mediatype_supported(); - test_video_processor(); test_quality_manager(); test_sar(); test_evr();

1 0

Rémi Bernon : mf/tests: Update a broken IMFMediaSink_AddStreamSink result check.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: b7fa00be65363132f1fd8686bfa0a81b394c0dba URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7fa00be65363132f1fd8686… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 09:18:43 2022 +0200 mf/tests: Update a broken IMFMediaSink_AddStreamSink result check. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/tests/mf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index cc6bec40234..8f2c050e3c6 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -4821,7 +4821,7 @@ todo_wine { /* Same test for a substream. */ hr = IMFMediaSink_AddStreamSink(sink, 1, NULL, &stream_sink2); - ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); + ok(hr == S_OK || broken(hr == E_INVALIDARG), "Unexpected hr %#lx.\n", hr); if (SUCCEEDED(hr)) {

1 0

Jinoh Kang : wineusb.sys: Remove erroneous call to LeaveCriticalSection() in add_usb_device.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: 2c83ec801d228a54ed297809fec5b63c98054f4c URL: https://source.winehq.org/git/wine.git/?a=commit;h=2c83ec801d228a54ed297809… Author: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Date: Sat May 7 17:34:29 2022 +0900 wineusb.sys: Remove erroneous call to LeaveCriticalSection() in add_usb_device. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineusb.sys/wineusb.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/wineusb.sys/wineusb.c b/dlls/wineusb.sys/wineusb.c index cca0257bb02..c41ea580137 100644 --- a/dlls/wineusb.sys/wineusb.c +++ b/dlls/wineusb.sys/wineusb.c @@ -114,7 +114,6 @@ static void add_usb_device(libusb_device *libusb_device) FILE_DEVICE_USB, 0, FALSE, &device_obj))) { ERR("Failed to create device, status %#x.\n", status); - LeaveCriticalSection(&wineusb_cs); libusb_close(handle); return; }

1 0

Nikolay Sivov : evr/sample: Avoid a race condition when releasing a tracked sample.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: ce71f5a05f226b3f68328d4632cd78ac9440d073 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce71f5a05f226b3f68328d46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue May 10 19:16:17 2022 +0300 evr/sample: Avoid a race condition when releasing a tracked sample. Same as b1807751219e256867eaac5cc4d8b97a5482978f. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/sample.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/evr/sample.c b/dlls/evr/sample.c index 1d29b6cdc2c..738f803fe66 100644 --- a/dlls/evr/sample.c +++ b/dlls/evr/sample.c @@ -920,19 +920,21 @@ static ULONG WINAPI video_sample_AddRef(IMFSample *iface) static ULONG WINAPI video_sample_Release(IMFSample *iface) { struct video_sample *sample = impl_from_IMFSample(iface); - ULONG refcount; + ULONG refcount = InterlockedDecrement(&sample->refcount); + IMFAsyncResult *tracked_result = NULL; IMFSample_LockStore(sample->sample); - if (sample->tracked_result && sample->tracked_refcount == (sample->refcount - 1)) + if (sample->tracked_result && sample->tracked_refcount == refcount) { - video_sample_tracking_thread_invoke(sample->tracked_result); - IMFAsyncResult_Release(sample->tracked_result); + tracked_result = sample->tracked_result; + video_sample_tracking_thread_invoke(tracked_result); sample->tracked_result = NULL; sample->tracked_refcount = 0; } IMFSample_UnlockStore(sample->sample); - refcount = InterlockedDecrement(&sample->refcount); + if (tracked_result) + IMFAsyncResult_Release(tracked_result); TRACE("%p, refcount %lu.\n", iface, refcount);

1 0

Rémi Bernon : winegstreamer: Register the video processor transform.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: fc2128d7fcd869b238932d50f034b8ff3e8be65c URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc2128d7fcd869b238932d50… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 6 09:46:48 2022 +0200 winegstreamer: Register the video processor transform. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/mfplat.c | 60 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 395b4239924..2e53afb0542 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -472,6 +472,56 @@ HRESULT mfplat_DllRegisterServer(void) {MFMediaType_Video, MFVideoFormat_YUY2}, }; + MFT_REGISTER_TYPE_INFO video_processor_input_types[] = + { + {MFMediaType_Video, MFVideoFormat_IYUV}, + {MFMediaType_Video, MFVideoFormat_YV12}, + {MFMediaType_Video, MFVideoFormat_NV12}, + {MFMediaType_Video, MFVideoFormat_YUY2}, + {MFMediaType_Video, MFVideoFormat_ARGB32}, + {MFMediaType_Video, MFVideoFormat_RGB32}, + {MFMediaType_Video, MFVideoFormat_NV11}, + {MFMediaType_Video, MFVideoFormat_AYUV}, + {MFMediaType_Video, MFVideoFormat_UYVY}, + {MFMediaType_Video, MEDIASUBTYPE_P208}, + {MFMediaType_Video, MFVideoFormat_RGB24}, + {MFMediaType_Video, MFVideoFormat_RGB555}, + {MFMediaType_Video, MFVideoFormat_RGB565}, + {MFMediaType_Video, MFVideoFormat_RGB8}, + {MFMediaType_Video, MFVideoFormat_I420}, + {MFMediaType_Video, MFVideoFormat_Y216}, + {MFMediaType_Video, MFVideoFormat_v410}, + {MFMediaType_Video, MFVideoFormat_Y41P}, + {MFMediaType_Video, MFVideoFormat_Y41T}, + {MFMediaType_Video, MFVideoFormat_Y42T}, + {MFMediaType_Video, MFVideoFormat_YVYU}, + {MFMediaType_Video, MFVideoFormat_420O}, + }; + MFT_REGISTER_TYPE_INFO video_processor_output_types[] = + { + {MFMediaType_Video, MFVideoFormat_IYUV}, + {MFMediaType_Video, MFVideoFormat_YV12}, + {MFMediaType_Video, MFVideoFormat_NV12}, + {MFMediaType_Video, MFVideoFormat_YUY2}, + {MFMediaType_Video, MFVideoFormat_ARGB32}, + {MFMediaType_Video, MFVideoFormat_RGB32}, + {MFMediaType_Video, MFVideoFormat_NV11}, + {MFMediaType_Video, MFVideoFormat_AYUV}, + {MFMediaType_Video, MFVideoFormat_UYVY}, + {MFMediaType_Video, MEDIASUBTYPE_P208}, + {MFMediaType_Video, MFVideoFormat_RGB24}, + {MFMediaType_Video, MFVideoFormat_RGB555}, + {MFMediaType_Video, MFVideoFormat_RGB565}, + {MFMediaType_Video, MFVideoFormat_RGB8}, + {MFMediaType_Video, MFVideoFormat_I420}, + {MFMediaType_Video, MFVideoFormat_Y216}, + {MFMediaType_Video, MFVideoFormat_v410}, + {MFMediaType_Video, MFVideoFormat_Y41P}, + {MFMediaType_Video, MFVideoFormat_Y41T}, + {MFMediaType_Video, MFVideoFormat_Y42T}, + {MFMediaType_Video, MFVideoFormat_YVYU}, + }; + struct mft { GUID clsid; @@ -515,6 +565,16 @@ HRESULT mfplat_DllRegisterServer(void) ARRAY_SIZE(h264_decoder_output_types), h264_decoder_output_types, }, + { + CLSID_VideoProcessorMFT, + MFT_CATEGORY_VIDEO_PROCESSOR, + L"Microsoft Video Processor MFT", + MFT_ENUM_FLAG_SYNCMFT, + ARRAY_SIZE(video_processor_input_types), + video_processor_input_types, + ARRAY_SIZE(video_processor_output_types), + video_processor_output_types, + }, }; unsigned int i;

1 0

Andrew Eikum : mfplat: Allow NULL length pointer in IMFAttributes::GetAllocatedString.
by Alexandre Julliard May 11, 2022

May 11, 2022

Module: wine Branch: master Commit: ca10760d2e7ea4f8718741592fd639f589247e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca10760d2e7ea4f871874159… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon May 9 10:56:29 2022 -0500 mfplat: Allow NULL length pointer in IMFAttributes::GetAllocatedString. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 3 ++- dlls/mfplat/tests/mfplat.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index cee052defeb..08195bca448 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -2670,7 +2670,8 @@ HRESULT attributes_GetAllocatedString(struct attributes *attributes, REFGUID key if (SUCCEEDED(hr)) { *value = attrval.pwszVal; - *length = lstrlenW(*value); + if (length) + *length = lstrlenW(*value); } return hr; diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index 8d21f2ed60e..8f18fcb293d 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -1638,6 +1638,11 @@ static void test_attributes(void) ok(hr == S_OK, "Failed to get string length, hr %#lx.\n", hr); ok(string_length == lstrlenW(stringW), "Unexpected length %u.\n", string_length); + hr = IMFAttributes_GetAllocatedString(attributes, &DUMMY_GUID1, &string, NULL); + ok(hr == S_OK, "Failed to get allocated string, hr %#lx.\n", hr); + ok(!lstrcmpW(string, stringW), "Unexpected string %s.\n", wine_dbgstr_w(string)); + CoTaskMemFree(string); + string_length = 0xdeadbeef; hr = IMFAttributes_GetAllocatedString(attributes, &DUMMY_GUID1, &string, &string_length); ok(hr == S_OK, "Failed to get allocated string, hr %#lx.\n", hr);

1 0