Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-22 22:11:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMD]

Browse source 
- Do not hardcode the length of the string arrays in the LoadString calls (use ARRAYSIZE instead)
- Localize the command prompt info line. CORE-9293 #resolve #comment I placed the string in the resource files so that you can now localize it!

svn path=/trunk/; revision=66518
This commit is contained in:
Hermès Bélusca-Maïto 2015-03-01 12:28:38 +00:00
parent dbf228f1ed
commit 01dccc57d3
27 changed files with 55 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
reactos/base/shell/cmd/console.c
View file

@ -249,14 +249,14 @@ VOID ConPuts(LPTSTR szText, DWORD nStdHandle)
VOID ConOutResPaging(BOOL NewPage, UINT resID)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg));
ConOutPrintfPaging(NewPage, szMsg);
}
VOID ConOutResPuts(UINT resID)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg));
ConPuts(szMsg, STD_OUTPUT_HANDLE);
}
@ -373,7 +373,7 @@ VOID ConErrFormatMessage(DWORD MessageId, ...)
}
else
{
LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg));
ConErrPrintf(szMsg);
}
}
@ -402,7 +402,7 @@ VOID ConOutFormatMessage(DWORD MessageId, ...)
}
else
{
LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_CONSOLE_ERROR, szMsg, ARRAYSIZE(szMsg));
ConErrPrintf(szMsg);
}
}
@ -413,7 +413,7 @@ VOID ConOutResPrintf(UINT resID, ...)
va_list arg_ptr;
va_start(arg_ptr, resID);
LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg));
ConPrintf(szMsg, arg_ptr, STD_OUTPUT_HANDLE);
va_end(arg_ptr);
}
@ -447,7 +447,7 @@ VOID ConErrChar(TCHAR c)
VOID ConErrResPuts(UINT resID)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg));
ConPuts(szMsg, STD_ERROR_HANDLE);
}
@ -463,7 +463,7 @@ VOID ConErrResPrintf(UINT resID, ...)
va_list arg_ptr;
va_start(arg_ptr, resID);
LoadString(CMD_ModuleHandle, resID, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, resID, szMsg, ARRAYSIZE(szMsg));
ConPrintf(szMsg, arg_ptr, STD_ERROR_HANDLE);
va_end(arg_ptr);
}

2
reactos/base/shell/cmd/copy.c
View file

