September 2010 - Wine-Commits

Andrew Nguyen : taskkill: Implement basic command-line parsing.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

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 Sept. 21, 2010

Sept. 21, 2010

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

Andrew Nguyen : taskkill: Add stub implementation.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 8e540ed26fb934999800c8d5e2c2afbeaef920a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e540ed26fb934999800c8d5e… Author: Andrew Nguyen <anguyen(a)codeweavers.com> Date: Tue Sep 21 02:17:09 2010 -0500 taskkill: Add stub implementation. --- configure | 1 + configure.ac | 1 + programs/taskkill/Makefile.in | 7 +++++++ programs/taskkill/taskkill.c | 31 +++++++++++++++++++++++++++++++ 4 files changed, 40 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 58093b5..788a57a 100755 --- a/configure +++ b/configure @@ -15016,6 +15016,7 @@ wine_fn_config_program services enable_services install wine_fn_config_program spoolsv enable_spoolsv install wine_fn_config_program start enable_start install wine_fn_config_program svchost enable_svchost install +wine_fn_config_program taskkill enable_taskkill install wine_fn_config_program taskmgr enable_taskmgr install wine_fn_config_program termsv enable_termsv install wine_fn_config_program uninstaller enable_uninstaller install diff --git a/configure.ac b/configure.ac index e3220ef..f279293 100644 --- a/configure.ac +++ b/configure.ac @@ -2804,6 +2804,7 @@ WINE_CONFIG_PROGRAM(services,install) WINE_CONFIG_PROGRAM(spoolsv,install) WINE_CONFIG_PROGRAM(start,install) WINE_CONFIG_PROGRAM(svchost,install) +WINE_CONFIG_PROGRAM(taskkill,install) WINE_CONFIG_PROGRAM(taskmgr,install) WINE_CONFIG_PROGRAM(termsv,install) WINE_CONFIG_PROGRAM(uninstaller,install) diff --git a/programs/taskkill/Makefile.in b/programs/taskkill/Makefile.in new file mode 100644 index 0000000..1f9c335 --- /dev/null +++ b/programs/taskkill/Makefile.in @@ -0,0 +1,7 @@ +EXTRADEFS = -DWINE_NO_UNICODE_MACROS +MODULE = taskkill.exe +APPMODE = -mconsole -municode + +C_SRCS = taskkill.c + +(a)MAKE_PROG_RULES@ diff --git a/programs/taskkill/taskkill.c b/programs/taskkill/taskkill.c new file mode 100644 index 0000000..f38db0c --- /dev/null +++ b/programs/taskkill/taskkill.c @@ -0,0 +1,31 @@ +/* + * Task termination utility + * + * 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 <windows.h> +#include <wine/debug.h> +#include <wine/unicode.h> + +WINE_DEFAULT_DEBUG_CHANNEL(taskkill); + +int wmain(int argc, WCHAR *argv[]) +{ + WINE_FIXME("taskkill.exe is not implemented\n"); + return 0; +}

1 0

Dmitry Timoshkov : user32: Do not test window state on the HCBT_SETFOCUS event, it's undefined.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 8118430b687e128ec2a9b1606e17f9348d7055e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8118430b687e128ec2a9b1606… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Sep 21 17:54:17 2010 +0900 user32: Do not test window state on the HCBT_SETFOCUS event, it's undefined. --- dlls/user32/tests/win.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eeab8b0..190ca79 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -1028,7 +1028,6 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) case HCBT_MOVESIZE: case HCBT_MINMAX: case HCBT_ACTIVATE: - case HCBT_SETFOCUS: if (pGetWindowInfo && IsWindow(hwnd)) { WINDOWINFO info; @@ -1042,7 +1041,8 @@ static LRESULT CALLBACK cbt_hook_proc(int nCode, WPARAM wParam, LPARAM lParam) verify_window_info(code_name, hwnd, &info); } break; - /* on HCBT_DESTROYWND window state is undefined */ + /* window state is undefined */ + case HCBT_SETFOCUS: case HCBT_DESTROYWND: break; default:

