found some hard code string move them to En.rc

them new are STRING_CMD_INVALIDDRIVE, STRING_CMD_SHELLINFO, STRING_VERSION_RUNVER
remove some #define strings that was not in use.
update ver so it output svn version number and update copyright note
it take the copyright and buildversion from <reactos/resource.h> and <reactos/buildno.h>
so we only need change it on one place

svn path=/trunk/; revision=15123

diff --git a/reactos/subsys/system/cmd/En.rc b/reactos/subsys/system/cmd/En.rc
index 71c898c..f6153a3 100644 (file)
--- a/reactos/subsys/system/cmd/En.rc
+++ b/reactos/subsys/system/cmd/En.rc
@@ -560,4 +560,9 @@ STRING_ERROR_D_PAUSEMSG,           "Press any key to continue . . ."
 STRING_ERROR_DRIVER_NOT_READY,     "Drive not ready"\r
 \r
 STRING_PATH_ERROR,                 "CMD: Not in environment '%s'\n"\r
+\r
+\r
+STRING_CMD_INVALIDDRIVE,           "ERROR: invalid drive"\r
+STRING_CMD_SHELLINFO,              "\nReactOS Command Line Interpreter"\r
+STRING_VERSION_RUNVER              " running on %s"\r
 }\r

diff --git a/reactos/subsys/system/cmd/cmd.c b/reactos/subsys/system/cmd/cmd.c
index de0c8fd..7829f07 100644 (file)
--- a/reactos/subsys/system/cmd/cmd.c
+++ b/reactos/subsys/system/cmd/cmd.c
@@ -333,7 +333,7 @@ Execute (LPTSTR full, LPTSTR first, LPTSTR rest)
                        working = SetCurrentDirectory(str);
                }
 
-               if (!working) ConErrPuts (INVALIDDRIVE);
+               if (!working) ConErrResPuts (STRING_CMD_INVALIDDRIVE);
 
                return;
        }

diff --git a/reactos/subsys/system/cmd/cmd.h b/reactos/subsys/system/cmd/cmd.h
index 5bc2da4..ba0a5bd 100644 (file)
--- a/reactos/subsys/system/cmd/cmd.h
+++ b/reactos/subsys/system/cmd/cmd.h
@@ -48,17 +48,6 @@
 #define BREAK_IGNORE 4
 
 /* define some error messages */
-#define NOENVERR        _T("ERROR: no environment")
-#define INVALIDDRIVE    _T("ERROR: invalid drive")
-#define INVALIDFUNCTION _T("ERROR: invalid function")
-#define ACCESSDENIED    _T("ERROR: access denied")
-#define BADENVIROMENT   _T("ERROR: bad enviroment")
-#define BADFORMAT       _T("ERROR: bad format")
-#define ERROR_E2BIG     _T("ERROR: Argument list too long")
-#define ERROR_EINVAL    _T("ERROR: Invalid argument")
-
-#define SHELLINFO       "ReactOS Command Line Interpreter"
-
 
 #define D_ON         _T("on")
 #define D_OFF        _T("off")

diff --git a/reactos/subsys/system/cmd/resource.h b/reactos/subsys/system/cmd/resource.h
index 6d355a7..5478ed1 100644 (file)
--- a/reactos/subsys/system/cmd/resource.h
+++ b/reactos/subsys/system/cmd/resource.h
@@ -1,3 +1,5 @@
+\r
+\r
 #define RC_STRING_MAX_SIZE                 3072\r
 \r
 \r
@@ -81,125 +83,130 @@
 #define STRING_CMD_HELP5                   612\r
 #define STRING_CMD_HELP6                   613\r
 #define STRING_CMD_HELP7                   614\r
