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

Rémi Bernon : include: Add Windows.Gaming.Input.IGamepadStatics2 interface declaration.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: a9fbfa1b9c5e929ae99957eeb353565be5f3af13 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a9fbfa1b9c5e929ae99957ee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 8 10:55:25 2022 +0100 include: Add Windows.Gaming.Input.IGamepadStatics2 interface declaration. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/windows.gaming.input.idl | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/include/windows.gaming.input.idl b/include/windows.gaming.input.idl index 6a5fc8af1ee..5bf94f78820 100644 --- a/include/windows.gaming.input.idl +++ b/include/windows.gaming.input.idl @@ -293,6 +293,18 @@ namespace Windows.Gaming.Input { [propget] HRESULT Gamepads([out, retval] Windows.Foundation.Collections.IVectorView<Gamepad *> **value); } + [ + contract(Windows.Foundation.UniversalApiContract, 4.0), + exclusiveto(Windows.Gaming.Input.Gamepad), + uuid(42676dc5-0856-47c4-9213-b395504c3a3c) + ] + interface IGamepadStatics2 : IInspectable + requires Windows.Gaming.Input.IGamepadStatics + { + HRESULT FromGameController([in] Windows.Gaming.Input.IGameController *controller, + [out, retval] Windows.Gaming.Input.Gamepad **value); + } + [ contract(Windows.Foundation.UniversalApiContract, 1.0), exclusiveto(Windows.Gaming.Input.Headset),

1 0

Jacek Caban : win32u: Move GWLP_HWNDPARENT implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 115f3f3a0adcbd1ffee7d4987eb3cce40d6c3d3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=115f3f3a0adcbd1ffee7d498… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:24:07 2022 +0100 win32u: Move GWLP_HWNDPARENT implementation from user32. 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/user32/win.c | 14 -------------- dlls/win32u/window.c | 6 ++++-- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index eecc696023a..fe8d929a102 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2555,21 +2555,11 @@ LONG_PTR WIN_SetWindowLong( HWND hwnd, INT offset, UINT size, LONG_PTR newval, B } -/* FIXME: move to win32u */ -static ULONG_PTR get_hwnd_parent( HWND hwnd ) -{ - HWND parent = NtUserGetAncestor( hwnd, GA_PARENT ); - if (parent == GetDesktopWindow()) parent = GetWindow( hwnd, GW_OWNER ); - return (ULONG_PTR)parent; -} - - /********************************************************************** * GetWindowWord (USER32.@) */ WORD WINAPI GetWindowWord( HWND hwnd, INT offset ) { - if (offset == GWLP_HWNDPARENT) return get_hwnd_parent( hwnd ); return NtUserCallHwndParam( hwnd, offset, NtUserGetWindowWord ); } @@ -2590,7 +2580,6 @@ LONG WINAPI GetWindowLongA( HWND hwnd, INT offset ) return 0; #endif default: - if (offset == GWLP_HWNDPARENT) return get_hwnd_parent( hwnd ); return NtUserCallHwndParam( hwnd, offset, NtUserGetWindowLongA ); } } @@ -2612,7 +2601,6 @@ LONG WINAPI GetWindowLongW( HWND hwnd, INT offset ) return 0; #endif default: - if (offset == GWLP_HWNDPARENT) return get_hwnd_parent( hwnd ); return NtUserCallHwndParam( hwnd, offset, NtUserGetWindowLongW ); } } @@ -3805,7 +3793,6 @@ BOOL WINAPI SetProcessDefaultLayout( DWORD layout ) */ LONG_PTR WINAPI GetWindowLongPtrW( HWND hwnd, INT offset ) { - if (offset == GWLP_HWNDPARENT) return get_hwnd_parent( hwnd ); return NtUserCallHwndParam( hwnd, offset, NtUserGetWindowLongPtrW ); } @@ -3814,7 +3801,6 @@ LONG_PTR WINAPI GetWindowLongPtrW( HWND hwnd, INT offset ) */ LONG_PTR WINAPI GetWindowLongPtrA( HWND hwnd, INT offset ) { - if (offset == GWLP_HWNDPARENT) return get_hwnd_parent( hwnd ); return NtUserCallHwndParam( hwnd, offset, NtUserGetWindowLongPtrA ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 3ac177d310a..f7f0d4e6a65 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -612,8 +612,10 @@ static LONG_PTR get_window_long_size( HWND hwnd, INT offset, UINT size, BOOL ans if (offset == GWLP_HWNDPARENT) { - FIXME( "GWLP_HWNDPARENT not supported\n" ); - return 0; + HWND parent = NtUserGetAncestor( hwnd, GA_PARENT ); + if (user_callbacks && parent == user_callbacks->pGetDesktopWindow()) + parent = get_window_relative( hwnd, GW_OWNER ); + return (ULONG_PTR)parent; } if (!(win = get_win_ptr( hwnd )))

1 0

Jacek Caban : win32u: Move IsWindowVisible implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: a36fcc827acb1c2934dcf03ff76be99353325c93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a36fcc827acb1c2934dcf03f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:24:20 2022 +0100 win32u: Move IsWindowVisible implementation from user32. 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/user32/win.c | 15 +-------------- dlls/win32u/window.c | 21 +++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 58c581c26da..a22b80da6a9 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3016,20 +3016,7 @@ BOOL WINAPI IsChild( HWND parent, HWND child ) */ BOOL WINAPI IsWindowVisible( HWND hwnd ) { - HWND *list; - BOOL retval = TRUE; - int i; - - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_VISIBLE)) return FALSE; - if (!(list = list_window_parents( hwnd ))) return TRUE; - if (list[0]) - { - for (i = 0; list[i+1]; i++) - if (!(GetWindowLongW( list[i], GWL_STYLE ) & WS_VISIBLE)) break; - retval = !list[i+1] && (list[i] == GetDesktopWindow()); /* top message window isn't visible */ - } - HeapFree( GetProcessHeap(), 0, list ); - return retval; + return NtUserCallHwnd( hwnd, NtUserIsWindowVisible ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 3c65d3ec1ce..e13107d1d64 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -606,6 +606,25 @@ BOOL is_child( HWND parent, HWND child ) return ret; } +/* see IsWindowVisible */ +static BOOL is_window_visible( HWND hwnd ) +{ + HWND *list; + BOOL retval = TRUE; + int i; + + if (!(get_window_long( hwnd, GWL_STYLE ) & WS_VISIBLE)) return FALSE; + if (!(list = list_window_parents( hwnd ))) return TRUE; + if (list[0]) + { + for (i = 0; list[i+1]; i++) + if (!(get_window_long( list[i], GWL_STYLE ) & WS_VISIBLE)) break; + retval = !list[i+1] && (list[i] == user_callbacks->pGetDesktopWindow()); /* top message window isn't visible */ + } + free( list ); + return retval; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -955,6 +974,8 @@ DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) return get_server_window_text( hwnd, NULL, 0 ); case NtUserIsWindow: return is_window( hwnd ); + case NtUserIsWindowVisible: + return is_window_visible( hwnd ); default: FIXME( "invalid code %u\n", code ); return 0; diff --git a/include/ntuser.h b/include/ntuser.h index 8d724971d53..20fa61bacec 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -142,6 +142,7 @@ enum NtUserGetParent, NtUserGetWindowTextLength, NtUserIsWindow, + NtUserIsWindowVisible, }; /* NtUserCallHwndParam codes, not compatible with Windows */