1 0

Luca Bennati : shlwapi: Update Italian translation.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 4985b464a8caeaf5bf9e7605f3cba19b8a01b76f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4985b464a8caeaf5bf9e7605f… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 20 23:31:41 2010 +0200 shlwapi: Update Italian translation. --- dlls/shlwapi/shlwapi_It.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/shlwapi/shlwapi_It.rc b/dlls/shlwapi/shlwapi_It.rc index ea18513..45a5b9c 100644 --- a/dlls/shlwapi/shlwapi_It.rc +++ b/dlls/shlwapi/shlwapi_It.rc @@ -32,14 +32,14 @@ FONT 8, "MS Shell Dlg" CHECKBOX "Non mostrare nuovamente &questo messaggio", IDC_ERR_DONT_SHOW, 5, 20, 210, 10, BS_AUTOCHECKBOX | WS_GROUP | WS_TABSTOP PUSHBUTTON L"&OK", IDOK, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&Annulla", IDCANCEL, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP - PUSHBUTTON L"&Si", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP + PUSHBUTTON L"&Sì", IDYES, 105, 40, 50, 14, WS_GROUP | WS_TABSTOP PUSHBUTTON L"&No", IDNO, 160, 40, 50, 14, WS_GROUP | WS_TABSTOP } STRINGTABLE { - IDS_BYTES_FORMAT "%ld bytes" - IDS_TIME_INTERVAL_HOURS " hr" + IDS_BYTES_FORMAT "%ld byte" + IDS_TIME_INTERVAL_HOURS " ore" IDS_TIME_INTERVAL_MINUTES " min" IDS_TIME_INTERVAL_SECONDS " sec" }

1 0

Luca Bennati : shell32: Update Italian translation.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: bbf3d65b0c8a73211f0a2a63b7c758d2a255ac7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbf3d65b0c8a73211f0a2a63b… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Sep 20 23:28:47 2010 +0200 shell32: Update Italian translation. --- dlls/shell32/shell32_It.rc | 68 ++++++++++++++++++++++---------------------- 1 files changed, 34 insertions(+), 34 deletions(-) diff --git a/dlls/shell32/shell32_It.rc b/dlls/shell32/shell32_It.rc index 169a14e..983eb74 100644 --- a/dlls/shell32/shell32_It.rc +++ b/dlls/shell32/shell32_It.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL MENU_001 MENU BEGIN - MENUITEM "Icone &Grandi", FCIDM_SHVIEW_BIGICON - MENUITEM "Icone &Piccole", FCIDM_SHVIEW_SMALLICON + MENUITEM "Icone &grandi", FCIDM_SHVIEW_BIGICON + MENUITEM "Icone &piccole", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW END @@ -43,32 +43,32 @@ BEGIN BEGIN POPUP "&Visualizza" BEGIN - MENUITEM "Icone &Grandi", FCIDM_SHVIEW_BIGICON - MENUITEM "Icone &Piccole", FCIDM_SHVIEW_SMALLICON + MENUITEM "Icone &grandi", FCIDM_SHVIEW_BIGICON + MENUITEM "Icone &piccole", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW END MENUITEM SEPARATOR POPUP "Disponi &Icone" BEGIN - MENUITEM "Per &Nome", 0x30 /* column 0 */ - MENUITEM "Per &Tipo", 0x32 /* column 2 */ - MENUITEM "Per Di&mensione", 0x31 /* ... */ - MENUITEM "Per &Data", 0x33 + MENUITEM "Per &nome", 0x30 /* column 0 */ + MENUITEM "Per &tipo", 0x32 /* column 2 */ + MENUITEM "Per di&mensione", 0x31 /* ... */ + MENUITEM "Per &data", 0x33 MENUITEM SEPARATOR - MENUITEM "&Disponi Automaticamente", FCIDM_SHVIEW_AUTOARRANGE + MENUITEM "&Disponi automaticamente", FCIDM_SHVIEW_AUTOARRANGE END - MENUITEM "Allinea Icone", FCIDM_SHVIEW_SNAPTOGRID + MENUITEM "Allinea icone", FCIDM_SHVIEW_SNAPTOGRID MENUITEM SEPARATOR MENUITEM "Aggiorna", FCIDM_SHVIEW_REFRESH MENUITEM SEPARATOR MENUITEM "Incolla", FCIDM_SHVIEW_INSERT - MENUITEM "Crea Collegamento", FCIDM_SHVIEW_INSERTLINK + MENUITEM "Crea collegamento", FCIDM_SHVIEW_INSERTLINK MENUITEM SEPARATOR POPUP "Nuovo" BEGIN - MENUITEM "Nuova &Cartella", FCIDM_SHVIEW_NEWFOLDER - MENUITEM "Nuovo Co&llegamento", FCIDM_SHVIEW_NEWLINK + MENUITEM "Nuova &cartella", FCIDM_SHVIEW_NEWFOLDER + MENUITEM "Nuovo co&llegamento", FCIDM_SHVIEW_NEWLINK MENUITEM SEPARATOR END MENUITEM SEPARATOR @@ -90,7 +90,7 @@ BEGIN MENUITEM "&Taglia", FCIDM_SHVIEW_CUT MENUITEM "&Copia", FCIDM_SHVIEW_COPY MENUITEM SEPARATOR - MENUITEM "Crea Co&llegamento", FCIDM_SHVIEW_CREATELINK + MENUITEM "Crea co&llegamento", FCIDM_SHVIEW_CREATELINK MENUITEM "Ca&ncella", FCIDM_SHVIEW_DELETE MENUITEM "&Rinomina", FCIDM_SHVIEW_RENAME MENUITEM SEPARATOR @@ -108,15 +108,15 @@ BEGIN POPUP "&Vista" BEGIN - MENUITEM "Icone &Grandi", FCIDM_SHVIEW_BIGICON - MENUITEM "Icone &Piccole", FCIDM_SHVIEW_SMALLICON + MENUITEM "Icone &grandi", FCIDM_SHVIEW_BIGICON + MENUITEM "Icone &piccole", FCIDM_SHVIEW_SMALLICON MENUITEM "&Lista", FCIDM_SHVIEW_LISTVIEW MENUITEM "&Dettagli", FCIDM_SHVIEW_REPORTVIEW END POPUP "&Aiuto" BEGIN - MENUITEM "&Sul Pannello di Controllo...", IDM_CPANEL_ABOUT + MENUITEM "&Riguardo al pannello di controllo...", IDM_CPANEL_ABOUT END END @@ -212,7 +212,7 @@ STRINGTABLE IDS_SHV_COLUMN_DELFROM "Locazione originale" IDS_SHV_COLUMN_DELDATE "Data di eliminazione" IDS_SHV_COL_DOCS "Documenti" - IDS_SHV_COL_STATUS "Status" + IDS_SHV_COL_STATUS "Stato" IDS_SHV_COL_LOCATION "Locazione" IDS_SHV_COL_MODEL "Modello" @@ -223,26 +223,26 @@ STRINGTABLE IDS_CONTROLPANEL "Pannello di Controllo" /* context menus */ - IDS_VIEW_LARGE "Icone &Grandi" - IDS_VIEW_SMALL "Icone &Piccole" + IDS_VIEW_LARGE "Icone &grandi" + IDS_VIEW_SMALL "Icone &piccole" IDS_VIEW_LIST "&Lista" IDS_VIEW_DETAILS "&Dettagli" IDS_SELECT "Selezione" IDS_OPEN "Apri" - IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: Accesso negato." + IDS_CREATEFOLDER_DENIED "Impossibile creare la cartella: accesso negato." IDS_CREATEFOLDER_CAPTION "Errore durante la creazione della cartella" IDS_DELETEITEM_CAPTION "Confermare la cancellazione del file" IDS_DELETEFOLDER_CAPTION "Confermare la cancellazione della cartella" IDS_DELETEITEM_TEXT "Sei sicuro di voler cancellare '%1'?" IDS_DELETEMULTIPLE_TEXT "Sei sicuro di voler cancellare questi %1 elementi?" IDS_DELETESELECTED_TEXT "Sei sicuro di voler cancellare gli oggetti selezionati?" - IDS_TRASHITEM_TEXT "Sei sicuro di voler mandare '%1' Nel Cestino?" - IDS_TRASHFOLDER_TEXT "Sei sicuro di voler mandare '%1' e tutto il suo contenuto nel Cestino?" + IDS_TRASHITEM_TEXT "Sei sicuro di voler mandare '%1' nel cestino?" + IDS_TRASHFOLDER_TEXT "Sei sicuro di voler mandare '%1' e tutto il suo contenuto nel cestino?" IDS_TRASHMULTIPLE_TEXT "Sei sicuro di voler mandare qeusti %1 oggetti nel Cestino?" IDS_CANTTRASH_TEXT "L'oggetto '%1' non può essere mandato al Cestino. Vuoi cancellarlo direttamente?" IDS_OVERWRITEFILE_TEXT "Questa cartella contiene già un file chiamato '%1'.\n\nVuoi sostituirlo?" - IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrizione del File" + IDS_OVERWRITEFILE_CAPTION "Confermare la sovrascrizione del file" IDS_OVERWRITEFOLDER_TEXT "Questa cartella contiene già una cartella chiamata '%1'.\n\n"\ "Se i file nella cartella di destinazione hanno gli stessi nomi dei file nella\n"\ "cartella selezionata, saranno sostituiti. Vuoi spostare o copiare\n"\ @@ -255,20 +255,20 @@ STRINGTABLE IDS_SHUTDOWN_PROMPT "Vuoi terminare la sessione di Wine?" /* Run File dialog */ - IDS_RUNDLG_ERROR "Impossibile mostrare la finestra Esegui File (errore interno)" + IDS_RUNDLG_ERROR "Impossibile mostrare la finestra Esegui file (errore interno)" IDS_RUNDLG_BROWSE_ERROR "Impossibile mostrare la finestra Sfoglia (errore interno)" IDS_RUNDLG_BROWSE_CAPTION "Sfoglia" IDS_RUNDLG_BROWSE_FILTER "File eseguibili\0*.exe\0Tutti i file\0*.*\0\0" /* shell folder path default values */ - IDS_STARTMENU "Start Menu" - IDS_PROGRAMS "Start Menu\\Programmi" - IDS_STARTUP "Start Menu\\Programmi\\StartUp" - IDS_ADMINTOOLS "Start Menu\\Programmi\\Strumenti di Amministrazione" - IDS_INTERNET_CACHE "Settaggi Locali\\Temporary Internet Files" - IDS_HISTORY "Settaggi Locali\\Cronologia" - IDS_LOCAL_APPDATA "Settaggi Locali\\Applicazioni" - IDS_CDBURN_AREA "Settaggi Locali\\Applicazioni\\Microsoft\\CD Burning" + IDS_STARTMENU "Menu Start" + IDS_PROGRAMS "Menu Start\\Programmi" + IDS_STARTUP "Menu Start\\Programmi\\Esecuzione automatica" + IDS_ADMINTOOLS "Start Menu\\Programmi\\Strumenti di amministrazione" + IDS_INTERNET_CACHE "Impostazioni locali\\File Internet Temporanei" + IDS_HISTORY "Impostazioni locali\\Cronologia" + IDS_LOCAL_APPDATA "Impostazioni locali\\Applicazioni" + IDS_CDBURN_AREA "Impostazioni locali\\Applicazioni\\Microsoft\\CD Burning" IDS_PROGRAM_FILES "Programmi" IDS_PROGRAM_FILESX86 "Programmi (x86)" IDS_PROGRAM_FILES_COMMON "Programmi\\File Comuni" @@ -277,7 +277,7 @@ STRINGTABLE IDS_COMMON_MUSIC "Documenti\\Musica" IDS_COMMON_PICTURES "Documenti\\Immagini" IDS_COMMON_VIDEO "Documenti\\Video" - IDS_PERSONAL "Miei Documenti" + IDS_PERSONAL "Miei documenti" IDS_MYMUSIC "Musica" IDS_MYVIDEO "Video" IDS_MYPICTURES "Immagini"

