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

Zhiyi Zhang : winegstreamer: Trace mf_media_type_from_wg_format_{audio|video}().
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: b5becc2ee8b70753b9fc538cfdd92c2b4be5911c URL: https://gitlab.winehq.org/wine/wine/-/commit/b5becc2ee8b70753b9fc538cfdd92c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Aug 1 17:39:20 2022 +0800 winegstreamer: Trace mf_media_type_from_wg_format_{audio|video}(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/winegstreamer/mfplat.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/winegstreamer/mfplat.c b/dlls/winegstreamer/mfplat.c index 55f9ae6323d..d6620c0d08a 100644 --- a/dlls/winegstreamer/mfplat.c +++ b/dlls/winegstreamer/mfplat.c @@ -435,6 +435,7 @@ static IMFMediaType *mf_media_type_from_wg_format_audio(const struct wg_format * } } + FIXME("Unknown audio format %#x.\n", format->u.audio.format); return NULL; } @@ -478,6 +479,7 @@ static IMFMediaType *mf_media_type_from_wg_format_video(const struct wg_format * } } + FIXME("Unknown video format %#x.\n", format->u.video.format); return NULL; }

1 0

Jacek Caban : wow64: Directly use CPU area in Wow64KiUserCallbackDispatcher for I386_CONTEXT.
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: de5f640abf800cbb4674ab0c55f30fc9acb9085a URL: https://gitlab.winehq.org/wine/wine/-/commit/de5f640abf800cbb4674ab0c55f30f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Aug 11 14:19:24 2022 +0200 wow64: Directly use CPU area in Wow64KiUserCallbackDispatcher for I386_CONTEXT. NtSetInformationThread for i386 causes WOW64_CPURESERVED_FLAG_RESET_STATE to be set, which makes subsequent syscall to restore the state instead of returning its result. --- dlls/wow64/syscall.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index bc6d46258ed..73fb84c6d2e 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -865,13 +865,14 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, { case IMAGE_FILE_MACHINE_I386: { - I386_CONTEXT orig_ctx, ctx = { CONTEXT_I386_FULL }; + I386_CONTEXT orig_ctx, *ctx; void *args_data; ULONG *stack; - NtQueryInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx), NULL ); + RtlWow64GetCurrentCpuArea( NULL, (void **)&ctx, NULL ); + orig_ctx = *ctx; - stack = args_data = ULongToPtr( (ctx.Esp - len) & ~15 ); + stack = args_data = ULongToPtr( (ctx->Esp - len) & ~15 ); memcpy( args_data, args, len ); *(--stack) = 0; *(--stack) = len; @@ -879,16 +880,13 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, *(--stack) = id; *(--stack) = 0xdeadbabe; - orig_ctx = ctx; - ctx.Esp = PtrToUlong( stack ); - ctx.Eip = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; - NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, &ctx, sizeof(ctx) ); + ctx->Esp = PtrToUlong( stack ); + ctx->Eip = pLdrSystemDllInitBlock->pKiUserCallbackDispatcher; if (!__wine_setjmpex( &frame.jmpbuf, NULL )) cpu_simulate(); else - NtSetInformationThread( GetCurrentThread(), ThreadWow64Context, - &orig_ctx, sizeof(orig_ctx) ); + *ctx = orig_ctx; } break;

1 0

Jacek Caban : wow64: Preserve TEB exception frame in Wow64KiUserCallbackDispatcher.
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: 21a3690ad12bcf2088e0fe9ddef0fc824298690f URL: https://gitlab.winehq.org/wine/wine/-/commit/21a3690ad12bcf2088e0fe9ddef0fc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 15:57:08 2022 +0200 wow64: Preserve TEB exception frame in Wow64KiUserCallbackDispatcher. --- dlls/wow64/syscall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wow64/syscall.c b/dlls/wow64/syscall.c index 73fb84c6d2e..8cb5f92c245 100644 --- a/dlls/wow64/syscall.c +++ b/dlls/wow64/syscall.c @@ -850,6 +850,8 @@ void WINAPI Wow64ApcRoutine( ULONG_PTR arg1, ULONG_PTR arg2, ULONG_PTR arg3, CON NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, void **ret_ptr, ULONG *ret_len ) { + TEB32 *teb32 = (TEB32 *)((char *)NtCurrentTeb() + NtCurrentTeb()->WowTebOffset); + ULONG teb_frame = teb32->Tib.ExceptionList; struct user_callback_frame frame; frame.prev_frame = NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA]; @@ -916,6 +918,7 @@ NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, break; } + teb32->Tib.ExceptionList = teb_frame; NtCurrentTeb()->TlsSlots[WOW64_TLS_USERCALLBACKDATA] = frame.prev_frame; NtCurrentTeb()->TlsSlots[WOW64_TLS_TEMPLIST] = frame.temp_list; return frame.status;

