September 2023 - Wine-commits

Etaash Mathamsetty : include: Update definition of KDPC.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 51f16a2f80ca74d375a4d3c838048d5697ed3a17 URL: https://gitlab.winehq.org/wine/wine/-/commit/51f16a2f80ca74d375a4d3c838048d… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sat Jan 7 21:42:41 2023 -0500 include: Update definition of KDPC. --- include/ddk/wdm.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 45503f48a4e..be275bef582 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -83,15 +83,21 @@ typedef struct _KSEMAPHORE { } KSEMAPHORE, *PKSEMAPHORE, *PRKSEMAPHORE; typedef struct _KDPC { - CSHORT Type; - UCHAR Number; - UCHAR Importance; - LIST_ENTRY DpcListEntry; + union { + ULONG TargetInfoAsUlong; + struct { + UCHAR Type; + UCHAR Importance; + volatile USHORT Number; + } DUMMYSTRUCTNAME; + } DUMMYUNIONNAME; + SINGLE_LIST_ENTRY DpcListEntry; + KAFFINITY ProcessorHistory; PKDEFERRED_ROUTINE DeferredRoutine; PVOID DeferredContext; PVOID SystemArgument1; PVOID SystemArgument2; - PULONG_PTR Lock; + PVOID DpcData; } KDPC, *PKDPC, *RESTRICTED_POINTER PRKDPC; typedef enum _KDPC_IMPORTANCE {

1 0

Etaash Mathamsetty : ntoskrnl.exe/tests: Add KeInitializeDpc tests.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 03d6a8678629c27cf7ccc61b86113ee0ac662130 URL: https://gitlab.winehq.org/wine/wine/-/commit/03d6a8678629c27cf7ccc61b86113e… Author: Etaash Mathamsetty <etaash.mathamsetty(a)gmail.com> Date: Sat Jan 7 23:01:11 2023 -0500 ntoskrnl.exe/tests: Add KeInitializeDpc tests. --- dlls/ntoskrnl.exe/tests/driver.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5275aada3dc..4d6bae60431 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -2123,9 +2123,26 @@ static void WINAPI test_dpc_func(PKDPC Dpc, void *context, void *cpu_count, static void test_dpc(void) { void (WINAPI *pKeGenericCallDpc)(PKDEFERRED_ROUTINE routine, void *context); + void (WINAPI *pKeInitializeDpc)(PKDPC dpc, PKDEFERRED_ROUTINE routine, void *context); struct test_dpc_func_context data; KAFFINITY cpu_mask; ULONG cpu_count; + struct _KDPC dpc = {0}; + + pKeInitializeDpc = get_proc_address("KeInitializeDpc"); + if(!pKeInitializeDpc) + { + win_skip("KeInitializeDpc is not available.\n"); + return; + } + + pKeInitializeDpc(&dpc, test_dpc_func, &data); + + ok(dpc.Number == 0, "Got unexpected Dpc Number %u.\n", dpc.Number); + todo_wine ok(dpc.Type == 0x13, "Got unexpected Dpc Type %u.\n", dpc.Type); + todo_wine ok(dpc.Importance == MediumImportance, "Got unexpected Dpc Importance %u.\n", dpc.Importance); + ok(dpc.DeferredRoutine == test_dpc_func, "Got unexpected Dpc DeferredRoutine %p.\n", dpc.DeferredRoutine); + ok(dpc.DeferredContext == &data, "Got unexpected Dpc DeferredContext %p.\n", dpc.DeferredContext); pKeGenericCallDpc = get_proc_address("KeGenericCallDpc"); if (!pKeGenericCallDpc)

1 0

