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

Francois Gouget : testbot/cgi: Move saving items to ItemPage::Save().
by Alexandre Julliard 09 Mar '22

09 Mar '22

Module: tools Branch: master Commit: 5f75332e5039dc2784a539c0c718e76df997bd74 URL: https://source.winehq.org/git/tools.git/?a=commit;h=5f75332e5039dc2784a539c… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 9 20:13:53 2022 +0100 testbot/cgi: Move saving items to ItemPage::Save(). A FormPage has no Collection field and no concept of what an Item object is so it should not be trying to save items. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/lib/ObjectModel/CGI/FormPage.pm | 5 +---- testbot/lib/ObjectModel/CGI/ItemPage.pm | 10 ++++++++++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/lib/ObjectModel/CGI/FormPage.pm b/testbot/lib/ObjectModel/CGI/FormPage.pm index 9ea7f0f..3ac6223 100644 --- a/testbot/lib/ObjectModel/CGI/FormPage.pm +++ b/testbot/lib/ObjectModel/CGI/FormPage.pm @@ -388,10 +388,7 @@ sub Save($) { my ($self) = @_; - return !1 if (!$self->SaveProperties()); - - (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); - return ! defined($self->{ErrMessage}); + return $self->SaveProperties(); } sub OnAction($$) diff --git a/testbot/lib/ObjectModel/CGI/ItemPage.pm b/testbot/lib/ObjectModel/CGI/ItemPage.pm index 9b9f2ff..6d94491 100644 --- a/testbot/lib/ObjectModel/CGI/ItemPage.pm +++ b/testbot/lib/ObjectModel/CGI/ItemPage.pm @@ -134,6 +134,16 @@ sub SaveProperty($$$) return 1; } +sub Save($) +{ + my ($self) = @_; + + return !1 if (!$self->SUPER::Save()); + + (my $_ErrKey, $self->{ErrField}, $self->{ErrMessage}) = $self->{Collection}->Save(); + return !defined $self->{ErrMessage}; +} + sub OnAction($$) { my ($self, $Action) = @_;

1 0