1 0

Mariusz Pluciński : gameux/tests: Add test of creating IGameStatistics instance.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 10c39090bdfab8718e71f22e7b9ae66843b6799d URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c39090bdfab8718e71f22e7… Author: Mariusz Pluciński <vshader(a)gmail.com> Date: Mon Sep 20 15:04:56 2010 +0200 gameux/tests: Add test of creating IGameStatistics instance. --- dlls/gameux/tests/gamestatistics.c | 117 +++++++++++++++++++++++++++++++++++- 1 files changed, 115 insertions(+), 2 deletions(-) diff --git a/dlls/gameux/tests/gamestatistics.c b/dlls/gameux/tests/gamestatistics.c index 3a8260c..1f5e9d2 100644 --- a/dlls/gameux/tests/gamestatistics.c +++ b/dlls/gameux/tests/gamestatistics.c @@ -20,34 +20,147 @@ #define COBJMACROS +#include "shlwapi.h" +#include "oleauto.h" + #include "gameux.h" #include "wine/test.h" -static void test_create( void ) +/******************************************************************************* + * utilities + */ +static IGameExplorer *ge = NULL; +static WCHAR sExeName[MAX_PATH] = {0}; +static GUID gameInstanceId; +/******************************************************************************* + * _registerGame + * Registers test suite executable as game in Games Explorer. Required to test + * game statistics. + */ +static HRESULT _registerGame(void) { + HRESULT hr; + WCHAR sExePath[MAX_PATH]; + BSTR bstrExeName, bstrExePath; + DWORD dwExeNameLen; + + /* prepare path to binary */ + dwExeNameLen = GetModuleFileNameW(NULL, sExeName, sizeof (sExeName) / sizeof (sExeName[0])); + hr = (dwExeNameLen!= 0 ? S_OK : E_FAIL); + lstrcpynW(sExePath, sExeName, StrRChrW(sExeName, NULL, '\\') - sExeName + 1); + + bstrExeName = SysAllocString(sExeName); + if(!bstrExeName) hr = E_OUTOFMEMORY; + + bstrExePath = SysAllocString(sExePath); + if(!bstrExePath) hr = E_OUTOFMEMORY; + + if(SUCCEEDED(hr)) + { + gameInstanceId = GUID_NULL; + hr = CoCreateInstance(&CLSID_GameExplorer, NULL, CLSCTX_INPROC_SERVER, + &IID_IGameExplorer, (LPVOID*)&ge); + } + + if(SUCCEEDED(hr)) + hr = IGameExplorer_AddGame(ge, bstrExeName, bstrExePath, + GIS_CURRENT_USER, &gameInstanceId); + + if(FAILED(hr) && ge) + { + IGameExplorer_Release(ge); + ge = NULL; + } + + SysFreeString(bstrExeName); + SysFreeString(bstrExePath); + return hr; +} +/******************************************************************************* + * _unregisterGame + * Unregisters test suite from Games Explorer. + */ +static HRESULT _unregisterGame(void) { + HRESULT hr; + + if(!ge) return E_FAIL; + + hr = IGameExplorer_RemoveGame(ge, gameInstanceId); + + IGameExplorer_Release(ge); + ge = NULL; + + return hr; +} +/******************************************************************************* + * test routines + */ +static void test_create(BOOL* gameStatisticsAvailable) { HRESULT hr; IGameStatisticsMgr* gsm = NULL; + *gameStatisticsAvailable = FALSE; /* interface available up from Win7 */ hr = CoCreateInstance( &CLSID_GameStatistics, NULL, CLSCTX_INPROC_SERVER, &IID_IGameStatisticsMgr, (LPVOID*)&gsm); if(gsm) { ok( hr == S_OK, "IGameStatisticsMgr creating failed (result: 0x%08x)\n", hr); + *gameStatisticsAvailable = TRUE; IGameStatisticsMgr_Release(gsm); } else win_skip("IGameStatisticsMgr cannot be created\n"); } +static void test_gamestatisticsmgr( void ) +{ + HRESULT hr; + DWORD dwOpenResult; + + IGameStatisticsMgr* gsm = NULL; + IGameStatistics* gs = NULL; + + hr = CoCreateInstance( &CLSID_GameStatistics, NULL, CLSCTX_INPROC_SERVER, &IID_IGameStatisticsMgr, (LPVOID*)&gsm); + ok(hr == S_OK, "IGameStatisticsMgr creating failed (result false)\n"); + + /* test trying to create interface IGameStatistics using GetGameStatistics method */ + hr = IGameStatisticsMgr_GetGameStatistics(gsm, sExeName, GAMESTATS_OPEN_OPENORCREATE, &dwOpenResult, &gs); + todo_wine ok(SUCCEEDED(hr), "GetGameStatistics returned error: 0x%x\n", hr); + todo_wine ok(gs!=NULL, "GetGameStatistics did not return valid interface pointer\n"); + if(gs) + { + hr = IGameStatistics_Release(gs); + ok(SUCCEEDED(hr), "releasing IGameStatistics returned error: 0x%x\n", hr); + + /* test of removing game statistics from underlying storage */ + hr = IGameStatisticsMgr_RemoveGameStatistics(gsm, sExeName); + todo_wine ok(SUCCEEDED(hr), "cannot remove game statistics, error: 0x%x\n", hr); + } + + hr = IGameStatisticsMgr_Release(gsm); + ok(SUCCEEDED(hr), "releasing IGameStatisticsMgr returned error: 0x%x\n", hr); +} START_TEST(gamestatistics) { HRESULT hr; + BOOL gameStatisticsAvailable; hr = CoInitialize( NULL ); ok( hr == S_OK, "failed to init COM\n"); - test_create(); + test_create(&gameStatisticsAvailable); + + if(gameStatisticsAvailable) + { + hr = _registerGame(); + ok( hr == S_OK, "cannot register game in Game Explorer (error: 0x%x)\n", hr); + + test_gamestatisticsmgr(); + + hr = _unregisterGame(); + ok( hr == S_OK, "cannot unregister game from Game Explorer (error: 0x%x)\n", hr); + } CoUninitialize(); }