Zhiyi Zhang : comctl32/edit: Don't use WM_TIMER to update caret position.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 753ddd3a02a711cab54b5b2f62bf36eb35742bc2 URL: https://gitlab.winehq.org/wine/wine/-/commit/753ddd3a02a711cab54b5b2f62bf36… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Tue Dec 13 16:18:43 2022 +0800 comctl32/edit: Don't use WM_TIMER to update caret position. An application subclasses edit control and crashes on unexpected WM_TIMER messages. A timer was added a long time ago and it was for auto scrolling the view when the cursor is outside of the client area. However, with a EDIT_EM_ScrollCaret() call in EDIT_WM_MouseMove(), the view can be scrolled to the correct position automatically. So the timer is not necessary at all. This is tested manually with a long text in the edit control with notepad on XP, Win7 and Win10. Before this patch, the caret will move backwards every 100ms when the clicking the left mouse button on the bottom of the text and then dragging the cursor upwards and outside of the client area. After this, the behavior is the same as native. --- dlls/comctl32/edit.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/comctl32/edit.c b/dlls/comctl32/edit.c index 24ef8a43c17..4b950412617 100644 --- a/dlls/comctl32/edit.c +++ b/dlls/comctl32/edit.c @@ -113,8 +113,6 @@ typedef struct RECT format_rect; INT text_width; /* width of the widest line in pixels for multi line controls and just line width for single line controls */ - INT region_posx; /* Position of cursor relative to region: */ - INT region_posy; /* -1: to left, 0: within, 1: to right */ EDITWORDBREAKPROCW word_break_proc; INT line_count; /* number of lines */ INT y_offset; /* scroll offset in number of lines */ @@ -3438,8 +3436,6 @@ static LRESULT EDIT_WM_LButtonDblClk(EDITSTATE *es) e = li + EDIT_CallWordBreakProc(es, li, e - li, ll, WB_RIGHT); EDIT_EM_SetSel(es, s, e, FALSE); EDIT_EM_ScrollCaret(es); - es->region_posx = es->region_posy = 0; - SetTimer(es->hwndSelf, 0, 100, NULL); return 0; } @@ -3460,8 +3456,6 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y) e = EDIT_CharFromPos(es, x, y, &after_wrap); EDIT_EM_SetSel(es, (keys & MK_SHIFT) ? es->selection_start : e, e, after_wrap); EDIT_EM_ScrollCaret(es); - es->region_posx = es->region_posy = 0; - SetTimer(es->hwndSelf, 0, 100, NULL); if (!(es->flags & EF_FOCUSED)) SetFocus(es->hwndSelf); @@ -3478,7 +3472,6 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y) static LRESULT EDIT_WM_LButtonUp(EDITSTATE *es) { if (es->bCaptureState) { - KillTimer(es->hwndSelf, 0); if (GetCapture() == es->hwndSelf) ReleaseCapture(); } es->bCaptureState = FALSE; @@ -3507,7 +3500,6 @@ static LRESULT EDIT_WM_MouseMove(EDITSTATE *es, INT x, INT y) { INT e; BOOL after_wrap; - INT prex, prey; /* If the mouse has been captured by process other than the edit control itself, * the windows edit controls will not select the strings with mouse move. @@ -3515,17 +3507,10 @@ static LRESULT EDIT_WM_MouseMove(EDITSTATE *es, INT x, INT y) if (!es->bCaptureState || GetCapture() != es->hwndSelf) return 0; - /* - * FIXME: gotta do some scrolling if outside client - * area. Maybe reset the timer ? - */ - prex = x; prey = y; - EDIT_ConfinePoint(es, &x, &y); - es->region_posx = (prex < x) ? -1 : ((prex > x) ? 1 : 0); - es->region_posy = (prey < y) ? -1 : ((prey > y) ? 1 : 0); e = EDIT_CharFromPos(es, x, y, &after_wrap); EDIT_EM_SetSel(es, es->selection_start, e, after_wrap); EDIT_SetCaretPos(es,es->selection_end,es->flags & EF_AFTER_WRAP); + EDIT_EM_ScrollCaret(es); return 0; } @@ -3924,25 +3909,6 @@ static LRESULT EDIT_WM_SysKeyDown(EDITSTATE *es, INT key, DWORD key_data) return DefWindowProcW(es->hwndSelf, WM_SYSKEYDOWN, key, key_data); } - -/********************************************************************* - * - * WM_TIMER - * - */ -static void EDIT_WM_Timer(EDITSTATE *es) -{ - if (es->region_posx < 0) { - EDIT_MoveBackward(es, TRUE); - } else if (es->region_posx > 0) { - EDIT_MoveForward(es, TRUE); - } -/* - * FIXME: gotta do some vertical scrolling here, like - * EDIT_EM_LineScroll(hwnd, 0, 1); - */ -} - /********************************************************************* * * WM_HSCROLL @@ -4915,10 +4881,6 @@ static LRESULT CALLBACK EDIT_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPAR result = EDIT_WM_SysKeyDown(es, (INT)wParam, (DWORD)lParam); break; - case WM_TIMER: - EDIT_WM_Timer(es); - break; - case WM_VSCROLL: result = EDIT_WM_VScroll(es, LOWORD(wParam), (short)HIWORD(wParam)); break;

1 0

Zhiyi Zhang : user32/edit: Don't use WM_TIMER to update caret position.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 8ee237281206920d4ef6642fa493a23ab8cc7f71 URL: https://gitlab.winehq.org/wine/wine/-/commit/8ee237281206920d4ef6642fa493a2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Aug 18 15:44:49 2023 +0800 user32/edit: Don't use WM_TIMER to update caret position. An application subclasses edit control and crashes on unexpected WM_TIMER messages. A timer was added a long time ago and it was for auto scrolling the view when the cursor is outside of the client area. However, with a EDIT_EM_ScrollCaret() call in EDIT_WM_MouseMove(), the view can be scrolled to the correct position automatically. So the timer is not necessary at all. This is tested manually with a long text in the edit control with notepad on XP, Win7 and Win10. Before this patch, the caret will move backwards every 100ms when the clicking the left mouse button on the bottom of the text and then dragging the cursor upwards and outside of the client area. After this, the behavior is the same as native. --- dlls/user32/edit.c | 40 +--------------------------------------- 1 file changed, 1 insertion(+), 39 deletions(-) diff --git a/dlls/user32/edit.c b/dlls/user32/edit.c index 3a8241fcf15..39f429813d6 100644 --- a/dlls/user32/edit.c +++ b/dlls/user32/edit.c @@ -100,8 +100,6 @@ typedef struct RECT format_rect; INT text_width; /* width of the widest line in pixels for multi line controls and just line width for single line controls */ - INT region_posx; /* Position of cursor relative to region: */ - INT region_posy; /* -1: to left, 0: within, 1: to right */ void *word_break_proc; /* 32-bit word break proc: ANSI or Unicode */ INT line_count; /* number of lines */ INT y_offset; /* scroll offset in number of lines */ @@ -3587,8 +3585,6 @@ static LRESULT EDIT_WM_LButtonDblClk(EDITSTATE *es) e = li + EDIT_CallWordBreakProc(es, li, e - li, ll, WB_RIGHT); EDIT_EM_SetSel(es, s, e, FALSE); EDIT_EM_ScrollCaret(es); - es->region_posx = es->region_posy = 0; - SetTimer(es->hwndSelf, 0, 100, NULL); return 0; } @@ -3609,8 +3605,6 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y) e = EDIT_CharFromPos(es, x, y, &after_wrap); EDIT_EM_SetSel(es, (keys & MK_SHIFT) ? es->selection_start : e, e, after_wrap); EDIT_EM_ScrollCaret(es); - es->region_posx = es->region_posy = 0; - SetTimer(es->hwndSelf, 0, 100, NULL); if (!(es->flags & EF_FOCUSED)) NtUserSetFocus(es->hwndSelf); @@ -3627,7 +3621,6 @@ static LRESULT EDIT_WM_LButtonDown(EDITSTATE *es, DWORD keys, INT x, INT y) static LRESULT EDIT_WM_LButtonUp(EDITSTATE *es) { if (es->bCaptureState) { - NtUserKillTimer(es->hwndSelf, 0); if (GetCapture() == es->hwndSelf) ReleaseCapture(); } es->bCaptureState = FALSE; @@ -3656,7 +3649,6 @@ static LRESULT EDIT_WM_MouseMove(EDITSTATE *es, INT x, INT y) { INT e; BOOL after_wrap; - INT prex, prey; /* If the mouse has been captured by process other than the edit control itself, * the windows edit controls will not select the strings with mouse move. @@ -3664,17 +3656,10 @@ static LRESULT EDIT_WM_MouseMove(EDITSTATE *es, INT x, INT y) if (!es->bCaptureState || GetCapture() != es->hwndSelf) return 0; - /* - * FIXME: gotta do some scrolling if outside client - * area. Maybe reset the timer ? - */ - prex = x; prey = y; - EDIT_ConfinePoint(es, &x, &y); - es->region_posx = (prex < x) ? -1 : ((prex > x) ? 1 : 0); - es->region_posy = (prey < y) ? -1 : ((prey > y) ? 1 : 0); e = EDIT_CharFromPos(es, x, y, &after_wrap); EDIT_EM_SetSel(es, es->selection_start, e, after_wrap); EDIT_SetCaretPos(es,es->selection_end,es->flags & EF_AFTER_WRAP); + EDIT_EM_ScrollCaret(es); return 0; } @@ -4049,25 +4034,6 @@ static LRESULT EDIT_WM_SysKeyDown(EDITSTATE *es, INT key, DWORD key_data) return DefWindowProcW(es->hwndSelf, WM_SYSKEYDOWN, key, key_data); } - -/********************************************************************* - * - * WM_TIMER - * - */ -static void EDIT_WM_Timer(EDITSTATE *es) -{ - if (es->region_posx < 0) { - EDIT_MoveBackward(es, TRUE); - } else if (es->region_posx > 0) { - EDIT_MoveForward(es, TRUE); - } -/* - * FIXME: gotta do some vertical scrolling here, like - * EDIT_EM_LineScroll(hwnd, 0, 1); - */ -} - /********************************************************************* * * WM_HSCROLL @@ -5066,10 +5032,6 @@ LRESULT EditWndProc_common( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, B result = EDIT_WM_SysKeyDown(es, (INT)wParam, (DWORD)lParam); break; - case WM_TIMER: - EDIT_WM_Timer(es); - break; - case WM_VSCROLL: result = EDIT_WM_VScroll(es, LOWORD(wParam), (short)HIWORD(wParam)); break;

1 0

Hans Leidekker : ipconfig: Use CRT allocation functions.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 3f9f4a4a0e3aab0dcf759ed57537fc650d2b1c26 URL: https://gitlab.winehq.org/wine/wine/-/commit/3f9f4a4a0e3aab0dcf759ed57537fc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 10:21:07 2023 +0200 ipconfig: Use CRT allocation functions. --- programs/ipconfig/ipconfig.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/programs/ipconfig/ipconfig.c b/programs/ipconfig/ipconfig.c index f59c3ab7182..7c5671f9e1c 100644 --- a/programs/ipconfig/ipconfig.c +++ b/programs/ipconfig/ipconfig.c @@ -45,13 +45,13 @@ static int ipconfig_vprintfW(const WCHAR *msg, va_list va_args) */ len = WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, NULL, 0, NULL, NULL); - msgA = HeapAlloc(GetProcessHeap(), 0, len); + msgA = malloc(len); if (!msgA) return 0; WideCharToMultiByte(GetOEMCP(), 0, msg_buffer, wlen, msgA, len, NULL, NULL); WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); - HeapFree(GetProcessHeap(), 0, msgA); + free(msgA); } return count; @@ -146,7 +146,7 @@ static void print_basic_information(void) if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { - adapters = HeapAlloc(GetProcessHeap(), 0, out); + adapters = malloc(out); if (!adapters) exit(1); @@ -194,7 +194,7 @@ static void print_basic_information(void) } } - HeapFree(GetProcessHeap(), 0, adapters); + free(adapters); } } @@ -265,7 +265,7 @@ static void print_full_information(void) if (GetNetworkParams(NULL, &out) == ERROR_BUFFER_OVERFLOW) { - info = HeapAlloc(GetProcessHeap(), 0, out); + info = malloc(out); if (!info) exit(1); @@ -288,13 +288,13 @@ static void print_full_information(void) ipconfig_printfW(L"\n"); } - HeapFree(GetProcessHeap(), 0, info); + free(info); } if (GetAdaptersAddresses(AF_UNSPEC, GAA_FLAG_INCLUDE_GATEWAYS, NULL, NULL, &out) == ERROR_BUFFER_OVERFLOW) { - adapters = HeapAlloc(GetProcessHeap(), 0, out); + adapters = malloc(out); if (!adapters) exit(1); @@ -348,7 +348,7 @@ static void print_full_information(void) } } - HeapFree(GetProcessHeap(), 0, adapters); + free(adapters); } }

