August 2022 - Wine-commits - list.winehq.org

Jacek Caban : win32u: Support wow64 in NtAllocateVirtualMemory calls.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 149e7502400e24d27fe3f9159d2a936af71c7a19 URL: https://gitlab.winehq.org/wine/wine/-/commit/149e7502400e24d27fe3f9159d2a93… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 02:51:49 2022 +0200 win32u: Support wow64 in NtAllocateVirtualMemory calls. --- dlls/win32u/dc.c | 4 ++-- dlls/win32u/dib.c | 4 ++-- dlls/win32u/gdiobj.c | 4 ++-- dlls/win32u/win32u_private.h | 9 +++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/win32u/dc.c b/dlls/win32u/dc.c index 131927a4707..a8c651dd28f 100644 --- a/dlls/win32u/dc.c +++ b/dlls/win32u/dc.c @@ -112,8 +112,8 @@ static DC_ATTR *alloc_dc_attr(void) { SIZE_T size = system_info.AllocationGranularity; bucket->entries = NULL; - if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, 0, &size, - MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE )) + if (!NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&bucket->entries, zero_bits(), + &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) { bucket->next_free = NULL; bucket->next_unused = bucket->entries + 1; diff --git a/dlls/win32u/dib.c b/dlls/win32u/dib.c index 7a6df3da7cc..e7a5a50e201 100644 --- a/dlls/win32u/dib.c +++ b/dlls/win32u/dib.c @@ -1548,8 +1548,8 @@ HBITMAP WINAPI NtGdiCreateDIBSection( HDC hdc, HANDLE section, DWORD offset, con { SIZE_T size = bmp->dib.dsBmih.biSizeImage; offset = 0; - if (NtAllocateVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, 0, &size, - MEM_RESERVE|MEM_COMMIT, PAGE_READWRITE )) + if (NtAllocateVirtualMemory( GetCurrentProcess(), &bmp->dib.dsBm.bmBits, zero_bits(), + &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) goto error; } bmp->dib.dshSection = section; diff --git a/dlls/win32u/gdiobj.c b/dlls/win32u/gdiobj.c index aaeed2ba676..e42d076bc5b 100644 --- a/dlls/win32u/gdiobj.c +++ b/dlls/win32u/gdiobj.c @@ -566,8 +566,8 @@ static void init_gdi_shared(void) { SIZE_T size = sizeof(*gdi_shared); - if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, 0, &size, - MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) + if (NtAllocateVirtualMemory( GetCurrentProcess(), (void **)&gdi_shared, zero_bits(), + &size, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE )) return; next_unused = gdi_shared->Handles + FIRST_GDI_HANDLE; diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index d4b86d1e6a9..6d492f2e73b 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -494,6 +494,15 @@ static inline BOOL is_win9x(void) return NtCurrentTeb()->Peb->OSPlatformId == VER_PLATFORM_WIN32s; } +static inline ULONG_PTR zero_bits(void) +{ +#ifdef _WIN64 + return !NtCurrentTeb()->WowTebOffset ? 0 : 0x7fffffff; +#else + return 0; +#endif +} + static inline const char *debugstr_us( const UNICODE_STRING *us ) { if (!us) return "<null>";

1 0

Jacek Caban : win32u: Use platform-independent layout for ntuser_thread_info.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 1e9390e558d02652d245353b9e4e3037451c6c30 URL: https://gitlab.winehq.org/wine/wine/-/commit/1e9390e558d02652d245353b9e4e30… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 03:09:47 2022 +0200 win32u: Use platform-independent layout for ntuser_thread_info. --- dlls/imm32/imm.c | 8 ++++---- dlls/user32/message.c | 15 ++++++++++----- dlls/user32/user_main.c | 2 +- dlls/user32/win.c | 8 ++++---- dlls/win32u/driver.c | 2 +- dlls/win32u/imm.c | 7 ++++--- dlls/win32u/window.c | 17 ++++++++++------- dlls/win32u/winstation.c | 15 ++++++++------- dlls/wineandroid.drv/device.c | 4 ++-- dlls/winemac.drv/macdrv.h | 2 +- dlls/winemac.drv/macdrv_main.c | 2 +- dlls/winex11.drv/x11drv.h | 2 +- dlls/winex11.drv/x11drv_main.c | 4 ++-- include/ntuser.h | 14 +++++++------- 14 files changed, 56 insertions(+), 46 deletions(-)

