June 2021 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Import lgamma implementation from musl.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 3171aa2b2d8db28e5bfde1cad92e0ef36ee7ccaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=3171aa2b2d8db28e5bfde1ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jun 4 18:25:49 2021 +0200 msvcrt: Import lgamma implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 1 - configure.ac | 1 - dlls/msvcrt/math.c | 196 +++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msvcrt/unixlib.c | 14 ---- dlls/msvcrt/unixlib.h | 1 - include/config.h.in | 3 - 6 files changed, 195 insertions(+), 21 deletions(-) diff --git a/configure b/configure index edc15165750..6c890d0e36b 100755 --- a/configure +++ b/configure @@ -19620,7 +19620,6 @@ for ac_func in \ exp2 \ exp2f \ fmaf \ - lgamma \ lgammaf \ tgamma \ tgammaf diff --git a/configure.ac b/configure.ac index cb2b0cbeb17..f5bf9bc071f 100644 --- a/configure.ac +++ b/configure.ac @@ -2659,7 +2659,6 @@ AC_CHECK_FUNCS(\ exp2 \ exp2f \ fmaf \ - lgamma \ lgammaf \ tgamma \ tgammaf diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index ae9debce20c..6f0b0c1ba4f 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -8644,12 +8644,206 @@ end: return sx ? -x : x; } +/* sin(pi*x) assuming x > 2^-100, if sin(pi*x)==0 the sign is arbitrary */ +static double sin_pi(double x) +{ + static const double pi = 3.14159265358979311600e+00; + int n; + + /* spurious inexact if odd int */ + x = 2.0 * (x * 0.5 - floor(x * 0.5)); /* x mod 2.0 */ + + n = (int)(x * 4.0); + n = (n + 1) / 2; + x -= n * 0.5f; + x *= pi; + + switch (n) { + default: /* case 4: */ + case 0: return __sin(x, 0.0, 0); + case 1: return __cos(x, 0.0); + case 2: return __sin(-x, 0.0, 0); + case 3: return -__cos(x, 0.0); + } +} + /********************************************************************* * lgamma (MSVCR120.@) + * + * Copied from musl: src/math/lgamma_r.c */ double CDECL lgamma(double x) { - return unix_funcs->lgamma( x ); + static const double pi = 3.14159265358979311600e+00, + a0 = 7.72156649015328655494e-02, + a1 = 3.22467033424113591611e-01, + a2 = 6.73523010531292681824e-02, + a3 = 2.05808084325167332806e-02, + a4 = 7.38555086081402883957e-03, + a5 = 2.89051383673415629091e-03, + a6 = 1.19270763183362067845e-03, + a7 = 5.10069792153511336608e-04, + a8 = 2.20862790713908385557e-04, + a9 = 1.08011567247583939954e-04, + a10 = 2.52144565451257326939e-05, + a11 = 4.48640949618915160150e-05, + tc = 1.46163214496836224576e+00, + tf = -1.21486290535849611461e-01, + tt = -3.63867699703950536541e-18, + t0 = 4.83836122723810047042e-01, + t1 = -1.47587722994593911752e-01, + t2 = 6.46249402391333854778e-02, + t3 = -3.27885410759859649565e-02, + t4 = 1.79706750811820387126e-02, + t5 = -1.03142241298341437450e-02, + t6 = 6.10053870246291332635e-03, + t7 = -3.68452016781138256760e-03, + t8 = 2.25964780900612472250e-03, + t9 = -1.40346469989232843813e-03, + t10 = 8.81081882437654011382e-04, + t11 = -5.38595305356740546715e-04, + t12 = 3.15632070903625950361e-04, + t13 = -3.12754168375120860518e-04, + t14 = 3.35529192635519073543e-04, + u0 = -7.72156649015328655494e-02, + u1 = 6.32827064025093366517e-01, + u2 = 1.45492250137234768737e+00, + u3 = 9.77717527963372745603e-01, + u4 = 2.28963728064692451092e-01, + u5 = 1.33810918536787660377e-02, + v1 = 2.45597793713041134822e+00, + v2 = 2.12848976379893395361e+00, + v3 = 7.69285150456672783825e-01, + v4 = 1.04222645593369134254e-01, + v5 = 3.21709242282423911810e-03, + s0 = -7.72156649015328655494e-02, + s1 = 2.14982415960608852501e-01, + s2 = 3.25778796408930981787e-01, + s3 = 1.46350472652464452805e-01, + s4 = 2.66422703033638609560e-02, + s5 = 1.84028451407337715652e-03, + s6 = 3.19475326584100867617e-05, + r1 = 1.39200533467621045958e+00, + r2 = 7.21935547567138069525e-01, + r3 = 1.71933865632803078993e-01, + r4 = 1.86459191715652901344e-02, + r5 = 7.77942496381893596434e-04, + r6 = 7.32668430744625636189e-06, + w0 = 4.18938533204672725052e-01, + w1 = 8.33333333333329678849e-02, + w2 = -2.77777777728775536470e-03, + w3 = 7.93650558643019558500e-04, + w4 = -5.95187557450339963135e-04, + w5 = 8.36339918996282139126e-04, + w6 = -1.63092934096575273989e-03; + + union {double f; UINT64 i;} u = {x}; + double t, y, z, nadj, p, p1, p2, p3, q, r, w; + UINT32 ix; + int sign,i; + + /* purge off +-inf, NaN, +-0, tiny and negative arguments */ + sign = u.i >> 63; + ix = u.i >> 32 & 0x7fffffff; + if (ix >= 0x7ff00000) + return x * x; + if (ix < (0x3ff - 70) << 20) { /* |x|<2**-70, return -log(|x|) */ + if(sign) + x = -x; + return -log(x); + } + if (sign) { + x = -x; + t = sin_pi(x); + if (t == 0.0) { /* -integer */ + *_errno() = ERANGE; + return 1.0 / (x - x); + } + if (t <= 0.0) + t = -t; + nadj = log(pi / (t * x)); + } + + /* purge off 1 and 2 */ + if ((ix == 0x3ff00000 || ix == 0x40000000) && (UINT32)u.i == 0) + r = 0; + /* for x < 2.0 */ + else if (ix < 0x40000000) { + if (ix <= 0x3feccccc) { /* lgamma(x) = lgamma(x+1)-log(x) */ + r = -log(x); + if (ix >= 0x3FE76944) { + y = 1.0 - x; + i = 0; + } else if (ix >= 0x3FCDA661) { + y = x - (tc - 1.0); + i = 1; + } else { + y = x; + i = 2; + } + } else { + r = 0.0; + if (ix >= 0x3FFBB4C3) { /* [1.7316,2] */ + y = 2.0 - x; + i = 0; + } else if(ix >= 0x3FF3B4C4) { /* [1.23,1.73] */ + y = x - tc; + i = 1; + } else { + y = x - 1.0; + i = 2; + } + } + switch (i) { + case 0: + z = y * y; + p1 = a0 + z * (a2 + z * (a4 + z * (a6 + z * (a8 + z * a10)))); + p2 = z * (a1 + z * (a3 + z * (a5 + z * (a7 + z * (a9 + z * a11))))); + p = y * p1 + p2; + r += (p - 0.5 * y); + break; + case 1: + z = y * y; + w = z * y; + p1 = t0 + w * (t3 + w * (t6 + w * (t9 + w * t12))); /* parallel comp */ + p2 = t1 + w * (t4 + w * (t7 + w * (t10 + w * t13))); + p3 = t2 + w * (t5 + w * (t8 + w * (t11 + w * t14))); + p = z * p1 - (tt - w * (p2 + y * p3)); + r += tf + p; + break; + case 2: + p1 = y * (u0 + y * (u1 + y * (u2 + y * (u3 + y * (u4 + y * u5))))); + p2 = 1.0 + y * (v1 + y * (v2 + y * (v3 + y * (v4 + y * v5)))); + r += -0.5 * y + p1 / p2; + } + } else if (ix < 0x40200000) { /* x < 8.0 */ + i = (int)x; + y = x - (double)i; + p = y * (s0 + y * (s1 + y * (s2 + y * (s3 + y * (s4 + y * (s5 + y * s6)))))); + q = 1.0 + y * (r1 + y * (r2 + y * (r3 + y * (r4 + y * (r5 + y * r6))))); + r = 0.5 * y + p / q; + z = 1.0; /* lgamma(1+s) = log(s) + lgamma(s) */ + switch (i) { + case 7: z *= y + 6.0; /* fall through */ + case 6: z *= y + 5.0; /* fall through */ + case 5: z *= y + 4.0; /* fall through */ + case 4: z *= y + 3.0; /* fall through */ + case 3: + z *= y + 2.0; + r += log(z); + break; + } + } else if (ix < 0x43900000) { /* 8.0 <= x < 2**58 */ + t = log(x); + z = 1.0 / x; + y = z * z; + w = w0 + z * (w1 + y * (w2 + y * (w3 + y * (w4 + y * (w5 + y * w6))))); + r = (x - 0.5) * (t - 1.0) + w; + } else /* 2**58 <= x <= inf */ + r = x * (log(x) - 1.0); + if (sign) + r = nadj - r; + return r; } /********************************************************************* diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 440d002869c..14aeef4c1e7 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -94,19 +94,6 @@ static float CDECL unix_fmaf( float x, float y, float z ) #endif } -/********************************************************************* - * lgamma - */ -static double CDECL unix_lgamma(double x) -{ -#ifdef HAVE_LGAMMA - return lgamma(x); -#else - FIXME( "not implemented\n" ); - return 0; -#endif -} - /********************************************************************* * lgammaf */ @@ -169,7 +156,6 @@ static const struct unix_funcs funcs = unix_exp2, unix_exp2f, unix_fmaf, - unix_lgamma, unix_lgammaf, unix_pow, unix_powf, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index fc2ceb7798d..4309ff835a0 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -28,7 +28,6 @@ struct unix_funcs double (CDECL *exp2)(double x); float (CDECL *exp2f)(float x); float (CDECL *fmaf)(float x, float y, float z); - double (CDECL *lgamma)(double x); float (CDECL *lgammaf)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); diff --git a/include/config.h.in b/include/config.h.in index 252c2819fcc..dd34230b268 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -297,9 +297,6 @@ /* Define to 1 if you have the `ldap_parse_vlv_control' function. */ #undef HAVE_LDAP_PARSE_VLV_CONTROL -/* Define to 1 if you have the `lgamma' function. */ -#undef HAVE_LGAMMA - /* Define to 1 if you have the `lgammaf' function. */ #undef HAVE_LGAMMAF

1 0

Damjan Jovanovic : msxml3/tests: Add some regex tests.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: b5f3b8d07f0d0796e6a4d96addd3ee817ed4c41a URL: https://source.winehq.org/git/wine.git/?a=commit;h=b5f3b8d07f0d0796e6a4d96a… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Thu Jun 3 19:03:20 2021 +0200 msxml3/tests: Add some regex tests. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/schema.c | 154 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) diff --git a/dlls/msxml3/tests/schema.c b/dlls/msxml3/tests/schema.c index d1622ffc7da..b66be76c159 100644 --- a/dlls/msxml3/tests/schema.c +++ b/dlls/msxml3/tests/schema.c @@ -1012,6 +1012,159 @@ static void test_collection_content(void) free_bstrs(); } +static HRESULT validate_regex_document(IXMLDOMDocument2 *doc, IXMLDOMDocument2 *schema, IXMLDOMSchemaCollection* cache, + const WCHAR *regex, const WCHAR *input) +{ + static const WCHAR regex_doc[] = +L"" +"<?xml version='1.0'?>" +"<root xmlns='urn:test'>%s</root>"; + + static const WCHAR regex_schema[] = +L"<?xml version='1.0'?>" +"<schema xmlns='http://www.w3.org/2001/XMLSchema'" +" targetNamespace='urn:test'>" +" <element name='root'>" +" <simpleType>" +" <restriction base='string'>" +" <pattern value='%s'/>" +" </restriction>" +" </simpleType>" +" </element>" +"</schema>"; + + WCHAR buffer[1024]; + IXMLDOMParseError* err; + VARIANT v; + VARIANT_BOOL b; + BSTR namespace; + BSTR bstr; + HRESULT hr; + + VariantInit(&v); + + swprintf(buffer, ARRAY_SIZE(buffer), regex_doc, input); + bstr = SysAllocString(buffer); + ole_check(IXMLDOMDocument2_loadXML(doc, bstr, &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + SysFreeString(bstr); + + swprintf(buffer, ARRAY_SIZE(buffer), regex_schema, regex); + bstr = SysAllocString(buffer); + ole_check(IXMLDOMDocument2_loadXML(schema, bstr, &b)); + ok(b == VARIANT_TRUE, "failed to load XML\n"); + SysFreeString(bstr); + + /* add the schema to the cache */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + ole_check(IXMLDOMDocument2_QueryInterface(schema, &IID_IDispatch, (void**)&V_DISPATCH(&v))); + ok(V_DISPATCH(&v) != NULL, "failed to get IDispatch interface\n"); + namespace = alloc_str_from_narrow("urn:test"); + hr = IXMLDOMSchemaCollection_add(cache, namespace, v); + SysFreeString(namespace); + VariantClear(&v); + if (FAILED(hr)) + return hr; + + /* associate the cache to the doc */ + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = NULL; + ole_check(IXMLDOMSchemaCollection_QueryInterface(cache, &IID_IDispatch, (void**)&V_DISPATCH(&v))); + ok(V_DISPATCH(&v) != NULL, "failed to get IDispatch interface\n"); + ole_check(IXMLDOMDocument2_putref_schemas(doc, v)); + VariantClear(&v); + + /* validate the doc + * only declared elements in the declared order + * this is fine */ + err = NULL; + bstr = NULL; + hr = IXMLDOMDocument2_validate(doc, &err); + ok(err != NULL, "domdoc_validate() should always set err\n"); + if (IXMLDOMParseError_get_reason(err, &bstr) != S_FALSE) + trace("got error: %s\n", wine_dbgstr_w(bstr)); + SysFreeString(bstr); + IXMLDOMParseError_Release(err); + + return hr; +} + +static void test_regex(void) +{ + struct regex_test { + const WCHAR *regex; + const WCHAR *input; + BOOL todo; + }; + + struct regex_test tests[] = { + { L"\\!", L"!", TRUE }, + { L"\\\"", L"\"", TRUE }, + { L"\\#", L"#", TRUE }, + { L"\\$", L"$", TRUE }, + { L"\\%", L"%", TRUE }, + { L"\\,", L",", TRUE }, + { L"\\/", L"/", TRUE }, + { L"\\:", L":", TRUE }, + { L"\\;", L";", TRUE }, + { L"\\=", L"=", TRUE }, + { L"\\>", L">", TRUE }, + { L"\\@", L"@", TRUE }, + { L"\\`", L"`", TRUE }, + { L"\\~", L"~", TRUE }, + { L"\\uCAFE", L"\xCAFE", TRUE }, + /* non-BMP character in surrogate pairs: */ + { L"\\uD83D\\uDE00", L"\xD83D\xDE00", TRUE } + }; + + int i; + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + IXMLDOMDocument2 *doc40, *doc60; + IXMLDOMDocument2 *schema40, *schema60; + IXMLDOMSchemaCollection *cache40, *cache60; + + doc40 = create_document_version(40, &IID_IXMLDOMDocument2); + doc60 = create_document_version(60, &IID_IXMLDOMDocument2); + schema40 = create_document_version(40, &IID_IXMLDOMDocument2); + schema60 = create_document_version(60, &IID_IXMLDOMDocument2); + cache40 = create_cache_version(40, &IID_IXMLDOMSchemaCollection); + cache60 = create_cache_version(60, &IID_IXMLDOMSchemaCollection); + + if (doc60 && schema60 && cache60) + { + HRESULT hr = validate_regex_document(doc60, schema60, cache60, tests[i].regex, tests[i].input); + todo_wine_if(tests[i].todo) + ok(hr == S_OK, "got 0x%08x for version 60 regex %s input %s\n", + hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); + if (doc40 && schema40 && cache40) + { + hr = validate_regex_document(doc40, schema40, cache40, tests[i].regex, tests[i].input); + todo_wine_if(tests[i].todo) + ok(hr == S_OK, "got 0x%08x for version 40 regex %s input %s\n", + hr, wine_dbgstr_w(tests[i].regex), wine_dbgstr_w(tests[i].input)); + } + } + else + ok(0, "out of memory\n"); + + if (doc40) + IXMLDOMDocument2_Release(doc40); + if (doc60) + IXMLDOMDocument2_Release(doc60); + if (schema40) + IXMLDOMDocument2_Release(schema40); + if (schema60) + IXMLDOMDocument2_Release(schema60); + if (cache40) + IXMLDOMSchemaCollection_Release(cache40); + if (cache60) + IXMLDOMSchemaCollection_Release(cache60); + } +} + static void test_XDR_schemas(void) { IXMLDOMDocument2 *doc, *schema; @@ -1669,6 +1822,7 @@ START_TEST(schema) test_collection_refs(); test_length(); test_collection_content(); + test_regex(); test_XDR_schemas(); test_XDR_datatypes(); test_validate_on_load();

1 0

Robin Ebert : ntdll: Fix a file descriptor leak.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: b94fe5942291c93b23f2bf06ea7dc99f38cee411 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b94fe5942291c93b23f2bf06… Author: Robin Ebert <ebertrobin2002(a)gmail.com> Date: Thu Jun 3 23:09:32 2021 +0200 ntdll: Fix a file descriptor leak. Signed-off-by: Robin Ebert <ebertrobin2002(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/socket.c b/dlls/ntdll/unix/socket.c index c10a48b3008..e5f4862bf3c 100644 --- a/dlls/ntdll/unix/socket.c +++ b/dlls/ntdll/unix/socket.c @@ -1255,7 +1255,7 @@ NTSTATUS sock_ioctl( HANDLE handle, HANDLE event, PIO_APC_ROUTINE apc, void *apc if (in_size < sizeof(*params)) { - return STATUS_BUFFER_TOO_SMALL; + status = STATUS_BUFFER_TOO_SMALL; break; }

1 0

Zebediah Figura : ws2_32/tests: Add more tests for sockets that cannot be accepted into.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 96d3e5a5ec1ec47cb969090d96c18ace00c48ec2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96d3e5a5ec1ec47cb969090d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Jun 3 21:41:52 2021 -0500 ws2_32/tests: Add more tests for sockets that cannot be accepted into. 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 | 56 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 56 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index f165742fe45..592baa806c3 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -6402,6 +6402,7 @@ static void test_ConnectEx(void) static void test_AcceptEx(void) { + const struct sockaddr_in bind_addr = {.sin_family = AF_INET, .sin_addr.s_addr = htonl(INADDR_LOOPBACK)}; SOCKET listener, acceptor, acceptor2, connector, connector2; struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; @@ -6525,6 +6526,61 @@ todo_wine closesocket(connector); closesocket(acceptor); + /* A UDP socket cannot be accepted into. */ + + acceptor = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + closesocket(acceptor); + + /* A bound socket cannot be accepted into. */ + + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + iret = bind(acceptor, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); + ok(!iret, "got error %u\n", WSAGetLastError()); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + closesocket(acceptor); + + /* A connected socket cannot be accepted into. */ + + tcp_socketpair(&acceptor, &acceptor2); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + overlapped.Internal = 0xdeadbeef; + bret = pAcceptEx(listener, acceptor2, buffer, 0, 0, sizeof(struct sockaddr_in) + 16, &bytesReturned, &overlapped); + ok(!bret, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + ok(overlapped.Internal == STATUS_PENDING, "got status %#x\n", (NTSTATUS)overlapped.Internal); + if (WSAGetLastError() == ERROR_IO_PENDING) + CancelIo((HANDLE)listener); + + closesocket(acceptor); + closesocket(acceptor2); + + /* Pass an insufficient local address size. */ + acceptor = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(acceptor != -1, "failed to create socket, error %u\n", WSAGetLastError());

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 1c2a7827cc10b04d0dac4dea52da80e80c6af32e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c2a7827cc10b04d0dac4dea… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Fri Jun 4 08:43:48 2021 +0300 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/po/lt.po b/po/lt.po index 9410f833c2f..35da532b6aa 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2021-06-01 00:06+0300\n" +"PO-Revision-Date: 2021-06-04 08:43+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -15190,12 +15190,11 @@ msgid "reg: The source and destination keys cannot be the same\n" msgstr "reg: Šaltinio ir paskirties raktai negali būti tie patys\n" #: programs/reg/reg.rc:205 -#, fuzzy -#| msgid "The file '%1' already exists. Do you want to overwrite it?" msgid "" "The value '%1\\%2' already exists in the destination key. Do you want to " "overwrite it?" -msgstr "Failas „%1“ jau egzistuoja. Ar norite jį perrašyti?" +msgstr "" +"Reikšmė „%1\\%2“ jau egzistuoja paskirties rakte. Ar norite ją perrašyti?" #: programs/reg/reg.rc:133 msgid "Are you sure you want to delete the registry value '%1'?"

1 0

Nikolay Sivov : winegstreamer: Fix assert condition.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 0393a0e2b58ff65274926572becadfdf49e7a817 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0393a0e2b58ff65274926572… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jun 4 09:18:16 2021 +0300 winegstreamer: Fix assert condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/media_source.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index e153c8e9161..d3d156fc9cb 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -832,7 +832,7 @@ static HRESULT media_stream_init_desc(struct media_stream *stream) type_count = 1; } - assert(type_count < ARRAY_SIZE(stream_types)); + assert(type_count <= ARRAY_SIZE(stream_types)); if (!type_count) {

1 0

Giovanni Mascellani : winegstreamer: Improve reported supported rates values for the media source.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 8a506ea9b2c44f9043048f8756848772bc75a598 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8a506ea9b2c44f9043048f87… Author: Giovanni Mascellani <gmascellani(a)codeweavers.com> Date: Fri Jun 4 10:27:39 2021 +0300 winegstreamer: Improve reported supported rates values for the media source. Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/tests/mfplat.c | 61 +++++++++++++++++++++++++++++++++++++++ dlls/winegstreamer/media_source.c | 17 +++++------ 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ae9bd60c6df..7f049aa90bb 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -655,12 +655,15 @@ static void test_source_resolver(void) IMFStreamDescriptor *sd; IUnknown *cancel_cookie; IMFByteStream *stream; + IMFGetService *get_service; + IMFRateSupport *rate_support; WCHAR pathW[MAX_PATH]; int i, sample_count; WCHAR *filename; PROPVARIANT var; HRESULT hr; GUID guid; + float rate; if (!pMFCreateSourceResolver) { @@ -766,6 +769,62 @@ static void test_source_resolver(void) check_interface(mediasource, &IID_IMFGetService, TRUE); check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, TRUE); + + hr = IMFMediaSource_QueryInterface(mediasource, &IID_IMFGetService, (void**)&get_service); + ok(hr == S_OK, "Failed to get service interface, hr %#x.\n", hr); + + hr = IMFGetService_GetService(get_service, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateSupport, (void**)&rate_support); + ok(hr == S_OK, "Failed to get rate support interface, hr %#x.\n", hr); + + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == 1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); + hr = IMFRateSupport_GetFastestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query fastest rate, hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected fastest rate %f.\n", rate); + + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_FORWARD, TRUE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, FALSE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + hr = IMFRateSupport_GetSlowestRate(rate_support, MFRATE_REVERSE, TRUE, &rate); + ok(hr == S_OK, "Failed to query slowest rate, hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected slowest rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, NULL); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 0.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 0.0f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == 1.0f, "Unexpected rate %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1.0f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -1.0f, "Unexpected rate %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, 1e6f + 1.0f, &rate); + ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr); + ok(rate == 1e6f + 1.0f || broken(rate == 1e6f) /* Win7 */, "Unexpected %f.\n", rate); + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f, &rate); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(rate == -1e6f, "Unexpected rate %f.\n", rate); + + hr = IMFRateSupport_IsRateSupported(rate_support, FALSE, -1e6f - 1.0f, &rate); + ok(hr == MF_E_UNSUPPORTED_RATE, "Unexpected hr %#x.\n", hr); + ok(rate == -1e6f - 1.0f || broken(rate == -1e6f) /* Win7 */, "Unexpected rate %f.\n", rate); + check_service_interface(mediasource, &MF_RATE_CONTROL_SERVICE, &IID_IMFRateControl, TRUE); hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, &descriptor); ok(hr == S_OK, "Failed to get presentation descriptor, hr %#x.\n", hr); @@ -879,6 +938,8 @@ todo_wine hr = IMFMediaSource_CreatePresentationDescriptor(mediasource, NULL); ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFRateSupport_Release(rate_support); + IMFGetService_Release(get_service); IMFMediaSource_Release(mediasource); IMFByteStream_Release(stream); diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index d3d156fc9cb..3c87bbb2146 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -933,7 +933,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = 0.0f; return S_OK; } @@ -942,21 +942,20 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = direction == MFRATE_FORWARD ? 1e6f : -1e6f; return S_OK; } -static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) +static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, + float *nearest_rate) { - const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; + TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_rate); - TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); + if (nearest_rate) + *nearest_rate = rate; - if (nearest_support_rate) - *nearest_support_rate = supported_rate; - - return rate == supported_rate ? S_OK : MF_E_UNSUPPORTED_RATE; + return rate >= -1e6f && rate <= 1e6f ? S_OK : MF_E_UNSUPPORTED_RATE; } static const IMFRateSupportVtbl media_source_rate_support_vtbl =

