Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-21 11:48:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove all hardcode string to En.rc

Browse source 
from memmory.c

svn path=/trunk/; revision=14852
This commit is contained in:
Magnus Olsen 2005-04-28 22:05:26 +00:00
parent 1e92d6dfb5
commit 0dd12c923f
3 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reactos/subsys/system/cmd/En.rc
View file

@ -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"

23
reactos/subsys/system/cmd/memory.c
View file

@ -6,9 +6,13 @@
*
* 01-Sep-1999 (Eric Kohl)
* Started.
*
* 28-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* 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);

7
reactos/subsys/system/cmd/resource.h
View file

@ -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