@ -852,7 +852,7 @@ INT cmd_copy(LPTSTR param)
if (copy(tmpSrcPath,tmpDestPath, bAppend, dwFlags, bTouch))
{
nFiles++;
//LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
//LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, ARRAYSIZE(szMsg));
}
else
{

2
reactos/base/shell/cmd/del.c
View file

@ -83,7 +83,7 @@ static BOOLEAN StringsLoaded = FALSE;
static VOID LoadStrings(VOID)
{
LoadString( CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_DELETE_WIPE, szDeleteWipe, ARRAYSIZE(szDeleteWipe));
GetModuleFileName(NULL, CMDPath, MAX_PATH);
StringsLoaded = TRUE;
}

14
reactos/base/shell/cmd/dir.c
View file

@ -585,17 +585,17 @@ PrintDirectoryHeader(LPTSTR szPath, LPDIRSWITCHFLAGS lpFlags)
/* print drive info */
if (szVolName[0] != _T('\0'))
{
LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP2, szMsg, ARRAYSIZE(szMsg));
DirPrintf(lpFlags, szMsg, szRootName[0], szVolName);
}
else
{
LoadString(CMD_ModuleHandle, STRING_DIR_HELP3, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP3, szMsg, ARRAYSIZE(szMsg));
DirPrintf(lpFlags, szMsg, szRootName[0]);
}
/* print the volume serial number if the return was successful */
LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, (LPTSTR) szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP4, szMsg, ARRAYSIZE(szMsg));
DirPrintf(lpFlags, szMsg, HIWORD(dwSerialNr), LOWORD(dwSerialNr));
return TRUE;
@ -763,7 +763,7 @@ PrintSummary(LPTSTR szPath,
if (TotalSummary && lpFlags->bRecursive)
{
ConvertULargeInteger(u64Bytes, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP5, szMsg, ARRAYSIZE(szMsg));
DirPrintf(lpFlags, szMsg, ulFiles, szBuffer);
}
else
@ -772,7 +772,7 @@ PrintSummary(LPTSTR szPath,
/* Condition to print summary is:
If we are not in bare format and if we have results! */
ConvertULargeInteger(u64Bytes, szBuffer, 20, lpFlags->bTSeperator);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP8, szMsg, ARRAYSIZE(szMsg));
DirPrintf(lpFlags, szMsg, ulFiles, szBuffer);
}
@ -781,7 +781,7 @@ PrintSummary(LPTSTR szPath,
{
GetUserDiskFreeSpace(szPath, &uliFree);
ConvertULargeInteger(uliFree.QuadPart, szBuffer, sizeof(szBuffer), lpFlags->bTSeperator);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, (LPTSTR) szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP6, szMsg, ARRAYSIZE(szMsg));
DirPrintf(lpFlags, szMsg, ulDirs, szBuffer);
}
@ -1101,7 +1101,7 @@ DirPrintFiles(LPWIN32_FIND_DATA ptrFiles[], /* [IN] Files' Info */
and if we are in recursive mode... we must have results */
if (!(lpFlags->bBareFormat ) && !((lpFlags->bRecursive) && (dwCount <= 0)))
{
LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_DIR_HELP7, szMsg, ARRAYSIZE(szMsg));
if (DirPrintf(lpFlags, szMsg, szTemp))
return;
}

4
reactos/base/shell/cmd/error.c
View file

@ -98,7 +98,7 @@ VOID error_sfile_not_found (LPTSTR f)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_ERROR_FILE_NOT_FOUND, szMsg, ARRAYSIZE(szMsg));
ConErrPrintf(_T("%s - %s\n"), szMsg, f);
nErrorLevel = 1;
}
@ -150,7 +150,7 @@ VOID error_syntax (LPTSTR s)
{
TCHAR szMsg[RC_STRING_MAX_SIZE];
LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR2, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_ERROR_ERROR2, szMsg, ARRAYSIZE(szMsg));
if (s)
ConErrPrintf(_T("%s - %s\n"), szMsg, s);

6
reactos/base/shell/cmd/free.c
View file

@ -45,7 +45,7 @@ PrintDiskInfo (LPTSTR szDisk)
if (!GetVolumeInformation (szRootPath, szVolume, 64, &dwSerial,
NULL, NULL, NULL, 0))
{
LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, ARRAYSIZE(szMsg));
ConErrPrintf(_T("%s %s:\n"), szMsg, szDrive);
return;
}
@ -53,7 +53,7 @@ PrintDiskInfo (LPTSTR szDisk)
if (szVolume[0] == _T('\0'))
{
LoadString(CMD_ModuleHandle, STRING_FREE_ERROR2, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_FREE_ERROR2, szMsg, ARRAYSIZE(szMsg));
_tcscpy (szVolume, szMsg);
}
@ -65,7 +65,7 @@ PrintDiskInfo (LPTSTR szDisk)
if (!GetDiskFreeSpace (szRootPath, &dwSecPerCl,
&dwBytPerSec, &dwFreeCl, &dwTotCl))
{
LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_FREE_ERROR1, szMsg, ARRAYSIZE(szMsg));
ConErrPrintf(_T("%s %s:\n"), szMsg, szDrive);
return;
}

1
reactos/base/shell/cmd/lang/de-DE.rc
View file

@ -520,6 +520,7 @@ title neuer Titel"
STRING_REPLACE_ERROR5 "Zugriff verweigert - %s\n"
STRING_REPLACE_ERROR6 "Keine Dateien gefunden - %s\n"
STRING_REPLACE_ERROR7 "Erweiterter Fehler 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Betriebssystem [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nReactOS-Befehlszeileninterpreter\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Läuft in: "

