September 2010 - Wine-commits

Igor Paliychuk : shell32: Ukrainian translation update.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 2b94a71d23123016a02bdfed0a197cf8790f943f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b94a71d23123016a02bdfed0… Author: Igor Paliychuk <Igor-hkr(a)mail.ru> Date: Tue Sep 21 16:21:49 2010 +0300 shell32: Ukrainian translation update. --- dlls/shell32/shell32_Uk.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/shell32/shell32_Uk.rc b/dlls/shell32/shell32_Uk.rc index b79e746..e7bc179 100644 --- a/dlls/shell32/shell32_Uk.rc +++ b/dlls/shell32/shell32_Uk.rc @@ -303,6 +303,7 @@ STRINGTABLE IDS_COMMON_OEM_LINKS "OEM ��" IDS_DOCUMENTS "��" IDS_DOWNLOADS "��" + IDS_LOCAL_APPDATA_LOW "AppData\\LocalLow" IDS_NEWFOLDER "�� "

1 0

Misha Koshelev : d3dx9_36: Implement D3DXCreateMesh and initial ID3DXMesh methods.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: af0c074d7bbf3cf27cf8dffe1e9007ff3c23d256 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af0c074d7bbf3cf27cf8dffe1… Author: Misha Koshelev <misha680(a)gmail.com> Date: Thu Sep 16 17:02:48 2010 -0500 d3dx9_36: Implement D3DXCreateMesh and initial ID3DXMesh methods. --- dlls/d3dx9_36/d3dx9_36_private.h | 18 ++ dlls/d3dx9_36/mesh.c | 433 +++++++++++++++++++++++++++++++++++++- dlls/d3dx9_36/tests/mesh.c | 151 +++++++++++--- 3 files changed, 567 insertions(+), 35 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af0c074d7bbf3cf27cf8d…

1 0

Andrew Nguyen : taskkill: Implement forcible termination by process name.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: a7431fe90fa82ab3313b582aeb2c6af7cbf9de36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7431fe90fa82ab3313b582ae… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 21 02:21:23 2010 -0500 taskkill: Implement forcible termination by process name. --- programs/taskkill/En.rc | 1 + programs/taskkill/taskkill.c | 51 +++++++++++++++++++++++++++++++++++++++++- programs/taskkill/taskkill.h | 7 +++-- 3 files changed, 55 insertions(+), 4 deletions(-) diff --git a/programs/taskkill/En.rc b/programs/taskkill/En.rc index 724f907..f7fcfd6 100644 --- a/programs/taskkill/En.rc +++ b/programs/taskkill/En.rc @@ -34,6 +34,7 @@ STRINGTABLE STRING_CLOSE_PID_SEARCH, "Close message sent to top-level windows of process with PID %u.\n" STRING_CLOSE_PROC_SRCH, "Close message sent to top-level windows of process \"%s\" with PID %u.\n" STRING_TERM_PID_SEARCH, "Process with PID %u was forcibly terminated.\n" + STRING_TERM_PROC_SEARCH, "Process \"%s\" with PID %u was forcibly terminated.\n" STRING_SEARCH_FAILED, "Error: Could not find process \"%s\".\n" STRING_ENUM_FAILED, "Error: Unable to enumerate the process list.\n" STRING_TERMINATE_FAILED, "Error: Unable to terminate process \"%s\".\n" diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index d864e60..c3080e5 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -280,9 +280,17 @@ static int send_close_messages(void) static int terminate_processes(void) { + DWORD *pid_list, pid_list_size; 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]; @@ -323,9 +331,50 @@ static int terminate_processes(void) CloseHandle(process); } else - WINE_FIXME("Forcible process termination by name is not implemented\n"); + { + 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) && + !strcmpiW(process_name, task_list[i])) + { + HANDLE process; + + 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, 0)) + { + 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; + } + } } + HeapFree(GetProcessHeap(), 0, pid_list); return status_code; } diff --git a/programs/taskkill/taskkill.h b/programs/taskkill/taskkill.h index a70cab0..e535a01 100644 --- a/programs/taskkill/taskkill.h +++ b/programs/taskkill/taskkill.h @@ -30,6 +30,7 @@ #define STRING_CLOSE_PID_SEARCH 107 #define STRING_CLOSE_PROC_SRCH 108 #define STRING_TERM_PID_SEARCH 109 -#define STRING_SEARCH_FAILED 110 -#define STRING_ENUM_FAILED 111 -#define STRING_TERMINATE_FAILED 112 +#define STRING_TERM_PROC_SEARCH 110 +#define STRING_SEARCH_FAILED 111 +#define STRING_ENUM_FAILED 112 +#define STRING_TERMINATE_FAILED 113

