Ros-diffs April 2018

ros-diffs@reactos.org

26 participants
247 discussions

03/04: [ZIPFLDR] Implement Italian resource translation

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ee7c15445ceb50fb1fe8f… commit ee7c15445ceb50fb1fe8f73739104a6edb5d04a3 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Apr 8 18:38:19 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 14 19:29:40 2018 +0200 [ZIPFLDR] Implement Italian resource translation --- dll/shellext/zipfldr/lang/it-IT.rc | 71 ++++++++++++++++++++++++++++++++++++++ dll/shellext/zipfldr/zipfldr.rc | 3 ++ 2 files changed, 74 insertions(+) diff --git a/dll/shellext/zipfldr/lang/it-IT.rc b/dll/shellext/zipfldr/lang/it-IT.rc new file mode 100644 index 0000000000..6d63957c76 --- /dev/null +++ b/dll/shellext/zipfldr/lang/it-IT.rc @@ -0,0 +1,71 @@ +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: Italian resource translation + * COPYRIGHT: Copyright 2018 Bișoc George (fraizeraust99 at gmail dot com) + */ + +LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL + +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Seleziona una Destinazione" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "Seleziona la cartella di destinazione",IDC_STATIC,6,12,174,8 + EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL + PUSHBUTTON "Sfoglia...",IDC_BROWSE,174,42,54,14 + PUSHBUTTON "Password",IDC_PASSWORD,174,66,54,14 + LTEXT "Estrazione...",IDC_STATIC,6,114,42,8 + CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 +END + +IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Estrazione Completa" +FONT 8, "MS Shell Dlg", 400, 0, 0x0 +BEGIN + LTEXT "I file sono stati estratti nella seguente cartella:",IDC_STATIC,6,12,222,18 + LTEXT "Cartella destinazione",IDC_DESTDIR,6,36,222,8 + CONTROL "Mostra i file estratti",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 + LTEXT "Premi Fine per continuare.",IDC_STATIC,6,84,174,8 +END + +IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 +STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "Conferma Sostituzione File" +FONT 8, "MS Shell Dlg", 400, 0, 0x1 +BEGIN + DEFPUSHBUTTON "&Sì",IDYES,6,36,62,14 + PUSHBUTTON "Annulla",IDCANCEL,204,36,62,14 + PUSHBUTTON "Sì &A Tutti",IDYESALL,72,36,62,14 + PUSHBUTTON "&No",IDNO,138,36,62,14 + ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 + LTEXT "",IDC_MESSAGE,36,6,228,24 +END + +STRINGTABLE +BEGIN + IDS_COL_NAME "Nome" + IDS_COL_TYPE "Tipo" + IDS_COL_COMPRSIZE "Dimensione Compressa" + IDS_COL_PASSWORD "Password" + IDS_COL_SIZE "Dimensione" + IDS_COL_RATIO "Rapporto" + IDS_COL_DATE_MOD "Data modificata" + IDS_YES "Sì" + IDS_NO "No" + + IDS_WIZ_TITLE "Estrazione Guidata" + IDS_WIZ_DEST_TITLE "Seleziona una Destinazione" + IDS_WIZ_DEST_SUBTITLE "I file dall'archivio zip verranno estratti nella destinazione specificata." + IDS_WIZ_COMPL_TITLE "Estrazione Completa" + IDS_WIZ_COMPL_SUBTITLE "I file dall'archivio zip sono stati estratti." + IDS_WIZ_BROWSE_TITLE "Seleziona la destinazione in cui desideri estrarre gli elementi selezionati." + + IDS_OVERWRITEFILE_TEXT "Questa cartella già contiene un file chiamato '%1'.\nVuoi sostituirla?" + + IDS_MENUITEM "Estrai &Tutto..." + IDS_HELPTEXT "Estrae i contenuti della cartella" + IDS_FRIENDLYNAME "Cartella Compressa (zippata)" +END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index 24fde95967..3086ff727a 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -21,3 +21,6 @@ IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_IT_IT + #include "lang/it-IT.rc" +#endif

6 years, 8 months

02/04: [ZIPFLDR] Typo fix on constant

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=55381f8164a8084be689c… commit 55381f8164a8084be689c5a4a966ab82d95d2f1c Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Apr 8 17:31:29 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 14 19:29:40 2018 +0200 [ZIPFLDR] Typo fix on constant --- dll/shellext/zipfldr/CZipExtract.cpp | 2 +- dll/shellext/zipfldr/resource.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/shellext/zipfldr/CZipExtract.cpp b/dll/shellext/zipfldr/CZipExtract.cpp index 5fbebefbb7..0b5465a52c 100644 --- a/dll/shellext/zipfldr/CZipExtract.cpp +++ b/dll/shellext/zipfldr/CZipExtract.cpp @@ -232,7 +232,7 @@ public: } public: - enum { IDD = IDD_PROPPAGEDESTIONATION }; + enum { IDD = IDD_PROPPAGEDESTINATION }; BEGIN_MSG_MAP(CCompleteSettingsPage) COMMAND_ID_HANDLER(IDC_BROWSE, OnBrowse) diff --git a/dll/shellext/zipfldr/resource.h b/dll/shellext/zipfldr/resource.h index 10cadc742a..6c2ea39c2e 100644 --- a/dll/shellext/zipfldr/resource.h +++ b/dll/shellext/zipfldr/resource.h @@ -6,7 +6,7 @@ /* Dialogs */ -#define IDD_PROPPAGEDESTIONATION 1000 +#define IDD_PROPPAGEDESTINATION 1000 #define IDC_DIRECTORY 1001 #define IDC_BROWSE 1002 #define IDC_PASSWORD 1003

6 years, 8 months

01/04: [ZIPFLDR] Support for multiple languages interface

by Bișoc George

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=84cc11d4c34e2546d9734… commit 84cc11d4c34e2546d9734aaf0795a9975f0b6652 Author: Bișoc George <fraizeraust99(a)gmail.com> AuthorDate: Sun Apr 8 17:15:24 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 14 19:29:35 2018 +0200 [ZIPFLDR] Support for multiple languages interface --- dll/shellext/zipfldr/{zipfldr.rc => lang/en-US.rc} | 33 +++------- dll/shellext/zipfldr/zipfldr.rc | 75 ++-------------------- 2 files changed, 13 insertions(+), 95 deletions(-) diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/lang/en-US.rc similarity index 83% copy from dll/shellext/zipfldr/zipfldr.rc copy to dll/shellext/zipfldr/lang/en-US.rc index b9f93eecf7..ce2b78e1c7 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/lang/en-US.rc @@ -1,25 +1,13 @@ -#include <windef.h> -#include <winuser.h> +/* + * PROJECT: ReactOS Zip Shell Extension + * LICENSE: GPL-2.0+ (https://spdx.org/licenses/GPL-2.0+) + * PURPOSE: English (United States) resource translation + * COPYRIGHT: Copyright 2017 Mark Jansen (mark.jansen(a)reactos.org) + */ -#include "resource.h" +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - -1 ICON "res/zipfldr.ico" - -#define REACTOS_VERSION_DLL -#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Zip Shell Extension" -#define REACTOS_STR_INTERNAL_NAME "zipfldr" -#define REACTOS_STR_ORIGINAL_FILENAME "zipfldr.dll" -#include <reactos/version.rc> - -#include <reactos/manifest_dll.rc> - -IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" - - - -IDD_PROPPAGEDESTIONATION DIALOGEX 0, 0, 235, 156 +IDD_PROPPAGEDESTINATION DIALOGEX 0, 0, 235, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Select a Destination" FONT 8, "MS Shell Dlg", 400, 0, 0x0 @@ -32,7 +20,6 @@ BEGIN CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 END - IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION CAPTION "Extraction Complete" @@ -44,7 +31,6 @@ BEGIN LTEXT "Press finish to continue.",IDC_STATIC,6,84,174,8 END - IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Confirm File Replace" @@ -58,8 +44,6 @@ BEGIN LTEXT "",IDC_MESSAGE,36,6,228,24 END - - STRINGTABLE BEGIN IDS_COL_NAME "Name" @@ -84,5 +68,4 @@ BEGIN IDS_MENUITEM "Extract &All..." IDS_HELPTEXT "Extracts folder contents" IDS_FRIENDLYNAME "Compressed (zipped) Folder" - END diff --git a/dll/shellext/zipfldr/zipfldr.rc b/dll/shellext/zipfldr/zipfldr.rc index b9f93eecf7..24fde95967 100644 --- a/dll/shellext/zipfldr/zipfldr.rc +++ b/dll/shellext/zipfldr/zipfldr.rc @@ -3,8 +3,6 @@ #include "resource.h" -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL - 1 ICON "res/zipfldr.ico" #define REACTOS_VERSION_DLL @@ -17,72 +15,9 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL IDR_ZIPFLDR REGISTRY "res/zipfldr.rgs" +/* UTF-8 */ +#pragma code_page(65001) - -IDD_PROPPAGEDESTIONATION DIALOGEX 0, 0, 235, 156 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Select a Destination" -FONT 8, "MS Shell Dlg", 400, 0, 0x0 -BEGIN - LTEXT "Select the destination directory",IDC_STATIC,6,12,174,8 - EDITTEXT IDC_DIRECTORY,6,24,222,12,ES_AUTOHSCROLL - PUSHBUTTON "Browse...",IDC_BROWSE,174,42,54,14 - PUSHBUTTON "Password",IDC_PASSWORD,174,66,54,14 - LTEXT "Extracting...",IDC_STATIC,6,114,42,8 - CONTROL "",IDC_PROGRESS,"msctls_progress32",WS_BORDER,6,126,222,6 -END - - -IDD_PROPPAGECOMPLETE DIALOGEX 0, 0, 235, 156 -STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION -CAPTION "Extraction Complete" -FONT 8, "MS Shell Dlg", 400, 0, 0x0 -BEGIN - LTEXT "The files have been extracted to the following directory:",IDC_STATIC,6,12,222,18 - LTEXT "Target dir",IDC_DESTDIR,6,36,222,8 - CONTROL "Show extracted files",IDC_SHOW_EXTRACTED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,6,66,81,10 - LTEXT "Press finish to continue.",IDC_STATIC,6,84,174,8 -END - - -IDD_CONFIRM_FILE_REPLACE DIALOGEX 0, 0, 273, 56 -STYLE DS_MODALFRAME | DS_SHELLFONT | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Confirm File Replace" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "&Yes",IDYES,6,36,62,14 - PUSHBUTTON "Cancel",IDCANCEL,204,36,62,14 - PUSHBUTTON "Yes &To All",IDYESALL,72,36,62,14 - PUSHBUTTON "&No",IDNO,138,36,62,14 - ICON "",IDC_EXCLAMATION_ICON,6,6,24,22 - LTEXT "",IDC_MESSAGE,36,6,228,24 -END - - - -STRINGTABLE -BEGIN - IDS_COL_NAME "Name" - IDS_COL_TYPE "Type" - IDS_COL_COMPRSIZE "Compressed size" - IDS_COL_PASSWORD "Password" - IDS_COL_SIZE "Size" - IDS_COL_RATIO "Ratio" - IDS_COL_DATE_MOD "Date modified" - IDS_YES "Yes" - IDS_NO "No" - - IDS_WIZ_TITLE "Extraction Wizard" - IDS_WIZ_DEST_TITLE "Select a Destination" - IDS_WIZ_DEST_SUBTITLE "The files from the zip archive will be extracted to the location specified." - IDS_WIZ_COMPL_TITLE "Extraction Complete" - IDS_WIZ_COMPL_SUBTITLE "The files from the zip archive have been extracted." - IDS_WIZ_BROWSE_TITLE "Select the place where you want to extract the selected items." - - IDS_OVERWRITEFILE_TEXT "This folder already contains a file called '%1'.\nDo you want to replace it?" - - IDS_MENUITEM "Extract &All..." - IDS_HELPTEXT "Extracts folder contents" - IDS_FRIENDLYNAME "Compressed (zipped) Folder" - -END +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif

6 years, 8 months

02/02: [NETMSG] Add netmsg resource dll with some lmerr messages

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ceb596f100bf6faebc947… commit ceb596f100bf6faebc947f71cc9d9b50d715db8c Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 14 18:31:14 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 14 18:56:09 2018 +0200 [NETMSG] Add netmsg resource dll with some lmerr messages --- dll/win32/netmsg/CMakeLists.txt | 5 ++ dll/win32/netmsg/netmsg.rc | 7 +++ sdk/include/reactos/mc/CMakeLists.txt | 1 + sdk/include/reactos/mc/netmsgmsg.mc | 90 +++++++++++++++++++++++++++++++++++ 4 files changed, 103 insertions(+) diff --git a/dll/win32/netmsg/CMakeLists.txt b/dll/win32/netmsg/CMakeLists.txt new file mode 100644 index 0000000000..3957ebeaf7 --- /dev/null +++ b/dll/win32/netmsg/CMakeLists.txt @@ -0,0 +1,5 @@ + +add_library(netmsg SHARED netmsg.rc) +set_module_type(netmsg module UNICODE) +add_dependencies(netmsg netmsgmsg) +add_cd_file(TARGET netmsg DESTINATION reactos/system32 FOR all) diff --git a/dll/win32/netmsg/netmsg.rc b/dll/win32/netmsg/netmsg.rc new file mode 100644 index 0000000000..df8f4ea2fd --- /dev/null +++ b/dll/win32/netmsg/netmsg.rc @@ -0,0 +1,7 @@ +#define REACTOS_VERSION_DLL +#define REACTOS_STR_FILE_DESCRIPTION "ReactOS Network Messages" +#define REACTOS_STR_INTERNAL_NAME "netmsg" +#define REACTOS_STR_ORIGINAL_FILENAME "netmsg.dll" +#include <reactos/version.rc> + +#include <netmsg_msg.rc> diff --git a/sdk/include/reactos/mc/CMakeLists.txt b/sdk/include/reactos/mc/CMakeLists.txt index 1a0e23025c..56e501f41a 100644 --- a/sdk/include/reactos/mc/CMakeLists.txt +++ b/sdk/include/reactos/mc/CMakeLists.txt @@ -5,6 +5,7 @@ list(APPEND ANSI_SOURCE list(APPEND UNICODE_SOURCE errcodes.mc neteventmsg.mc + netmsgmsg.mc ntiologc.mc ntstatus.mc pciclass.mc) diff --git a/sdk/include/reactos/mc/netmsgmsg.mc b/sdk/include/reactos/mc/netmsgmsg.mc new file mode 100644 index 0000000000..9324e7b634 --- /dev/null +++ b/sdk/include/reactos/mc/netmsgmsg.mc @@ -0,0 +1,90 @@ +; +; netmsg_msg.mc MESSAGE resources for netmsg.dll +; + +MessageIdTypedef=DWORD + +SeverityNames=(Success=0x0:STATUS_SEVERITY_SUCCESS + Informational=0x1:STATUS_SEVERITY_INFORMATIONAL + Warning=0x2:STATUS_SEVERITY_WARNING + Error=0x3:STATUS_SEVERITY_ERROR + ) + +FacilityNames=(System=0x0:FACILITY_SYSTEM + ) + +LanguageNames=(English=0x409:MSG00409) + + +; +; lmerr message definitions +; + +MessageId=2102 +Severity=Success +Facility=System +SymbolicName=NERR_NetNotStarted +Language=English +The workstation driver is not installed. +. + +MessageId=2103 +Severity=Success +Facility=System +SymbolicName=NERR_UnknownServer +Language=English +The server could not be located. +. + +MessageId=2104 +Severity=Success +Facility=System +SymbolicName=NERR_ShareMem +Language=English +An internal error occurred. The network cannot access a shared memory segment. +. + +MessageId=2105 +Severity=Success +Facility=System +SymbolicName=NERR_NoNetworkResource +Language=English +A network resource shortage occurred. +. + +MessageId=2106 +Severity=Success +Facility=System +SymbolicName=NERR_RemoteOnly +Language=English +This operation is not supported on workstations. +. + +MessageId=2107 +Severity=Success +Facility=System +SymbolicName=NERR_DevNotRedirected +Language=English +The device is not connected. +. + + +; +; other message definitions +; + +MessageId=3500 +Severity=Success +Facility=System +SymbolicName=OTHER_3000 +Language=English +The command completed successfully. +. + +MessageId=3515 +Severity=Success +Facility=System +SymbolicName=OTHER_3515 +Language=English +The command can be used only on a Domain Controller. +.

6 years, 8 months

