Module: wine Branch: master Commit: afe4d80a5eb08519d962fa309da2a2cc60e55ca8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=afe4d80a5eb08519d962fa309d...
Author: Jason Edmeades jason.edmeades@googlemail.com Date: Sun Jun 3 22:07:43 2007 +0100
cmd.exe: Fix 'help garbage' command post-unicode support.
---
programs/cmd/builtins.c | 9 +++------ programs/cmd/wcmd.h | 1 + 2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index b73e318..f5310b7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -46,7 +46,7 @@ struct env_stack *saved_environment; struct env_stack *pushd_directories;
extern HINSTANCE hinst; -extern WCHAR *inbuilt[]; +extern WCHAR inbuilt[][10]; extern int echo_mode, verify_mode, defaultColor; extern WCHAR quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; @@ -659,19 +659,16 @@ void WCMD_execute (WCHAR *orig_cmd, WCHAR *param, WCHAR *subst) { void WCMD_give_help (WCHAR *command) {
int i; - WCHAR buffer[2048];
command = WCMD_strtrim_leading_spaces(command); if (strlenW(command) == 0) { - LoadString (hinst, 1000, buffer, sizeof(buffer)/sizeof(WCHAR)); - WCMD_output_asis (buffer); + WCMD_output_asis (WCMD_LoadMessage(WCMD_ALLHELP)); } else { for (i=0; i<=WCMD_EXIT; i++) { if (CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, param1, -1, inbuilt[i], -1) == 2) { - LoadString (hinst, i, buffer, sizeof(buffer)/sizeof(WCHAR)); - WCMD_output_asis (buffer); + WCMD_output_asis (WCMD_LoadMessage(i)); return; } } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 9fe729d..a9abfe6 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -189,6 +189,7 @@ extern WCHAR anykey[]; extern WCHAR version_string[];
/* Translated messages */ +#define WCMD_ALLHELP 1000 #define WCMD_CONFIRM 1001 #define WCMD_YES 1002 #define WCMD_NO 1003