1
reactos/base/shell/cmd/lang/el-GR.rc
View file

@ -525,6 +525,7 @@ title new title\n"
STRING_REPLACE_ERROR5 "Δεν επιτρέπεται η πρόσβαση - %s\n"
STRING_REPLACE_ERROR6 "Δε βρέθηκαν αρχεία - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Running on: "

1
reactos/base/shell/cmd/lang/en-US.rc
View file

@ -521,6 +521,7 @@ title new title\n"
STRING_REPLACE_ERROR5 "Access denied - %s\n"
STRING_REPLACE_ERROR6 "No files found - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Running on: "

1
reactos/base/shell/cmd/lang/es-ES.rc
View file

@ -523,6 +523,7 @@ title Nuevo título\n"
STRING_REPLACE_ERROR5 "Access denied - %s\n"
STRING_REPLACE_ERROR6 "No files found - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nIntérprete de comandos de ReactOS\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Corriendo en: "

1
reactos/base/shell/cmd/lang/fr-FR.rc
View file

@ -535,6 +535,7 @@ titre titre de la fenêtre"
STRING_REPLACE_ERROR5 "Accès refusé - %s\n"
STRING_REPLACE_ERROR6 "Aucun fichier trouvé - %s\n"
STRING_REPLACE_ERROR7 "Erreur étendue 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nInterpréteur de ligne de commandes ReactOS\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Fonctionnant sous: "

1
reactos/base/shell/cmd/lang/hu-HU.rc
View file

@ -505,6 +505,7 @@ title new title\n"
STRING_REPLACE_ERROR5 "Access denied - %s\n"
STRING_REPLACE_ERROR6 "No files found - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nReactOS Parancssor értelmezõ\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Running on: "

1
reactos/base/shell/cmd/lang/id-ID.rc
View file

@ -520,6 +520,7 @@ title judul baru\n"
STRING_REPLACE_ERROR5 "Access denied - %s\n"
STRING_REPLACE_ERROR6 "No files found - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nInterpreter Baris Perintah ReactOS\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Berjalan pada: "

1
reactos/base/shell/cmd/lang/it-IT.rc
View file

@ -531,6 +531,7 @@ titolo il nuovo titolo\n"
STRING_REPLACE_ERROR5 "Accesso negato - %s\n"
STRING_REPLACE_ERROR6 "Nessun file trovato - %s\n"
STRING_REPLACE_ERROR7 "Errore esteso 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nInterprete di linea di comando di ReactOS\nVersion %s %s"
STRING_VERSION_RUNNING_ON "In esecuzione su: "

1
reactos/base/shell/cmd/lang/ja-JP.rc
View file

@ -528,6 +528,7 @@ RESTORE ウィンドウを元のサイズに戻します。\n\
STRING_REPLACE_ERROR5 "Access denied - %s\n"
STRING_REPLACE_ERROR6 "No files found - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nReactOS Command Line Interpreter\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Running on: "

1
reactos/base/shell/cmd/lang/no-NO.rc
View file

@ -519,6 +519,7 @@ tittel ny tittel\n"
STRING_REPLACE_ERROR5 "Tilgang nektet - %s\n"
STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s-%s]\n"
STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s"
STRING_VERSION_RUNNING_ON "Kjører på: "

1
reactos/base/shell/cmd/lang/pl-PL.rc
View file

@ -525,6 +525,7 @@ title nowy tytuł okna\n"
STRING_REPLACE_ERROR5 "Dostęp zabroniony - %s\n"
STRING_REPLACE_ERROR6 "Nie znaleziono plików - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32 - Błąd współdzielenia\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operating System [Version %s-%s]\n"
STRING_CMD_SHELLINFO "\nInterpreter linii poleceń ReactOS\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Działający na: "

1
reactos/base/shell/cmd/lang/ro-RO.rc
View file