1 0

Jacek Caban : win32u: Store thread info in 64-bit TEB on wow64.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 8bb71922a555d6346f1652b52866ed02025f9f01 URL: https://gitlab.winehq.org/wine/wine/-/commit/8bb71922a555d6346f1652b52866ed… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 12:49:51 2022 +0200 win32u: Store thread info in 64-bit TEB on wow64. --- dlls/win32u/ntuser_private.h | 5 +++++ dlls/win32u/win32u_private.h | 5 ----- include/ntuser.h | 7 +++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/win32u/ntuser_private.h b/dlls/win32u/ntuser_private.h index 3b74a2ae83a..1be8eed3020 100644 --- a/dlls/win32u/ntuser_private.h +++ b/dlls/win32u/ntuser_private.h @@ -138,6 +138,11 @@ struct user_thread_info C_ASSERT( sizeof(struct user_thread_info) <= sizeof(((TEB *)0)->Win32ClientInfo) ); +static inline struct user_thread_info *get_user_thread_info(void) +{ + return CONTAINING_RECORD( NtUserGetThreadInfo(), struct user_thread_info, client_info ); +} + struct user_key_state_info { UINT time; /* Time of last key state refresh */ diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index 6d492f2e73b..eb215519643 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -432,11 +432,6 @@ extern void reg_delete_value( HKEY hkey, const WCHAR *name ) DECLSPEC_HIDDEN; extern HKEY hkcu_key DECLSPEC_HIDDEN; -static inline struct user_thread_info *get_user_thread_info(void) -{ - return (struct user_thread_info *)NtCurrentTeb()->Win32ClientInfo; -} - extern const struct user_driver_funcs *user_driver DECLSPEC_HIDDEN; static inline BOOL set_ntstatus( NTSTATUS status ) diff --git a/include/ntuser.h b/include/ntuser.h index 84cb7fdb9b8..f15ba1f135e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -78,6 +78,13 @@ struct ntuser_thread_info static inline struct ntuser_thread_info *NtUserGetThreadInfo(void) { +#ifndef _WIN64 + if (NtCurrentTeb()->GdiBatchCount) + { + TEB64 *teb64 = (TEB64 *)(UINT_PTR)NtCurrentTeb()->GdiBatchCount; + return (struct ntuser_thread_info *)teb64->Win32ClientInfo; + } +#endif return (struct ntuser_thread_info *)NtCurrentTeb()->Win32ClientInfo; }

1 0

Tim Clem : ntdll: Fix leak of mach_thread_self port.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 317085fde560d99c5a9fc89d449502f1834edbdb URL: https://gitlab.winehq.org/wine/wine/-/commit/317085fde560d99c5a9fc89d449502… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Aug 8 10:06:44 2022 -0700 ntdll: Fix leak of mach_thread_self port. --- dlls/ntdll/unix/signal_x86_64.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c index 1c2db47c95d..88c517daecf 100644 --- a/dlls/ntdll/unix/signal_x86_64.c +++ b/dlls/ntdll/unix/signal_x86_64.c @@ -3052,7 +3052,10 @@ static void *mac_thread_gsbase(void) unsigned int info_count = THREAD_IDENTIFIER_INFO_COUNT; static int gsbase_offset = -1; - kern_return_t kr = thread_info(mach_thread_self(), THREAD_IDENTIFIER_INFO, (thread_info_t) &tiinfo, &info_count); + mach_port_t self = mach_thread_self(); + kern_return_t kr = thread_info(self, THREAD_IDENTIFIER_INFO, (thread_info_t) &tiinfo, &info_count); + mach_port_deallocate(mach_task_self(), self); + if (kr == KERN_SUCCESS) return (void*)tiinfo.thread_handle; if (gsbase_offset < 0)

1 0

