March 2023 - Wine-commits - list.winehq.org

Torge Matthies : msvcr100: Use enum for _StructuredTaskCollection status bits.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: a3fc7a423f20b929295a089594402031beddaad0 URL: https://gitlab.winehq.org/wine/wine/-/commit/a3fc7a423f20b929295a0895944020… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Tue Mar 28 19:15:57 2023 +0200 msvcr100: Use enum for _StructuredTaskCollection status bits. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcrt/concurrency.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 69551db3c8b..c8c6752deec 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -186,6 +186,12 @@ typedef enum TASK_COLLECTION_CANCELLED } _TaskCollectionStatus; +typedef enum +{ + STRUCTURED_TASK_COLLECTION_CANCELLED = 0x2, + STRUCTURED_TASK_COLLECTION_STATUS_MASK = 0x7 +} _StructuredTaskCollectionStatusBits; + typedef struct _UnrealizedChore { const vtable_ptr *vtable; @@ -1976,7 +1982,7 @@ static LONG CALLBACK execute_chore_except(EXCEPTION_POINTERS *pexc, void *_data) new_exception = data->task_collection->exception; do { - if ((ULONG_PTR)new_exception & ~0x7) { + if ((ULONG_PTR)new_exception & ~STRUCTURED_TASK_COLLECTION_STATUS_MASK) { __ExceptionPtrDestroy(ptr); operator_delete(ptr); break; @@ -1999,7 +2005,8 @@ static void execute_chore(_UnrealizedChore *chore, __TRY { - if (!((ULONG_PTR)task_collection->exception & ~0x7) && chore->chore_proc) + if (!((ULONG_PTR)task_collection->exception & ~STRUCTURED_TASK_COLLECTION_STATUS_MASK) && + chore->chore_proc) chore->chore_proc(chore); } __EXCEPT_CTX(execute_chore_except, &data) @@ -2172,6 +2179,7 @@ _TaskCollectionStatus __stdcall _StructuredTaskCollection__RunAndWait( { LONG expected, val; ULONG_PTR exception; + exception_ptr *ep; TRACE("(%p %p)\n", this, chore); @@ -2199,8 +2207,8 @@ _TaskCollectionStatus __stdcall _StructuredTaskCollection__RunAndWait( this->count = 0; exception = (ULONG_PTR)this->exception; - if (exception & ~0x7) { - exception_ptr *ep = (exception_ptr*)(exception & ~0x7); + ep = (exception_ptr*)(exception & ~STRUCTURED_TASK_COLLECTION_STATUS_MASK); + if (ep) { this->exception = 0; __TRY {

1 0

