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

Liam Middlebrook : winevulkan: Update to VK spec version 1.2.178.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 21e002aa7e7f85d92d1efeaeb7a9545eb16b96ad URL: https://source.winehq.org/git/wine.git/?a=commit;h=21e002aa7e7f85d92d1efeae… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon May 10 03:29:08 2021 -0700 winevulkan: Update to VK spec version 1.2.178. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Daniel Koch <dkoch(a)nvidia.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 30 + dlls/winevulkan/loader_thunks.h | 5 + dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 104 ++++ dlls/winevulkan/vulkan_thunks.h | 46 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 1153 +++++++++++++++++++++------------------ 7 files changed, 809 insertions(+), 533 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=21e002aa7e7f85d92d1e…

1 0

Zebediah Figura : ws2_32/tests: Test calling ConnectEx() on a socket which is being accepted into.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 9e448142c6e5e1b33047d1bef088cdbc1c5c0d85 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e448142c6e5e1b33047d1be… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 10 10:19:47 2021 -0500 ws2_32/tests: Test calling ConnectEx() on a socket which is being 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 | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index d132bc833f2..24259ad4cf2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -5894,19 +5894,21 @@ static void test_AcceptEx(void) struct sockaddr_in bindAddress, peerAddress, *readBindAddress, *readRemoteAddress; int socklen, optlen; GUID acceptExGuid = WSAID_ACCEPTEX, getAcceptExGuid = WSAID_GETACCEPTEXSOCKADDRS; + GUID connectex_guid = WSAID_CONNECTEX; LPFN_ACCEPTEX pAcceptEx = NULL; LPFN_GETACCEPTEXSOCKADDRS pGetAcceptExSockaddrs = NULL; + LPFN_CONNECTEX pConnectEx = NULL; fd_set fds_accept, fds_send; static const struct timeval timeout = {1, 0}; DWORD bytesReturned, connect_time; char buffer[1024], ipbuffer[32]; - OVERLAPPED overlapped; + OVERLAPPED overlapped = {0}, overlapped2 = {0}; int iret, localSize = sizeof(struct sockaddr_in), remoteSize = localSize; BOOL bret; DWORD dwret; - memset(&overlapped, 0, sizeof(overlapped)); overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + overlapped2.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); listener = socket(AF_INET, SOCK_STREAM, 0); ok(listener != INVALID_SOCKET, "failed to create socket, error %u\n", WSAGetLastError()); @@ -5935,6 +5937,10 @@ static void test_AcceptEx(void) &pGetAcceptExSockaddrs, sizeof(pGetAcceptExSockaddrs), &bytesReturned, NULL, NULL); ok(!iret, "Failed to get GetAcceptExSockaddrs, error %u\n", WSAGetLastError()); + iret = WSAIoctl(listener, SIO_GET_EXTENSION_FUNCTION_POINTER, &connectex_guid, sizeof(connectex_guid), + &pConnectEx, sizeof(pConnectEx), &bytesReturned, NULL, NULL); + ok(!iret, "Failed to get ConnectEx, error %u\n", WSAGetLastError()); + overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(INVALID_SOCKET, acceptor, buffer, sizeof(buffer) - 2*(sizeof(struct sockaddr_in) + 16), sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, @@ -6119,6 +6125,7 @@ todo_wine ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "AcceptEx returned %d + errno %d\n", bret, WSAGetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); + /* try to accept into the same socket twice */ overlapped.Internal = 0xdeadbeef; bret = pAcceptEx(listener, acceptor, buffer, 0, sizeof(struct sockaddr_in) + 16, sizeof(struct sockaddr_in) + 16, @@ -6127,6 +6134,7 @@ todo_wine "AcceptEx on already pending socket returned %d + errno %d\n", bret, WSAGetLastError()); ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); + /* try to connect a socket that's being accepted into */ iret = connect(acceptor, (struct sockaddr*)&bindAddress, sizeof(bindAddress)); todo_wine ok(iret == SOCKET_ERROR && WSAGetLastError() == WSAEINVAL, "connecting to acceptex acceptor succeeded? return %d + errno %d\n", iret, WSAGetLastError()); @@ -6148,6 +6156,11 @@ todo_wine ok(overlapped.Internal == STATUS_PENDING, "got %08x\n", (ULONG)overlapped.Internal); } + bret = pConnectEx(acceptor, (struct sockaddr *)&bindAddress, sizeof(bindAddress), + NULL, 0, &bytesReturned, &overlapped2); + ok(!bret, "expected failure\n"); + ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + connector = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(connector != -1, "failed to create socket, error %u\n", WSAGetLastError()); overlapped.Internal = 0xdeadbeef; @@ -6390,7 +6403,8 @@ todo_wine bret = GetOverlappedResult((HANDLE)listener, &overlapped, &bytesReturned, FALSE); ok(!bret && GetLastError() == ERROR_OPERATION_ABORTED, "GetOverlappedResult failed, error %d\n", GetLastError()); - WSACloseEvent(overlapped.hEvent); + CloseHandle(overlapped.hEvent); + CloseHandle(overlapped2.hEvent); closesocket(acceptor); closesocket(connector2); }

