wine-commits August 2022

wine-commits@winehq.org

1 participants
596 discussions

Nikolay Sivov : dwrite/fallback: Add Georgian and Armenian ranges.
by Alexandre Julliard 11 Aug '22

11 Aug '22

Module: wine Branch: master Commit: 857ec56f45b6a9a63f1c24935c398baae99ac551 URL: https://gitlab.winehq.org/wine/wine/-/commit/857ec56f45b6a9a63f1c24935c398b… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Aug 11 16:57:08 2022 +0300 dwrite/fallback: Add Georgian and Armenian ranges. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/analyzer.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c528ccf7001..53b0853e7d6 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -222,6 +222,8 @@ system_fallback_config[] = { "0000-007F, 0080-00FF, 0100-017F, 0180-024F, " "0250-02AF, 02B0-02FF, 0300-036F", L"Tahoma" }, + { "0530-058F, FB10-FB1C", L"Noto Sans Armenian" }, + { "0590-05FF, FB1D-FB4F", L"Noto Sans Hebrew" }, { "0600-06FF, 0750-077F, " @@ -252,6 +254,8 @@ system_fallback_config[] = { "1000-109F, A9E0-A9FF, AA60-AA7F", L"Noto Sans Myanmar" }, + { "10A0-10FF, 2D00-2D2F", L"Noto Sans Georgian" }, + /* Hangul Jamo - 1100-11FF Hangul Compatibility Jamo - 3130-318F Enc. CJK (Paren Hangul) - 3200-321F

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

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 : 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

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

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

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

Akihiro Sagawa : mciqtz32: Show the default video window when switching from another one.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 8e27f6c2ef327d6d643e29a271245e76aa6f4792 URL: https://gitlab.winehq.org/wine/wine/-/commit/8e27f6c2ef327d6d643e29a271245e… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 mciqtz32: Show the default video window when switching from another one. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 2 ++ dlls/winmm/tests/mci.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 952015e4c9f..ee130b078d5 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -1010,6 +1010,8 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS if (wma->parent == wma->window) ShowWindow(wma->window, SW_HIDE); + else if (hwnd == wma->window) + ShowWindow(wma->window, SW_SHOW); wma->parent = hwnd; } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 18dfdf1f74b..a529b3080d2 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1695,7 +1695,7 @@ static void test_video_window(void) 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 shown.\n"); - todo_wine ok(IsWindowVisible(video_window), "Video window should be shown.\n"); + 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));

1 0

Akihiro Sagawa : mciqtz32: Hide the default video window when switching to another one.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 6f7c0c76bf209c3d00419edf443fb5253b4e0510 URL: https://gitlab.winehq.org/wine/wine/-/commit/6f7c0c76bf209c3d00419edf443fb5… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 mciqtz32: Hide the default video window when switching to another one. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 3 +++ dlls/winmm/tests/mci.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index 89f128831b6..952015e4c9f 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -1008,6 +1008,9 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS IBasicVideo_GetVideoSize(wma->vidbasic, &width, &height); IVideoWindow_SetWindowPosition(wma->vidwin, 0, 0, width, height); + if (wma->parent == wma->window) + ShowWindow(wma->window, SW_HIDE); + wma->parent = hwnd; } } diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index dc3a4973362..18dfdf1f74b 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1658,7 +1658,7 @@ static void test_video_window(void) 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", + 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 */ @@ -1688,14 +1688,14 @@ static void test_video_window(void) ok(!err, "Got %s.\n", dbg_mcierr(err)); ok(IsWindowVisible(main_window), "Main window should be shown.\n"); ok(IsWindow(video_window), "Video window should exist.\n"); - todo_wine ok(!IsWindowVisible(video_window), "Video window should be hidden.\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)); ok(IsWindowVisible(main_window), "Main window should be shown.\n"); - ok(IsWindowVisible(video_window), "Video 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));

1 0

Akihiro Sagawa : mciqtz32: Reset the video size when changing video destination.
by Alexandre Julliard 10 Aug '22

10 Aug '22

Module: wine Branch: master Commit: 9cdc68126530012d67f17c2ae6528ceea767f89e URL: https://gitlab.winehq.org/wine/wine/-/commit/9cdc68126530012d67f17c2ae6528c… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Jul 31 20:49:25 2022 +0900 mciqtz32: Reset the video size when changing video destination. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/mciqtz32/mciqtz.c | 15 ++++++++++++--- dlls/winmm/tests/mci.c | 4 ++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/dlls/mciqtz32/mciqtz.c b/dlls/mciqtz32/mciqtz.c index fb941f26a86..89f128831b6 100644 --- a/dlls/mciqtz32/mciqtz.c +++ b/dlls/mciqtz32/mciqtz.c @@ -998,9 +998,18 @@ static DWORD MCIQTZ_mciWindow(UINT wDevID, DWORD dwFlags, LPMCI_DGV_WINDOW_PARMS if (dwFlags & MCI_DGV_WINDOW_HWND && (IsWindow(lpParms->hWnd) || !lpParms->hWnd)) { HWND hwnd = lpParms->hWnd ? lpParms->hWnd : wma->window; TRACE("Setting parent window to %p.\n", hwnd); - IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)hwnd); - IVideoWindow_put_Owner(wma->vidwin, (OAHWND)hwnd); - wma->parent = hwnd; + if (wma->parent != hwnd) + { + LONG width, height; + + IVideoWindow_put_MessageDrain(wma->vidwin, (OAHWND)hwnd); + IVideoWindow_put_Owner(wma->vidwin, (OAHWND)hwnd); + + IBasicVideo_GetVideoSize(wma->vidbasic, &width, &height); + IVideoWindow_SetWindowPosition(wma->vidwin, 0, 0, width, height); + + wma->parent = hwnd; + } } if (dwFlags & MCI_DGV_WINDOW_STATE) { TRACE("Setting nCmdShow to %d\n", lpParms->nCmdShow); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index c4a92221d0f..dc3a4973362 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -1664,7 +1664,7 @@ static void test_video_window(void) /* 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", + 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 */ @@ -1699,7 +1699,7 @@ static void test_video_window(void) 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", + 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)); err = mciSendCommandW(id, MCI_CLOSE, 0, 0);

1 0

← Newer
1
...
35
36
37
38
39
40
41
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits August 2022