November 2021 - Wine-commits

Jacek Caban : win32u: Move NtUserSetProp implementation from user32.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 97fa9db478c7ac9575309c194161cc23c6a92161 URL: https://source.winehq.org/git/wine.git/?a=commit;h=97fa9db478c7ac9575309c19… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 8 14:48:37 2021 +0100 win32u: Move NtUserSetProp implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/property.c | 15 ++------------- dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 21 +++++++++++++++++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 22 ++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 3 +++ 8 files changed, 60 insertions(+), 14 deletions(-) diff --git a/dlls/user32/property.c b/dlls/user32/property.c index b6fb66a5e3e..e6877a3b3e0 100644 --- a/dlls/user32/property.c +++ b/dlls/user32/property.c @@ -24,7 +24,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" -#include "winuser.h" +#include "ntuser.h" #include "wine/server.h" /* size of buffer needed to store an atom string */ @@ -158,18 +158,7 @@ BOOL WINAPI SetPropA( HWND hwnd, LPCSTR str, HANDLE handle ) */ BOOL WINAPI SetPropW( HWND hwnd, LPCWSTR str, HANDLE handle ) { - BOOL ret; - - SERVER_START_REQ( set_window_property ) - { - req->window = wine_server_user_handle( hwnd ); - req->data = (ULONG_PTR)handle; - if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); - else wine_server_add_data( req, str, lstrlenW(str) * sizeof(WCHAR) ); - ret = !wine_server_call_err( req ); - } - SERVER_END_REQ; - return ret; + return NtUserSetProp( hwnd, str, handle ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 8b74deb0be7..c718510bbc7 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -114,6 +114,7 @@ static void * const syscalls[] = NtUserOpenWindowStation, NtUserSetObjectInformation, NtUserSetProcessWindowStation, + NtUserSetProp, NtUserSetThreadDesktop, }; diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 2f5014b80b4..079c4eead23 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -32,6 +32,26 @@ static void test_NtUserCloseWindowStation(void) "NtUserCloseWindowStation returned %x %u\n", ret, GetLastError() ); } +static void test_window_props(void) +{ + HANDLE prop; + ATOM atom; + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowExA( 0, "static", NULL, WS_POPUP, 0,0,0,0,0,0,0, NULL ); + + atom = GlobalAddAtomW( L"test" ); + + ret = NtUserSetProp( hwnd, UlongToPtr(atom), UlongToHandle(0xdeadbeef) ); + ok( ret, "NtUserSetProp failed: %u\n", GetLastError() ); + + prop = GetPropW( hwnd, L"test" ); + ok( prop == UlongToHandle(0xdeadbeef), "prop = %p\n", prop ); + + GlobalDeleteAtom( atom ); + DestroyWindow( hwnd ); +} START_TEST(win32u) { @@ -39,4 +59,5 @@ START_TEST(win32u) GetDesktopWindow(); test_NtUserCloseWindowStation(); + test_window_props(); } diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 5c31b9017ee..97df44f3215 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1222,7 +1222,7 @@ @ stub NtUserSetProcessRestrictionExemption @ stub NtUserSetProcessUIAccessZorder @ stdcall -syscall NtUserSetProcessWindowStation(long) -@ stub NtUserSetProp +@ stdcall -syscall NtUserSetProp(long wstr ptr) @ stub NtUserSetScrollInfo @ stub NtUserSetSensorPresence @ stub NtUserSetSharedWindowData diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 03065c1a00a..9543d4c4a54 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -27,6 +27,28 @@ #include "wine/server.h" +/***************************************************************************** + * NtUserSetProp (win32u.@) + * + * NOTE Native allows only ATOMs as the second argument. We allow strings + * to save extra server call in SetPropW. + */ +BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ) +{ + BOOL ret; + + SERVER_START_REQ( set_window_property ) + { + req->window = wine_server_user_handle( hwnd ); + req->data = (ULONG_PTR)handle; + if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); + else wine_server_add_data( req, str, lstrlenW(str) * sizeof(WCHAR) ); + ret = !wine_server_call_err( req ); + } + SERVER_END_REQ; + return ret; +} + /***************************************************************************** * NtUserGetLayeredWindowAttributes (win32u.@) */ diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 7c6f00afe66..fb265638750 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -101,6 +101,7 @@ SYSCALL_ENTRY( NtUserOpenWindowStation ) \ SYSCALL_ENTRY( NtUserSetObjectInformation ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ + SYSCALL_ENTRY( NtUserSetProp ) \ SYSCALL_ENTRY( NtUserSetThreadDesktop ) #endif /* __WOW64WIN_SYSCALL_H */ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index c33ab4e4dff..d25f2271012 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -156,6 +156,15 @@ NTSTATUS WINAPI wow64_NtUserSetObjectInformation( UINT *args ) return NtUserSetObjectInformation( handle, index, info, len ); } +NTSTATUS WINAPI wow64_NtUserSetProp( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + const WCHAR *str = get_ptr( &args ); + HANDLE handle = get_handle( &args ); + + return NtUserSetProp( hwnd, str, handle ); +} + NTSTATUS WINAPI wow64_NtUserGetLayeredWindowAttributes( UINT *args ) { HWND hwnd = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index a9b2ae65dad..c05c743b553 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -34,12 +34,15 @@ BOOL WINAPI NtUserGetLayeredWindowAttributes( HWND hwnd, COLORREF *key, BYTE BOOL WINAPI NtUserGetObjectInformation( HANDLE handle, INT index, void *info, DWORD len, DWORD *needed ); HWINSTA WINAPI NtUserGetProcessWindowStation(void); +HANDLE WINAPI NtUserGetProp( HWND hwnd, const WCHAR *str ); HDESK WINAPI NtUserGetThreadDesktop( DWORD thread ); HWINSTA WINAPI NtUserOpenWindowStation( OBJECT_ATTRIBUTES *attr, ACCESS_MASK access ); BOOL WINAPI NtUserSetObjectInformation( HANDLE handle, INT index, void *info, DWORD len ); HDESK WINAPI NtUserOpenDesktop( OBJECT_ATTRIBUTES *attr, DWORD flags, ACCESS_MASK access ); HDESK WINAPI NtUserOpenInputDesktop( DWORD flags, BOOL inherit, ACCESS_MASK access ); +HANDLE WINAPI NtUserRemoveProp( HWND hwnd, const WCHAR *str ); BOOL WINAPI NtUserSetProcessWindowStation( HWINSTA handle ); +BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ); BOOL WINAPI NtUserSetThreadDesktop( HDESK handle ); #endif /* _NTUSER_ */

