ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

taskkill: Build with msvcrt. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2019-05-01 10:40:25 +02:00
parent d0d51f98d8
commit fb80c1b554
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
programs/taskkill/Makefile.in
View File

@ -1,7 +1,8 @@
MODULE = taskkill.exe MODULE = taskkill.exe
APPMODE = -mconsole -municode
IMPORTS = user32 IMPORTS = user32
EXTRADLLFLAGS = -mconsole -municode -mno-cygwin
C_SRCS = taskkill.c C_SRCS = taskkill.c
RC_SRCS = taskkill.rc RC_SRCS = taskkill.rc

23
programs/taskkill/taskkill.c
View File

@ -23,7 +23,6 @@
#include <windows.h> #include <windows.h>
#include <psapi.h> #include <psapi.h>
#include <wine/debug.h> #include <wine/debug.h>
#include <wine/unicode.h>
#include "taskkill.h" #include "taskkill.h"
@ -230,7 +229,7 @@ static int send_close_messages(void)
/* Determine whether the string is not numeric. */ /* Determine whether the string is not numeric. */
while (*p) while (*p)
{ {
if (!isdigitW(*p++)) if (!iswdigit(*p++))
{ {
is_numeric = FALSE; is_numeric = FALSE;
break; break;
@ -239,7 +238,7 @@ static int send_close_messages(void)
if (is_numeric) if (is_numeric)
{ {
DWORD pid = atoiW(task_list[i]); DWORD pid = wcstol(task_list[i], NULL, 10);
struct pid_close_info info = { pid }; struct pid_close_info info = { pid };
if (pid == self_pid) if (pid == self_pid)
@ -268,7 +267,7 @@ static int send_close_messages(void)
WCHAR process_name[MAX_PATH]; WCHAR process_name[MAX_PATH];
if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) &&
!strcmpiW(process_name, task_list[i])) !wcsicmp(process_name, task_list[i]))
{ {
struct pid_close_info info = { pid_list[index] }; struct pid_close_info info = { pid_list[index] };
@ -319,7 +318,7 @@ static int terminate_processes(void)
/* Determine whether the string is not numeric. */ /* Determine whether the string is not numeric. */
while (*p) while (*p)
{ {
if (!isdigitW(*p++)) if (!iswdigit(*p++))
{ {
is_numeric = FALSE; is_numeric = FALSE;
break; break;
@ -328,7 +327,7 @@ static int terminate_processes(void)
if (is_numeric) if (is_numeric)
{ {
DWORD pid = atoiW(task_list[i]); DWORD pid = wcstol(task_list[i], NULL, 10);
HANDLE process; HANDLE process;
if (pid == self_pid) if (pid == self_pid)
@ -367,7 +366,7 @@ static int terminate_processes(void)
WCHAR process_name[MAX_PATH]; WCHAR process_name[MAX_PATH];
if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) && if (get_process_name_from_pid(pid_list[index], process_name, MAX_PATH) &&
!strcmpiW(process_name, task_list[i])) !wcsicmp(process_name, task_list[i]))
{ {
HANDLE process; HANDLE process;
@ -461,7 +460,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[])
if (argc == 2) if (argc == 2)
{ {
argdata = argv[1]; argdata = argv[1];
if ((*argdata == '/' || *argdata == '-') && !strcmpW(opHelp, argdata + 1)) if ((*argdata == '/' || *argdata == '-') && !lstrcmpW(opHelp, argdata + 1))
{ {
taskkill_message(STRING_USAGE); taskkill_message(STRING_USAGE);
exit(0); exit(0);
@ -477,14 +476,14 @@ static BOOL process_arguments(int argc, WCHAR *argv[])
goto invalid; goto invalid;
argdata++; argdata++;
if (!strcmpiW(opTerminateChildren, argdata)) if (!wcsicmp(opTerminateChildren, argdata))
WINE_FIXME("argument T not supported\n"); WINE_FIXME("argument T not supported\n");
if (!strcmpiW(opForceTerminate, argdata)) if (!wcsicmp(opForceTerminate, argdata))
force_termination = TRUE; force_termination = TRUE;
/* Options /IM and /PID appear to behave identically, except for /* Options /IM and /PID appear to behave identically, except for
* the fact that they cannot be specified at the same time. */ * the fact that they cannot be specified at the same time. */
else if ((got_im = !strcmpiW(opImage, argdata)) || else if ((got_im = !wcsicmp(opImage, argdata)) ||
(got_pid = !strcmpiW(opPID, argdata))) (got_pid = !wcsicmp(opPID, argdata)))
{ {
if (!argv[i + 1]) if (!argv[i + 1])
{ {