1 0

Austin English : winedump: Match the new Makefile format.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 02bdbbc4752562bfd79ff3a2630b4f6dcb915fa5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=02bdbbc4752562bfd79ff3a26… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Sep 20 22:25:50 2010 -0700 winedump: Match the new Makefile format. --- tools/winedump/output.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tools/winedump/output.c b/tools/winedump/output.c index e0697f8..5b0e1f5 100644 --- a/tools/winedump/output.c +++ b/tools/winedump/output.c @@ -451,13 +451,11 @@ void output_makefile (void) puts ("Creating makefile"); fprintf (makefile, - "# Generated from %s by winedump.\nTOPSRCDIR = @top_srcdir@\n" - "TOPOBJDIR = ../..\nSRCDIR = @srcdir@\nVPATH = @srcdir@\n" + "# Generated from %s by winedump.\n" "MODULE = %s.dll\n", globals.input_name, OUTPUT_DLL_NAME); - fprintf (makefile, "IMPORTS = kernel32"); if (globals.forward_dll) - fprintf (makefile, " %s", globals.forward_dll); + fprintf (makefile, "IMPORTS = %s", globals.forward_dll); fprintf (makefile, "\n\nC_SRCS = \\\n\t%s_main.c\n\n(a)MAKE_DLL_RULES@\n\n", OUTPUT_DLL_NAME);