1 0

Haoyang Chen : rsaenh: Fix a typo in a comment.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 0a076524201c28cc0085f5d1a611dbe567525966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a076524201c28cc0085f5d1… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Fri Jun 4 16:55:55 2021 +0800 rsaenh: Fix a typo in a comment. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rsaenh/rsaenh.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/rsaenh/rsaenh.c b/dlls/rsaenh/rsaenh.c index 705419526fe..a4deb80b0e1 100644 --- a/dlls/rsaenh/rsaenh.c +++ b/dlls/rsaenh/rsaenh.c @@ -2695,7 +2695,7 @@ BOOL WINAPI RSAENH_CPDecrypt(HCRYPTPROV hProv, HCRYPTKEY hKey, HCRYPTHASH hHash, pbData[*pdwDataLen-1] <= *pdwDataLen) { BOOL padOkay = TRUE; - /* check that every bad byte has the same value */ + /* check that every pad byte has the same value */ for (i = 1; padOkay && i < pbData[*pdwDataLen-1]; i++) if (pbData[*pdwDataLen - i - 1] != pbData[*pdwDataLen - 1]) padOkay = FALSE;

1 0

Rémi Bernon : hidclass.sys: Use msvcrt allocation functions.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 1c5e57fc7503fcacd4f95c89c7da774a6090eba1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c5e57fc7503fcacd4f95c89… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:30:31 2021 +0200 hidclass.sys: Use msvcrt allocation functions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 23 ++++++++++++----------- dlls/hidclass.sys/descriptor.c | 18 +++++++++--------- dlls/hidclass.sys/device.c | 23 ++++++++++++----------- dlls/hidclass.sys/pnp.c | 13 +++++++------ 4 files changed, 40 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1c5e57fc7503fcacd4f9…

1 0

Rémi Bernon : hidclass.sys: Use nameless unions.
by Alexandre Julliard 04 Jun '21

04 Jun '21

Module: wine Branch: master Commit: 975e33c7e756dd052a5b6948dc0ef6b1abd34d9d URL: https://source.winehq.org/git/wine.git/?a=commit;h=975e33c7e756dd052a5b6948… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri Jun 4 11:30:32 2021 +0200 hidclass.sys: Use nameless unions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/buffer.c | 1 - dlls/hidclass.sys/descriptor.c | 123 ++++++++++++++++++++--------------------- dlls/hidclass.sys/device.c | 80 +++++++++++++-------------- dlls/hidclass.sys/pnp.c | 25 ++++----- 4 files changed, 112 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=975e33c7e756dd052a5b…

1 0