wine-commits July 2021

wine-commits@winehq.org

1 participants
728 discussions

Zebediah Figura : amstream: Switch to the quartz debug channel.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: 157a84a1f6bd6ad71d223b12a9d53c63b4c62510 URL: https://source.winehq.org/git/wine.git/?a=commit;h=157a84a1f6bd6ad71d223b12… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 9 22:14:42 2021 -0500 amstream: Switch to the quartz debug channel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/audiodata.c | 2 +- dlls/amstream/audiostream.c | 2 +- dlls/amstream/ddrawstream.c | 2 +- dlls/amstream/filter.c | 2 +- dlls/amstream/main.c | 2 +- dlls/amstream/multimedia.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/amstream/audiodata.c b/dlls/amstream/audiodata.c index 06ed9324012..c4e32e9b179 100644 --- a/dlls/amstream/audiodata.c +++ b/dlls/amstream/audiodata.c @@ -25,7 +25,7 @@ #include "winbase.h" #include "amstream_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(amstream); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { IAudioData IAudioData_iface; diff --git a/dlls/amstream/audiostream.c b/dlls/amstream/audiostream.c index 77ed4072ccf..91ca0630199 100644 --- a/dlls/amstream/audiostream.c +++ b/dlls/amstream/audiostream.c @@ -23,7 +23,7 @@ #include "wine/debug.h" #include "wine/strmbase.h" -WINE_DEFAULT_DEBUG_CHANNEL(amstream); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR sink_id[] = L"I{A35FF56B-9FDA-11D0-8FDF-00C04FD9189D}"; diff --git a/dlls/amstream/ddrawstream.c b/dlls/amstream/ddrawstream.c index 150e622ad33..5e88e096991 100644 --- a/dlls/amstream/ddrawstream.c +++ b/dlls/amstream/ddrawstream.c @@ -24,7 +24,7 @@ #include "wine/debug.h" #include "wine/strmbase.h" -WINE_DEFAULT_DEBUG_CHANNEL(amstream); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const WCHAR sink_id[] = L"I{A35FF56A-9FDA-11D0-8FDF-00C04FD9189D}"; diff --git a/dlls/amstream/filter.c b/dlls/amstream/filter.c index 91a9ef4bb8a..c419bb73de7 100644 --- a/dlls/amstream/filter.c +++ b/dlls/amstream/filter.c @@ -23,7 +23,7 @@ #include "wine/debug.h" #include "wine/list.h" -WINE_DEFAULT_DEBUG_CHANNEL(amstream); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct enum_pins { diff --git a/dlls/amstream/main.c b/dlls/amstream/main.c index c2c76069ea2..3d091135257 100644 --- a/dlls/amstream/main.c +++ b/dlls/amstream/main.c @@ -35,7 +35,7 @@ #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(amstream); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); /****************************************************************************** * Multimedia Streams ClassFactory diff --git a/dlls/amstream/multimedia.c b/dlls/amstream/multimedia.c index 98ffc95a54a..827f9ef0363 100644 --- a/dlls/amstream/multimedia.c +++ b/dlls/amstream/multimedia.c @@ -28,7 +28,7 @@ #include "amstream_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(amstream); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct multimedia_stream {

1 0

Zebediah Figura : qdvd: Switch to the quartz debug channel.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: d88c50e42bca7ae4ccf93c39b02b39cdae2e0d00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d88c50e42bca7ae4ccf93c39… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 9 22:14:41 2021 -0500 qdvd: Switch to the quartz debug channel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/graph.c | 2 +- dlls/qdvd/navigator.c | 2 +- dlls/qdvd/qdvd_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qdvd/graph.c b/dlls/qdvd/graph.c index 986fcc0db04..0e806313e00 100644 --- a/dlls/qdvd/graph.c +++ b/dlls/qdvd/graph.c @@ -20,7 +20,7 @@ #include "qdvd_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(qdvd); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct graph_builder { diff --git a/dlls/qdvd/navigator.c b/dlls/qdvd/navigator.c index 74bd9a3923d..2a0d013018b 100644 --- a/dlls/qdvd/navigator.c +++ b/dlls/qdvd/navigator.c @@ -21,7 +21,7 @@ #include "qdvd_private.h" #include "wine/strmbase.h" -WINE_DEFAULT_DEBUG_CHANNEL(qdvd); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct navigator { diff --git a/dlls/qdvd/qdvd_main.c b/dlls/qdvd/qdvd_main.c index 2c6430e9393..608a664e392 100644 --- a/dlls/qdvd/qdvd_main.c +++ b/dlls/qdvd/qdvd_main.c @@ -21,7 +21,7 @@ #include "qdvd_private.h" #include "rpcproxy.h" -WINE_DEFAULT_DEBUG_CHANNEL(qdvd); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct class_factory {