1 0

Francois Gouget : infosoft/tests: Fix the pfnFillTextBuffer() return value.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 8ac9f334b4b7591a42c6aabf90d5326fe3e0fd02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8ac9f334b4b7591a42c6aabf… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 10 15:54:11 2021 +0200 infosoft/tests: Fix the pfnFillTextBuffer() return value. Windows Vista to Windows 10 1507 expect pfnFillTextBuffer() to return WBREAK_E_END_OF_TEXT to signal the end of the string. Returning unexpected values such as E_FAIL causes BreakText() to abort and report them to the caller. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50843 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/infosoft/tests/infosoft.c | 5 +++-- include/cierror.h | 7 +++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/infosoft/tests/infosoft.c b/dlls/infosoft/tests/infosoft.c index d221cee5732..c76aba63466 100644 --- a/dlls/infosoft/tests/infosoft.c +++ b/dlls/infosoft/tests/infosoft.c @@ -24,6 +24,7 @@ #include <stdio.h> #include <ole2.h> #include "indexsrv.h" +#include "cierror.h" #include "wine/test.h" @@ -141,7 +142,7 @@ static wordsink_impl wordsink = { { &wsvt } }; static HRESULT WINAPI fillbuf_none(TEXT_SOURCE *ts) { - return E_FAIL; + return WBREAK_E_END_OF_TEXT; } static HRESULT WINAPI fillbuf_many(TEXT_SOURCE *ts) @@ -154,7 +155,7 @@ static HRESULT WINAPI fillbuf_many(TEXT_SOURCE *ts) ts->awcBuffer += ts->iCur; if (!ts->awcBuffer[0]) - return E_FAIL; + return WBREAK_E_END_OF_TEXT; for( i=0; ts->awcBuffer[i] && ts->awcBuffer[i] != ' '; i++) ; diff --git a/include/cierror.h b/include/cierror.h index 049985beb11..e646c18e4b0 100644 --- a/include/cierror.h +++ b/include/cierror.h @@ -19,6 +19,13 @@ #ifndef __WINE_CIERROR_H__ #define __WINE_CIERROR_H__ +#define WBREAK_E_END_OF_TEXT 0x80041780 +#define LANGUAGE_S_LARGE_WORD 0x00041781 +#define WBREAK_E_QUERY_ONLY 0x80041782 +#define WBREAK_E_BUFFER_TOO_SMALL 0x80041783 +#define LANGUAGE_E_DATABASE_NOT_FOUND 0x80041784 +#define WBREAK_E_INIT_FAILED 0x80041785 + #define CI_E_ALREADY_INITIALIZED 0x8004180a #define CI_E_NOT_INITIALIZED 0x8004180b #define CI_E_BUFFERTOOSMALL 0x8004180c

1 0

Zebediah Figura : ws2_32/tests: Clean up and expand tests for WSAPoll().
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: cb117a1a158417a73ed2932d82bbdcb11aafa6a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb117a1a158417a73ed2932d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 10 10:19:45 2021 -0500 ws2_32/tests: Clean up and expand tests for WSAPoll(). 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 | 490 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 331 insertions(+), 159 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cb117a1a158417a73ed2…

1 0