Torge Matthies : msvcr100: Implement _StructuredTaskCollection canceling.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 58d516f00f587e855c1476f926de81e3db698a75 URL: https://gitlab.winehq.org/wine/wine/-/commit/58d516f00f587e855c1476f926de81… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Tue Mar 28 19:32:01 2023 +0200 msvcr100: Implement _StructuredTaskCollection canceling. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 12 ++++++- dlls/msvcrt/concurrency.c | 72 ++++++++++++++++++++++++++++++++++++------ 2 files changed, 73 insertions(+), 11 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 0a4fb383e0e..607048ab9da 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -1587,7 +1587,17 @@ static void test_StructuredTaskCollection(void) ok(b, "SetEvent failed\n"); status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); - todo_wine ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + call_func1(p__StructuredTaskCollection_dtor, &task_coll); + + /* cancel task collection without scheduled tasks */ + call_func2(p__StructuredTaskCollection_ctor, &task_coll, NULL); + call_func1(p__StructuredTaskCollection__Cancel, &task_coll); + ok(task_coll.context == context, "Unexpected context: %p != %p\n", task_coll.context, context); + chore_ctor(&chore1); + status = p__StructuredTaskCollection__RunAndWait(&task_coll, NULL); + ok(status == 2, "_StructuredTaskCollection::_RunAndWait failed: %d\n", status); + ok(!chore1.executed, "Canceled collection executed chore\n"); call_func1(p__StructuredTaskCollection_dtor, &task_coll); CloseHandle(chore_start_evt); diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index c8c6752deec..3606fe16482 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -1967,6 +1967,64 @@ struct execute_chore_data { _StructuredTaskCollection *task_collection; }; +/* ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ */ +/* ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ */ +/* ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ */ +DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Cancel, 4) +void __thiscall _StructuredTaskCollection__Cancel( + _StructuredTaskCollection *this) +{ + ThreadScheduler *scheduler; + void *prev_exception, *new_exception; + struct scheduled_chore *sc, *next; + LONG removed = 0; + LONG prev_finished, new_finished; + + TRACE("(%p)\n", this); + + if (!this->context) + this->context = get_current_context(); + scheduler = get_thread_scheduler_from_context(this->context); + if (!scheduler) + return; + + new_exception = this->exception; + do { + prev_exception = new_exception; + if ((ULONG_PTR)prev_exception & STRUCTURED_TASK_COLLECTION_CANCELLED) + return; + new_exception = (void*)((ULONG_PTR)prev_exception | + STRUCTURED_TASK_COLLECTION_CANCELLED); + } while ((new_exception = InterlockedCompareExchangePointer( + &this->exception, new_exception, prev_exception)) + != prev_exception); + + EnterCriticalSection(&scheduler->cs); + LIST_FOR_EACH_ENTRY_SAFE(sc, next, &scheduler->scheduled_chores, + struct scheduled_chore, entry) { + if (sc->chore->task_collection != this) + continue; + sc->chore->task_collection = NULL; + list_remove(&sc->entry); + removed++; + operator_delete(sc); + } + LeaveCriticalSection(&scheduler->cs); + if (!removed) + return; + + new_finished = this->finished; + do { + prev_finished = new_finished; + if (prev_finished == FINISHED_INITIAL) + new_finished = removed; + else + new_finished = prev_finished + removed; + } while ((new_finished = InterlockedCompareExchange(&this->finished, + new_finished, prev_finished)) != prev_finished); + RtlWakeAddressAll((LONG*)&this->finished); +} + static LONG CALLBACK execute_chore_except(EXCEPTION_POINTERS *pexc, void *_data) { struct execute_chore_data *data = _data; @@ -1976,6 +2034,8 @@ static LONG CALLBACK execute_chore_except(EXCEPTION_POINTERS *pexc, void *_data) if (pexc->ExceptionRecord->ExceptionCode != CXX_EXCEPTION) return EXCEPTION_CONTINUE_SEARCH; + _StructuredTaskCollection__Cancel(data->task_collection); + ptr = operator_new(sizeof(*ptr)); __ExceptionPtrCreate(ptr); exception_ptr_from_record(ptr, pexc->ExceptionRecord); @@ -2216,19 +2276,11 @@ _TaskCollectionStatus __stdcall _StructuredTaskCollection__RunAndWait( } __FINALLY_CTX(exception_ptr_rethrow_finally, ep) } + if (exception & STRUCTURED_TASK_COLLECTION_CANCELLED) + return TASK_COLLECTION_CANCELLED; return TASK_COLLECTION_SUCCESS; } -/* ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAAXXZ */ -/* ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QAEXXZ */ -/* ?_Cancel(a)_StructuredTaskCollection@details(a)Concurrency@@QEAAXXZ */ -DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__Cancel, 4) -void __thiscall _StructuredTaskCollection__Cancel( - _StructuredTaskCollection *this) -{ - FIXME("(%p): stub!\n", this); -} - /* ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAA_NXZ */ /* ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QAE_NXZ */ /* ?_IsCanceling(a)_StructuredTaskCollection@details(a)Concurrency@@QEAA_NXZ */

1 0

Torge Matthies : msvcr100: Implement _StructuredTaskCollection::_IsCanceling.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 9e865967140f00680ffe2983ca4fa994ab6bf3d8 URL: https://gitlab.winehq.org/wine/wine/-/commit/9e865967140f00680ffe2983ca4fa9… Author: Torge Matthies <tmatthies(a)codeweavers.com> Date: Tue Mar 28 16:25:39 2023 +0200 msvcr100: Implement _StructuredTaskCollection::_IsCanceling. Signed-off-by: Torge Matthies <tmatthies(a)codeweavers.com> --- dlls/msvcr120/tests/msvcr120.c | 2 +- dlls/msvcrt/concurrency.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr120/tests/msvcr120.c b/dlls/msvcr120/tests/msvcr120.c index 607048ab9da..fd8e42fd35d 100644 --- a/dlls/msvcr120/tests/msvcr120.c +++ b/dlls/msvcr120/tests/msvcr120.c @@ -1403,7 +1403,7 @@ static void __cdecl chore_proc(_UnrealizedChore *_this) MSVCRT_bool canceling = call_func1( p__StructuredTaskCollection__IsCanceling, chore->chore.task_collection); - todo_wine ok(canceling, "Task is not canceling\n"); + ok(canceling, "Task is not canceling\n"); } } diff --git a/dlls/msvcrt/concurrency.c b/dlls/msvcrt/concurrency.c index 3606fe16482..d148aadd13a 100644 --- a/dlls/msvcrt/concurrency.c +++ b/dlls/msvcrt/concurrency.c @@ -2288,8 +2288,8 @@ DEFINE_THISCALL_WRAPPER(_StructuredTaskCollection__IsCanceling, 4) bool __thiscall _StructuredTaskCollection__IsCanceling( _StructuredTaskCollection *this) { - FIXME("(%p): stub!\n", this); - return FALSE; + TRACE("(%p)\n", this); + return !!((ULONG_PTR)this->exception & STRUCTURED_TASK_COLLECTION_CANCELLED); } /* ?_CheckTaskCollection(a)_UnrealizedChore@details(a)Concurrency@@IAEXXZ */