1 0

Alexandre Julliard : wined3d: Reduce the size of a huge function that takes ages to compile.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 97c4ab23ab25d8c943dc1ece4f5637a8a99d4be7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97c4ab23ab25d8c943dc1ece4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 21 15:47:22 2010 +0200 wined3d: Reduce the size of a huge function that takes ages to compile. --- dlls/wined3d/directx.c | 31 ++++++++++++++++++------------- 1 files changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index ff41438..e8bbe77 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2188,6 +2188,23 @@ static const struct blit_shader *select_blit_implementation(struct wined3d_adapt else return &ffp_blit; } +static void load_gl_funcs(struct wined3d_gl_info *gl_info, DWORD gl_version) +{ + DWORD ver; + +#define USE_GL_FUNC(type, pfn, ext, replace) \ + if (gl_info->supported[ext]) gl_info->pfn = (type)pwglGetProcAddress(#pfn); \ + else if ((ver = ver_for_ext(ext)) && ver <= gl_version) gl_info->pfn = (type)pwglGetProcAddress(#replace); \ + else gl_info->pfn = NULL; + + GL_EXT_FUNCS_GEN; +#undef USE_GL_FUNC + +#define USE_GL_FUNC(type, pfn, ext, replace) gl_info->pfn = (type)pwglGetProcAddress(#pfn); + WGL_EXT_FUNCS_GEN; +#undef USE_GL_FUNC +} + /* Context activation is done by the caller. */ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) { @@ -2322,19 +2339,7 @@ static BOOL IWineD3DImpl_FillGLCaps(struct wined3d_adapter *adapter) } /* Now work out what GL support this card really has */ -#define USE_GL_FUNC(type, pfn, ext, replace) \ -{ \ - DWORD ver = ver_for_ext(ext); \ - if (gl_info->supported[ext]) gl_info->pfn = (type)pwglGetProcAddress(#pfn); \ - else if (ver && ver <= gl_version) gl_info->pfn = (type)pwglGetProcAddress(#replace); \ - else gl_info->pfn = NULL; \ -} - GL_EXT_FUNCS_GEN; -#undef USE_GL_FUNC - -#define USE_GL_FUNC(type, pfn, ext, replace) gl_info->pfn = (type)pwglGetProcAddress(#pfn); - WGL_EXT_FUNCS_GEN; -#undef USE_GL_FUNC + load_gl_funcs( gl_info, gl_version ); ENTER_GL();

1 0

Paul Vriens : ddraw: Pass the correct size to memset (Coccinelle).
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: c0ff1aec0362a15bc44160e44d45051662c67b68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0ff1aec0362a15bc44160e44… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Sep 21 14:37:38 2010 +0200 ddraw: Pass the correct size to memset (Coccinelle). --- dlls/ddraw/ddraw.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 7552144..f3ebade 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5090,7 +5090,7 @@ HRESULT IDirect3DImpl_GetCaps(IWineD3D *wined3d, D3DDEVICEDESC *desc1, D3DDEVICE desc7->dwReserved4 = 0; /* Fill the old structure */ - memset(desc1, 0, sizeof(desc1)); + memset(desc1, 0, sizeof(*desc1)); desc1->dwSize = sizeof(D3DDEVICEDESC); desc1->dwFlags = D3DDD_COLORMODEL | D3DDD_DEVCAPS

1 0

Alexandre Julliard : wineps: Add a comment about the trap for code checking tools.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 1f3873aae7310cd40e9fcfb0739e281bcbf32806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f3873aae7310cd40e9fcfb07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 21 15:55:33 2010 +0200 wineps: Add a comment about the trap for code checking tools. --- dlls/wineps.drv/init.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 685a56a..f0c4e18 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -271,6 +271,7 @@ static LPDEVMODEA DEVMODEdupWtoA(HANDLE heap, const DEVMODEW *dmW) LPDEVMODEA dmA; DWORD size; BOOL Formname; + /* there is no pointer dereference here, if your code checking tool complains it's broken */ ptrdiff_t off_formname = (const char *)dmW->dmFormName - (const char *)dmW; if(!dmW) return NULL;

1 0

Alexandre Julliard : krnl386.exe: Get rid of the useless config.sys parser.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 18bb9da5bce2fc188a7f2662ebe465900cec2343 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18bb9da5bce2fc188a7f2662e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Sep 21 15:59:45 2010 +0200 krnl386.exe: Get rid of the useless config.sys parser. --- dlls/krnl386.exe16/Makefile.in | 1 - dlls/krnl386.exe16/dosconf.c | 484 ---------------------------------------- dlls/krnl386.exe16/dosexe.h | 22 -- dlls/krnl386.exe16/int21.c | 17 +- 4 files changed, 7 insertions(+), 517 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=18bb9da5bce2fc188a7f2…

1 0

Gerald Pfeifer : widl: Avoid duplicate assignments in resolve_expression.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: 17ee7300f88f4f15c996f2eb12b3dbdf0111f603 URL: http://source.winehq.org/git/wine.git/?a=commit;h=17ee7300f88f4f15c996f2eb1… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Sun Sep 19 12:06:52 2010 +0200 widl: Avoid duplicate assignments in resolve_expression. --- tools/widl/expr.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/tools/widl/expr.c b/tools/widl/expr.c index 8511ce5..e1a5196 100644 --- a/tools/widl/expr.c +++ b/tools/widl/expr.c @@ -513,27 +513,22 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc case EXPR_HEXNUM: case EXPR_NUM: case EXPR_TRUEFALSE: - result.is_variable = FALSE; result.is_temporary = FALSE; result.type = type_new_int(TYPE_BASIC_INT, 0); break; case EXPR_STRLIT: - result.is_variable = FALSE; result.is_temporary = TRUE; result.type = type_new_pointer(RPC_FC_UP, type_new_int(TYPE_BASIC_CHAR, 0), NULL); break; case EXPR_WSTRLIT: - result.is_variable = FALSE; result.is_temporary = TRUE; result.type = type_new_pointer(RPC_FC_UP, type_new_int(TYPE_BASIC_WCHAR, 0), NULL); break; case EXPR_CHARCONST: - result.is_variable = FALSE; result.is_temporary = TRUE; result.type = type_new_int(TYPE_BASIC_CHAR, 0); break; case EXPR_DOUBLE: - result.is_variable = FALSE; result.is_temporary = TRUE; result.type = type_new_basic(TYPE_BASIC_DOUBLE); break; @@ -596,7 +591,6 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc result.type = e->u.tref; break; case EXPR_SIZEOF: - result.is_variable = FALSE; result.is_temporary = FALSE; result.type = type_new_int(TYPE_BASIC_INT, 0); break; @@ -634,7 +628,6 @@ static struct expression_type resolve_expression(const struct expr_loc *expr_loc result_right = resolve_expression(expr_loc, cont_type, e->u.ext); check_scalar_type(expr_loc, cont_type, result_left.type); check_scalar_type(expr_loc, cont_type, result_right.type); - result.is_variable = FALSE; result.is_temporary = FALSE; result.type = type_new_int(TYPE_BASIC_INT, 0); break;

1 0

Andrew Nguyen : taskkill: Implement basic command-line parsing.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: db90b2d004eb18a717cb25424496595c9f5c5502 URL: http://source.winehq.org/git/wine.git/?a=commit;h=db90b2d004eb18a717cb25424… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 21 02:17:26 2010 -0500 taskkill: Implement basic command-line parsing. --- programs/taskkill/En.rc | 34 ++++++++ programs/taskkill/Makefile.in | 4 + programs/taskkill/taskkill.c | 186 ++++++++++++++++++++++++++++++++++++++++- programs/taskkill/taskkill.h | 29 +++++++ 4 files changed, 252 insertions(+), 1 deletions(-) diff --git a/programs/taskkill/En.rc b/programs/taskkill/En.rc new file mode 100644 index 0000000..67b2dac --- /dev/null +++ b/programs/taskkill/En.rc @@ -0,0 +1,34 @@ +/* + * Task termination utility + * English language support + * + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "taskkill.h" + +LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT + +STRINGTABLE +{ + STRING_USAGE, "Usage: taskkill [/?] [/f] [/im ProcessName | /pid ProcessID]\n" + STRING_INVALID_OPTION, "Error: Unknown or invalid command line option specified.\n" + STRING_INVALID_PARAM, "Error: Invalid command line parameter specified.\n" + STRING_MISSING_OPTION, "Error: One of options /im or /pid must be specified.\n" + STRING_MISSING_PARAM, "Error: Option %s expects a command line parameter.\n" + STRING_MUTUAL_EXCLUSIVE, "Error: Options /im and /pid are mutually exclusive.\n" +} diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in index 1f9c335..9dce65a 100644 --- a/programs/taskkill/Makefile.in +++ b/programs/taskkill/Makefile.in @@ -1,7 +1,11 @@ EXTRADEFS = -DWINE_NO_UNICODE_MACROS MODULE = taskkill.exe APPMODE = -mconsole -municode +IMPORTS = user32 C_SRCS = taskkill.c +RC_SRCS = \ + En.rc + @MAKE_PROG_RULES@ diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index f38db0c..0ff6385 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -1,6 +1,7 @@ /* * Task termination utility * + * Copyright 2008 Andrew Riedi * Copyright 2010 Andrew Nguyen * * This library is free software; you can redistribute it and/or @@ -22,10 +23,193 @@ #include <wine/debug.h> #include <wine/unicode.h> +#include "taskkill.h" + WINE_DEFAULT_DEBUG_CHANNEL(taskkill); +int force_termination; + +WCHAR **task_list; +unsigned int task_count; + +static int taskkill_vprintfW(const WCHAR *msg, va_list va_args) +{ + int wlen; + DWORD count, ret; + WCHAR msg_buffer[8192]; + + wlen = vsprintfW(msg_buffer, msg, va_args); + + ret = WriteConsoleW(GetStdHandle(STD_OUTPUT_HANDLE), msg_buffer, wlen, &count, NULL); + if (!ret) + { + DWORD len; + char *msgA; + + len = WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, + NULL, 0, NULL, NULL); + msgA = HeapAlloc(GetProcessHeap(), 0, len); + if (!msgA) + return 0; + + WideCharToMultiByte(GetConsoleOutputCP(), 0, msg_buffer, wlen, msgA, len, + NULL, NULL); + WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), msgA, len, &count, FALSE); + HeapFree(GetProcessHeap(), 0, msgA); + } + + return count; +} + +static int taskkill_printfW(const WCHAR *msg, ...) +{ + va_list va_args; + int len; + + va_start(va_args, msg); + len = taskkill_vprintfW(msg, va_args); + va_end(va_args); + + return len; +} + +static int taskkill_message_printfW(int msg, ...) +{ + va_list va_args; + WCHAR msg_buffer[8192]; + int len; + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, + sizeof(msg_buffer)/sizeof(WCHAR)); + + va_start(va_args, msg); + len = taskkill_vprintfW(msg_buffer, va_args); + va_end(va_args); + + return len; +} + +static int taskkill_message(int msg) +{ + static const WCHAR formatW[] = {'%','s',0}; + WCHAR msg_buffer[8192]; + + LoadStringW(GetModuleHandleW(NULL), msg, msg_buffer, + sizeof(msg_buffer)/sizeof(WCHAR)); + + return taskkill_printfW(formatW, msg_buffer); +} + +static BOOL add_to_task_list(WCHAR *name) +{ + static unsigned int list_size = 16; + + if (!task_list) + { + task_list = HeapAlloc(GetProcessHeap(), 0, + list_size * sizeof(*task_list)); + if (!task_list) + return FALSE; + } + else if (task_count == list_size) + { + void *realloc_list; + + list_size *= 2; + realloc_list = HeapReAlloc(GetProcessHeap(), 0, task_list, + list_size * sizeof(*task_list)); + if (!realloc_list) + return FALSE; + + task_list = realloc_list; + } + + task_list[task_count++] = name; + return TRUE; +} + +/* FIXME Argument processing does not match behavior observed on Windows. + * Stringent argument counting and processing is performed, and unrecognized + * options are detected as parameters when placed after options that accept one. */ +static BOOL process_arguments(int argc, WCHAR *argv[]) +{ + static const WCHAR slashForceTerminate[] = {'/','f',0}; + static const WCHAR slashImage[] = {'/','i','m',0}; + static const WCHAR slashPID[] = {'/','p','i','d',0}; + static const WCHAR slashHelp[] = {'/','?',0}; + + if (argc > 1) + { + int i; + BOOL has_im = 0, has_pid = 0; + + /* Only the lone help option is recognized. */ + if (argc == 2 && !strcmpW(slashHelp, argv[1])) + { + taskkill_message(STRING_USAGE); + exit(0); + } + + for (i = 1; i < argc; i++) + { + int got_im = 0, got_pid = 0; + + if (!strcmpiW(slashForceTerminate, argv[i])) + force_termination = 1; + /* 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 = !strcmpiW(slashImage, argv[i])) || + (got_pid = !strcmpiW(slashPID, argv[i]))) + { + if (!argv[i + 1]) + { + taskkill_message_printfW(STRING_MISSING_PARAM, argv[i]); + taskkill_message(STRING_USAGE); + return FALSE; + } + + if (got_im) has_im = 1; + if (got_pid) has_pid = 1; + + if (has_im && has_pid) + { + taskkill_message(STRING_MUTUAL_EXCLUSIVE); + taskkill_message(STRING_USAGE); + return FALSE; + } + + if (!add_to_task_list(argv[i + 1])) + return FALSE; + i++; + } + else + { + taskkill_message(STRING_INVALID_OPTION); + taskkill_message(STRING_USAGE); + return FALSE; + } + } + } + else + { + taskkill_message(STRING_MISSING_OPTION); + taskkill_message(STRING_USAGE); + return FALSE; + } + + return TRUE; +} + int wmain(int argc, WCHAR *argv[]) { - WINE_FIXME("taskkill.exe is not implemented\n"); + if (!process_arguments(argc, argv)) + { + HeapFree(GetProcessHeap(), 0, task_list); + return 1; + } + + WINE_FIXME("taskkill.exe functionality is not implemented\n"); + + HeapFree(GetProcessHeap(), 0, task_list); return 0; } diff --git a/programs/taskkill/taskkill.h b/programs/taskkill/taskkill.h new file mode 100644 index 0000000..281690b --- /dev/null +++ b/programs/taskkill/taskkill.h @@ -0,0 +1,29 @@ +/* + * Task termination utility private definitions + * + * Copyright 2010 Andrew Nguyen + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <windef.h> + +/* Translation IDs. */ +#define STRING_USAGE 101 +#define STRING_INVALID_OPTION 102 +#define STRING_INVALID_PARAM 103 +#define STRING_MISSING_OPTION 104 +#define STRING_MISSING_PARAM 105 +#define STRING_MUTUAL_EXCLUSIVE 106

1 0

Andrew Nguyen : taskkill: Implement graceful termination by process identifier.
by Alexandre Julliard 21 Sep '10

21 Sep '10

Module: wine Branch: master Commit: df4359b117acd7466ed7d9bed61e3bed713b5c45 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df4359b117acd7466ed7d9bed… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 21 02:18:41 2010 -0500 taskkill: Implement graceful termination by process identifier. --- programs/taskkill/En.rc | 2 + programs/taskkill/taskkill.c | 87 +++++++++++++++++++++++++++++++++++++++++- programs/taskkill/taskkill.h | 2 + 3 files changed, 89 insertions(+), 2 deletions(-) diff --git a/programs/taskkill/En.rc b/programs/taskkill/En.rc index 67b2dac..ccad885 100644 --- a/programs/taskkill/En.rc +++ b/programs/taskkill/En.rc @@ -31,4 +31,6 @@ STRINGTABLE STRING_MISSING_OPTION, "Error: One of options /im or /pid must be specified.\n" STRING_MISSING_PARAM, "Error: Option %s expects a command line parameter.\n" STRING_MUTUAL_EXCLUSIVE, "Error: Options /im and /pid are mutually exclusive.\n" + STRING_CLOSE_PID_SEARCH, "Close message sent to top-level windows of process with PID %u.\n" + STRING_SEARCH_FAILED, "Error: Could not find process \"%s\".\n" } diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c index 0ff6385..4b9fb94 100644 --- a/programs/taskkill/taskkill.c +++ b/programs/taskkill/taskkill.c @@ -32,6 +32,12 @@ int force_termination; WCHAR **task_list; unsigned int task_count; +struct pid_close_info +{ + DWORD pid; + BOOL found; +}; + static int taskkill_vprintfW(const WCHAR *msg, va_list va_args) { int wlen; @@ -100,6 +106,78 @@ static int taskkill_message(int msg) return taskkill_printfW(formatW, msg_buffer); } +/* Post WM_CLOSE to all top-level windows belonging to the process with specified PID. */ +static BOOL CALLBACK pid_enum_proc(HWND hwnd, LPARAM lParam) +{ + struct pid_close_info *info = (struct pid_close_info *)lParam; + DWORD hwnd_pid; + + GetWindowThreadProcessId(hwnd, &hwnd_pid); + + if (hwnd_pid == info->pid) + { + PostMessageW(hwnd, WM_CLOSE, 0, 0); + info->found = TRUE; + } + + return TRUE; +} + +/* The implemented task enumeration and termination behavior does not + * exactly match native behavior. On Windows: + * + * In the case of terminating by process name, specifying a particular + * process name more times than the number of running instances causes + * all instances to be terminated, but termination failure messages to + * be printed as many times as the difference between the specification + * quantity and the number of running instances. + * + * Successful terminations are all listed first in order, with failing + * terminations being listed at the end. + * + * A PID of zero causes taskkill to warn about the inability to terminate + * system processes. */ +static int send_close_messages(void) +{ + unsigned int i; + int status_code = 0; + + 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 (!isdigitW(*p++)) + { + is_numeric = FALSE; + break; + } + } + + if (is_numeric) + { + DWORD pid = atoiW(task_list[i]); + struct pid_close_info info = { pid }; + + EnumWindows(pid_enum_proc, (LPARAM)&info); + if (info.found) + taskkill_message_printfW(STRING_CLOSE_PID_SEARCH, pid); + else + { + taskkill_message_printfW(STRING_SEARCH_FAILED, task_list[i]); + status_code = 128; + } + } + else + WINE_FIXME("Termination by name is not implemented\n"); + } + + return status_code; +} + static BOOL add_to_task_list(WCHAR *name) { static unsigned int list_size = 16; @@ -202,14 +280,19 @@ static BOOL process_arguments(int argc, WCHAR *argv[]) int wmain(int argc, WCHAR *argv[]) { + int status_code = 0; + if (!process_arguments(argc, argv)) { HeapFree(GetProcessHeap(), 0, task_list); return 1; } - WINE_FIXME("taskkill.exe functionality is not implemented\n"); + if (force_termination) + WINE_FIXME("Forced termination is not implemented\n"); + else + status_code = send_close_messages(); HeapFree(GetProcessHeap(), 0, task_list); - return 0; + return status_code; } diff --git a/programs/taskkill/taskkill.h b/programs/taskkill/taskkill.h index 281690b..1cc09af 100644 --- a/programs/taskkill/taskkill.h +++ b/programs/taskkill/taskkill.h @@ -27,3 +27,5 @@ #define STRING_MISSING_OPTION 104 #define STRING_MISSING_PARAM 105 #define STRING_MUTUAL_EXCLUSIVE 106 +#define STRING_CLOSE_PID_SEARCH 107 +#define STRING_SEARCH_FAILED 108

1 0