1 0

Jacek Caban : wow64win: Add initial user callbacks support.
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: 701932a6ce7175c78d16f49079fecd1d64df5f2e URL: https://gitlab.winehq.org/wine/wine/-/commit/701932a6ce7175c78d16f49079fecd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Sat Jul 30 15:44:58 2022 +0200 wow64win: Add initial user callbacks support. --- dlls/wow64win/syscall.c | 4 +- dlls/wow64win/user.c | 226 +++++++++++++++++++++++++++++++++++++++ dlls/wow64win/wow64win_private.h | 5 + include/ntuser.h | 2 +- 4 files changed, 235 insertions(+), 2 deletions(-) diff --git a/dlls/wow64win/syscall.c b/dlls/wow64win/syscall.c index 0be70421b74..20ea054ff7c 100644 --- a/dlls/wow64win/syscall.c +++ b/dlls/wow64win/syscall.c @@ -53,6 +53,8 @@ SYSTEM_SERVICE_TABLE sdwhwin32 = BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, void *reserved ) { - if (reason == DLL_PROCESS_ATTACH) LdrDisableThreadCalloutsForDll( inst ); + if (reason != DLL_PROCESS_ATTACH) return TRUE; + LdrDisableThreadCalloutsForDll( inst ); + NtCurrentTeb()->Peb->KernelCallbackTable = user_callbacks; return TRUE; } diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index c69c8fd6d6c..1f4acc04e2a 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -189,6 +189,232 @@ static struct client_menu_name32 *client_menu_name_64to32( const struct client_m return name32; } +static NTSTATUS dispatch_callback( ULONG id, void *args, ULONG len ) +{ + void *ret_ptr; + ULONG ret_len; + NTSTATUS status = Wow64KiUserCallbackDispatcher( id, args, len, &ret_ptr, &ret_len ); + return NtCallbackReturn( ret_ptr, ret_len, status ); +} + +static NTSTATUS WINAPI wow64_NtUserCallEnumDisplayMonitor( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserCallSendAsyncCallback( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserCallWinEventHook( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserCallWinProc( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserCallWindowsHook( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserCopyImage( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserDrawScrollBar( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserDrawText( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserFreeCachedClipboardData( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserImmProcessKey( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserImmTranslateMessage( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserInitBuiltinClasses( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserInitBuiltinClasses, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserLoadDriver( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserLoadDriver, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserLoadImage( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserLoadSysMenu( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserLoadSysMenu, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserPostDDEMessage( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserRenderSynthesizedFormat( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserRenderSynthesizedFormat, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserUnpackDDEMessage( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserCallFreeIcon( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserCallFreeIcon, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserThunkLock( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserThunkLock, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserCallVulkanDebugReportCallback( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserCallVulkanDebugUtilsCallback( void *arg, ULONG size ) +{ + FIXME( "\n" ); + return 0; +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst0( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 0, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst1( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 1, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst2( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 2, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst3( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 3, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst4( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 4, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst5( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 5, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst6( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 6, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst7( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 7, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst8( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 8, arg, size ); +} + +static NTSTATUS WINAPI wow64_NtUserDriverCallbackFirst9( void *arg, ULONG size ) +{ + return dispatch_callback( NtUserDriverCallbackFirst + 9, arg, size ); +} + +user_callback user_callbacks[] = +{ + /* user32 callbacks */ + wow64_NtUserCallEnumDisplayMonitor, + wow64_NtUserCallSendAsyncCallback, + wow64_NtUserCallWinEventHook, + wow64_NtUserCallWinProc, + wow64_NtUserCallWindowsHook, + wow64_NtUserCopyImage, + wow64_NtUserDrawScrollBar, + wow64_NtUserDrawText, + wow64_NtUserFreeCachedClipboardData, + wow64_NtUserImmProcessKey, + wow64_NtUserImmTranslateMessage, + wow64_NtUserInitBuiltinClasses, + wow64_NtUserLoadDriver, + wow64_NtUserLoadImage, + wow64_NtUserLoadSysMenu, + wow64_NtUserPostDDEMessage, + wow64_NtUserRenderSynthesizedFormat, + wow64_NtUserUnpackDDEMessage, + /* win16 hooks */ + wow64_NtUserCallFreeIcon, + wow64_NtUserThunkLock, + /* Vulkan support */ + wow64_NtUserCallVulkanDebugReportCallback, + wow64_NtUserCallVulkanDebugUtilsCallback, + /* Driver-specific callbacks */ + wow64_NtUserDriverCallbackFirst0, + wow64_NtUserDriverCallbackFirst1, + wow64_NtUserDriverCallbackFirst2, + wow64_NtUserDriverCallbackFirst3, + wow64_NtUserDriverCallbackFirst4, + wow64_NtUserDriverCallbackFirst5, + wow64_NtUserDriverCallbackFirst6, + wow64_NtUserDriverCallbackFirst7, + wow64_NtUserDriverCallbackFirst8, + wow64_NtUserDriverCallbackFirst9, +}; + +C_ASSERT( ARRAYSIZE(user_callbacks) == NtUserCallCount ); + NTSTATUS WINAPI wow64_NtUserActivateKeyboardLayout( UINT *args ) { HKL layout = get_handle( &args ); diff --git a/dlls/wow64win/wow64win_private.h b/dlls/wow64win/wow64win_private.h index cf0b2b62e5f..643875c69ce 100644 --- a/dlls/wow64win/wow64win_private.h +++ b/dlls/wow64win/wow64win_private.h @@ -27,7 +27,12 @@ ALL_WIN32_SYSCALLS #undef SYSCALL_ENTRY +typedef NTSTATUS (WINAPI *user_callback)( void *params, ULONG size ); +extern user_callback user_callbacks[] DECLSPEC_HIDDEN; + void * WINAPI Wow64AllocateTemp( SIZE_T size ); +NTSTATUS WINAPI Wow64KiUserCallbackDispatcher( ULONG id, void *args, ULONG len, + void **ret_ptr, ULONG *ret_len ); struct object_attr64 { diff --git a/include/ntuser.h b/include/ntuser.h index 5b7d66a2a4e..f5555056078 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -54,7 +54,7 @@ enum NtUserCallVulkanDebugUtilsCallback, /* Driver-specific callbacks */ NtUserDriverCallbackFirst, - NtUserDriverCallbackLast = NtUserDriverCallbackFirst + 10, + NtUserDriverCallbackLast = NtUserDriverCallbackFirst + 9, NtUserCallCount };

1 0

cjsilver : WWN 423
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: website Branch: master Commit: 695ae5f8bbd90289892346788fbc381ab514f846 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/695ae5f8bbd90289892346788f… Author: cjsilver <cjsilver(a)codeweavers.com> Date: Mon Aug 8 16:30:21 2022 +0000 WWN 423 --- wwn/en/wn20220805_423.xml | 254 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 254 insertions(+)

1 0

CJ Silver : WWN 423
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: website Branch: master Commit: d23b7934ad8aa37f0a96da8a00888f8a81edaec0 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/d23b7934ad8aa37f0a96da8a00… Author: CJ Silver <cjsilver(a)codeweavers.com> Date: Mon Aug 8 16:33:37 2022 +0000 WWN 423 --- news/en/2022080502.xml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/news/en/2022080502.xml b/news/en/2022080502.xml new file mode 100644 index 00000000..626ab277 --- /dev/null +++ b/news/en/2022080502.xml @@ -0,0 +1,13 @@ +<news> + <date>August 05, 2022</date> + <title>World Wine News Issue 423</title> + <body> + <a href="{$root}/wwn/ISS">WWN Issue 423</a> is out today. + <p> + <ul> + <li><a href="{$root}/wwn/423#Wine 7.14" class="">Wine 7.14</a></li> + <li><a href="{$root}/wwn/423#Bugs Closed 7/29/22" class="">Bugs Closed 7/29/22</a></li> + </ul> + </p> + </body> +</news>

1 0

Jeremy Newman : fix link
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: website Branch: master Commit: 2f66bb1cf6d61196244da67698578624a44ea1a7 URL: https://gitlab.winehq.org/winehq/winehq/-/commit/2f66bb1cf6d61196244da67698… Author: Jeremy Newman <jnewman(a)codeweavers.com> Date: Wed Aug 10 16:34:17 2022 -0500 fix link --- news/en/2022080502.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/news/en/2022080502.xml b/news/en/2022080502.xml index 626ab277..146091a9 100644 --- a/news/en/2022080502.xml +++ b/news/en/2022080502.xml @@ -2,7 +2,7 @@ <date>August 05, 2022</date> <title>World Wine News Issue 423</title> <body> - <a href="{$root}/wwn/ISS">WWN Issue 423</a> is out today. + <a href="{$root}/wwn/423">WWN Issue 423</a> is out today. <p> <ul> <li><a href="{$root}/wwn/423#Wine 7.14" class="">Wine 7.14</a></li>

