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

Dmitry Timoshkov : msxml3/tests: Add some tests for IVBSAXContentHandler::startElement() and IVBSAXContentHandler::endElement().
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: bbfa8d17f8c7166af20b167578139029e225cd07 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbfa8d17f8c7166af20b1675… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 20 19:42:39 2021 +0300 msxml3/tests: Add some tests for IVBSAXContentHandler::startElement() and IVBSAXContentHandler::endElement(). These are mostly a copy of ISAXContentHandler::startElement() and ISAXContentHandler::endElement() tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/tests/saxreader.c | 85 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 35d0e71545b..f2016e3132d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3824,8 +3824,10 @@ static void test_mxwriter_startendelement_batch2(const struct writer_startendele static void test_mxwriter_startendelement(void) { ISAXContentHandler *content; + IVBSAXContentHandler *vb_content; IMXWriter *writer; VARIANT dest; + BSTR bstr_null = NULL, bstr_empty, bstr_a, bstr_b, bstr_ab; HRESULT hr; test_mxwriter_startendelement_batch(writer_startendelement); @@ -3835,12 +3837,93 @@ static void test_mxwriter_startendelement(void) &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_IVBSAXContentHandler, (void**)&vb_content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IVBSAXContentHandler_startDocument(vb_content); + ok(hr == S_OK, "got %08x\n", hr); + + bstr_empty = SysAllocString(L""); + bstr_a = SysAllocString(L"a"); + bstr_b = SysAllocString(L"b"); + bstr_ab = SysAllocString(L"a:b"); + + hr = IVBSAXContentHandler_startElement(vb_content, &bstr_null, &bstr_empty, &bstr_b, NULL); +todo_wine + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_startElement(vb_content, &bstr_empty, &bstr_b, &bstr_empty, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); +todo_wine + ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = IVBSAXContentHandler_startElement(vb_content, &bstr_empty, &bstr_empty, &bstr_b, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); +todo_wine + ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_null, &bstr_null, &bstr_b); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_null, &bstr_a, &bstr_b); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_a, &bstr_b, &bstr_null); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_empty, &bstr_null, &bstr_b); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_empty, &bstr_b, &bstr_null); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_empty, &bstr_empty, &bstr_b); ok(hr == S_OK, "got %08x\n", hr); + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); +todo_wine + ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + SysFreeString(bstr_empty); + SysFreeString(bstr_a); + SysFreeString(bstr_b); + SysFreeString(bstr_ab); + + hr = IVBSAXContentHandler_endDocument(vb_content); + ok(hr == S_OK, "got %08x\n", hr); + + IVBSAXContentHandler_Release(vb_content); + IMXWriter_Release(writer); + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); ok(hr == S_OK, "got %08x\n", hr); + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "got %08x\n", hr); + hr = ISAXContentHandler_startDocument(content); ok(hr == S_OK, "got %08x\n", hr);

1 0

Dmitry Timoshkov : msxml3: IVBSAXContentHandler::startElement() should also check *namespaceURI for NULL.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 13b1e36de04ad6296bc5ef9da86cd92e851c1504 URL: https://source.winehq.org/git/wine.git/?a=commit;h=13b1e36de04ad6296bc5ef9d… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu May 20 19:42:42 2021 +0300 msxml3: IVBSAXContentHandler::startElement() should also check *namespaceURI for NULL. Like ISAXContentHandler::startElement() does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml3/mxwriter.c | 4 ++-- dlls/msxml3/tests/saxreader.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index ac3c0fa59c3..b1ca5a0ca41 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -2159,8 +2159,8 @@ static HRESULT WINAPI VBSAXContentHandler_startElement(IVBSAXContentHandler *ifa TRACE("(%p)->(%p %p %p %p)\n", This, namespaceURI, localName, QName, attrs); - if (!namespaceURI || !localName || !QName) - return E_POINTER; + if (!namespaceURI || !*namespaceURI || !localName || !QName) + return E_INVALIDARG; TRACE("(%s %s %s)\n", debugstr_w(*namespaceURI), debugstr_w(*localName), debugstr_w(*QName)); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index f2016e3132d..e401aafc87d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3852,7 +3852,6 @@ static void test_mxwriter_startendelement(void) bstr_ab = SysAllocString(L"a:b"); hr = IVBSAXContentHandler_startElement(vb_content, &bstr_null, &bstr_empty, &bstr_b, NULL); -todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); hr = IVBSAXContentHandler_startElement(vb_content, &bstr_empty, &bstr_b, &bstr_empty, NULL); @@ -3862,7 +3861,6 @@ todo_wine hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); -todo_wine ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -3873,7 +3871,6 @@ todo_wine hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); -todo_wine ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -3899,7 +3896,6 @@ todo_wine hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); -todo_wine ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest);