Zebediah Figura : server: Do not call sock_reselect() on an uninitialized socket.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: afad281dd1b4f5db226599980daf403c4db70937 URL: https://source.winehq.org/git/wine.git/?a=commit;h=afad281dd1b4f5db22659998… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 10 10:19:44 2021 -0500 server: Do not call sock_reselect() on an uninitialized socket. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 24a826e4ce5..6891b5cbc57 100644 --- a/server/sock.c +++ b/server/sock.c @@ -838,8 +838,10 @@ static void sock_reselect_async( struct fd *fd, struct async_queue *queue ) { struct sock *sock = get_fd_user( fd ); - /* ignore reselect on ifchange queue */ - if (&sock->ifchange_q != queue) + /* Don't reselect the ifchange queue; we always ask for POLLIN. + * Don't reselect an uninitialized socket; we can't call set_fd_events() on + * a pseudo-fd. */ + if (queue != &sock->ifchange_q && sock->type) sock_reselect( sock ); }

1 0

Francois Gouget : infosoft/tests: Fix refilling the text buffer.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: b908ec2294d8e4ac3ccd7befbb9e530af04d24f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b908ec2294d8e4ac3ccd7bef… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Mon May 10 15:55:26 2021 +0200 infosoft/tests: Fix refilling the text buffer. Up to Windows 10 1507 BreakText() would increment iCur but later Windows versions leave it unchanged. So assume all characters up to iEnd have been processed. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50844 Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/infosoft/tests/infosoft.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/infosoft/tests/infosoft.c b/dlls/infosoft/tests/infosoft.c index c76aba63466..996af73ca20 100644 --- a/dlls/infosoft/tests/infosoft.c +++ b/dlls/infosoft/tests/infosoft.c @@ -152,7 +152,7 @@ static HRESULT WINAPI fillbuf_many(TEXT_SOURCE *ts) if (ts->awcBuffer == NULL) ts->awcBuffer = teststring; else - ts->awcBuffer += ts->iCur; + ts->awcBuffer += ts->iEnd; if (!ts->awcBuffer[0]) return WBREAK_E_END_OF_TEXT;

1 0

Hans Leidekker : wpcap: Get rid of the wine_ prefix.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: efbb3091d25b7d1ca186db6331fec42b7a11ec8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=efbb3091d25b7d1ca186db63… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 10 15:37:27 2021 +0200 wpcap: Get rid of the wine_ prefix. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 116 +++++++++++++++++++++++++------------------------- dlls/wpcap/wpcap.spec | 108 +++++++++++++++++++++++----------------------- 2 files changed, 112 insertions(+), 112 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=efbb3091d25b7d1ca186…

1 0

Zebediah Figura : d3dcompiler/tests: Use winetest_push_context().
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: e5c50f56616722a5e9361d0aa22c10d9ed853096 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5c50f56616722a5e9361d0a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Apr 25 15:09:33 2021 -0500 d3dcompiler/tests: Use winetest_push_context(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/tests/hlsl_d3d11.c | 160 +++++++++++++++++++-------------- 1 file changed, 91 insertions(+), 69 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=e5c50f56616722a5e936…

1 0

Hans Leidekker : wpcap: Build with msvcrt.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: cf105074585c503336f8abffdd13f05a6bbf3480 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cf105074585c503336f8abff… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 10 15:37:25 2021 +0200 wpcap: Build with msvcrt. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wpcap/Makefile.in b/dlls/wpcap/Makefile.in index 4409a8c9e3a..52e4c9a2921 100644 --- a/dlls/wpcap/Makefile.in +++ b/dlls/wpcap/Makefile.in @@ -2,6 +2,8 @@ MODULE = wpcap.dll DELAYIMPORTS = ws2_32 EXTRALIBS = $(PCAP_LIBS) +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ unixlib.c \ wpcap.c

1 0

Hans Leidekker : wpcap: Implement some more functions.
by Alexandre Julliard May 10, 2021

May 10, 2021

Module: wine Branch: master Commit: 1fc4d54c5f24a1444b2d7868a4bd41c0ff6852c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fc4d54c5f24a1444b2d7868… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 10 15:37:24 2021 +0200 wpcap: Implement some more functions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/unixlib.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wpcap/unixlib.h | 18 +++++++++ dlls/wpcap/wpcap.c | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++ dlls/wpcap/wpcap.spec | 18 +++++++++ 4 files changed, 252 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=1fc4d54c5f24a1444b2d…

1 0