1 0

Rémi Bernon : windows.gaming.input: Implement IRawGameControllerStatics_FromGameController.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: d45a2a14cd51d1b5fc011eb5a80beb4b68cba76f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d45a2a14cd51d1b5fc011eb5… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Tue Mar 8 10:55:23 2022 +0100 windows.gaming.input: Implement IRawGameControllerStatics_FromGameController. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windows.gaming.input/controller.c | 16 ++++++++++++++-- dlls/windows.gaming.input/main.c | 7 +++---- dlls/windows.gaming.input/manager.c | 27 ++++++++++++++++++++++++--- dlls/windows.gaming.input/private.h | 2 +- 4 files changed, 42 insertions(+), 10 deletions(-) diff --git a/dlls/windows.gaming.input/controller.c b/dlls/windows.gaming.input/controller.c index 27c5d6ebd32..94343c0927d 100644 --- a/dlls/windows.gaming.input/controller.c +++ b/dlls/windows.gaming.input/controller.c @@ -174,8 +174,20 @@ static HRESULT WINAPI statics_get_RawGameControllers( IRawGameControllerStatics static HRESULT WINAPI statics_FromGameController( IRawGameControllerStatics *iface, IGameController *game_controller, IRawGameController **value ) { - FIXME( "iface %p, game_controller %p, value %p stub!\n", iface, game_controller, value ); - return E_NOTIMPL; + struct controller_statics *impl = impl_from_IRawGameControllerStatics( iface ); + IGameController *controller; + HRESULT hr; + + TRACE( "iface %p, game_controller %p, value %p.\n", iface, game_controller, value ); + + hr = IGameControllerFactoryManagerStatics2_TryGetFactoryControllerFromGameController( manager_factory, &impl->ICustomGameControllerFactory_iface, + game_controller, &controller ); + if (FAILED(hr)) return hr; + + hr = IGameController_QueryInterface( controller, &IID_IRawGameController, (void **)value ); + IGameController_Release( controller ); + + return hr; } static const struct IRawGameControllerStaticsVtbl statics_vtbl = diff --git a/dlls/windows.gaming.input/main.c b/dlls/windows.gaming.input/main.c index e71043fcb0f..c5b7f19c987 100644 --- a/dlls/windows.gaming.input/main.c +++ b/dlls/windows.gaming.input/main.c @@ -169,7 +169,7 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** { static INIT_ONCE init_once = INIT_ONCE_STATIC_INIT; const WCHAR *buffer = WindowsGetStringRawBuffer( class_str, NULL ); - HRESULT hr = S_OK; + HRESULT hr = REGDB_E_CLASSNOTREG; TRACE( "class %s, factory %p.\n", debugstr_w(buffer), factory ); @@ -182,10 +182,9 @@ HRESULT WINAPI DllGetActivationFactory( HSTRING class_str, IActivationFactory ** if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Gamepad )) hr = ICustomGameControllerFactory_QueryInterface( gamepad_factory, &IID_IActivationFactory, (void **)factory ); if (!wcscmp( buffer, RuntimeClass_Windows_Gaming_Input_Custom_GameControllerFactoryManager )) - IActivationFactory_AddRef( (*factory = manager_factory) ); + hr = IGameControllerFactoryManagerStatics2_QueryInterface( manager_factory, &IID_IActivationFactory, (void **)factory ); - if (SUCCEEDED(hr) && *factory) return S_OK; - return REGDB_E_CLASSNOTREG; + return hr; } BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, void *reserved ) diff --git a/dlls/windows.gaming.input/manager.c b/dlls/windows.gaming.input/manager.c index 15388f7df5d..33f2a3c3df9 100644 --- a/dlls/windows.gaming.input/manager.c +++ b/dlls/windows.gaming.input/manager.c @@ -370,8 +370,29 @@ statics2_TryGetFactoryControllerFromGameController( IGameControllerFactoryManage ICustomGameControllerFactory *factory, IGameController *controller, IGameController **value ) { - FIXME( "iface %p, factory %p, controller %p, value %p stub!\n", iface, factory, controller, value ); - return E_NOTIMPL; + struct controller *entry, *other; + BOOL found = FALSE; + + TRACE( "iface %p, factory %p, controller %p, value %p.\n", iface, factory, controller, value ); + + EnterCriticalSection( &manager_cs ); + + LIST_FOR_EACH_ENTRY( entry, &controller_list, struct controller, entry ) + if ((found = &entry->IGameController_iface == controller)) break; + + if (!found) WARN( "Failed to find controller %p\n", controller ); + else + { + LIST_FOR_EACH_ENTRY( other, &controller_list, struct controller, entry ) + if ((found = entry->provider == other->provider && other->factory == factory)) break; + if (!found) WARN( "Failed to find controller %p, factory %p\n", controller, factory ); + else IGameController_AddRef( (*value = &other->IGameController_iface) ); + } + + LeaveCriticalSection( &manager_cs ); + + if (!found) return E_FAIL; + return S_OK; } static const struct IGameControllerFactoryManagerStatics2Vtbl statics2_vtbl = @@ -395,7 +416,7 @@ static struct manager_statics manager_statics = 1, }; -IActivationFactory *manager_factory = &manager_statics.IActivationFactory_iface; +IGameControllerFactoryManagerStatics2 *manager_factory = &manager_statics.IGameControllerFactoryManagerStatics2_iface; static HRESULT controller_create( ICustomGameControllerFactory *factory, IGameControllerProvider *provider, struct controller **out ) diff --git a/dlls/windows.gaming.input/private.h b/dlls/windows.gaming.input/private.h index 27dbdb8416c..56d03abad44 100644 --- a/dlls/windows.gaming.input/private.h +++ b/dlls/windows.gaming.input/private.h @@ -39,7 +39,7 @@ extern HINSTANCE windows_gaming_input; extern ICustomGameControllerFactory *controller_factory; extern ICustomGameControllerFactory *gamepad_factory; -extern IActivationFactory *manager_factory; +extern IGameControllerFactoryManagerStatics2 *manager_factory; extern HRESULT vector_create( REFIID iid, REFIID view_iid, void **out );