1 0

Andrew Eikum : windowscodecs: Avoid types deprecated in libtiff 4.3.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 5e3758a70fb0068df0ffed9e1470e01e5a3cd9df URL: https://source.winehq.org/git/wine.git/?a=commit;h=5e3758a70fb0068df0ffed9e… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed May 19 16:04:57 2021 -0500 windowscodecs: Avoid types deprecated in libtiff 4.3. dlls/windowscodecs/libtiff.c:256:5: warning: ‘uint16’ is deprecated [-Wdeprecated-declarations] Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/libtiff.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/windowscodecs/libtiff.c b/dlls/windowscodecs/libtiff.c index 25d8c1c6081..1489fbe85fa 100644 --- a/dlls/windowscodecs/libtiff.c +++ b/dlls/windowscodecs/libtiff.c @@ -29,6 +29,7 @@ #include <unistd.h> #endif #ifdef HAVE_TIFFIO_H +#include <stdint.h> #include <tiffio.h> #endif @@ -253,9 +254,9 @@ static inline struct tiff_decoder *impl_from_decoder(struct decoder* iface) static HRESULT tiff_get_decode_info(TIFF *tiff, tiff_decode_info *decode_info) { - uint16 photometric, bps, samples, planar; - uint16 extra_sample_count, extra_sample, *extra_samples; - uint16 *red, *green, *blue; + uint16_t photometric, bps, samples, planar; + uint16_t extra_sample_count, extra_sample, *extra_samples; + uint16_t *red, *green, *blue; UINT resolution_unit; float xres=0.0, yres=0.0; int ret, i; @@ -1282,32 +1283,32 @@ static HRESULT CDECL tiff_encoder_create_frame(struct encoder* iface, const stru This->format = &formats[i]; - pTIFFSetField(This->tiff, TIFFTAG_PHOTOMETRIC, (uint16)This->format->photometric); - pTIFFSetField(This->tiff, TIFFTAG_PLANARCONFIG, (uint16)1); - pTIFFSetField(This->tiff, TIFFTAG_BITSPERSAMPLE, (uint16)This->format->bps); - pTIFFSetField(This->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16)This->format->samples); + pTIFFSetField(This->tiff, TIFFTAG_PHOTOMETRIC, (uint16_t)This->format->photometric); + pTIFFSetField(This->tiff, TIFFTAG_PLANARCONFIG, (uint16_t)1); + pTIFFSetField(This->tiff, TIFFTAG_BITSPERSAMPLE, (uint16_t)This->format->bps); + pTIFFSetField(This->tiff, TIFFTAG_SAMPLESPERPIXEL, (uint16_t)This->format->samples); if (This->format->extra_sample) { - uint16 extra_samples; + uint16_t extra_samples; extra_samples = This->format->extra_sample_type; - pTIFFSetField(This->tiff, TIFFTAG_EXTRASAMPLES, (uint16)1, &extra_samples); + pTIFFSetField(This->tiff, TIFFTAG_EXTRASAMPLES, (uint16_t)1, &extra_samples); } - pTIFFSetField(This->tiff, TIFFTAG_IMAGEWIDTH, (uint32)frame->width); - pTIFFSetField(This->tiff, TIFFTAG_IMAGELENGTH, (uint32)frame->height); + pTIFFSetField(This->tiff, TIFFTAG_IMAGEWIDTH, (uint32_t)frame->width); + pTIFFSetField(This->tiff, TIFFTAG_IMAGELENGTH, (uint32_t)frame->height); if (frame->dpix != 0.0 && frame->dpiy != 0.0) { - pTIFFSetField(This->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16)2); /* Inch */ + pTIFFSetField(This->tiff, TIFFTAG_RESOLUTIONUNIT, (uint16_t)2); /* Inch */ pTIFFSetField(This->tiff, TIFFTAG_XRESOLUTION, (float)frame->dpix); pTIFFSetField(This->tiff, TIFFTAG_YRESOLUTION, (float)frame->dpiy); } if (This->format->bpp <= 8 && frame->num_colors && This->format->indexed) { - uint16 red[256], green[256], blue[256]; + uint16_t red[256], green[256], blue[256]; UINT i; for (i = 0; i < frame->num_colors; i++)