1 0

Hans Leidekker : advapi32: Fix handling of zero account and domain size parameters in LookupAccountSid .
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 0cffcb77d6e624bcc7567ebcfaecb0ef730e7a7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cffcb77d6e624bcc7567ebcf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Sep 21 12:54:50 2010 +0200 advapi32: Fix handling of zero account and domain size parameters in LookupAccountSid. --- dlls/advapi32/security.c | 15 ++++++++++++--- dlls/advapi32/tests/security.c | 12 +++++++++++- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 3e7699a..0458033 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -2069,6 +2069,11 @@ LookupAccountSidA( } else *domainSize = domainSizeW + 1; } + else + { + *accountSize = accountSizeW + 1; + *domainSize = domainSizeW + 1; + } HeapFree( GetProcessHeap(), 0, systemW ); HeapFree( GetProcessHeap(), 0, accountW ); @@ -2225,8 +2230,11 @@ LookupAccountSidW( if (domain) lstrcpyW(domain, dm); } - if (((*accountSize != 0) && (*accountSize < ac_len)) || - ((*domainSize != 0) && (*domainSize < dm_len))) { + if ((*accountSize && *accountSize < ac_len) || + (!account && !*accountSize && ac_len) || + (*domainSize && *domainSize < dm_len) || + (!domain && !*domainSize && dm_len)) + { SetLastError(ERROR_INSUFFICIENT_BUFFER); status = FALSE; } @@ -2238,9 +2246,10 @@ LookupAccountSidW( *accountSize = ac_len; else *accountSize = ac_len + 1; - *name_use = use; + HeapFree(GetProcessHeap(), 0, account_name); HeapFree(GetProcessHeap(), 0, computer_name); + if (status) *name_use = use; return status; } diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 424403b..f599bb1 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1505,7 +1505,7 @@ static void test_LookupAccountSid(void) PSID pUsersSid = NULL; SID_NAME_USE use; BOOL ret; - DWORD size,cbti = 0; + DWORD error, size, cbti = 0; MAX_SID max_sid; CHAR *str_sidA; int i; @@ -1667,6 +1667,16 @@ static void test_LookupAccountSid(void) "LookupAccountSidW() Expected dom_size = %u, got %u\n", real_dom_sizeW + 1, dom_sizeW); + acc_sizeW = dom_sizeW = use = 0; + SetLastError(0xdeadbeef); + ret = LookupAccountSidW(NULL, pUsersSid, NULL, &acc_sizeW, NULL, &dom_sizeW, &use); + error = GetLastError(); + ok(!ret, "LookupAccountSidW failed %u\n", GetLastError()); + ok(error == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %u\n", error); + ok(acc_sizeW, "expected non-zero account size\n"); + ok(dom_sizeW, "expected non-zero domain size\n"); + ok(!use, "expected zero use %u\n", use); + FreeSid(pUsersSid); /* Test LookupAccountSid with Sid retrieved from token information.

1 0

Paul Vriens : dbghelp: Fix use of GetProcessHeap.
by Alexandre Julliard Sept. 21, 2010

Sept. 21, 2010

Module: wine Branch: master Commit: 5da1ecef3adb94f18cc544200d52d5481925dac3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5da1ecef3adb94f18cc544200… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Sep 21 13:01:54 2010 +0200 dbghelp: Fix use of GetProcessHeap. --- dlls/dbghelp/elf_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c index 132e40c..9b1155e 100644 --- a/dlls/dbghelp/elf_module.c +++ b/dlls/dbghelp/elf_module.c @@ -274,7 +274,7 @@ static BOOL elf_map_file(const WCHAR* filenameW, struct image_file_map* fmap) { if (read(fmap->u.elf.fd, &fmap->u.elf.sect[i].shdr, sizeof(fmap->u.elf.sect[i].shdr)) != sizeof(fmap->u.elf.sect[i].shdr)) { - HeapFree(GetProcessHeap, 0, fmap->u.elf.sect); + HeapFree(GetProcessHeap(), 0, fmap->u.elf.sect); fmap->u.elf.sect = NULL; goto done; }

1 0