1 0

Sven Baars : wine.inf: Put the Clients key in the right place.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: cabd68728d33817c966bdbf6acfed3b6daff2140 URL: https://gitlab.winehq.org/wine/wine/-/commit/cabd68728d33817c966bdbf6acfed3… Author: Sven Baars <sbaars(a)codeweavers.com> Date: Mon Oct 17 16:20:29 2022 +0200 wine.inf: Put the Clients key in the right place. --- loader/wine.inf.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 9aaf2124ee3..38103d12876 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -554,11 +554,11 @@ HKLM,%MciExtStr%,"wvx",,"MPEGVideo" [Misc] HKLM,Software\Borland\Database Engine\Settings\SYSTEM\INIT,SHAREDMEMLOCATION,,9000 +HKLM,Software\Clients,,16 HKLM,Software\Clients\Mail,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,,2,"Native Mail Client" HKLM,Software\Clients\Mail\Native Mail Client,"DLLPath",2,"%11%\winemapi.dll" HKLM,Software\Microsoft\Advanced INF Setup,,16 -HKLM,Software\Microsoft\Clients,,16 HKLM,Software\Microsoft\Cryptography\Calais\Current,,16 HKLM,Software\Microsoft\Cryptography\Calais\Readers,,16 HKLM,Software\Microsoft\Cryptography\Services,,16 @@ -2531,7 +2531,7 @@ HKLM,Software\Classes\Wow6432Node\Interface,,16 HKLM,Software\Classes\Wow6432Node\Media Type,,16 HKLM,Software\Classes\Wow6432Node\MediaFoundation,,16 ; symlinks for shared keys under HKLM\Software -HKLM,Software\Wow6432Node\Microsoft\Clients,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Clients" +HKLM,Software\Wow6432Node\Clients,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Clients" HKLM,Software\Wow6432Node\Microsoft\Cryptography\Calais\Current,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Cryptography\Calais\Current" HKLM,Software\Wow6432Node\Microsoft\Cryptography\Calais\Readers,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Cryptography\Calais\Readers" HKLM,Software\Wow6432Node\Microsoft\Cryptography\Services,"SymbolicLinkValue",0x60000,"\Registry\Machine\Software\Microsoft\Cryptography\Services"

1 0

Paul Gofman : taskkill: Use CRT allocation functions.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: dd3f3f381f9e761325c7c06236de1241c9605ed6 URL: https://gitlab.winehq.org/wine/wine/-/commit/dd3f3f381f9e761325c7c06236de12… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 28 09:34:12 2023 -0600 taskkill: Use CRT allocation functions. --- programs/taskkill/taskkill.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 424e87b9a44..44ed4c79119 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -58,13 +58,13 @@ static int taskkill_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; @@ -127,7 +127,7 @@ static DWORD *enumerate_processes(DWORD *list_count) { DWORD *pid_list, alloc_bytes = 1024 * sizeof(*pid_list), needed_bytes; - pid_list = HeapAlloc(GetProcessHeap(), 0, alloc_bytes); + pid_list = malloc(alloc_bytes); if (!pid_list) return NULL; @@ -137,7 +137,7 @@ static DWORD *enumerate_processes(DWORD *list_count) if (!EnumProcesses(pid_list, alloc_bytes, &needed_bytes)) { - HeapFree(GetProcessHeap(), 0, pid_list); + free(pid_list); return NULL; } @@ -150,10 +150,10 @@ static DWORD *enumerate_processes(DWORD *list_count) break; alloc_bytes *= 2; - realloc_list = HeapReAlloc(GetProcessHeap(), 0, pid_list, alloc_bytes); + realloc_list = realloc(pid_list, alloc_bytes); if (!realloc_list) { - HeapFree(GetProcessHeap(), 0, pid_list); + free(pid_list); return NULL; } pid_list = realloc_list; @@ -288,7 +288,7 @@ static int send_close_messages(void) } } - HeapFree(GetProcessHeap(), 0, pid_list); + free(pid_list); return status_code; } @@ -403,7 +403,7 @@ static int terminate_processes(void) } } - HeapFree(GetProcessHeap(), 0, pid_list); + free(pid_list); return status_code; } @@ -413,8 +413,7 @@ static BOOL add_to_task_list(WCHAR *name) if (!task_list) { - task_list = HeapAlloc(GetProcessHeap(), 0, - list_size * sizeof(*task_list)); + task_list = malloc(list_size * sizeof(*task_list)); if (!task_list) return FALSE; } @@ -423,8 +422,7 @@ static BOOL add_to_task_list(WCHAR *name) void *realloc_list; list_size *= 2; - realloc_list = HeapReAlloc(GetProcessHeap(), 0, task_list, - list_size * sizeof(*task_list)); + realloc_list = realloc(task_list, list_size * sizeof(*task_list)); if (!realloc_list) return FALSE; @@ -521,7 +519,7 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!process_arguments(argc, argv)) { - HeapFree(GetProcessHeap(), 0, task_list); + free(task_list); return 1; } @@ -530,6 +528,6 @@ int __cdecl wmain(int argc, WCHAR *argv[]) else status_code = send_close_messages(); - HeapFree(GetProcessHeap(), 0, task_list); + free(task_list); return status_code; }

