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

Hans Leidekker : ws2_32: Add support for hints in GetAddrInfoExW.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: e7af1f92a3f419019e05258db31d64717a12ee8a URL: https://source.winehq.org/git/wine.git/?a=commit;h=e7af1f92a3f419019e05258d… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu May 13 15:39:51 2021 +0200 ws2_32: Add support for hints in GetAddrInfoExW. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/protocol.c | 18 +++++++++++++----- dlls/ws2_32/tests/protocol.c | 24 +++++++++++++++++++++++- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/dlls/ws2_32/protocol.c b/dlls/ws2_32/protocol.c index 64af105f0b9..15616fdaf34 100644 --- a/dlls/ws2_32/protocol.c +++ b/dlls/ws2_32/protocol.c @@ -568,6 +568,7 @@ struct getaddrinfo_args ADDRINFOEXW **result; char *nodename; char *servname; + struct WS_addrinfo *hints; }; static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *context) @@ -579,7 +580,7 @@ static void WINAPI getaddrinfo_callback(TP_CALLBACK_INSTANCE *instance, void *co struct WS_addrinfo *res; int ret; - ret = WS_getaddrinfo( args->nodename, args->servname, NULL, &res ); + ret = WS_getaddrinfo( args->nodename, args->servname, args->hints, &res ); if (res) { *args->result = addrinfo_list_AtoW(res); @@ -660,12 +661,21 @@ static int WS_getaddrinfoW( const WCHAR *nodename, const WCHAR *servname, goto end; } - if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) ))) goto end; + if (!(args = HeapAlloc( GetProcessHeap(), 0, sizeof(*args) + sizeof(*args->hints) ))) goto end; args->overlapped = overlapped; args->completion_routine = completion_routine; args->result = res; args->nodename = nodenameA; args->servname = servnameA; + if (hints) + { + args->hints = (struct WS_addrinfo *)(args + 1); + args->hints->ai_flags = hints->ai_flags; + args->hints->ai_family = hints->ai_family; + args->hints->ai_socktype = hints->ai_socktype; + args->hints->ai_protocol = hints->ai_protocol; + } + else args->hints = NULL; overlapped->Internal = WSAEINPROGRESS; if (!TrySubmitThreadpoolCallback( getaddrinfo_callback, args, NULL )) @@ -714,14 +724,12 @@ int WINAPI GetAddrInfoExW( const WCHAR *name, const WCHAR *servname, DWORD names FIXME( "Unsupported namespace %u\n", namespace ); if (namespace_id) FIXME( "Unsupported namespace_id %s\n", debugstr_guid(namespace_id) ); - if (hints) - FIXME( "Unsupported hints\n" ); if (timeout) FIXME( "Unsupported timeout\n" ); if (handle) FIXME( "Unsupported cancel handle\n" ); - ret = WS_getaddrinfoW( name, servname, NULL, result, overlapped, completion_routine ); + ret = WS_getaddrinfoW( name, servname, (struct WS_addrinfo *)hints, result, overlapped, completion_routine ); if (ret) return ret; if (handle) *handle = (HANDLE)0xdeadbeef; return 0; diff --git a/dlls/ws2_32/tests/protocol.c b/dlls/ws2_32/tests/protocol.c index 8937e84d63f..27ef6ff92aa 100644 --- a/dlls/ws2_32/tests/protocol.c +++ b/dlls/ws2_32/tests/protocol.c @@ -1599,7 +1599,7 @@ static void test_GetAddrInfoExW(void) static const WCHAR localhost[] = {'l','o','c','a','l','h','o','s','t',0}; static const WCHAR winehq[] = {'t','e','s','t','.','w','i','n','e','h','q','.','o','r','g',0}; static const WCHAR nxdomain[] = {'n','x','d','o','m','a','i','n','.','w','i','n','e','h','q','.','o','r','g',0}; - ADDRINFOEXW *result; + ADDRINFOEXW *result, hints; OVERLAPPED overlapped; HANDLE event; int ret; @@ -1666,6 +1666,28 @@ static void test_GetAddrInfoExW(void) ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); pFreeAddrInfoExW(result); + /* hints */ + result = (void *)0xdeadbeef; + memset(&overlapped, 0xcc, sizeof(overlapped)); + ResetEvent(event); + overlapped.hEvent = event; + WSASetLastError(0xdeadbeef); + memset(&hints, 0, sizeof(hints)); + hints.ai_flags = AI_ALL | AI_V4MAPPED; + hints.ai_family = AF_INET6; + hints.ai_socktype = SOCK_DGRAM; + hints.ai_protocol = IPPROTO_UDP; + ret = pGetAddrInfoExW(winehq, NULL, NS_ALL, NULL, &hints, &result, NULL, &overlapped, NULL, NULL); + ok(ret == ERROR_IO_PENDING, "GetAddrInfoExW failed with %d\n", WSAGetLastError()); + ok(WSAGetLastError() == ERROR_IO_PENDING, "expected 11001, got %d\n", WSAGetLastError()); + ret = overlapped.Internal; + ok(ret == WSAEINPROGRESS || ret == ERROR_SUCCESS, "overlapped.Internal = %u\n", ret); + ok(WaitForSingleObject(event, 1000) == WAIT_OBJECT_0, "wait failed\n"); + ret = pGetAddrInfoExOverlappedResult(&overlapped); + ok(!ret, "overlapped result is %d\n", ret); + ok(result != NULL, "result == NULL\n"); + pFreeAddrInfoExW(result); + result = (void *)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped)); ResetEvent(event);