1 0

Hans Leidekker : ipconfig: Call GetAdaptersAddresses() in a loop.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 757ea81a99bba2df0e5156152e9bd4849ae72067 URL: https://gitlab.winehq.org/wine/wine/-/commit/757ea81a99bba2df0e5156152e9bd4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 5 10:23:07 2023 +0200 ipconfig: Call GetAdaptersAddresses() in a loop. --- programs/ipconfig/ipconfig.c | 190 +++++++++++++++++++++---------------------- 1 file changed, 92 insertions(+), 98 deletions(-)

1 0

Brendan Shanks : tools: Use posix_spawn() instead of fork()/execvp().
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 5206c7147210cf6578c5cda8bbf60867f0fca39c URL: https://gitlab.winehq.org/wine/wine/-/commit/5206c7147210cf6578c5cda8bbf608… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Sep 1 16:10:08 2023 -0700 tools: Use posix_spawn() instead of fork()/execvp(). --- tools/tools.h | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tools/tools.h b/tools/tools.h index fa459994eb3..7f99205aca8 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -57,6 +57,8 @@ # define strcasecmp _stricmp # endif #else +extern char **environ; +# include <spawn.h> # include <sys/wait.h> # include <unistd.h> # ifndef O_BINARY @@ -283,13 +285,9 @@ static inline int strarray_spawn( struct strarray args ) pid_t pid, wret; int status; - if (!(pid = fork())) - { - strarray_add( &args, NULL ); - execvp( args.str[0], (char **)args.str ); - _exit(1); - } - if (pid == -1) return -1; + strarray_add( &args, NULL ); + if (posix_spawnp( &pid, args.str[0], NULL, NULL, (char **)args.str, environ )) + return -1; while (pid != (wret = waitpid( pid, &status, 0 ))) if (wret == -1 && errno != EINTR) break;