1 0

Paul Gofman : taskkill: Remove unneeded free() before process exit.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 20ab5f06d0972440a7df7fb1ba390ab1b32f3b1d URL: https://gitlab.winehq.org/wine/wine/-/commit/20ab5f06d0972440a7df7fb1ba390a… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 28 10:12:29 2023 -0600 taskkill: Remove unneeded free() before process exit. --- programs/taskkill/taskkill.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 44ed4c79119..ad5f8e389f7 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -136,10 +136,7 @@ static DWORD *enumerate_processes(DWORD *list_count) DWORD *realloc_list; if (!EnumProcesses(pid_list, alloc_bytes, &needed_bytes)) - { - free(pid_list); return NULL; - } /* EnumProcesses can't signal an insufficient buffer condition, so the * only way to possibly determine whether a larger buffer is required @@ -152,10 +149,7 @@ static DWORD *enumerate_processes(DWORD *list_count) alloc_bytes *= 2; realloc_list = realloc(pid_list, alloc_bytes); if (!realloc_list) - { - free(pid_list); return NULL; - } pid_list = realloc_list; } @@ -288,7 +282,6 @@ static int send_close_messages(void) } } - free(pid_list); return status_code; } @@ -403,7 +396,6 @@ static int terminate_processes(void) } } - free(pid_list); return status_code; } @@ -515,19 +507,10 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) int __cdecl wmain(int argc, WCHAR *argv[]) { - int status_code = 0; - if (!process_arguments(argc, argv)) - { - free(task_list); return 1; - } if (force_termination) - status_code = terminate_processes(); - else - status_code = send_close_messages(); - - free(task_list); - return status_code; + return terminate_processes(); + return send_close_messages(); }

1 0

