wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Liam Middlebrook : winevulkan: Allow some experimental VK extensions to be translated.
by Alexandre Julliard 10 May '21

10 May '21

Module: wine Branch: master Commit: b2cc53d32eb8bff3a8cc7fb181dff149cb7fab9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=b2cc53d32eb8bff3a8cc7fb1… Author: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Date: Mon May 10 03:29:07 2021 -0700 winevulkan: Allow some experimental VK extensions to be translated. 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 | 12 ++++++++ dlls/winevulkan/loader_thunks.h | 2 ++ dlls/winevulkan/make_vulkan | 9 +++++- dlls/winevulkan/vulkan_thunks.c | 67 +++++++++++++++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 31 +++++++++++++++++++ include/wine/vulkan.h | 25 +++++++++++++++ 6 files changed, 145 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b2cc53d32eb8bff3a8cc…

1 0

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

10 May '21

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

Zebediah Figura : ws2_32/tests: Add a couple of tests for passing empty buffers to recv().
by Alexandre Julliard 10 May '21

10 May '21

Module: wine Branch: master Commit: 258cd1cdbcdf44c1ba16a206c84657c121f1ed79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=258cd1cdbcdf44c1ba16a206… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 10 10:19:46 2021 -0500 ws2_32/tests: Add a couple of tests for passing empty buffers to recv(). 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 f16a17aa7b3..d132bc833f2 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -9044,6 +9044,61 @@ static void test_nonblocking_async_recv(void) CloseHandle(overlapped.hEvent); } +static void test_empty_recv(void) +{ + OVERLAPPED overlapped = {0}; + SOCKET client, server; + DWORD size, flags = 0; + char buffer[5]; + WSABUF wsabuf; + int ret; + + overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + tcp_socketpair(&client, &server); + + WSASetLastError(0xdeadbeef); + ret = WSARecv(client, NULL, 0, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + + wsabuf.buf = buffer; + wsabuf.len = 0; + WSASetLastError(0xdeadbeef); + ret = WSARecv(client, &wsabuf, 0, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == WSAEINVAL, "got error %u\n", WSAGetLastError()); + + WSASetLastError(0xdeadbeef); + ret = WSARecv(client, &wsabuf, 1, NULL, &flags, &overlapped, NULL); + ok(ret == -1, "expected failure\n"); + ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + ret = send(server, "data", 5, 0); + ok(ret == 5, "got %d\n", ret); + + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait failed\n"); + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, FALSE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got size %u\n", size); + + WSASetLastError(0xdeadbeef); + ret = WSARecv(client, &wsabuf, 1, &size, &flags, &overlapped, NULL); + ok(!ret, "got error %u\n", WSAGetLastError()); + ok(!size, "got size %u\n", size); + + ret = recv(client, NULL, 0, 0); + ok(!ret, "got %d\n", ret); + + ret = recv(client, buffer, sizeof(buffer), 0); + ok(ret == 5, "got %d\n", ret); + ok(!strcmp(buffer, "data"), "got %s\n", debugstr_an(buffer, ret)); + + closesocket(client); + closesocket(server); + CloseHandle(overlapped.hEvent); +} + START_TEST( sock ) { int i; @@ -9101,6 +9156,7 @@ START_TEST( sock ) test_connecting_socket(); test_WSAGetOverlappedResult(); test_nonblocking_async_recv(); + test_empty_recv(); /* this is an io heavy test, do it at the end so the kernel doesn't start dropping packets */ test_send();

1 0

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

10 May '21

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 10 May '21

10 May '21

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

Zebediah Figura : server: Avoid calling get_unix_fd() in IOCTL_AFD_CREATE.
by Alexandre Julliard 10 May '21

10 May '21

Module: wine Branch: master Commit: 920f654ffb73688ee92af049c6c866f4eea3af1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=920f654ffb73688ee92af049… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon May 10 10:19:43 2021 -0500 server: Avoid calling get_unix_fd() in IOCTL_AFD_CREATE. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server/sock.c b/server/sock.c index 36fda31f9c1..24a826e4ce5 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1087,7 +1087,6 @@ static int init_socket( struct sock *sock, int family, int type, int protocol, u return -1; } sock_reselect( sock ); - clear_error(); return 0; } @@ -1354,7 +1353,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) assert( sock->obj.ops == &sock_ops ); - if (get_unix_fd( fd ) == -1 && code != IOCTL_AFD_CREATE) return 0; + if (code != IOCTL_AFD_CREATE && get_unix_fd( fd ) < 0) return 0; switch(code) {

1 0

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

10 May '21

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

Hans Leidekker : wpcap: Use CRT memory allocators.
by Alexandre Julliard 10 May '21

10 May '21

Module: wine Branch: master Commit: 7a774f75697eace8a419a18d8a1e107e3b226007 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7a774f75697eace8a419a18d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon May 10 15:37:26 2021 +0200 wpcap: Use CRT memory allocators. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wpcap/wpcap.c | 34 ++++++++++++++-------------------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/wpcap/wpcap.c b/dlls/wpcap/wpcap.c index cb064512e08..3c959a9dbd7 100644 --- a/dlls/wpcap/wpcap.c +++ b/dlls/wpcap/wpcap.c @@ -26,7 +26,6 @@ #define USE_WS_PREFIX #include "winsock2.h" -#include "wine/heap.h" #include "wine/debug.h" #include "unixlib.h" @@ -34,22 +33,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(wpcap); const struct pcap_funcs *pcap_funcs = NULL; -static inline WCHAR *heap_strdupAtoW(const char *str) -{ - LPWSTR ret = NULL; - - if(str) { - DWORD len; - - len = MultiByteToWideChar(CP_ACP, 0, str, -1, NULL, 0); - ret = heap_alloc(len*sizeof(WCHAR)); - if(ret) - MultiByteToWideChar(CP_ACP, 0, str, -1, ret, len); - } - - return ret; -} - int CDECL wine_pcap_activate( void *handle ) { TRACE( "%p\n", handle ); @@ -124,6 +107,17 @@ void CDECL wine_pcap_dump( unsigned char *user, const void *hdr, const unsigned pcap_funcs->dump( user, hdr, packet ); } +static inline WCHAR *strdupAW( const char *str ) +{ + WCHAR *ret = NULL; + if (str) + { + int len = MultiByteToWideChar( CP_ACP, 0, str, -1, NULL, 0 ); + if ((ret = malloc( len * sizeof(WCHAR) ))) MultiByteToWideChar( CP_ACP, 0, str, -1, ret, len ); + } + return ret; +} + void * CDECL wine_pcap_dump_open( void *handle, const char *filename ) { void *dumper; @@ -132,15 +126,15 @@ void * CDECL wine_pcap_dump_open( void *handle, const char *filename ) TRACE( "%p, %s\n", handle, debugstr_a(filename) ); - if (!(filenameW = heap_strdupAtoW( filename ))) return NULL; + if (!(filenameW = strdupAW( filename ))) return NULL; unix_path = wine_get_unix_file_name( filenameW ); - heap_free( filenameW ); + free( filenameW ); if (!unix_path) return NULL; TRACE( "unix_path %s\n", debugstr_a(unix_path) ); dumper = pcap_funcs->dump_open( handle, unix_path ); - heap_free( unix_path ); + RtlFreeHeap( GetProcessHeap(), 0, unix_path ); return dumper; }

1 0

Hans Leidekker : wpcap: Build with msvcrt.
by Alexandre Julliard 10 May '21

10 May '21

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 10 May '21

10 May '21

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

← Newer
1
...
54
55
56
57
58
59
60
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021