01/02: [NET] Add help text for the NET GROUP command and improve the NET LOCALGROUP help text

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8787eba8ca628c73bb9a5… commit 8787eba8ca628c73bb9a5ecbc0909a7a6fbe7317 Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 14 14:54:50 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 14 18:56:08 2018 +0200 [NET] Add help text for the NET GROUP command and improve the NET LOCALGROUP help text --- base/applications/network/net/help.c | 8 ++- base/applications/network/net/lang/en-US.rc | 25 +++++-- base/applications/network/net/lang/es-ES.rc | 25 +++++-- base/applications/network/net/lang/ro-RO.rc | 25 +++++-- base/applications/network/net/lang/ru-RU.rc | 25 +++++-- base/applications/network/net/lang/tr-TR.rc | 25 +++++-- base/applications/network/net/lang/zh-CN.rc | 25 +++++-- base/applications/network/net/lang/zh-TW.rc | 25 +++++-- base/applications/network/net/resource.h | 102 +++++++++++++++------------- 9 files changed, 201 insertions(+), 84 deletions(-) diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index da0bac436e..8d70860ad9 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -86,7 +86,13 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"GROUP") == 0) { ConResPuts(StdOut, IDS_GROUP_SYNTAX); - ConResPuts(StdOut, IDS_GROUP_HELP); + ConResPuts(StdOut, IDS_GROUP_HELP_1); + ConResPuts(StdOut, IDS_GROUP_HELP_2); + ConResPuts(StdOut, IDS_GROUP_HELP_3); + ConResPuts(StdOut, IDS_GROUP_HELP_4); + ConResPuts(StdOut, IDS_GROUP_HELP_5); + ConResPuts(StdOut, IDS_GROUP_HELP_6); + ConResPuts(StdOut, IDS_GROUP_HELP_7); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index 207a63771d..793344d10f 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -83,8 +83,23 @@ type NET CONFIG SERVER without parameters.\n\n" WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP ...\n\n" - IDS_GROUP_HELP "GROUP\n...\n\n" + IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" + IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ +used without parameters, it displays the groupnames on the server.\n\n" + IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ + Supply only a groupname to view a list of users\n\ + in a group.\n" + IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ + a group. Separate multiple username entries with a space.\n" + IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" + IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" IDS_HELP_SYNTAX "NET HELP command\n - or -\nNET command /HELP\n\n" IDS_HELP_HELP_1 " The following commands are available:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ @@ -105,8 +120,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ groupname name [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ -options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ +used without parameters, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ delete. Supply only a groupname to view a list of\n\ users or global groups in a local group.\n" @@ -115,7 +130,7 @@ options, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ of the current domain. Otherwise, the operation is \n\ performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ remove from a local group. Separate multiple entries with\n\ a space. Names may be users or global groups, but not\n\ other local groups. If a user is from another doamin,\n\ diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 7b748e6eec..b86e48a05a 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -86,8 +86,23 @@ type NET CONFIG SERVER without parameters.\n\n" WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP ...\n\n" - IDS_GROUP_HELP "GROUP\n...\n\n" + IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" + IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ +used without parameters, it displays the groupnames on the server.\n\n" + IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ + Supply only a groupname to view a list of users\n\ + in a group.\n" + IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ + a group. Separate multiple username entries with a space.\n" + IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" + IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" IDS_HELP_SYNTAX "NET HELP <comando>\n - o -\nNET <comando> /HELP\n\n" IDS_HELP_HELP_1 " Éstos son los argumentos de línea de comandos disponibles:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ @@ -108,8 +123,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [grupo [/COMMENT:""texto""]] [/DOMAIN]\n\ grupo {/ADD [/COMMENT:""texto""] | /DELETE} [/DOMAIN]\n\ grupo nombre [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ -options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ +used without parameters, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ delete. Supply only a groupname to view a list of\n\ users or global groups in a local group.\n" @@ -118,7 +133,7 @@ options, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ of the current domain. Otherwise, the operation is \n\ performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add to or\n\ remove from a local group. Separate multiple entries with\n\ a space. Names may be users or global groups, but not\n\ other local groups. If a user is from another doamin,\n\ diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index 6ea8a083a9..a2c9963a2e 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -89,8 +89,23 @@ type NET CONFIG SERVER without parameters.\n\n" WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP ...\n\n" - IDS_GROUP_HELP "GROUP\n...\n\n" + IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" + IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ +used without parameters, it displays the groupnames on the server.\n\n" + IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ + Supply only a groupname to view a list of users\n\ + in a group.\n" + IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ + a group. Separate multiple username entries with a space.\n" + IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" + IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" IDS_HELP_SYNTAX "NET HELP <comandă>\n - sau -\nNET <comandă> /HELP\n\n" IDS_HELP_HELP_1 " Sunt disponibile următoarele comenzi:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ @@ -111,8 +126,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [nume-de-grup [/COMMENT:""text""]] [/DOMAIN]\n\ nume-de-grup {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ nume-de-grup nume [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ -options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ +used without parameters, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ delete. Supply only a groupname to view a list of\n\ users or global groups in a local group.\n" @@ -121,7 +136,7 @@ options, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ of the current domain. Otherwise, the operation is \n\ performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ remove from a local group. Separate multiple entries with\n\ a space. Names may be users or global groups, but not\n\ other local groups. If a user is from another doamin,\n\ diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index c2ac1079f2..7d91bd56b1 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -85,8 +85,23 @@ type NET CONFIG SERVER without parameters.\n\n" WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP ...\n\n" - IDS_GROUP_HELP "GROUP\n...\n\n" + IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" + IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ +used without parameters, it displays the groupnames on the server.\n\n" + IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ + Supply only a groupname to view a list of users\n\ + in a group.\n" + IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ + a group. Separate multiple username entries with a space.\n" + IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" + IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" IDS_HELP_SYNTAX "NET HELP <Команда>\n - или -\nNET <Команда> /HELP\n\n" IDS_HELP_HELP_1 " Доступны следующие команды:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ @@ -107,8 +122,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [имя_группы [/COMMENT:""текст""]] [/DOMAIN]\n\ имя_группы {/ADD [/COMMENT:""текст""] | /DELETE} [/DOMAIN]\n\ имя_группы имя [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ -options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ +used without parameters, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ delete. Supply only a groupname to view a list of\n\ users or global groups in a local group.\n" @@ -117,7 +132,7 @@ options, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ of the current domain. Otherwise, the operation is \n\ performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ remove from a local group. Separate multiple entries with\n\ a space. Names may be users or global groups, but not\n\ other local groups. If a user is from another doamin,\n\ diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 2e4ae02590..203f82be88 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -85,8 +85,23 @@ type NET CONFIG SERVER without parameters.\n\n" WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP ...\n\n" - IDS_GROUP_HELP "GROUP\n...\n\n" + IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" + IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ +used without parameters, it displays the groupnames on the server.\n\n" + IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ + Supply only a groupname to view a list of users\n\ + in a group.\n" + IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ + a group. Separate multiple username entries with a space.\n" + IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" + IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" IDS_HELP_SYNTAX "NET HELP <Komut>\n - ya da -\nNET <Komut> /HELP\n\n" IDS_HELP_HELP_1 " Aşağıdaki komutlar kullanılabilir:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ @@ -107,8 +122,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [takım adı [/COMMENT:""metin""]] [/DOMAIN]\n\ takım adı {/ADD [/COMMENT:""metin""] | /DELETE} [/DOMAIN]\n\ takım adı ad [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ -options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ +used without parameters, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ delete. Supply only a groupname to view a list of\n\ users or global groups in a local group.\n" @@ -117,7 +132,7 @@ options, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ of the current domain. Otherwise, the operation is \n\ performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ remove from a local group. Separate multiple entries with\n\ a space. Names may be users or global groups, but not\n\ other local groups. If a user is from another doamin,\n\ diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index ee24567df7..14de45cdfb 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -85,8 +85,23 @@ type NET CONFIG SERVER without parameters.\n\n" WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP ...\n\n" - IDS_GROUP_HELP "NET GROUP\n...\n\n" + IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" + IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ +used without parameters, it displays the groupnames on the server.\n\n" + IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ + Supply only a groupname to view a list of users\n\ + in a group.\n" + IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ + a group. Separate multiple username entries with a space.\n" + IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" + IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" IDS_HELP_SYNTAX "NET HELP <Command>\n - or -\nNET <Command> /HELP\n\n" IDS_HELP_HELP_1 " 以下命令可用:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ @@ -107,8 +122,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ groupname name [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ -options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ +used without parameters, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ delete. Supply only a groupname to view a list of\n\ users or global groups in a local group.\n" @@ -117,7 +132,7 @@ options, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ of the current domain. Otherwise, the operation is \n\ performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ remove from a local group. Separate multiple entries with\n\ a space. Names may be users or global groups, but not\n\ other local groups. If a user is from another doamin,\n\ diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index 01e461a32f..08a0f88380 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -85,8 +85,23 @@ type NET CONFIG SERVER without parameters.\n\n" WORKSTATION\n\n" IDS_FILE_SYNTAX "NET FILE [id [/CLOSE]]\n\n" IDS_FILE_HELP "NET FILE\n...\n\n" - IDS_GROUP_SYNTAX "NET GROUP ...\n\n" - IDS_GROUP_HELP "GROUP\n...\n\n" + IDS_GROUP_SYNTAX "NET GROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ + groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ + groupname username [...] {/ADD | /DELETE} [/DOMAIN]\n\n" + IDS_GROUP_HELP_1 "NET GROUP adds, displays or modifies global groups on servers. When\n\ +used without parameters, it displays the groupnames on the server.\n\n" + IDS_GROUP_HELP_2 "groupname Is the name of the group to add, expand, or delete.\n\ + Supply only a groupname to view a list of users\n\ + in a group.\n" + IDS_GROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_GROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_GROUP_HELP_5 "username[ ...] List one or more usernames to add to or remove from\n\ + a group. Separate multiple username entries with a space.\n" + IDS_GROUP_HELP_6 "/ADD Adds a group, or adds a username to a group.\n" + IDS_GROUP_HELP_7 "/DELETE Removes a group, or removes a username from a group.\n\n" IDS_HELP_SYNTAX "NET HELP <命令>\n - 或 -\nNET <命令> /HELP\n\n" IDS_HELP_HELP_1 " 以下命令是可用的:\n\n\ NET ACCOUNTS NET HELP NET SHARE\n\ @@ -107,8 +122,8 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [組名 [/COMMENT:""文字""]] [/DOMAIN]\n\ 組名 {/ADD [/COMMENT:""文字""] | /DELETE} [/DOMAIN]\n\ 組名稱 [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ -options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP adds, displays or modifies local groups on computers. When\n\ +used without parameters, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ delete. Supply only a groupname to view a list of\n\ users or global groups in a local group.\n" @@ -117,7 +132,7 @@ options, it displays the local groups on the computer.\n\n" IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ of the current domain. Otherwise, the operation is \n\ performed on the local computer.\n" - IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + IDS_LOCALGROUP_HELP_5 "name[ ...] List one or more usernames or groupnams to add to or\n\ remove from a local group. Separate multiple entries with\n\ a space. Names may be users or global groups, but not\n\ other local groups. If a user is from another doamin,\n\ diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index ef4cfde7df..beff7b0f3c 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -29,54 +29,60 @@ #define IDS_FILE_SYNTAX 126 #define IDS_FILE_HELP 127 #define IDS_GROUP_SYNTAX 128 -#define IDS_GROUP_HELP 129 -#define IDS_HELP_SYNTAX 130 -#define IDS_HELP_HELP_1 131 -#define IDS_HELP_HELP_2 132 -#define IDS_HELPMSG_SYNTAX 133 -#define IDS_HELPMSG_HELP_1 134 -#define IDS_HELPMSG_HELP_2 135 -#define IDS_LOCALGROUP_SYNTAX 136 -#define IDS_LOCALGROUP_HELP_1 137 -#define IDS_LOCALGROUP_HELP_2 138 -#define IDS_LOCALGROUP_HELP_3 139 -#define IDS_LOCALGROUP_HELP_4 140 -#define IDS_LOCALGROUP_HELP_5 141 -#define IDS_LOCALGROUP_HELP_6 142 -#define IDS_LOCALGROUP_HELP_7 143 -#define IDS_NAME_SYNTAX 144 -#define IDS_NAME_HELP 145 -#define IDS_PAUSE_SYNTAX 146 -#define IDS_PAUSE_HELP_1 147 -#define IDS_PAUSE_HELP_2 148 -#define IDS_PRINT_SYNTAX 149 -#define IDS_PRINT_HELP 150 -#define IDS_SEND_SYNTAX 151 -#define IDS_SEND_HELP 152 -#define IDS_SESSION_SYNTAX 153 -#define IDS_SESSION_HELP 154 -#define IDS_SHARE_SYNTAX 155 -#define IDS_SHARE_HELP 156 -#define IDS_START_SYNTAX 157 -#define IDS_START_HELP_1 158 -#define IDS_START_HELP_2 159 -#define IDS_START_HELP_3 160 -#define IDS_STATISTICS_SYNTAX 161 -#define IDS_STATISTICS_HELP_1 162 -#define IDS_STATISTICS_HELP_2 163 -#define IDS_STOP_SYNTAX 164 -#define IDS_STOP_HELP_1 165 -#define IDS_STOP_HELP_2 166 -#define IDS_STOP_HELP_3 167 -#define IDS_TIME_SYNTAX 168 -#define IDS_TIME_HELP 169 -#define IDS_USE_SYNTAX 170 -#define IDS_USE_HELP 171 -#define IDS_USER_SYNTAX 172 -#define IDS_USER_HELP 173 -#define IDS_VIEW_SYNTAX 174 -#define IDS_VIEW_HELP 175 -#define IDS_NET_SYNTAX 176 +#define IDS_GROUP_HELP_1 129 +#define IDS_GROUP_HELP_2 130 +#define IDS_GROUP_HELP_3 131 +#define IDS_GROUP_HELP_4 132 +#define IDS_GROUP_HELP_5 133 +#define IDS_GROUP_HELP_6 134 +#define IDS_GROUP_HELP_7 135 +#define IDS_HELP_SYNTAX 136 +#define IDS_HELP_HELP_1 137 +#define IDS_HELP_HELP_2 138 +#define IDS_HELPMSG_SYNTAX 139 +#define IDS_HELPMSG_HELP_1 140 +#define IDS_HELPMSG_HELP_2 141 +#define IDS_LOCALGROUP_SYNTAX 142 +#define IDS_LOCALGROUP_HELP_1 143 +#define IDS_LOCALGROUP_HELP_2 144 +#define IDS_LOCALGROUP_HELP_3 145 +#define IDS_LOCALGROUP_HELP_4 146 +#define IDS_LOCALGROUP_HELP_5 147 +#define IDS_LOCALGROUP_HELP_6 148 +#define IDS_LOCALGROUP_HELP_7 149 +#define IDS_NAME_SYNTAX 150 +#define IDS_NAME_HELP 151 +#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 +#define IDS_START_HELP_3 166 +#define IDS_STATISTICS_SYNTAX 167 +#define IDS_STATISTICS_HELP_1 168 +#define IDS_STATISTICS_HELP_2 169 +#define IDS_STOP_SYNTAX 170 +#define IDS_STOP_HELP_1 171 +#define IDS_STOP_HELP_2 172 +#define IDS_STOP_HELP_3 173 +#define IDS_TIME_SYNTAX 174 +#define IDS_TIME_HELP 175 +#define IDS_USE_SYNTAX 176 +#define IDS_USE_HELP 177 +#define IDS_USER_SYNTAX 178 +#define IDS_USER_HELP 179 +#define IDS_VIEW_SYNTAX 180 +#define IDS_VIEW_HELP 181 +#define IDS_NET_SYNTAX 182 #define IDS_ACCOUNTS_FORCE_LOGOFF 200 #define IDS_ACCOUNTS_LOGOFF_SECONDS 201

6 years, 8 months

01/01: [KERNEL32] FlsAlloc(): Add a missing '\n' to a DPRINT1()

by Serge Gautherie

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a8f1bea4b14bb67f6a241… commit a8f1bea4b14bb67f6a241bffd98414de29e26d4d Author: Serge Gautherie <reactos-git_serge_171003(a)gautherie.fr> AuthorDate: Sun Apr 8 23:44:35 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 14 16:07:29 2018 +0200 [KERNEL32] FlsAlloc(): Add a missing '\n' to a DPRINT1() --- dll/win32/kernel32/client/fiber.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/kernel32/client/fiber.c b/dll/win32/kernel32/client/fiber.c index ce6cd2d150..a3a38ecd7f 100644 --- a/dll/win32/kernel32/client/fiber.c +++ b/dll/win32/kernel32/client/fiber.c @@ -352,7 +352,7 @@ FlsAlloc(PFLS_CALLBACK_FUNCTION lpCallback) NtCurrentTeb()->FlsData = ppFlsSlots; if (lpCallback) - DPRINT1("FlsAlloc: Got lpCallback 0x%p, UNIMPLEMENTED!", lpCallback); + DPRINT1("FlsAlloc: Got lpCallback 0x%p, UNIMPLEMENTED!\n", lpCallback); ppFlsSlots[dwFlsIndex + 2] = NULL; /* clear the value */ Peb->FlsCallback[dwFlsIndex] = lpCallback;

6 years, 8 months

01/01: [SHELL32] Sync CShellDispatch and family with wine. Incorporates work from Ivan Rodionov. CORE-12955

by Mark Jansen

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e8dcbcc61d52df02fd6bb… commit e8dcbcc61d52df02fd6bb4abb9af947851df8cd3 Author: Mark Jansen <mark.jansen(a)reactos.org> AuthorDate: Fri Apr 13 22:59:04 2018 +0200 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sat Apr 14 15:47:13 2018 +0200 [SHELL32] Sync CShellDispatch and family with wine. Incorporates work from Ivan Rodionov. CORE-12955 --- dll/win32/shell32/CFolder.cpp | 72 ++++++--------- dll/win32/shell32/CFolder.h | 24 ++--- dll/win32/shell32/CFolderItemVerbs.cpp | 15 ++- dll/win32/shell32/CFolderItems.cpp | 118 ++++++++++++++---------- dll/win32/shell32/CFolderItems.h | 28 ++---- dll/win32/shell32/CShellDispatch.cpp | 161 ++++++++++++++++++++++++++------- dll/win32/shell32/CShellDispatch.h | 21 +---- 7 files changed, 257 insertions(+), 182 deletions(-) diff --git a/dll/win32/shell32/CFolder.cpp b/dll/win32/shell32/CFolder.cpp index 26eea6cfba..3421ecbcc1 100644 --- a/dll/win32/shell32/CFolder.cpp +++ b/dll/win32/shell32/CFolder.cpp @@ -1,21 +1,8 @@ /* - * Folder implementation - * - * Copyright 2015 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: shell32 + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Folder implementation + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -31,9 +18,10 @@ CFolder::~CFolder() { } -void CFolder::Init(LPITEMIDLIST idlist) +HRESULT CFolder::Initialize(LPITEMIDLIST idlist) { - m_idlist.Attach(idlist); + m_idlist.Attach(ILClone(idlist)); + return CShellDispatch_Constructor(IID_PPV_ARG(IShellDispatch, &m_Application)); } HRESULT CFolder::GetShellFolder(CComPtr<IShellFolder>& psfCurrent) @@ -65,35 +53,39 @@ HRESULT STDMETHODCALLTYPE CFolder::get_Title(BSTR *pbs) HRESULT STDMETHODCALLTYPE CFolder::get_Application(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); - return E_NOTIMPL; + + if (!ppid) + return E_INVALIDARG; + + *ppid = m_Application; + (*ppid)->AddRef(); + + return S_OK; } HRESULT STDMETHODCALLTYPE CFolder::get_Parent(IDispatch **ppid) { TRACE("(%p %p)\n", this, ppid); + + if (ppid) + *ppid = NULL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CFolder::get_ParentFolder(Folder **ppsf) { TRACE("(%p, %p)\n", this); + + *ppsf = NULL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CFolder::Items(FolderItems **ppid) { - CFolderItems* items = new CComObject<CFolderItems>(); - items->AddRef(); - - HRESULT hr = items->Init(ILClone(m_idlist)); - if (FAILED_UNEXPECTEDLY(hr)) - { - items->Release(); - return hr; - } - - *ppid = items; - return S_OK; + /* FolderItems_Constructor */ + return ShellObjectCreatorInit<CFolderItems>(static_cast<LPITEMIDLIST>(m_idlist), this, IID_PPV_ARG(FolderItems, ppid)); } HRESULT STDMETHODCALLTYPE CFolder::ParseName(BSTR bName, FolderItem **ppid) @@ -113,11 +105,10 @@ HRESULT STDMETHODCALLTYPE CFolder::ParseName(BSTR bName, FolderItem **ppid) if (!SUCCEEDED(hr)) return S_FALSE; - CFolderItem* item = new CComObject<CFolderItem>(); - item->AddRef(); - item->Init(ILCombine(m_idlist, relativePidl)); - *ppid = item; - return S_OK; + CComHeapPtr<ITEMIDLIST> combined; + combined.Attach(ILCombine(m_idlist, relativePidl)); + + return ShellObjectCreatorInit<CFolderItem>(this, static_cast<LPITEMIDLIST>(combined), IID_PPV_ARG(FolderItem, ppid)); } HRESULT STDMETHODCALLTYPE CFolder::NewFolder(BSTR bName, VARIANT vOptions) @@ -151,11 +142,8 @@ HRESULT STDMETHODCALLTYPE CFolder::get_Self(FolderItem **ppfi) TRACE("(%p, %p)\n", this, ppfi); if (!ppfi) return E_POINTER; - CFolderItem* item = new CComObject<CFolderItem>(); - item->AddRef(); - item->Init(ILClone(m_idlist)); - *ppfi = item; - return S_OK; + + return ShellObjectCreatorInit<CFolderItem>(this, static_cast<LPITEMIDLIST>(m_idlist), IID_PPV_ARG(FolderItem, ppfi)); } HRESULT STDMETHODCALLTYPE CFolder::get_OfflineStatus(LONG *pul) diff --git a/dll/win32/shell32/CFolder.h b/dll/win32/shell32/CFolder.h index bfd5c9d08d..df0d482b43 100644 --- a/dll/win32/shell32/CFolder.h +++ b/dll/win32/shell32/CFolder.h @@ -1,21 +1,8 @@ /* - * Folder implementation - * - * Copyright 2015 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: shell32 + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: Folder implementation + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef _FOLDER_H_ @@ -31,12 +18,13 @@ private: HRESULT GetShellFolder(CComPtr<IShellFolder>& psfCurrent); CComHeapPtr<ITEMIDLIST> m_idlist; + CComPtr<IShellDispatch> m_Application; public: CFolder(); ~CFolder(); - void Init(LPITEMIDLIST idlist); + HRESULT Initialize(LPITEMIDLIST idlist); // *** Folder methods *** virtual HRESULT STDMETHODCALLTYPE get_Title(BSTR *pbs); diff --git a/dll/win32/shell32/CFolderItemVerbs.cpp b/dll/win32/shell32/CFolderItemVerbs.cpp index 87866fa786..0397f724f8 100644 --- a/dll/win32/shell32/CFolderItemVerbs.cpp +++ b/dll/win32/shell32/CFolderItemVerbs.cpp @@ -107,7 +107,7 @@ HRESULT CFolderItemVerbs::Init(LPITEMIDLIST idlist) HRESULT STDMETHODCALLTYPE CFolderItemVerbs::get_Count(LONG *plCount) { if (!plCount) - return E_POINTER; + return E_INVALIDARG; *plCount = m_count; return S_OK; } @@ -115,12 +115,20 @@ HRESULT STDMETHODCALLTYPE CFolderItemVerbs::get_Count(LONG *plCount) HRESULT STDMETHODCALLTYPE CFolderItemVerbs::get_Application(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); + + if (ppid) + *ppid = NULL; + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CFolderItemVerbs::get_Parent(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); + + if (ppid) + *ppid = NULL; + return E_NOTIMPL; } @@ -130,9 +138,8 @@ HRESULT STDMETHODCALLTYPE CFolderItemVerbs::Item(VARIANT indexVar, FolderItemVer return E_POINTER; CComVariant var; - VariantCopyInd(&var, &indexVar); - HRESULT hr = VariantChangeType(&var, &var, 0, VT_I4); + HRESULT hr = VariantChangeType(&var, &indexVar, 0, VT_I4); if (FAILED_UNEXPECTEDLY(hr)) return E_INVALIDARG; @@ -144,7 +151,9 @@ HRESULT STDMETHODCALLTYPE CFolderItemVerbs::Item(VARIANT indexVar, FolderItemVer BSTR name = NULL; if(index == m_count) + { name = SysAllocStringLen(NULL, 0); + } else { MENUITEMINFOW info = { sizeof(info), 0 }; diff --git a/dll/win32/shell32/CFolderItems.cpp b/dll/win32/shell32/CFolderItems.cpp index 614ead2e8b..9d2e27090b 100644 --- a/dll/win32/shell32/CFolderItems.cpp +++ b/dll/win32/shell32/CFolderItems.cpp @@ -1,21 +1,8 @@ /* - * FolderItem(s) implementation - * - * Copyright 2015,2016 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: shell32 + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: FolderItem(s) implementation + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" @@ -31,28 +18,49 @@ CFolderItem::~CFolderItem() { } -void CFolderItem::Init(LPITEMIDLIST idlist) +HRESULT CFolderItem::Initialize(Folder* folder, LPITEMIDLIST idlist) { - m_idlist.Attach(idlist); + m_idlist.Attach(ILClone(idlist)); + m_Folder = folder; + return S_OK; } // *** FolderItem methods *** HRESULT STDMETHODCALLTYPE CFolderItem::get_Application(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); - return E_NOTIMPL; + return m_Folder->get_Application(ppid); } HRESULT STDMETHODCALLTYPE CFolderItem::get_Parent(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); + if (ppid) + { + *ppid = m_Folder; + m_Folder->AddRef(); + } return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CFolderItem::get_Name(BSTR *pbs) { TRACE("(%p, %p)\n", this, pbs); - return E_NOTIMPL; + + *pbs = NULL; + + CComPtr<IShellFolder2> Parent; + LPCITEMIDLIST last_part; + HRESULT hr = SHBindToParent(m_idlist, IID_PPV_ARG(IShellFolder2, &Parent), &last_part); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + STRRET strret; + hr = Parent->GetDisplayNameOf(last_part, SHGDN_INFOLDER, &strret); + if (!FAILED_UNEXPECTEDLY(hr)) + hr = StrRetToBSTR(&strret, last_part, pbs); + + return hr; } HRESULT STDMETHODCALLTYPE CFolderItem::put_Name(BSTR bs) @@ -170,11 +178,11 @@ CFolderItems::~CFolderItems() { } -HRESULT CFolderItems::Init(LPITEMIDLIST idlist) +HRESULT CFolderItems::Initialize(LPITEMIDLIST idlist, Folder* parent) { CComPtr<IShellFolder> psfDesktop, psfTarget; - m_idlist.Attach(idlist); + m_idlist.Attach(ILClone(idlist)); HRESULT hr = SHGetDesktopFolder(&psfDesktop); if (FAILED_UNEXPECTEDLY(hr)) @@ -189,6 +197,7 @@ HRESULT CFolderItems::Init(LPITEMIDLIST idlist) if (FAILED_UNEXPECTEDLY(hr)) return hr; + m_Folder = parent; return S_OK; } @@ -210,8 +219,7 @@ HRESULT STDMETHODCALLTYPE CFolderItems::get_Count(long *plCount) return hr; CComHeapPtr<ITEMIDLIST> Pidl; - hr = m_EnumIDList->Next(1, &Pidl, 0); - while (hr != S_FALSE) + while ((hr = m_EnumIDList->Next(1, &Pidl, 0)) != S_FALSE) { count++; Pidl.Free(); @@ -226,12 +234,16 @@ HRESULT STDMETHODCALLTYPE CFolderItems::get_Count(long *plCount) HRESULT STDMETHODCALLTYPE CFolderItems::get_Application(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); - return E_NOTIMPL; + return m_Folder->get_Application(ppid); } HRESULT STDMETHODCALLTYPE CFolderItems::get_Parent(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); + + if (ppid) + *ppid = NULL; + return E_NOTIMPL; } @@ -240,40 +252,48 @@ HRESULT STDMETHODCALLTYPE CFolderItems::Item(VARIANT index, FolderItem **ppid) if (!m_EnumIDList) return E_FAIL; - if (V_VT(&index) != VT_I4 && V_VT(&index) != VT_UI4) - return E_INVALIDARG; + if (V_VT(&index) == VT_I2) + VariantChangeType(&index, &index, 0, VT_I4); - ULONG count = V_UI4(&index); + if (V_VT(&index) == VT_I4) + { + ULONG count = V_UI4(&index); - HRESULT hr = m_EnumIDList->Reset(); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + HRESULT hr = m_EnumIDList->Reset(); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - hr = m_EnumIDList->Skip(count); + hr = m_EnumIDList->Skip(count); - if (FAILED_UNEXPECTEDLY(hr)) - return hr; + if (FAILED_UNEXPECTEDLY(hr)) + return hr; - CComHeapPtr<ITEMIDLIST> spPidl; - hr = m_EnumIDList->Next(1, &spPidl, 0); - if (hr == S_OK) + CComHeapPtr<ITEMIDLIST> spPidl; + hr = m_EnumIDList->Next(1, &spPidl, 0); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + hr = ShellObjectCreatorInit<CFolderItem>(m_Folder, static_cast<LPITEMIDLIST>(spPidl), IID_PPV_ARG(FolderItem, ppid)); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + return hr; + } + else if (V_VT(&index) == VT_BSTR) { - CFolderItem* item = new CComObject<CFolderItem>(); - item->AddRef(); - item->Init(spPidl.Detach()); - *ppid = item; - return S_OK; + if (!V_BSTR(&index)) + return S_FALSE; + + HRESULT hr = m_Folder->ParseName(V_BSTR(&index), ppid); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + return hr; } - return hr; + FIXME("Index type %d not handled.\n", V_VT(&index)); + return E_NOTIMPL; } HRESULT STDMETHODCALLTYPE CFolderItems::_NewEnum(IUnknown **ppunk) { - CFolderItems* items = new CComObject<CFolderItems>(); - items->AddRef(); - items->Init(ILClone(m_idlist)); - *ppunk = items; - return S_OK; + return ShellObjectCreatorInit<CFolderItems>(static_cast<LPITEMIDLIST>(m_idlist), m_Folder, IID_FolderItems, reinterpret_cast<void**>(ppunk)); } diff --git a/dll/win32/shell32/CFolderItems.h b/dll/win32/shell32/CFolderItems.h index ddb62c87e8..ce339646db 100644 --- a/dll/win32/shell32/CFolderItems.h +++ b/dll/win32/shell32/CFolderItems.h @@ -1,21 +1,8 @@ /* - * FolderItem(s) implementation - * - * Copyright 2015 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: shell32 + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: FolderItem(s) implementation + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef _FOLDERITEM_H_ @@ -29,13 +16,13 @@ class CFolderItem: { private: CComHeapPtr<ITEMIDLIST> m_idlist; + CComPtr<Folder> m_Folder; public: CFolderItem(); ~CFolderItem(); - // Please note: CFolderItem takes ownership of idlist. - void Init(LPITEMIDLIST idlist); + HRESULT Initialize(Folder* folder, LPITEMIDLIST idlist); // *** FolderItem methods *** @@ -75,6 +62,7 @@ class CFolderItems: private: CComHeapPtr<ITEMIDLIST> m_idlist; CComPtr<IEnumIDList> m_EnumIDList; + CComPtr<Folder> m_Folder; long m_Count; public: @@ -82,7 +70,7 @@ public: ~CFolderItems(); // Please note: CFolderItems takes ownership of idlist. - HRESULT Init(LPITEMIDLIST idlist); + HRESULT Initialize(LPITEMIDLIST idlist, Folder* parent); // *** FolderItems methods *** virtual HRESULT STDMETHODCALLTYPE get_Count(long *plCount); diff --git a/dll/win32/shell32/CShellDispatch.cpp b/dll/win32/shell32/CShellDispatch.cpp index 7c98b4ae52..259b891997 100644 --- a/dll/win32/shell32/CShellDispatch.cpp +++ b/dll/win32/shell32/CShellDispatch.cpp @@ -1,24 +1,12 @@ /* - * IShellDispatch implementation - * - * Copyright 2015 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: shell32 + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: IShellDispatch implementation + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #include "precomp.h" +#include "winsvc.h" WINE_DEFAULT_DEBUG_CHANNEL(shell); @@ -40,13 +28,27 @@ HRESULT CShellDispatch::Initialize() HRESULT STDMETHODCALLTYPE CShellDispatch::get_Application(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); - return E_NOTIMPL; + + if (!ppid) + return E_INVALIDARG; + + *ppid = this; + AddRef(); + + return S_OK; } HRESULT STDMETHODCALLTYPE CShellDispatch::get_Parent(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); - return E_NOTIMPL; + + if (ppid) + { + *ppid = static_cast<IDispatch*>(this); + AddRef(); + } + + return S_OK; } HRESULT VariantToIdlist(VARIANT* var, LPITEMIDLIST* idlist) @@ -69,26 +71,56 @@ HRESULT STDMETHODCALLTYPE CShellDispatch::NameSpace(VARIANT vDir, Folder **ppsdf if (!ppsdf) return E_POINTER; *ppsdf = NULL; - LPITEMIDLIST idlist = NULL; - HRESULT hr = VariantToIdlist(&vDir, &idlist); + HRESULT hr; + + if (V_VT(&vDir) == VT_I2) + { + hr = VariantChangeType(&vDir, &vDir, 0, VT_I4); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + } + + CComHeapPtr<ITEMIDLIST> idlist; + hr = VariantToIdlist(&vDir, &idlist); if (!SUCCEEDED(hr) || !idlist) return S_FALSE; - CFolder* fld = new CComObject<CFolder>(); - fld->Init(idlist); - *ppsdf = fld; - fld->AddRef(); - return hr; + + return ShellObjectCreatorInit<CFolder>(static_cast<LPITEMIDLIST>(idlist), IID_PPV_ARG(Folder, ppsdf)); +} + +static BOOL is_optional_argument(const VARIANT *arg) +{ + return V_VT(arg) == VT_ERROR && V_ERROR(arg) == DISP_E_PARAMNOTFOUND; } HRESULT STDMETHODCALLTYPE CShellDispatch::BrowseForFolder(LONG Hwnd, BSTR Title, LONG Options, VARIANT RootFolder, Folder **ppsdf) { TRACE("(%p, %lu, %ls, %lu, %s, %p)\n", this, Hwnd, Title, Options, debugstr_variant(&RootFolder), ppsdf); - return E_NOTIMPL; + + *ppsdf = NULL; + + if (!is_optional_argument(&RootFolder)) + FIXME("root folder is ignored\n"); + + BROWSEINFOW bi = { 0 }; + bi.hwndOwner = reinterpret_cast<HWND>(LongToHandle(Hwnd)); + bi.lpszTitle = Title; + bi.ulFlags = Options; + + CComHeapPtr<ITEMIDLIST> selection; + selection.Attach(SHBrowseForFolderW(&bi)); + if (!selection) + return S_FALSE; + + return ShellObjectCreatorInit<CFolder>(static_cast<LPITEMIDLIST>(selection), IID_PPV_ARG(Folder, ppsdf)); } HRESULT STDMETHODCALLTYPE CShellDispatch::Windows(IDispatch **ppid) { TRACE("(%p, %p)\n", this, ppid); + + *ppid = NULL; + return E_NOTIMPL; } @@ -208,10 +240,35 @@ HRESULT STDMETHODCALLTYPE CShellDispatch::IsRestricted(BSTR group, BSTR restrict return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellDispatch::ShellExecute(BSTR file, VARIANT args, VARIANT dir, VARIANT op, VARIANT show) +HRESULT STDMETHODCALLTYPE CShellDispatch::ShellExecute(BSTR file, VARIANT v_args, VARIANT v_dir, VARIANT v_op, VARIANT v_show) { - TRACE("(%p, %ls, %s, %s, %s, %s)\n", this, file, debugstr_variant(&args), debugstr_variant(&dir), debugstr_variant(&op), debugstr_variant(&show)); - return E_NOTIMPL; + CComVariant args_str, dir_str, op_str, show_int; + WCHAR *args = NULL, *dir = NULL, *op = NULL; + INT show = 0; + HINSTANCE ret; + + TRACE("(%s, %s, %s, %s, %s)\n", debugstr_w(file), debugstr_variant(&v_args), + debugstr_variant(&v_dir), debugstr_variant(&v_op), debugstr_variant(&v_show)); + + args_str.ChangeType(VT_BSTR, &v_args); + if (V_VT(&args_str) == VT_BSTR) + args = V_BSTR(&args_str); + + dir_str.ChangeType(VT_BSTR, &v_dir); + if (V_VT(&dir_str) == VT_BSTR) + dir = V_BSTR(&dir_str); + + op_str.ChangeType(VT_BSTR, &v_op); + if (V_VT(&op_str) == VT_BSTR) + op = V_BSTR(&op_str); + + show_int.ChangeType(VT_I4, &v_show); + if (V_VT(&show_int) == VT_I4) + show = V_I4(&show_int); + + ret = ShellExecuteW(NULL, op, file, args, dir, show); + + return (ULONG_PTR)ret > 32 ? S_OK : S_FALSE; } HRESULT STDMETHODCALLTYPE CShellDispatch::FindPrinter(BSTR name, BSTR location, BSTR model) @@ -238,10 +295,48 @@ HRESULT STDMETHODCALLTYPE CShellDispatch::ServiceStop(BSTR service, VARIANT pers return E_NOTIMPL; } -HRESULT STDMETHODCALLTYPE CShellDispatch::IsServiceRunning(BSTR service, VARIANT *running) +HRESULT STDMETHODCALLTYPE CShellDispatch::IsServiceRunning(BSTR name, VARIANT *running) { - TRACE("(%p, %ls, %p)\n", this, service, running); - return E_NOTIMPL; + SERVICE_STATUS_PROCESS status; + SC_HANDLE scm, service; + DWORD dummy; + + TRACE("(%s, %p)\n", debugstr_w(name), running); + + V_VT(running) = VT_BOOL; + V_BOOL(running) = VARIANT_FALSE; + + scm = OpenSCManagerW(NULL, NULL, SC_MANAGER_CONNECT); + if (!scm) + { + ERR("failed to connect to service manager\n"); + return S_OK; + } + + service = OpenServiceW(scm, name, SERVICE_QUERY_STATUS); + if (!service) + { + ERR("Failed to open service %s (%u)\n", debugstr_w(name), GetLastError()); + CloseServiceHandle(scm); + return S_OK; + } + + if (!QueryServiceStatusEx(service, SC_STATUS_PROCESS_INFO, (BYTE *)&status, + sizeof(SERVICE_STATUS_PROCESS), &dummy)) + { + TRACE("failed to query service status (%u)\n", GetLastError()); + CloseServiceHandle(service); + CloseServiceHandle(scm); + return S_OK; + } + + if (status.dwCurrentState == SERVICE_RUNNING) + V_BOOL(running) = VARIANT_TRUE; + + CloseServiceHandle(service); + CloseServiceHandle(scm); + + return S_OK; } HRESULT STDMETHODCALLTYPE CShellDispatch::CanStartStopService(BSTR service, VARIANT *ret) diff --git a/dll/win32/shell32/CShellDispatch.h b/dll/win32/shell32/CShellDispatch.h index 539f3cfd29..6c32ecf667 100644 --- a/dll/win32/shell32/CShellDispatch.h +++ b/dll/win32/shell32/CShellDispatch.h @@ -1,21 +1,8 @@ /* - * IShellDispatch implementation - * - * Copyright 2015 Mark Jansen - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + * PROJECT: shell32 + * LICENSE: LGPL-2.1+ (https://spdx.org/licenses/LGPL-2.1+) + * PURPOSE: IShellDispatch implementation + * COPYRIGHT: Copyright 2015-2018 Mark Jansen (mark.jansen(a)reactos.org) */ #ifndef _SHELLDISPATCH_H_