1 0

Rémi Bernon : hidclass.sys: Send rawinput messages with HID report.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 9a4fa43a81790aa403bf14a0a6bdf6309281e263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a4fa43a81790aa403bf14a0… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 12 11:25:28 2021 +0200 hidclass.sys: Send rawinput messages with HID report. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50506 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/device.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/hidclass.sys/device.c b/dlls/hidclass.sys/device.c index 7dc97781b6b..4d031ffcaa0 100644 --- a/dlls/hidclass.sys/device.c +++ b/dlls/hidclass.sys/device.c @@ -104,6 +104,43 @@ static NTSTATUS copy_packet_into_buffer(HID_XFER_PACKET *packet, BYTE* buffer, U return STATUS_BUFFER_OVERFLOW; } +static void hid_device_send_input(DEVICE_OBJECT *device, HID_XFER_PACKET *packet) +{ + BASE_DEVICE_EXTENSION *ext = device->DeviceExtension; + RAWINPUT *rawinput; + UCHAR *report, id; + ULONG data_size; + INPUT input; + + data_size = offsetof(RAWINPUT, data.hid.bRawData) + packet->reportBufferLen; + if (!(id = ext->u.pdo.preparsed_data->reports[0].reportID)) data_size += 1; + + if (!(rawinput = HeapAlloc(GetProcessHeap(), 0, data_size))) + { + ERR("Failed to allocate rawinput data!\n"); + return; + } + + rawinput->header.dwType = RIM_TYPEHID; + rawinput->header.dwSize = data_size; + rawinput->header.hDevice = ULongToHandle(ext->u.pdo.rawinput_handle); + rawinput->header.wParam = RIM_INPUT; + rawinput->data.hid.dwCount = 1; + rawinput->data.hid.dwSizeHid = data_size - offsetof(RAWINPUT, data.hid.bRawData); + + report = rawinput->data.hid.bRawData; + if (!id) *report++ = 0; + memcpy(report, packet->reportBuffer, packet->reportBufferLen); + + input.type = INPUT_HARDWARE; + input.u.hi.uMsg = WM_INPUT; + input.u.hi.wParamH = 0; + input.u.hi.wParamL = 0; + __wine_send_input(0, &input, rawinput); + + HeapFree(GetProcessHeap(), 0, rawinput); +} + static void HID_Device_processQueue(DEVICE_OBJECT *device) { IRP *irp; @@ -175,6 +212,7 @@ static DWORD CALLBACK hid_device_thread(void *args) if (irp_status.u.Status == STATUS_SUCCESS) { RingBuffer_Write(ext->u.pdo.ring_buffer, packet); + hid_device_send_input(device, packet); HID_Device_processQueue(device); } @@ -215,6 +253,7 @@ static DWORD CALLBACK hid_device_thread(void *args) else packet->reportId = 0; RingBuffer_Write(ext->u.pdo.ring_buffer, packet); + hid_device_send_input(device, packet); HID_Device_processQueue(device); }

1 0