Tim Clem : ntdll: Fix leak of mach_host_self port.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 2ffcce16cb3a580a58cc9504ae375f8ec0033a22 URL: https://gitlab.winehq.org/wine/wine/-/commit/2ffcce16cb3a580a58cc9504ae375f… Author: Tim Clem <tclem(a)codeweavers.com> Date: Mon Aug 8 10:07:23 2022 -0700 ntdll: Fix leak of mach_host_self port. --- dlls/ntdll/unix/system.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/system.c b/dlls/ntdll/unix/system.c index 902b63c2b2f..83e0521a3c9 100644 --- a/dlls/ntdll/unix/system.c +++ b/dlls/ntdll/unix/system.c @@ -2624,8 +2624,9 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, { processor_cpu_load_info_data_t *pinfo; mach_msg_type_number_t info_count; + host_name_port_t host = mach_host_self (); - if (host_processor_info( mach_host_self (), + if (host_processor_info( host, PROCESSOR_CPU_LOAD_INFO, &cpus, (processor_info_array_t*)&pinfo, @@ -2641,6 +2642,8 @@ NTSTATUS WINAPI NtQuerySystemInformation( SYSTEM_INFORMATION_CLASS class, } vm_deallocate (mach_task_self (), (vm_address_t) pinfo, info_count * sizeof(natural_t)); } + + mach_port_deallocate (mach_task_self (), host); } #elif defined(linux) {

1 0

Nikolay Sivov : include: Fix ID2D1CommandSink::DrawImage() prototype.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 6ed5d85121ac36c68fdd3fb85b259254a72523ea URL: https://gitlab.winehq.org/wine/wine/-/commit/6ed5d85121ac36c68fdd3fb85b2592… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Sat Aug 6 00:58:24 2022 +0300 include: Fix ID2D1CommandSink::DrawImage() prototype. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- include/d2d1_1.idl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/d2d1_1.idl b/include/d2d1_1.idl index ba3fd24914f..b60064be3b6 100644 --- a/include/d2d1_1.idl +++ b/include/d2d1_1.idl @@ -623,7 +623,7 @@ interface ID2D1CommandSink : IUnknown HRESULT DrawImage( [in] ID2D1Image *image, [in] const D2D1_POINT_2F *target_offset, - [in] const D2D1_POINT_2F *image_rect, + [in] const D2D1_RECT_F *image_rect, [in] D2D1_INTERPOLATION_MODE interpolation_mode, [in] D2D1_COMPOSITE_MODE composite_mode );

1 0

Jacek Caban : win32u: Use NtUserMessageCall for NtUserSpyGetMsgName.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 2c75490c3e6cb8611197fa64c1470a318edb80f0 URL: https://gitlab.winehq.org/wine/wine/-/commit/2c75490c3e6cb8611197fa64c1470a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 19:03:04 2022 +0200 win32u: Use NtUserMessageCall for NtUserSpyGetMsgName. Instead of leaking a kernel pointer. --- dlls/user32/user_main.c | 4 +++- dlls/win32u/message.c | 6 +++++- dlls/win32u/window.c | 3 --- include/ntuser.h | 6 +++--- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/dlls/user32/user_main.c b/dlls/user32/user_main.c index df3e6b27b81..bc817089e46 100644 --- a/dlls/user32/user_main.c +++ b/dlls/user32/user_main.c @@ -352,7 +352,9 @@ BOOL WINAPI ShutdownBlockReasonDestroy(HWND hwnd) const char *SPY_GetMsgName( UINT msg, HWND hwnd ) { - return (const char *)NtUserCallHwndParam( hwnd, msg, NtUserSpyGetMsgName ); + char buf[128]; + NtUserMessageCall( hwnd, msg, ARRAYSIZE(buf), 0, buf, NtUserSpyGetMsgName, FALSE ); + return wine_dbg_sprintf( "%s", buf ); } void SPY_EnterMessage( INT flag, HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam ) diff --git a/dlls/win32u/message.c b/dlls/win32u/message.c index 5fb065e1208..33170147aa9 100644 --- a/dlls/win32u/message.c +++ b/dlls/win32u/message.c @@ -2960,7 +2960,7 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa return send_notify_message( hwnd, msg, wparam, lparam, ansi ); case NtUserSendMessageCallback: - return send_message_callback( hwnd, msg, wparam, lparam, (void *)result_info, ansi ); + return send_message_callback( hwnd, msg, wparam, lparam, result_info, ansi ); case NtUserClipboardWindowProc: return user_driver->pClipboardWindowProc( hwnd, msg, wparam, lparam ); @@ -2978,6 +2978,10 @@ LRESULT WINAPI NtUserMessageCall( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpa spy_enter_message( ansi, hwnd, msg, wparam, lparam ); return 0; + case NtUserSpyGetMsgName: + lstrcpynA( result_info, debugstr_msg_name( msg, hwnd ), wparam ); + return 0; + case NtUserSpyExit: spy_exit_message( ansi, hwnd, msg, (LPARAM)result_info, wparam, lparam ); return 0; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index c4e14381cf5..2a4edeee656 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -5578,9 +5578,6 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return set_window_style( hwnd, style->styleNew, style->styleOld ); } - case NtUserSpyGetMsgName: - return (UINT_PTR)debugstr_msg_name( param, hwnd ); - default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index f15ba1f135e..5b7d66a2a4e 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -297,8 +297,9 @@ enum /* Wine-specific exports */ NtUserClipboardWindowProc = 0x0300, NtUserGetDispatchParams = 0x3001, - NtUserSpyEnter = 0x0302, - NtUserSpyExit = 0x0303, + NtUserSpyGetMsgName = 0x3002, + NtUserSpyEnter = 0x0303, + NtUserSpyExit = 0x0304, }; /* NtUserThunkedMenuItemInfo codes */ @@ -1261,7 +1262,6 @@ enum NtUserCallHwndParam_ShowOwnedPopups, /* temporary exports */ NtUserSetWindowStyle, - NtUserSpyGetMsgName, }; static inline BOOL NtUserClientToScreen( HWND hwnd, POINT *pt )