1 0

Eric Pouech : kernel32/console: Add tests for GenerateConsoleCtrlEvent().
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: e668cf356b33740c07c94738ce8120a3bd7043ab URL: https://gitlab.winehq.org/wine/wine/-/commit/e668cf356b33740c07c94738ce8120… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Sep 6 10:07:51 2023 +0200 kernel32/console: Add tests for GenerateConsoleCtrlEvent(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 152 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 152 insertions(+) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index 6facf2ad214..54d1a80709b 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -5153,6 +5153,142 @@ static void test_CreateProcessCUI(void) SetStdHandle(STD_ERROR_HANDLE, hstd[2]); } +#define NO_EVENT 0xfe + +static HANDLE mch_child_kill_event; +static DWORD mch_child_event = NO_EVENT; +static BOOL WINAPI mch_child(DWORD event) +{ + mch_child_event = event; + SetEvent(mch_child_kill_event); + return TRUE; +} + +static void test_CtrlHandlerSubsystem(void) +{ + static char guiexec[MAX_PATH]; + static char cuiexec[MAX_PATH]; + + static struct + { + /* input */ + BOOL use_cui; + DWORD cp_flags; + enum pgid {PGID_PARENT, PGID_ZERO, PGID_CHILD} pgid_kind; + /* output */ + unsigned child_event; + } + tests[] = + { +/* 0 */ {FALSE, 0, PGID_PARENT, NO_EVENT}, + {FALSE, 0, PGID_ZERO, NO_EVENT}, + {FALSE, CREATE_NEW_PROCESS_GROUP, PGID_CHILD, NO_EVENT}, + {FALSE, CREATE_NEW_PROCESS_GROUP, PGID_PARENT, NO_EVENT}, + {FALSE, CREATE_NEW_PROCESS_GROUP, PGID_ZERO, NO_EVENT}, +/* 5 */ {TRUE, 0, PGID_PARENT, CTRL_C_EVENT}, + {TRUE, 0, PGID_ZERO, CTRL_C_EVENT}, + {TRUE, CREATE_NEW_PROCESS_GROUP, PGID_CHILD, NO_EVENT}, + {TRUE, CREATE_NEW_PROCESS_GROUP, PGID_PARENT, NO_EVENT}, + {TRUE, CREATE_NEW_PROCESS_GROUP, PGID_ZERO, NO_EVENT}, +/* 10 */ {TRUE, CREATE_NEW_CONSOLE, PGID_PARENT, NO_EVENT}, + {TRUE, CREATE_NEW_CONSOLE, PGID_ZERO, NO_EVENT}, + {TRUE, DETACHED_PROCESS, PGID_PARENT, NO_EVENT}, + {TRUE, DETACHED_PROCESS, PGID_ZERO, NO_EVENT}, + }; + SECURITY_ATTRIBUTES inheritable_attr = { sizeof(inheritable_attr), NULL, TRUE }; + STARTUPINFOA si = { sizeof(si) }; + PROCESS_INFORMATION info; + char buf[MAX_PATH]; + DWORD exit_code; + HANDLE event_child; + char **argv; + DWORD saved_console_flags; + DWORD pgid; + BOOL ret; + DWORD res; + int i; + + winetest_get_mainargs(&argv); + GetTempPathA(ARRAY_SIZE(guiexec), guiexec); + strcat(guiexec, "console_gui.exe"); + copy_change_subsystem(argv[0], guiexec, IMAGE_SUBSYSTEM_WINDOWS_GUI); + GetTempPathA(ARRAY_SIZE(cuiexec), cuiexec); + strcat(cuiexec, "console_cui.exe"); + copy_change_subsystem(argv[0], cuiexec, IMAGE_SUBSYSTEM_WINDOWS_CUI); + + event_child = CreateEventA(&inheritable_attr, FALSE, FALSE, NULL); + ok(event_child != NULL, "Couldn't create event\n"); + + saved_console_flags = RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags; + + /* protect self against ctrl-c, but don't mask it on child */ + ret = SetConsoleCtrlHandler(NULL, FALSE); + ret = SetConsoleCtrlHandler(mydummych, TRUE); + ok(ret, "Couldn't set ctrl-c handler flag\n"); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + winetest_push_context("test #%u", i); + + res = snprintf(buf, ARRAY_SIZE(buf), "\"%s\" console ctrl_handler %p", tests[i].use_cui ? cuiexec : guiexec, event_child); + ok((LONG)res >= 0 && res < ARRAY_SIZE(buf), "Truncated string %s (%lu)\n", buf, res); + + ret = CreateProcessA(NULL, buf, NULL, NULL, TRUE, tests[i].cp_flags, + NULL, NULL, &si, &info); + ok(ret, "CreateProcess failed: %lu %s\n", GetLastError(), tests[i].use_cui ? cuiexec : guiexec); + + res = WaitForSingleObject(event_child, 5000); + ok(res == WAIT_OBJECT_0, "Child didn't init %lu %p\n", res, event_child); + + switch (tests[i].pgid_kind) + { + case PGID_PARENT: + pgid = RtlGetCurrentPeb()->ProcessParameters->ProcessGroupId; + break; + case PGID_CHILD: + ok((tests[i].cp_flags & CREATE_NEW_PROCESS_GROUP) != 0, + "PGID should only be used with new process groupw\n"); + pgid = info.dwProcessId; + break; + case PGID_ZERO: + pgid = 0; + break; + default: + ok(0, "Unexpected pgid kind %u\n", tests[i].pgid_kind); + pgid = 0; + } + + ret = GenerateConsoleCtrlEvent(CTRL_C_EVENT, pgid); + ok(ret || broken(GetLastError() == ERROR_INVALID_PARAMETER) /* Win7 */, + "GenerateConsoleCtrlEvent failed: %lu\n", GetLastError()); + + res = WaitForSingleObject(info.hProcess, 2000); + ok(res == WAIT_OBJECT_0, "Expecting child to be terminated\n"); + + if (ret) + { + ret = GetExitCodeProcess(info.hProcess, &exit_code); + ok(ret, "Couldn't get exit code\n"); + + ok(tests[i].child_event == exit_code, "Unexpected exit code %#lx, instead of %#x\n", + exit_code, tests[i].child_event); + } + + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + winetest_pop_context(); + } + + CloseHandle(event_child); + + RtlGetCurrentPeb()->ProcessParameters->ConsoleFlags = saved_console_flags; + ret = SetConsoleCtrlHandler(mydummych, FALSE); + ok(ret, "Couldn't remove ctrl-c handler flag\n"); + + DeleteFileA(guiexec); + DeleteFileA(cuiexec); +} + START_TEST(console) { HANDLE hConIn, hConOut, revert_output = NULL, unbound_output; @@ -5181,6 +5317,21 @@ START_TEST(console) return; } + if (argc == 4 && !strcmp(argv[2], "ctrl_handler")) + { + HANDLE event; + + SetConsoleCtrlHandler(mch_child, TRUE); + mch_child_kill_event = CreateEventA(NULL, FALSE, FALSE, NULL); + ok(mch_child_kill_event != NULL, "Couldn't create event\n"); + sscanf(argv[3], "%p", &event); + ret = SetEvent(event); + ok(ret, "SetEvent failed\n"); + + WaitForSingleObject(mch_child_kill_event, 1000); /* enough for all events to be distributed? */ + ExitProcess(mch_child_event); + } + if (argc == 3 && !strcmp(argv[2], "check_console")) { DWORD exit_code = 0, pcslist; @@ -5408,6 +5559,7 @@ START_TEST(console) test_AllocConsole(); test_FreeConsole(); test_CreateProcessCUI(); + test_CtrlHandlerSubsystem(); } else if (revert_output) SetConsoleActiveScreenBuffer(revert_output);