1 0

Zebediah Figura : qedit: Switch to the quartz debug channel.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: 10769c59fcd0b737dddf1358d6d0a592cb63829c URL: https://source.winehq.org/git/wine.git/?a=commit;h=10769c59fcd0b737dddf1358… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 9 22:14:40 2021 -0500 qedit: Switch to the quartz debug channel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 2 +- dlls/qedit/mediadet.c | 2 +- dlls/qedit/nullrenderer.c | 2 +- dlls/qedit/samplegrabber.c | 2 +- dlls/qedit/timeline.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index 1ea7c14493a..652da939e37 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -23,7 +23,7 @@ #include "rpcproxy.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(qedit); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index bacf5208a08..cdf2ea8ee5b 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -30,7 +30,7 @@ #include "qedit_private.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(qedit); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct MediaDetImpl { IUnknown IUnknown_inner; diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index 5dc74c77809..87ef14240cd 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -24,7 +24,7 @@ #include "wine/debug.h" #include "wine/strmbase.h" -WINE_DEFAULT_DEBUG_CHANNEL(qedit); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct null_renderer { diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index 47358f2763b..d1b974d3d5d 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -30,7 +30,7 @@ #include "qedit_private.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(qedit); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct sample_grabber { diff --git a/dlls/qedit/timeline.c b/dlls/qedit/timeline.c index a00ccdbefb5..3a4ed5c017e 100644 --- a/dlls/qedit/timeline.c +++ b/dlls/qedit/timeline.c @@ -30,7 +30,7 @@ #include "qedit_private.h" #include "wine/debug.h" -WINE_DEFAULT_DEBUG_CHANNEL(qedit); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { IUnknown IUnknown_inner;

1 0

Zebediah Figura : qcap: Switch to the quartz debug channel.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: 2f5805fa8d5255ff543f6d7e1d74319007493f8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f5805fa8d5255ff543f6d7e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 9 22:14:39 2021 -0500 qcap: Switch to the quartz debug channel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/audiorecord.c | 2 +- dlls/qcap/avico.c | 2 +- dlls/qcap/avimux.c | 2 +- dlls/qcap/capturegraph.c | 2 +- dlls/qcap/filewriter.c | 2 +- dlls/qcap/qcap_main.c | 2 +- dlls/qcap/smartteefilter.c | 2 +- dlls/qcap/v4l.c | 2 +- dlls/qcap/vfwcapture.c | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/qcap/audiorecord.c b/dlls/qcap/audiorecord.c index 4c5f6646953..7f759fce5f1 100644 --- a/dlls/qcap/audiorecord.c +++ b/dlls/qcap/audiorecord.c @@ -19,7 +19,7 @@ #include "qcap_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { struct strmbase_filter filter; diff --git a/dlls/qcap/avico.c b/dlls/qcap/avico.c index fbcce49a441..e8a452fc7f5 100644 --- a/dlls/qcap/avico.c +++ b/dlls/qcap/avico.c @@ -20,7 +20,7 @@ #include "vfw.h" #include "aviriff.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { struct strmbase_filter filter; diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 0fcf5b8402a..5cc7d55bdf1 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -20,7 +20,7 @@ #include "vfw.h" #include "aviriff.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); #define MAX_PIN_NO 128 #define AVISUPERINDEX_ENTRIES 2000 diff --git a/dlls/qcap/capturegraph.c b/dlls/qcap/capturegraph.c index e3f047b9957..e5c7d9c1120 100644 --- a/dlls/qcap/capturegraph.c +++ b/dlls/qcap/capturegraph.c @@ -20,7 +20,7 @@ #include "qcap_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); /*********************************************************************** * ICaptureGraphBuilder & ICaptureGraphBuilder2 implementation diff --git a/dlls/qcap/filewriter.c b/dlls/qcap/filewriter.c index 4ea1460bb26..e49e6039604 100644 --- a/dlls/qcap/filewriter.c +++ b/dlls/qcap/filewriter.c @@ -20,7 +20,7 @@ #include "qcap_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct file_writer { diff --git a/dlls/qcap/qcap_main.c b/dlls/qcap/qcap_main.c index ef71947687c..ac7ac6a26aa 100644 --- a/dlls/qcap/qcap_main.c +++ b/dlls/qcap/qcap_main.c @@ -25,7 +25,7 @@ #include "qcap_private.h" #include "rpcproxy.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); HINSTANCE qcap_instance; diff --git a/dlls/qcap/smartteefilter.c b/dlls/qcap/smartteefilter.c index fc98666196c..9c736a40626 100644 --- a/dlls/qcap/smartteefilter.c +++ b/dlls/qcap/smartteefilter.c @@ -20,7 +20,7 @@ #include "qcap_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); typedef struct { struct strmbase_filter filter; diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index ccc06194b99..82af4dba9e1 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -59,7 +59,7 @@ #ifdef HAVE_LINUX_VIDEODEV2_H -WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); WINE_DECLARE_DEBUG_CHANNEL(winediag); static typeof(open) *video_open = open; diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index 6f03a3124af..fd5434434f2 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -21,7 +21,7 @@ #include "qcap_private.h" #include "winternl.h" -WINE_DEFAULT_DEBUG_CHANNEL(qcap); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); static const struct video_capture_funcs *capture_funcs;