1 0

Paul Gofman : ws2_32: Return WSAEFAULT from setsockopt() for IP_MULTICAST_TTL with zero optlen.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 5f9da35af1a0d82ceffabac27c57122bda1fcf2e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5f9da35af1a0d82ceffabac2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 8 12:22:45 2022 +0300 ws2_32: Return WSAEFAULT from setsockopt() for IP_MULTICAST_TTL with zero optlen. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 816ca828b90..ed2889b3eb0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2989,6 +2989,11 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_LOOP, optval, optlen ); case IP_MULTICAST_TTL: + if (!optlen) + { + SetLastError( WSAEFAULT ); + return -1; + } return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL, optval, optlen ); case IP_OPTIONS:

1 0

Santino Mazza : bcrypt: Implement KeyLength property.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: bae287a1aad210c66dd067614d97c409a4fc4d35 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bae287a1aad210c66dd06761… Author: Santino Mazza <mazzasantino1206(a)gmail.com> Date: Tue Mar 8 11:10:54 2022 +0100 bcrypt: Implement KeyLength property. Signed-off-by: Santino Mazza <mazzasantino1206(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 6 ++++++ dlls/bcrypt/tests/bcrypt.c | 20 +++++++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 072b7915b1e..5df4da009a4 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -701,6 +701,12 @@ static NTSTATUS set_key_property( struct key *key, const WCHAR *prop, UCHAR *val return STATUS_NOT_IMPLEMENTED; } } + else if (!wcscmp( prop, BCRYPT_KEY_LENGTH )) + { + if (size < sizeof(DWORD)) return STATUS_INVALID_PARAMETER; + key->u.a.bitlen = *(DWORD*)value; + return STATUS_SUCCESS; + } FIXME( "unsupported key property %s\n", debugstr_w(prop) ); return STATUS_NOT_IMPLEMENTED; diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index 4d7516a55ac..8982e0ae90b 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -672,6 +672,7 @@ static void test_BCryptGenerateSymmetricKey(void) BCRYPT_KEY_LENGTHS_STRUCT key_lengths; ULONG size, len, i; NTSTATUS ret; + DWORD keylen; ret = BCryptOpenAlgorithmProvider(&aes, BCRYPT_AES_ALGORITHM, NULL, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); @@ -706,6 +707,13 @@ static void test_BCryptGenerateSymmetricKey(void) sizeof(BCRYPT_CHAIN_MODE_CBC), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + todo_wine + { + keylen = 512; + ret = BCryptSetProperty(aes, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); + ok(ret == STATUS_NOT_SUPPORTED, "got %#lx\n", ret); + } + size = 0; memset(mode, 0, sizeof(mode)); ret = BCryptGetProperty(key, BCRYPT_CHAINING_MODE, mode, sizeof(mode), &size, 0); @@ -2005,6 +2013,7 @@ static void test_RSA(void) ULONG len, size, size2, schemes; NTSTATUS ret; BYTE *buf; + DWORD keylen; ret = BCryptOpenAlgorithmProvider(&alg, BCRYPT_RSA_ALGORITHM, NULL, 0); if (ret) @@ -2052,12 +2061,21 @@ static void test_RSA(void) ok(!ret, "BCryptDestroyKey failed: %#lx\n", ret); /* sign/verify with export/import round-trip */ - ret = BCryptGenerateKeyPair(alg, &key, 512, 0); + ret = BCryptGenerateKeyPair(alg, &key, 1024, 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + + keylen = 512; + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, 2, 0); + ok(ret == STATUS_INVALID_PARAMETER, "got %#lx\n", ret); + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); ret = BCryptFinalizeKeyPair(key, 0); ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + ret = BCryptSetProperty(key, BCRYPT_KEY_LENGTH, (UCHAR *)&keylen, sizeof(keylen), 0); + ok(ret == STATUS_SUCCESS, "got %#lx\n", ret); + pad.pszAlgId = BCRYPT_SHA1_ALGORITHM; memset(sig, 0, sizeof(sig)); ret = BCryptSignHash(key, &pad, hash, sizeof(hash), sig, sizeof(sig), &len, BCRYPT_PAD_PKCS1);