1 0

Rémi Bernon : wmvcore/tests: Add some IWMOutputMediaProps_SetMediaType tests.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: b3d6e0cf571c6c0cc6ed1a234d92feab238f2f05 URL: https://gitlab.winehq.org/wine/wine/-/commit/b3d6e0cf571c6c0cc6ed1a234d92fe… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Jul 5 12:54:00 2022 +0200 wmvcore/tests: Add some IWMOutputMediaProps_SetMediaType tests. --- dlls/wmvcore/tests/wmvcore.c | 211 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 211 insertions(+)

1 0

Rémi Bernon : winegstreamer: Implement IWMOutputMediaProps_SetMediaType.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 782abff94aab93fc3751c972dedc6a307e8d838c URL: https://gitlab.winehq.org/wine/wine/-/commit/782abff94aab93fc3751c972dedc6a… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu Aug 4 09:54:26 2022 +0200 winegstreamer: Implement IWMOutputMediaProps_SetMediaType. --- dlls/winegstreamer/wm_reader.c | 41 +++++++++++++++++++++++++++++++++++++++-- dlls/wmvcore/tests/wmvcore.c | 22 ---------------------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/dlls/winegstreamer/wm_reader.c b/dlls/winegstreamer/wm_reader.c index 8038b61f7a7..6c15413bba6 100644 --- a/dlls/winegstreamer/wm_reader.c +++ b/dlls/winegstreamer/wm_reader.c @@ -116,8 +116,18 @@ static HRESULT WINAPI output_props_GetMediaType(IWMOutputMediaProps *iface, WM_M static HRESULT WINAPI output_props_SetMediaType(IWMOutputMediaProps *iface, WM_MEDIA_TYPE *mt) { - FIXME("iface %p, mt %p, stub!\n", iface, mt); - return E_NOTIMPL; + const struct output_props *props = impl_from_IWMOutputMediaProps(iface); + + TRACE("iface %p, mt %p.\n", iface, mt); + + if (!mt) + return E_POINTER; + + if (!IsEqualGUID(&props->mt.majortype, &mt->majortype)) + return E_FAIL; + + FreeMediaType((AM_MEDIA_TYPE *)&props->mt); + return CopyMediaType((AM_MEDIA_TYPE *)&props->mt, (AM_MEDIA_TYPE *)mt); } static HRESULT WINAPI output_props_GetStreamGroupName(IWMOutputMediaProps *iface, WCHAR *name, WORD *len) @@ -1754,6 +1764,7 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, struct output_props *props = unsafe_impl_from_IWMOutputMediaProps(props_iface); struct wg_format format, pref_format; struct wm_stream *stream; + int i; strmbase_dump_media_type(&props->mt); @@ -1780,6 +1791,32 @@ HRESULT wm_reader_set_output_props(struct wm_reader *reader, DWORD output, return NS_E_INCOMPATIBLE_FORMAT; } + switch (pref_format.major_type) + { + case WG_MAJOR_TYPE_AUDIO: + if (format.u.audio.format == WG_AUDIO_FORMAT_UNKNOWN) + return NS_E_AUDIO_CODEC_NOT_INSTALLED; + if (format.u.audio.channels > pref_format.u.audio.channels) + return NS_E_AUDIO_CODEC_NOT_INSTALLED; + break; + + case WG_MAJOR_TYPE_VIDEO: + for (i = 0; i < ARRAY_SIZE(video_formats); ++i) + if (format.u.video.format == video_formats[i]) + break; + if (i == ARRAY_SIZE(video_formats)) + return NS_E_INVALID_OUTPUT_FORMAT; + + if (pref_format.u.video.width != format.u.video.width) + return NS_E_INVALID_OUTPUT_FORMAT; + if (pref_format.u.video.height != format.u.video.height) + return NS_E_INVALID_OUTPUT_FORMAT; + break; + + default: + return NS_E_INCOMPATIBLE_FORMAT; + } + stream->format = format; wg_parser_stream_enable(stream->wg_stream, &format); diff --git a/dlls/wmvcore/tests/wmvcore.c b/dlls/wmvcore/tests/wmvcore.c index 50348eecaca..237546ed7a6 100644 --- a/dlls/wmvcore/tests/wmvcore.c +++ b/dlls/wmvcore/tests/wmvcore.c @@ -1295,12 +1295,10 @@ static void test_sync_reader_types(void) debugstr_guid(&majortype), debugstr_guid(&majortype2)); hr = IWMOutputMediaProps_SetMediaType(output_props, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#lx.\n", hr); memset(mt2_buffer, 0, sizeof(mt2_buffer)); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == E_FAIL, "Got hr %#lx.\n", hr); if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) @@ -1309,22 +1307,18 @@ static void test_sync_reader_types(void) init_audio_type(mt2, &MEDIASUBTYPE_IEEE_FLOAT, 32, format->nChannels * 2, format->nSamplesPerSec); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); - todo_wine ok(hr == NS_E_AUDIO_CODEC_NOT_INSTALLED, "Got hr %#lx.\n", hr); init_audio_type(mt2, &MEDIASUBTYPE_PCM, 8, 1, 11025); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#lx.\n", hr); init_audio_type(mt2, &MEDIASUBTYPE_IEEE_FLOAT, 32, format->nChannels, format->nSamplesPerSec / 4); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -1336,14 +1330,12 @@ static void test_sync_reader_types(void) init_video_type(mt2, &MEDIASUBTYPE_RGB32, 32, BI_RGB, &rect); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#lx.\n", hr); init_video_type(mt2, &MEDIASUBTYPE_NV12, 12, MAKEFOURCC('N','V','1','2'), &rect); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); todo_wine @@ -1353,15 +1345,12 @@ static void test_sync_reader_types(void) init_video_type(mt2, &MEDIASUBTYPE_RGB32, 32, BI_RGB, &rect); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); - todo_wine ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#lx.\n", hr); } hr = IWMOutputMediaProps_SetMediaType(output_props, mt); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMSyncReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -2578,12 +2567,10 @@ static void test_async_reader_types(void) debugstr_guid(&majortype), debugstr_guid(&majortype2)); hr = IWMOutputMediaProps_SetMediaType(output_props, NULL); - todo_wine ok(hr == E_POINTER, "Got hr %#lx.\n", hr); memset(mt2_buffer, 0, sizeof(mt2_buffer)); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == E_FAIL, "Got hr %#lx.\n", hr); if (IsEqualGUID(&majortype, &MEDIATYPE_Audio)) @@ -2592,22 +2579,18 @@ static void test_async_reader_types(void) init_audio_type(mt2, &MEDIASUBTYPE_IEEE_FLOAT, 32, format->nChannels * 2, format->nSamplesPerSec); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, output_number, output_props); - todo_wine ok(hr == NS_E_AUDIO_CODEC_NOT_INSTALLED, "Got hr %#lx.\n", hr); init_audio_type(mt2, &MEDIASUBTYPE_PCM, 8, 1, 11025); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#lx.\n", hr); init_audio_type(mt2, &MEDIASUBTYPE_IEEE_FLOAT, 32, format->nChannels, format->nSamplesPerSec / 4); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#lx.\n", hr); @@ -2619,14 +2602,12 @@ static void test_async_reader_types(void) init_video_type(mt2, &MEDIASUBTYPE_RGB32, 32, BI_RGB, &rect); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#lx.\n", hr); init_video_type(mt2, &MEDIASUBTYPE_NV12, 12, MAKEFOURCC('N','V','1','2'), &rect); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, output_number, output_props); todo_wine @@ -2636,15 +2617,12 @@ static void test_async_reader_types(void) init_video_type(mt2, &MEDIASUBTYPE_RGB32, 32, BI_RGB, &rect); hr = IWMOutputMediaProps_SetMediaType(output_props, mt2); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, output_number, output_props); - todo_wine ok(hr == NS_E_INVALID_OUTPUT_FORMAT, "Got hr %#lx.\n", hr); } hr = IWMOutputMediaProps_SetMediaType(output_props, mt); - todo_wine ok(hr == S_OK, "Got hr %#lx.\n", hr); hr = IWMReader_SetOutputProps(reader, output_number, output_props); ok(hr == S_OK, "Got hr %#lx.\n", hr);