-#define STRING_CMD_HELP8                   615\r
-#define STRING_COLOR_HELP1                 616\r
-#define STRING_COPY_HELP1                  617\r
-#define STRING_COPY_HELP2                  618\r
-#define STRING_DATE_HELP1                  619\r
-#define STRING_DATE_HELP2                  620\r
-#define STRING_DATE_HELP3                  621\r
-#define STRING_DATE_HELP4                  622\r
-#define STRING_DEL_HELP1                   623\r
-#define STRING_DEL_HELP2                   624\r
-#define STRING_DEL_HELP3                   625\r
-#define STRING_DEL_HELP4                   626\r
-#define STRING_DELAY_HELP                  627\r
+#define STRING_CMD_HELP8                   615 \r
+#define STRING_CMD_INVALIDDRIVE            617\r
+#define STRING_CMD_SHELLINFO               624\r
+\r
+#define STRING_COLOR_HELP1                 625\r
+#define STRING_COPY_HELP1                  626\r
+#define STRING_COPY_HELP2                  627\r
+\r
+#define STRING_DATE_HELP1                  628\r
+#define STRING_DATE_HELP2                  629\r
+#define STRING_DATE_HELP3                  630\r
+#define STRING_DATE_HELP4                  631\r
+#define STRING_DEL_HELP1                   632\r
+#define STRING_DEL_HELP2                   633\r
+#define STRING_DEL_HELP3                   634\r
+#define STRING_DEL_HELP4                   635\r
+#define STRING_DELAY_HELP                  636\r
 \r
-#define STRING_DIR_HELP1                   628\r
-#define STRING_DIR_HELP2                   629\r
-#define STRING_DIR_HELP3                   630\r
-#define STRING_DIR_HELP4                   631\r
-#define STRING_DIR_HELP5                   632\r
-#define STRING_DIR_HELP6                   633\r
-#define STRING_DIR_HELP7                   634\r
-#define STRING_DIR_HELP8                   635\r
+#define STRING_DIR_HELP1                   637\r
+#define STRING_DIR_HELP2                   638\r
+#define STRING_DIR_HELP3                   639\r
+#define STRING_DIR_HELP4                   640\r
+#define STRING_DIR_HELP5                   641\r
+#define STRING_DIR_HELP6                   642\r
+#define STRING_DIR_HELP7                   643\r
+#define STRING_DIR_HELP8                   644\r
 \r
-#define STRING_DIRSTACK_HELP1              636\r
-#define STRING_DIRSTACK_HELP2              637\r
-#define STRING_DIRSTACK_HELP3              638\r
-#define STRING_DIRSTACK_HELP4              639\r
+#define STRING_DIRSTACK_HELP1              645\r
+#define STRING_DIRSTACK_HELP2              646\r
+#define STRING_DIRSTACK_HELP3              647\r
+#define STRING_DIRSTACK_HELP4              648\r
 \r
-#define STRING_ECHO_HELP1                  640\r
-#define STRING_ECHO_HELP2                  641\r
-#define STRING_ECHO_HELP3                  642\r
-#define STRING_ECHO_HELP4                  643\r
-#define STRING_ECHO_HELP5                  644\r
+#define STRING_ECHO_HELP1                  649\r
+#define STRING_ECHO_HELP2                  650\r
+#define STRING_ECHO_HELP3                  651\r
+#define STRING_ECHO_HELP4                  652\r
+#define STRING_ECHO_HELP5                  653\r
 \r
-#define STRING_EXIT_HELP                   645\r
+#define STRING_EXIT_HELP                   654\r
 \r
-#define STRING_FOR_HELP1                   646\r
+#define STRING_FOR_HELP1                   655\r
 \r
-#define STRING_FREE_HELP1                  647\r
-#define STRING_FREE_HELP2                  648\r
+#define STRING_FREE_HELP1                  656\r
+#define STRING_FREE_HELP2                  657\r
 \r
-#define STRING_IF_HELP1                    650\r
+#define STRING_IF_HELP1                    658\r
 \r
-#define STRING_GOTO_HELP1                  651\r
+#define STRING_GOTO_HELP1                  659\r
 \r
-#define STRING_LABEL_HELP1                 652\r
-#define STRING_LABEL_HELP2                 653\r
-#define STRING_LABEL_HELP3                 654\r
-#define STRING_LABEL_HELP4                 655\r
-#define STRING_LABEL_HELP5                 656\r
+#define STRING_LABEL_HELP1                 660\r
+#define STRING_LABEL_HELP2                 661\r
+#define STRING_LABEL_HELP3                 662\r
+#define STRING_LABEL_HELP4                 663\r
+#define STRING_LABEL_HELP5                 664\r
 \r
-#define STRING_LOCALE_HELP1                657\r
+#define STRING_LOCALE_HELP1                665\r
 \r
-#define STRING_MKDIR_HELP                  658\r
+#define STRING_MKDIR_HELP                  666\r
 \r