1 0

Zebediah Figura : qasf: Switch to the quartz debug channel.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: ecef62cf81f3948d9a1fde5851ce167f0c2dc688 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ecef62cf81f3948d9a1fde58… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 9 22:14:38 2021 -0500 qasf: Switch to the quartz debug channel. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/asfreader.c | 2 +- dlls/qasf/dmowrapper.c | 2 +- dlls/qasf/qasf_main.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/qasf/asfreader.c b/dlls/qasf/asfreader.c index 372d03a3902..a037728079f 100644 --- a/dlls/qasf/asfreader.c +++ b/dlls/qasf/asfreader.c @@ -20,7 +20,7 @@ #include "qasf_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(qasf); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct asf_reader { diff --git a/dlls/qasf/dmowrapper.c b/dlls/qasf/dmowrapper.c index ec01e79822e..54581b48bee 100644 --- a/dlls/qasf/dmowrapper.c +++ b/dlls/qasf/dmowrapper.c @@ -20,7 +20,7 @@ #include "qasf_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(qasf); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct buffer { diff --git a/dlls/qasf/qasf_main.c b/dlls/qasf/qasf_main.c index 4e8319c34b1..d32a9da12b5 100644 --- a/dlls/qasf/qasf_main.c +++ b/dlls/qasf/qasf_main.c @@ -20,7 +20,7 @@ #include "qasf_private.h" -WINE_DEFAULT_DEBUG_CHANNEL(qasf); +WINE_DEFAULT_DEBUG_CHANNEL(quartz); struct class_factory {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IP_TTL) implementation to ntdll.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: 7986d4e29984dab59270c18d26c513d5eca2e752 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7986d4e29984dab59270c18d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 9 19:40:43 2021 -0500 ws2_32: Move the getsockopt(IP_TTL) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 559afb71eb8..c38f4f53089 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1790,6 +1790,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_TOS: return do_setsockopt( handle, io, IPPROTO_IP, IP_TOS, in_buffer, in_size ); + case IOCTL_AFD_WINE_GET_IP_TTL: + return do_getsockopt( handle, io, IPPROTO_IP, IP_TTL, 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 d29931f2a76..fac19355705 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2458,6 +2458,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_TOS, optval, optlen ); case WS_IP_TTL: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_TTL, optval, optlen ); + #ifdef IP_UNICAST_IF case WS_IP_UNICAST_IF: #endif diff --git a/include/wine/afd.h b/include/wine/afd.h index 26276d9c909..9e1802d5833 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -202,6 +202,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_PKTINFO WINE_AFD_IOC(257) #define IOCTL_AFD_WINE_GET_IP_TOS WINE_AFD_IOC(258) #define IOCTL_AFD_WINE_SET_IP_TOS WINE_AFD_IOC(259) +#define IOCTL_AFD_WINE_GET_IP_TTL WINE_AFD_IOC(260) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IP_TOS) implementation to ntdll.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: b605fca9b3f0a03f5d181bd63348e1ea24314d39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b605fca9b3f0a03f5d181bd6… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 9 19:40:42 2021 -0500 ws2_32: Move the setsockopt(IP_TOS) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.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 89d1719d4f5..559afb71eb8 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1787,6 +1787,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_GET_IP_TOS: return do_getsockopt( handle, io, IPPROTO_IP, IP_TOS, out_buffer, out_size ); + case IOCTL_AFD_WINE_SET_IP_TOS: + return do_setsockopt( handle, io, IPPROTO_IP, IP_TOS, 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 7f0e1dfeff2..d29931f2a76 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3671,6 +3671,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_PKTINFO: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_PKTINFO, optval, optlen ); + case WS_IP_TOS: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_TOS, optval, optlen ); + case WS_IP_UNBLOCK_SOURCE: { WS_IP_MREQ_SOURCE* val = (void*)optval; @@ -3684,7 +3687,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } - case WS_IP_TOS: case WS_IP_TTL: #ifdef IP_UNICAST_IF case WS_IP_UNICAST_IF: diff --git a/include/wine/afd.h b/include/wine/afd.h index 24f4ffb9d08..26276d9c909 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -201,6 +201,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_PKTINFO WINE_AFD_IOC(256) #define IOCTL_AFD_WINE_SET_IP_PKTINFO WINE_AFD_IOC(257) #define IOCTL_AFD_WINE_GET_IP_TOS WINE_AFD_IOC(258) +#define IOCTL_AFD_WINE_SET_IP_TOS WINE_AFD_IOC(259) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IP_TOS) implementation to ntdll.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: a6f457b0eaccb13d982e0096a43a381a7ccfdbfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6f457b0eaccb13d982e0096… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 9 19:40:41 2021 -0500 ws2_32: Move the getsockopt(IP_TOS) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 3 +++ dlls/ws2_32/socket.c | 2 ++ include/wine/afd.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index a727841e917..89d1719d4f5 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1784,6 +1784,9 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc return do_setsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, in_buffer, in_size ); #endif + case IOCTL_AFD_WINE_GET_IP_TOS: + return do_getsockopt( handle, io, IPPROTO_IP, IP_TOS, 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 37f72c9d62e..7f0e1dfeff2 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2455,6 +2455,8 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_PKTINFO, optval, optlen ); case WS_IP_TOS: + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_TOS, optval, optlen ); + case WS_IP_TTL: #ifdef IP_UNICAST_IF case WS_IP_UNICAST_IF: diff --git a/include/wine/afd.h b/include/wine/afd.h index fde0fe6db94..24f4ffb9d08 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -200,6 +200,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_OPTIONS WINE_AFD_IOC(255) #define IOCTL_AFD_WINE_GET_IP_PKTINFO WINE_AFD_IOC(256) #define IOCTL_AFD_WINE_SET_IP_PKTINFO WINE_AFD_IOC(257) +#define IOCTL_AFD_WINE_GET_IP_TOS WINE_AFD_IOC(258) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the setsockopt(IP_PKTINFO) implementation to ntdll.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: 38a6ac7a3255a15fa71a1fe1b83e26babcef158a URL: https://source.winehq.org/git/wine.git/?a=commit;h=38a6ac7a3255a15fa71a1fe1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 9 19:40:40 2021 -0500 ws2_32: Move the setsockopt(IP_PKTINFO) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 6 ++++++ dlls/ws2_32/socket.c | 6 +++--- include/wine/afd.h | 1 + 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index f862aa3e21b..a727841e917 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1773,9 +1773,15 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc #ifdef IP_PKTINFO case IOCTL_AFD_WINE_GET_IP_PKTINFO: return do_getsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IP_PKTINFO: + return do_setsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, in_buffer, in_size ); #elif defined(IP_RECVDSTADDR) case IOCTL_AFD_WINE_GET_IP_PKTINFO: return do_getsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, out_buffer, out_size ); + + case IOCTL_AFD_WINE_SET_IP_PKTINFO: + return do_setsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, in_buffer, in_size ); #endif default: diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 1cd1934a11e..37f72c9d62e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3666,6 +3666,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, case WS_IP_OPTIONS: return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_OPTIONS, optval, optlen ); + case WS_IP_PKTINFO: + return server_setsockopt( s, IOCTL_AFD_WINE_SET_IP_PKTINFO, optval, optlen ); + case WS_IP_UNBLOCK_SOURCE: { WS_IP_MREQ_SOURCE* val = (void*)optval; @@ -3679,9 +3682,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, convert_sockopt(&level, &optname); break; } -#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) - case WS_IP_PKTINFO: -#endif case WS_IP_TOS: case WS_IP_TTL: #ifdef IP_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 3522e2444f5..fde0fe6db94 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -199,6 +199,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_GET_IP_OPTIONS WINE_AFD_IOC(254) #define IOCTL_AFD_WINE_SET_IP_OPTIONS WINE_AFD_IOC(255) #define IOCTL_AFD_WINE_GET_IP_PKTINFO WINE_AFD_IOC(256) +#define IOCTL_AFD_WINE_SET_IP_PKTINFO WINE_AFD_IOC(257) struct afd_create_params {