1 0

Akihiro Sagawa : winmm/tests: Add tests for dimensions of video window.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 4bf8935d43f2432d03a9afe54e88ac7c8777f863 URL: https://gitlab.winehq.org/wine/wine/-/commit/4bf8935d43f2432d03a9afe54e88ac… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Aug 5 22:48:42 2022 +0900 winmm/tests: Add tests for dimensions of video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/mci.c | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index bf609a9d26d..d7686ec54b1 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -39,6 +39,7 @@ typedef union { MCI_SYSINFO_PARMSA sys; MCI_SEEK_PARMS seek; MCI_DGV_OPEN_PARMSW dgv_open; + MCI_DGV_WHERE_PARMS where; MCI_GENERIC_PARMS gen; } MCI_PARMS_UNION; @@ -1537,6 +1538,7 @@ static void test_video_window(void) { HWND parent_window = NULL, hwnd, video_window; DWORD style, expected; + RECT rc, src_rc, win_rc; winetest_push_context("%u", i); @@ -1585,6 +1587,49 @@ static void test_video_window(void) todo_wine_if (i != 3) ok(style == expected, "Got style %#lx for window %p, expected %#lx.\n", style, video_window, expected); + /* Get the source video size. */ + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_SOURCE, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + SetRect(&rc, 0, 0, 32, 24); + ok(EqualRect(&parm.where.rc, &rc), "Got source rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&rc)); + src_rc = parm.where.rc; + + /* Test the default video destination size. */ + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + if (style & (WS_POPUP | WS_CHILD)) + rc = src_rc; + else + /* The video destination is stretched to fit the window, + * in particular if the video width is less than SM_CXMIN. */ + GetClientRect(video_window, &rc); + + todo_wine_if (style & (WS_POPUP | WS_CHILD)) + ok(EqualRect(&parm.where.rc, &rc), "Got destination rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&rc)); + + /* Test the default video window size. */ + rc = src_rc; + /* Windows is broken and always uses WS_OVERLAPPEDWINDOW regardless of + * the window's actual style. */ + AdjustWindowRect(&rc, WS_OVERLAPPEDWINDOW, FALSE); + OffsetRect(&rc, -rc.left, -rc.top); + rc.right = max(rc.right, GetSystemMetrics(SM_CXMIN)); + + GetWindowRect(video_window, &win_rc); + OffsetRect(&rc, win_rc.left, win_rc.top); + todo_wine_if (testcase[i].style & WS_CHILD) + ok(EqualRect(&rc, &win_rc), "Got window rect %s, expected %s.\n", + wine_dbgstr_rect(&win_rc), wine_dbgstr_rect(&rc)); + + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_WINDOW, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + win_rc.right -= win_rc.left; + win_rc.bottom -= win_rc.top; + ok(EqualRect(&win_rc, &parm.where.rc), "Got rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&win_rc)); + err = mciSendCommandW(id, MCI_STOP, 0, (DWORD_PTR)&parm); ok(!err, "Got %s.\n", dbg_mcierr(err));

1 0

