Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lorenzo Ferrillo
wine
Commits
fb80c1b5
Commit
fb80c1b5
authored
5 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
taskkill: Build with msvcrt.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d0d51f98
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
programs/taskkill/Makefile.in
+2
-1
2 additions, 1 deletion
programs/taskkill/Makefile.in
programs/taskkill/taskkill.c
+11
-12
11 additions, 12 deletions
programs/taskkill/taskkill.c
with
13 additions
and
13 deletions
programs/taskkill/Makefile.in
+
2
−
1
View file @
fb80c1b5
MODULE
=
taskkill.exe
APPMODE
=
-mconsole
-municode
IMPORTS
=
user32
EXTRADLLFLAGS
=
-mconsole
-municode
-mno-cygwin
C_SRCS
=
taskkill.c
RC_SRCS
=
taskkill.rc
This diff is collapsed.
Click to expand it.
programs/taskkill/taskkill.c
+
11
−
12
View file @
fb80c1b5
...
...
@@ -23,7 +23,6 @@
#include
<windows.h>
#include
<psapi.h>
#include
<wine/debug.h>
#include
<wine/unicode.h>
#include
"taskkill.h"
...
...
@@ -230,7 +229,7 @@ static int send_close_messages(void)
/* Determine whether the string is not numeric. */
while
(
*
p
)
{
if
(
!
isdigit
W
(
*
p
++
))
if
(
!
is
w
digit
(
*
p
++
))
{
is_numeric
=
FALSE
;
break
;
...
...
@@ -239,7 +238,7 @@ static int send_close_messages(void)
if
(
is_numeric
)
{
DWORD
pid
=
atoiW
(
task_list
[
i
]);
DWORD
pid
=
wcstol
(
task_list
[
i
]
,
NULL
,
10
);
struct
pid_close_info
info
=
{
pid
};
if
(
pid
==
self_pid
)
...
...
@@ -268,7 +267,7 @@ static int send_close_messages(void)
WCHAR
process_name
[
MAX_PATH
];
if
(
get_process_name_from_pid
(
pid_list
[
index
],
process_name
,
MAX_PATH
)
&&
!
str
cmp
iW
(
process_name
,
task_list
[
i
]))
!
wcsi
cmp
(
process_name
,
task_list
[
i
]))
{
struct
pid_close_info
info
=
{
pid_list
[
index
]
};
...
...
@@ -319,7 +318,7 @@ static int terminate_processes(void)
/* Determine whether the string is not numeric. */
while
(
*
p
)
{
if
(
!
isdigit
W
(
*
p
++
))
if
(
!
is
w
digit
(
*
p
++
))
{
is_numeric
=
FALSE
;
break
;
...
...
@@ -328,7 +327,7 @@ static int terminate_processes(void)
if
(
is_numeric
)
{
DWORD
pid
=
atoiW
(
task_list
[
i
]);
DWORD
pid
=
wcstol
(
task_list
[
i
]
,
NULL
,
10
);
HANDLE
process
;
if
(
pid
==
self_pid
)
...
...
@@ -367,7 +366,7 @@ static int terminate_processes(void)
WCHAR
process_name
[
MAX_PATH
];
if
(
get_process_name_from_pid
(
pid_list
[
index
],
process_name
,
MAX_PATH
)
&&
!
str
cmp
iW
(
process_name
,
task_list
[
i
]))
!
wcsi
cmp
(
process_name
,
task_list
[
i
]))
{
HANDLE
process
;
...
...
@@ -461,7 +460,7 @@ static BOOL process_arguments(int argc, WCHAR *argv[])
if
(
argc
==
2
)
{
argdata
=
argv
[
1
];
if
((
*
argdata
==
'/'
||
*
argdata
==
'-'
)
&&
!
strcmpW
(
opHelp
,
argdata
+
1
))
if
((
*
argdata
==
'/'
||
*
argdata
==
'-'
)
&&
!
l
strcmpW
(
opHelp
,
argdata
+
1
))
{
taskkill_message
(
STRING_USAGE
);
exit
(
0
);
...
...
@@ -477,14 +476,14 @@ static BOOL process_arguments(int argc, WCHAR *argv[])
goto
invalid
;
argdata
++
;
if
(
!
str
cmp
iW
(
opTerminateChildren
,
argdata
))
if
(
!
wcsi
cmp
(
opTerminateChildren
,
argdata
))
WINE_FIXME
(
"argument T not supported
\n
"
);
if
(
!
str
cmp
iW
(
opForceTerminate
,
argdata
))
if
(
!
wcsi
cmp
(
opForceTerminate
,
argdata
))
force_termination
=
TRUE
;
/* Options /IM and /PID appear to behave identically, except for
* the fact that they cannot be specified at the same time. */
else
if
((
got_im
=
!
str
cmp
iW
(
opImage
,
argdata
))
||
(
got_pid
=
!
str
cmp
iW
(
opPID
,
argdata
)))
else
if
((
got_im
=
!
wcsi
cmp
(
opImage
,
argdata
))
||
(
got_pid
=
!
wcsi
cmp
(
opPID
,
argdata
)))
{
if
(
!
argv
[
i
+
1
])
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment