[reactos] 02/02: [NET] Move PAUSE, PRINT, SEND, SESSION and SHARE command syntax and help texts into a message table.
24 Dec
2018
24 Dec
'18
12:27 a.m.
https://git.reactos.org/?p=reactos.git;a=commitdiff;h=01af56140c8c8983de5d4…
commit 01af56140c8c8983de5d43a523fa21320a616afa
Author: Eric Kohl <eric.kohl(a)reactos.org>
AuthorDate: Mon Dec 24 01:25:30 2018 +0100
Commit: Eric Kohl <eric.kohl(a)reactos.org>
CommitDate: Mon Dec 24 01:25:30 2018 +0100
[NET] Move PAUSE, PRINT, SEND, SESSION and SHARE command syntax and help texts into a
message table.
---
base/applications/network/net/cmdPause.c | 7 +-
base/applications/network/net/help.c | 21 +-
base/applications/network/net/lang/en-US.rc | 11 -
base/applications/network/net/lang/es-ES.rc | 11 -
base/applications/network/net/lang/pl-PL.rc | 11 -
base/applications/network/net/lang/ro-RO.rc | 11 -
base/applications/network/net/lang/ru-RU.rc | 11 -
base/applications/network/net/lang/tr-TR.rc | 11 -
base/applications/network/net/lang/zh-CN.rc | 11 -
base/applications/network/net/lang/zh-TW.rc | 11 -
base/applications/network/net/resource.h | 11 -
sdk/include/reactos/mc/net_msg.mc | 348 ++++++++++++++++++++++++++++
12 files changed, 361 insertions(+), 114 deletions(-)
diff --git a/base/applications/network/net/cmdPause.c
b/base/applications/network/net/cmdPause.c
index 05e07b884f..afd583595c 100644
--- a/base/applications/network/net/cmdPause.c
+++ b/base/applications/network/net/cmdPause.c
@@ -20,7 +20,7 @@ INT cmdPause(INT argc, WCHAR **argv)
if (argc != 3)
{
ConResPuts(StdOut, IDS_GENERIC_SYNTAX);
- ConResPuts(StdOut, IDS_PAUSE_SYNTAX);
+ PrintNetMessage(MSG_PAUSE_SYNTAX);
return 1;
}
@@ -29,9 +29,8 @@ INT cmdPause(INT argc, WCHAR **argv)
if (_wcsicmp(argv[i], L"/help") == 0)
{
ConResPuts(StdOut, IDS_GENERIC_SYNTAX);
- ConResPuts(StdOut, IDS_PAUSE_SYNTAX);
- ConResPuts(StdOut, IDS_PAUSE_HELP_1);
- ConResPuts(StdOut, IDS_PAUSE_HELP_2);
+ PrintNetMessage(MSG_PAUSE_SYNTAX);
+ PrintNetMessage(MSG_PAUSE_HELP);
return 1;
}
}
diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c
index ae36e3d536..d509594a37 100644
--- a/base/applications/network/net/help.c
+++ b/base/applications/network/net/help.c
@@ -99,37 +99,36 @@ INT cmdHelp(INT argc, WCHAR **argv)
if (_wcsicmp(argv[2], L"PAUSE") == 0)
{
- ConResPuts(StdOut, IDS_PAUSE_SYNTAX);
- ConResPuts(StdOut, IDS_PAUSE_HELP_1);
- ConResPuts(StdOut, IDS_PAUSE_HELP_2);
+ PrintNetMessage(MSG_PAUSE_SYNTAX);
+ PrintNetMessage(MSG_PAUSE_HELP);
return 0;
}
if (_wcsicmp(argv[2], L"PRINT") == 0)
{
- ConResPuts(StdOut, IDS_PRINT_SYNTAX);
- ConResPuts(StdOut, IDS_PRINT_HELP);
+ PrintNetMessage(MSG_PRINT_SYNTAX);
+ PrintNetMessage(MSG_PRINT_HELP);
return 0;
}
if (_wcsicmp(argv[2], L"SEND") == 0)
{
- ConResPuts(StdOut, IDS_SEND_SYNTAX);
- ConResPuts(StdOut, IDS_SEND_HELP);
+ PrintNetMessage(MSG_SEND_SYNTAX);
+ PrintNetMessage(MSG_SEND_HELP);
return 0;
}
if (_wcsicmp(argv[2], L"SESSION") == 0)
{
- ConResPuts(StdOut, IDS_SESSION_SYNTAX);
- ConResPuts(StdOut, IDS_SESSION_HELP);
+ PrintNetMessage(MSG_SESSION_SYNTAX);
+ PrintNetMessage(MSG_SESSION_HELP);
return 0;
}
if (_wcsicmp(argv[2], L"SHARE") == 0)
{
- ConResPuts(StdOut, IDS_SHARE_SYNTAX);
- ConResPuts(StdOut, IDS_SHARE_HELP);
+ PrintNetMessage(MSG_SHARE_SYNTAX);
+ PrintNetMessage(MSG_SHARE_HELP);
return 0;
}
diff --git a/base/applications/network/net/lang/en-US.rc
b/base/applications/network/net/lang/en-US.rc
index b9c6eed84c..cd8f368158 100644
--- a/base/applications/network/net/lang/en-US.rc
+++ b/base/applications/network/net/lang/en-US.rc
@@ -2,17 +2,6 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
STRINGTABLE
BEGIN
- IDS_PRINT_SYNTAX "NET PRINT ...\n\n"
- IDS_PRINT_HELP "PRINT\n...\n\n"
- IDS_PAUSE_SYNTAX "NET PAUSE service\n\n"
- IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on
hold.\n\n"
- IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n"
- IDS_SEND_SYNTAX "NET SEND ...\n\n"
- IDS_SEND_HELP "SEND\n...\n\n"
- IDS_SESSION_SYNTAX "NET SESSION ...\n\n"
- IDS_SESSION_HELP "SESSION\n...\n\n"
- IDS_SHARE_SYNTAX "NET SHARE ...\n\n"
- IDS_SHARE_HELP "SHARE\n...\n\n"
IDS_START_SYNTAX "NET START [service]\n\n"
IDS_START_HELP_1 "NET START starts services or lists running
services.\n\n"
IDS_START_HELP_2 "service The name of the service to be started.\n\n"
diff --git a/base/applications/network/net/lang/es-ES.rc
b/base/applications/network/net/lang/es-ES.rc
index 1baf4f450c..39950eb2b6 100644
--- a/base/applications/network/net/lang/es-ES.rc
+++ b/base/applications/network/net/lang/es-ES.rc
@@ -5,17 +5,6 @@ LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
STRINGTABLE
BEGIN
- IDS_PRINT_SYNTAX "NET PRINT ...\n\n"
- IDS_PRINT_HELP "PRINT\n...\n\n"
- IDS_PAUSE_SYNTAX "NET PAUSE <nombre del servicio>\n\n"
- IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on
hold.\n\n"
- IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n"
- IDS_SEND_SYNTAX "NET SEND ...\n\n"
- IDS_SEND_HELP "SEND\n...\n\n"
- IDS_SESSION_SYNTAX "NET SESSION ...\n\n"
- IDS_SESSION_HELP "SESSION\n...\n\n"
- IDS_SHARE_SYNTAX "NET SHARE ...\n\n"
- IDS_SHARE_HELP "SHARE\n...\n\n"
IDS_START_SYNTAX "NET START [service]\n\n"
IDS_START_HELP_1 "NET START starts services or lists running
services.\n\n"
IDS_START_HELP_2 "service The name of the service to be started.\n\n"
diff --git a/base/applications/network/net/lang/pl-PL.rc
b/base/applications/network/net/lang/pl-PL.rc
index 5b220b6a33..b41750401a 100644
--- a/base/applications/network/net/lang/pl-PL.rc
+++ b/base/applications/network/net/lang/pl-PL.rc
@@ -1,17 +1,6 @@
LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
STRINGTABLE
BEGIN
- IDS_PRINT_SYNTAX "NET PRINT ...\n\n"
- IDS_PRINT_HELP "PRINT\n...\n\n"
- IDS_PAUSE_SYNTAX "NET PAUSE usługa\n\n"
- IDS_PAUSE_HELP_1 "NET PAUSE wstrzymuje usługę.\n\n"
- IDS_PAUSE_HELP_2 "usługa Nazwa wstrzymywanej usługi.\n\n"
- IDS_SEND_SYNTAX "NET SEND ...\n\n"
- IDS_SEND_HELP "SEND\n...\n\n"
- IDS_SESSION_SYNTAX "NET SESSION ...\n\n"
- IDS_SESSION_HELP "SESSION\n...\n\n"
- IDS_SHARE_SYNTAX "NET SHARE ...\n\n"
- IDS_SHARE_HELP "SHARE\n...\n\n"
IDS_START_SYNTAX "NET START [usługa]\n\n"
IDS_START_HELP_1 "NET START uruchamia usługi lub wyświetla uruchomione
usługi.\n\n"
IDS_START_HELP_2 "usługa Nazwa uruchamianej usługi.\n\n"
diff --git a/base/applications/network/net/lang/ro-RO.rc
b/base/applications/network/net/lang/ro-RO.rc
index d492608b3d..563cc9635a 100644
--- a/base/applications/network/net/lang/ro-RO.rc
+++ b/base/applications/network/net/lang/ro-RO.rc
@@ -8,17 +8,6 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
STRINGTABLE
BEGIN
- IDS_PRINT_SYNTAX "NET PRINT ...\n\n"
- IDS_PRINT_HELP "PRINT\n...\n\n"
- IDS_PAUSE_SYNTAX "NET PAUSE <nume serviciu>\n\n"
- IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on
hold.\n\n"
- IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n"
- IDS_SEND_SYNTAX "NET SEND ...\n\n"
- IDS_SEND_HELP "SEND\n...\n\n"
- IDS_SESSION_SYNTAX "NET SESSION ...\n\n"
- IDS_SESSION_HELP "SESSION\n...\n\n"
- IDS_SHARE_SYNTAX "NET SHARE ...\n\n"
- IDS_SHARE_HELP "SHARE\n...\n\n"
IDS_START_SYNTAX "NET START [service]\n\n"
IDS_START_HELP_1 "NET START starts services or lists running
services.\n\n"
IDS_START_HELP_2 "service The name of the service to be started.\n\n"
diff --git a/base/applications/network/net/lang/ru-RU.rc
b/base/applications/network/net/lang/ru-RU.rc
index e52cc2a30f..4e260e89ed 100644
--- a/base/applications/network/net/lang/ru-RU.rc
+++ b/base/applications/network/net/lang/ru-RU.rc
@@ -4,17 +4,6 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
STRINGTABLE
BEGIN
- IDS_PRINT_SYNTAX "NET PRINT ...\n\n"
- IDS_PRINT_HELP "PRINT\n...\n\n"
- IDS_PAUSE_SYNTAX "NET PAUSE <имя_службы>\n\n"
- IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on
hold.\n\n"
- IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n"
- IDS_SEND_SYNTAX "NET SEND ...\n\n"
- IDS_SEND_HELP "SEND\n...\n\n"
- IDS_SESSION_SYNTAX "NET SESSION ...\n\n"
- IDS_SESSION_HELP "SESSION\n...\n\n"
- IDS_SHARE_SYNTAX "NET SHARE ...\n\n"
- IDS_SHARE_HELP "SHARE\n...\n\n"
IDS_START_SYNTAX "NET START [service]\n\n"
IDS_START_HELP_1 "NET START starts services or lists running
services.\n\n"
IDS_START_HELP_2 "service The name of the service to be started.\n\n"
diff --git a/base/applications/network/net/lang/tr-TR.rc
b/base/applications/network/net/lang/tr-TR.rc
index 215df1ed0f..20d8d3198c 100644
--- a/base/applications/network/net/lang/tr-TR.rc
+++ b/base/applications/network/net/lang/tr-TR.rc
@@ -4,17 +4,6 @@ LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
STRINGTABLE
BEGIN
- IDS_PRINT_SYNTAX "NET PRINT ...\n\n"
- IDS_PRINT_HELP "PRINT\n...\n\n"
- IDS_PAUSE_SYNTAX "NET PAUSE service\n\n"
- IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on
hold.\n\n"
- IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n"
- IDS_SEND_SYNTAX "NET SEND ...\n\n"
- IDS_SEND_HELP "SEND\n...\n\n"
- IDS_SESSION_SYNTAX "NET SESSION ...\n\n"
- IDS_SESSION_HELP "SESSION\n...\n\n"
- IDS_SHARE_SYNTAX "NET SHARE ...\n\n"
- IDS_SHARE_HELP "SHARE\n...\n\n"
IDS_START_SYNTAX "NET START [service]\n\n"
IDS_START_HELP_1 "NET START starts services or lists running
services.\n\n"
IDS_START_HELP_2 "service The name of the service to be started.\n\n"
diff --git a/base/applications/network/net/lang/zh-CN.rc
b/base/applications/network/net/lang/zh-CN.rc
index 5bc5bdf5a0..c8b4cee23d 100644
--- a/base/applications/network/net/lang/zh-CN.rc
+++ b/base/applications/network/net/lang/zh-CN.rc
@@ -4,17 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
STRINGTABLE
BEGIN
- IDS_PRINT_SYNTAX "NET PRINT ...\n\n"
- IDS_PRINT_HELP "PRINT\n...\n\n"
- IDS_PAUSE_SYNTAX "NET PAUSE service\n\n"
- IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on
hold.\n\n"
- IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n"
- IDS_SEND_SYNTAX "NET SEND ...\n\n"
- IDS_SEND_HELP "SEND\n...\n\n"
- IDS_SESSION_SYNTAX "NET SESSION ...\n\n"
- IDS_SESSION_HELP "SESSION\n...\n\n"
- IDS_SHARE_SYNTAX "NET SHARE ...\n\n"
- IDS_SHARE_HELP "SHARE\n...\n\n"
IDS_START_SYNTAX "NET START [service]\n\n"
IDS_START_HELP_1 "NET START starts services or lists running
services.\n\n"
IDS_START_HELP_2 "service The name of the service to be started.\n\n"
diff --git a/base/applications/network/net/lang/zh-TW.rc
b/base/applications/network/net/lang/zh-TW.rc
index f3232457df..09f5b2c155 100644
--- a/base/applications/network/net/lang/zh-TW.rc
+++ b/base/applications/network/net/lang/zh-TW.rc
@@ -4,17 +4,6 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL
STRINGTABLE
BEGIN
- IDS_PRINT_SYNTAX "NET PRINT ...\n\n"
- IDS_PRINT_HELP "PRINT\n...\n\n"
- IDS_PAUSE_SYNTAX "NET PAUSE <服務名稱>\n\n"
- IDS_PAUSE_HELP_1 "NET PAUSE suspends a service. Pausing a service puts it on
hold.\n\n"
- IDS_PAUSE_HELP_2 "service The name of the service to be paused.\n\n"
- IDS_SEND_SYNTAX "NET SEND ...\n\n"
- IDS_SEND_HELP "SEND\n...\n\n"
- IDS_SESSION_SYNTAX "NET SESSION ...\n\n"
- IDS_SESSION_HELP "SESSION\n...\n\n"
- IDS_SHARE_SYNTAX "NET SHARE ...\n\n"
- IDS_SHARE_HELP "SHARE\n...\n\n"
IDS_START_SYNTAX "NET START [service]\n\n"
IDS_START_HELP_1 "NET START starts services or lists running
services.\n\n"
IDS_START_HELP_2 "service The name of the service to be started.\n\n"
diff --git a/base/applications/network/net/resource.h
b/base/applications/network/net/resource.h
index 888494f4b8..93bea7b079 100644
--- a/base/applications/network/net/resource.h
+++ b/base/applications/network/net/resource.h
@@ -1,16 +1,5 @@
#pragma once
-#define IDS_PAUSE_SYNTAX 152
-#define IDS_PAUSE_HELP_1 153
-#define IDS_PAUSE_HELP_2 154
-#define IDS_PRINT_SYNTAX 155
-#define IDS_PRINT_HELP 156
-#define IDS_SEND_SYNTAX 157
-#define IDS_SEND_HELP 158
-#define IDS_SESSION_SYNTAX 159
-#define IDS_SESSION_HELP 160
-#define IDS_SHARE_SYNTAX 161
-#define IDS_SHARE_HELP 162
#define IDS_START_SYNTAX 163
#define IDS_START_HELP_1 164
#define IDS_START_HELP_2 165
diff --git a/sdk/include/reactos/mc/net_msg.mc b/sdk/include/reactos/mc/net_msg.mc
index 8b61d17a55..dbeb3a126c 100644
--- a/sdk/include/reactos/mc/net_msg.mc
+++ b/sdk/include/reactos/mc/net_msg.mc
@@ -1772,3 +1772,351 @@ Language=Taiwanese
NAME
...
.
+
+
+MessageId=10022
+SymbolicName=MSG_PAUSE_SYNTAX
+Severity=Success
+Facility=System
+Language=English
+NET PAUSE service
+.
+Language=Polish
+NET PAUSE usługa
+.
+Language=Romanian
+NET PAUSE <nume serviciu>
+.
+Language=Russian
+NET PAUSE <имя_службы>
+.
+Language=Spanish
+NET PAUSE <nombre del servicio>
+.
+Language=Turkish
+NET PAUSE service
+.
+Language=Chinese
+NET PAUSE service
+.
+Language=Taiwanese
+NET PAUSE <服務名稱>
+.
+
+
+MessageId=10023
+SymbolicName=MSG_PAUSE_HELP
+Severity=Success
+Facility=System
+Language=English
+NET PAUSE suspends a service. Pausing a service puts it on hold.
+
+service The name of the service to be paused.
+.
+Language=Polish
+NET PAUSE wstrzymuje usługę.
+
+usługa Nazwa wstrzymywanej usługi.
+.
+Language=Romanian
+NET PAUSE suspends a service. Pausing a service puts it on hold.
+
+service The name of the service to be paused.
+.
+Language=Russian
+NET PAUSE suspends a service. Pausing a service puts it on hold.
+
+service The name of the service to be paused.
+.
+Language=Spanish
+NET PAUSE suspends a service. Pausing a service puts it on hold.
+service The name of the service to be paused.
+.
+Language=Turkish
+NET PAUSE suspends a service. Pausing a service puts it on hold.
+
+service The name of the service to be paused.
+.
+Language=Chinese
+NET PAUSE suspends a service. Pausing a service puts it on hold.
+
+service The name of the service to be paused.
+.
+Language=Taiwanese
+NET PAUSE suspends a service. Pausing a service puts it on hold.
+
+service The name of the service to be paused.
+.
+
+
+MessageId=10024
+SymbolicName=MSG_PRINT_SYNTAX
+Severity=Success
+Facility=System
+Language=English
+NET PRINT ...
+.
+Language=Polish
+NET PRINT ...
+.
+Language=Romanian
+NET PRINT ...
+.
+Language=Russian
+NET PRINT ...
+.
+Language=Spanish
+NET PRINT ...
+.
+Language=Turkish
+NET PRINT ...
+.
+Language=Chinese
+NET PRINT ...
+.
+Language=Taiwanese
+NET PRINT ...
+.
+
+
+MessageId=10025
+SymbolicName=MSG_PRINT_HELP
+Severity=Success
+Facility=System
+Language=English
+PRINT
+...
+.
+Language=Polish
+PRINT
+...
+.
+Language=Romanian
+PRINT
+...
+.
+Language=Russian
+PRINT
+...
+.
+Language=Spanish
+PRINT
+...
+.
+Language=Turkish
+PRINT
+...
+.
+Language=Chinese
+PRINT
+...
+.
+Language=Taiwanese
+PRINT
+...
+.
+
+
+MessageId=10026
+SymbolicName=MSG_SEND_SYNTAX
+Severity=Success
+Facility=System
+Language=English
+NET SEND ...
+.
+Language=Polish
+NET SEND ...
+.
+Language=Romanian
+NET SEND ...
+.
+Language=Russian
+NET SEND ...
+.
+Language=Spanish
+NET SEND ...
+.
+Language=Turkish
+NET SEND ...
+.
+Language=Chinese
+NET SEND ...
+.
+Language=Taiwanese
+NET SEND ...
+.
+
+
+MessageId=10027
+SymbolicName=MSG_SEND_HELP
+Severity=Success
+Facility=System
+Language=English
+SEND
+...
+.
+Language=Polish
+SEND
+...
+.
+Language=Romanian
+SEND
+...
+.
+Language=Russian
+SEND
+...
+.
+Language=Spanish
+SEND
+...
+.
+Language=Turkish
+SEND
+...
+.
+Language=Chinese
+SEND
+...
+.
+Language=Taiwanese
+SEND
+...
+.
+
+
+MessageId=10028
+SymbolicName=MSG_SESSION_SYNTAX
+Severity=Success
+Facility=System
+Language=English
+NET SESSION ...
+.
+Language=Polish
+NET SESSION ...
+.
+Language=Romanian
+NET SESSION ...
+.
+Language=Russian
+NET SESSION ...
+.
+Language=Spanish
+NET SESSION ...
+.
+Language=Turkish
+NET SESSION ...
+.
+Language=Chinese
+NET SESSION ...
+.
+Language=Taiwanese
+NET SESSION ...
+.
+
+
+MessageId=10029
+SymbolicName=MSG_SESSION_HELP
+Severity=Success
+Facility=System
+Language=English
+SESSION
+...
+.
+Language=Polish
+SESSION
+...
+.
+Language=Romanian
+SESSION
+...
+.
+Language=Russian
+SESSION
+...
+.
+Language=Spanish
+SESSION
+...
+.
+Language=Turkish
+SESSION
+...
+.
+Language=Chinese
+SESSION
+...
+.
+Language=Taiwanese
+SESSION
+...
+.
+
+
+MessageId=10030
+SymbolicName=MSG_SHARE_SYNTAX
+Severity=Success
+Facility=System
+Language=English
+NET SHARE ...
+.
+Language=Polish
+NET SHARE ...
+.
+Language=Romanian
+NET SHARE ...
+.
+Language=Russian
+NET SHARE ...
+.
+Language=Spanish
+NET SHARE ...
+.
+Language=Turkish
+NET SHARE ...
+.
+Language=Chinese
+NET SHARE ...
+.
+Language=Taiwanese
+NET SHARE ...
+.
+
+
+MessageId=10031
+SymbolicName=MSG_SHARE_HELP
+Severity=Success
+Facility=System
+Language=English
+SHARE
+...
+.
+Language=Polish
+SHARE
+...
+.
+Language=Romanian
+SHARE
+...
+.
+Language=Russian
+SHARE
+...
+.
+Language=Spanish
+SHARE
+...
+.
+Language=Turkish
+SHARE
+...
+.
+Language=Chinese
+SHARE
+...
+.
+Language=Taiwanese
+SHARE
+...
+.
+
2147
days inactive
2147
days old
0 comments
1 participants
participants (1)
-
Eric Kohl