July 2020 - Wine-devel - list.winehq.org

[PATCH] ws2_32: Provide default protocol for SOCK_STREAM and SOCK_DGRAM
by Robin Ebert 17 Jul '20

17 Jul '20

Windows provides a default protocol in socket() if af is AF_INET or AF_INET6 type is SOCK_STREAM or SOCK_DGRAM and protocol is 0. Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> --- dlls/ws2_32/socket.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d7eddde..de30ee4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -835,6 +835,12 @@ static const int ws_poll_map[][2] = { WS_POLLRDBAND, POLLPRI } }; +static const int ws_default_protocol_map[][2] = +{ + { WS_SOCK_STREAM, WS_IPPROTO_TCP }, + { WS_SOCK_DGRAM, WS_IPPROTO_UDP } +}; + static const char magic_loopback_addr[] = {127, 12, 34, 56}; #ifndef HAVE_STRUCT_MSGHDR_MSG_ACCRIGHTS @@ -1660,6 +1666,26 @@ static int convert_poll_u2w(int events) return ret; } +static int get_default_protocol(int type) +{ + int i, ret; + for(i = ret = 0; i < ARRAY_SIZE(ws_default_protocol_map); i++) + { + if (ws_default_protocol_map[i][0] == type) + { + ret = ws_default_protocol_map[i][1]; + break; + } + } + + if(!ret) + WARN("selecting default protocol failed: type %i\n", type); + else + TRACE("selected %i as default protocol: type %i\n", ret, type); + + return ret; +} + static int set_ipx_packettype(int sock, int ptype) { #ifdef HAS_IPX @@ -7643,6 +7669,19 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, protocol = lpProtocolInfo->iProtocol; } + /* + Windows provides a default protocol + if af is AF_INET or AF_INET6, + type is SOCKET_STREAM or SOCKET_DGRAM + and protocol is 0 + */ + if (!protocol + && (af == WS_AF_INET || af == WS_AF_INET6) + && (type == WS_SOCK_STREAM || type == WS_SOCK_DGRAM)) + { + protocol = get_default_protocol(type); + } + if (!type && (af || protocol)) { int autoproto = protocol; -- 2.20.1

2 2

[PATCH 2/2] comctl32: Offset client area when toolbar divider is present.
by Piotr Caban 17 Jul '20

17 Jul '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 5 +++++ dlls/comctl32/toolbar.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] comctl32: Compute border size from client and window rectangles.
by Piotr Caban 17 Jul '20

17 Jul '20

Fixes toolbar size when WS_EX_DLGMODALFRAME is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/comctl32/tests/toolbar.c | 26 ++++++++++++++++++++++---- dlls/comctl32/toolbar.c | 22 ++++++++++++---------- 2 files changed, 34 insertions(+), 14 deletions(-)

1 0

[PATCH] ntdll: Always use GNU _CI* functions implementation on clang.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- Fixes compilation with clang MSVC target. dlls/ntdll/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH] msvcrt: Fix the spelling of a TRACE() message.
by Francois Gouget 17 Jul '20

17 Jul '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/msvcrt/printf.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index 46df340839e..f776a1fa4b2 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -585,7 +585,7 @@ static inline int FUNC_NAME(pf_output_fp)(FUNC_NAME(puts_clbk) pf_puts, void *pu ULONGLONG m; DWORD l; - TRACE("floting point argument: %.16le\n", v); + TRACE("floating point argument: %.16le\n", v); if(flags->Precision == -1) flags->Precision = 6; -- 2.20.1

2 1

[PATCH 4/4] server: Remove support for SET_CONSOLE_INPUT_INFO_ACTIVE_SB.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/console.c | 26 +------------------------- server/protocol.def | 2 -- 2 files changed, 1 insertion(+), 27 deletions(-)

1 0

[PATCH 3/4] kernelbase: Use IOCTL_CONDRV_ACTIVATE in SetConsoleActiveScreenBuffer.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)

1 0

[PATCH 2/4] server: Introduce IOCTL_CONDRV_ACTIVATE ioctl.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- include/wine/condrv.h | 1 + server/console.c | 15 +++++++++++++++ server/trace.c | 1 + 3 files changed, 17 insertions(+)

1 0

[PATCH 1/4] kernelbase: Avoid unneeded GetConsoleOutputCP calls.
by Jacek Caban 17 Jul '20

17 Jul '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernelbase/console.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)

1 0

[PATCH] mshtml: Fix the spelling of a MoveUnitBounded() parameter.
by Francois Gouget 17 Jul '20

17 Jul '20

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/mshtml/range.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/range.c b/dlls/mshtml/range.c index c15470c4ff5..7db62f49a12 100644 --- a/dlls/mshtml/range.c +++ b/dlls/mshtml/range.c @@ -2343,10 +2343,10 @@ static HRESULT WINAPI MarkupPointer2_MoveToMarkupPosition(IMarkupPointer2 *iface return E_NOTIMPL; } -static HRESULT WINAPI MarkupPointer2_MoveUnitBounded(IMarkupPointer2 *iface, MOVEUNIT_ACTION action, IMarkupPointer *boundry) +static HRESULT WINAPI MarkupPointer2_MoveUnitBounded(IMarkupPointer2 *iface, MOVEUNIT_ACTION action, IMarkupPointer *boundary) { MarkupPointer *This = impl_from_IMarkupPointer2(iface); - FIXME("(%p)->(%u %p)\n", This, action, boundry); + FIXME("(%p)->(%u %p)\n", This, action, boundary); return E_NOTIMPL; } -- 2.20.1

2 1