1 0

Jacek Caban : win32u: Move NtUserInternalGetWindowText implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 90c13be9dde8ea32cbe4958e2ba3bc0bf1669a2f URL: https://source.winehq.org/git/wine.git/?a=commit;h=90c13be9dde8ea32cbe4958e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:23:37 2022 +0100 win32u: Move NtUserInternalGetWindowText implementation from user32. 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/user32/button.c | 2 +- dlls/user32/mdi.c | 4 ++-- dlls/user32/spy.c | 2 +- dlls/user32/static.c | 2 +- dlls/user32/tests/win.c | 5 +++++ dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 26 +------------------------- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 43 +++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 9 +++++++++ include/ntuser.h | 1 + 13 files changed, 68 insertions(+), 32 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index e3af68e0e54..5fdf4803c18 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -173,7 +173,7 @@ static inline WCHAR *get_button_text( HWND hwnd ) { static const INT len = 512; WCHAR *buffer = HeapAlloc( GetProcessHeap(), 0, (len + 1) * sizeof(WCHAR) ); - if (buffer) InternalGetWindowText( hwnd, buffer, len + 1 ); + if (buffer) NtUserInternalGetWindowText( hwnd, buffer, len + 1 ); return buffer; } diff --git a/dlls/user32/mdi.c b/dlls/user32/mdi.c index 66f258bb3f3..4b8e0bcd7fd 100644 --- a/dlls/user32/mdi.c +++ b/dlls/user32/mdi.c @@ -452,7 +452,7 @@ static LRESULT MDI_RefreshMenu(MDICLIENTINFO *ci) buf[0] = '&'; buf[1] = '0' + visible; buf[2] = ' '; - InternalGetWindowText(ci->child[i], buf + 3, ARRAY_SIZE(buf) - 3); + NtUserInternalGetWindowText(ci->child[i], buf + 3, ARRAY_SIZE(buf) - 3); TRACE("Adding %p, id %u %s\n", ci->child[i], id, debugstr_w(buf)); AppendMenuW(ci->hWindowMenu, MF_STRING, id, buf); @@ -1911,7 +1911,7 @@ static INT_PTR WINAPI MDI_MoreWindowsDlgProc (HWND hDlg, UINT iMsg, WPARAM wPara { WCHAR buffer[MDI_MAXTITLELENGTH]; - if (!InternalGetWindowText(ci->child[i], buffer, ARRAY_SIZE(buffer))) + if (!NtUserInternalGetWindowText(ci->child[i], buffer, ARRAY_SIZE(buffer))) continue; SendMessageW(hListBox, LB_ADDSTRING, 0, (LPARAM)buffer ); SendMessageW(hListBox, LB_SETITEMDATA, i, (LPARAM)ci->child[i] ); diff --git a/dlls/user32/spy.c b/dlls/user32/spy.c index 8093799ed6b..dc8e0b2a708 100644 --- a/dlls/user32/spy.c +++ b/dlls/user32/spy.c @@ -2186,7 +2186,7 @@ static void SPY_GetWndName( SPY_INSTANCE *sp_e ) SPY_GetClassName( sp_e ); - len = InternalGetWindowText(sp_e->msg_hwnd, sp_e->wnd_name, ARRAY_SIZE(sp_e->wnd_name)); + len = NtUserInternalGetWindowText( sp_e->msg_hwnd, sp_e->wnd_name, ARRAY_SIZE(sp_e->wnd_name) ); if(!len) /* get class name */ { LPWSTR dst = sp_e->wnd_name; diff --git a/dlls/user32/static.c b/dlls/user32/static.c index 8de216269c1..d19df22dcb9 100644 --- a/dlls/user32/static.c +++ b/dlls/user32/static.c @@ -635,7 +635,7 @@ static void STATIC_PaintTextfn( HWND hwnd, HDC hdc, HBRUSH hbrush, DWORD style ) if (!(text = HeapAlloc( GetProcessHeap(), 0, buf_size * sizeof(WCHAR) ))) goto no_TextOut; - while ((len = InternalGetWindowText( hwnd, text, buf_size )) == buf_size - 1) + while ((len = NtUserInternalGetWindowText( hwnd, text, buf_size )) == buf_size - 1) { buf_size *= 2; if (!(text = HeapReAlloc( GetProcessHeap(), 0, text, buf_size * sizeof(WCHAR) ))) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index d6087873f21..cfcec5cc78f 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -8308,6 +8308,11 @@ static void test_gettext(void) ok( !strcmp(buf, "blah"), "got %s\n", buf ); ok( num_gettext_msgs == 0, "got %u WM_GETTEXT messages\n", num_gettext_msgs ); + bufW[0] = 0xcc; + buf_len = InternalGetWindowText( hwnd, bufW, ARRAYSIZE(bufW) ); + ok( buf_len == ARRAYSIZE("caption") - 1, "expected a nonempty window text\n" ); + ok( !lstrcmpW( bufW, L"caption" ), "got %s\n", debugstr_w(bufW) ); + g_wm_gettext_override.enabled = FALSE; /* same for W window */ diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec index 88f73206943..cdd8815f67c 100644 --- a/dlls/user32/user32.spec +++ b/dlls/user32/user32.spec @@ -446,7 +446,7 @@ @ stdcall InsertMenuItemW(long long long ptr) @ stdcall InsertMenuW(long long long long ptr) @ stdcall InternalGetWindowIcon(ptr long) -@ stdcall InternalGetWindowText(long ptr long) +@ stdcall InternalGetWindowText(long ptr long) NtUserInternalGetWindowText @ stdcall IntersectRect(ptr ptr ptr) @ stdcall InvalidateRect(long ptr long) @ stdcall InvalidateRgn(long long long) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index a71753bd148..fc31e0cc01d 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2037,7 +2037,7 @@ HWND WINAPI FindWindowExW( HWND parent, HWND child, LPCWSTR className, LPCWSTR t { while (list[i]) { - if (InternalGetWindowText( list[i], buffer, len + 1 )) + if (NtUserInternalGetWindowText( list[i], buffer, len + 1 )) { if (!wcsicmp( buffer, title )) break; } @@ -2944,30 +2944,6 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) } -/******************************************************************* - * InternalGetWindowText (USER32.@) - */ -INT WINAPI InternalGetWindowText(HWND hwnd,LPWSTR lpString,INT nMaxCount ) -{ - WND *win; - - if (nMaxCount <= 0) return 0; - if (!(win = WIN_GetPtr( hwnd ))) return 0; - if (win == WND_DESKTOP) lpString[0] = 0; - else if (win != WND_OTHER_PROCESS) - { - if (win->text) lstrcpynW( lpString, win->text, nMaxCount ); - else lpString[0] = 0; - WIN_ReleasePtr( win ); - } - else - { - get_server_window_text( hwnd, lpString, nMaxCount ); - } - return lstrlenW(lpString); -} - - /******************************************************************* * GetWindowTextW (USER32.@) */ diff --git a/dlls/win32u/syscall.c b/dlls/win32u/syscall.c index 95cb2452f9c..19c03b277b1 100644 --- a/dlls/win32u/syscall.c +++ b/dlls/win32u/syscall.c @@ -139,6 +139,7 @@ static void * const syscalls[] = NtUserGetSystemDpiForProcess, NtUserGetThreadDesktop, NtUserInitializeClientPfnArrays, + NtUserInternalGetWindowText, NtUserNotifyWinEvent, NtUserOpenDesktop, NtUserOpenInputDesktop, diff --git a/dlls/win32u/win32u.spec b/dlls/win32u/win32u.spec index d0561ad8e58..e3e7b31b4a2 100644 --- a/dlls/win32u/win32u.spec +++ b/dlls/win32u/win32u.spec @@ -1045,7 +1045,7 @@ @ stub NtUserInjectTouchInput @ stub NtUserInteractiveControlQueryUsage @ stub NtUserInternalGetWindowIcon -@ stub NtUserInternalGetWindowText +@ stdcall -syscall NtUserInternalGetWindowText(long ptr long) @ stub NtUserInternalToUnicode @ stub NtUserInvalidateRect @ stub NtUserInvalidateRgn diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index b0aab45d28d..93ee0ffd164 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -425,6 +425,49 @@ NTSTATUS WINAPI NtUserBuildHwndList( HDESK desktop, ULONG unk2, ULONG unk3, ULON return STATUS_SUCCESS; } +/* Retrieve the window text from the server. */ +static data_size_t get_server_window_text( HWND hwnd, WCHAR *text, data_size_t count ) +{ + data_size_t len = 0, needed = 0; + + SERVER_START_REQ( get_window_text ) + { + req->handle = wine_server_user_handle( hwnd ); + if (count) wine_server_set_reply( req, text, (count - 1) * sizeof(WCHAR) ); + if (!wine_server_call_err( req )) + { + needed = reply->length; + len = wine_server_reply_size(reply); + } + } + SERVER_END_REQ; + if (text) text[len / sizeof(WCHAR)] = 0; + return needed; +} + +/******************************************************************* + * NtUserInternalGetWindowText (win32u.@) + */ +INT WINAPI NtUserInternalGetWindowText( HWND hwnd, WCHAR *text, INT count ) +{ + WND *win; + + if (count <= 0) return 0; + if (!(win = get_win_ptr( hwnd ))) return 0; + if (win == WND_DESKTOP) text[0] = 0; + else if (win != WND_OTHER_PROCESS) + { + if (win->text) lstrcpynW( text, win->text, count ); + else text[0] = 0; + release_win_ptr( win ); + } + else + { + get_server_window_text( hwnd, text, count ); + } + return lstrlenW(text); +} + /***************************************************************************** * NtUserCallHwnd (win32u.@) */ diff --git a/dlls/wow64win/syscall.h b/dlls/wow64win/syscall.h index 6ca0daee71a..78ba09645b2 100644 --- a/dlls/wow64win/syscall.h +++ b/dlls/wow64win/syscall.h @@ -124,6 +124,7 @@ SYSCALL_ENTRY( NtUserGetSystemDpiForProcess ) \ SYSCALL_ENTRY( NtUserGetThreadDesktop ) \ SYSCALL_ENTRY( NtUserInitializeClientPfnArrays ) \ + SYSCALL_ENTRY( NtUserInternalGetWindowText ) \ SYSCALL_ENTRY( NtUserNotifyWinEvent ) \ SYSCALL_ENTRY( NtUserOpenDesktop ) \ SYSCALL_ENTRY( NtUserOpenInputDesktop ) \ diff --git a/dlls/wow64win/user.c b/dlls/wow64win/user.c index 51879956a7c..a72b0307cc5 100644 --- a/dlls/wow64win/user.c +++ b/dlls/wow64win/user.c @@ -214,6 +214,15 @@ NTSTATUS WINAPI wow64_NtUserBuildHwndList( UINT *args ) return status; } +NTSTATUS WINAPI wow64_NtUserInternalGetWindowText( UINT *args ) +{ + HWND hwnd = get_handle( &args ); + WCHAR *text = get_ptr( &args ); + INT count = get_ulong( &args ); + + return NtUserInternalGetWindowText( hwnd, text, count ); +} + NTSTATUS WINAPI wow64_NtUserGetLayeredWindowAttributes( UINT *args ) { HWND hwnd = get_handle( &args ); diff --git a/include/ntuser.h b/include/ntuser.h index 6111d227476..34d75f4f726 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -312,6 +312,7 @@ BOOL WINAPI NtUserGetUpdatedClipboardFormats( UINT *formats, UINT size, UINT NTSTATUS WINAPI NtUserInitializeClientPfnArrays( const struct user_client_procs *client_procsA, const struct user_client_procs *client_procsW, const void *client_workers, HINSTANCE user_module ); +INT WINAPI NtUserInternalGetWindowText( HWND hwnd, WCHAR *text, INT count ); BOOL WINAPI NtUserIsClipboardFormatAvailable( UINT format ); UINT WINAPI NtUserMapVirtualKeyEx( UINT code, UINT type, HKL layout ); void WINAPI NtUserNotifyWinEvent( DWORD event, HWND hwnd, LONG object_id, LONG child_id );