Haoyang Chen : gdi32: Fix a memory leak.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 4b9c4e42014759e4f6ebb6e588a9f1113a256d61 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4b9c4e42014759e4f6ebb6e5… Author: Haoyang Chen <chenhaoyang(a)uniontech.com> Date: Thu May 13 14:17:57 2021 +0800 gdi32: Fix a memory leak. Signed-off-by: Haoyang Chen <chenhaoyang(a)uniontech.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 456eb245700..6af76d6f81b 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -1540,9 +1540,10 @@ static UINT parse_aa_pattern( FcPattern *pattern ) static FcPattern *create_family_pattern( const char *name, FcPattern **cached ) { - FcPattern *ret = NULL, *tmp, *pattern = pFcPatternCreate(); + FcPattern *ret = NULL, *tmp, *pattern; FcResult result; if (*cached) return *cached; + pattern = pFcPatternCreate(); pFcPatternAddString( pattern, FC_FAMILY, (const FcChar8 *)name ); pFcPatternAddString( pattern, FC_NAMELANG, (const FcChar8 *)"en-us" ); pFcPatternAddString( pattern, FC_PRGNAME, (const FcChar8 *)"wine" );

1 0

Zebediah Figura : ws2_32: Clear FD_OOB instead of FD_READ when receiving OOB data.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 53210ceb0ec1ff85b5fbe98da77d8611c73ccd1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=53210ceb0ec1ff85b5fbe98d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 21:59:24 2021 -0500 ws2_32: Clear FD_OOB instead of FD_READ when receiving OOB data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 12 ++++++------ dlls/ws2_32/tests/sock.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 3a8bfa0ce41..0a23b44cc68 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2110,14 +2110,14 @@ static NTSTATUS WS2_async_recv( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS stat if (result >= 0) { status = STATUS_SUCCESS; - _enable_event( wsa->hSocket, FD_READ, 0, 0 ); + _enable_event( wsa->hSocket, (wsa->flags & WS_MSG_OOB) ? FD_OOB : FD_READ, 0, 0 ); } else { if (errno == EAGAIN) { status = STATUS_PENDING; - _enable_event( wsa->hSocket, FD_READ, 0, 0 ); + _enable_event( wsa->hSocket, (wsa->flags & WS_MSG_OOB) ? FD_OOB : FD_READ, 0, 0 ); } else { @@ -6180,7 +6180,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, } else NtQueueApcThread( GetCurrentThread(), (PNTAPCFUNC)ws2_async_apc, (ULONG_PTR)wsa, (ULONG_PTR)iosb, 0 ); - _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); + _enable_event(SOCKET2HANDLE(s), (wsa->flags & WS_MSG_OOB) ? FD_OOB : FD_READ, 0, 0); return 0; } @@ -6209,13 +6209,13 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, { err = WSAETIMEDOUT; /* a timeout is not fatal */ - _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); + _enable_event(SOCKET2HANDLE(s), (wsa->flags & WS_MSG_OOB) ? FD_OOB : FD_READ, 0, 0); goto error; } } else { - _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); + _enable_event(SOCKET2HANDLE(s), (wsa->flags & WS_MSG_OOB) ? FD_OOB : FD_READ, 0, 0); err = WSAEWOULDBLOCK; goto error; } @@ -6224,7 +6224,7 @@ static int WS2_recv_base( SOCKET s, LPWSABUF lpBuffers, DWORD dwBufferCount, TRACE(" -> %i bytes\n", n); if (wsa != &localwsa) HeapFree( GetProcessHeap(), 0, wsa ); release_sock_fd( s, fd ); - _enable_event(SOCKET2HANDLE(s), FD_READ, 0, 0); + _enable_event(SOCKET2HANDLE(s), (wsa->flags & WS_MSG_OOB) ? FD_OOB : FD_READ, 0, 0); SetLastError(ERROR_SUCCESS); return 0; diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 1732c9bf3ee..596e1ec1a21 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4413,7 +4413,7 @@ static void test_oob_events(struct event_test_ctx *ctx) ret = recv(server, buffer, 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); - check_events_todo_msg(ctx, FD_OOB, 0, 200); + check_events_todo(ctx, FD_OOB, 0, 200); check_events_todo_msg(ctx, 0, 0, 0); ret = recv(server, buffer, 1, MSG_OOB);

1 0

Zebediah Figura : server: Do not send messages for events that are not currently being selected for.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 037fccc0dffc808a562a9f28f1de273b2a979de6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=037fccc0dffc808a562a9f28… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 21:59:23 2021 -0500 server: Do not send messages for events that are not currently being selected for. 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 | 2 +- server/sock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 2d9c0958dd7..1732c9bf3ee 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4177,7 +4177,7 @@ static void test_connect_events(struct event_test_ctx *ctx) server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); - check_events_todo_msg(ctx, FD_WRITE, 0, 200); + check_events(ctx, FD_WRITE, 0, 200); select_events(ctx, client, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); diff --git a/server/sock.c b/server/sock.c index ad80b897365..f74c9396f26 100644 --- a/server/sock.c +++ b/server/sock.c @@ -413,7 +413,7 @@ static void sock_wake_up( struct sock *sock ) for (i = 0; i < FD_MAX_EVENTS; i++) { int event = event_bitorder[i]; - if (sock->pending_events & (1 << event)) + if (events & (1 << event)) { lparam_t lparam = (1 << event) | (sock->errors[event] << 16); post_message( sock->window, sock->message, sock->wparam, lparam );

1 0

Zebediah Figura : server: Reset the reported event mask in set_socket_event only when using window messages.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 44a3c70d77139526b4066114cf9128fafd113ffb URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a3c70d77139526b4066114… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 21:59:21 2021 -0500 server: Reset the reported event mask in set_socket_event only when using window messages. 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 | 21 ++++++++++----------- server/sock.c | 3 ++- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index ec78e62969e..7611b934c3a 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2641,9 +2641,8 @@ static void test_WSAEnumNetworkEvents(void) } else { - todo_wine_if (i != 0) /* Remove when fixed */ - ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", - i, net_events.lNetworkEvents); + ok (net_events.lNetworkEvents == 0, "Test[%d]: expected 0, got %d\n", + i, net_events.lNetworkEvents); } for (k = 0; k < FD_MAX_EVENTS; k++) { @@ -3990,12 +3989,12 @@ static void test_accept_events(struct event_test_ctx *ctx) select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); if (ctx->is_message) check_events(ctx, FD_ACCEPT, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); select_events(ctx, listener, 0); select_events(ctx, listener, FD_CONNECT | FD_READ | FD_OOB | FD_ACCEPT); if (ctx->is_message) check_events(ctx, FD_ACCEPT, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); client2 = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(client2 != -1, "failed to create socket, error %u\n", WSAGetLastError()); @@ -4134,7 +4133,7 @@ static void test_connect_events(struct event_test_ctx *ctx) select_events(ctx, client, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); server = accept(listener, NULL, NULL); ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); @@ -4235,12 +4234,12 @@ static void test_write_events(struct event_test_ctx *ctx) select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); select_events(ctx, server, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); ret = send(server, "data", 5, 0); ok(ret == 5, "got %d\n", ret); @@ -4268,7 +4267,7 @@ static void test_write_events(struct event_test_ctx *ctx) select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ | FD_WRITE); if (ctx->is_message) check_events(ctx, FD_WRITE, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); } closesocket(server); @@ -4313,12 +4312,12 @@ static void test_read_events(struct event_test_ctx *ctx) select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) check_events(ctx, FD_READ, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); select_events(ctx, server, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) check_events(ctx, FD_READ, 0, 200); - check_events_todo_event(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); ret = send(client, "data", 5, 0); ok(ret == 5, "got %d\n", ret); diff --git a/server/sock.c b/server/sock.c index bd65cfc68c3..ad80b897365 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1780,7 +1780,8 @@ DECL_HANDLER(set_socket_event) if (get_unix_fd( sock->fd ) == -1) return; old_event = sock->event; sock->mask = req->mask; - sock->reported_events &= ~req->mask; /* re-enable held events */ + if (req->window) + sock->reported_events &= ~req->mask; /* re-enable held events */ sock->event = NULL; sock->window = req->window; sock->message = req->msg;

1 0

Zebediah Figura : quartz/dsoundrender: Remove the no longer used "play_time" field.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 67330f90556d3057409a4582e95d5ca8ee81310c URL: https://source.winehq.org/git/wine.git/?a=commit;h=67330f90556d3057409a4582… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 19:00:32 2021 -0500 quartz/dsoundrender: Remove the no longer used "play_time" field. This was used to implement IReferenceClock::GetTime(), which was reimplemented in 63a6b308e9. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index f7f0255d4ab..656a5e1f7ab 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -64,8 +64,6 @@ struct dsound_render DWORD buf_size; DWORD last_playpos, writepos; - REFERENCE_TIME play_time; - LONG volume; LONG pan; }; @@ -122,10 +120,9 @@ static void DSoundRender_UpdatePositions(struct dsound_render *This, DWORD *seqw old_writepos += This->buf_size; IDirectSoundBuffer_GetCurrentPosition(This->dsbuffer, &playpos, &writepos); - if (old_playpos > playpos) { + if (old_playpos > playpos) adv = This->buf_size + playpos - old_playpos; - This->play_time += time_from_pos(This, This->buf_size); - } else + else adv = playpos - old_playpos; This->last_playpos = playpos; if (adv) {

1 0

Zebediah Figura : ws2_32/tests: Verify that recv() does not reset a pending FD_CLOSE.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 11102116ac7e8cee6ca4149d00a6c416dfc8c966 URL: https://source.winehq.org/git/wine.git/?a=commit;h=11102116ac7e8cee6ca4149d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 21:59:22 2021 -0500 ws2_32/tests: Verify that recv() does not reset a pending FD_CLOSE. 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 7611b934c3a..2d9c0958dd7 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4463,6 +4463,11 @@ static void test_close_events(struct event_test_ctx *ctx) check_events_todo_msg(ctx, FD_CLOSE, 0, 200); check_events(ctx, 0, 0, 0); + ret = recv(server, buffer, 5, 0); + ok(!ret, "got %d\n", ret); + + check_events(ctx, 0, 0, 0); + closesocket(server); /* Test shutdown(remote end, SD_SEND). */

1 0

Zebediah Figura : server: Post socket events only if selecting for them.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: 4c409f8a3bf984d2ca1e315f0b400971322e777f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c409f8a3bf984d2ca1e315f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 21:59:25 2021 -0500 server: Post socket events only if selecting for them. 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 | 22 +++++++++++----------- server/sock.c | 9 ++++++--- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 596e1ec1a21..266ddc14451 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4391,35 +4391,35 @@ static void test_oob_events(struct event_test_ctx *ctx) ret = send(client, "a", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); - check_events_todo_msg(ctx, FD_OOB, 0, 200); - check_events_todo(ctx, 0, 0, 0); + check_events(ctx, FD_OOB, 0, 200); + check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_OOB, 0, 200); - check_events_todo(ctx, 0, 0, 0); + check_events(ctx, FD_OOB, 0, 200); + check_events(ctx, 0, 0, 0); select_events(ctx, server, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_OOB, 0, 200); - check_events_todo(ctx, 0, 0, 0); + check_events(ctx, FD_OOB, 0, 200); + check_events(ctx, 0, 0, 0); ret = send(client, "b", 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); if (!ctx->is_message) - check_events(ctx, FD_OOB, 0, 200); - check_events_todo(ctx, 0, 0, 0); + check_events_todo_event(ctx, FD_OOB, 0, 200); + check_events(ctx, 0, 0, 0); ret = recv(server, buffer, 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); check_events_todo(ctx, FD_OOB, 0, 200); - check_events_todo_msg(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); ret = recv(server, buffer, 1, MSG_OOB); todo_wine ok(ret == 1, "got %d\n", ret); - check_events_todo_msg(ctx, 0, 0, 0); + check_events(ctx, 0, 0, 0); /* Send data while we're not selecting. */ @@ -4428,7 +4428,7 @@ static void test_oob_events(struct event_test_ctx *ctx) ok(ret == 1, "got %d\n", ret); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); - check_events_todo_msg(ctx, FD_OOB, 0, 200); + check_events(ctx, FD_OOB, 0, 200); ret = recv(server, buffer, 1, MSG_OOB); ok(ret == 1, "got %d\n", ret); diff --git a/server/sock.c b/server/sock.c index f74c9396f26..c8cd603149b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -627,9 +627,12 @@ static void post_socket_event( struct sock *sock, unsigned int event_bit, unsign { unsigned int event = (1 << event_bit); - sock->pending_events |= event; - sock->reported_events |= event; - sock->errors[event_bit] = error; + if (!(sock->reported_events & event)) + { + sock->pending_events |= event; + sock->reported_events |= event; + sock->errors[event_bit] = error; + } } static void sock_dispatch_events( struct sock *sock, int prevstate, int event, int error )

1 0

Hugh McMaster : reg/tests: Add data tests for the 'copy' command.
by Alexandre Julliard May 13, 2021

May 13, 2021

Module: wine Branch: master Commit: bb609c6acbf53b822825e3077fe0996a85d5026d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb609c6acbf53b822825e307… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu May 13 22:36:56 2021 +1000 reg/tests: Add data tests for the 'copy' command. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/copy.c | 136 ++++++++++++++++++++++++++++++++++++++++++ programs/reg/tests/export.c | 30 +++++----- programs/reg/tests/reg_test.h | 7 +++ 3 files changed, 158 insertions(+), 15 deletions(-) diff --git a/programs/reg/tests/copy.c b/programs/reg/tests/copy.c index 0d245dae4da..7126b00d50e 100644 --- a/programs/reg/tests/copy.c +++ b/programs/reg/tests/copy.c @@ -122,6 +122,140 @@ static void test_command_syntax(void) ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); } +static void test_copy_empty_key(void) +{ + DWORD r; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, NULL); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", empty_key_test, 0), "compare_export() failed\n"); +} + +static void test_copy_simple_data(void) +{ + HKEY hkey; + DWORD r, dword; + + delete_tree(HKEY_CURRENT_USER, COPY_SRC); + verify_key_nonexist(HKEY_CURRENT_USER, COPY_SRC); + + delete_tree(HKEY_CURRENT_USER, KEY_BASE); + verify_key_nonexist(HKEY_CURRENT_USER, KEY_BASE); + + add_key(HKEY_CURRENT_USER, COPY_SRC, &hkey); + + dword = 0x100; + add_value(hkey, "DWORD", REG_DWORD, &dword, sizeof(dword)); + add_value(hkey, "String", REG_SZ, "Your text here...", 18); + close_key(hkey); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE " /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + todo_wine delete_key(HKEY_CURRENT_USER, KEY_BASE); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC "\\ HKCU\\" KEY_BASE "\\ /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); + + + run_reg_exe("reg copy HKCU\\" COPY_SRC " HKCU\\" KEY_BASE " /s /f", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine verify_key(HKEY_CURRENT_USER, KEY_BASE); + + run_reg_exe("reg export HKCU\\" KEY_BASE " file.reg /y", &r); + todo_wine ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); + todo_wine ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); +} + START_TEST(copy) { DWORD r; @@ -132,4 +266,6 @@ START_TEST(copy) } test_command_syntax(); + test_copy_empty_key(); + test_copy_simple_data(); } diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index daf42f66e3e..27d70b6a663 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -18,9 +18,8 @@ #include "reg_test.h" -#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) -static BOOL compare_export_(const char *file, unsigned line, const char *filename, - const char *expected, DWORD todo) +BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo) { FILE *fp; long file_size; @@ -64,6 +63,17 @@ error: return FALSE; } +const char *empty_key_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; + +const char *simple_data_test = + "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" + "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" + "\"DWORD\"=dword:00000100\r\n" + "\"String\"=\"Your text here...\"\r\n\r\n"; + + /* Unit tests */ static void test_export(void) @@ -73,16 +83,6 @@ static void test_export(void) HKEY hkey, subkey; BYTE hex[4], buffer[8]; - const char *empty_key_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n\r\n"; - - const char *simple_test = - "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" - "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" - "\"DWORD\"=dword:00000100\r\n" - "\"String\"=\"Your text here...\"\r\n\r\n"; - const char *complex_test = "\xef\xbb\xbfWindows Registry Editor Version 5.00\r\n\r\n" "[HKEY_CURRENT_USER\\" KEY_BASE "]\r\n" @@ -243,12 +243,12 @@ static void test_export(void) run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " file.reg /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("file.reg", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("file.reg", simple_data_test, 0), "compare_export() failed\n"); /* Test whether a .reg file extension is required when exporting */ run_reg_exe("reg export HKEY_CURRENT_USER\\" KEY_BASE " foo /y", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); - ok(compare_export("foo", simple_test, 0), "compare_export() failed\n"); + ok(compare_export("foo", simple_data_test, 0), "compare_export() failed\n"); /* Test registry export with a complex data structure */ add_key(hkey, "Subkey1", &subkey); diff --git a/programs/reg/tests/reg_test.h b/programs/reg/tests/reg_test.h index 6718e91096f..3f4677a7a69 100644 --- a/programs/reg/tests/reg_test.h +++ b/programs/reg/tests/reg_test.h @@ -74,6 +74,13 @@ void add_value_(const char *file, unsigned line, HKEY hkey, const char *name, #define delete_value(k,n) delete_value_(__FILE__,__LINE__,k,n) void delete_value_(const char *file, unsigned line, const HKEY hkey, const char *name); +/* export.c */ +#define compare_export(f,e,todo) compare_export_(__FILE__,__LINE__,f,e,todo) +BOOL compare_export_(const char *file, unsigned line, const char *filename, + const char *expected, DWORD todo); +extern const char *empty_key_test; +extern const char *simple_data_test; + /* import.c */ #define test_import_str(c,r) import_reg(__FILE__,__LINE__,c,FALSE,r) #define test_import_wstr(c,r) import_reg(__FILE__,__LINE__,c,TRUE,r)

1 0