6 years, 8 months

01/01: [SC] Don't leak service status info on success

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fd87f0ad87bca5449d438… commit fd87f0ad87bca5449d43802b62fb4a3d1fc0074e Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Apr 14 15:38:12 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Apr 14 15:40:26 2018 +0200 [SC] Don't leak service status info on success CID 1434266 --- base/applications/sc/query.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/base/applications/sc/query.c b/base/applications/sc/query.c index 87b2468cfd..37ab700052 100644 --- a/base/applications/sc/query.c +++ b/base/applications/sc/query.c @@ -350,6 +350,8 @@ Query(LPCTSTR *ServiceArgs, NULL, pStatus, bExtended); + + HeapFree(GetProcessHeap(), 0, pStatus); } } else

6 years, 8 months

01/01: [NET] Add help text for the NET LOCALGROUP command

by Eric Kohl

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ff9c737acce7363c392af… commit ff9c737acce7363c392afba68c8d0abde7a3180e Author: Eric Kohl <eric.kohl(a)reactos.org> AuthorDate: Sat Apr 14 13:23:37 2018 +0200 Commit: Eric Kohl <eric.kohl(a)reactos.org> CommitDate: Sat Apr 14 13:24:05 2018 +0200 [NET] Add help text for the NET LOCALGROUP command --- base/applications/network/net/cmdLocalGroup.c | 11 +++- base/applications/network/net/help.c | 8 ++- base/applications/network/net/lang/en-US.rc | 22 +++++++- base/applications/network/net/lang/es-ES.rc | 21 +++++++- base/applications/network/net/lang/ro-RO.rc | 21 +++++++- base/applications/network/net/lang/ru-RU.rc | 21 +++++++- base/applications/network/net/lang/tr-TR.rc | 21 +++++++- base/applications/network/net/lang/zh-CN.rc | 21 +++++++- base/applications/network/net/lang/zh-TW.rc | 21 +++++++- base/applications/network/net/resource.h | 74 +++++++++++++++------------ 10 files changed, 198 insertions(+), 43 deletions(-) diff --git a/base/applications/network/net/cmdLocalGroup.c b/base/applications/network/net/cmdLocalGroup.c index c70aa1e2e4..931add98be 100644 --- a/base/applications/network/net/cmdLocalGroup.c +++ b/base/applications/network/net/cmdLocalGroup.c @@ -242,7 +242,16 @@ cmdLocalGroup( { if (_wcsicmp(argv[i], L"/help") == 0) { - ConResPuts(StdOut, IDS_LOCALGROUP_HELP); + ConResPuts(StdOut, IDS_GENERIC_SYNTAX); + ConResPuts(StdOut, IDS_LOCALGROUP_SYNTAX); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_1); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_2); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_3); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_4); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_5); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_6); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_7); + ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } else if (_wcsicmp(argv[i], L"/add") == 0) diff --git a/base/applications/network/net/help.c b/base/applications/network/net/help.c index 9398c45a1e..da0bac436e 100644 --- a/base/applications/network/net/help.c +++ b/base/applications/network/net/help.c @@ -102,7 +102,13 @@ INT cmdHelp(INT argc, WCHAR **argv) if (_wcsicmp(argv[2], L"LOCALGROUP") == 0) { ConResPuts(StdOut, IDS_LOCALGROUP_SYNTAX); - ConResPuts(StdOut, IDS_LOCALGROUP_HELP); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_1); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_2); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_3); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_4); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_5); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_6); + ConResPuts(StdOut, IDS_LOCALGROUP_HELP_7); ConResPuts(StdOut, IDS_GENERIC_PAGE); return 0; } diff --git a/base/applications/network/net/lang/en-US.rc b/base/applications/network/net/lang/en-US.rc index d4417db80f..207a63771d 100644 --- a/base/applications/network/net/lang/en-US.rc +++ b/base/applications/network/net/lang/en-US.rc @@ -105,7 +105,27 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ groupname name [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP "LOCALGROUP\n...\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ +options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ + delete. Supply only a groupname to view a list of\n\ + users or global groups in a local group.\n" + IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + remove from a local group. Separate multiple entries with\n\ + a space. Names may be users or global groups, but not\n\ + other local groups. If a user is from another doamin,\n\ + preface the username with the domain name (for\n\ + example, SALES\\RALPHR).\n" + IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ + must be established for users or global groups added to a\n\ + local group with this command.\n" + IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" + IDS_NAME_SYNTAX "NET NAME ...\n\n" IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" diff --git a/base/applications/network/net/lang/es-ES.rc b/base/applications/network/net/lang/es-ES.rc index 774c1f7c39..7b748e6eec 100644 --- a/base/applications/network/net/lang/es-ES.rc +++ b/base/applications/network/net/lang/es-ES.rc @@ -108,7 +108,26 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [grupo [/COMMENT:""texto""]] [/DOMAIN]\n\ grupo {/ADD [/COMMENT:""texto""] | /DELETE} [/DOMAIN]\n\ grupo nombre [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP "LOCALGROUP\n...\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ +options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ + delete. Supply only a groupname to view a list of\n\ + users or global groups in a local group.\n" + IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + remove from a local group. Separate multiple entries with\n\ + a space. Names may be users or global groups, but not\n\ + other local groups. If a user is from another doamin,\n\ + preface the username with the domain name (for\n\ + example, SALES\\RALPHR).\n" + IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ + must be established for users or global groups added to a\n\ + local group with this command.\n" + IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" IDS_NAME_SYNTAX "NET NAME ...\n\n" IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" diff --git a/base/applications/network/net/lang/ro-RO.rc b/base/applications/network/net/lang/ro-RO.rc index f1869cbce8..6ea8a083a9 100644 --- a/base/applications/network/net/lang/ro-RO.rc +++ b/base/applications/network/net/lang/ro-RO.rc @@ -111,7 +111,26 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [nume-de-grup [/COMMENT:""text""]] [/DOMAIN]\n\ nume-de-grup {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ nume-de-grup nume [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP "LOCALGROUP\n...\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ +options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ + delete. Supply only a groupname to view a list of\n\ + users or global groups in a local group.\n" + IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + remove from a local group. Separate multiple entries with\n\ + a space. Names may be users or global groups, but not\n\ + other local groups. If a user is from another doamin,\n\ + preface the username with the domain name (for\n\ + example, SALES\\RALPHR).\n" + IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ + must be established for users or global groups added to a\n\ + local group with this command.\n" + IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" IDS_NAME_SYNTAX "NET NAME ...\n\n" IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" diff --git a/base/applications/network/net/lang/ru-RU.rc b/base/applications/network/net/lang/ru-RU.rc index e220767605..c2ac1079f2 100644 --- a/base/applications/network/net/lang/ru-RU.rc +++ b/base/applications/network/net/lang/ru-RU.rc @@ -107,7 +107,26 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [имя_группы [/COMMENT:""текст""]] [/DOMAIN]\n\ имя_группы {/ADD [/COMMENT:""текст""] | /DELETE} [/DOMAIN]\n\ имя_группы имя [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP "LOCALGROUP\n...\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ +options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ + delete. Supply only a groupname to view a list of\n\ + users or global groups in a local group.\n" + IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + remove from a local group. Separate multiple entries with\n\ + a space. Names may be users or global groups, but not\n\ + other local groups. If a user is from another doamin,\n\ + preface the username with the domain name (for\n\ + example, SALES\\RALPHR).\n" + IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ + must be established for users or global groups added to a\n\ + local group with this command.\n" + IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" IDS_NAME_SYNTAX "NET NAME ...\n\n" IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" diff --git a/base/applications/network/net/lang/tr-TR.rc b/base/applications/network/net/lang/tr-TR.rc index 9e64226ee6..2e4ae02590 100644 --- a/base/applications/network/net/lang/tr-TR.rc +++ b/base/applications/network/net/lang/tr-TR.rc @@ -107,7 +107,26 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [takım adı [/COMMENT:""metin""]] [/DOMAIN]\n\ takım adı {/ADD [/COMMENT:""metin""] | /DELETE} [/DOMAIN]\n\ takım adı ad [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP "LOCALGROUP\n...\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ +options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ + delete. Supply only a groupname to view a list of\n\ + users or global groups in a local group.\n" + IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + remove from a local group. Separate multiple entries with\n\ + a space. Names may be users or global groups, but not\n\ + other local groups. If a user is from another doamin,\n\ + preface the username with the domain name (for\n\ + example, SALES\\RALPHR).\n" + IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ + must be established for users or global groups added to a\n\ + local group with this command.\n" + IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" IDS_NAME_SYNTAX "NET NAME ...\n\n" IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" diff --git a/base/applications/network/net/lang/zh-CN.rc b/base/applications/network/net/lang/zh-CN.rc index 7ebbc12466..ee24567df7 100644 --- a/base/applications/network/net/lang/zh-CN.rc +++ b/base/applications/network/net/lang/zh-CN.rc @@ -107,7 +107,26 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [groupname [/COMMENT:""text""]] [/DOMAIN]\n\ groupname {/ADD [/COMMENT:""text""] | /DELETE} [/DOMAIN]\n\ groupname name [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP "LOCALGROUP\n...\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ +options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ + delete. Supply only a groupname to view a list of\n\ + users or global groups in a local group.\n" + IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + remove from a local group. Separate multiple entries with\n\ + a space. Names may be users or global groups, but not\n\ + other local groups. If a user is from another doamin,\n\ + preface the username with the domain name (for\n\ + example, SALES\\RALPHR).\n" + IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ + must be established for users or global groups added to a\n\ + local group with this command.\n" + IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" IDS_NAME_SYNTAX "NET NAME ...\n\n" IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" diff --git a/base/applications/network/net/lang/zh-TW.rc b/base/applications/network/net/lang/zh-TW.rc index b7e25be658..01e461a32f 100644 --- a/base/applications/network/net/lang/zh-TW.rc +++ b/base/applications/network/net/lang/zh-TW.rc @@ -107,7 +107,26 @@ message and suggested actions you can take to solve the problem.\n\n" IDS_LOCALGROUP_SYNTAX "NET LOCALGROUP [組名 [/COMMENT:""文字""]] [/DOMAIN]\n\ 組名 {/ADD [/COMMENT:""文字""] | /DELETE} [/DOMAIN]\n\ 組名稱 [...] {/ADD | /DELETE} [/DOMAIN]\n\n" - IDS_LOCALGROUP_HELP "LOCALGROUP\n...\n\n" + IDS_LOCALGROUP_HELP_1 "NET LOCALGROUP modifies local groups on computers. When used without\n\ +options, it displays the local groups on the computer.\n\n" + IDS_LOCALGROUP_HELP_2 "groupname Is the name of the local group to add, expand, or\n\ + delete. Supply only a groupname to view a list of\n\ + users or global groups in a local group.\n" + IDS_LOCALGROUP_HELP_3 "/COMMENT:""text"" Adds a comment for a new or existing group.\n\ + Enclose the text inquotation marks.\n" + IDS_LOCALGROUP_HELP_4 "/DOMAIN Performs the operation on a domain controller\n\ + of the current domain. Otherwise, the operation is \n\ + performed on the local computer.\n" + IDS_LOCALGROUP_HELP_5 "name [ ...] List one or more usernames or groupnams to add or to\n\ + remove from a local group. Separate multiple entries with\n\ + a space. Names may be users or global groups, but not\n\ + other local groups. If a user is from another doamin,\n\ + preface the username with the domain name (for\n\ + example, SALES\\RALPHR).\n" + IDS_LOCALGROUP_HELP_6 "/ADD Adds a groupname or username to a local group. An account\n\ + must be established for users or global groups added to a\n\ + local group with this command.\n" + IDS_LOCALGROUP_HELP_7 "/DELETE Removes a groupname or username from a local group.\n\n" IDS_NAME_SYNTAX "NET NAME ...\n\n" IDS_NAME_HELP "NAME\n...\n\n" IDS_PRINT_SYNTAX "NET PRINT ...\n\n" diff --git a/base/applications/network/net/resource.h b/base/applications/network/net/resource.h index 9ecf1c2dc0..ef4cfde7df 100644 --- a/base/applications/network/net/resource.h +++ b/base/applications/network/net/resource.h @@ -37,40 +37,46 @@ #define IDS_HELPMSG_HELP_1 134 #define IDS_HELPMSG_HELP_2 135 #define IDS_LOCALGROUP_SYNTAX 136 -#define IDS_LOCALGROUP_HELP 137 -#define IDS_NAME_SYNTAX 138 -#define IDS_NAME_HELP 139 -#define IDS_PAUSE_SYNTAX 140 -#define IDS_PAUSE_HELP_1 141 -#define IDS_PAUSE_HELP_2 142 -#define IDS_PRINT_SYNTAX 143 -#define IDS_PRINT_HELP 144 -#define IDS_SEND_SYNTAX 145 -#define IDS_SEND_HELP 146 -#define IDS_SESSION_SYNTAX 147 -#define IDS_SESSION_HELP 148 -#define IDS_SHARE_SYNTAX 149 -#define IDS_SHARE_HELP 150 -#define IDS_START_SYNTAX 151 -#define IDS_START_HELP_1 152 -#define IDS_START_HELP_2 153 -#define IDS_START_HELP_3 154 -#define IDS_STATISTICS_SYNTAX 155 -#define IDS_STATISTICS_HELP_1 156 -#define IDS_STATISTICS_HELP_2 157 -#define IDS_STOP_SYNTAX 158 -#define IDS_STOP_HELP_1 159 -#define IDS_STOP_HELP_2 160 -#define IDS_STOP_HELP_3 161 -#define IDS_TIME_SYNTAX 162 -#define IDS_TIME_HELP 163 -#define IDS_USE_SYNTAX 164 -#define IDS_USE_HELP 165 -#define IDS_USER_SYNTAX 166 -#define IDS_USER_HELP 167 -#define IDS_VIEW_SYNTAX 168 -#define IDS_VIEW_HELP 169 -#define IDS_NET_SYNTAX 170 +#define IDS_LOCALGROUP_HELP_1 137 +#define IDS_LOCALGROUP_HELP_2 138 +#define IDS_LOCALGROUP_HELP_3 139 +#define IDS_LOCALGROUP_HELP_4 140 +#define IDS_LOCALGROUP_HELP_5 141 +#define IDS_LOCALGROUP_HELP_6 142 +#define IDS_LOCALGROUP_HELP_7 143 +#define IDS_NAME_SYNTAX 144 +#define IDS_NAME_HELP 145 +#define IDS_PAUSE_SYNTAX 146 +#define IDS_PAUSE_HELP_1 147 +#define IDS_PAUSE_HELP_2 148 +#define IDS_PRINT_SYNTAX 149 +#define IDS_PRINT_HELP 150 +#define IDS_SEND_SYNTAX 151 +#define IDS_SEND_HELP 152 +#define IDS_SESSION_SYNTAX 153 +#define IDS_SESSION_HELP 154 +#define IDS_SHARE_SYNTAX 155 +#define IDS_SHARE_HELP 156 +#define IDS_START_SYNTAX 157 +#define IDS_START_HELP_1 158 +#define IDS_START_HELP_2 159 +#define IDS_START_HELP_3 160 +#define IDS_STATISTICS_SYNTAX 161 +#define IDS_STATISTICS_HELP_1 162 +#define IDS_STATISTICS_HELP_2 163 +#define IDS_STOP_SYNTAX 164 +#define IDS_STOP_HELP_1 165 +#define IDS_STOP_HELP_2 166 +#define IDS_STOP_HELP_3 167 +#define IDS_TIME_SYNTAX 168 +#define IDS_TIME_HELP 169 +#define IDS_USE_SYNTAX 170 +#define IDS_USE_HELP 171 +#define IDS_USER_SYNTAX 172 +#define IDS_USER_HELP 173 +#define IDS_VIEW_SYNTAX 174 +#define IDS_VIEW_HELP 175 +#define IDS_NET_SYNTAX 176 #define IDS_ACCOUNTS_FORCE_LOGOFF 200 #define IDS_ACCOUNTS_LOGOFF_SECONDS 201

6 years, 8 months

01/01: [VFATLIB] Simplify in-memory boot sector copy. So that, coverity is happy again. NFC

by Pierre Schweitzer

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=38791299ca9727d4b639b… commit 38791299ca9727d4b639b25bcf5aeca5716d1826 Author: Pierre Schweitzer <pierre(a)reactos.org> AuthorDate: Sat Apr 14 12:05:32 2018 +0200 Commit: Pierre Schweitzer <pierre(a)reactos.org> CommitDate: Sat Apr 14 12:05:32 2018 +0200 [VFATLIB] Simplify in-memory boot sector copy. So that, coverity is happy again. NFC CID 1434230, 1434233, 1434238, 1434243, 1434246, 1434272 --- sdk/lib/fslib/vfatlib/fat12.c | 3 +-- sdk/lib/fslib/vfatlib/fat16.c | 3 +-- sdk/lib/fslib/vfatlib/fat32.c | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sdk/lib/fslib/vfatlib/fat12.c b/sdk/lib/fslib/vfatlib/fat12.c index bf96f8d2ec..1668fc4670 100644 --- a/sdk/lib/fslib/vfatlib/fat12.c +++ b/sdk/lib/fslib/vfatlib/fat12.c @@ -38,8 +38,7 @@ Fat12WriteBootSector(IN HANDLE FileHandle, RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ - memcpy(&NewBootSector->Jump[0], - &BootSector->Jump[0], + memcpy(NewBootSector, BootSector, FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, Jump)); /* FAT16 BPB length (up to (not including) Res2) */ diff --git a/sdk/lib/fslib/vfatlib/fat16.c b/sdk/lib/fslib/vfatlib/fat16.c index 1438532390..ac38311547 100644 --- a/sdk/lib/fslib/vfatlib/fat16.c +++ b/sdk/lib/fslib/vfatlib/fat16.c @@ -38,8 +38,7 @@ Fat16WriteBootSector(IN HANDLE FileHandle, RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT16 BPB to new bootsector */ - memcpy(&NewBootSector->Jump[0], - &BootSector->Jump[0], + memcpy(NewBootSector, BootSector, FIELD_OFFSET(FAT16_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT16_BOOT_SECTOR, Jump)); /* FAT16 BPB length (up to (not including) Res2) */ diff --git a/sdk/lib/fslib/vfatlib/fat32.c b/sdk/lib/fslib/vfatlib/fat32.c index 1987af4fdd..4e789372d4 100644 --- a/sdk/lib/fslib/vfatlib/fat32.c +++ b/sdk/lib/fslib/vfatlib/fat32.c @@ -38,8 +38,7 @@ Fat32WriteBootSector(IN HANDLE FileHandle, RtlZeroMemory(NewBootSector, BootSector->BytesPerSector); /* Copy FAT32 BPB to new bootsector */ - memcpy(&NewBootSector->Jump[0], - &BootSector->Jump[0], + memcpy(NewBootSector, BootSector, FIELD_OFFSET(FAT32_BOOT_SECTOR, Res2) - FIELD_OFFSET(FAT32_BOOT_SECTOR, Jump)); /* FAT32 BPB length (up to (not including) Res2) */

6 years, 8 months

← Newer
1
...
7
8
9
10
11
12
13
...
25
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2018