Paul Gofman : ws2_32/tests: Add tests for zero option length in test_set_getsockopt().
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 8fef57b1ef5c81a73441bae6288404f7bb169043 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8fef57b1ef5c81a73441bae6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 8 12:22:47 2022 +0300 ws2_32/tests: Add tests for zero option length in test_set_getsockopt(). 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/tests/sock.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1fc8d132b63..0fab10b4d70 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1459,6 +1459,27 @@ static void test_set_getsockopt(void) } ok(size == (test_optsize[i].optname == SO_OPENTYPE ? 4 : -1), "Got unexpected size %d.\n", size); + if (test_optsize[i].level == SOL_SOCKET && test_optsize[i].bool_value) + { + expected_err = 0; + expected_last_error = 0; + } + else + { + expected_err = -1; + expected_last_error = WSAEFAULT; + } + value = 1; + SetLastError(0xdeadbeef); + err = setsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, 0); + ok(err == expected_err, "Unexpected setsockopt result %d.\n", err); + ok(WSAGetLastError() == expected_last_error, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + + size = 0; + err = getsockopt(s2, test_optsize[i].level, test_optsize[i].optname, (char*)&value, &size); + ok(err == -1, "Unexpected getsockopt result %d.\n", err); + ok(WSAGetLastError() == WSAEFAULT, "Unexpected WSAGetLastError() %u.\n", WSAGetLastError()); + expected_size = test_optsize[i].sizes[2]; if (expected_size == 1) expected_value = 0xdeadbe00;

1 0

Paul Gofman : ws2_32: Manage shorter length for SO_BROADCAST.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 666eb2c628bb0704dd0e812e02f787aef97d10c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=666eb2c628bb0704dd0e812e… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 8 12:22:48 2022 +0300 ws2_32: Manage shorter length for SO_BROADCAST. 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 | 13 ++++++++++--- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e708d0d2f5e..3a1b230435a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1419,7 +1419,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ACCEPTCONN, optval, optlen ); case SO_BROADCAST: - return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_BROADCAST, optval, optlen ); + ret = server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_BROADCAST, optval, optlen ); + if (!ret && *optlen < sizeof(DWORD)) *optlen = 1; + return ret; case SO_BSP_STATE: { @@ -2794,8 +2796,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int switch(optname) { case SO_BROADCAST: - return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, optval, optlen ); - + if (!optval) + { + SetLastError( WSAEFAULT ); + return SOCKET_ERROR; + } + memcpy( &value, optval, min( optlen, sizeof(value) )); + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, (char *)&value, sizeof(value) ); case SO_DONTLINGER: { struct linger linger; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 0fab10b4d70..a868bc946a7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1169,6 +1169,7 @@ static void test_set_getsockopt(void) } test_optsize[] = { + {AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE},

1 0

Paul Gofman : ws2_32: Manage shorter length for SO_DONTLINGER.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: a73cb3f13734d7283d0c45a3f801dbbff06aa332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a73cb3f13734d7283d0c45a3… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 8 12:22:49 2022 +0300 ws2_32: Manage shorter length for SO_DONTLINGER. 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 | 12 +++++++----- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3a1b230435a..e58fc21c9f2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1488,11 +1488,12 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl case SO_DONTLINGER: { - struct linger linger; + LINGER linger; int len = sizeof(linger); + BOOL value; int ret; - if (*optlen < sizeof(BOOL)|| !optval) + if (*optlen < 1 || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; @@ -1500,8 +1501,9 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl if (!(ret = getsockopt( s, SOL_SOCKET, SO_LINGER, (char *)&linger, &len ))) { - *(BOOL *)optval = !linger.l_onoff; - *optlen = sizeof(BOOL); + value = !linger.l_onoff; + memcpy( optval, &value, min( sizeof(BOOL), *optlen )); + *optlen = *optlen >= sizeof(BOOL) ? sizeof(BOOL) : 1; } return ret; } @@ -2805,7 +2807,7 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, (char *)&value, sizeof(value) ); case SO_DONTLINGER: { - struct linger linger; + LINGER linger; if (!optval) { diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index a868bc946a7..5200fb185b4 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1170,6 +1170,7 @@ static void test_set_getsockopt(void) test_optsize[] = { {AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTLINGER, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE},

1 0

Paul Gofman : ws2_32: Manage shorter length for SO_DONTROUTE.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 26c26702034bfce20aaba36f02eecec23f579cd4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=26c26702034bfce20aaba36f… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 8 12:22:50 2022 +0300 ws2_32: Manage shorter length for SO_DONTROUTE. 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 | 17 ++++++++++++----- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index e58fc21c9f2..31e8be5b6b0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1511,13 +1511,14 @@ int WINAPI getsockopt( SOCKET s, int level, int optname, char *optval, int *optl /* As mentioned in setsockopt, Windows ignores this, so we * always return true here */ case SO_DONTROUTE: - if (*optlen < sizeof(BOOL) || !optval) + if (*optlen < 1 || !optval) { - SetLastError(WSAEFAULT); + SetLastError( WSAEFAULT ); return SOCKET_ERROR; } - *(BOOL *)optval = TRUE; - *optlen = sizeof(BOOL); + *optval = TRUE; + *optlen = 1; + SetLastError( ERROR_SUCCESS ); return 0; case SO_ERROR: @@ -2859,7 +2860,13 @@ int WINAPI setsockopt( SOCKET s, int level, int optname, const char *optval, int /* For some reason the game GrandPrixLegends does set SO_DONTROUTE on its * socket. According to MSDN, this option is silently ignored.*/ case SO_DONTROUTE: - TRACE("Ignoring SO_DONTROUTE\n"); + TRACE( "Ignoring SO_DONTROUTE.\n" ); + if (optlen <= 0) + { + SetLastError( optlen ? WSAENOBUFS : WSAEFAULT ); + return -1; + } + SetLastError( ERROR_SUCCESS ); return 0; /* Stops two sockets from being bound to the same port. Always happens diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5200fb185b4..3da68b0e4a8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1171,6 +1171,7 @@ static void test_set_getsockopt(void) { {AF_INET, SOCK_DGRAM, SOL_SOCKET, SO_BROADCAST, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTLINGER, TRUE, {1, 1, 4}, {0, 0xdead0001, 0}, TRUE, TRUE}, + {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_DONTROUTE, TRUE, {1, 1, 1}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_RCVTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_STREAM, SOL_SOCKET, SO_SNDTIMEO, FALSE, {1, 2, 4}, {0}, TRUE}, {AF_INET, SOCK_DGRAM, IPPROTO_IP, IP_MULTICAST_LOOP, TRUE, {1, 1, 4}, {0}, TRUE, TRUE},

1 0

Jacek Caban : win32u: Move GetWindowLong implementation from user32.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: d174cb22944e2ec90bfdf268af94b11e7f81136b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d174cb22944e2ec90bfdf268… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:23:52 2022 +0100 win32u: Move GetWindowLong 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 | 166 ++++-------------------------- dlls/user32/win.h | 10 -- dlls/win32u/class.c | 2 +- dlls/win32u/ntuser_private.h | 11 ++ dlls/win32u/window.c | 237 +++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 5 + 6 files changed, 274 insertions(+), 157 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d174cb22944e2ec90bfd…

1 0

Jacek Caban : win32u: Move GetWindow implementation from user32.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: cde008fe7192798db143074578aac78caf4eddac URL: https://source.winehq.org/git/wine.git/?a=commit;h=cde008fe7192798db1430745… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:23:56 2022 +0100 win32u: Move GetWindow 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 | 51 +--------------------------------------------- dlls/win32u/window.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ include/ntuser.h | 1 + 3 files changed, 59 insertions(+), 50 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index 8678aa39454..fb7d05b71dc 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -3200,56 +3200,7 @@ HWND WINAPI GetTopWindow( HWND hwnd ) */ HWND WINAPI GetWindow( HWND hwnd, UINT rel ) { - HWND retval = 0; - - if (rel == GW_OWNER) /* this one may be available locally */ - { - WND *wndPtr = WIN_GetPtr( hwnd ); - if (!wndPtr) - { - SetLastError( ERROR_INVALID_HANDLE ); - return 0; - } - if (wndPtr == WND_DESKTOP) return 0; - if (wndPtr != WND_OTHER_PROCESS) - { - retval = wndPtr->owner; - WIN_ReleasePtr( wndPtr ); - return retval; - } - /* else fall through to server call */ - } - - SERVER_START_REQ( get_window_tree ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) - { - switch(rel) - { - case GW_HWNDFIRST: - retval = wine_server_ptr_handle( reply->first_sibling ); - break; - case GW_HWNDLAST: - retval = wine_server_ptr_handle( reply->last_sibling ); - break; - case GW_HWNDNEXT: - retval = wine_server_ptr_handle( reply->next_sibling ); - break; - case GW_HWNDPREV: - retval = wine_server_ptr_handle( reply->prev_sibling ); - break; - case GW_OWNER: - retval = wine_server_ptr_handle( reply->owner ); - break; - case GW_CHILD: - retval = wine_server_ptr_handle( reply->first_child ); - break; - } - } - } - SERVER_END_REQ; - return retval; + return UlongToHandle( NtUserCallHwndParam( hwnd, rel, NtUserGetWindowRelative )); } diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index 86356b609b0..f24fc531f16 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -361,6 +361,61 @@ static DWORD get_window_thread( HWND hwnd, DWORD *process ) return tid; } +/* see GetWindow */ +static HWND get_window_relative( HWND hwnd, UINT rel ) +{ + HWND retval = 0; + + if (rel == GW_OWNER) /* this one may be available locally */ + { + WND *win = get_win_ptr( hwnd ); + if (!win) + { + SetLastError( ERROR_INVALID_HANDLE ); + return 0; + } + if (win == WND_DESKTOP) return 0; + if (win != WND_OTHER_PROCESS) + { + retval = win->owner; + release_win_ptr( win ); + return retval; + } + /* else fall through to server call */ + } + + SERVER_START_REQ( get_window_tree ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) + { + switch(rel) + { + case GW_HWNDFIRST: + retval = wine_server_ptr_handle( reply->first_sibling ); + break; + case GW_HWNDLAST: + retval = wine_server_ptr_handle( reply->last_sibling ); + break; + case GW_HWNDNEXT: + retval = wine_server_ptr_handle( reply->next_sibling ); + break; + case GW_HWNDPREV: + retval = wine_server_ptr_handle( reply->prev_sibling ); + break; + case GW_OWNER: + retval = wine_server_ptr_handle( reply->owner ); + break; + case GW_CHILD: + retval = wine_server_ptr_handle( reply->first_child ); + break; + } + } + } + SERVER_END_REQ; + return retval; +} + static LONG_PTR get_win_data( const void *ptr, UINT size ) { if (size == sizeof(WORD)) @@ -737,6 +792,8 @@ ULONG_PTR WINAPI NtUserCallHwndParam( HWND hwnd, DWORD_PTR param, DWORD code ) return get_window_long_ptr( hwnd, param, TRUE ); case NtUserGetWindowLongPtrW: return get_window_long_ptr( hwnd, param, FALSE ); + case NtUserGetWindowRelative: + return HandleToUlong( get_window_relative( hwnd, param )); case NtUserGetWindowThread: return get_window_thread( hwnd, (DWORD *)param ); case NtUserGetWindowWord: diff --git a/include/ntuser.h b/include/ntuser.h index ccdfdb04de5..3021a8a9af4 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -155,6 +155,7 @@ enum NtUserGetWindowLongW, NtUserGetWindowLongPtrA, NtUserGetWindowLongPtrW, + NtUserGetWindowRelative, NtUserGetWindowThread, NtUserGetWindowWord, };

1 0

Jacek Caban : win32u: Move GetParent implementation from user32.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 5da6282a60319bddb4f25b360a65441bf96b4d54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5da6282a60319bddb4f25b36… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:24:00 2022 +0100 win32u: Move GetParent 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 | 34 +--------------------------------- dlls/win32u/win32u_private.h | 1 + dlls/win32u/window.c | 42 +++++++++++++++++++++++++++++++++++++++++- include/ntuser.h | 1 + 4 files changed, 44 insertions(+), 34 deletions(-) diff --git a/dlls/user32/win.c b/dlls/user32/win.c index fb7d05b71dc..c860464125e 100644 --- a/dlls/user32/win.c +++ b/dlls/user32/win.c @@ -2908,39 +2908,7 @@ DWORD WINAPI GetWindowThreadProcessId( HWND hwnd, LPDWORD process ) */ HWND WINAPI GetParent( HWND hwnd ) { - WND *wndPtr; - HWND retvalue = 0; - - if (!(wndPtr = WIN_GetPtr( hwnd ))) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return 0; - } - if (wndPtr == WND_DESKTOP) return 0; - if (wndPtr == WND_OTHER_PROCESS) - { - LONG style = GetWindowLongW( hwnd, GWL_STYLE ); - if (style & (WS_POPUP | WS_CHILD)) - { - SERVER_START_REQ( get_window_tree ) - { - req->handle = wine_server_user_handle( hwnd ); - if (!wine_server_call_err( req )) - { - if (style & WS_POPUP) retvalue = wine_server_ptr_handle( reply->owner ); - else if (style & WS_CHILD) retvalue = wine_server_ptr_handle( reply->parent ); - } - } - SERVER_END_REQ; - } - } - else - { - if (wndPtr->dwStyle & WS_POPUP) retvalue = wndPtr->owner; - else if (wndPtr->dwStyle & WS_CHILD) retvalue = wndPtr->parent; - WIN_ReleasePtr( wndPtr ); - } - return retvalue; + return UlongToHandle( NtUserCallHwnd( hwnd, NtUserGetParent )); } diff --git a/dlls/win32u/win32u_private.h b/dlls/win32u/win32u_private.h index e3cf939db09..a46accddd71 100644 --- a/dlls/win32u/win32u_private.h +++ b/dlls/win32u/win32u_private.h @@ -296,6 +296,7 @@ extern void user_check_not_lock(void) DECLSPEC_HIDDEN; struct tagWND; extern HWND is_current_thread_window( HWND hwnd ) DECLSPEC_HIDDEN; extern void flush_window_surfaces( BOOL idle ) DECLSPEC_HIDDEN; +extern DWORD get_window_long( HWND hwnd, INT offset ) DECLSPEC_HIDDEN; extern void register_window_surface( struct window_surface *old, struct window_surface *new ) DECLSPEC_HIDDEN; diff --git a/dlls/win32u/window.c b/dlls/win32u/window.c index f24fc531f16..eb49d9bf237 100644 --- a/dlls/win32u/window.c +++ b/dlls/win32u/window.c @@ -361,6 +361,44 @@ static DWORD get_window_thread( HWND hwnd, DWORD *process ) return tid; } +/* see GetParent */ +static HWND get_parent( HWND hwnd ) +{ + HWND retval = 0; + WND *win; + + if (!(win = get_win_ptr( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return 0; + } + if (win == WND_DESKTOP) return 0; + if (win == WND_OTHER_PROCESS) + { + LONG style = get_window_long( hwnd, GWL_STYLE ); + if (style & (WS_POPUP | WS_CHILD)) + { + SERVER_START_REQ( get_window_tree ) + { + req->handle = wine_server_user_handle( hwnd ); + if (!wine_server_call_err( req )) + { + if (style & WS_POPUP) retval = wine_server_ptr_handle( reply->owner ); + else if (style & WS_CHILD) retval = wine_server_ptr_handle( reply->parent ); + } + } + SERVER_END_REQ; + } + } + else + { + if (win->dwStyle & WS_POPUP) retval = win->owner; + else if (win->dwStyle & WS_CHILD) retval = win->parent; + release_win_ptr( win ); + } + return retval; +} + /* see GetWindow */ static HWND get_window_relative( HWND hwnd, UINT rel ) { @@ -557,7 +595,7 @@ static LONG_PTR get_window_long_size( HWND hwnd, INT offset, UINT size, BOOL ans } /* see GetWindowLongW */ -static DWORD get_window_long( HWND hwnd, INT offset ) +DWORD get_window_long( HWND hwnd, INT offset ) { return get_window_long_size( hwnd, offset, sizeof(LONG), FALSE ); } @@ -757,6 +795,8 @@ DWORD WINAPI NtUserCallHwnd( HWND hwnd, DWORD code ) { switch (code) { + case NtUserGetParent: + return HandleToUlong( get_parent( hwnd )); case NtUserGetWindowTextLength: return get_server_window_text( hwnd, NULL, 0 ); case NtUserIsWindow: diff --git a/include/ntuser.h b/include/ntuser.h index 3021a8a9af4..8ae916e57bd 100644 --- a/include/ntuser.h +++ b/include/ntuser.h @@ -139,6 +139,7 @@ enum /* NtUserCallHwnd codes, not compatible with Windows */ enum { + NtUserGetParent, NtUserGetWindowTextLength, NtUserIsWindow, };

1 0

Jacek Caban : win32u: Move NtUserGetAncestor implementation from user32.
by Alexandre Julliard 08 Mar '22

08 Mar '22

Module: wine Branch: master Commit: 4ef69e2b5920f3bab3f823345639c83811e7a02d URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ef69e2b5920f3bab3f82334… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Mar 8 14:24:03 2022 +0100 win32u: Move NtUserGetAncestor 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/defwnd.c | 4 +- dlls/user32/desktop.c | 2 +- dlls/user32/driver.c | 2 +- dlls/user32/focus.c | 6 +-- dlls/user32/menu.c | 2 +- dlls/user32/message.c | 2 +- dlls/user32/nonclient.c | 6 +-- dlls/user32/painting.c | 4 +- dlls/user32/user32.spec | 2 +- dlls/user32/win.c | 63 +---------------------- dlls/user32/winpos.c | 26 +++++----- dlls/win32u/syscall.c | 1 + dlls/win32u/win32u.spec | 2 +- dlls/win32u/window.c | 129 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wow64win/syscall.h | 1 + dlls/wow64win/user.c | 8 +++ include/ntuser.h | 1 + 17 files changed, 170 insertions(+), 91 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4ef69e2b5920f3bab3f8…

1 0

Jacek Caban : win32u: Move GWLP_HWNDPARENT implementation from user32.
by Alexandre Julliard 08 Mar '22

08 Mar '22

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