June 2021 - Wine-commits - list.winehq.org

Zhiyi Zhang : light.msstyles: Add Status parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: c4d58096cd4ce2f04da09cc45ac32972dd2c4e3f URL: https://source.winehq.org/git/wine.git/?a=commit;h=c4d58096cd4ce2f04da09cc4… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:58:45 2021 +0800 light.msstyles: Add Status parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/Makefile.in | 2 ++ dlls/light.msstyles/blue_status_background.bmp | Bin 0 -> 186 bytes dlls/light.msstyles/blue_status_background.svg | 14 ++++++++++ dlls/light.msstyles/blue_status_pane.bmp | Bin 0 -> 318 bytes dlls/light.msstyles/blue_status_pane.svg | 13 +++++++++ dlls/light.msstyles/light.rc | 36 +++++++++++++++++++++++++ 6 files changed, 65 insertions(+) diff --git a/dlls/light.msstyles/Makefile.in b/dlls/light.msstyles/Makefile.in index 9ed4d4094e4..ec23c395b3a 100644 --- a/dlls/light.msstyles/Makefile.in +++ b/dlls/light.msstyles/Makefile.in @@ -37,6 +37,8 @@ SVG_SRCS = \ blue_spin_glyph_left.svg \ blue_spin_glyph_right.svg \ blue_spin_glyph_up.svg \ + blue_status_background.svg \ + blue_status_pane.svg \ blue_toolbar_buttons.svg \ blue_toolbar_buttons_split.svg \ blue_toolbar_buttons_split_dropdown.svg \ diff --git a/dlls/light.msstyles/blue_status_background.bmp b/dlls/light.msstyles/blue_status_background.bmp new file mode 100644 index 00000000000..b56048f2f66 Binary files /dev/null and b/dlls/light.msstyles/blue_status_background.bmp differ diff --git a/dlls/light.msstyles/blue_status_background.svg b/dlls/light.msstyles/blue_status_background.svg new file mode 100644 index 00000000000..4fc5d4fdce0 --- /dev/null +++ b/dlls/light.msstyles/blue_status_background.svg @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-24" width="3" height="4" version="1.1" viewBox="0 0 .79375 1.0583" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect y=".13229" width=".79375" height="3.4173e-7" fill="#aeaeae" stroke="#aeaeae" stroke-width=".26458"/> + <rect x="-1.1102e-16" y=".26457" width=".79375" height=".79375" fill="#f5f5f5"/> +</svg> diff --git a/dlls/light.msstyles/blue_status_pane.bmp b/dlls/light.msstyles/blue_status_pane.bmp new file mode 100644 index 00000000000..befc4807cbd Binary files /dev/null and b/dlls/light.msstyles/blue_status_pane.bmp differ diff --git a/dlls/light.msstyles/blue_status_pane.svg b/dlls/light.msstyles/blue_status_pane.svg new file mode 100644 index 00000000000..9c1b197b6c6 --- /dev/null +++ b/dlls/light.msstyles/blue_status_pane.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="bitmap:3-32" width="3" height="15" version="1.1" viewBox="0 0 .79375 3.9688" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> + <metadata> + <rdf:RDF> + <cc:Work rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/> + <dc:title/> + </cc:Work> + </rdf:RDF> + </metadata> + <rect x=".26458" width=".26458" height="3.7042" fill="#aeaeae" stroke-width="0"/> +</svg> diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index c96b4dcf30f..f0a462035a7 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -532,6 +532,35 @@ BLUE_INI TEXTFILE "GlyphImageFile = blue_spin_glyph_left.bmp\r\n" "GlyphTransparent = True\r\n" +"\r\n; Status\r\n" +"[Status]\r\n" +"SizingMargins = 1, 1, 2, 1\r\n" +"ImageFile = blue_status_background.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Stretch\r\n" + +"[Status.Pane]\r\n" +"SizingMargins = 0, 2, 2, 2\r\n" +"ImageFile = blue_status_pane.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 1\r\n" +"SizingType = Tile\r\n" +"Transparent = True\r\n" + +"[Status.GripperPane]\r\n" +"BgType = None\r\n" + +"[Status.Gripper]\r\n" +"ContentMargins = 0, 0, 0, 0\r\n" +"; Same as scrollbar resize box gripper \r\n" +"ImageFile = blue_scrollbar_resizebox_grip.bmp\r\n" +"BgType = ImageFile\r\n" +"ImageCount = 2\r\n" +"SizingType = TrueSize\r\n" +"Transparent = True\r\n" +"VAlign = Bottom\r\n" + "\r\n; Toolbar\r\n" "[Toolbar]\r\n" "BgType = BorderFill\r\n" @@ -707,6 +736,13 @@ BLUE_SPIN_GLYPH_RIGHT_BMP BITMAP "blue_spin_glyph_right.bmp" /* @makedep: blue_spin_glyph_up.bmp */ BLUE_SPIN_GLYPH_UP_BMP BITMAP "blue_spin_glyph_up.bmp" +/* Status */ +/* @makedep: blue_status_background.bmp */ +BLUE_STATUS_BACKGROUND_BMP BITMAP "blue_status_background.bmp" + +/* @makedep: blue_status_pane.bmp */ +BLUE_STATUS_PANE_BMP BITMAP "blue_status_pane.bmp" + /* ToolBar */ /* @makedep: blue_toolbar_buttons.bmp */ BLUE_TOOLBAR_BUTTONS_BMP BITMAP "blue_toolbar_buttons.bmp"

