July 2021 - Wine-Commits - list.winehq.org

Paul Gofman : mshtml: Default to IE11 for Internet URL zone.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 4eb35fb2375fa9d1ce3d35d6d3911ee6e449acfe URL: https://source.winehq.org/git/wine.git/?a=commit;h=4eb35fb2375fa9d1ce3d35d6… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 21 23:44:32 2021 +0300 mshtml: Default to IE11 for Internet URL zone. Fixes Swords of Legends Online launcher. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index abe403ea976..4352e93eba3 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -828,15 +828,10 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, DWORD zone; HRESULT hres; - /* - * Internet URL zone is treated differently. Native defaults to latest supported - * mode. We default to IE8. Ideally, we'd sync that with version used for IE=edge - * X-UA-Compatible version, allow configuration and default to higher version - * (once it's well supported). - */ + /* Internet URL zone is treated differently and defaults to the latest supported mode. */ hres = IInternetSecurityManager_MapUrlToZone(get_security_manager(), window->url, &zone, 0); if(SUCCEEDED(hres) && zone == URLZONE_INTERNET) - mode = COMPAT_MODE_IE8; + mode = COMPAT_MODE_IE11; } set_document_mode(This, mode, FALSE);

1 0

Zebediah Figura : ws2_32/tests: Add more tests for bind() and getsockname().
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 2e0cb6d4dec0914d95d40853ea1876f734fa6c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2e0cb6d4dec0914d95d40853… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:50 2021 -0500 ws2_32/tests: Add more tests for bind() and getsockname(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/afd.c | 149 ++++++++++++++++++++++++++++++++++++++++------- dlls/ws2_32/tests/sock.c | 84 ++++++++++++++++++++++++++ 2 files changed, 211 insertions(+), 22 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2e0cb6d4dec0914d95d4…

1 0

Zebediah Figura : ws2_32: Validate address length in bind().
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: cd34be062c057f24771c48ce59a6c54a2f2e31b2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd34be062c057f24771c48ce… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:51 2021 -0500 ws2_32: Validate address length in bind(). bind() returns WSAEFAULT for short length, but IOCTL_AFD_BIND returns STATUS_INVALID_ADDRESS, which translates to WSAEADDRNOTAVAIL. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 42 +++++++++++++++++++++++++++++++++++++++++- dlls/ws2_32/tests/sock.c | 10 ++++------ 2 files changed, 45 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index fac19355705..88d30cb2802 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1775,12 +1775,52 @@ int WINAPI WS_bind( SOCKET s, const struct WS_sockaddr *addr, int len ) TRACE( "socket %#lx, addr %s\n", s, debugstr_sockaddr(addr) ); - if (!addr || (addr->sa_family && !supported_pf( addr->sa_family ))) + if (!addr) { SetLastError( WSAEAFNOSUPPORT ); return -1; } + switch (addr->sa_family) + { + case WS_AF_INET: + if (len < sizeof(struct WS_sockaddr_in)) + { + SetLastError( WSAEFAULT ); + return -1; + } + break; + + case WS_AF_INET6: + if (len < sizeof(struct WS_sockaddr_in6)) + { + SetLastError( WSAEFAULT ); + return -1; + } + break; + + case WS_AF_IPX: + if (len < sizeof(struct WS_sockaddr_ipx)) + { + SetLastError( WSAEFAULT ); + return -1; + } + break; + + case WS_AF_IRDA: + if (len < sizeof(SOCKADDR_IRDA)) + { + SetLastError( WSAEFAULT ); + return -1; + } + break; + + default: + FIXME( "unknown protocol %u\n", addr->sa_family ); + SetLastError( WSAEAFNOSUPPORT ); + return -1; + } + if (!(sync_event = get_sync_event())) return -1; params = HeapAlloc( GetProcessHeap(), 0, sizeof(int) + len ); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f5c5acf161e..dd880531047 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10668,15 +10668,13 @@ static void test_bind(void) ok(s != -1, "failed to create socket, error %u\n", WSAGetLastError()); ret = bind(s, unicast_addr->Address.lpSockaddr, sizeof(struct sockaddr_in6_old)); - todo_wine_if (!addr6.sin6_scope_id) - { - ok(ret == -1, "expected failure\n"); - ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); - } + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); addr6.sin6_scope_id = 0xabacab; ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); - ok(ret == -1, "expected failure\n"); + todo_wine_if (!((const struct sockaddr_in6 *)unicast_addr->Address.lpSockaddr)->sin6_scope_id) + ok(ret == -1, "expected failure\n"); todo_wine ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); addr6.sin6_scope_id = 0;

