wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Rémi Bernon : dinput: Factor out IDirectInputDevice_GetCapabilities WtoA conversions.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 5eb5f94fc0c5d5ace256e75122f675722d0527f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5eb5f94fc0c5d5ace256e751… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 27 10:50:01 2021 +0200 dinput: Factor out IDirectInputDevice_GetCapabilities WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 7 +++++++ dlls/dinput/device_private.h | 1 + dlls/dinput/joystick.c | 6 ------ dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 1 - dlls/dinput/keyboard.c | 8 +------- dlls/dinput/mouse.c | 8 +------- 9 files changed, 13 insertions(+), 24 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 4e9a9af7a83..d61fdb07e4f 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -130,6 +130,13 @@ ULONG WINAPI IDirectInputDevice2AImpl_Release( IDirectInputDevice8A *iface_a ) return IDirectInputDevice8_Release( iface_w ); } +HRESULT WINAPI IDirectInputDevice2AImpl_GetCapabilities( IDirectInputDevice8A *iface_a, DIDEVCAPS *caps ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + return IDirectInputDevice8_GetCapabilities( iface_w, caps ); +} + struct enum_objects_wtoa_params { LPDIENUMDEVICEOBJECTSCALLBACKA callback; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 56718790040..f8cfd98f9b3 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -144,6 +144,7 @@ extern HRESULT WINAPI IDirectInputDevice2AImpl_SetEventNotification(LPDIRECTINPU extern HRESULT WINAPI IDirectInputDevice2WImpl_SetEventNotification(LPDIRECTINPUTDEVICE8W iface, HANDLE hnd) DECLSPEC_HIDDEN; extern ULONG WINAPI IDirectInputDevice2AImpl_Release(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; extern ULONG WINAPI IDirectInputDevice2WImpl_Release(LPDIRECTINPUTDEVICE8W iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI IDirectInputDevice2AImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, DIDEVCAPS *caps) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface(LPDIRECTINPUTDEVICE8A iface, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT WINAPI IDirectInputDevice2WImpl_QueryInterface(LPDIRECTINPUTDEVICE8W iface, REFIID riid, LPVOID *ppobj) DECLSPEC_HIDDEN; extern ULONG WINAPI IDirectInputDevice2AImpl_AddRef(LPDIRECTINPUTDEVICE8A iface) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index b79935ede7c..60a61d1ea6b 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -542,12 +542,6 @@ HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } -HRESULT WINAPI JoystickAGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) -{ - JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); - return JoystickWGenericImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); -} - /****************************************************************************** * GetObjectInfo : get object info */ diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 091e1f2152e..8196102f9bb 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -907,7 +907,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - JoystickAGenericImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 307b447d237..9a41e798642 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1338,7 +1338,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - JoystickAGenericImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, diff --git a/dlls/dinput/joystick_osx.c b/dlls/dinput/joystick_osx.c index 78e041daf92..a663c438c35 100644 --- a/dlls/dinput/joystick_osx.c +++ b/dlls/dinput/joystick_osx.c @@ -1579,7 +1579,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - JoystickAGenericImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, diff --git a/dlls/dinput/joystick_private.h b/dlls/dinput/joystick_private.h index 2a25bf4eb23..60cea6197c6 100644 --- a/dlls/dinput/joystick_private.h +++ b/dlls/dinput/joystick_private.h @@ -64,7 +64,6 @@ HRESULT WINAPI JoystickWGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8W iface, HRESULT WINAPI JoystickWGenericImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, REFGUID rguid, LPDIPROPHEADER pdiph) DECLSPEC_HIDDEN; -HRESULT WINAPI JoystickAGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) DECLSPEC_HIDDEN; HRESULT WINAPI JoystickWGenericImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, LPDIDEVCAPS lpDIDevCaps) DECLSPEC_HIDDEN; void _dump_DIDEVCAPS(const DIDEVCAPS *lpDIDevCaps) DECLSPEC_HIDDEN; diff --git a/dlls/dinput/keyboard.c b/dlls/dinput/keyboard.c index b1914d057bd..3a81b7e58fb 100644 --- a/dlls/dinput/keyboard.c +++ b/dlls/dinput/keyboard.c @@ -419,12 +419,6 @@ static HRESULT WINAPI SysKeyboardWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W ifa return DI_OK; } -static HRESULT WINAPI SysKeyboardAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) -{ - SysKeyboardImpl *This = impl_from_IDirectInputDevice8A(iface); - return SysKeyboardWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); -} - static DWORD map_dik_to_scan(DWORD dik_code, DWORD subtype) { if (dik_code == DIK_PAUSE || dik_code == DIK_NUMLOCK) dik_code ^= 0x80; @@ -657,7 +651,7 @@ static const IDirectInputDevice8AVtbl SysKeyboardAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - SysKeyboardAImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty, diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 9267d92d6e9..68cc5059ec8 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -761,12 +761,6 @@ static HRESULT WINAPI SysMouseWImpl_GetCapabilities(LPDIRECTINPUTDEVICE8W iface, return DI_OK; } -static HRESULT WINAPI SysMouseAImpl_GetCapabilities(LPDIRECTINPUTDEVICE8A iface, LPDIDEVCAPS lpDIDevCaps) -{ - SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); - return SysMouseWImpl_GetCapabilities(IDirectInputDevice8W_from_impl(This), lpDIDevCaps); -} - /****************************************************************************** * GetObjectInfo : get information about a device object such as a button * or axis @@ -911,7 +905,7 @@ static const IDirectInputDevice8AVtbl SysMouseAvt = IDirectInputDevice2AImpl_QueryInterface, IDirectInputDevice2AImpl_AddRef, IDirectInputDevice2AImpl_Release, - SysMouseAImpl_GetCapabilities, + IDirectInputDevice2AImpl_GetCapabilities, IDirectInputDevice2AImpl_EnumObjects, IDirectInputDevice2AImpl_GetProperty, IDirectInputDevice2AImpl_SetProperty,

1 0

Rémi Bernon : dinput: Implement IDirectInputDevice_GetImageInfo WtoA conversion.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 5df60ff2ba908b6fd99acee300ad057e2066eac0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5df60ff2ba908b6fd99acee3… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Thu May 27 10:50:00 2021 +0200 dinput: Implement IDirectInputDevice_GetImageInfo WtoA conversion. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/dinput/device.c | 13 ------------ 2 files changed, 57 insertions(+), 13 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 5d1ea9f0b4e..4e9a9af7a83 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -73,6 +73,42 @@ static void dieffectinfo_wtoa( const DIEFFECTINFOW *in, DIEFFECTINFOA *out ) WideCharToMultiByte( CP_ACP, 0, in->tszName, -1, out->tszName, sizeof(out->tszName), NULL, NULL ); } +static void dideviceimageinfo_wtoa( const DIDEVICEIMAGEINFOW *in, DIDEVICEIMAGEINFOA *out ) +{ + WideCharToMultiByte( CP_ACP, 0, in->tszImagePath, -1, out->tszImagePath, + sizeof(out->tszImagePath), NULL, NULL ); + + out->dwFlags = in->dwFlags; + out->dwViewID = in->dwViewID; + out->rcOverlay = in->rcOverlay; + out->dwObjID = in->dwObjID; + out->dwcValidPts = in->dwcValidPts; + out->rgptCalloutLine[0] = in->rgptCalloutLine[0]; + out->rgptCalloutLine[1] = in->rgptCalloutLine[1]; + out->rgptCalloutLine[2] = in->rgptCalloutLine[2]; + out->rgptCalloutLine[3] = in->rgptCalloutLine[3]; + out->rgptCalloutLine[4] = in->rgptCalloutLine[4]; + out->rcCalloutRect = in->rcCalloutRect; + out->dwTextAlign = in->dwTextAlign; +} + +static void dideviceimageinfoheader_wtoa( const DIDEVICEIMAGEINFOHEADERW *in, DIDEVICEIMAGEINFOHEADERA *out ) +{ + DWORD i; + + out->dwcViews = in->dwcViews; + out->dwcButtons = in->dwcButtons; + out->dwcAxes = in->dwcAxes; + out->dwcPOVs = in->dwcPOVs; + out->dwBufferUsed = 0; + + for (i = 0; i < in->dwBufferUsed / sizeof(DIDEVICEIMAGEINFOW); ++i) + { + dideviceimageinfo_wtoa( &in->lprgImageInfoArray[i], &out->lprgImageInfoArray[i] ); + out->dwBufferUsed += sizeof(DIDEVICEIMAGEINFOA); + } +} + HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface( IDirectInputDevice8A *iface_a, REFIID iid, void **out ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); @@ -331,3 +367,24 @@ HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile( IDirectInputDevice8A return IDirectInputDevice8_WriteEffectToFile( iface_w, filename_w, entries, file_effect, flags ); } + +HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo( IDirectInputDevice8A *iface_a, DIDEVICEIMAGEINFOHEADERA *header_a ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + DIDEVICEIMAGEINFOHEADERW header_w = {sizeof(header_w), sizeof(DIDEVICEIMAGEINFOW)}; + HRESULT hr; + + if (!header_a) return E_POINTER; + if (header_a->dwSize != sizeof(DIDEVICEIMAGEINFOHEADERA)) return DIERR_INVALIDPARAM; + if (header_a->dwSizeImageInfo != sizeof(DIDEVICEIMAGEINFOA)) return DIERR_INVALIDPARAM; + + header_w.dwBufferSize = (header_a->dwBufferSize / sizeof(DIDEVICEIMAGEINFOA)) * sizeof(DIDEVICEIMAGEINFOW); + header_w.lprgImageInfoArray = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, header_w.dwBufferSize ); + if (!header_w.lprgImageInfoArray) return DIERR_OUTOFMEMORY; + + hr = IDirectInputDevice8_GetImageInfo( iface_w, &header_w ); + dideviceimageinfoheader_wtoa( &header_w, header_a ); + HeapFree( GetProcessHeap(), 0, header_w.lprgImageInfoArray ); + return hr; +} diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 541f39954f6..5da58b85126 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -43,10 +43,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(dinput); -static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8A(IDirectInputDevice8A *iface) -{ - return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8A_iface); -} static inline IDirectInputDeviceImpl *impl_from_IDirectInputDevice8W(IDirectInputDevice8W *iface) { return CONTAINING_RECORD(iface, IDirectInputDeviceImpl, IDirectInputDevice8W_iface); @@ -1699,15 +1695,6 @@ HRESULT WINAPI IDirectInputDevice8WImpl_BuildActionMap(LPDIRECTINPUTDEVICE8W ifa return DI_OK; } -HRESULT WINAPI IDirectInputDevice8AImpl_GetImageInfo(LPDIRECTINPUTDEVICE8A iface, - LPDIDEVICEIMAGEINFOHEADERA lpdiDevImageInfoHeader) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - FIXME("(%p)->(%p): stub !\n", This, lpdiDevImageInfoHeader); - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice8WImpl_GetImageInfo(LPDIRECTINPUTDEVICE8W iface, LPDIDEVICEIMAGEINFOHEADERW lpdiDevImageInfoHeader) {

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_SENDMSG in WS2_sendto().
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 58694d1f757c7a902b3f71baadb3a0036f15cdae URL: https://source.winehq.org/git/wine.git/?a=commit;h=58694d1f757c7a902b3f71ba… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:54 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_SENDMSG in WS2_sendto(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 334 ++++++++++++----------------------------------- dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 88 insertions(+), 248 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=58694d1f757c7a902b3f…

1 0

Zebediah Figura : ntdll: Introduce IOCTL_AFD_WINE_SENDMSG.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 85a615f13697925a4cea2f311bb33501a785f2c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=85a615f13697925a4cea2f31… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:53 2021 -0500 ntdll: Introduce IOCTL_AFD_WINE_SENDMSG. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 310 ++++++++++++++++++++++++++++++++++++++++- include/wine/afd.h | 11 ++ include/wine/server_protocol.h | 22 ++- server/protocol.def | 11 ++ server/request.h | 9 ++ server/sock.c | 92 +++++++++++- server/trace.c | 16 +++ 7 files changed, 456 insertions(+), 15 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=85a615f13697925a4cea…

1 0

Zebediah Figura : ntdll: No longer export __wine_locked_recvmsg().
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: ac3ec2d955573e187413743428ee7e4d1a6906d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac3ec2d955573e1874137434… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:52 2021 -0500 ntdll: No longer export __wine_locked_recvmsg(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 --- dlls/ntdll/unix/socket.c | 4 +--- dlls/ntdll/unix/unix_private.h | 3 +++ dlls/ntdll/unix/virtual.c | 4 ++-- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index c092e7a9d78..529bf6f269a 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1623,9 +1623,6 @@ @ cdecl -norelay __wine_dbg_output(str) @ cdecl -norelay __wine_dbg_strdup(str) -# Virtual memory -@ cdecl -syscall __wine_locked_recvmsg(long ptr long) - # Version @ cdecl wine_get_version() @ cdecl wine_get_build_id() diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index aa56e529f0d..8d126e004f0 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -147,8 +147,6 @@ static NTSTATUS sock_errno_to_status( int err ) } } -extern ssize_t CDECL __wine_locked_recvmsg( int fd, struct msghdr *hdr, int flags ); - union unix_sockaddr { struct sockaddr addr; @@ -349,7 +347,7 @@ static NTSTATUS try_recv( int fd, struct async_recv_ioctl *async, ULONG_PTR *siz hdr.msg_control = control_buffer; hdr.msg_controllen = sizeof(control_buffer); #endif - while ((ret = __wine_locked_recvmsg( fd, &hdr, async->unix_flags )) < 0 && errno == EINTR); + while ((ret = virtual_locked_recvmsg( fd, &hdr, async->unix_flags )) < 0 && errno == EINTR); if (ret < 0) { diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index fdede25cfbc..f28d5cf4e99 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -27,6 +27,8 @@ #include "wine/server.h" #include "wine/list.h" +struct msghdr; + #ifdef __i386__ static const WORD current_machine = IMAGE_FILE_MACHINE_I386; #elif defined(__x86_64__) @@ -216,6 +218,7 @@ extern NTSTATUS virtual_handle_fault( void *addr, DWORD err, void *stack ) DECLS extern unsigned int virtual_locked_server_call( void *req_ptr ) DECLSPEC_HIDDEN; extern ssize_t virtual_locked_read( int fd, void *addr, size_t size ) DECLSPEC_HIDDEN; extern ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset ) DECLSPEC_HIDDEN; +extern ssize_t virtual_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) DECLSPEC_HIDDEN; extern BOOL virtual_is_valid_code_address( const void *addr, SIZE_T size ) DECLSPEC_HIDDEN; extern void *virtual_setup_exception( void *stack_ptr, size_t size, EXCEPTION_RECORD *rec ) DECLSPEC_HIDDEN; extern BOOL virtual_check_buffer_for_read( const void *ptr, SIZE_T size ) DECLSPEC_HIDDEN; diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index fd2e80c75f3..2ef72220a45 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -3356,9 +3356,9 @@ ssize_t virtual_locked_pread( int fd, void *addr, size_t size, off_t offset ) /*********************************************************************** - * __wine_locked_recvmsg (NTDLL.@) + * virtual_locked_recvmsg */ -ssize_t CDECL __wine_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) +ssize_t virtual_locked_recvmsg( int fd, struct msghdr *hdr, int flags ) { sigset_t sigset; size_t i;

1 0

Zebediah Figura : ws2_32: Use IOCTL_AFD_WINE_RECVMSG in WS2_recv_base().
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 6682aa4747330f6707369b06647dc64a57874d8d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6682aa4747330f6707369b06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:51 2021 -0500 ws2_32: Use IOCTL_AFD_WINE_RECVMSG in WS2_recv_base(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 466 +++++++---------------------------------------- dlls/ws2_32/tests/sock.c | 18 +- 2 files changed, 72 insertions(+), 412 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6682aa4747330f670736…

1 0

Zebediah Figura : ntdll: Introduce IOCTL_AFD_WINE_RECVMSG.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: b108c1373a8774f38ebbb6b70077250771d17d84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b108c1373a8774f38ebbb6b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:50 2021 -0500 ntdll: Introduce IOCTL_AFD_WINE_RECVMSG. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 + dlls/ntdll/unix/socket.c | 320 +++++++++++++++++++++++++++++++++++++++++++++-- include/wine/afd.h | 18 +++ 3 files changed, 328 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b108c1373a8774f38ebb…

1 0

Zebediah Figura : server: Clear FD_OOB instead of FD_READ when receiving OOB data.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: e634cc7f48aa6c20aaf3623d3b899cf420393f5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e634cc7f48aa6c20aaf3623d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:49 2021 -0500 server: Clear FD_OOB instead of FD_READ when receiving OOB data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 1 + include/wine/server_protocol.h | 4 ++-- server/protocol.def | 1 + server/request.h | 1 + server/sock.c | 4 ++-- server/trace.c | 3 ++- 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index 0812ec4970f..eb278096b43 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -223,6 +223,7 @@ static NTSTATUS sock_recv( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, voi req->status = status; req->total = information; req->async = server_async( handle, &async->io, event, apc, apc_user, io ); + req->oob = !!(unix_flags & MSG_OOB); status = wine_server_call( req ); wait_handle = wine_server_ptr_handle( reply->wait ); options = reply->options; diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 730bb3c151c..771a3fb7d75 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -1808,7 +1808,7 @@ struct set_socket_deferred_reply struct recv_socket_request { struct request_header __header; - char __pad_12[4]; + int oob; async_data_t async; unsigned int status; unsigned int total; @@ -6287,7 +6287,7 @@ union generic_reply /* ### protocol_version begin ### */ -#define SERVER_PROTOCOL_VERSION 706 +#define SERVER_PROTOCOL_VERSION 707 /* ### protocol_version end ### */ diff --git a/server/protocol.def b/server/protocol.def index f0a9107cfbe..88e5ad6a96b 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -1468,6 +1468,7 @@ enum server_fd_type /* Perform a recv on a socket */ @REQ(recv_socket) + int oob; /* are we receiving OOB data? */ async_data_t async; /* async I/O parameters */ unsigned int status; /* status of initial call */ unsigned int total; /* number of bytes already read */ diff --git a/server/request.h b/server/request.h index bb261958f59..b600a9660b2 100644 --- a/server/request.h +++ b/server/request.h @@ -1068,6 +1068,7 @@ C_ASSERT( sizeof(struct enable_socket_event_request) == 32 ); C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_socket_deferred_request, deferred) == 16 ); C_ASSERT( sizeof(struct set_socket_deferred_request) == 24 ); +C_ASSERT( FIELD_OFFSET(struct recv_socket_request, oob) == 12 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, async) == 16 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, status) == 56 ); C_ASSERT( FIELD_OFFSET(struct recv_socket_request, total) == 60 ); diff --git a/server/sock.c b/server/sock.c index 549cde17296..04e27328d80 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2452,8 +2452,8 @@ DECL_HANDLER(recv_socket) /* are we shut down? */ if (status == STATUS_PENDING && !(sock->state & FD_READ)) status = STATUS_PIPE_DISCONNECTED; - sock->pending_events &= ~FD_READ; - sock->reported_events &= ~FD_READ; + sock->pending_events &= ~(req->oob ? FD_OOB : FD_READ); + sock->reported_events &= ~(req->oob ? FD_OOB : FD_READ); if ((async = create_request_async( fd, get_fd_comp_flags( fd ), &req->async ))) { diff --git a/server/trace.c b/server/trace.c index 1420f1e799f..efa263eadec 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2124,7 +2124,8 @@ static void dump_set_socket_deferred_request( const struct set_socket_deferred_r static void dump_recv_socket_request( const struct recv_socket_request *req ) { - dump_async_data( " async=", &req->async ); + fprintf( stderr, " oob=%d", req->oob ); + dump_async_data( ", async=", &req->async ); fprintf( stderr, ", status=%08x", req->status ); fprintf( stderr, ", total=%08x", req->total ); }

1 0

Zebediah Figura : server: Pass -1 to set_fd_events() if the socket is not yet initialized or a not yet used TCP socket.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: b5e264a4a2072c515afd46f57ead663582461a51 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5e264a4a2072c515afd46f5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:48 2021 -0500 server: Pass -1 to set_fd_events() if the socket is not yet initialized or a not yet used TCP socket. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/server/sock.c b/server/sock.c index 6e9ef3d9d97..549cde17296 100644 --- a/server/sock.c +++ b/server/sock.c @@ -151,7 +151,6 @@ struct sock * any event once until it is reset.) */ unsigned int reported_events; unsigned int flags; /* socket flags */ - int polling; /* is socket being polled? */ int wr_shutdown_pending; /* is a write shutdown pending? */ unsigned short proto; /* socket protocol */ unsigned short type; /* socket type */ @@ -410,14 +409,6 @@ static int sock_reselect( struct sock *sock ) if (debug_level) fprintf(stderr,"sock_reselect(%p): new mask %x\n", sock, ev); - if (!sock->polling) /* FIXME: should find a better way to do this */ - { - /* previously unconnected socket, is this reselect supposed to connect it? */ - if (!(sock->state & ~FD_WINE_NONBLOCKING)) return 0; - /* ok, it is, attach it to the wineserver's main poll loop */ - sock->polling = 1; - } - /* update condition mask */ set_fd_events( sock->fd, ev ); return ev; } @@ -986,6 +977,15 @@ static int sock_get_poll_events( struct fd *fd ) assert( sock->obj.ops == &sock_ops ); + if (!sock->type) /* not initialized yet */ + return -1; + + /* A connection-mode Windows socket which has never been connected does not + * return any events, but Linux returns POLLOUT | POLLHUP. Hence we need to + * return -1 here, to prevent the socket from being polled on at all. */ + if (sock->type == WS_SOCK_STREAM && !(sock->state & (FD_CONNECT | FD_WINE_CONNECTED | FD_WINE_LISTENING))) + return -1; + if (sock->state & FD_CONNECT) /* connecting, wait for writable */ return POLLOUT; @@ -1169,7 +1169,6 @@ static struct sock *create_socket(void) sock->mask = 0; sock->pending_events = 0; sock->reported_events = 0; - sock->polling = 0; sock->wr_shutdown_pending = 0; sock->flags = 0; sock->proto = 0; @@ -1464,7 +1463,6 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; acceptsock->pending_events = 0; acceptsock->reported_events = 0; - acceptsock->polling = 0; acceptsock->proto = sock->proto; acceptsock->type = sock->type; acceptsock->family = sock->family;

1 0

Zebediah Figura : server: Mark the socket as cacheable when it is connected, marked listening, or created as connectionless.
by Alexandre Julliard 27 May '21

27 May '21

Module: wine Branch: master Commit: 89f77a93a6c96896d90c943bc3e82139114cf58c URL: https://source.winehq.org/git/wine.git/?a=commit;h=89f77a93a6c96896d90c943b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 26 23:36:47 2021 -0500 server: Mark the socket as cacheable when it is connected, marked listening, or created as connectionless. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 3925018c7a5..6e9ef3d9d97 100644 --- a/server/sock.c +++ b/server/sock.c @@ -416,7 +416,6 @@ static int sock_reselect( struct sock *sock ) if (!(sock->state & ~FD_WINE_NONBLOCKING)) return 0; /* ok, it is, attach it to the wineserver's main poll loop */ sock->polling = 1; - allow_fd_caching( sock->fd ); } /* update condition mask */ set_fd_events( sock->fd, ev ); @@ -1358,7 +1357,11 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u { return -1; } - sock_reselect( sock ); + + /* We can't immediately allow caching for a connection-mode socket, since it + * might be accepted into (changing the underlying fd object.) */ + if (sock->type != WS_SOCK_STREAM) allow_fd_caching( sock->fd ); + return 0; } @@ -1750,6 +1753,9 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) sock->state |= FD_WINE_LISTENING; sock->state &= ~(FD_CONNECT | FD_WINE_CONNECTED); + /* a listening socket can no longer be accepted into */ + allow_fd_caching( sock->fd ); + /* we may already be selecting for FD_ACCEPT */ sock_reselect( sock ); return 0; @@ -1790,6 +1796,9 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } + /* a connected or connecting socket can no longer be accepted into */ + allow_fd_caching( sock->fd ); + sock->pending_events &= ~(FD_CONNECT | FD_READ | FD_WRITE); sock->reported_events &= ~(FD_CONNECT | FD_READ | FD_WRITE);

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
77
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 May 2021