1 0

Rémi Bernon : qasf: Implement ASF Reader filter pin_query_accept.
by Alexandre Julliard 09 Aug '22

09 Aug '22

Module: wine Branch: master Commit: 08e1faa5aeb1f67374a9024e5deefa1f9c9c33d9 URL: https://gitlab.winehq.org/wine/wine/-/commit/08e1faa5aeb1f67374a9024e5deefa… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Aug 2 10:50:24 2022 +0200 qasf: Implement ASF Reader filter pin_query_accept. --- dlls/qasf/asfreader.c | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 13b6e2d7bbe..8f97667752c 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -48,6 +48,57 @@ struct asf_reader struct asf_stream streams[16]; }; +static inline struct asf_stream *impl_from_strmbase_pin(struct strmbase_pin *iface) +{ + return CONTAINING_RECORD(iface, struct asf_stream, source.pin); +} + +static inline struct asf_reader *asf_reader_from_asf_stream(struct asf_stream *stream) +{ + return CONTAINING_RECORD(stream, struct asf_reader, streams[stream->index]); +} + +static HRESULT asf_stream_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TYPE *media_type) +{ + struct asf_stream *stream = impl_from_strmbase_pin(iface); + struct asf_reader *filter = asf_reader_from_asf_stream(stream); + IWMOutputMediaProps *props; + WM_MEDIA_TYPE *mt; + DWORD size, i = 0; + HRESULT hr; + + TRACE("iface %p, media_type %p.\n", iface, media_type); + + if (FAILED(hr = IWMReader_GetOutputFormat(filter->reader, stream->index, i, &props))) + return hr; + if (FAILED(hr = IWMOutputMediaProps_GetMediaType(props, NULL, &size))) + { + IWMOutputMediaProps_Release(props); + return hr; + } + if (!(mt = malloc(size))) + { + IWMOutputMediaProps_Release(props); + return E_OUTOFMEMORY; + } + + do + { + if (SUCCEEDED(hr = IWMOutputMediaProps_GetMediaType(props, mt, &size)) + && IsEqualGUID(&mt->majortype, &media_type->majortype) + && IsEqualGUID(&mt->subtype, &media_type->subtype)) + { + IWMOutputMediaProps_Release(props); + break; + } + + IWMOutputMediaProps_Release(props); + } while (SUCCEEDED(hr = IWMReader_GetOutputFormat(filter->reader, stream->index, ++i, &props))); + + free(mt); + return hr; +} + static inline struct asf_reader *impl_from_strmbase_filter(struct strmbase_filter *iface) { return CONTAINING_RECORD(iface, struct asf_reader, filter); @@ -120,6 +171,7 @@ static HRESULT WINAPI asf_reader_DecideBufferSize(struct strmbase_source *iface, static const struct strmbase_source_ops source_ops = { + .base.pin_query_accept = asf_stream_query_accept, .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideBufferSize = asf_reader_DecideBufferSize,

1 0