1 0

Jacek Caban : user32: Use NtUserInternalGetWindowText in GetWindowText.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 6c49dfff14bff4a07570c8e42465c87bfe9b1e8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=6c49dfff14bff4a07570c8e4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:23:41 2022 +0100 user32: Use NtUserInternalGetWindowText in GetWindowText. Instead of get_server_window_text. 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/user32/win.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index fc31e0cc01d..9c2ceedd6a3 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2927,7 +2927,7 @@ INT WINAPI GetWindowTextA( HWND hwnd, LPSTR lpString, INT nMaxCount ) else if ((buffer = HeapAlloc( GetProcessHeap(), 0, nMaxCount * sizeof(WCHAR) ))) { /* when window belongs to other process, don't send a message */ - get_server_window_text( hwnd, buffer, nMaxCount ); + NtUserInternalGetWindowText( hwnd, buffer, nMaxCount ); if (!WideCharToMultiByte( CP_ACP, 0, buffer, -1, lpString, nMaxCount, NULL, NULL )) lpString[nMaxCount-1] = 0; HeapFree( GetProcessHeap(), 0, buffer ); @@ -2964,8 +2964,7 @@ INT WINAPI GetWindowTextW( HWND hwnd, LPWSTR lpString, INT nMaxCount ) else { /* when window belongs to other process, don't send a message */ - get_server_window_text( hwnd, lpString, nMaxCount ); - ret = lstrlenW(lpString); + ret = NtUserInternalGetWindowText( hwnd, lpString, nMaxCount ); } } __EXCEPT_PAGE_FAULT