1 0

Zebediah Figura : server: Map ENODEV to STATUS_INVALID_ADDRESS_COMPONENT.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 06dd08ee44b140ca5182120926506e26f21a7c1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=06dd08ee44b140ca51821209… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:55 2021 -0500 server: Map ENODEV to STATUS_INVALID_ADDRESS_COMPONENT. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 4 +++- server/sock.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ed7d5121332..41fcb5d9248 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10674,8 +10674,10 @@ static void test_bind(void) addr6.sin6_scope_id = 0xabacab; ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); todo_wine_if (!((const struct sockaddr_in6 *)unicast_addr->Address.lpSockaddr)->sin6_scope_id) + { ok(ret == -1, "expected failure\n"); - todo_wine ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEADDRNOTAVAIL, "got error %u\n", WSAGetLastError()); + } addr6.sin6_scope_id = 0; ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); diff --git a/server/sock.c b/server/sock.c index e28b0349027..f730bb31c55 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1976,6 +1976,9 @@ static int sock_get_ntstatus( int err ) case ENOPROTOOPT: return STATUS_INVALID_PARAMETER; case EOPNOTSUPP: return STATUS_NOT_SUPPORTED; case EADDRINUSE: return STATUS_SHARING_VIOLATION; + /* Linux returns ENODEV when specifying an invalid sin6_scope_id; + * Windows returns STATUS_INVALID_ADDRESS_COMPONENT */ + case ENODEV: case EADDRNOTAVAIL: return STATUS_INVALID_ADDRESS_COMPONENT; case ECONNREFUSED: return STATUS_CONNECTION_REFUSED; case ESHUTDOWN: return STATUS_PIPE_DISCONNECTED;

1 0

Paul Gofman : mshtml: Do not lock document mode in create_document_event().
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: b7ddab2e46ecb64379d617b2536862cda5e66548 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7ddab2e46ecb64379d617b2… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed Jul 21 23:44:31 2021 +0300 mshtml: Do not lock document mode in create_document_event(). Event may be created before the document is loaded. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 17f5fb35b71..5b040c4df62 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -2334,7 +2334,7 @@ HRESULT create_document_event(HTMLDocumentNode *doc, eventid_t event_id, DOMEven return E_FAIL; } - event = alloc_event(nsevent, dispex_compat_mode(&doc->node.event_target.dispex), event_id); + event = alloc_event(nsevent, doc->document_mode, event_id); if(!event) return E_OUTOFMEMORY;

1 0