Akihiro Sagawa : winmm/tests: Add tests for destination of video window.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: e08631097eae8a2bcfd125cea2b09225789913ad URL: https://gitlab.winehq.org/wine/wine/-/commit/e08631097eae8a2bcfd125cea2b092… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 winmm/tests: Add tests for destination of video window. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/winmm/tests/mci.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 67 insertions(+), 1 deletion(-) diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index d7686ec54b1..a0989d542c5 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -39,7 +39,9 @@ typedef union { MCI_SYSINFO_PARMSA sys; MCI_SEEK_PARMS seek; MCI_DGV_OPEN_PARMSW dgv_open; + MCI_DGV_PUT_PARMS put; MCI_DGV_WHERE_PARMS where; + MCI_DGV_WINDOW_PARMSW win; MCI_GENERIC_PARMS gen; } MCI_PARMS_UNION; @@ -1536,12 +1538,14 @@ static void test_video_window(void) for (i = 0; i < ARRAY_SIZE(testcase); ++i) { - HWND parent_window = NULL, hwnd, video_window; + HWND parent_window = NULL, hwnd, video_window, main_window; DWORD style, expected; RECT rc, src_rc, win_rc; winetest_push_context("%u", i); + main_window = CreateWindowExA(0, "static", "main", + WS_POPUPWINDOW, 0, 0, 10, 10, 0, 0, 0, NULL); if (testcase[i].open_flags & MCI_DGV_OPEN_PARENT) parent_window = CreateWindowExA(0, "static", "parent", WS_POPUPWINDOW, 0, 0, 100, 100, 0, 0, 0, NULL); @@ -1645,6 +1649,67 @@ static void test_video_window(void) ok(IsWindowVisible(video_window), "Video window should be visible.\n"); + /* Test MCI_DGV_WINDOW_HWND. */ + parm.win.hWnd = main_window; + err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + ok(!IsWindowVisible(main_window), "Main window should be hidden.\n"); + + hwnd = GetWindow(main_window, GW_CHILD); + todo_wine ok(hwnd != video_window, + "Video window (%p) and child window (%p) should be different.\n", video_window, hwnd); + style = GetWindowLongW(hwnd, GWL_STYLE); + expected = WS_CHILD | WS_VISIBLE; + todo_wine ok(style == expected, "Child window %p: got style %#lx, expected %#lx.\n", + hwnd, style, expected); + + style = GetWindowLongW(video_window, GWL_STYLE); + expected = testcase[i].expected_style; + todo_wine ok(style == expected, "Video window %p: got style %#lx, expected %#lx.\n", + video_window, style, expected); + + /* destination size is reset to the source video size */ + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + todo_wine ok(EqualRect(&parm.where.rc, &src_rc), "Got destination rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&src_rc)); + + /* destination size isn't reset unless the destination window is changed */ + SetRect(&rc, 0, 0, src_rc.right * 2, src_rc.bottom / 2); + parm.put.rc = rc; + err = mciSendCommandW(id, MCI_PUT, MCI_DGV_PUT_DESTINATION | MCI_DGV_RECT, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + + parm.win.hWnd = main_window; + err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + ok(!IsWindowVisible(main_window), "Main window should be hidden.\n"); + + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + todo_wine_if ((testcase[i].style & (WS_CHILD | WS_POPUP)) != WS_CHILD) + ok(EqualRect(&parm.where.rc, &rc), "Got destination rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&rc)); + + /* MCI_PLAY shows current video window */ + err = mciSendCommandW(id, MCI_PLAY, 0, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + todo_wine ok(IsWindowVisible(main_window), "Main window should be shown.\n"); + ok(IsWindow(video_window), "Video window should exist.\n"); + ok(!IsWindowVisible(video_window), "Video window should be hidden.\n"); + + /* video window is reset to the default window, which is visible again */ + parm.win.hWnd = NULL; + err = mciSendCommandW(id, MCI_WINDOW, MCI_DGV_WINDOW_HWND, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + todo_wine ok(IsWindowVisible(main_window), "Main window should be shown.\n"); + todo_wine ok(IsWindowVisible(video_window), "Video window should be shown.\n"); + + err = mciSendCommandW(id, MCI_WHERE, MCI_DGV_WHERE_DESTINATION, (DWORD_PTR)&parm); + ok(!err, "Got %s.\n", dbg_mcierr(err)); + todo_wine ok(EqualRect(&parm.where.rc, &src_rc), "Got destination rect %s, expected %s.\n", + wine_dbgstr_rect(&parm.where.rc), wine_dbgstr_rect(&src_rc)); + next: err = mciSendCommandW(id, MCI_CLOSE, 0, 0); ok(!err, "Got %s.\n", dbg_mcierr(err)); @@ -1654,6 +1719,7 @@ next: ret = DestroyWindow(parent_window); ok(ret, "Failed to destroy parent window\n"); } + DestroyWindow(main_window); winetest_pop_context(); }

1 0

Akihiro Sagawa : mciqtz32: Correct video window behavior by creating default window.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 8c9ccf86226d261189f43dfa37f39dbe2cff230e URL: https://gitlab.winehq.org/wine/wine/-/commit/8c9ccf86226d261189f43dfa37f39d… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 21:51:47 2022 +0900 mciqtz32: Correct video window behavior by creating default window. Now the video renderer window by IVideoWindow always has WS_CHILD style regardless open parameters. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52448 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 133 ++++++++++++++++++++++++++++++----------- dlls/mciqtz32/mciqtz_private.h | 1 + dlls/winmm/tests/mci.c | 42 ++++++------- 3 files changed, 117 insertions(+), 59 deletions(-)

1 0