diff --git a/reactos/subsys/system/cmd/En.rc b/reactos/subsys/system/cmd/En.rc index 983acc36159..e97dced9ecb 100644 --- a/reactos/subsys/system/cmd/En.rc +++ b/reactos/subsys/system/cmd/En.rc @@ -278,6 +278,17 @@ STRING_LABEL_HELP5, "Drive label (11 Characters, ENTER if none)? " STRING_MKDIR_HELP, "Creates a directory.\n\n \ MKDIR [drive:]path\nMD [drive:]path" +STRING_MEMMORY_HELP1, "Displays the amount of system memory.\n\nMEMORY" + +STRING_MEMMORY_HELP2, "\n %12s%% memory load.\n\n \ + %13s bytes total physical RAM.\n \ + %13s bytes available physical RAM.\n\n \ + %13s bytes total page file.\n \ + %13s bytes available page file.\n\n \ + %13s bytes total virtual memory.\n \ + %13s bytes available virtual memory.\n" + + STRING_RMDIR_HELP, "Removes a directory.\n\n \ RMDIR [drive:]path\nRD [drive:]path" diff --git a/reactos/subsys/system/cmd/memory.c b/reactos/subsys/system/cmd/memory.c index a7da82b06c4..3abd0a2559c 100644 --- a/reactos/subsys/system/cmd/memory.c +++ b/reactos/subsys/system/cmd/memory.c @@ -6,9 +6,13 @@ * * 01-Sep-1999 (Eric Kohl) * Started. + * + * 28-Apr-2005 (Magnus Olsen) ) + * Remove all hardcode string to En.rc */ #include "precomp.h" +#include "resource.h" #ifdef INCLUDE_CMD_MEMORY @@ -60,12 +64,12 @@ INT CommandMemory (LPTSTR cmd, LPTSTR param) TCHAR szAvailPageFile[20]; TCHAR szTotalVirtual[20]; TCHAR szAvailVirtual[20]; + WCHAR szMsg[RC_STRING_MAX_SIZE]; if (!_tcsncmp (param, _T("/?"), 2)) { - ConOutPuts (_T("Displays the amount of system memory.\n" - "\n" - "MEMORY")); + LoadString( GetModuleHandle(NULL), STRING_MEMMORY_HELP1, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPuts ((LPTSTR)szMsg); return 0; } @@ -81,17 +85,8 @@ INT CommandMemory (LPTSTR cmd, LPTSTR param) ConvertDWord (ms.dwTotalVirtual, szTotalVirtual, 20, TRUE); ConvertDWord (ms.dwAvailVirtual, szAvailVirtual, 20, TRUE); - ConOutPrintf (_T("\n" - " %12s%% memory load.\n" - "\n" - " %13s bytes total physical RAM.\n" - " %13s bytes available physical RAM.\n" - "\n" - " %13s bytes total page file.\n" - " %13s bytes available page file.\n" - "\n" - " %13s bytes total virtual memory.\n" - " %13s bytes available virtual memory.\n"), + LoadString( GetModuleHandle(NULL), STRING_MEMMORY_HELP2, (LPTSTR) szMsg,sizeof(szMsg)); + ConOutPrintf ((LPTSTR)szMsg, szMemoryLoad, szTotalPhys, szAvailPhys, szTotalPageFile, szAvailPageFile, szTotalVirtual, szAvailVirtual); diff --git a/reactos/subsys/system/cmd/resource.h b/reactos/subsys/system/cmd/resource.h index d2f83602e82..2baa89a411e 100644 --- a/reactos/subsys/system/cmd/resource.h +++ b/reactos/subsys/system/cmd/resource.h @@ -132,9 +132,12 @@ #define STRING_MKDIR_HELP 657 -#define STRING_RMDIR_HELP 658 +#define STRING_MEMMORY_HELP1 658 +#define STRING_MEMMORY_HELP2 659 -#define STRING_REM_HELP 659 +#define STRING_RMDIR_HELP 660 + +#define STRING_REM_HELP 661