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

Remove all hardcode string to En.rc

Browse source 
for all file 

This changes are only for  ver.c
Remove hardcode dev list to cmd.rc

update mailing adress for bug report to ros-dev@reactos.com
sugestion by GvG 

I did leave copyright year hardcode in ver.c


svn path=/trunk/; revision=14877
This commit is contained in:
Magnus Olsen 2005-04-30 15:46:59 +00:00
parent 5c87a8787a
commit f1dad288cd
8 changed files with 159 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -423,7 +423,62 @@ TIMER [ON|OFF] [/S] [/n] [/Fn]\n\n \
if none of ON, OFF or /S is specified the command\n \
will toggle stopwach state\n\n"
STRING_TYPE_HELP1, "Displays the contents of text files.\n\nTYPE [drive:][path]filename"
STRING_VERIFY_HELP1, "This command is just a dummy!!\n \
Sets whether to verify that your files are written correctly to a\n \
disk.\n\n \
VERIFY [ON | OFF]\n\n \
Type VERIFY without a parameter to display the current VERIFY setting."
STRING_VERIFY_HELP2, "VERIFY is %s.\n"
STRING_VERIFY_HELP3, "Must specify ON or OFF."
STRING_VERSION_HELP1, "Displays shell version information\n\n \
VER [/C][/R][/W]\n\n \
/C Displays credits.\n \
/R Displays redistribution information.\n \
/W Displays warranty information."
STRING_VERSION_HELP2, " comes with ABSOLUTELY NO WARRANTY; for details\n \
type: `ver /w'. This is free software, and you are welcome to redistribute\n \
it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n \
listing of credits."
STRING_VERSION_HELP3, "\n This program is distributed in the hope that it will be useful,\n \
but WITHOUT ANY WARRANTY; without even the implied warranty of\n \
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n \
GNU General Public License for more details."
STRING_VERSION_HELP4, "\n This program is free software; you can redistribute it and/or modify\n \
it under the terms of the GNU General Public License as published by\n \
the Free Software Foundation; either version 2 of the License, or\n \
(at your option) any later version."
STRING_VERSION_HELP5, "\nSend bug reports to <ros-dev@reactos.com>.\n \
Updates are available at: http://www.reactos.com"
STRING_VERSION_HELP6, "FreeDOS version written by:\n%s\nReactOS version written by:\n%s\n"
STRING_WINDOW_HELP1, "change console window aspect\n\n \
WINDOW [/POS[=]left,top,width,heigth]\n \
[MIN|MAX|RESTORE] ['title']\n\n \
/POS specify window placement and dimensions\n \
MIN minimize the window\n \
MAX maximize the window\n \
RESTORE restore the window"
STRING_WINDOW_HELP2, "change console window aspect\n\n \
ACTIAVTE 'window' [/POS[=]left,top,width,heigth]\n \
[MIN|MAX|RESTORE] ['title']\n\n \
window tile of window on wich perform actions\n \
/POS specify window placement and dimensions\n \
MIN minimize the window\n \
MAX maximize the window\n \
RESTORE restore the window\n \
title new title"
STRING_CHOICE_OPTION, "YN"
@ -487,6 +542,11 @@ STRING_START_ERROR1, "No batch support at the moment!"
STRING_TIME_ERROR1, "Invalid time."
STRING_TYPE_ERROR1, "Invalid option '/%s'\n"
STRING_WINDOW_ERROR1, "window not found"
STRING_ERROR_PARAMETERF_ERROR, "Parameter format not correct - %c\n"
STRING_ERROR_INVALID_SWITCH, "Invalid switch - /%c\n"
STRING_ERROR_TOO_MANY_PARAMETERS, "Too many parameters - %s\n"

13
reactos/subsys/system/cmd/cmd.rc
View file

@ -8,6 +8,19 @@
#define REACTOS_STR_LEGAL_COPYRIGHT "Copyright (C) 1998-2001 Eric Kohl and others\0"
#include <reactos/version.rc>
#include "En.rc"
STRINGTABLE DISCARDABLE
{
STRING_FreeDOS_DEV, " Tim Norman Matt Rains\n \
Evan Jeffrey Steffen Kaiser\n \
Svante Frey Oliver Mueller\n \
Aaron Kaufman Marc Desrochers\n \
Rob Lake John P Price\n \
Hans B Pufal\n"
STRING_REACTOS_DEV, " Eric Kohl Emanuele Aliberti\n \
Paolo Pantaleo Phillip Susi\n"
}

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