@ -558,6 +558,7 @@ titlu Noul titlu.\n"
STRING_REPLACE_ERROR5 "Acces nepermis - %s\n"
STRING_REPLACE_ERROR6 "Fișierele nu au fost găsite - %s\n"
STRING_REPLACE_ERROR7 "Eroare Extinsă 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS [Versiunea %s-%s]\n"
STRING_CMD_SHELLINFO "\nInterpretorul de comenzi ReactOS\nVersiunea %s %s"
STRING_VERSION_RUNNING_ON "Operând pe: "

1
reactos/base/shell/cmd/lang/ru-RU.rc
View file

@ -530,6 +530,7 @@ RESTORE восстанавливает окно\n\
STRING_REPLACE_ERROR5 "Доступ запрещен - %s\n"
STRING_REPLACE_ERROR6 "Не найдено файлов - %s\n"
STRING_REPLACE_ERROR7 "Расширенная ошибка 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "Операционная система ReactOS [Версия %s-%s]\n"
STRING_CMD_SHELLINFO "\nИнтерпретатор командной строки ReactOS\nВерсия %s %s"
STRING_VERSION_RUNNING_ON "Запущен на: "

1
reactos/base/shell/cmd/lang/sk-SK.rc
View file

@ -527,6 +527,7 @@ title new title\n"
STRING_REPLACE_ERROR5 "Prístup zamietnutý - %s\n"
STRING_REPLACE_ERROR6 "Žiadne súbory sa nenašli - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "Operačný systém ReactOS [Verzia %s-%s]\n"
STRING_CMD_SHELLINFO "\nInterpréter príkazového riadku systému ReactOS\nVerzia %s %s"
STRING_VERSION_RUNNING_ON "Running on: "

1
reactos/base/shell/cmd/lang/sq-AL.rc
View file

@ -525,6 +525,7 @@ title titull i ri\n"
STRING_REPLACE_ERROR5 "Refuzot hyrja - %s\n"
STRING_REPLACE_ERROR6 "Nuk u gjet dokumenti - %s\n"
STRING_REPLACE_ERROR7 "Error i zgjatur 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "Sistemi Operativ ReactOS [Versioni %s-%s]\n"
STRING_CMD_SHELLINFO "\nReactOS Interpretuesi i komandave\nVersioni %s %s"
STRING_VERSION_RUNNING_ON "Funksionon në: "

1
reactos/base/shell/cmd/lang/sv-SE.rc
View file

@ -519,6 +519,7 @@ tittel ny tittel\n"
STRING_REPLACE_ERROR5 "Tilgang nektet - %s\n"
STRING_REPLACE_ERROR6 "Ingen filer ble funnet - %s\n"
STRING_REPLACE_ERROR7 "Extended Error 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS Operativsystem [Versjon %s-%s]\n"
STRING_CMD_SHELLINFO "\nReactOS Kommandotolk\nVersjon %s %s"
STRING_VERSION_RUNNING_ON "Körs på: "

1
reactos/base/shell/cmd/lang/uk-UA.rc
View file

@ -531,6 +531,7 @@ title новий заголовок\n"
STRING_REPLACE_ERROR5 "Немає доступу - %s\n"
STRING_REPLACE_ERROR6 "Файли не знайдено - %s\n"
STRING_REPLACE_ERROR7 "Розширена помилка 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "Операцiйна Система ReactOS [Версiя %s-%s]\n"
STRING_CMD_SHELLINFO "\nIнтерпретатор командного рядка ReactOS\nVersion %s %s"
STRING_VERSION_RUNNING_ON "Запущений на: "

1
reactos/base/shell/cmd/lang/zh-CN.rc
View file

@ -490,6 +490,7 @@ RESTORE 恢复窗口\n\
STRING_REPLACE_ERROR5 "禁止访问 - %s\n"
STRING_REPLACE_ERROR6 "没有文件被发现 - %s\n"
STRING_REPLACE_ERROR7 "扩展错误 32\n"
STRING_CMD_INFOLINE " ReactOS Command Prompt Type HELP = Help "
STRING_REACTOS_VERSION "ReactOS 操作系统 [版本 %s-%s]\n"
STRING_CMD_SHELLINFO "\nReactOS 命令行解释器\n版本 %s %s"
STRING_VERSION_RUNNING_ON "在 上运行"