-#define STRING_MEMMORY_HELP1               659\r
-#define STRING_MEMMORY_HELP2               660\r
+#define STRING_MEMMORY_HELP1               667\r
+#define STRING_MEMMORY_HELP2               668\r
 \r
-#define STRING_MISC_HELP1                  661\r
+#define STRING_MISC_HELP1                  669\r
 \r
-#define STRING_MOVE_HELP1                  662\r
-#define STRING_MOVE_HELP2                  663\r
+#define STRING_MOVE_HELP1                  670\r
+#define STRING_MOVE_HELP2                  671\r
 \r
-#define STRING_MSGBOX_HELP                 664\r
+#define STRING_MSGBOX_HELP                 672\r
 \r
-#define STRING_PATH_HELP1                  665\r
+#define STRING_PATH_HELP1                  673\r
 \r
-#define STRING_PAUSE_HELP1                 666\r
+#define STRING_PAUSE_HELP1                 674\r
 \r
-#define STRING_PROMPT_HELP1                667\r
-#define STRING_PROMPT_HELP2                668\r
-#define STRING_PROMPT_HELP3                669\r
+#define STRING_PROMPT_HELP1                675\r
+#define STRING_PROMPT_HELP2                676\r
+#define STRING_PROMPT_HELP3                677\r
 \r
-#define STRING_REM_HELP                    670\r
+#define STRING_REM_HELP                    678\r
 \r
-#define STRING_REN_HELP1                   671\r
-#define STRING_REN_HELP2                   672\r
-#define STRING_REN_HELP3                   673\r
+#define STRING_REN_HELP1                   679\r
+#define STRING_REN_HELP2                   680\r
+#define STRING_REN_HELP3                   681\r
 \r
-#define STRING_RMDIR_HELP                  674\r
+#define STRING_RMDIR_HELP                  682\r
 \r
-#define STRING_SCREEN_HELP                 675\r
+#define STRING_SCREEN_HELP                 683\r
 \r
-#define STRING_SHIFT_HELP                  676\r
+#define STRING_SHIFT_HELP                  684\r
 \r
-#define STRING_SET_HELP                    677\r
+#define STRING_SET_HELP                    685\r
 \r
-#define STRING_START_HELP1                 678\r
+#define STRING_START_HELP1                 686\r
 \r
-#define STRING_TITLE_HELP                  679\r
+#define STRING_TITLE_HELP                  687\r
 \r
-#define STRING_TIME_HELP1                  680\r
-#define STRING_TIME_HELP2                  681\r
+#define STRING_TIME_HELP1                  688\r
+#define STRING_TIME_HELP2                  689\r
 \r
-#define STRING_TIMER_HELP1                 682\r
-#define STRING_TIMER_HELP2                 683\r
-#define STRING_TIMER_HELP3                 684\r
+#define STRING_TIMER_HELP1                 690\r
+#define STRING_TIMER_HELP2                 691\r
+#define STRING_TIMER_HELP3                 692\r
 \r
-#define STRING_TYPE_HELP1                  685\r
+#define STRING_TYPE_HELP1                  693\r
 \r
-#define STRING_VERIFY_HELP1                686\r
-#define STRING_VERIFY_HELP2                687\r
-#define STRING_VERIFY_HELP3                688\r
+#define STRING_VERIFY_HELP1                694\r
+#define STRING_VERIFY_HELP2                695\r
+#define STRING_VERIFY_HELP3                696\r
 \r
-#define STRING_VERSION_HELP1               689\r
-#define STRING_VERSION_HELP2               690\r
-#define STRING_VERSION_HELP3               691\r
-#define STRING_VERSION_HELP4               692\r
-#define STRING_VERSION_HELP5               693\r
-#define STRING_VERSION_HELP6               694\r
-#define STRING_VERSION_HELP7               695\r
+#define STRING_VERSION_HELP1               697\r
+#define STRING_VERSION_HELP2               698\r
+#define STRING_VERSION_HELP3               699\r
+#define STRING_VERSION_HELP4               700\r
+#define STRING_VERSION_HELP5               701\r
+#define STRING_VERSION_HELP6               702\r
+#define STRING_VERSION_HELP7               703\r
+#define STRING_VERSION_RUNVER              705\r
 \r