1 0

Jacek Caban : win32u: Move NtUserGetProp implementation from user32.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 32ea3ec7b3f6b237b7362f639cf4f45b091e4391 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32ea3ec7b3f6b237b7362f63… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 8 14:48:45 2021 +0100 win32u: Move NtUserGetProp implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/property.c | 12 +----------- dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 3 +++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 21 +++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ 7 files changed, 36 insertions(+), 12 deletions(-) diff --git a/dlls/user32/property.c b/dlls/user32/property.c index e6877a3b3e0..b31169120d7 100644 --- a/dlls/user32/property.c +++ b/dlls/user32/property.c @@ -126,17 +126,7 @@ HANDLE WINAPI GetPropA( HWND hwnd, LPCSTR str ) */ HANDLE WINAPI GetPropW( HWND hwnd, LPCWSTR str ) { - ULONG_PTR ret = 0; - - SERVER_START_REQ( get_window_property ) - { - req->window = wine_server_user_handle( hwnd ); - if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); - else wine_server_add_data( req, str, lstrlenW(str) * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) ret = reply->data; - } - SERVER_END_REQ; - return (HANDLE)ret; + return NtUserGetProp( hwnd, str ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index c718510bbc7..ac4a880ee63 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -108,6 +108,7 @@ static void * const syscalls[] = NtUserGetLayeredWindowAttributes, NtUserGetObjectInformation, NtUserGetProcessWindowStation, + NtUserGetProp, NtUserGetThreadDesktop, NtUserOpenDesktop, NtUserOpenInputDesktop, diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 079c4eead23..60e0085a913 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -49,6 +49,9 @@ static void test_window_props(void) prop = GetPropW( hwnd, L"test" ); ok( prop == UlongToHandle(0xdeadbeef), "prop = %p\n", prop ); + prop = NtUserGetProp( hwnd, UlongToPtr(atom) ); + ok( prop == UlongToHandle(0xdeadbeef), "prop = %p\n", prop ); + GlobalDeleteAtom( atom ); DestroyWindow( hwnd ); } diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index 97df44f3215..eb01a5299fe 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -980,7 +980,7 @@ @ stub NtUserGetProcessDpiAwarenessContext @ stub NtUserGetProcessUIContextInformation @ stdcall -syscall NtUserGetProcessWindowStation() -@ stub NtUserGetProp +@ stdcall -syscall NtUserGetProp(long wstr) @ stub NtUserGetQueueStatus @ stub NtUserGetQueueStatusReadonly @ stub NtUserGetRawInputBuffer diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 9543d4c4a54..dcf71b12c32 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -27,6 +27,27 @@ #include "wine/server.h" +/*********************************************************************** + * NtUserGetProp (win32u.@) + * + * NOTE Native allows only ATOMs as the second argument. We allow strings + * to save extra server call in GetPropW. + */ +HANDLE WINAPI NtUserGetProp( HWND hwnd, const WCHAR *str ) +{ + ULONG_PTR ret = 0; + + SERVER_START_REQ( get_window_property ) + { + req->window = wine_server_user_handle( hwnd ); + if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); + else wine_server_add_data( req, str, lstrlenW(str) * sizeof(WCHAR) ); + if (!wine_server_call_err( req )) ret = reply->data; + } + SERVER_END_REQ; + return (HANDLE)ret; +} + /***************************************************************************** * NtUserSetProp (win32u.@) * diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index fb265638750..d3a02181e64 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -95,6 +95,7 @@ SYSCALL_ENTRY( NtUserGetLayeredWindowAttributes ) \ SYSCALL_ENTRY( NtUserGetObjectInformation ) \ SYSCALL_ENTRY( NtUserGetProcessWindowStation ) \ + SYSCALL_ENTRY( NtUserGetProp ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index d25f2271012..48dc9d465df 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -156,6 +156,14 @@ NTSTATUS WINAPI wow64_NtUserSetObjectInformation( UINT *args ) return NtUserSetObjectInformation( handle, index, info, len ); } +NTSTATUS WINAPI wow64_NtUserGetProp( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + const WCHAR *str = get_ptr( &args ); + + return HandleToUlong( NtUserGetProp( hwnd, str )); +} + NTSTATUS WINAPI wow64_NtUserSetProp( UINT *args ) { HWND hwnd = get_handle( &args );