1 0

Jacek Caban : win32u: Move GetWindowTextLength implementation from user32.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: d312083e0add3a5752f6fd6e265a667f22d71af7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d312083e0add3a5752f6fd6e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:23:45 2022 +0100 win32u: Move GetWindowTextLength implementation from user32. 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/user32/win.c | 29 ++--------------------------- dlls/win32u/window.c | 2 ++ include/ntuser.h | 1 + 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 9c2ceedd6a3..0aa0a0b6f08 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -399,31 +399,6 @@ void update_window_state( HWND hwnd ) } -/******************************************************************* - * get_server_window_text - * - * Retrieve the window text from the server. - */ -static data_size_t get_server_window_text( HWND hwnd, WCHAR *text, data_size_t count ) -{ - data_size_t len = 0, needed = 0; - - SERVER_START_REQ( get_window_text ) - { - req->handle = wine_server_user_handle( hwnd ); - if (count) wine_server_set_reply( req, text, (count - 1) * sizeof(WCHAR) ); - if (!wine_server_call_err( req )) - { - needed = reply->length; - len = wine_server_reply_size(reply); - } - } - SERVER_END_REQ; - if (text) text[len / sizeof(WCHAR)] = 0; - return needed; -} - - /******************************************************************* * get_hwnd_message_parent * @@ -3023,7 +2998,7 @@ INT WINAPI GetWindowTextLengthA( HWND hwnd ) /* when window belongs to other process, don't send a message */ GetCPInfo( CP_ACP, &info ); - return get_server_window_text( hwnd, NULL, 0 ) * info.MaxCharSize; + return NtUserCallHwnd( hwnd, NtUserGetWindowTextLength ) * info.MaxCharSize; } /******************************************************************* @@ -3034,7 +3009,7 @@ INT WINAPI GetWindowTextLengthW( HWND hwnd ) if (WIN_IsCurrentProcess( hwnd )) return SendMessageW( hwnd, WM_GETTEXTLENGTH, 0, 0 ); /* when window belongs to other process, don't send a message */ - return get_server_window_text( hwnd, NULL, 0 ); + return NtUserCallHwnd( hwnd, NtUserGetWindowTextLength ); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 93ee0ffd164..168195dcd44 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -475,6 +475,8 @@ DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { + case NtUserGetWindowTextLength: + return get_server_window_text( hwnd, NULL, 0 ); case NtUserIsWindow: return is_window( hwnd ); default: diff --git a/include/ntuser.h b/include/ntuser.h index 34d75f4f726..ab46a1a5b09 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -139,6 +139,7 @@ enum /* NtUserCallHwnd codes, not compatible with Windows */ enum { + NtUserGetWindowTextLength, NtUserIsWindow, };

1 0

Eric Pouech : kernel32/tests/volume: Enable compilation with long types.
by Alexandre Julliard March 8, 2022

March 8, 2022

Module: wine Branch: master Commit: 0f430425431408faa681746bcaa48225be18b3f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f430425431408faa681746b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Mar 8 09:30:14 2022 +0100 kernel32/tests/volume: Enable compilation with long types. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/volume.c | 423 ++++++++++++++++++++++--------------------- 1 file changed, 212 insertions(+), 211 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0f430425431408faa681…

1 0