-#define STRING_VOL_HELP1                   696\r
-#define STRING_VOL_HELP2                   697\r
-#define STRING_VOL_HELP3                   698\r
-#define STRING_VOL_HELP4                   699\r
+#define STRING_VOL_HELP1                   706\r
+#define STRING_VOL_HELP2                   707\r
+#define STRING_VOL_HELP3                   708\r
+#define STRING_VOL_HELP4                   709\r
 \r
-#define STRING_WINDOW_HELP1                700\r
-#define STRING_WINDOW_HELP2                701\r
+#define STRING_WINDOW_HELP1                710\r
+#define STRING_WINDOW_HELP2                711\r
 \r
 /* These strings are language independent (cmd.rc) */\r
 #define STRING_FREEDOS_DEV                 800\r

diff --git a/reactos/subsys/system/cmd/start.c b/reactos/subsys/system/cmd/start.c
index a05d137..49653fd 100644 (file)
--- a/reactos/subsys/system/cmd/start.c
+++ b/reactos/subsys/system/cmd/start.c
@@ -39,7 +39,7 @@ INT cmd_start (LPTSTR first, LPTSTR rest)
                SetCurrentDirectory (szPath);
                GetCurrentDirectory (MAX_PATH, szPath);
                if (szPath[0] != (TCHAR)_totupper (*first))
-                       ConErrPuts (INVALIDDRIVE);
+                       ConErrResPuts (STRING_CMD_INVALIDDRIVE);
 
                return 0;
        }

diff --git a/reactos/subsys/system/cmd/ver.c b/reactos/subsys/system/cmd/ver.c
index 389464c..c202107 100644 (file)
--- a/reactos/subsys/system/cmd/ver.c
+++ b/reactos/subsys/system/cmd/ver.c
@@ -23,6 +23,7 @@
 
 #include "precomp.h"
 #include "resource.h"
+#include <reactos/resource.h>
 
 
 VOID ShortVersion (VOID)
@@ -30,15 +31,13 @@ VOID ShortVersion (VOID)
        OSVERSIONINFO VersionInfo;
        unsigned RosVersionLen;
        LPTSTR RosVersion;
-
-       ConOutPuts (_T("\n"
-                      SHELLINFO));
+       TCHAR szMsg[RC_STRING_MAX_SIZE];
+       
+       ConOutResPuts (STRING_CMD_SHELLINFO );
        VersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-#ifdef _UNICODE
-               ConOutPrintf(_T("%S"), SHELLVER);
-#else
-               ConOutPrintf(_T("%s"), SHELLVER);
-#endif /* _UNICODE */
+
+       ConOutPrintf(_T("Version %s %s"), _T(KERNEL_RELEASE_STR), _T(KERNEL_VERSION_BUILD_STR));
+
        memset(VersionInfo.szCSDVersion, 0, sizeof(VersionInfo.szCSDVersion));
        if (GetVersionEx(&VersionInfo))
        {
@@ -47,7 +46,8 @@ VOID ShortVersion (VOID)
                                (RosVersion - VersionInfo.szCSDVersion);
                if (7 <= RosVersionLen && 0 == _tcsnicmp(RosVersion, _T("ReactOS"), 7))
                {
-                       ConOutPrintf(_T(" running on %s"), RosVersion);
+                       LoadString( GetModuleHandle(NULL), STRING_VERSION_RUNVER, (LPTSTR) szMsg,sizeof(szMsg));
+            ConOutPrintf ((LPTSTR)szMsg, RosVersion);
                }
        }
        ConOutPuts (_T("\n"));
@@ -73,12 +73,12 @@ INT cmd_ver (LPTSTR cmd, LPTSTR param)
 
        ShortVersion();
        ConOutPuts (_T("Copyright (C) 1994-1998 Tim Norman and others."));
-       ConOutPuts (_T("Copyright (C) 1998-2005 Eric Kohl and others."));
+       ConOutPuts (_T(RES_STR_LEGAL_COPYRIGHT));
 
        /* Basic copyright notice */
        if (param[0] == _T('\0'))
        {
-               ConOutPuts(_T("\n"SHELLINFO));
+               ConOutResPuts (STRING_CMD_SHELLINFO );
                ConOutResPuts(STRING_VERSION_HELP2);
        }
        else