4
reactos/base/shell/cmd/misc.c
View file

@ -586,7 +586,7 @@ INT FilePromptYN (UINT resID)
for (p = szIn; _istspace (*p); p++)
;
LoadString(CMD_ModuleHandle, STRING_CHOICE_OPTION, szMsg, RC_STRING_MAX_SIZE);
LoadString(CMD_ModuleHandle, STRING_CHOICE_OPTION, szMsg, ARRAYSIZE(szMsg));
if (_tcsncmp(p, &szMsg[0], 1) == 0)
return PROMPT_YES;
@ -650,7 +650,7 @@ INT FilePromptYNA (UINT resID)
for (p = szIn; _istspace (*p); p++)
;
LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, RC_STRING_MAX_SIZE);
LoadString( CMD_ModuleHandle, STRING_COPY_OPTION, szMsg, ARRAYSIZE(szMsg));
if (_tcsncmp(p, &szMsg[0], 1) == 0)
return PROMPT_YES;

23
reactos/base/shell/cmd/prompt.c
View file

@ -48,13 +48,9 @@
*/
#include "precomp.h"
// FIXME: Localize the information line.
static TCHAR InfoLine[] = _T(" ReactOS Command Prompt Type HELP = Help ");
/* The default prompt */
static TCHAR DefaultPrompt[] = _T("$P$G");
/*
* Initialize prompt support
*/
@ -66,7 +62,7 @@ VOID InitPrompt(VOID)
* Set the PROMPT environment variable if it doesn't exist already.
* You can change the PROMPT environment variable before cmd starts.
*/
if (GetEnvironmentVariable(_T("PROMPT"), Buffer, sizeof(Buffer) / sizeof(Buffer[0])) == 0)
if (GetEnvironmentVariable(_T("PROMPT"), Buffer, ARRAYSIZE(Buffer)) == 0)
SetEnvironmentVariable(_T("PROMPT"), DefaultPrompt);
}
@ -82,12 +78,16 @@ VOID PrintInfoLine(VOID)
COORD coPos;
DWORD dwWritten;
if (!GetConsoleScreenBufferInfo(hOutput, &csbi))
{
/* No console */
return;
}
TCHAR szInfoLine[80 + 1]; // The info line is 80 characters long (without NULL character)
INT iInfoLineLen;
/* Return directly if the output handle is not a console handle */
if (!GetConsoleScreenBufferInfo(hOutput, &csbi))
return;
iInfoLineLen = LoadString(CMD_ModuleHandle, STRING_CMD_INFOLINE, szInfoLine, ARRAYSIZE(szInfoLine));
/* Display the localized information line */
coPos.X = 0;
coPos.Y = 0;
FillConsoleOutputAttribute(hOutput, BACKGROUND_BLUE | FOREGROUND_WHITE,
@ -97,8 +97,7 @@ VOID PrintInfoLine(VOID)
csbi.dwSize.X,
coPos, &dwWritten);
WriteConsoleOutputCharacter(hOutput, InfoLine,
sizeof(InfoLine)/sizeof(TCHAR) - 1,
WriteConsoleOutputCharacter(hOutput, szInfoLine, iInfoLineLen,
coPos, &dwWritten);
}

5
reactos/base/shell/cmd/resource.h
View file

@ -89,8 +89,9 @@
#define STRING_ASSOC_HELP 616
#define STRING_MKLINK_HELP 617
#define STRING_REACTOS_VERSION 623
#define STRING_CMD_SHELLINFO 624
#define STRING_CMD_INFOLINE 620
#define STRING_REACTOS_VERSION 623
#define STRING_CMD_SHELLINFO 624
#define STRING_COLOR_HELP1 625
#define STRING_COPY_HELP1 626