Paul Gofman : taskkill: Enumerate processes in main().
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: cf4a0b7392f33ba3e0b3fe69007a6d1f327f13f2 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf4a0b7392f33ba3e0b3fe69007a6d… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 28 10:09:11 2023 -0600 taskkill: Enumerate processes in main(). --- programs/taskkill/taskkill.c | 38 +++++++++++++++----------------------- 1 file changed, 15 insertions(+), 23 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index ad5f8e389f7..595bfa659af 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -33,6 +33,8 @@ static BOOL force_termination = FALSE; static WCHAR **task_list; static unsigned int task_count; +static DWORD *pid_list, pid_list_size; + struct pid_close_info { DWORD pid; @@ -123,20 +125,20 @@ static BOOL CALLBACK pid_enum_proc(HWND hwnd, LPARAM lParam) return TRUE; } -static DWORD *enumerate_processes(DWORD *list_count) +static BOOL enumerate_processes(void) { - DWORD *pid_list, alloc_bytes = 1024 * sizeof(*pid_list), needed_bytes; + DWORD alloc_bytes = 1024 * sizeof(*pid_list), needed_bytes; pid_list = malloc(alloc_bytes); if (!pid_list) - return NULL; + return FALSE; for (;;) { DWORD *realloc_list; if (!EnumProcesses(pid_list, alloc_bytes, &needed_bytes)) - return NULL; + return FALSE; /* EnumProcesses can't signal an insufficient buffer condition, so the * only way to possibly determine whether a larger buffer is required @@ -149,12 +151,12 @@ static DWORD *enumerate_processes(DWORD *list_count) alloc_bytes *= 2; realloc_list = realloc(pid_list, alloc_bytes); if (!realloc_list) - return NULL; + return FALSE; pid_list = realloc_list; } - *list_count = needed_bytes / sizeof(*pid_list); - return pid_list; + pid_list_size = needed_bytes / sizeof(*pid_list); + return TRUE; } static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) @@ -199,18 +201,10 @@ static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) * system processes. */ static int send_close_messages(void) { - DWORD *pid_list, pid_list_size; DWORD self_pid = GetCurrentProcessId(); unsigned int i; int status_code = 0; - pid_list = enumerate_processes(&pid_list_size); - if (!pid_list) - { - taskkill_message(STRING_ENUM_FAILED); - return 1; - } - for (i = 0; i < task_count; i++) { WCHAR *p = task_list[i]; @@ -287,18 +281,10 @@ static int send_close_messages(void) static int terminate_processes(void) { - DWORD *pid_list, pid_list_size; DWORD self_pid = GetCurrentProcessId(); unsigned int i; int status_code = 0; - pid_list = enumerate_processes(&pid_list_size); - if (!pid_list) - { - taskkill_message(STRING_ENUM_FAILED); - return 1; - } - for (i = 0; i < task_count; i++) { WCHAR *p = task_list[i]; @@ -510,6 +496,12 @@ int __cdecl wmain(int argc, WCHAR *argv[]) if (!process_arguments(argc, argv)) return 1; + if (!enumerate_processes()) + { + taskkill_message(STRING_ENUM_FAILED); + return 1; + } + if (force_termination) return terminate_processes(); return send_close_messages();

1 0

Paul Gofman : taskkill: Factor out get_task_pid().
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 62ef3c5be1d2c5374399984588a9daa75663d030 URL: https://gitlab.winehq.org/wine/wine/-/commit/62ef3c5be1d2c5374399984588a9da… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 28 13:21:13 2023 -0600 taskkill: Factor out get_task_pid(). --- programs/taskkill/taskkill.c | 234 +++++++++++++++---------------------------- 1 file changed, 82 insertions(+), 152 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 595bfa659af..d2e1dd54209 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -185,6 +185,55 @@ static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) return TRUE; } +static BOOL get_task_pid(const WCHAR *str, BOOL *is_numeric, WCHAR *process_name, int *status_code, DWORD *pid) +{ + DWORD self_pid = GetCurrentProcessId(); + const WCHAR *p = str; + unsigned int i; + + *is_numeric = TRUE; + while (*p) + { + if (!iswdigit(*p++)) + { + *is_numeric = FALSE; + break; + } + } + + if (*is_numeric) + { + *pid = wcstol(str, NULL, 10); + if (*pid == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + *status_code = 1; + return FALSE; + } + return TRUE; + } + + for (i = 0; i < pid_list_size; ++i) + { + if (get_process_name_from_pid(pid_list[i], process_name, MAX_PATH) && + !wcsicmp(process_name, str)) + { + if (pid_list[i] == self_pid) + { + taskkill_message(STRING_SELF_TERMINATION); + *status_code = 1; + return FALSE; + } + *pid = pid_list[i]; + return TRUE; + } + } + + taskkill_message_printfW(STRING_SEARCH_FAILED, str); + *status_code = 128; + return FALSE; +} + /* The implemented task enumeration and termination behavior does not * exactly match native behavior. On Windows: * @@ -201,79 +250,29 @@ static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) * system processes. */ static int send_close_messages(void) { - DWORD self_pid = GetCurrentProcessId(); + WCHAR process_name[MAX_PATH]; + struct pid_close_info info; unsigned int i; int status_code = 0; + BOOL is_numeric; for (i = 0; i < task_count; i++) { - WCHAR *p = task_list[i]; - BOOL is_numeric = TRUE; - - /* Determine whether the string is not numeric. */ - while (*p) - { - if (!iswdigit(*p++)) - { - is_numeric = FALSE; - break; - } - } + if (!get_task_pid(task_list[i], &is_numeric, process_name, &status_code, &info.pid)) + continue; - if (is_numeric) + info.found = FALSE; + EnumWindows(pid_enum_proc, (LPARAM)&info); + if (info.found) { - DWORD pid = wcstol(task_list[i], NULL, 10); - struct pid_close_info info = { pid }; - - if (pid == self_pid) - { - taskkill_message(STRING_SELF_TERMINATION); - status_code = 1; - continue; - } - - EnumWindows(pid_enum_proc, (LPARAM)&info); - if (info.found) - taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, pid); + if (is_numeric) + taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, info.pid); else - { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); - status_code = 128; - } - } - else - { - DWORD index; - BOOL found_process = FALSE; - - for (index = 0; index < pid_list_size; index++) - { - WCHAR process_name[MAX_PATH]; - - if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && - !wcsicmp(process_name, task_list[i])) - { - struct pid_close_info info = { pid_list[index] }; - - found_process = TRUE; - if (pid_list[index] == self_pid) - { - taskkill_message(STRING_SELF_TERMINATION); - status_code = 1; - continue; - } - - EnumWindows(pid_enum_proc, (LPARAM)&info); - taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, pid_list[index]); - } - } - - if (!found_process) - { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); - status_code = 128; - } + taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, info.pid); + continue; } + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; } return status_code; @@ -281,107 +280,38 @@ static int send_close_messages(void) static int terminate_processes(void) { - DWORD self_pid = GetCurrentProcessId(); + WCHAR process_name[MAX_PATH]; unsigned int i; int status_code = 0; + BOOL is_numeric; + HANDLE process; + DWORD pid; for (i = 0; i < task_count; i++) { - WCHAR *p = task_list[i]; - BOOL is_numeric = TRUE; + if (!get_task_pid(task_list[i], &is_numeric, process_name, &status_code, &pid)) + continue; - /* Determine whether the string is not numeric. */ - while (*p) + process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); + if (!process) { - if (!iswdigit(*p++)) - { - is_numeric = FALSE; - break; - } + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + continue; } - - if (is_numeric) + if (!TerminateProcess(process, 1)) { - DWORD pid = wcstol(task_list[i], NULL, 10); - HANDLE process; - - if (pid == self_pid) - { - taskkill_message(STRING_SELF_TERMINATION); - status_code = 1; - continue; - } - - process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); - if (!process) - { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); - status_code = 128; - continue; - } - - if (!TerminateProcess(process, 1)) - { - taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); - status_code = 1; - CloseHandle(process); - continue; - } - - taskkill_message_printfW(STRING_TERM_PID_SEARCH, pid); + taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); + status_code = 1; CloseHandle(process); + continue; } + if (is_numeric) + taskkill_message_printfW(STRING_TERM_PID_SEARCH, pid); else - { - DWORD index; - BOOL found_process = FALSE; - - for (index = 0; index < pid_list_size; index++) - { - WCHAR process_name[MAX_PATH]; - - if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && - !wcsicmp(process_name, task_list[i])) - { - HANDLE process; - - if (pid_list[index] == self_pid) - { - taskkill_message(STRING_SELF_TERMINATION); - status_code = 1; - continue; - } - - process = OpenProcess(PROCESS_TERMINATE, FALSE, pid_list[index]); - if (!process) - { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); - status_code = 128; - continue; - } - - if (!TerminateProcess(process, 1)) - { - taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); - status_code = 1; - CloseHandle(process); - continue; - } - - found_process = TRUE; - taskkill_message_printfW(STRING_TERM_PROC_SEARCH, task_list[i], pid_list[index]); - CloseHandle(process); - } - } - - if (!found_process) - { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); - status_code = 128; - } - } + taskkill_message_printfW(STRING_TERM_PROC_SEARCH, task_list[i], pid); + CloseHandle(process); } - return status_code; }

1 0

Paul Gofman : taskkill: Use toolhelp snapshot to get process information.
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 6cca1f5099a8354b67578b42dd34fd010e80b6de URL: https://gitlab.winehq.org/wine/wine/-/commit/6cca1f5099a8354b67578b42dd34fd… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 28 14:32:31 2023 -0600 taskkill: Use toolhelp snapshot to get process information. --- programs/taskkill/taskkill.c | 99 ++++++++++++++++++++------------------------ 1 file changed, 45 insertions(+), 54 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index d2e1dd54209..b60b5486f87 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -21,7 +21,7 @@ #include <stdlib.h> #include <windows.h> -#include <psapi.h> +#include <tlhelp32.h> #include <wine/debug.h> #include "taskkill.h" @@ -33,7 +33,13 @@ static BOOL force_termination = FALSE; static WCHAR **task_list; static unsigned int task_count; -static DWORD *pid_list, pid_list_size; +static struct +{ + PROCESSENTRY32W p; + BOOL matched; +} +*process_list; +static unsigned int process_count; struct pid_close_info { @@ -127,61 +133,36 @@ static BOOL CALLBACK pid_enum_proc(HWND hwnd, LPARAM lParam) static BOOL enumerate_processes(void) { - DWORD alloc_bytes = 1024 * sizeof(*pid_list), needed_bytes; + unsigned int alloc_count = 128; + void *realloc_list; + HANDLE snapshot; - pid_list = malloc(alloc_bytes); - if (!pid_list) + snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0); + if (snapshot == INVALID_HANDLE_VALUE) return FALSE; - for (;;) - { - DWORD *realloc_list; - - if (!EnumProcesses(pid_list, alloc_bytes, &needed_bytes)) - return FALSE; - - /* EnumProcesses can't signal an insufficient buffer condition, so the - * only way to possibly determine whether a larger buffer is required - * is to see whether the written number of bytes is the same as the - * buffer size. If so, the buffer will be reallocated to twice the - * size. */ - if (alloc_bytes != needed_bytes) - break; - - alloc_bytes *= 2; - realloc_list = realloc(pid_list, alloc_bytes); - if (!realloc_list) - return FALSE; - pid_list = realloc_list; - } - - pid_list_size = needed_bytes / sizeof(*pid_list); - return TRUE; -} - -static BOOL get_process_name_from_pid(DWORD pid, WCHAR *buf, DWORD chars) -{ - HANDLE process; - HMODULE module; - DWORD required_size; - - process = OpenProcess(PROCESS_QUERY_INFORMATION | PROCESS_VM_READ, FALSE, pid); - if (!process) + process_list = malloc(alloc_count * sizeof(*process_list)); + if (!process_list) return FALSE; - if (!EnumProcessModules(process, &module, sizeof(module), &required_size)) - { - CloseHandle(process); + process_list[0].p.dwSize = sizeof(process_list[0].p); + if (!Process32FirstW(snapshot, &process_list[0].p)) return FALSE; - } - if (!GetModuleBaseNameW(process, module, buf, chars)) + do { - CloseHandle(process); - return FALSE; - } - - CloseHandle(process); + process_list[process_count++].matched = FALSE; + if (process_count == alloc_count) + { + alloc_count *= 2; + realloc_list = realloc(process_list, alloc_count * sizeof(*process_list)); + if (!realloc_list) + return FALSE; + process_list = realloc_list; + } + process_list[process_count].p.dwSize = sizeof(process_list[process_count].p); + } while (Process32NextW(snapshot, &process_list[process_count].p)); + CloseHandle(snapshot); return TRUE; } @@ -204,6 +185,14 @@ static BOOL get_task_pid(const WCHAR *str, BOOL *is_numeric, WCHAR *process_name if (*is_numeric) { *pid = wcstol(str, NULL, 10); + for (i = 0; i < process_count; ++i) + { + if (process_list[i].p.th32ProcessID == *pid) + break; + } + if (i == process_count || process_list[i].matched) + goto not_found; + process_list[i].matched = TRUE; if (*pid == self_pid) { taskkill_message(STRING_SELF_TERMINATION); @@ -213,22 +202,24 @@ static BOOL get_task_pid(const WCHAR *str, BOOL *is_numeric, WCHAR *process_name return TRUE; } - for (i = 0; i < pid_list_size; ++i) + for (i = 0; i < process_count; ++i) { - if (get_process_name_from_pid(pid_list[i], process_name, MAX_PATH) && - !wcsicmp(process_name, str)) + if (!wcsicmp(process_list[i].p.szExeFile, str) && !process_list[i].matched) { - if (pid_list[i] == self_pid) + process_list[i].matched = TRUE; + if (process_list[i].p.th32ProcessID == self_pid) { taskkill_message(STRING_SELF_TERMINATION); *status_code = 1; return FALSE; } - *pid = pid_list[i]; + *pid = process_list[i].p.th32ProcessID; + wcscpy(process_name, process_list[i].p.szExeFile); return TRUE; } } +not_found: taskkill_message_printfW(STRING_SEARCH_FAILED, str); *status_code = 128; return FALSE;

1 0

Paul Gofman : taskkill: Mark processes for termination in main().
by Alexandre Julliard 29 Mar '23

29 Mar '23

Module: wine Branch: master Commit: 5c851451892e05c1747108432a5a2bff3a78ed9e URL: https://gitlab.winehq.org/wine/wine/-/commit/5c851451892e05c1747108432a5a2b… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Mar 28 15:14:17 2023 -0600 taskkill: Mark processes for termination in main(). --- programs/taskkill/taskkill.c | 82 ++++++++++++++++++++++++++++---------------- 1 file changed, 52 insertions(+), 30 deletions(-) diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index b60b5486f87..c32c380f001 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -37,6 +37,7 @@ static struct { PROCESSENTRY32W p; BOOL matched; + BOOL is_numeric; } *process_list; static unsigned int process_count; @@ -151,6 +152,7 @@ static BOOL enumerate_processes(void) do { + process_list[process_count].is_numeric = FALSE; process_list[process_count++].matched = FALSE; if (process_count == alloc_count) { @@ -166,40 +168,42 @@ static BOOL enumerate_processes(void) return TRUE; } -static BOOL get_task_pid(const WCHAR *str, BOOL *is_numeric, WCHAR *process_name, int *status_code, DWORD *pid) +static void mark_task_process(const WCHAR *str, int *status_code) { DWORD self_pid = GetCurrentProcessId(); const WCHAR *p = str; + BOOL is_numeric; unsigned int i; + DWORD pid; - *is_numeric = TRUE; + is_numeric = TRUE; while (*p) { if (!iswdigit(*p++)) { - *is_numeric = FALSE; + is_numeric = FALSE; break; } } - if (*is_numeric) + if (is_numeric) { - *pid = wcstol(str, NULL, 10); + pid = wcstol(str, NULL, 10); for (i = 0; i < process_count; ++i) { - if (process_list[i].p.th32ProcessID == *pid) + if (process_list[i].p.th32ProcessID == pid) break; } if (i == process_count || process_list[i].matched) goto not_found; process_list[i].matched = TRUE; - if (*pid == self_pid) + process_list[i].is_numeric = TRUE; + if (pid == self_pid) { taskkill_message(STRING_SELF_TERMINATION); *status_code = 1; - return FALSE; } - return TRUE; + return; } for (i = 0; i < process_count; ++i) @@ -211,18 +215,27 @@ static BOOL get_task_pid(const WCHAR *str, BOOL *is_numeric, WCHAR *process_name { taskkill_message(STRING_SELF_TERMINATION); *status_code = 1; - return FALSE; } - *pid = process_list[i].p.th32ProcessID; - wcscpy(process_name, process_list[i].p.szExeFile); - return TRUE; + return; } } not_found: taskkill_message_printfW(STRING_SEARCH_FAILED, str); *status_code = 128; - return FALSE; +} + +static void taskkill_message_print_process(int msg, unsigned int index) +{ + WCHAR pid_str[16]; + + if (!process_list[index].is_numeric) + { + taskkill_message_printfW(msg, process_list[index].p.szExeFile); + return; + } + wsprintfW(pid_str, L"%lu", process_list[index].p.th32ProcessID); + taskkill_message_printfW(msg, pid_str); } /* The implemented task enumeration and termination behavior does not @@ -241,28 +254,28 @@ not_found: * system processes. */ static int send_close_messages(void) { - WCHAR process_name[MAX_PATH]; + const WCHAR *process_name; struct pid_close_info info; unsigned int i; int status_code = 0; - BOOL is_numeric; for (i = 0; i < task_count; i++) { - if (!get_task_pid(task_list[i], &is_numeric, process_name, &status_code, &info.pid)) + if (!process_list[i].matched) continue; - + info.pid = process_list[i].p.th32ProcessID; + process_name = process_list[i].p.szExeFile; info.found = FALSE; EnumWindows(pid_enum_proc, (LPARAM)&info); if (info.found) { - if (is_numeric) + if (process_list[i].is_numeric) taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, info.pid); else taskkill_message_printfW(STRING_CLOSE_PROC_SRCH, process_name, info.pid); continue; } - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + taskkill_message_print_process(STRING_SEARCH_FAILED, i); status_code = 128; } @@ -271,36 +284,37 @@ static int send_close_messages(void) static int terminate_processes(void) { - WCHAR process_name[MAX_PATH]; + const WCHAR *process_name; unsigned int i; int status_code = 0; - BOOL is_numeric; HANDLE process; DWORD pid; - for (i = 0; i < task_count; i++) + for (i = 0; i < process_count; i++) { - if (!get_task_pid(task_list[i], &is_numeric, process_name, &status_code, &pid)) + if (!process_list[i].matched) continue; + pid = process_list[i].p.th32ProcessID; + process_name = process_list[i].p.szExeFile; process = OpenProcess(PROCESS_TERMINATE, FALSE, pid); if (!process) { - taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + taskkill_message_print_process(STRING_SEARCH_FAILED, i); status_code = 128; continue; } if (!TerminateProcess(process, 1)) { - taskkill_message_printfW(STRING_TERMINATE_FAILED, task_list[i]); + taskkill_message_print_process(STRING_TERMINATE_FAILED, i); status_code = 1; CloseHandle(process); continue; } - if (is_numeric) + if (process_list[i].is_numeric) taskkill_message_printfW(STRING_TERM_PID_SEARCH, pid); else - taskkill_message_printfW(STRING_TERM_PROC_SEARCH, task_list[i], pid); + taskkill_message_printfW(STRING_TERM_PROC_SEARCH, process_name, pid); CloseHandle(process); } return status_code; @@ -414,6 +428,9 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) int __cdecl wmain(int argc, WCHAR *argv[]) { + int search_status = 0, terminate_status; + unsigned int i; + if (!process_arguments(argc, argv)) return 1; @@ -423,7 +440,12 @@ int __cdecl wmain(int argc, WCHAR *argv[]) return 1; } + for (i = 0; i < task_count; ++i) + mark_task_process(task_list[i], &search_status); + if (force_termination) - return terminate_processes(); - return send_close_messages(); + terminate_status = terminate_processes(); + else + terminate_status = send_close_messages(); + return search_status ? search_status : terminate_status; }

1 0