Francois Gouget : oleaut32: Setting sThousand to a non-breaking space also matches regular spaces.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: c50dff867d797f7c43a8a319afb735fea6e8bf31 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c50dff867d797f7c43a8a319… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 22 00:03:43 2021 +0200 oleaut32: Setting sThousand to a non-breaking space also matches regular spaces. As the test_VarParseNumFromStrMisc() tests show the converse is not true. Note also that the " 1 000" test was failing as expected because in the French locale Wine was not recognizing regular spaces as thousands separators. Now it does and Wine incorrectly allows them before the first digit, just like it does for the English tests. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51450 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 32 +++++++++++++------------------- dlls/oleaut32/variant.c | 10 +++++++++- 2 files changed, 22 insertions(+), 20 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d3a1a2e3a31..50af05e47cc 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1916,7 +1916,6 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Trailing thousands separators are allowed as usual */ - todo_wine_if(spaces[i] == ' ') EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); EXPECT2(3,FAILDIG); } @@ -1949,7 +1948,6 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Non-breaking space and regular spaces work */ - todo_wine_if(i == 0) EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,5,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); @@ -1965,34 +1963,31 @@ static void test_VarParseNumFromStrFr(void) /* With flag and decimal point, thousands sep. but not decimals consumed */ CONVERT("1 001,0", NUMPRS_THOUSANDS); - if (broken(1)) /* FIXME Reenable once Wine is less broken */ EXPECT(4,NUMPRS_THOUSANDS,NUMPRS_THOUSANDS,5,0,0); - todo_wine ok(np.cDig == 4, "Expected cDig = 4, got %d\n", np.cDig); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,0); - todo_wine EXPECTRGB(2,0); - todo_wine EXPECTRGB(3,1); + EXPECT2(1,0); + EXPECTRGB(2,0); + EXPECTRGB(3,1); EXPECTRGB(4,FAILDIG); /* With flag, consecutive thousands separators are allowed */ CONVERT("1 000", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,6,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,6,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* With flag, thousands separators can be sprinkled at random */ CONVERT("1 00 0 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,8,0,3); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,8,0,3); EXPECTRGB(0,1); /* Don't test extra digits, see "1,000" test */ EXPECTRGB(4,FAILDIG); /* With flag, but leading thousands separators are not allowed */ CONVERT(" 1 000", NUMPRS_THOUSANDS); - EXPECTFAIL; + todo_wine EXPECTFAIL; /* With flag, thousands separator not needed but still reported */ CONVERT("1 ", NUMPRS_THOUSANDS|NUMPRS_USE_ALL); - todo_wine EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); + EXPECT(1,NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_THOUSANDS,2,0,0); EXPECT2(1,FAILDIG); @@ -2039,7 +2034,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - todo_wine_if(i==0) EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); + EXPECT(2,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS,4,0,0); EXPECT2(1,2); EXPECTRGB(2,FAILDIG); } @@ -2067,12 +2062,11 @@ static void test_VarParseNumFromStrFr(void) /* Thousands flag can also be used with currency */ WCONVERT(L"1 234,5 \x20ac", NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL); - todo_wine EXPECT(5,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL,9,0,-1); - EXPECTRGB(0,1); - todo_wine EXPECTRGB(1,2); - todo_wine EXPECTRGB(2,3); - todo_wine EXPECTRGB(3,4); - todo_wine EXPECTRGB(4,5); + EXPECT(5,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL|NUMPRS_USE_ALL,NUMPRS_CURRENCY|NUMPRS_THOUSANDS|NUMPRS_DECIMAL,9,0,-1); + EXPECT2(1,2); + EXPECTRGB(2,3); + EXPECTRGB(3,4); + EXPECTRGB(4,5); EXPECTRGB(5,FAILDIG); diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 208d5b63c8f..fbcc8ce693f 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1615,6 +1615,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla DWORD dwState = B_EXPONENT_START|B_INEXACT_ZEROS; int iMaxDigits = ARRAY_SIZE(rgbTmp); int cchUsed = 0; + OLECHAR cDigitSeparator2; TRACE("(%s,%d,0x%08x,%p,%p)\n", debugstr_w(lpszStr), lcid, dwFlags, pNumprs, rgbDig); @@ -1634,6 +1635,10 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla return DISP_E_TYPEMISMATCH; VARIANT_GetLocalisedNumberChars(&chars, lcid, dwFlags); + /* Setting the thousands separator to a non-breaking space implies regular + * spaces are allowed too. But the converse is not true. + */ + cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; /* First consume all the leading symbols and space from the string */ while (1) @@ -1674,6 +1679,7 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* Only accept currency characters */ chars.cDecimalPoint = chars.cCurrencyDecimalPoint; chars.cDigitSeparator = chars.cCurrencyDigitSeparator; + cDigitSeparator2 = chars.cDigitSeparator == 0xa0 ? ' ' : 0; } else if (pNumprs->dwInFlags & NUMPRS_PARENS && *lpszStr == '(' && !(pNumprs->dwOutFlags & NUMPRS_PARENS)) @@ -1781,7 +1787,9 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla cchUsed++; } } - else if (*lpszStr == chars.cDigitSeparator && pNumprs->dwInFlags & NUMPRS_THOUSANDS) + else if (pNumprs->dwInFlags & NUMPRS_THOUSANDS && + ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || + (cDigitSeparator2 && *lpszStr == cDigitSeparator2))) { pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; cchUsed++;

1 0

Francois Gouget : oleaut32: Fix VarParseNumFromStr()'s support for trailing thousands separator spaces.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: c2aeb915f4fc05d596aec0ff43f5e5f26569cd21 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2aeb915f4fc05d596aec0ff… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jul 22 00:03:49 2021 +0200 oleaut32: Fix VarParseNumFromStr()'s support for trailing thousands separator spaces. If a trailing character is a thousands separator, VarParseNumFromStr() only processes it if NUMPRS_THOUSANDS was specified; even if that character is also a space and NUMPRS_TRAILING_WHITE was specified. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 4 ++-- dlls/oleaut32/variant.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index 47dfbefc081..73df13fe5c9 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1903,7 +1903,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to the thousands separator are never allowed! */ - todo_wine EXPECTFAIL; + EXPECTFAIL; } else { @@ -2020,7 +2020,7 @@ static void test_VarParseNumFromStrFr(void) if (spaces[i] == ' ' || spaces[i] == 0xa0 /* non-breaking space */) { /* Spaces aliased to thousands separator are never allowed! */ - todo_wine EXPECTFAIL; + EXPECTFAIL; } else { diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index 35e4539c2ef..e4993de75a5 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -1923,7 +1923,22 @@ HRESULT WINAPI VarParseNumFromStr(const OLECHAR *lpszStr, LCID lcid, ULONG dwFla /* Consume any trailing symbols and space */ while (1) { - if ((pNumprs->dwInFlags & NUMPRS_TRAILING_WHITE) && iswspace(*lpszStr)) + if ((chars.cDigitSeparator && *lpszStr == chars.cDigitSeparator) || + (cDigitSeparator2 && *lpszStr == cDigitSeparator2)) + { + if (pNumprs->dwInFlags & NUMPRS_THOUSANDS) + { + pNumprs->dwOutFlags |= NUMPRS_THOUSANDS; + cchUsed++; + lpszStr++; + } + else + { + /* Not allowed, even with NUMPRS_TRAILING_WHITE */ + break; + } + } + else if ((pNumprs->dwInFlags & NUMPRS_TRAILING_WHITE) && iswspace(*lpszStr)) { pNumprs->dwOutFlags |= NUMPRS_TRAILING_WHITE; do

1 0

Michael Stefaniuc : dinput: Use SUCCEEDED instead of !FAILED.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: e35ea310a69e6e8bed0bdeff49c833cc8b5897ff URL: https://source.winehq.org/git/wine.git/?a=commit;h=e35ea310a69e6e8bed0bdeff… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Thu Jul 22 00:30:14 2021 +0200 dinput: Use SUCCEEDED instead of !FAILED. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 390b2f56581..cbc9dbc9733 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -174,7 +174,7 @@ static HRESULT diactionformat_atow( const DIACTIONFORMATA *in, DIACTIONFORMATW * out->dwDataSize = in->dwDataSize; out->dwNumActions = in->dwNumActions; - for (i = 0; i < out->dwNumActions && !FAILED(hr); ++i) + for (i = 0; i < out->dwNumActions && SUCCEEDED(hr); ++i) { out->rgoAction[i].uAppData = in->rgoAction[i].uAppData; out->rgoAction[i].dwSemantic = in->rgoAction[i].dwSemantic;

1 0

Zebediah Figura : server: Avoid leaking the ifaddrs structure in bind_to_interface().
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: d3b64637a0505379d74c3b7899fd1db3563517ac URL: https://source.winehq.org/git/wine.git/?a=commit;h=d3b64637a0505379d74c3b78… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:53 2021 -0500 server: Avoid leaking the ifaddrs structure in bind_to_interface(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server/sock.c b/server/sock.c index 3f0526016f9..6a8cb328df2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1844,6 +1844,8 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr return 1; } } + + freeifaddrs( ifaddrs ); return 0; }

1 0

Zebediah Figura : server: Support passing to bind a zero sin6_scope_id.
by Alexandre Julliard July 22, 2021

July 22, 2021

Module: wine Branch: master Commit: 9b257ed63f44067e9c7bbe3abd731b2f212a325c URL: https://source.winehq.org/git/wine.git/?a=commit;h=9b257ed63f44067e9c7bbe3a… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jul 21 20:34:54 2021 -0500 server: Support passing to bind a zero sin6_scope_id. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 19 ++++++++----------- server/sock.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index dd880531047..ed7d5121332 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -10679,27 +10679,24 @@ static void test_bind(void) addr6.sin6_scope_id = 0; ret = bind(s, (struct sockaddr *)&addr6, sizeof(addr6)); - todo_wine ok(!ret, "got error %u\n", WSAGetLastError()); + todo_wine_if (!((const struct sockaddr_in6 *)unicast_addr->Address.lpSockaddr)->sin6_scope_id) + ok(!ret, "got error %u\n", WSAGetLastError()); memcpy(&addr6, unicast_addr->Address.lpSockaddr, sizeof(addr6)); len = sizeof(struct sockaddr_in6_old); ret = getsockname(s, (struct sockaddr *)&ret_addr6, &len); ok(ret == -1, "expected failure\n"); - todo_wine_if (addr6.sin6_scope_id) - ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); + ok(WSAGetLastError() == WSAEFAULT, "got error %u\n", WSAGetLastError()); len = sizeof(ret_addr6); memset(&ret_addr6, 0, sizeof(ret_addr6)); ret = getsockname(s, (struct sockaddr *)&ret_addr6, &len); - todo_wine_if (addr6.sin6_scope_id) - { - ok(!ret, "got error %u\n", WSAGetLastError()); - ok(ret_addr6.sin6_family == AF_INET6, "got family %u\n", ret_addr6.sin6_family); - ok(ret_addr6.sin6_port != 0, "expected nonzero port\n"); - ok(!memcmp(&ret_addr6.sin6_addr, &addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); - ok(ret_addr6.sin6_scope_id == addr6.sin6_scope_id, "got scope %u\n", ret_addr6.sin6_scope_id); - } + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(ret_addr6.sin6_family == AF_INET6, "got family %u\n", ret_addr6.sin6_family); + ok(ret_addr6.sin6_port != 0, "expected nonzero port\n"); + ok(!memcmp(&ret_addr6.sin6_addr, &addr6.sin6_addr, sizeof(addr6.sin6_addr)), "address didn't match\n"); + ok(ret_addr6.sin6_scope_id == addr6.sin6_scope_id, "got scope %u\n", ret_addr6.sin6_scope_id); closesocket(s); } diff --git a/server/sock.c b/server/sock.c index 6a8cb328df2..e28b0349027 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1849,6 +1849,38 @@ static int bind_to_interface( struct sock *sock, const struct sockaddr_in *addr return 0; } +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID +static unsigned int get_ipv6_interface_index( const struct in6_addr *addr ) +{ + struct ifaddrs *ifaddrs, *ifaddr; + + if (getifaddrs( &ifaddrs ) < 0) return 0; + + for (ifaddr = ifaddrs; ifaddr != NULL; ifaddr = ifaddr->ifa_next) + { + if (ifaddr->ifa_addr && ifaddr->ifa_addr->sa_family == AF_INET6 + && !memcmp( &((struct sockaddr_in6 *)ifaddr->ifa_addr)->sin6_addr, addr, sizeof(*addr) )) + { + unsigned int index = if_nametoindex( ifaddr->ifa_name ); + + if (!index) + { + if (debug_level) + fprintf( stderr, "Unable to look up interface index for %s: %s\n", + ifaddr->ifa_name, strerror( errno ) ); + continue; + } + + freeifaddrs( ifaddrs ); + return index; + } + } + + freeifaddrs( ifaddrs ); + return 0; +} +#endif + /* return an errno value mapped to a WSA error */ static unsigned int sock_get_error( int err ) { @@ -2477,12 +2509,22 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) } bind_addr = unix_addr; - if (unix_addr.addr.sa_family == WS_AF_INET) + if (unix_addr.addr.sa_family == AF_INET) { if (!memcmp( &unix_addr.in.sin_addr, magic_loopback_addr, 4 ) || bind_to_interface( sock, &unix_addr.in )) bind_addr.in.sin_addr.s_addr = htonl( INADDR_ANY ); } + else if (unix_addr.addr.sa_family == AF_INET6) + { +#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_SCOPE_ID + /* Windows allows specifying zero to use the default scope. Linux + * interprets it as an interface index and requires that it be + * nonzero. */ + if (!unix_addr.in6.sin6_scope_id) + bind_addr.in6.sin6_scope_id = get_ipv6_interface_index( &unix_addr.in6.sin6_addr ); +#endif + } if (bind( unix_fd, &bind_addr.addr, unix_len ) < 0) {

1 0