1 0

Zebediah Figura : ws2_32: Move the getsockopt(IP_PKTINFO) implementation to ntdll.
by Alexandre Julliard 10 Jul '21

10 Jul '21

Module: wine Branch: master Commit: bbfe3507499aba02adabc19fa4929b6053876887 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbfe3507499aba02adabc19f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jul 9 19:40:39 2021 -0500 ws2_32: Move the getsockopt(IP_PKTINFO) implementation to ntdll. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 8 ++++++++ dlls/ws2_32/socket.c | 4 ++-- include/wine/afd.h | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index a3e0cb339e6..f862aa3e21b 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1770,6 +1770,14 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc case IOCTL_AFD_WINE_SET_IP_OPTIONS: return do_setsockopt( handle, io, IPPROTO_IP, IP_OPTIONS, in_buffer, in_size ); +#ifdef IP_PKTINFO + case IOCTL_AFD_WINE_GET_IP_PKTINFO: + return do_getsockopt( handle, io, IPPROTO_IP, IP_PKTINFO, out_buffer, out_size ); +#elif defined(IP_RECVDSTADDR) + case IOCTL_AFD_WINE_GET_IP_PKTINFO: + return do_getsockopt( handle, io, IPPROTO_IP, IP_RECVDSTADDR, out_buffer, out_size ); +#endif + default: { if ((code >> 16) == FILE_DEVICE_NETWORK) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 9aaef3e595f..1cd1934a11e 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2451,9 +2451,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_IP_OPTIONS: return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_OPTIONS, optval, optlen ); -#if defined(IP_PKTINFO) || defined(IP_RECVDSTADDR) case WS_IP_PKTINFO: -#endif + return server_getsockopt( s, IOCTL_AFD_WINE_GET_IP_PKTINFO, optval, optlen ); + case WS_IP_TOS: case WS_IP_TTL: #ifdef IP_UNICAST_IF diff --git a/include/wine/afd.h b/include/wine/afd.h index 37969f5fbf6..3522e2444f5 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -198,6 +198,7 @@ struct afd_get_events_params #define IOCTL_AFD_WINE_SET_IP_MULTICAST_TTL WINE_AFD_IOC(253) #define IOCTL_AFD_WINE_GET_IP_OPTIONS WINE_AFD_IOC(254) #define IOCTL_AFD_WINE_SET_IP_OPTIONS WINE_AFD_IOC(255) +#define IOCTL_AFD_WINE_GET_IP_PKTINFO WINE_AFD_IOC(256) struct afd_create_params {

1 0

← Newer
1
...
39
40
41
42
43
44
45
...
73
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits July 2021