@ -68,6 +68,8 @@
#define STRING_REN_ERROR1 346
#define STRING_START_ERROR1 347
#define STRING_TIME_ERROR1 348
#define STRING_TYPE_ERROR1 349
#define STRING_WINDOW_ERROR1 350
@ -184,6 +186,28 @@
#define STRING_TIMER_HELP2 681
#define STRING_TIMER_HELP3 682
#define STRING_TYPE_HELP1 683
#define STRING_VERIFY_HELP1 684
#define STRING_VERIFY_HELP2 685
#define STRING_VERIFY_HELP3 686
#define STRING_VERSION_HELP1 687
#define STRING_VERSION_HELP2 688
#define STRING_VERSION_HELP3 689
#define STRING_VERSION_HELP4 690
#define STRING_VERSION_HELP5 691
#define STRING_VERSION_HELP6 692
#define STRING_WINDOW_HELP1 693
#define STRING_WINDOW_HELP2 694
#define STRING_FreeDOS_DEV 800
#define STRING_REACTOS_DEV 801

12
reactos/subsys/system/cmd/type.c
View file

@ -21,9 +21,13 @@
*
* 19-Jan-1999 (Paolo Pantaleo <paolopan@freemail.it>)
* Added multiple file support (copied from y.c)
*
* 30-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* Remove all hardcode string to En.rc
*/
#include "precomp.h"
#include "resource.h"
#ifdef INCLUDE_CMD_TYPE
@ -38,13 +42,14 @@ INT cmd_type (LPTSTR cmd, LPTSTR param)
INT argc,i;
LPTSTR *argv;
LPTSTR errmsg;
WCHAR szMsg[RC_STRING_MAX_SIZE];
hConsoleOut=GetStdHandle (STD_OUTPUT_HANDLE);
if (!_tcsncmp (param, _T("/?"), 2))
{
ConOutPuts (_T("Displays the contents of text files.\n\n"
"TYPE [drive:][path]filename"));
LoadString( GetModuleHandle(NULL), STRING_TYPE_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
return 0;
}
@ -60,7 +65,8 @@ INT cmd_type (LPTSTR cmd, LPTSTR param)
{
if (_T('/') == argv[i][0])
{
ConErrPrintf(_T("Invalid option \"%S\"\n"), argv[i] + 1);
LoadString( GetModuleHandle(NULL), STRING_TYPE_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPrintf ((LPTSTR)szMsg, argv[i] + 1);
continue;
}
hFile = CreateFile(argv[i],

47
reactos/subsys/system/cmd/ver.c
View file

@ -22,6 +22,7 @@
*/
#include "precomp.h"
#include "resource.h"
VOID ShortVersion (VOID)
@ -63,16 +64,15 @@ VOID ShortVersion (VOID)
INT cmd_ver (LPTSTR cmd, LPTSTR param)
{
INT i;
WCHAR szMsg[RC_STRING_MAX_SIZE];
WCHAR rosdev[RC_STRING_MAX_SIZE];
WCHAR fredev[RC_STRING_MAX_SIZE];
if (_tcsstr (param, _T("/?")) != NULL)
{
ConOutPuts (_T("Displays shell version information\n"
"\n"
"VER [/C][/R][/W]\n"
"\n"
" /C Displays credits.\n"
" /R Displays redistribution information.\n"
" /W Displays warranty information."));
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
return 0;
}
@ -83,11 +83,9 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
/* Basic copyright notice */
if (param[0] == _T('\0'))
{
ConOutPuts (_T("\n"SHELLINFO
" comes with ABSOLUTELY NO WARRANTY; for details\n"
"type: `ver /w'. This is free software, and you are welcome to redistribute\n"
"it under certain conditions; type `ver /r' for details. Type `ver /c' for a\n"
"listing of credits."));
ConOutPuts (_T("\n"SHELLINFO));
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
}
else
{
@ -111,22 +109,25 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
if (_totupper (param[i]) == _T('W'))
{
/* Warranty notice */
ConOutPuts (_T("\n This program is distributed in the hope that it will be useful,\n"
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
" GNU General Public License for more details."));
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP3, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
}
else if (_totupper (param[i]) == _T('R'))
{
/* Redistribution notice */
ConOutPuts (_T("\n This program is free software; you can redistribute it and/or modify\n"
" it under the terms of the GNU General Public License as published by\n"
" the Free Software Foundation; either version 2 of the License, or\n"
" (at your option) any later version."));
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP4, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
}
else if (_totupper (param[i]) == _T('C'))
{
/* Developer listing */
LoadString( GetModuleHandle(NULL), STRING_REACTOS_DEV, (LPTSTR) rosdev,sizeof(rosdev));
LoadString( GetModuleHandle(NULL), STRING_FreeDOS_DEV, (LPTSTR) fredev,sizeof(fredev));
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP6, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf ((LPTSTR)szMsg,fredev,rosdev);
/*
ConOutPuts (_T("\n"
"FreeDOS version written by:\n"
" Tim Norman Matt Rains\n"
@ -139,6 +140,7 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
"ReactOS version written by:\n"
" Eric Kohl Emanuele Aliberti\n"
" Paolo Pantaleo Phillip Susi\n"));
*/
}
else
{
@ -148,9 +150,8 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
}
}
ConOutPuts (_T("\n"
"Send bug reports to <ekohl@rz-online.de>.\n"
"Updates are available at: http://www.reactos.com"));
LoadString( GetModuleHandle(NULL), STRING_VERSION_HELP5, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
return 0;
}

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

@ -13,9 +13,13 @@
*
* 20-Jan-1999 (Eric Kohl <ekohl@abo.rhein-zeitung.de>)
* Unicode and redirection ready!
*
* 30-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* Remove all hardcode string to En.rc
*/
#include "precomp.h"
#include "resource.h"
#ifdef INCLUDE_CMD_VERIFY
@ -26,24 +30,27 @@ static BOOL bVerify = FALSE;
INT cmd_verify (LPTSTR cmd, LPTSTR param)
{
WCHAR szMsg[RC_STRING_MAX_SIZE];
if (!_tcsncmp (param, _T("/?"), 2))
{
ConOutPuts (_T("This command is just a dummy!!\n"
"Sets whether to verify that your files are written correctly to a\n"
"disk.\n\n"
"VERIFY [ON | OFF]\n\n"
"Type VERIFY without a parameter to display the current VERIFY setting."));
LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
return 0;
}
if (!*param)
ConOutPrintf (_T("VERIFY is %s.\n"), bVerify ? D_ON : D_OFF);
{
LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPrintf ((LPTSTR)szMsg, bVerify ? D_ON : D_OFF);
}
else if (_tcsicmp (param, D_OFF) == 0)
bVerify = FALSE;
else if (_tcsicmp (param, D_ON) == 0)
bVerify = TRUE;
else
ConOutPuts (_T("Must specify ON or OFF."));
else
LoadString( GetModuleHandle(NULL), STRING_VERIFY_HELP3, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
return 0;
}

1
reactos/subsys/system/cmd/vol.c
View file

@ -21,6 +21,7 @@
*/
#include "precomp.h"
#include "resource.h"
#ifdef INCLUDE_CMD_VOL

34
reactos/subsys/system/cmd/window.c
View file

@ -10,10 +10,14 @@
* 29 Sep 1999 (Paolo Pantaleo)
* activate and window in a single file using mainly the same code
* (nice size optimization :)
*
* 30-Apr-2005 (Magnus Olsen) <magnus@greatlord.com>)
* Remove all hardcode string to En.rc
*/
#include "precomp.h"
#include "resource.h"
#if ( defined(INCLUDE_CMD_WINDOW) || defined(INCLUDE_CMD_ACTIVATE) )
@ -173,18 +177,13 @@ INT ServiceActivate (LPTSTR param, HWND hWnd)
INT CommandWindow (LPTSTR cmd, LPTSTR param)
{
HWND h;
WCHAR szMsg[RC_STRING_MAX_SIZE];
if (_tcsncmp (param, _T("/?"), 2) == 0)
{
ConOutPuts(_T("change console window aspect\n"
"\n"
"WINDOW [/POS[=]left,top,width,heigth]\n"
" [MIN|MAX|RESTORE] [\"title\"]\n"
"\n"
"/POS specify window placement and dimensions\n"
"MIN minimize the window\n"
"MAX maximize the window\n"
"RESTORE restore the window"));
LoadString( GetModuleHandle(NULL), STRING_WINDOW_HELP1, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
return 0;
}
@ -198,20 +197,12 @@ INT CommandActivate (LPTSTR cmd, LPTSTR param)
{
LPTSTR str;
HWND h;
WCHAR szMsg[RC_STRING_MAX_SIZE];
if (_tcsncmp (param, _T("/?"), 2) == 0)
{
ConOutPuts(_T("change console window aspect\n"
"\n"
"ACTIAVTE \"window\" [/POS[=]left,top,width,heigth]\n"
" [MIN|MAX|RESTORE] [\"title\"]\n"
"\n"
"window tile of window on wich perform actions\n"
"/POS specify window placement and dimensions\n"
"MIN minimize the window\n"
"MAX maximize the window\n"
"RESTORE restore the window\n"
"title new title"));
LoadString( GetModuleHandle(NULL), STRING_WINDOW_HELP2, (LPTSTR) szMsg,sizeof(szMsg));
ConOutPuts ((LPTSTR)szMsg);
return 0;
}
@ -231,7 +222,8 @@ INT CommandActivate (LPTSTR cmd, LPTSTR param)
h=FindWindow(NULL, param);
if (!h)
{
ConErrPuts("window not found");
LoadString( GetModuleHandle(NULL), STRING_WINDOW_ERROR1, (LPTSTR) szMsg,sizeof(szMsg));
ConErrPuts ((LPTSTR)szMsg);
return 1;
}