1 0

Jacek Caban : win32u: Move NtUserRemoveProp implementation from user32.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: ed928dc49e7b038df39a87bd30ae4acf4492ed95 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed928dc49e7b038df39a87bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 8 14:48:55 2021 +0100 win32u: Move NtUserRemoveProp implementation from user32. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/property.c | 13 +------------ dlls/win32u/syscall.c | 1 + dlls/win32u/tests/win32u.c | 6 ++++++ dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 24 ++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 ++++++++ 7 files changed, 42 insertions(+), 13 deletions(-) diff --git a/dlls/user32/property.c b/dlls/user32/property.c index b31169120d7..4d55c4dfac8 100644 --- a/dlls/user32/property.c +++ b/dlls/user32/property.c @@ -170,18 +170,7 @@ HANDLE WINAPI RemovePropA( HWND hwnd, LPCSTR str ) */ HANDLE WINAPI RemovePropW( HWND hwnd, LPCWSTR str ) { - ULONG_PTR ret = 0; - - SERVER_START_REQ( remove_window_property ) - { - req->window = wine_server_user_handle( hwnd ); - if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); - else wine_server_add_data( req, str, lstrlenW(str) * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) ret = reply->data; - } - SERVER_END_REQ; - - return (HANDLE)ret; + return NtUserRemoveProp( hwnd, str ); } diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index ac4a880ee63..762729f815e 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -113,6 +113,7 @@ static void * const syscalls[] = NtUserOpenDesktop, NtUserOpenInputDesktop, NtUserOpenWindowStation, + NtUserRemoveProp, NtUserSetObjectInformation, NtUserSetProcessWindowStation, NtUserSetProp, diff --git a/dlls/win32u/tests/win32u.c b/dlls/win32u/tests/win32u.c index 60e0085a913..a7c2e5ef029 100644 --- a/dlls/win32u/tests/win32u.c +++ b/dlls/win32u/tests/win32u.c @@ -52,6 +52,12 @@ static void test_window_props(void) prop = NtUserGetProp( hwnd, UlongToPtr(atom) ); ok( prop == UlongToHandle(0xdeadbeef), "prop = %p\n", prop ); + prop = NtUserRemoveProp( hwnd, UlongToPtr(atom) ); + ok( prop == UlongToHandle(0xdeadbeef), "prop = %p\n", prop ); + + prop = GetPropW(hwnd, L"test"); + ok(!prop, "prop = %p\n", prop); + GlobalDeleteAtom( atom ); DestroyWindow( hwnd ); } diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index eb01a5299fe..8327e588b77 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1148,7 +1148,7 @@ @ stub NtUserRemoveClipboardFormatListener @ stub NtUserRemoveInjectionDevice @ stub NtUserRemoveMenu -@ stub NtUserRemoveProp +@ stdcall -syscall NtUserRemoveProp(long wstr) @ stub NtUserRemoveVisualIdentifier @ stub NtUserReportInertia @ stub NtUserRequestMoveSizeOperation diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index dcf71b12c32..a84ceeefaf5 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -70,6 +70,30 @@ BOOL WINAPI NtUserSetProp( HWND hwnd, const WCHAR *str, HANDLE handle ) return ret; } + +/*********************************************************************** + * NtUserRemoveProp (win32u.@) + * + * NOTE Native allows only ATOMs as the second argument. We allow strings + * to save extra server call in RemovePropW. + */ +HANDLE WINAPI NtUserRemoveProp( HWND hwnd, const WCHAR *str ) +{ + ULONG_PTR ret = 0; + + SERVER_START_REQ( remove_window_property ) + { + req->window = wine_server_user_handle( hwnd ); + if (IS_INTRESOURCE(str)) req->atom = LOWORD(str); + else wine_server_add_data( req, str, lstrlenW(str) * sizeof(WCHAR) ); + if (!wine_server_call_err( req )) ret = reply->data; + } + SERVER_END_REQ; + + return (HANDLE)ret; +} + + /***************************************************************************** * NtUserGetLayeredWindowAttributes (win32u.@) */ diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index d3a02181e64..8430d0b1527 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -100,6 +100,7 @@ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ SYSCALL_ENTRY( NtUserOpenWindowStation ) \ + SYSCALL_ENTRY( NtUserRemoveProp ) \ SYSCALL_ENTRY( NtUserSetObjectInformation ) \ SYSCALL_ENTRY( NtUserSetProcessWindowStation ) \ SYSCALL_ENTRY( NtUserSetProp ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 48dc9d465df..2686d75a094 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -173,6 +173,14 @@ NTSTATUS WINAPI wow64_NtUserSetProp( UINT *args ) return NtUserSetProp( hwnd, str, handle ); } +NTSTATUS WINAPI wow64_NtUserRemoveProp( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + const WCHAR *str = get_ptr( &args ); + + return HandleToUlong( NtUserRemoveProp( hwnd, str )); +} + NTSTATUS WINAPI wow64_NtUserGetLayeredWindowAttributes( UINT *args ) { HWND hwnd = get_handle( &args );

1 0

Jacek Caban : win32u: Don't use free_region in alloc_region.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 2d1e3e5d13bf0b9c295889169f13e4d7765fe088 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d1e3e5d13bf0b9c29588916… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Nov 8 14:49:14 2021 +0100 win32u: Don't use free_region in alloc_region. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/win32u/region.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/win32u/region.c b/dlls/win32u/region.c index 8555be96f72..e3e840a1554 100644 --- a/dlls/win32u/region.c +++ b/dlls/win32u/region.c @@ -451,7 +451,7 @@ static WINEREGION *alloc_region( INT n ) if (rgn && !init_region( rgn, n )) { - free_region( rgn ); + free( rgn ); rgn = NULL; } return rgn;

1 0

Nikolay Sivov : evr/mixer: Fix rectangle scaling helper argument check (Coverity).
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 82965df653e5bc86aa49ba8af60beaefb03e7d86 URL: https://source.winehq.org/git/wine.git/?a=commit;h=82965df653e5bc86aa49ba8a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 14:57:00 2021 +0300 evr/mixer: Fix rectangle scaling helper argument check (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index bb3f938cb64..b6b4d148f90 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -1237,7 +1237,7 @@ static HRESULT video_mixer_get_d3d_device(struct video_mixer *mixer, IDirect3DDe static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int height, const MFVideoNormalizedRect *scale) { - if (rect->left == 0.0f && rect->top == 0.0f && rect->right == 1.0f && rect->bottom == 1.0f) + if (scale->left == 0.0f && scale->top == 0.0f && scale->right == 1.0f && scale->bottom == 1.0f) { SetRect(rect, 0, 0, width, height); }

1 0

Nikolay Sivov : evr/mixer: Preserve frame aspect ratio when rendering.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 4b6df3a66c6dfcf33d3f05d73f0bafe7c0cbbd27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b6df3a66c6dfcf33d3f05d7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 14:57:01 2021 +0300 evr/mixer: Preserve frame aspect ratio when rendering. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/mixer.c | 109 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 57 insertions(+), 52 deletions(-) diff --git a/dlls/evr/mixer.c b/dlls/evr/mixer.c index b6b4d148f90..4f5837a49a4 100644 --- a/dlls/evr/mixer.c +++ b/dlls/evr/mixer.c @@ -45,6 +45,7 @@ struct input_stream IMFMediaType *media_type; MFVideoNormalizedRect rect; unsigned int zorder; + SIZE frame_size; IMFSample *sample; unsigned int sample_requested : 1; }; @@ -100,6 +101,7 @@ struct video_mixer COLORREF rgba; DXVA2_AYUVSample16 ayuv; } bkgnd_color; + MFVideoArea aperture; LONGLONG lower_bound; LONGLONG upper_bound; CRITICAL_SECTION cs; @@ -864,6 +866,8 @@ static HRESULT WINAPI video_mixer_transform_SetInputType(IMFTransform *iface, DW if (mixer->inputs[0].media_type) IMFMediaType_Release(mixer->inputs[0].media_type); mixer->inputs[0].media_type = media_type; + mixer->inputs[0].frame_size.cx = video_desc.SampleWidth; + mixer->inputs[0].frame_size.cy = video_desc.SampleHeight; IMFMediaType_AddRef(mixer->inputs[0].media_type); } CoTaskMemFree(guids); @@ -939,6 +943,11 @@ static HRESULT WINAPI video_mixer_transform_SetOutputType(IMFTransform *iface, D if (SUCCEEDED(hr = IDirectXVideoProcessorService_CreateVideoProcessor(service, &mixer->output.rt_formats[i].device, &video_desc, rt_format, MAX_MIXER_INPUT_SUBSTREAMS, &mixer->processor))) { + if (FAILED(IMFMediaType_GetBlob(type, &MF_MT_GEOMETRIC_APERTURE, (UINT8 *)&mixer->aperture, + sizeof(mixer->aperture), NULL))) + { + memset(&mixer->aperture, 0, sizeof(mixer->aperture)); + } if (mixer->output.media_type) IMFMediaType_Release(mixer->output.media_type); mixer->output.media_type = type; @@ -1234,46 +1243,60 @@ static HRESULT video_mixer_get_d3d_device(struct video_mixer *mixer, IDirect3DDe return hr; } +static BOOL video_mixer_rect_needs_scaling(const MFVideoNormalizedRect *scale) +{ + return scale->left != 0.0f || scale->top != 0.0f || scale->right != 1.0f || scale->bottom != 1.0f; +} + static void video_mixer_scale_rect(RECT *rect, unsigned int width, unsigned int height, const MFVideoNormalizedRect *scale) { - if (scale->left == 0.0f && scale->top == 0.0f && scale->right == 1.0f && scale->bottom == 1.0f) - { - SetRect(rect, 0, 0, width, height); - } - else + if (video_mixer_rect_needs_scaling(scale)) { rect->left = width * scale->left; rect->right = width * scale->right; rect->top = height * scale->top; rect->bottom = height * scale->bottom; } + else + SetRect(rect, 0, 0, width, height); } -static void video_mixer_normalize_rect(const RECT *full, const RECT *part, MFVideoNormalizedRect *ret) +static void video_mixer_correct_aspect_ratio(const RECT *src, RECT *dst) { - float width = full->right - full->left; - float height = full->bottom - full->top; + unsigned int src_width = src->right - src->left, src_height = src->bottom - src->top; + unsigned int dst_width = dst->right - dst->left, dst_height = dst->bottom - dst->top; - ret->left = (part->left - full->left) / width; - ret->right = (part->right - full->left) / width; - ret->bottom = (part->bottom - full->top) / height; - ret->top = (part->top - full->top) / height; + if (src_width * dst_height > dst_width * src_height) + { + /* src is "wider" than dst. */ + unsigned int dst_center = (dst->top + dst->bottom) / 2; + unsigned int scaled_height = src_height * dst_width / src_width; + + dst->top = dst_center - scaled_height / 2; + dst->bottom = dst->top + scaled_height; + } + else if (src_width * dst_height < dst_width * src_height) + { + /* src is "taller" than dst. */ + unsigned int dst_center = (dst->left + dst->right) / 2; + unsigned int scaled_width = src_width * dst_height / src_height; + + dst->left = dst_center - scaled_width / 2; + dst->right = dst->left + scaled_width; + } } static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) { DXVA2_VideoSample samples[MAX_MIXER_INPUT_STREAMS] = {{ 0 }}; DXVA2_VideoProcessBltParams params = { 0 }; - MFVideoNormalizedRect zoom_rect, norm; - unsigned int i, sample_count = 0; - D3DSURFACE_DESC desc, rt_desc; + MFVideoNormalizedRect zoom_rect; struct input_stream *stream; HRESULT hr = S_OK; + unsigned int i; RECT dst; - IDirect3DSurface9_GetDesc(rt, &rt_desc); - if (FAILED(IMFAttributes_GetBlob(mixer->attributes, &VIDEO_ZOOM_RECT, (UINT8 *)&zoom_rect, sizeof(zoom_rect), NULL))) { @@ -1281,12 +1304,12 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) zoom_rect.right = zoom_rect.bottom = 1.0f; } - video_mixer_scale_rect(&dst, rt_desc.Width, rt_desc.Height, &zoom_rect); + SetRect(&dst, 0, 0, mixer->aperture.Area.cx, mixer->aperture.Area.cy); + OffsetRect(&dst, mixer->aperture.OffsetX.value, mixer->aperture.OffsetY.value); for (i = 0; i < mixer->input_count; ++i) { - RECT stream_dst, stream_vis; - + DXVA2_VideoSample *sample = &samples[i]; IDirect3DSurface9 *surface; stream = mixer->zorder[i]; @@ -1297,54 +1320,36 @@ static void video_mixer_render(struct video_mixer *mixer, IDirect3DSurface9 *rt) break; } - IDirect3DSurface9_GetDesc(surface, &desc); - - /* In order to compute source/destination rectangles for each stream: - - * per-stream rectangle is used to get destination rectangle in target coordinates; - * destination per-stream rectangle is clipped with zoom rectangle, applied to target coordinates; - * visible rectangle is scaled back to get source area of the stream that would be visible; - * visible rectangle is scaled back to get destination area in target coordinates for given steam. + /* Full input frame corrected to full destination rectangle. */ - */ + video_mixer_scale_rect(&sample->SrcRect, stream->frame_size.cx, stream->frame_size.cy, &zoom_rect); + CopyRect(&sample->DstRect, &dst); + video_mixer_correct_aspect_ratio(&sample->SrcRect, &sample->DstRect); - video_mixer_scale_rect(&stream_dst, rt_desc.Width, rt_desc.Height, &stream->rect); + if (video_mixer_rect_needs_scaling(&stream->rect)) + WARN("Ignoring stream %u rectangle %s.\n", stream->id, debugstr_normalized_rect(&stream->rect)); - /* Part of the stream that's visible after zooming. */ - if (!IntersectRect(&stream_vis, &stream_dst, &dst)) - { - IDirect3DSurface9_Release(surface); - continue; - } - - samples[sample_count].SampleFormat.SampleFormat = stream->id == 0 ? - DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; - samples[sample_count].SrcSurface = surface; - - video_mixer_normalize_rect(&stream_dst, &stream_vis, &norm); - video_mixer_scale_rect(&samples[sample_count].SrcRect, desc.Width, desc.Height, &norm); - - video_mixer_normalize_rect(&dst, &stream_vis, &norm); - video_mixer_scale_rect(&samples[sample_count].DstRect, rt_desc.Width, rt_desc.Height, &norm); - samples[sample_count].PlanarAlpha = DXVA2_Fixed32OpaqueAlpha(); - - sample_count++; + sample->SampleFormat.SampleFormat = stream->id == 0 ? DXVA2_SampleProgressiveFrame : DXVA2_SampleSubStream; + sample->SrcSurface = surface; + sample->PlanarAlpha = DXVA2_Fixed32OpaqueAlpha(); } if (SUCCEEDED(hr)) { - SetRect(&params.TargetRect, 0, 0, rt_desc.Width, rt_desc.Height); + SetRect(&params.TargetRect, 0, 0, mixer->aperture.Area.cx, mixer->aperture.Area.cy); + OffsetRect(&params.TargetRect, mixer->aperture.OffsetX.value, mixer->aperture.OffsetY.value); + params.BackgroundColor = mixer->bkgnd_color.ayuv; params.Alpha = DXVA2_Fixed32OpaqueAlpha(); if (FAILED(hr = IDirectXVideoProcessor_VideoProcessBlt(mixer->processor, rt, &params, samples, - sample_count, NULL))) + mixer->input_count, NULL))) { WARN("Failed to process samples, hr %#x.\n", hr); } } - for (i = 0; i < sample_count; ++i) + for (i = 0; i < mixer->input_count; ++i) { if (samples[i].SrcSurface) IDirect3DSurface9_Release(samples[i].SrcSurface);

1 0

Nikolay Sivov : evr/presenter: Remove logic related to picture aspect ratio adjustment.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 7462d77f0b8e53ac1c425b7d3e4beac39d0de594 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7462d77f0b8e53ac1c425b7d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 14:57:02 2021 +0300 evr/presenter: Remove logic related to picture aspect ratio adjustment. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 0381cb3e593..5f70d173c0b 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -483,8 +483,6 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM { IDirect3DSurface9 *surface, *backbuffer; IDirect3DDevice9 *device; - D3DSURFACE_DESC desc; - RECT dst, src; HRESULT hr; if (!presenter->swapchain) @@ -506,38 +504,7 @@ static void video_presenter_sample_present(struct video_presenter *presenter, IM IDirect3DSwapChain9_GetDevice(presenter->swapchain, &device); IDirect3DDevice9_StretchRect(device, surface, NULL, backbuffer, NULL, D3DTEXF_POINT); - IDirect3DSurface9_GetDesc(surface, &desc); - SetRect(&src, 0, 0, desc.Width, desc.Height); - - IDirect3DSurface9_GetDesc(backbuffer, &desc); - SetRect(&dst, 0, 0, desc.Width, desc.Height); - - if (presenter->ar_mode & MFVideoARMode_PreservePicture) - { - unsigned int src_width = src.right - src.left, src_height = src.bottom - src.top; - unsigned int dst_width = dst.right - dst.left, dst_height = dst.bottom - dst.top; - - if (src_width * dst_height > dst_width * src_height) - { - /* src is "wider" than dst. */ - unsigned int dst_center = (dst.top + dst.bottom) / 2; - unsigned int scaled_height = src_height * dst_width / src_width; - - dst.top = dst_center - scaled_height / 2; - dst.bottom = dst.top + scaled_height; - } - else if (src_width * dst_height < dst_width * src_height) - { - /* src is "taller" than dst. */ - unsigned int dst_center = (dst.left + dst.right) / 2; - unsigned int scaled_width = src_width * dst_height / src_height; - - dst.left = dst_center - scaled_width / 2; - dst.right = dst.left + scaled_width; - } - } - - IDirect3DSwapChain9_Present(presenter->swapchain, &src, &dst, NULL, NULL, 0); + IDirect3DSwapChain9_Present(presenter->swapchain, NULL, NULL, NULL, NULL, 0); presenter->frame_stats.presented++; IDirect3DDevice9_Release(device);

1 0

Nikolay Sivov : evr/presenter: Add missing break in get_FramesDrawn() (Coverity).
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: e57e19c2360beb6ec27a65aa75f29d14636cd321 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e57e19c2360beb6ec27a65aa… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 8 14:57:03 2021 +0300 evr/presenter: Add missing break in get_FramesDrawn() (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/presenter.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/evr/presenter.c b/dlls/evr/presenter.c index 5f70d173c0b..fd02404b7af 100644 --- a/dlls/evr/presenter.c +++ b/dlls/evr/presenter.c @@ -1754,6 +1754,7 @@ static HRESULT WINAPI video_presenter_qualprop_get_FramesDrawn(IQualProp *iface, case PRESENTER_STATE_PAUSED: if (frames) *frames = presenter->frame_stats.presented; else hr = E_POINTER; + break; default: hr = E_NOTIMPL; }

1 0

Andrew Eikum : msvcrt: Better handle multiple width specifiers.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 0c6bab9339d62c8952692911f055ccbc95d956f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c6bab9339d62c8952692911… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Nov 8 09:42:45 2021 -0600 msvcrt: Better handle multiple width specifiers. Includes feedback from David Gow <david(a)davidgow.net> and Piotr Caban. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/printf.h | 9 ++++++++- dlls/msvcrt/tests/printf.c | 12 ++++++++++++ dlls/ucrtbase/tests/printf.c | 19 +++++++++++++++++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index aeb1290f48f..c34479c5688 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -1050,7 +1050,14 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API flags.LeftAlign = TRUE; flags.FieldLength = -flags.FieldLength; } - } else while (*p >= '0' && *p <= '9') { + } + +#if _MSVCR_VER >= 140 + if (*p >= '0' && *p <= '9') + flags.FieldLength = 0; +#endif + + while (*p >= '0' && *p <= '9') { flags.FieldLength *= 10; flags.FieldLength += *p++ - '0'; } diff --git a/dlls/msvcrt/tests/printf.c b/dlls/msvcrt/tests/printf.c index 06acf4c8450..010cad0ab8f 100644 --- a/dlls/msvcrt/tests/printf.c +++ b/dlls/msvcrt/tests/printf.c @@ -396,6 +396,18 @@ static void test_sprintf( void ) ok(!strcmp(buffer, "string to copy"), "failed: \"%s\"\n", buffer); setlocale(LC_ALL, "C"); + + r = p_sprintf(buffer, "%*1d", 1, 3); + ok(r==11, "r = %d\n", r); + ok(!strcmp(buffer, " 3"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "%0*0d", 1, 2); + ok(r==10, "r = %d\n", r); + ok(!strcmp(buffer, "0000000002"), "failed: \"%s\"\n", buffer); + + r = p_sprintf(buffer, "% *2d", 0, 7); + ok(r==2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "failed: \"%s\"\n", buffer); } static void test_swprintf( void ) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 4f20ccff9a4..51a54426bc4 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -845,6 +845,24 @@ static void test_printf_fp(void) } } +static void test_printf_width_specification(void) +{ + int r; + char buffer[20]; + + r = vsprintf_wrapper(0, buffer, sizeof(buffer), "%0*2d", 1, 3); + ok(r == 2, "r = %d\n", r); + ok(!strcmp(buffer, "03"), "buffer wrong, got=%s\n", buffer); + + r = vsprintf_wrapper(0, buffer, sizeof(buffer), "%*0d", 1, 2); + ok(r == 1, "r = %d\n", r); + ok(!strcmp(buffer, "2"), "buffer wrong, got=%s\n", buffer); + + r = vsprintf_wrapper(0, buffer, sizeof(buffer), "% *2d", 0, 7); + ok(r == 2, "r = %d\n", r); + ok(!strcmp(buffer, " 7"), "buffer wrong, got=%s\n", buffer); +} + START_TEST(printf) { ok(_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, @@ -862,4 +880,5 @@ START_TEST(printf) test_printf_c99(); test_printf_natural_string(); test_printf_fp(); + test_printf_width_specification(); }

1 0

Alistair Leslie-Hughes : msdasql: Implement IDBProperties SetProperties.
by Alexandre Julliard 08 Nov '21

08 Nov '21

Module: wine Branch: master Commit: 0f0d3c48594ed6025ad0ce18d8edd90b550ec1f6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f0d3c48594ed6025ad0ce18… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon Nov 8 21:29:06 2021 +1100 msdasql: Implement IDBProperties SetProperties. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msdasql/msdasql_main.c | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/msdasql/msdasql_main.c b/dlls/msdasql/msdasql_main.c index d14f7957978..e58facc47fc 100644 --- a/dlls/msdasql/msdasql_main.c +++ b/dlls/msdasql/msdasql_main.c @@ -424,10 +424,27 @@ static HRESULT WINAPI dbprops_SetProperties(IDBProperties *iface, ULONG cPropert DBPROPSET rgPropertySets[]) { struct msdasql *provider = impl_from_IDBProperties(iface); + int i, j, k; - FIXME("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); + TRACE("(%p)->(%d %p)\n", provider, cPropertySets, rgPropertySets); - return E_NOTIMPL; + for (i=0; i < cPropertySets; i++) + { + for (j=0; j < rgPropertySets[i].cProperties; j++) + { + for(k=0; k < ARRAY_SIZE(provider->properties); k++) + { + if (provider->properties[k].id == rgPropertySets[i].rgProperties[j].dwPropertyID) + { + TRACE("Found property %d\n", provider->properties[k].id); + VariantCopy(&provider->properties[k].value, &rgPropertySets[i].rgProperties[j].vValue); + break; + } + } + } + } + + return S_OK; } static const struct IDBPropertiesVtbl dbprops_vtbl =

1 0