1 0

Alexandre Julliard : Release 6.9.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 9561af9a7d8d77e2f98341e278c842226cae47ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=9561af9a7d8d77e2f98341e2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 21:18:08 2021 +0200 Release 6.9. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 855 +++++++++++++++++++++++++++++--------------------------------- AUTHORS | 1 + VERSION | 2 +- configure | 18 +- 4 files changed, 413 insertions(+), 463 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9561af9a7d8d77e2f983…

1 0

Tag wine-6.9 : Alexandre Julliard : Release 6.9
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: refs/tags/wine-6.9 Tag: 9435500b987b39c11e4bb71e67989ba66961968a URL: https://source.winehq.org/git/wine.git/?a=tag;h=9435500b987b39c11e4bb71e679… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 21 21:18:08 2021 +0200 Release 6.9

1 0

Zebediah Figura : ws2_32/tests: Extend WSARecvMsg() tests a bit.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 40e3e959fd9e438ea4634f79e3af9c3e0218e02d URL: https://source.winehq.org/git/wine.git/?a=commit;h=40e3e959fd9e438ea4634f79… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 21 00:17:57 2021 -0500 ws2_32/tests: Extend WSARecvMsg() tests a bit. 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 | 63 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8bec781ac6f..5cc0725752e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1769,6 +1769,16 @@ static void test_so_reuseaddr(void) #define IP_PKTINFO_LEN (sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(sizeof(struct in_pktinfo))) +static unsigned int got_ip_pktinfo_apc; + +static void WINAPI ip_pktinfo_apc(DWORD error, DWORD size, OVERLAPPED *overlapped, DWORD flags) +{ + ok(error == WSAEMSGSIZE, "got error %u\n", error); + ok(size == 6, "got size %u\n", size); + ok(!flags, "got flags %#x\n", flags); + ++got_ip_pktinfo_apc; +} + static void test_ip_pktinfo(void) { ULONG addresses[2] = {inet_addr("127.0.0.1"), htonl(INADDR_ANY)}; @@ -1858,14 +1868,20 @@ static void test_ip_pktinfo(void) ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); hdr.Control.len = 1; - rc=pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); - err=WSAGetLastError(); - ok(rc == SOCKET_ERROR && err == WSAEMSGSIZE && (hdr.dwFlags & MSG_CTRUNC), - "WSARecvMsg() failed error: %d (ret: %d, flags: %d)\n", err, rc, hdr.dwFlags); + dwSize = 0xdeadbeef; + rc = pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); + ok(rc == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEMSGSIZE, "got error %u\n", WSAGetLastError()); + todo_wine ok(dwSize == sizeof(msg), "got size %u\n", dwSize); + ok(hdr.dwFlags == MSG_CTRUNC, "got flags %#x\n", hdr.dwFlags); hdr.dwFlags = 0; /* Reset flags */ /* Perform another short control header test, this time with an overlapped receive */ hdr.Control.len = 1; + ov.Internal = 0xdead1; + ov.InternalHigh = 0xdead2; + ov.Offset = 0xdead3; + ov.OffsetHigh = 0xdead4; rc=pWSARecvMsg(s1, &hdr, NULL, &ov, NULL); err=WSAGetLastError(); ok(rc != 0 && err == WSA_IO_PENDING, "WSARecvMsg() failed error: %d\n", err); @@ -1874,14 +1890,45 @@ static void test_ip_pktinfo(void) ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok(!WaitForSingleObject(ov.hEvent, 100), "wait failed\n"); - dwFlags = 0; - WSAGetOverlappedResult(s1, &ov, NULL, FALSE, &dwFlags); - ok(dwFlags == 0, - "WSAGetOverlappedResult() returned unexpected flags %d!\n", dwFlags); + ok((NTSTATUS)ov.Internal == STATUS_BUFFER_OVERFLOW, "got status %#x\n", (NTSTATUS)ov.Internal); + todo_wine ok(ov.InternalHigh == sizeof(msg), "got size %Iu\n", ov.InternalHigh); + ok(ov.Offset == 0xdead3, "got Offset %Iu\n", ov.Offset); + ok(ov.OffsetHigh == 0xdead4, "got OffsetHigh %Iu\n", ov.OffsetHigh); + dwFlags = 0xdeadbeef; + rc = WSAGetOverlappedResult(s1, &ov, &dwSize, FALSE, &dwFlags); + ok(!rc, "expected failure\n"); + ok(WSAGetLastError() == WSAEMSGSIZE, "got error %u\n", WSAGetLastError()); + todo_wine ok(dwSize == sizeof(msg), "got size %u\n", dwSize); + todo_wine ok(dwFlags == 0xdeadbeef, "got flags %#x\n", dwFlags); ok(hdr.dwFlags == MSG_CTRUNC, "WSARecvMsg() overlapped operation set unexpected flags %d.\n", hdr.dwFlags); hdr.dwFlags = 0; /* Reset flags */ + /* And with an APC. */ + + SetLastError(0xdeadbeef); + rc = sendto(s2, msg, sizeof(msg), 0, (struct sockaddr *)&s2addr, sizeof(s2addr)); + ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + hdr.Control.len = 1; + + ov.Internal = 0xdead1; + ov.InternalHigh = 0xdead2; + ov.Offset = 0xdead3; + ov.OffsetHigh = 0xdead4; + dwSize = 0xdeadbeef; + rc = pWSARecvMsg(s1, &hdr, NULL, &ov, ip_pktinfo_apc); + ok(rc == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + rc = SleepEx(1000, TRUE); + todo_wine ok(rc == WAIT_IO_COMPLETION, "got %d\n", rc); + todo_wine ok(got_ip_pktinfo_apc == 1, "apc was called %u times\n", got_ip_pktinfo_apc); + ok(hdr.dwFlags == MSG_CTRUNC, "got flags %#x\n", hdr.dwFlags); + got_ip_pktinfo_apc = 0; + + hdr.dwFlags = 0; /* Reset flags */ + /* * Setup an overlapped receive, send a packet, then wait for the packet to be retrieved * on the server end and check that the returned packet matches what was sent.