1 0

Jacek Caban : ntdll: Unconditionally forward console events to kernelbase.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: b228e3df608e9a6a9fc5df55375974d06324e11e URL: https://gitlab.winehq.org/wine/wine/-/commit/b228e3df608e9a6a9fc5df55375974… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 6 10:07:51 2023 +0200 ntdll: Unconditionally forward console events to kernelbase. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/ntdll/loader.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index fc2d2ff7a12..aa299535181 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -3217,9 +3217,7 @@ done: */ NTSTATUS WINAPI __wine_ctrl_routine( void *arg ) { - DWORD ret = 0; - - if (pCtrlRoutine && NtCurrentTeb()->Peb->ProcessParameters->ConsoleHandle) ret = pCtrlRoutine( arg ); + DWORD ret = pCtrlRoutine ? pCtrlRoutine( arg ) : 0; RtlExitUserThread( ret ); }

1 0

Eric Pouech : cmd: Better handle ctrl-c events.
by Alexandre Julliard 06 Sep '23

06 Sep '23

Module: wine Branch: master Commit: 91cce00dbaf76106dc1f4315c2ffb4dd3ceaa54a URL: https://gitlab.winehq.org/wine/wine/-/commit/91cce00dbaf76106dc1f4315c2ffb4… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Sep 6 10:07:51 2023 +0200 cmd: Better handle ctrl-c events. cmd shouldn't terminate itself when user hits ctrl-c. cmd should terminate the currently running CUI child it waits for upon ctrl-c. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- programs/cmd/wcmdmain.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index d00c6e07566..cc81534fff3 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -2411,6 +2411,12 @@ void WCMD_free_commands(CMD_LIST *cmds) { } } +static BOOL WINAPI my_event_handler(DWORD ctrl) +{ + WCMD_output(L"\n"); + return ctrl == CTRL_C_EVENT; +} + /***************************************************************************** * Main entry point. This is a console application so we have a main() not a @@ -2658,6 +2664,10 @@ int __cdecl wmain (int argc, WCHAR *argvW[]) if (opt_s && *cmd=='\"') WCMD_strip_quotes(cmd); } + else + { + SetConsoleCtrlHandler(my_event_handler, TRUE); + } /* Save cwd into appropriate env var (Must be before the /c processing */ GetCurrentDirectoryW(ARRAY_SIZE(string), string);

1 0