1 0

Zhiyi Zhang : light.msstyles: Add ListView parts.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: ee7be6ea7c00f0ca08f9161d34efe1b13e1d0c82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ee7be6ea7c00f0ca08f9161d… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Jun 25 09:58:58 2021 +0800 light.msstyles: Add ListView parts. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/light.msstyles/light.rc b/dlls/light.msstyles/light.rc index f0a462035a7..b7a8f538536 100644 --- a/dlls/light.msstyles/light.rc +++ b/dlls/light.msstyles/light.rc @@ -341,6 +341,13 @@ BLUE_INI TEXTFILE "FillColor = 255 255 255\r\n" "BorderColor = 174 174 174\r\n" +"\r\n; ListView\r\n" +"[ListView]\r\n" +"BgType = BorderFill\r\n" +"BorderSize = 1\r\n" +"FillColor = 255 255 255\r\n" +"BorderColor = 174 174 174\r\n" + "\r\n; Rebar\r\n" "[Rebar]\r\n" "BgType = ImageFile\r\n"

1 0

Zebediah Figura : ws2_32: Move the getsockopt(SO_LINGER) implementation to ntdll.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: f52df002b0ace5d5e69c90019a512b0671007d4b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f52df002b0ace5d5e69c9001… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 22:32:45 2021 -0500 ws2_32: Move the getsockopt(SO_LINGER) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 22 ++++++++++++++++++++++ dlls/ws2_32/socket.c | 23 +++++------------------ include/wine/afd.h | 1 + 3 files changed, 28 insertions(+), 18 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 7b62c5aef68..89926411a40 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1613,6 +1613,28 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_SO_KEEPALIVE: return do_setsockopt( handle, io, SOL_SOCKET, SO_KEEPALIVE, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_SO_LINGER: + { + struct WS_linger *ws_linger = out_buffer; + struct linger unix_linger; + socklen_t len = sizeof(unix_linger); + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = getsockopt( fd, SOL_SOCKET, SO_LINGER, &unix_linger, &len ); + if (needs_close) close( fd ); + if (!ret) + { + ws_linger->l_onoff = unix_linger.l_onoff; + ws_linger->l_linger = unix_linger.l_linger; + io->Information = sizeof(*ws_linger); + } + + return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c35972c1d27..de83563bd29 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2229,9 +2229,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_LINGER: { - struct linger lingval; - socklen_t len = sizeof(struct linger); - /* struct linger and LINGER have different sizes */ if (!optlen || *optlen < sizeof(LINGER) || !optval) { @@ -2243,23 +2240,13 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, if (_get_fd_type(fd) == SOCK_DGRAM) { - SetLastError(WSAENOPROTOOPT); - ret = SOCKET_ERROR; - } - else if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - { - ((LINGER *)optval)->l_onoff = lingval.l_onoff; - ((LINGER *)optval)->l_linger = lingval.l_linger; - *optlen = sizeof(struct linger); + release_sock_fd( s, fd ); + SetLastError( WSAENOPROTOOPT ); + return -1; } - release_sock_fd( s, fd ); - return ret; + + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_LINGER, optval, optlen ); } case WS_SO_MAX_MSG_SIZE: diff --git a/include/wine/afd.h b/include/wine/afd.h index 616ba27b679..f1dd392ed32 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -165,6 +165,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_ERROR CTL_CODE(FILE_DEVICE_NETWORK, 222, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(SO_LINGER) implementation to ntdll.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 130b549671fc82b77890f50681b3e83d64b09a3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=130b549671fc82b77890f506… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 22:32:46 2021 -0500 ws2_32: Move the setsockopt(SO_LINGER) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 11 +++++++++++ dlls/ws2_32/socket.c | 17 +++-------------- include/wine/afd.h | 1 + 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 89926411a40..c809dc17d13 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1635,6 +1635,17 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; } + case IOCTL_AFD_WINE_SET_SO_LINGER: + { + const struct WS_linger *ws_linger = in_buffer; + struct linger unix_linger; + + unix_linger.l_onoff = ws_linger->l_onoff; + unix_linger.l_linger = ws_linger->l_linger; + + return do_setsockopt( handle, io, SOL_SOCKET, SO_LINGER, &unix_linger, sizeof(unix_linger) ); + } + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index de83563bd29..3925a7ed500 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3545,6 +3545,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_KEEPALIVE: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_KEEPALIVE, optval, optlen ); + case WS_SO_LINGER: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen ); + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3564,20 +3567,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, optlen = sizeof(struct linger); break; - case WS_SO_LINGER: - if (!optval) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - linger.l_onoff = ((LINGER*)optval)->l_onoff; - linger.l_linger = ((LINGER*)optval)->l_linger; - level = SOL_SOCKET; - optname = SO_LINGER; - optval = (char*)&linger; - optlen = sizeof(struct linger); - break; - case WS_SO_SNDBUF: if (!*(const int *)optval) { diff --git a/include/wine/afd.h b/include/wine/afd.h index f1dd392ed32..9ffdf491ac6 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -166,6 +166,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 223, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Implement getsockopt(SO_DONTLINGER) on top of Win32 getsockopt(SO_LINGER).
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 1d7d57326af8c339bfd82f27c2d344d05be660b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d7d57326af8c339bfd82f27… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 22:32:47 2021 -0500 ws2_32: Implement getsockopt(SO_DONTLINGER) on top of Win32 getsockopt(SO_LINGER). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3925a7ed500..112376e583c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2162,29 +2162,21 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_DONTLINGER: { - struct linger lingval; - socklen_t len = sizeof(struct linger); + struct WS_linger linger; + int len = sizeof(linger); + int ret; if (!optlen || *optlen < sizeof(BOOL)|| !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - if (getsockopt(fd, SOL_SOCKET, SO_LINGER, &lingval, &len) != 0 ) + if (!(ret = WS_getsockopt( s, WS_SOL_SOCKET, WS_SO_LINGER, (char *)&linger, &len ))) { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - { - *(BOOL *)optval = !lingval.l_onoff; + *(BOOL *)optval = !linger.l_onoff; *optlen = sizeof(BOOL); } - - release_sock_fd( s, fd ); return ret; }

1 0

Zebediah Figura : ws2_32: Implement setsockopt(SO_DONTLINGER) on top of Win32 setsockopt(SO_LINGER).
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 2ba41754593bcc5dc5bec4a163f39ef15d703cc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2ba41754593bcc5dc5bec4a1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 22:32:48 2021 -0500 ws2_32: Implement setsockopt(SO_DONTLINGER) on top of Win32 setsockopt(SO_LINGER). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 112376e583c..776268b381a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3506,7 +3506,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, { int fd; int woptval; - struct linger linger; struct timeval tval; struct ip_mreq_source mreq_source; @@ -3529,6 +3528,21 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_BROADCAST: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, optval, optlen ); + case WS_SO_DONTLINGER: + { + struct WS_linger linger; + + if (!optval) + { + SetLastError( WSAEFAULT ); + return -1; + } + + linger.l_onoff = !*(const BOOL *)optval; + linger.l_linger = 0; + return WS_setsockopt( s, WS_SOL_SOCKET, WS_SO_LINGER, (char *)&linger, sizeof(linger) ); + } + case WS_SO_ERROR: FIXME( "SO_ERROR, stub!\n" ); SetLastError( WSAENOPROTOOPT ); @@ -3545,20 +3559,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, * to the general case. Special options that are not passed to * setsockopt follow below that.*/ - case WS_SO_DONTLINGER: - if (!optval) - { - SetLastError(WSAEFAULT); - return SOCKET_ERROR; - } - linger.l_onoff = *(const int*)optval == 0; - linger.l_linger = 0; - level = SOL_SOCKET; - optname = SO_LINGER; - optval = (char*)&linger; - optlen = sizeof(struct linger); - break; - case WS_SO_SNDBUF: if (!*(const int *)optval) {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(SO_OOBINLINE) implementation to ntdll.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: afa71f9a126f4206685aa6f4df3d5a1de45efaf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afa71f9a126f4206685aa6f4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 22:32:49 2021 -0500 ws2_32: Move the getsockopt(SO_OOBINLINE) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c809dc17d13..917f883a0f5 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1646,6 +1646,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, SOL_SOCKET, SO_LINGER, &unix_linger, sizeof(unix_linger) ); } + case IOCTL_AFD_WINE_GET_SO_OOBINLINE: + return do_getsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, out_buffer, out_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 776268b381a..0301454657a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2090,7 +2090,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_OOBINLINE: case WS_SO_RCVBUF: case WS_SO_REUSEADDR: case WS_SO_SNDBUF: @@ -2252,6 +2251,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, *optlen = sizeof(int); return 0; + case WS_SO_OOBINLINE: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_OOBINLINE, optval, optlen ); + /* SO_OPENTYPE does not require a valid socket handle. */ case WS_SO_OPENTYPE: if (!optlen || *optlen < sizeof(int) || !optval) diff --git a/include/wine/afd.h b/include/wine/afd.h index 9ffdf491ac6..fec4db4db94 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -167,6 +167,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_SO_KEEPALIVE CTL_CODE(FILE_DEVICE_NETWORK, 224, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(SO_OOBINLINE) implementation to ntdll.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 061e85a548e1691dc0225e809dee7d64a9416221 URL: https://source.winehq.org/git/wine.git/?a=commit;h=061e85a548e1691dc0225e80… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 24 22:32:50 2021 -0500 ws2_32: Move the setsockopt(SO_OOBINLINE) implementation to ntdll. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 4 +++- include/wine/afd.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 917f883a0f5..0ab30ec6515 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1649,6 +1649,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_SO_OOBINLINE: return do_getsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_SO_OOBINLINE: + return do_setsockopt( handle, io, SOL_SOCKET, SO_OOBINLINE, in_buffer, in_size ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0301454657a..88d8e9bf134 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3556,6 +3556,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SO_LINGER: return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_LINGER, optval, optlen ); + case WS_SO_OOBINLINE: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_OOBINLINE, optval, optlen ); + /* Some options need some conversion before they can be sent to * setsockopt. The conversions are done here, then they will fall through * to the general case. Special options that are not passed to @@ -3583,7 +3586,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, /* The options listed here don't need any special handling. Thanks to * the conversion happening above, options from there will fall through * to this, too.*/ - case WS_SO_OOBINLINE: /* BSD socket SO_REUSEADDR is not 100% compatible to winsock semantics. * however, using it the BSD way fixes bug 8513 and seems to be what * most programmers assume, anyway */ diff --git a/include/wine/afd.h b/include/wine/afd.h index fec4db4db94..ae5a0584bdc 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -168,6 +168,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 225, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_SET_SO_LINGER CTL_CODE(FILE_DEVICE_NETWORK, 226, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 227, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_OOBINLINE CTL_CODE(FILE_DEVICE_NETWORK, 228, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Rémi Bernon : hid: Introduce new copy_bits helper for HidP_SetUsageValueArray.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 334c6cf8f4222bb2737cd1f35588c95acc1737ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=334c6cf8f4222bb2737cd1f3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 10:06:48 2021 +0200 hid: Introduce new copy_bits helper for HidP_SetUsageValueArray. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 70 ++++++++++++++++++++++++++++++++++++-- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 6 +--- 2 files changed, 68 insertions(+), 8 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 8d893f6327d..827de20c634 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -70,6 +70,7 @@ struct caps_filter { BOOLEAN buttons; BOOLEAN values; + BOOLEAN array; USAGE usage_page; USHORT collection; USAGE usage; @@ -102,6 +103,7 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR { if (!match_value_caps( caps, filter )) continue; if (filter->report_id && caps->report_id != filter->report_id) continue; + else if (filter->array && (caps->is_range || caps->report_count <= 1)) return HIDP_STATUS_NOT_VALUE_ARRAY; else if (remaining-- > 0) status = callback( caps, user ); } @@ -114,6 +116,44 @@ static NTSTATUS enum_value_caps( WINE_HIDP_PREPARSED_DATA *preparsed, HIDP_REPOR return HIDP_STATUS_SUCCESS; } +/* copy count bits from src, starting at (-shift) bit if < 0, to dst starting at (shift) bit if > 0 */ +static void copy_bits( unsigned char *dst, const unsigned char *src, int count, int shift ) +{ + unsigned char bits, mask; + size_t src_shift = shift < 0 ? (-shift & 7) : 0; + size_t dst_shift = shift > 0 ? (shift & 7) : 0; + if (shift < 0) src += -shift / 8; + if (shift > 0) dst += shift / 8; + + if (src_shift == 0 && dst_shift == 0) + { + memcpy( dst, src, count / 8 ); + dst += count / 8; + src += count / 8; + count &= 7; + } + + if (!count) return; + + bits = *dst << (8 - dst_shift); + count += dst_shift; + + while (count > 8) + { + *dst = bits >> (8 - dst_shift); + bits = *(unsigned short *)src++ >> src_shift; + *dst++ |= bits << dst_shift; + count -= 8; + } + + bits >>= (8 - dst_shift); + if (count <= 8 - src_shift) bits |= (*src >> src_shift) << dst_shift; + else bits |= (*(unsigned short *)src >> src_shift) << dst_shift; + + mask = (1 << count) - 1; + *dst = (bits & mask) | (*dst & ~mask); +} + static NTSTATUS get_report_data(BYTE *report, INT reportLength, INT startBit, INT valueSize, PULONG value) { @@ -323,6 +363,13 @@ static NTSTATUS find_usage(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT return HIDP_STATUS_USAGE_NOT_FOUND; } +struct usage_value_params +{ + void *value_buf; + USHORT value_len; + void *report_buf; +}; + static LONG sign_extend(ULONG value, const WINE_HID_ELEMENT *element) { UINT bit_count = element->bitCount; @@ -514,6 +561,15 @@ ULONG WINAPI HidP_MaxUsageListLength( HIDP_REPORT_TYPE report_type, USAGE usage_ return count; } +static NTSTATUS set_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; + ULONG bit_count = caps->bit_size * caps->report_count; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + copy_bits( params->report_buf, params->value_buf, bit_count, caps->start_bit ); + return HIDP_STATUS_NULL; +} + NTSTATUS WINAPI HidP_SetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, ULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, CHAR *Report, ULONG ReportLength) @@ -539,11 +595,19 @@ NTSTATUS WINAPI HidP_SetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usa USAGE usage, char *value_buf, USHORT value_len, PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - FIXME( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " - "preparsed_data %p, report_buf %p, report_len %u stub!\n", + struct usage_value_params params = {.value_buf = value_buf, .value_len = value_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .array = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; + + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " + "preparsed_data %p, report_buf %p, report_len %u.\n", report_type, usage_page, collection, usage, value_buf, value_len, preparsed_data, report_buf, report_len ); - return HIDP_STATUS_NOT_IMPLEMENTED; + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; + + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, set_usage_value, &params, &count ); } struct set_usage_params diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index ca030599299..3185b0f7893 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2021,15 +2021,14 @@ static void test_hidp(HANDLE file, int report_id) status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, sizeof(buffer), preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_NOT_VALUE_ARRAY, "HidP_SetUsageValueArray returned %#x\n", status); memset(buffer, 0xcd, sizeof(buffer)); status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 0, preparsed_data, report, caps.InputReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_SetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_HATSWITCH, buffer, 8, preparsed_data, report, caps.InputReportByteLength); + todo_wine ok(status == HIDP_STATUS_NOT_IMPLEMENTED, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_GetUsageValueArray(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, buffer, @@ -2365,13 +2364,10 @@ static void test_hidp(HANDLE file, int report_id) memset(buffer, 0xff, sizeof(buffer)); status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 0, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_BUFFER_TOO_SMALL, "HidP_SetUsageValueArray returned %#x\n", status); status = HidP_SetUsageValueArray(HidP_Feature, HID_USAGE_PAGE_HAPTICS, 0, HID_USAGE_HAPTICS_WAVEFORM_CUTOFF_TIME, buffer, 64, preparsed_data, report, caps.FeatureReportByteLength); - todo_wine ok(status == HIDP_STATUS_SUCCESS, "HidP_SetUsageValueArray returned %#x\n", status); - todo_wine ok(!memcmp(report + 9, buffer, 8), "unexpected report data\n"); memset(buffer, 0, sizeof(buffer));

1 0

Rémi Bernon : hid: Rewrite HidP_GetUsageValueArray using enum_value_caps.
by Alexandre Julliard 25 Jun '21

25 Jun '21

Module: wine Branch: master Commit: 0a192647fe6841e61d834f3593e100fd292ce8ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a192647fe6841e61d834f35… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 25 10:06:49 2021 +0200 hid: Rewrite HidP_GetUsageValueArray using enum_value_caps. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hid/hidp.c | 81 +++++++++++--------------------------- dlls/ntoskrnl.exe/tests/ntoskrnl.c | 1 - 2 files changed, 22 insertions(+), 60 deletions(-) diff --git a/dlls/hid/hidp.c b/dlls/hid/hidp.c index 827de20c634..929426ef536 100644 --- a/dlls/hid/hidp.c +++ b/dlls/hid/hidp.c @@ -234,46 +234,6 @@ static NTSTATUS set_report_data(BYTE *report, INT reportLength, INT startBit, IN return HIDP_STATUS_SUCCESS; } -static NTSTATUS get_report_data_array(BYTE *report, UINT reportLength, UINT startBit, UINT elemSize, - UINT numElements, PCHAR values, UINT valuesSize) -{ - BYTE byte, *end, *p = report + startBit / 8; - ULONG size = elemSize * numElements; - ULONG m, bit_index = startBit % 8; - BYTE *data = (BYTE*)values; - - if ((startBit + size) / 8 > reportLength) - return HIDP_STATUS_INVALID_REPORT_LENGTH; - - if (valuesSize < (size + 7) / 8) - return HIDP_STATUS_BUFFER_TOO_SMALL; - - end = report + (startBit + size + 7) / 8; - - data--; - byte = *p++; - while (p != end) - { - *(++data) = byte >> bit_index; - byte = *p++; - *data |= byte << (8 - bit_index); - } - - /* Handle the end and mask out bits beyond */ - m = (startBit + size) % 8; - m = m ? m : 8; - - if (m > bit_index) - *(++data) = (byte >> bit_index) & ((1 << (m - bit_index)) - 1); - else - *data &= (1 << (m + 8 - bit_index)) - 1; - - if (++data < (BYTE*)values + valuesSize) - memset(data, 0, (BYTE*)values + valuesSize - data); - - return HIDP_STATUS_SUCCESS; -} - NTSTATUS WINAPI HidP_GetButtonCaps( HIDP_REPORT_TYPE report_type, HIDP_BUTTON_CAPS *caps, USHORT *caps_count, PHIDP_PREPARSED_DATA preparsed_data ) { @@ -419,6 +379,15 @@ NTSTATUS WINAPI HidP_GetScaledUsageValue(HIDP_REPORT_TYPE ReportType, USAGE Usag return rc; } +static NTSTATUS get_usage_value( const struct hid_value_caps *caps, void *user ) +{ + struct usage_value_params *params = user; + ULONG bit_count = caps->bit_size * caps->report_count; + if ((bit_count + 7) / 8 > params->value_len) return HIDP_STATUS_BUFFER_TOO_SMALL; + memset( params->value_buf, 0, params->value_len ); + copy_bits( params->value_buf, params->report_buf, bit_count, -caps->start_bit ); + return HIDP_STATUS_NULL; +} NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, USAGE Usage, PULONG UsageValue, PHIDP_PREPARSED_DATA PreparsedData, @@ -441,29 +410,23 @@ NTSTATUS WINAPI HidP_GetUsageValue(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, return rc; } - -NTSTATUS WINAPI HidP_GetUsageValueArray(HIDP_REPORT_TYPE ReportType, USAGE UsagePage, USHORT LinkCollection, - USAGE Usage, PCHAR UsageValue, USHORT UsageValueByteLength, - PHIDP_PREPARSED_DATA PreparsedData, PCHAR Report, ULONG ReportLength) +NTSTATUS WINAPI HidP_GetUsageValueArray( HIDP_REPORT_TYPE report_type, USAGE usage_page, USHORT collection, + USAGE usage, char *value_buf, USHORT value_len, + PHIDP_PREPARSED_DATA preparsed_data, char *report_buf, ULONG report_len ) { - WINE_HID_ELEMENT element; - NTSTATUS rc; - - TRACE("(%i, %x, %i, %i, %p, %u, %p, %p, %i)\n", ReportType, UsagePage, LinkCollection, Usage, UsageValue, - UsageValueByteLength, PreparsedData, Report, ReportLength); - - rc = find_usage(ReportType, UsagePage, LinkCollection, Usage, PreparsedData, Report, 0, &element); + struct usage_value_params params = {.value_buf = value_buf, .value_len = value_len, .report_buf = report_buf}; + WINE_HIDP_PREPARSED_DATA *preparsed = (WINE_HIDP_PREPARSED_DATA *)preparsed_data; + struct caps_filter filter = {.values = TRUE, .array = TRUE, .usage_page = usage_page, .collection = collection, .usage = usage}; + USHORT count = 1; - if (rc == HIDP_STATUS_SUCCESS) - { - if (element.caps.IsRange || element.caps.ReportCount <= 1 || !element.bitCount) - return HIDP_STATUS_NOT_VALUE_ARRAY; + TRACE( "report_type %d, usage_page %x, collection %d, usage %x, value_buf %p, value_len %u, " + "preparsed_data %p, report_buf %p, report_len %u.\n", + report_type, usage_page, collection, usage, value_buf, value_len, preparsed_data, report_buf, report_len ); - return get_report_data_array((BYTE*)Report, ReportLength, element.valueStartBit, element.bitCount, - element.caps.ReportCount, UsageValue, UsageValueByteLength); - } + if (!report_len) return HIDP_STATUS_INVALID_REPORT_LENGTH; - return rc; + filter.report_id = report_buf[0]; + return enum_value_caps( preparsed, report_type, report_len, &filter, get_usage_value, &params, &count ); } diff --git a/dlls/ntoskrnl.exe/tests/ntoskrnl.c b/dlls/ntoskrnl.exe/tests/ntoskrnl.c index 3185b0f7893..ee0134ec39d 100644 --- a/dlls/ntoskrnl.exe/tests/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/tests/ntoskrnl.c @@ -2378,7 +2378,6 @@ static void test_hidp(HANDLE file, int report_id) 64, preparsed_data, report, caps.FeatureReportByteLength); ok(status == HIDP_STATUS_SUCCESS, "HidP_GetUsageValueArray returned %#x\n", status); memset(buffer + 16, 0xff, 8); - todo_wine ok(!memcmp(buffer, buffer + 16, 16), "unexpected report value\n"); HidD_FreePreparsedData(preparsed_data);

1 0