1 0

Francois Gouget : user32/tests: Fix the clipboard format id vs. atom table checks.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: cf85253a9c3db2816b3ae1fc2c7c18fc005ffbd6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf85253a9c3db2816b3ae1fc… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Fri May 21 00:10:22 2021 +0200 user32/tests: Fix the clipboard format id vs. atom table checks. One cannot assume that a random integer has zero chance of being a valid atom. Reenable the GlobalFindAtomA() check in a todo_wine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/clipboard.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 2fceab6c0f6..d75e8fc3c32 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -391,29 +391,30 @@ static void test_RegisterClipboardFormatA(void) lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); len = GetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); - ok(len == 0, "GetAtomNameA should fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); + ok(len == 0 || lstrcmpA(buf, "my_cool_clipboard_format") != 0, + "format_id should not be a valid local atom\n"); + ok(len != 0 || GetLastError() == ERROR_INVALID_HANDLE, + "err %d\n", GetLastError()); -todo_wine -{ lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); len = GlobalGetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); - ok(len == 0, "GlobalGetAtomNameA should fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); -} + todo_wine ok(len == 0 || lstrcmpA(buf, "my_cool_clipboard_format") != 0, + "format_id should not be a valid global atom\n"); + ok(len != 0 || GetLastError() == ERROR_INVALID_HANDLE, + "err %d\n", GetLastError()); SetLastError(0xdeadbeef); atom_id = FindAtomA("my_cool_clipboard_format"); - ok(atom_id == 0, "FindAtomA should fail\n"); + ok(atom_id == 0, "FindAtomA should fail, but it returned %x (format_id=%x)\n", atom_id, format_id); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); - if (0) + todo_wine { /* this relies on the clipboard and global atom table being different */ SetLastError(0xdeadbeef); atom_id = GlobalFindAtomA("my_cool_clipboard_format"); - ok(atom_id == 0, "GlobalFindAtomA should fail\n"); + ok(atom_id == 0, "GlobalFindAtomA should fail, but it returned %x (format_id=%x)\n", atom_id, format_id); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); }

1 0

