June 2022 - Wine-Devel - list.winehq.org

[PATCH v4 0/4] MR313: win32u: Finish moving raw input APIs.

by Zebediah Figura (＠zfigura)

-- v4: user32: Merge rawinput.c into input.c. win32u: Move raw input device list management from user32. win32u: Move NtUserGetRegisteredRawInputDevices from user32. win32u: Move NtUserRegisterRawInputDevices from user32. https://gitlab.winehq.org/wine/wine/-/merge_requests/313

June 29, 2022

[PATCH 1/1] server: Allow IOCTL_AFD_POLL for sockets without unix fd.

by Paul Gofman

From: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/tests/afd.c | 15 ++++++++++++--- server/sock.c | 5 +++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/afd.c b/dlls/ws2_32/tests/afd.c index fe3c2ef2ff6..f84e7084a27 100644 --- a/dlls/ws2_32/tests/afd.c +++ b/dlls/ws2_32/tests/afd.c @@ -172,15 +172,17 @@ static void test_poll(void) GUID acceptex_guid = WSAID_ACCEPTEX; SOCKET client, server, listener; OVERLAPPED overlapped = {0}; + HANDLE event, afd_handle; LPFN_ACCEPTEX pAcceptEx; struct sockaddr_in addr; + OBJECT_ATTRIBUTES attr; + UNICODE_STRING string; DWORD size, flags = 0; char *large_buffer; IO_STATUS_BLOCK io; LARGE_INTEGER now; ULONG params_size; WSABUF wsabuf; - HANDLE event; int ret, len; large_buffer = malloc(large_buffer_size); @@ -189,6 +191,11 @@ static void test_poll(void) event = CreateEventW(NULL, TRUE, FALSE, NULL); overlapped.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + RtlInitUnicodeString(&string, L"\\Device\\Afd\\deadbeef"); + InitializeObjectAttributes(&attr, &string, 0, NULL, NULL); + ret = NtOpenFile(&afd_handle, SYNCHRONIZE, &attr, &io, 0, 0); + ok(!ret, "got %#x\n", ret); + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ret = bind(listener, (const struct sockaddr *)&bind_addr, sizeof(bind_addr)); ok(!ret, "got error %u\n", WSAGetLastError()); @@ -246,7 +253,7 @@ static void test_poll(void) in_params->sockets[0].status = 0xdeadbeef; memset(out_params, 0, params_size); - ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, + ret = NtDeviceIoControlFile(afd_handle, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(!ret, "got %#x\n", ret); ok(!io.Status, "got %#lx\n", io.Status); @@ -260,7 +267,7 @@ static void test_poll(void) NtQuerySystemTime(&now); in_params->timeout = now.QuadPart; - ret = NtDeviceIoControlFile((HANDLE)listener, event, NULL, NULL, &io, + ret = NtDeviceIoControlFile(afd_handle, event, NULL, NULL, &io, IOCTL_AFD_POLL, in_params, params_size, out_params, params_size); ok(ret == STATUS_PENDING, "got %#x\n", ret); ret = WaitForSingleObject(event, 100); @@ -899,6 +906,8 @@ static void test_poll(void) CloseHandle(overlapped.hEvent); CloseHandle(event); free(large_buffer); + + CloseHandle(afd_handle); } struct poll_exclusive_thread_cb_ctx diff --git a/server/sock.c b/server/sock.c index 2f1b33a333d..caa68dd213b 100644 --- a/server/sock.c +++ b/server/sock.c @@ -2186,11 +2186,12 @@ static struct accept_req *alloc_accept_req( struct sock *sock, struct sock *acce static void sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct sock *sock = get_fd_user( fd ); - int unix_fd; + int unix_fd = -1; assert( sock->obj.ops == &sock_ops ); - if (code != IOCTL_AFD_WINE_CREATE && (unix_fd = get_unix_fd( fd )) < 0) return; + if (code != IOCTL_AFD_WINE_CREATE && code != IOCTL_AFD_POLL && (unix_fd = get_unix_fd( fd )) < 0) + return; switch(code) { -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/344

June 29, 2022

[PATCH 0/1] MR344: server: Allow IOCTL_AFD_POLL for sockets without unix fd.

by Paul Gofman (＠gofman)

libzmq (https://github.com/zeromq/libzmq) which is used by some apps (Glyph launcher is an example) does it this way and currently breaks with assert with Wine. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/344

June 29, 2022

Re: [PATCH v3 0/2] MR340: regedit: Fix broken handling of REG_DWORD and REG_QWORD values - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/340

June 29, 2022

Re: [PATCH v2 0/1] MR341: dbghelp/msc: support LF_INDEX* in enumeration type definition - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/341

June 29, 2022

Re: [PATCH v2 0/1] MR339: programs/winedbg: no longer hide current WineDbg process from 'info proc' - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/339

June 29, 2022

[PATCH v2 1/1] winedbg: No longer hide current WineDbg process from 'info proc'.

by Eric Pouech

From: Eric Pouech <eric.pouech(a)gmail.com> We used to hide current WineDbg instance when displaying processes' list (command 'info proc'). This can potentially generate some "dangling" processes in the hierarchy (related to this WineDbg instance): - conhost.exe - start.exe (when launched from unix shell without full path to winedbg.exe) Also, print a more comprehensive error message when trying to attach to itself (now that debugger's PID is more easily available). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winedbg/info.c | 17 ++++++++++------- programs/winedbg/tgt_active.c | 7 ++++++- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/programs/winedbg/info.c b/programs/winedbg/info.c index bb933aeb455..ae0fd90e938 100644 --- a/programs/winedbg/info.c +++ b/programs/winedbg/info.c @@ -498,14 +498,18 @@ static unsigned get_parent(const struct dump_proc* dp, unsigned idx) static void dump_proc_info(const struct dump_proc* dp, unsigned idx, unsigned depth) { struct dump_proc_entry* dpe; + char info; for ( ; idx != -1; idx = dp->entries[idx].sibling) { assert(idx < dp->count); dpe = &dp->entries[idx]; - dbg_printf("%c%08lx %-8ld ", - (dpe->proc.th32ProcessID == (dbg_curr_process ? - dbg_curr_process->pid : 0)) ? '>' : ' ', - dpe->proc.th32ProcessID, dpe->proc.cntThreads); + if (dbg_curr_process && dpe->proc.th32ProcessID == dbg_curr_process->pid) + info = '>'; + else if (dpe->proc.th32ProcessID == GetCurrentProcessId()) + info = '='; + else + info = ' '; + dbg_printf("%c%08lx %-8ld ", info, dpe->proc.th32ProcessID, dpe->proc.cntThreads); if (depth) { unsigned i; @@ -537,11 +541,10 @@ void info_win32_processes(void) dp.entries[dp.count].proc.dwSize = sizeof(dp.entries[dp.count].proc); ok = Process32First(snap, &dp.entries[dp.count].proc); - /* fetch all process information into dp (skipping this debugger) */ + /* fetch all process information into dp */ while (ok) { - if (dp.entries[dp.count].proc.th32ProcessID != GetCurrentProcessId()) - dp.entries[dp.count++].children = -1; + dp.entries[dp.count++].children = -1; if (dp.count >= dp.alloc) { dp.entries = HeapReAlloc(GetProcessHeap(), 0, dp.entries, sizeof(*dp.entries) * (dp.alloc *= 2)); diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c index c17a6f38290..9e11de69bc9 100644 --- a/programs/winedbg/tgt_active.c +++ b/programs/winedbg/tgt_active.c @@ -70,9 +70,14 @@ static unsigned dbg_handle_debug_event(DEBUG_EVENT* de); */ BOOL dbg_attach_debuggee(DWORD pid) { + if (pid == GetCurrentProcessId()) + { + dbg_printf("WineDbg can't debug its own process. Please use another process ID.\n"); + return FALSE; + } if (!(dbg_curr_process = dbg_add_process(&be_process_active_io, pid, 0))) return FALSE; - if (!DebugActiveProcess(pid)) + if (!DebugActiveProcess(pid)) { dbg_printf("Can't attach process %04lx: error %lu\n", pid, GetLastError()); dbg_del_process(dbg_curr_process); -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/339

June 29, 2022

[PATCH v2 0/1] MR339: programs/winedbg: no longer hide current WineDbg process from 'info proc'

by eric pouech (＠epo)

We used to hide current WineDbg instance when displaying processes' list (command 'info proc'). This can potentially generate some "dangling" processes in the hierarchy (related to this WineDbg instance): - conhost.exe - start.exe (when launched from unix shell without full path to winedbg.exe) Also, print a more comprehensive error message when trying to attach to itself (now that debugger's PID is more easily available). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> -- v2: winedbg: No longer hide current WineDbg process from 'info proc'. https://gitlab.winehq.org/wine/wine/-/merge_requests/339

June 29, 2022

Re: [PATCH v8 0/5] MR310: mf: Fix several reference leaks. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/310

June 29, 2022

Re: [PATCH v2 0/2] MR335: uxtheme/tests: Add dialog procedure message tests. - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/335

June 29, 2022