winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
June 2021
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
1 participants
811 discussions
Start a n
N
ew thread
Zebediah Figura : ws2_32: Make getsockopt(SO_DEBUG) into a stub.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: d8dfce3edcdf10d0fd7d65df1e15c15fb4661cad URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d8dfce3edcdf10d0fd7d65df…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:47 2021 -0500 ws2_32: Make getsockopt(SO_DEBUG) into a stub. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 +++++++- dlls/ws2_32/tests/sock.c | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 320e4b3af2a..ab111f726a9 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2103,7 +2103,6 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_DEBUG: case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: case WS_SO_RCVBUF: @@ -2168,6 +2167,13 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, csinfo->iProtocol = infow.iProtocol; return 0; } + + case WS_SO_DEBUG: + WARN( "returning 0 for SO_DEBUG\n" ); + *(DWORD *)optval = 0; + SetLastError( 0 ); + return 0; + case WS_SO_DONTLINGER: { struct linger lingval; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c4a3f953175..7534e75edb3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10991,7 +10991,7 @@ static void test_so_debug(void) debug = 0xdeadbeef; ret = getsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, &len); ok(!ret, "got %d\n", ret); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(len == sizeof(debug), "got len %u\n", len); ok(!debug, "got debug %u\n", debug); @@ -11006,7 +11006,7 @@ static void test_so_debug(void) debug = 0xdeadbeef; ret = getsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, &len); ok(!ret, "got %d\n", ret); - todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); ok(len == sizeof(debug), "got len %u\n", len); todo_wine ok(debug == 1, "got debug %u\n", debug);
1
0
0
0
Zebediah Figura : ws2_32/tests: Add some tests for SO_DEBUG.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: 75fe1064f714fb1676085ac7b6e7cdff6ae17eae URL:
https://source.winehq.org/git/wine.git/?a=commit;h=75fe1064f714fb1676085ac7…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:46 2021 -0500 ws2_32/tests: Add some tests for SO_DEBUG. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c12ff45b921..c4a3f953175 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10978,6 +10978,41 @@ static void test_timeout(void) CloseHandle(overlapped.hEvent); } +static void test_so_debug(void) +{ + int ret, len; + DWORD debug; + SOCKET s; + + s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + + len = sizeof(debug); + WSASetLastError(0xdeadbeef); + debug = 0xdeadbeef; + ret = getsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, &len); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(len == sizeof(debug), "got len %u\n", len); + ok(!debug, "got debug %u\n", debug); + + WSASetLastError(0xdeadbeef); + debug = 2; + ret = setsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, sizeof(debug)); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + len = sizeof(debug); + WSASetLastError(0xdeadbeef); + debug = 0xdeadbeef; + ret = getsockopt(s, SOL_SOCKET, SO_DEBUG, (char *)&debug, &len); + ok(!ret, "got %d\n", ret); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(len == sizeof(debug), "got len %u\n", len); + todo_wine ok(debug == 1, "got debug %u\n", debug); + + closesocket(s); +} + START_TEST( sock ) { int i; @@ -10993,6 +11028,7 @@ START_TEST( sock ) test_so_reuseaddr(); test_ip_pktinfo(); test_extendedSocketOptions(); + test_so_debug(); for (i = 0; i < ARRAY_SIZE(tests); i++) do_test(&tests[i]);
1
0
0
0
Zebediah Figura : ws2_32: Move the setsockopt(SO_BROADCAST) implementation to ntdll.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: 759408c3ae1086b68cb10916492decee5a1e4e62 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=759408c3ae1086b68cb10916…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:45 2021 -0500 ws2_32: Move the setsockopt(SO_BROADCAST) 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 | 25 ++++++++++++++++++++++--- dlls/ws2_32/socket.c | 16 +++++++++++++++- include/wine/afd.h | 1 + 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c3392f94b54..959f0e7bc00 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1146,8 +1146,8 @@ static void complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo } -static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, void *out_buffer, - ULONG out_size, int level, int option ) +static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, + int option, void *out_buffer, ULONG out_size ) { int fd, needs_close = FALSE; socklen_t len = out_size; @@ -1165,6 +1165,22 @@ static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, void *out_buf } +static NTSTATUS do_setsockopt( HANDLE handle, IO_STATUS_BLOCK *io, int level, + int option, const void *optval, socklen_t optlen ) +{ + int fd, needs_close = FALSE; + NTSTATUS status; + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = setsockopt( fd, level, option, optval, optlen ); + if (needs_close) close( fd ); + return ret ? sock_errno_to_status( errno ) : STATUS_SUCCESS; +} + + NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { @@ -1586,7 +1602,10 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc } case IOCTL_AFD_WINE_GET_SO_BROADCAST: - return do_getsockopt( handle, io, out_buffer, out_size, SOL_SOCKET, SO_BROADCAST ); + return do_getsockopt( handle, io, SOL_SOCKET, SO_BROADCAST, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_SO_BROADCAST: + return do_setsockopt( handle, io, SOL_SOCKET, SO_BROADCAST, in_buffer, in_size ); default: { diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3b00e65fe3d..320e4b3af2a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3538,6 +3538,18 @@ int WINAPI WS_sendto(SOCKET s, const char *buf, int len, int flags, return n; } + +static int server_setsockopt( SOCKET s, ULONG code, const char *optval, int optlen ) +{ + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, (void *)optval, optlen, NULL, 0 ); + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; +} + + /*********************************************************************** * setsockopt (WS2_32.21) */ @@ -3566,6 +3578,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_SOL_SOCKET: switch(optname) { + case WS_SO_BROADCAST: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_SO_BROADCAST, 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 @@ -3621,7 +3636,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_BROADCAST: case WS_SO_ERROR: case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: diff --git a/include/wine/afd.h b/include/wine/afd.h index 8916fafae53..6370e00539f 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -161,6 +161,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_SET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 221, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {
1
0
0
0
Zebediah Figura : ws2_32: Move the getsockopt(SO_BROADCAST) implementation to ntdll.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: d9b281e5c7a70f4485e9947d62d6ae520652220e URL:
https://source.winehq.org/git/wine.git/?a=commit;h=d9b281e5c7a70f4485e9947d…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:44 2021 -0500 ws2_32: Move the getsockopt(SO_BROADCAST) 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 | 4 +++- include/wine/afd.h | 1 + 3 files changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 04db120dcbd..c3392f94b54 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1146,6 +1146,25 @@ static void complete_async( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, vo } +static NTSTATUS do_getsockopt( HANDLE handle, IO_STATUS_BLOCK *io, void *out_buffer, + ULONG out_size, int level, int option ) +{ + int fd, needs_close = FALSE; + socklen_t len = out_size; + NTSTATUS status; + int ret; + + if ((status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL ))) + return status; + + ret = getsockopt( fd, level, option, out_buffer, &len ); + if (needs_close) close( fd ); + if (ret) return sock_errno_to_status( errno ); + io->Information = len; + return STATUS_SUCCESS; +} + + NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc_user, IO_STATUS_BLOCK *io, ULONG code, void *in_buffer, ULONG in_size, void *out_buffer, ULONG out_size ) { @@ -1566,6 +1585,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc break; } + case IOCTL_AFD_WINE_GET_SO_BROADCAST: + return do_getsockopt( handle, io, out_buffer, out_size, SOL_SOCKET, SO_BROADCAST ); + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3dac76fd3f0..3b00e65fe3d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2098,9 +2098,11 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_ACCEPTCONN: return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ACCEPTCONN, optval, optlen ); + case WS_SO_BROADCAST: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_BROADCAST, optval, optlen ); + /* Handle common cases. The special cases are below, sorted * alphabetically */ - case WS_SO_BROADCAST: case WS_SO_DEBUG: case WS_SO_KEEPALIVE: case WS_SO_OOBINLINE: diff --git a/include/wine/afd.h b/include/wine/afd.h index 4c501872dde..8916fafae53 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -160,6 +160,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_BROADCAST CTL_CODE(FILE_DEVICE_NETWORK, 220, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {
1
0
0
0
Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_GET_SO_ACCEPTCONN.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: 8eed10c534b095135db285137ca280d253a25965 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=8eed10c534b095135db28513…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:43 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_GET_SO_ACCEPTCONN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index cb576bad5f2..3dac76fd3f0 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2063,6 +2063,19 @@ int WINAPI WS_getsockname( SOCKET s, struct WS_sockaddr *addr, int *len ) return status ? -1 : 0; } + +static int server_getsockopt( SOCKET s, ULONG code, char *optval, int *optlen ) +{ + IO_STATUS_BLOCK io; + NTSTATUS status; + + status = NtDeviceIoControlFile( (HANDLE)s, NULL, NULL, NULL, &io, code, NULL, 0, optval, *optlen ); + if (!status) *optlen = io.Information; + SetLastError( NtStatusToWSAError( status ) ); + return status ? -1 : 0; +} + + /*********************************************************************** * getsockopt (WS2_32.7) */ @@ -2082,6 +2095,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, { switch(optname) { + case WS_SO_ACCEPTCONN: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_SO_ACCEPTCONN, optval, optlen ); + /* Handle common cases. The special cases are below, sorted * alphabetically */ case WS_SO_BROADCAST: @@ -2101,21 +2117,7 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, } release_sock_fd( s, fd ); return ret; - case WS_SO_ACCEPTCONN: - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - if (getsockopt(fd, SOL_SOCKET, SO_ACCEPTCONN, optval, (socklen_t *)optlen) != 0 ) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - { - /* BSD returns != 0 while Windows return exact == 1 */ - if (*(int *)optval) *(int *)optval = 1; - } - release_sock_fd( s, fd ); - return ret; + case WS_SO_BSP_STATE: { CSADDR_INFO *csinfo = (CSADDR_INFO *)optval;
1
0
0
0
Zebediah Figura : server: Introduce IOCTL_AFD_WINE_GET_SO_ACCEPTCONN.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: 697f9e979e95fe9345291dbcd46df757fc6f6bdb URL:
https://source.winehq.org/git/wine.git/?a=commit;h=697f9e979e95fe9345291dbc…
Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Jun 23 11:23:42 2021 -0500 server: Introduce IOCTL_AFD_WINE_GET_SO_ACCEPTCONN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 1 + server/sock.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+) diff --git a/include/wine/afd.h b/include/wine/afd.h index e497eece0be..4c501872dde 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -159,6 +159,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GETPEERNAME CTL_CODE(FILE_DEVICE_NETWORK, 216, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_DEFER CTL_CODE(FILE_DEVICE_NETWORK, 217, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_GET_INFO CTL_CODE(FILE_DEVICE_NETWORK, 218, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_GET_SO_ACCEPTCONN CTL_CODE(FILE_DEVICE_NETWORK, 219, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index b73fbb98388..71f22845827 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2532,6 +2532,20 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + case IOCTL_AFD_WINE_GET_SO_ACCEPTCONN: + { + int listening = (sock->state == SOCK_LISTENING); + + if (get_reply_max_size() < sizeof(listening)) + { + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + } + + set_reply_data( &listening, sizeof(listening) ); + return 1; + } + default: set_error( STATUS_NOT_SUPPORTED ); return 0;
1
0
0
0
Nikolay Sivov : mf/session: Fix typo in a trace message.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: 396df44c7b9f660d75b3be17527286df6adbc887 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=396df44c7b9f660d75b3be17…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 23 17:25:30 2021 +0300 mf/session: Fix typo in a trace message. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 826c31ce121..9e8429fa8ac 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -3361,7 +3361,7 @@ static HRESULT WINAPI session_sink_finalizer_callback_Invoke(IMFAsyncCallback *i if (state == (IUnknown *)sink->sink) { if (FAILED(hr = IMFMediaSink_QueryInterface(sink->sink, &IID_IMFFinalizableMediaSink, (void **)&fin_sink))) - WARN("Unexpected, missing IMFFinalizableSink, hr %#x.\n", hr); + WARN("Unexpected, missing IMFFinalizableMediaSink, hr %#x.\n", hr); } else {
1
0
0
0
Zhiyi Zhang : light.msstyles: Add Blue stub visual style.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: f42158b62fd397fa36dae47de9add729ec52124c URL:
https://source.winehq.org/git/wine.git/?a=commit;h=f42158b62fd397fa36dae47d…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 23 18:14:42 2021 +0800 light.msstyles: Add Blue stub visual style. Blue is a visual style that uses blue as the main color and contains bitmaps for UI controls. Its system color is the same as Classic Blue. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/light.msstyles/light.rc | 52 +++++++++++++++++++++++++++++++++++++++++ dlls/light.msstyles/resources.h | 6 +++-- po/ar.po | 7 +++--- po/ast.po | 7 +++--- po/bg.po | 7 +++--- po/ca.po | 7 +++--- po/cs.po | 7 +++--- po/da.po | 7 +++--- po/de.po | 7 +++--- po/el.po | 7 +++--- po/en.po | 7 +++--- po/en_US.po | 7 +++--- po/eo.po | 7 +++--- po/es.po | 7 +++--- po/fa.po | 7 +++--- po/fi.po | 7 +++--- po/fr.po | 7 +++--- po/he.po | 7 +++--- po/hi.po | 7 +++--- po/hr.po | 7 +++--- po/hu.po | 7 +++--- po/it.po | 7 +++--- po/ja.po | 7 +++--- po/ko.po | 7 +++--- po/lt.po | 7 +++--- po/ml.po | 7 +++--- po/nb_NO.po | 7 +++--- po/nl.po | 7 +++--- po/or.po | 7 +++--- po/pa.po | 7 +++--- po/pl.po | 7 +++--- po/pt_BR.po | 7 +++--- po/pt_PT.po | 7 +++--- po/rm.po | 7 +++--- po/ro.po | 7 +++--- po/ru.po | 7 +++--- po/si.po | 7 +++--- po/sk.po | 7 +++--- po/sl.po | 7 +++--- po/sr_RS(a)cyrillic.po | 7 +++--- po/sr_RS(a)latin.po | 7 +++--- po/sv.po | 7 +++--- po/ta.po | 7 +++--- po/te.po | 7 +++--- po/th.po | 7 +++--- po/tr.po | 7 +++--- po/uk.po | 7 +++--- po/wa.po | 7 +++--- po/wine.pot | 7 +++--- po/zh_CN.po | 7 +++--- po/zh_TW.po | 7 +++--- 51 files changed, 252 insertions(+), 149 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=f42158b62fd397fa36da…
1
0
0
0
Zhiyi Zhang : light.msstyles: Add Classic Blue visual style.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: 062ef9f68e2e4b27b6068ecbc9000e2e234dc964 URL:
https://source.winehq.org/git/wine.git/?a=commit;h=062ef9f68e2e4b27b6068ecb…
Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jun 23 18:14:33 2021 +0800 light.msstyles: Add Classic Blue visual style. Classic Blue is a visual style that uses blue as the main color and doesn't have bitmaps for UI controls. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/light.msstyles/Makefile.in | 3 + dlls/light.msstyles/light.msstyles.spec | 1 + dlls/light.msstyles/light.rc | 140 ++++++++++++++++++++++++++++++++ dlls/light.msstyles/resources.h | 24 ++++++ loader/wine.inf.in | 3 + po/ar.po | 15 +++- po/ast.po | 13 ++- po/bg.po | 13 ++- po/ca.po | 15 +++- po/cs.po | 15 +++- po/da.po | 15 +++- po/de.po | 15 +++- po/el.po | 13 ++- po/en.po | 13 ++- po/en_US.po | 13 ++- po/eo.po | 13 ++- po/es.po | 15 +++- po/fa.po | 13 ++- po/fi.po | 15 +++- po/fr.po | 15 +++- po/he.po | 15 +++- po/hi.po | 13 ++- po/hr.po | 15 +++- po/hu.po | 15 +++- po/it.po | 15 +++- po/ja.po | 15 +++- po/ko.po | 15 +++- po/lt.po | 15 +++- po/ml.po | 13 ++- po/nb_NO.po | 15 +++- po/nl.po | 15 +++- po/or.po | 13 ++- po/pa.po | 13 ++- po/pl.po | 15 +++- po/pt_BR.po | 15 +++- po/pt_PT.po | 15 +++- po/rm.po | 13 ++- po/ro.po | 15 +++- po/ru.po | 15 +++- po/si.po | 15 +++- po/sk.po | 13 ++- po/sl.po | 15 +++- po/sr_RS(a)cyrillic.po | 13 ++- po/sr_RS(a)latin.po | 13 ++- po/sv.po | 15 +++- po/ta.po | 13 ++- po/te.po | 13 ++- po/th.po | 13 ++- po/tr.po | 15 +++- po/uk.po | 15 +++- po/wa.po | 13 ++- po/wine.pot | 13 ++- po/zh_CN.po | 15 +++- po/zh_TW.po | 15 +++- 56 files changed, 673 insertions(+), 196 deletions(-) Diff:
https://source.winehq.org/git/wine.git/?a=commitdiff;h=062ef9f68e2e4b27b606…
1
0
0
0
Nikolay Sivov : mf/session: Treat only started/paused/stopped as valid states for start command.
by Alexandre Julliard
23 Jun '21
23 Jun '21
Module: wine Branch: master Commit: 7dba45f6ec7a25df69def7918ad408f07c88a20b URL:
https://source.winehq.org/git/wine.git/?a=commit;h=7dba45f6ec7a25df69def791…
Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 23 14:03:06 2021 +0300 mf/session: Treat only started/paused/stopped as valid states for start command. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index de82d687aba..826c31ce121 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -862,13 +862,11 @@ static void session_start(struct media_session *session, const GUID *time_format FIXME("Seeking is not implemented.\n"); session_command_complete(session); break; - case SESSION_STATE_CLOSED: + default: IMFMediaEventQueue_QueueEventParamVar(session->event_queue, MESessionStarted, &GUID_NULL, MF_E_INVALIDREQUEST, NULL); session_command_complete(session); break; - default: - ; } }
1
0
0
0
← Newer
1
...
18
19
20
21
22
23
24
...
82
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
Results per page:
10
25
50
100
200