Zebediah Figura : ws2_32/tests: Add some tests for SO_RCVTIMEO.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 7fb3e57d8eb6742d062fcd1d3bf7a39046992e4d URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fb3e57d8eb6742d062fcd1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri May 21 00:17:58 2021 -0500 ws2_32/tests: Add some tests for SO_RCVTIMEO. 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 | 75 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5cc0725752e..912bf9ee5d8 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -9926,6 +9926,80 @@ static void test_empty_recv(void) CloseHandle(overlapped.hEvent); } +static void test_timeout(void) +{ + DWORD timeout, flags = 0, size; + OVERLAPPED overlapped = {0}; + SOCKET client, server; + WSABUF wsabuf; + int ret, len; + char buffer; + + tcp_socketpair(&client, &server); + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + timeout = 0xdeadbeef; + len = sizeof(timeout); + WSASetLastError(0xdeadbeef); + ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); + ok(!ret, "expected success\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + ok(len == sizeof(timeout), "got size %u\n", len); + ok(!timeout, "got timeout %u\n", timeout); + + timeout = 100; + WSASetLastError(0xdeadbeef); + ret = setsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, sizeof(timeout)); + ok(!ret, "expected success\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + + timeout = 0xdeadbeef; + len = sizeof(timeout); + WSASetLastError(0xdeadbeef); + ret = getsockopt(client, SOL_SOCKET, SO_RCVTIMEO, (char *)&timeout, &len); + ok(!ret, "expected success\n"); + todo_wine ok(!WSAGetLastError(), "got error %u\n", WSAGetLastError()); + todo_wine ok(timeout == 100, "got timeout %u\n", timeout); + + WSASetLastError(0xdeadbeef); + ret = recv(client, &buffer, 1, 0); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAETIMEDOUT, "got error %u\n", WSAGetLastError()); + + wsabuf.buf = &buffer; + wsabuf.len = 1; + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = WSARecv(client, &wsabuf, 1, &size, &flags, NULL, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == WSAETIMEDOUT, "got error %u\n", WSAGetLastError()); + ok(size == 0xdeadbeef, "got size %u\n", size); + + wsabuf.buf = &buffer; + wsabuf.len = 1; + WSASetLastError(0xdeadbeef); + size = 0xdeadbeef; + ret = WSARecv(client, &wsabuf, 1, &size, &flags, &overlapped, NULL); + ok(ret == -1, "got %d\n", ret); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(ret == WAIT_TIMEOUT, "got %d\n", ret); + + ret = send(server, "a", 1, 0); + ok(ret == 1, "got %d\n", ret); + + ret = WaitForSingleObject(overlapped.hEvent, 200); + ok(!ret, "got %d\n", ret); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(size == 1, "got size %u\n", size); + + closesocket(client); + closesocket(server); + CloseHandle(overlapped.hEvent); +} + START_TEST( sock ) { int i; @@ -9987,6 +10061,7 @@ START_TEST( sock ) test_WSAGetOverlappedResult(); test_nonblocking_async_recv(); test_empty_recv(); + test_timeout(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

Piotr Caban : msvcrt: Import _logbf implementation from musl.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: 78fc19d67a525d78dbf89e9b9fe93082bdd2b4ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=78fc19d67a525d78dbf89e9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 23:04:44 2021 +0200 msvcrt: Import _logbf implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 49 +++++++++++++++++++++++++++++-------------------- dlls/msvcrt/unixlib.c | 9 --------- dlls/msvcrt/unixlib.h | 1 - 3 files changed, 29 insertions(+), 30 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index df00f0532bb..234483da299 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -275,15 +275,38 @@ float CDECL _nextafterf( float x, float y ) return y; } +/* Copied from musl: src/math/ilogbf.c */ +static int __ilogbf(float x) +{ + union { float f; UINT32 i; } u = { x }; + int e = u.i >> 23 & 0xff; + + if (!e) + { + u.i <<= 9; + if (u.i == 0) return FP_ILOGB0; + /* subnormal x */ + for (e = -0x7f; u.i >> 31 == 0; e--, u.i <<= 1); + return e; + } + if (e == 0xff) return u.i << 9 ? FP_ILOGBNAN : INT_MAX; + return e - 0x7f; +} + /********************************************************************* * _logbf (MSVCRT.@) + * + * Copied from musl: src/math/logbf.c */ -float CDECL _logbf( float num ) +float CDECL _logbf(float x) { - float ret = unix_funcs->logbf(num); - if (isnan(num)) return math_error(_DOMAIN, "_logbf", num, 0, ret); - if (!num) return math_error(_SING, "_logbf", num, 0, ret); - return ret; + if (!isfinite(x)) + return x * x; + if (x == 0) { + *_errno() = ERANGE; + return -1 / (x * x); + } + return __ilogbf(x); } #endif @@ -6178,23 +6201,9 @@ int CDECL ilogb(double x) /********************************************************************* * ilogbf (MSVCR120.@) - * - * Copied from musl: src/math/ilogbf.c */ int CDECL ilogbf(float x) { - union { float f; UINT32 i; } u = { x }; - int e = u.i >> 23 & 0xff; - - if (!e) - { - u.i <<= 9; - if (u.i == 0) return FP_ILOGB0; - /* subnormal x */ - for (e = -0x7f; u.i >> 31 == 0; e--, u.i <<= 1); - return e; - } - if (e == 0xff) return u.i << 9 ? FP_ILOGBNAN : INT_MAX; - return e - 0x7f; + return __ilogbf(x); } #endif /* _MSVCR_VER>=120 */ diff --git a/dlls/msvcrt/unixlib.c b/dlls/msvcrt/unixlib.c index 51fe7ef6f0f..a4d570a282a 100644 --- a/dlls/msvcrt/unixlib.c +++ b/dlls/msvcrt/unixlib.c @@ -387,14 +387,6 @@ static float CDECL unix_log2f(float x) #endif } -/********************************************************************* - * logbf - */ -static float CDECL unix_logbf( float x ) -{ - return logbf( x ); -} - /********************************************************************* * pow */ @@ -536,7 +528,6 @@ static const struct unix_funcs funcs = unix_log1pf, unix_log2, unix_log2f, - unix_logbf, unix_pow, unix_powf, unix_sin, diff --git a/dlls/msvcrt/unixlib.h b/dlls/msvcrt/unixlib.h index a0cded99e20..d4471477715 100644 --- a/dlls/msvcrt/unixlib.h +++ b/dlls/msvcrt/unixlib.h @@ -56,7 +56,6 @@ struct unix_funcs float (CDECL *log1pf)(float x); double (CDECL *log2)(double x); float (CDECL *log2f)(float x); - float (CDECL *logbf)(float x); double (CDECL *pow)(double x, double y); float (CDECL *powf)(float x, float y); double (CDECL *sin)(double x);

1 0

Piotr Caban : msvcrt: Import cos implementation from musl.
by Alexandre Julliard May 21, 2021

May 21, 2021

Module: wine Branch: master Commit: ef91a7c02c8431a09edb1c1954cacda8b5f8958c URL: https://source.winehq.org/git/wine.git/?a=commit;h=ef91a7c02c8431a09edb1c19… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu May 20 23:04:58 2021 +0200 msvcrt: Import cos implementation from musl. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/math.c | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index d89a4c7f5bc..7643f39fde7 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -1802,12 +1802,41 @@ static double __cos(double x, double y) /********************************************************************* * cos (MSVCRT.@) + * + * Copied from musl: src/math/cos.c */ double CDECL cos( double x ) { - double ret = unix_funcs->cos( x ); - if (!isfinite(x)) return math_error(_DOMAIN, "cos", x, 0, ret); - return ret; + double y[2]; + UINT32 ix; + unsigned n; + + ix = *(ULONGLONG*)&x >> 32; + ix &= 0x7fffffff; + + /* |x| ~< pi/4 */ + if (ix <= 0x3fe921fb) { + if (ix < 0x3e46a09e) { /* |x| < 2**-27 * sqrt(2) */ + /* raise inexact if x!=0 */ + fp_barrier(x + 0x1p120f); + return 1.0; + } + return __cos(x, 0); + } + + /* cos(Inf or NaN) is NaN */ + if (isinf(x)) return math_error(_DOMAIN, "cos", x, 0, x - x); + if (ix >= 0x7ff00000) + return x - x; + + /* argument reduction */ + n = __rem_pio2(x, y); + switch (n & 3) { + case 0: return __cos(y[0], y[1]); + case 1: return -__sin(y[0], y[1], 1); + case 2: return -__cos(y[0], y[1]); + default: return __sin(y[0], y[1], 1); + } } /*********************************************************************

1 0