- Port the last welcome.exe change from r73658.

- Fix the path to welcome settings for the FOSDEM CD.
- Add the welcome.exe localized customizations for FOSDEM 2017 CD.

svn path=/branches/ReactOS-0.4.4-FOSDEM2017/; revision=73659

reactos/CMakeLists.txt

@@ -16,6 +16,11 @@ if(POLICY CMP0051)
     cmake_policy(SET CMP0051 NEW)
 endif()
 
+if(POLICY CMP0058)
+    # Ninja requires custom command byproducts to be explicit
+    cmake_policy(SET CMP0058 OLD)
+endif()
+
 project(REACTOS)
 
 # Versioning
@@ -35,7 +40,6 @@ set(CMAKE_SKIP_PREPROCESSED_SOURCE_RULES TRUE)
 set(CMAKE_SKIP_ASSEMBLY_SOURCE_RULES TRUE)
 set(CMAKE_COLOR_MAKEFILE OFF)
 #set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
-set(CMAKE_SKIP_INSTALL_RULES ON)
 
 if(NOT DEFINED NEW_STYLE_BUILD)
     set(NEW_STYLE_BUILD TRUE)
@@ -94,8 +98,6 @@ if(NOT CMAKE_CROSSCOMPILING)
             add_definitions(/D_ALLOW_KEYWORD_MACROS)
         endif()
         add_definitions(/Dinline=__inline)
-    else()
-        add_compile_flags("-fshort-wchar -Wno-multichar")
     endif()
 
     include_directories(sdk/include/host)
@@ -108,9 +110,9 @@ if(NOT CMAKE_CROSSCOMPILING)
 
     if(NOT NEW_STYLE_BUILD)
         if(NOT MSVC)
-            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc rsym mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc rsym mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         else()
-            export(TARGETS bin2c widl gendib cabman cdmake fatten hpp mkhive obj2bin spec2def geninc mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
+            export(TARGETS bin2c widl gendib cabman fatten hpp isohybrid mkhive mkisofs obj2bin spec2def geninc mkshelllink utf16le xml2sdb FILE ${CMAKE_BINARY_DIR}/ImportExecutables.cmake NAMESPACE native- )
         endif()
     endif()
 
@@ -235,6 +237,7 @@ else()
         ${REACTOS_BINARY_DIR}/sdk/include/dxsdk
         ${REACTOS_BINARY_DIR}/sdk/include/ddk
         ${REACTOS_BINARY_DIR}/sdk/include/reactos
+        ${REACTOS_BINARY_DIR}/sdk/include/reactos/mc
         sdk/include/crt
         sdk/include/ddk
         sdk/include/ndk

reactos/base/applications/atactl/atactl.cpp

@@ -91,14 +91,14 @@ void print_help() {
            "    will switch device at Scsi2, bus 1, taget_id 1 to UDMA0 mode\n"
            "  atactl -h -d 30 c1:b0:d0:l0 \n"
            "    will hide Master (d0:l0) device on secondary (c1:b0) IDE channel\n"
-           "    and lock i/o on this channel for 30 seconds to ensure safity\n"
+           "    and lock i/o on this channel for 30 seconds to ensure safety\n"
            "    of removal process"
            "------\n"
            "Device address format:\n"
            "\n"
            "s<controller id> number of controller in system. Is assigned during hardware\n"
            "                   detection. Usually s0/s1 are ATA Pri/Sec.\n"
-           "                   Note, due do NT internal desing ATA controllers are represented\n"
+           "                   Note, due do NT internal design ATA controllers are represented\n"
            "                   as SCSI controllers.\n"
            "b<bus id>        For ATA controllers it is channel number.\n"
            "                   Note, usually onboard controller is represented as 2 legacy\n"
@@ -1283,7 +1283,7 @@ ata_scan(
         to.WaitForPhysicalLink = lock;
         to.Flags = unhide ? UNIATA_ADD_FLAGS_UNHIDE : 0;
 
-        printf("Scaning bus for new devices.\n");
+        printf("Scanning bus for new devices.\n");
         if(lock) {
             printf("You have %d seconds to connect device.\n", lock);
         }

reactos/base/applications/cacls/CMakeLists.txt

@@ -1,6 +1,8 @@
 
-list(APPEND SOURCE cacls.c cacls.rc)
-add_executable(cacls ${SOURCE})
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
+add_executable(cacls cacls.c cacls.rc)
 set_module_type(cacls win32cui UNICODE)
+target_link_libraries(cacls conutils ${PSEH_LIB})
 add_importlibs(cacls advapi32 user32 shell32 msvcrt kernel32)
 add_cd_file(TARGET cacls DESTINATION reactos/system32 FOR all)

reactos/base/applications/cacls/cacls.c

@@ -33,155 +33,17 @@ static GENERIC_MAPPING FileGenericMapping =
 };
 
 
-static
-INT
-LengthOfStrResource(IN HINSTANCE hInst,
-                    IN UINT uID)
+static VOID
+PrintError(DWORD dwError)
 {
-    HRSRC hrSrc;
-    HGLOBAL hRes;
-    LPWSTR lpName, lpStr;
+    if (dwError == ERROR_SUCCESS)
+        return;
 
-    if (hInst == NULL)
-    {
-        hInst = GetModuleHandle(NULL);
-    }
-
-    /* There are always blocks of 16 strings */
-    lpName = (LPWSTR)MAKEINTRESOURCE((uID >> 4) + 1);
-
-    /* Find the string table block */
-    hrSrc = FindResourceW(hInst, lpName, (LPWSTR)RT_STRING);
-    if (hrSrc)
-    {
-        hRes = LoadResource(hInst, hrSrc);
-        if (hRes)
-        {
-            lpStr = LockResource(hRes);
-            if (lpStr)
-            {
-                UINT x;
-
-                /* Find the string we're looking for */
-                uID &= 0xF; /* position in the block, same as % 16 */
-                for (x = 0; x < uID; x++)
-                {
-                    lpStr += (*lpStr) + 1;
-                }
-
-                /* Found the string */
-                return (int)(*lpStr);
-            }
-        }
-    }
-    return -1;
+    ConMsgPuts(StdErr, FORMAT_MESSAGE_FROM_SYSTEM,
+               NULL, dwError, LANG_USER_DEFAULT);
 }
 
-
-static
-INT
-AllocAndLoadString(OUT LPTSTR *lpTarget,
-                   IN HINSTANCE hInst,
-                   IN UINT uID)
-{
-    INT ln;
-
-    ln = LengthOfStrResource(hInst,
-                             uID);
-    if (ln++ > 0)
-    {
-        (*lpTarget) = (LPTSTR)HeapAlloc(GetProcessHeap(),
-                                        0,
-                                        ln * sizeof(TCHAR));
-        if ((*lpTarget) != NULL)
-        {
-            INT Ret;
-            Ret = LoadString(hInst,
-                             uID,
-                             *lpTarget,
-                             ln);
-            if (!Ret)
-            {
-                HeapFree(GetProcessHeap(),
-                         0,
-                         *lpTarget);
-            }
-            return Ret;
-        }
-    }
-    return 0;
-}
-
-
-static
-VOID
-PrintHelp(VOID)
-{
-    LPTSTR szHelp;
-
-    if (AllocAndLoadString(&szHelp,
-                           NULL,
-                           IDS_HELP) != 0)
-    {
-        _tprintf(_T("%s"),
-                 szHelp);
-
-        HeapFree(GetProcessHeap(),
-                 0,
-                 szHelp);
-    }
-}
-
-
-static
-VOID
-PrintErrorMessage(IN DWORD dwError)
-{
-    LPTSTR szError;
-
-    if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
-                          FORMAT_MESSAGE_IGNORE_INSERTS |
-                          FORMAT_MESSAGE_FROM_SYSTEM,
-                      NULL,
-                      dwError,
-                      MAKELANGID(LANG_NEUTRAL,
-                                 SUBLANG_DEFAULT),
-                      (LPTSTR)&szError,
-                      0,
-                      NULL) != 0)
-    {
-        _tprintf(_T("%s"),
-                 szError);
-        LocalFree((HLOCAL)szError);
-    }
-}
-
-
-static
-DWORD
-LoadAndPrintString(IN HINSTANCE hInst,
-                   IN UINT uID)
-{
-    TCHAR szTemp[255];
-    DWORD Len;
-
-    Len = (DWORD)LoadString(hInst,
-                            uID,
-                            szTemp,
-                            sizeof(szTemp) / sizeof(szTemp[0]));
-
-    if (Len != 0)
-    {
-        _tprintf(_T("%s"),
-                 szTemp);
-    }
-
-    return Len;
-}
-
-
-static
-BOOL
+static BOOL
 PrintFileDacl(IN LPTSTR FilePath,
               IN LPTSTR FileName)
 {
@@ -199,10 +61,8 @@ PrintFileDacl(IN LPTSTR FilePath,
         return FALSE;
     }
 
-    _tcscpy(FullFileName,
-            FilePath);
-    _tcscat(FullFileName,
-            FileName);
+    _tcscpy(FullFileName, FilePath);
+    _tcscat(FullFileName, FileName);
 
     /* find out how much memory we need */
     if (!GetFileSecurity(FullFileName,
@@ -318,8 +178,7 @@ BuildSidString:
                         }
 
                         /* print the file name or space */
-                        _tprintf(_T("%s "),
-                                 FullFileName);
+                        ConPrintf(StdOut, L"%s ", FullFileName);
 
                         /* attempt to map the SID to a user name */
                         if (AceIndex == 0)
@@ -335,35 +194,29 @@ BuildSidString:
                         /* print the domain and/or user if possible, or the SID string */
                         if (Name != NULL && Domain[0] != _T('\0'))
                         {
-                            _tprintf(_T("%s\\%s:"),
-                                     Domain,
-                                     Name);
+                            ConPrintf(StdOut, L"%s\\%s:", Domain, Name);
                             IndentAccess = (DWORD)_tcslen(Domain) + _tcslen(Name);
                         }
                         else
                         {
                             LPTSTR DisplayString = (Name != NULL ? Name : SidString);
 
-                            _tprintf(_T("%s:"),
-                                     DisplayString);
+                            ConPrintf(StdOut, L"%s:", DisplayString);
                             IndentAccess = (DWORD)_tcslen(DisplayString);
                         }
 
                         /* print the ACE Flags */
                         if (Ace->Header.AceFlags & CONTAINER_INHERIT_ACE)
                         {
-                            IndentAccess += LoadAndPrintString(NULL,
-                                                               IDS_ABBR_CI);
+                            IndentAccess += ConResPuts(StdOut, IDS_ABBR_CI);
                         }
                         if (Ace->Header.AceFlags & OBJECT_INHERIT_ACE)
                         {
-                            IndentAccess += LoadAndPrintString(NULL,
-                                                               IDS_ABBR_OI);
+                            IndentAccess += ConResPuts(StdOut, IDS_ABBR_OI);
                         }
                         if (Ace->Header.AceFlags & INHERIT_ONLY_ACE)
                         {
-                            IndentAccess += LoadAndPrintString(NULL,
-                                                               IDS_ABBR_IO);
+                            IndentAccess += ConResPuts(StdOut, IDS_ABBR_IO);
                         }
 
                         IndentAccess += 2;
@@ -375,13 +228,11 @@ BuildSidString:
                         {
                             if (AccessMask == FILE_ALL_ACCESS)
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_NONE);
+                                ConResPuts(StdOut, IDS_ABBR_NONE);
                             }
                             else
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_DENY);
+                                ConResPuts(StdOut, IDS_DENY);
                                 goto PrintSpecialAccess;
                             }
                         }
@@ -389,24 +240,20 @@ BuildSidString:
                         {
                             if (AccessMask == FILE_ALL_ACCESS)
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_FULL);
+                                ConResPuts(StdOut, IDS_ABBR_FULL);
                             }
                             else if (!(Ace->Mask & (GENERIC_READ | GENERIC_EXECUTE)) &&
                                      AccessMask == (FILE_GENERIC_READ | FILE_EXECUTE))
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_READ);
+                                ConResPuts(StdOut, IDS_ABBR_READ);
                             }
                             else if (AccessMask == (FILE_GENERIC_READ | FILE_GENERIC_WRITE | FILE_EXECUTE | DELETE))
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_CHANGE);
+                                ConResPuts(StdOut, IDS_ABBR_CHANGE);
                             }
                             else if (AccessMask == FILE_GENERIC_WRITE)
                             {
-                                LoadAndPrintString(NULL,
-                                                   IDS_ABBR_WRITE);
+                                ConResPuts(StdOut, IDS_ABBR_WRITE);
                             }
                             else
                             {
@@ -446,38 +293,32 @@ BuildSidString:
                                     {STANDARD_RIGHTS_ALL, IDS_STANDARD_RIGHTS_ALL},
                                 };
 
-                                LoadAndPrintString(NULL,
-                                                   IDS_ALLOW);
+                                ConResPuts(StdOut, IDS_ALLOW);
 
 PrintSpecialAccess:
-                                LoadAndPrintString(NULL,
-                                                   IDS_SPECIAL_ACCESS);
+                                ConResPuts(StdOut, IDS_SPECIAL_ACCESS);
 
                                 /* print the special access rights */
-                                x = sizeof(AccessRights) / sizeof(AccessRights[0]);
+                                x = ARRAYSIZE(AccessRights);
                                 while (x-- != 0)
                                 {
                                     if ((Ace->Mask & AccessRights[x].Access) == AccessRights[x].Access)
                                     {
-                                        _tprintf(_T("\n%s "),
-                                                 FullFileName);
-                                        for (x2 = 0;
-                                             x2 < IndentAccess;
-                                             x2++)
+                                        ConPrintf(StdOut, L"\n%s ", FullFileName);
+                                        for (x2 = 0; x2 < IndentAccess; x2++)
                                         {
-                                            _tprintf(_T(" "));
+                                            ConPuts(StdOut, L" ");
                                         }
 
-                                        LoadAndPrintString(NULL,
-                                                           AccessRights[x].uID);
+                                        ConResPuts(StdOut, AccessRights[x].uID);
                                     }
                                 }
 
-                                _tprintf(_T("\n"));
+                                ConPuts(StdOut, L"\n");
                             }
                         }
 
-                        _tprintf(_T("\n"));
+                        ConPuts(StdOut, L"\n");
 
                         /* free up all resources */
                         if (Name != NULL)
@@ -541,7 +382,7 @@ GetPathOfFile(LPTSTR FilePath, LPCTSTR pszFiles)
         *pch = 0;
         if (!GetFullPathName(FilePath, MAX_PATH, FullPath, NULL))
         {
-            PrintErrorMessage(GetLastError());
+            PrintError(GetLastError());
             return FALSE;
         }
         lstrcpyn(FilePath, FullPath, MAX_PATH);
@@ -549,7 +390,7 @@ GetPathOfFile(LPTSTR FilePath, LPCTSTR pszFiles)
         attrs = GetFileAttributes(FilePath);
         if (attrs == 0xFFFFFFFF || !(attrs & FILE_ATTRIBUTE_DIRECTORY))
         {
-            PrintErrorMessage(ERROR_DIRECTORY);
+            PrintError(ERROR_DIRECTORY);
             return FALSE;
         }
     }
@@ -591,7 +432,7 @@ PrintDaclsOfFiles(LPCTSTR pszFiles)
             LastError = GetLastError();
             if (LastError == ERROR_ACCESS_DENIED)
             {
-                PrintErrorMessage(LastError);
+                PrintError(LastError);
                 if (!OptionC)
                 {
                     FindClose(hFind);
@@ -599,17 +440,21 @@ PrintDaclsOfFiles(LPCTSTR pszFiles)
                 }
             }
             else
+            {
                 break;
+            }
         }
         else
-            _tprintf(_T("\n"));
+        {
+            ConPuts(StdOut, L"\n");
+        }
     } while(FindNextFile(hFind, &FindData));
     LastError = GetLastError();
     FindClose(hFind);
 
     if (LastError != ERROR_NO_MORE_FILES)
     {
-        PrintErrorMessage(LastError);
+        PrintError(LastError);
         return FALSE;
     }
 
@@ -771,7 +616,7 @@ ChangeACLsOfFiles(LPCTSTR pszFiles)
             LastError = GetLastError();
             if (LastError == ERROR_ACCESS_DENIED)
             {
-                PrintErrorMessage(LastError);
+                PrintError(LastError);
                 if (!OptionC)
                 {
                     FindClose(hFind);
@@ -788,7 +633,7 @@ ChangeACLsOfFiles(LPCTSTR pszFiles)
 
     if (LastError != ERROR_NO_MORE_FILES)
     {
-        PrintErrorMessage(LastError);
+        PrintError(LastError);
         return FALSE;
     }
 
@@ -826,7 +671,7 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
             LastError = GetLastError();
             if (LastError == ERROR_ACCESS_DENIED)
             {
-                PrintErrorMessage(LastError);
+                PrintError(LastError);
                 if (!OptionC)
                 {
                     FindClose(hFind);
@@ -843,7 +688,7 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
 
     if (LastError != ERROR_NO_MORE_FILES)
     {
-        PrintErrorMessage(LastError);
+        PrintError(LastError);
         return FALSE;
     }
 
@@ -872,7 +717,7 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
                 LastError = GetLastError();
                 if (LastError == ERROR_ACCESS_DENIED)
                 {
-                    PrintErrorMessage(LastError);
+                    PrintError(LastError);
                     if (!OptionC)
                     {
                         FindClose(hFind);
@@ -889,26 +734,29 @@ ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
 
     if (LastError != ERROR_NO_MORE_FILES)
     {
-        PrintErrorMessage(LastError);
+        PrintError(LastError);
         return FALSE;
     }
     return TRUE;
 }
 
-int
-__cdecl
-_tmain(int argc, const TCHAR *argv[])
+int _tmain(int argc, const TCHAR *argv[])
 {
     INT i;
     LPTSTR pch;
     BOOL InvalidParameter = FALSE;
 
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
     if (argc <= 1)
     {
-        PrintHelp();
+        ConResPuts(StdOut, IDS_HELP);
         return 0;
     }
 
+    // FIXME: Convert to proper parsing, with support for /?
+
     /*
      * parse command line options
      */
@@ -991,8 +839,8 @@ _tmain(int argc, const TCHAR *argv[])
 
     if (InvalidParameter)
     {
-        PrintErrorMessage(ERROR_INVALID_PARAMETER);
-        PrintHelp();
+        PrintError(ERROR_INVALID_PARAMETER);
+        ConResPuts(StdOut, IDS_HELP);
         return 1;
     }
 

reactos/base/applications/cacls/lang/el-GR.rc

@@ -23,7 +23,8 @@ CACLS όνομα_αρχείου [/T] [/E] [/C] [/G χρήστης:άδειες [
                               C  Αλλαγή (εγγραφή)\n\
                               F  Πλήρης έλεγχος\n\
    /D user       Αποτροπή χρήστη από προσπέλαση.\n\
-Τα Wildcards μπορούν να χρησιμοποιηθούν για να προσδιορίσουν παραπαπάνω από ένα αρχεία στην εντολή.\n\
+Τα Wildcards μπορούν να χρησιμοποιηθούν για να προσδιορίσουν παραπαπάνω από\n\
+ένα αρχεία στην εντολή.\n\
 Μπορείτε να προσδιορίσετε παρπαάνω από έναν χρήστη στην εντολή.\n\n\
 Abbreviations:\n\
    CI - Container Inherit.\n\

reactos/base/applications/cacls/lang/es-ES.rc

@@ -18,7 +18,8 @@ CACLS archivo  [/T] [/E] [/C] [/G user:perm [...]] [/R usuario [...]]\n\
                                  W  Escribir\n\
                                  C  Cambiar (escribir)\n\
                                  F  Control total\n\
-   /R usuario    Revoca los derechos de acceso al usuario especificado (unicamente válido con /E).\n\
+   /R usuario    Revoca los derechos de acceso al usuario especificado\n\
+                 (unicamente válido con /E).\n\
    /P user:perm  Reemplaza los derechos de acceso del usuario especificado.\n\
                  Perm puede ser: N  Ninguno\n\
                                  R  Leer\n\

reactos/base/applications/cacls/lang/fr-FR.rc

@@ -15,7 +15,8 @@ CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
                                     W  Écriture\n\
                                     C  Modification (Écriture)\n\
                                     F  Contrôle total\n\
-   /R user       Supprime les droits d'accès de l'utilisateur spécifié (valide uniquement avec /E).\n\
+   /R user       Supprime les droits d'accès de l'utilisateur spécifié\n\
+                 (valide uniquement avec /E).\n\
    /P user:perm  Remplace les droits d'accès de l'utilisateur spécifié.\n\
                  Perm peut valoir : N  Aucun \n\
                                     R  Lecture\n\
@@ -23,7 +24,8 @@ CACLS nomfichier [/T] [/E] [/C] [/G user:perm [...]] [/R user [...]]\n\
                                     C  Modification (Écriture)\n\
                                     F  Contrôle total\n\
    /D user       Interdit l'accès à l'utilisateur spécifié.\n\
-Il est possible d'utiliser des caractères joker pour sélectionner plus d'un fichier avec une commande.\n\
+Il est possible d'utiliser des caractères joker pour sélectionner plus d'un\n\
+fichier avec une commande.\n\
 Il est possible de spécifier plus d'un utilisateur dans une commande.\n\n\
 Abréviations:\n\
    CI - Héritage du conteneur.\n\

reactos/base/applications/cacls/lang/nl-NL.rc

@@ -2,7 +2,9 @@ LANGUAGE LANG_DUTCH, SUBLANG_NEUTRAL
 
 STRINGTABLE
 BEGIN
-    IDS_HELP "ACL's (Access Control Lists, toegangslijsten) van bestanden weergeven\nof bewerken\n\nCACLS bestandsnaam [/T] [/E] [/C] [/G gebr:toeg] [/R gebruiker [...]]\n\
+    IDS_HELP "ACL's (Access Control Lists, toegangslijsten) van bestanden weergeven\n\
+of bewerken\n\n\
+CACLS bestandsnaam [/T] [/E] [/C] [/G gebr:toeg] [/R gebruiker [...]]\n\
                    [/P gebr:toeg [...]] [/D gebruiker [...]]\n\
    bestandsnaam    ACL's weergeven.\n\
    /T              ACL's wijzigen van opgegeven bestanden in\n\

reactos/base/applications/cacls/lang/pl-PL.rc

@@ -24,7 +24,8 @@ CACLS nazwa pliku [/T] [/E] [/C] [/G użytkownik:dostęp [...]] [/R użytkownik
                               W  Zapis\n\
                               C  Zmiana (zapis)\n\
                               F  Pełny dostęp\n\
-   /R użytkownik         Odwołuje prawa dostępu określonemu użytkownikowi  (działa tylko z opcją /E).\n\
+   /R użytkownik         Odwołuje prawa dostępu określonemu użytkownikowi\n\
+                         (działa tylko z opcją /E).\n\
    /P użytkownik:dostęp  Edytuje prawa dostępu określonego użytkownika.\n\
                          Poziom dostępu:\n\
                               N  Brak\n\
@@ -33,7 +34,8 @@ CACLS nazwa pliku [/T] [/E] [/C] [/G użytkownik:dostęp [...]] [/R użytkownik
                               C  Zmiana (zapis)\n\
                               F  Pełny dostęp\n\
    /D użytkownik        Odbiera prawa dostępu określonemu użytkownikowi.\n\
-W jednym poleceniu można edytować prawa dostępu do wielu plików, używając symboli wieloznacznych.\n\
+W jednym poleceniu można edytować prawa dostępu do wielu plików, używając\n\
+symboli wieloznacznych.\n\
 W jednym poleceniu można edytować prawa dostępu wielu użytkowników.\n\n\
 Skróty:\n\
    CI - Dziedziczenie kontenera.\n\

reactos/base/applications/cacls/lang/ro-RO.rc

@@ -1,4 +1,4 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
@@ -26,8 +26,8 @@ CACLS nume_fișier [/T] [/E] [/C] [/G utilizator:acces [...]]\n\
                                         C  De modificare (scriere)\n\
                                         F  Deplin\n\
    /D utilizator        Interzice accesul pentru utilizatorul specificat.\n\
-Se pot specifica mai multe fișiere utilizând metacaractere.\n\
-Pot fi specificați mai mulți utilizatori în aceiași comandă.\n\n\
+Utilizând metacaractere pot fi specificate mai multe fișiere.\n\
+În aceiași comandă pot fi specificați mai mulți utilizatori.\n\n\
 Abrevieri:\n\
    CI - Moștenire container.\n\
         ACE moștenită de directoare.\n\

reactos/base/applications/cacls/precomp.h

@@ -2,11 +2,14 @@
 #define _CACLS_PRECOMP_H
 
 #include <stdarg.h>
+#include <tchar.h>
+
 #include <windef.h>
 #include <winbase.h>
-#include <winuser.h>
+#include <winuser.h> // For CharPrev
 #include <sddl.h>
-#include <tchar.h>
+
+#include <conutils.h>
 
 #include "resource.h"
 

reactos/base/applications/calc/help.txt

@@ -331,7 +331,7 @@ It deletes the current calculation and all sub expressions.
 Shortcut from keyboard: ESC
 
 F-E
-It enables or it disables the fixed scietific notation.
+It enables or it disables the fixed scientific notation.
 Shortcut from keyboard: V
 
 0 1 2 3 4 5 6 7 8 9

reactos/base/applications/calc/lang/en-US.rc

@@ -331,7 +331,7 @@ BEGIN
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "&Help topics", IDM_HELP_HELP
+        MENUITEM "&Help Topics", IDM_HELP_HELP
         MENUITEM SEPARATOR
         MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT
     END
@@ -364,7 +364,7 @@ BEGIN
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "&Help topics", IDM_HELP_HELP
+        MENUITEM "&Help Topics", IDM_HELP_HELP
         MENUITEM SEPARATOR
         MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT
     END
@@ -387,7 +387,7 @@ BEGIN
     END
     POPUP "&Help"
     BEGIN
-        MENUITEM "&Help topics", IDM_HELP_HELP
+        MENUITEM "&Help Topics", IDM_HELP_HELP
         MENUITEM SEPARATOR
         MENUITEM "&About ReactOS Calc", IDM_HELP_ABOUT
     END

reactos/base/applications/calc/lang/tr-TR.rc

@@ -320,14 +320,14 @@ BEGIN
         MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
         MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "&Onaltılık\tİ5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "O&nluk\tİ6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "&Sekizlik\tİ7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "&İkilik\tİ8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "&Onaltılık\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "O&nluk\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "&Sekizlik\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "&İkilik\tF8", IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "D&erece\tİ2", IDM_VIEW_DEG, CHECKED
-        MENUITEM "&Radyan\tİ3", IDM_VIEW_RAD, CHECKED
-        MENUITEM "&Gradyan\tİ4", IDM_VIEW_GRAD, CHECKED
+        MENUITEM "D&erece\tF2", IDM_VIEW_DEG, CHECKED
+        MENUITEM "&Radyan\tF3", IDM_VIEW_RAD, CHECKED
+        MENUITEM "&Gradyan\tF4", IDM_VIEW_GRAD, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "B&asamakları Takımla", IDM_VIEW_GROUP, CHECKED
     END
@@ -352,15 +352,15 @@ BEGIN
         MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
         MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
-        MENUITEM "&Onaltılık\tİ5", IDM_VIEW_HEX, CHECKED
-        MENUITEM "O&nluk\tİ6", IDM_VIEW_DEC, CHECKED
-        MENUITEM "&Sekizlik\tİ7", IDM_VIEW_OCT, CHECKED
-        MENUITEM "&İkilik\tİ8", IDM_VIEW_BIN, CHECKED
+        MENUITEM "&Onaltılık\tF5", IDM_VIEW_HEX, CHECKED
+        MENUITEM "O&nluk\tF6", IDM_VIEW_DEC, CHECKED
+        MENUITEM "&Sekizlik\tF7", IDM_VIEW_OCT, CHECKED
+        MENUITEM "&İkilik\tF8", IDM_VIEW_BIN, CHECKED
         MENUITEM SEPARATOR
-        MENUITEM "Dö&rtlü Sözcük\tİ12", IDM_VIEW_QWORD, CHECKED
-        MENUITEM "İ&kili Sözcük\tİ2", IDM_VIEW_DWORD, CHECKED
-        MENUITEM "Sö&zcük\tİ3", IDM_VIEW_WORD, CHECKED
-        MENUITEM "&Çoklu\tİ4", IDM_VIEW_BYTE, CHECKED
+        MENUITEM "Dö&rtlü Sözcük\tF12", IDM_VIEW_QWORD, CHECKED
+        MENUITEM "İ&kili Sözcük\tF2", IDM_VIEW_DWORD, CHECKED
+        MENUITEM "Sö&zcük\tF3", IDM_VIEW_WORD, CHECKED
+        MENUITEM "&Çoklu\tF4", IDM_VIEW_BYTE, CHECKED
         MENUITEM SEPARATOR
         MENUITEM "B&asamakları Takımla", IDM_VIEW_GROUP, CHECKED
     END

reactos/base/applications/calc/rpn.c

@@ -314,7 +314,7 @@ void run_operator(calc_node_t *result,
             calc.is_nan = TRUE;
     } else {
         operator_list[operation].op_i(&dc, &da, &db);
-        /* apply final limitator to result */
+        /* apply final limiter to result */
         apply_int_mask(&dc);
     }
 

reactos/base/applications/calc/rpn_mpfr.c

@@ -300,7 +300,7 @@ void run_operator(calc_node_t *result,
             operator_list[operation].op_f(&result->number, &a->number, &b->number);
     } else {
         operator_list[operation].op_i(&result->number, &a->number, &b->number);
-        /* apply final limitator to result */
+        /* apply final limiter to result */
         apply_int_mask(&result->number);
     }
 }

reactos/base/applications/calc/utl.c

@@ -11,7 +11,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
         break;
     case IDC_RADIO_DEC:
 /*
- * Modifed from 17 to 16 for fixing this bug:
+ * Modified from 17 to 16 for fixing this bug:
  * 14+14+6.3+6.3= 40.5999999 instead of 40.6
  * So, it's probably better to leave the least
  * significant digit out of the display.
@@ -25,7 +25,7 @@ void prepare_rpn_result_2(calc_number_t *rpn, TCHAR *buffer, int size, int base)
             TCHAR *ptr, *dst;
 
             ptr = buffer + _stprintf(buffer, TEXT("%#*.*f"), width, ((MAX_LD_WIDTH-width-1)>=0) ? MAX_LD_WIDTH-width-1 : 0, rpn->f);
-            /* format sring ensures there is a '.': */
+            /* format string ensures there is a '.': */
             dst = _tcschr(buffer, TEXT('.'));
             while (--ptr > dst)
                 if (*ptr != TEXT('0'))

reactos/base/applications/calc/whatsnew.txt

@@ -34,7 +34,7 @@
 * Corrected precision underflow/overflow when working with trigonometric functions.
 * cbrt() function is not used if compiling into ReactOS build system.
 * Resources are moved into /res directory.
-* Added new (partial) support for other languages: bulgarian, spanish, german, dutch, polish, russian, slovak, ukraianian.
+* Added new (partial) support for other languages: bulgarian, spanish, german, dutch, polish, russian, slovak, ukrainian.
 * Decimal precision of number with standard layout has been limited to 16 digits because the output display is smaller here (GMP version only).
 * Fixed buffer overflow with function update_lcd_display().
 * The decimal point is now preserved when switching to temporary scientific notation.

reactos/base/applications/calc/winmain.c

@@ -212,8 +212,8 @@ static const function_table_t function_table[] = {
     { IDC_BUTTON_DMS,  MODIFIER_INV,              1, rpn_dec2dms, rpn_dms2dec, NULL,     NULL      },
     { IDC_BUTTON_FE,   0,                         1, run_fe,      NULL,        NULL,     NULL      },
     { IDC_BUTTON_DAT,  0,                         1, run_dat_sta, NULL,        NULL,     NULL,     },
-    { IDC_BUTTON_MP,   MODIFIER_INV,              1, run_mp,      run_mm,      NULL,     NULL,     },
-    { IDC_BUTTON_MS,   MODIFIER_INV,              1, run_ms,      run_mw,      NULL,     NULL,     },
+    { IDC_BUTTON_MP,   MODIFIER_INV|NO_CHAIN,     1, run_mp,      run_mm,      NULL,     NULL,     },
+    { IDC_BUTTON_MS,   MODIFIER_INV|NO_CHAIN,     1, run_ms,      run_mw,      NULL,     NULL,     },
     { IDC_BUTTON_CANC, NO_CHAIN,                  0, run_canc,    NULL,        NULL,     NULL,     },
     { IDC_BUTTON_RIGHTPAR, NO_CHAIN,              1, run_rpar,    NULL,        NULL,     NULL,     },
     { IDC_BUTTON_LEFTPAR,  NO_CHAIN,              0, run_lpar,    NULL,        NULL,     NULL,     },
@@ -435,7 +435,7 @@ KeyboardHookProc(int nCode, WPARAM wParam, LPARAM lParam)
 static void update_lcd_display(HWND hwnd)
 {
     /*
-     * muliply size of calc.buffer by 2 because it may
+     * multiply size of calc.buffer by 2 because it may
      * happen that separator is used between each digit.
      * Also added little additional space for dot and '\0'.
      */

reactos/base/applications/charmap/settings.c

@@ -58,7 +58,7 @@ extern void LoadSettings(void)
     if (RegOpenKeyEx(HKEY_CURRENT_USER, g_szGeneralRegKey, 0, KEY_READ, &hKey) == ERROR_SUCCESS)
     {
         TCHAR szBuffer[MAX_PATH];
-        DWORD dwAdvanChecked;
+        DWORD dwAdvancedChecked;
         unsigned long type = REG_DWORD, size = 1024;
 
         /* Restore last selected font */
@@ -89,9 +89,9 @@ extern void LoadSettings(void)
             }
         }
 
-        RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvanChecked, &size);
+        RegQueryValueEx(hKey, _T("Advanced"), NULL, &type, (LPBYTE)&dwAdvancedChecked, &size);
 
-        if(dwAdvanChecked == TRUE)
+        if(dwAdvancedChecked == TRUE)
             SendDlgItemMessage(hCharmapDlg, IDC_CHECK_ADVANCED, BM_CLICK, MF_CHECKED, 0);
 
     RegCloseKey(hKey);

reactos/base/applications/charmap_new/GridView.cpp

@@ -69,7 +69,7 @@ CGridView::SetFont(
     )
 {
 
-    // Create a temperary container for the new font
+    // Create a temporary container for the new font
     CurrentFont NewFont = { 0 };
     NewFont.FontName = FontName;
 
@@ -224,7 +224,7 @@ CGridView::OnSize(
                  SWP_NOZORDER | SWP_SHOWWINDOW);
 
     // Get the client area we can draw on. The position we set above includes
-    // a scrollbar which we obvioulsy can't draw on. GetClientRect gives us
+    // a scrollbar which we obviously can't draw on. GetClientRect gives us
     // the size without the scroll, and it's more efficient than getting the
     // scroll metrics and calculating the size from that
     RECT ClientRect;

reactos/base/applications/charmap_new/charmap.cpp

@@ -1,8 +1,7 @@
 /*
-* PROJECT:     ReactOS Device Managment
+* PROJECT:     ReactOS Character Map
 * LICENSE:     GPL - See COPYING in the top level directory
-* FILE:        base/applications/mscutils/devmgmt/devmgmt.c
-* PURPOSE:     Bootstrap for the device manager
+* FILE:        base/applications/charmap/charmap.cpp
 * COPYRIGHT:   Copyright 2006 Ged Murphy <gedmurphy@gmail.com>
 */
 

reactos/base/applications/clipbrd/lang/en-US.rc

@@ -10,7 +10,7 @@ BEGIN
     POPUP "&File"
     BEGIN
         MENUITEM "&Open...", CMD_OPEN
-        MENUITEM "Save &as...", CMD_SAVE_AS
+        MENUITEM "Save &As...", CMD_SAVE_AS
         MENUITEM SEPARATOR
         MENUITEM "E&xit", CMD_EXIT
     END

reactos/base/applications/clipbrd/lang/ru-RU.rc

@@ -45,17 +45,17 @@ BEGIN
     STRING_CF_UNKNOWN "Неизвестный формат"
     STRING_CF_TEXT "Текст"
     STRING_CF_BITMAP "Точечный рисунок"
-    STRING_CF_OEMTEXT "OEM текст"
-    STRING_CF_UNICODETEXT "Юникод текст"
-    STRING_CF_DIB "DIB точечный рисунок"
-    STRING_CF_LOCALE "Locale Data"
-    STRING_CF_ENHMETAFILE "Enhanced Metafile"
-    STRING_CF_METAFILEPICT "Metafile"
+    STRING_CF_OEMTEXT "Текст в кодировке OEM"
+    STRING_CF_UNICODETEXT "Текст в кодировке Юникод"
+    STRING_CF_DIB "Аппаратно-независимый точечный рисунок (DIB)"
+    STRING_CF_LOCALE "Языковые данные"
+    STRING_CF_ENHMETAFILE "Расширенный метафайл"
+    STRING_CF_METAFILEPICT "Метафайл"
     STRING_CF_PALETTE "Цветовая палитра"
-    STRING_CF_DIBV5 "DIB точечный рисунок (Версия 5)"
-    STRING_CF_SYLK "Symbolic Link Format"
-    STRING_CF_DIF "Data Interchange Format"
-    STRING_CF_HDROP "Drop Data"
+    STRING_CF_DIBV5 "Аппаратно-независимый точечный рисунок (DIB) (Версия 5)"
+    STRING_CF_SYLK "Формат символических ссылок"
+    STRING_CF_DIF "Формат обмена данными"
+    STRING_CF_HDROP "Очистить данные"
 END
 
 STRINGTABLE

reactos/base/applications/clipbrd/scrollutils.c

@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Clipboard Viewer
  * FILE:            base/applications/clipbrd/scrollutils.c
- * PURPOSE:         Scrolling releated helper functions.
+ * PURPOSE:         Scrolling related helper functions.
  * PROGRAMMERS:     Ricardo Hanke
  */
 

reactos/base/applications/clipbrd/scrollutils.h

@@ -2,7 +2,7 @@
  * COPYRIGHT:       See COPYING in the top level directory
  * PROJECT:         ReactOS Clipboard Viewer
  * FILE:            base/applications/clipbrd/scrollutils.h
- * PURPOSE:         Scrolling releated helper functions.
+ * PURPOSE:         Scrolling related helper functions.
  * PROGRAMMERS:     Ricardo Hanke
  */
 

reactos/base/applications/clipbrd/winutils.c

@@ -14,9 +14,21 @@ void ShowLastWin32Error(HWND hwndParent)
     LPWSTR lpMsgBuf = NULL;
 
     dwError = GetLastError();
+    if (dwError == ERROR_SUCCESS)
+        return;
+
+    if (!FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER |
+                        FORMAT_MESSAGE_FROM_SYSTEM |
+                        FORMAT_MESSAGE_IGNORE_INSERTS,
+                        NULL,
+                        dwError,
+                        LANG_USER_DEFAULT,
+                        (LPWSTR)&lpMsgBuf,
+                        0, NULL))
+    {
+        return;
+    }
 
-    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                   NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0, NULL);
     MessageBoxW(hwndParent, lpMsgBuf, NULL, MB_OK | MB_ICONERROR);
     LocalFree(lpMsgBuf);
 }

reactos/base/applications/cmdutils/CMakeLists.txt

@@ -3,6 +3,7 @@ add_subdirectory(comp)
 add_subdirectory(cscript)
 add_subdirectory(dbgprint)
 add_subdirectory(doskey)
+add_subdirectory(eventcreate)
 add_subdirectory(find)
 add_subdirectory(help)
 add_subdirectory(hostname)

reactos/base/applications/cmdutils/clip/CMakeLists.txt

@@ -1,5 +1,8 @@
 
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
 add_executable(clip clip.c clip.rc)
 set_module_type(clip win32cui UNICODE)
-add_importlibs(clip user32 msvcrt kernel32 advapi32)
+target_link_libraries(clip conutils ${PSEH_LIB})
+add_importlibs(clip advapi32 user32 msvcrt kernel32)
 add_cd_file(TARGET clip DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/clip/clip.c

@@ -12,31 +12,17 @@
 #include <winbase.h>
 #include <winuser.h>
 
+#include <conutils.h>
+
 #include "resource.h"
 
-static void PrintError(void)
+VOID PrintError(DWORD dwError)
 {
-    DWORD dwError;
-    LPWSTR lpMsgBuf = NULL;
-
-    dwError = GetLastError();
-    if (dwError == NO_ERROR)
+    if (dwError == ERROR_SUCCESS)
         return;
 
-    FormatMessageW(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-                   NULL, dwError, 0, (LPWSTR)&lpMsgBuf, 0,  NULL);
-    wprintf(L"%s", lpMsgBuf);
-    LocalFree(lpMsgBuf);
-}
-
-static void PrintResourceString(UINT uID)
-{
-    WCHAR buff[500];
-
-    if (LoadStringW(GetModuleHandle(NULL), uID, buff, ARRAYSIZE(buff)))
-    {
-        wprintf(L"%s", buff);
-    }
+    ConMsgPuts(StdErr, FORMAT_MESSAGE_FROM_SYSTEM,
+               NULL, dwError, LANG_USER_DEFAULT);
 }
 
 static BOOL IsDataUnicode(HGLOBAL hGlobal)
@@ -61,28 +47,27 @@ int wmain(int argc, wchar_t** argv)
     LPBYTE lpBuffer;
     SIZE_T dwSize = 0;
 
+    /* Initialize the Console Standard Streams */
     hInput = GetStdHandle(STD_INPUT_HANDLE);
+    ConInitStdStreams();
 
     /* Check for usage */
     if (argc > 1 && wcsncmp(argv[1], L"/?", 2) == 0)
     {
-        PrintResourceString(IDS_HELP);
+        ConResPuts(StdOut, IDS_HELP);
         return 0;
     }
 
     if (GetFileType(hInput) == FILE_TYPE_CHAR)
     {
-        PrintResourceString(IDS_USAGE);
+        ConResPuts(StdOut, IDS_USAGE);
         return 0;
     }
 
     /* Initialize a growable buffer for holding clipboard data */
     hBuffer = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, 4096);
     if (!hBuffer)
-    {
-        PrintError();
-        return -1;
-    }
+        goto Failure;
 
     /*
      * Read data from the input stream by chunks of 4096 bytes
@@ -92,7 +77,7 @@ int wmain(int argc, wchar_t** argv)
     {
         lpBuffer = GlobalLock(hBuffer);
         if (!lpBuffer)
-            goto cleanup;
+            goto Failure;
 
         bStatus = ReadFile(hInput, lpBuffer + dwSize, 4096, &dwBytesRead, NULL);
         dwSize += dwBytesRead;
@@ -100,11 +85,11 @@ int wmain(int argc, wchar_t** argv)
 
         hTemp = GlobalReAlloc(hBuffer, GlobalSize(hBuffer) + 4096, GMEM_ZEROINIT);
         if (!hTemp)
-            goto cleanup;
+            goto Failure;
 
         hBuffer = hTemp;
     }
-    while (dwBytesRead > 0 && bStatus);
+    while (bStatus && dwBytesRead > 0);
 
     /*
      * Resize the buffer to the total size of data read.
@@ -118,7 +103,7 @@ int wmain(int argc, wchar_t** argv)
 
     /* Attempt to open the clipboard */
     if (!OpenClipboard(NULL))
-        goto cleanup;
+        goto Failure;
 
     /* Empty it, copy our data, then close it */
 
@@ -138,8 +123,8 @@ int wmain(int argc, wchar_t** argv)
     CloseClipboard();
     return 0;
 
-cleanup:
-    GlobalFree(hBuffer);
-    PrintError();
+Failure:
+    if (hBuffer) GlobalFree(hBuffer);
+    PrintError(GetLastError());
     return -1;
 }

reactos/base/applications/cmdutils/clip/clip.rc

@@ -2,9 +2,11 @@
 
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Clip Command"
-#define REACTOS_STR_INTERNAL_NAME     "clip"
-#define REACTOS_STR_ORIGINAL_FILENAME "clip.exe"
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Clip Command"
+#define REACTOS_STR_INTERNAL_NAME       "clip"
+#define REACTOS_STR_ORIGINAL_FILENAME   "clip.exe"
 #include <reactos/version.rc>
 
 /* UTF-8 */

reactos/base/applications/cmdutils/comp/CMakeLists.txt

@@ -1,5 +1,8 @@
 
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
 add_executable(comp comp.c comp.rc)
 set_module_type(comp win32cui UNICODE)
-add_importlibs(comp user32 msvcrt kernel32)
+target_link_libraries(comp conutils ${PSEH_LIB})
+add_importlibs(comp msvcrt kernel32)
 add_cd_file(TARGET comp DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/comp/comp.c

@@ -1,273 +1,245 @@
-/*
- *  ReactOS Win32 Applications
- *  Copyright (C) 2005 ReactOS Team
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-/*
- * PROJECT:     ReactOS Comp utility
- * COPYRIGHT:   See COPYING in the top level directory
- * FILE:        base/applications/cmdutils/comp/comp.c
- * PURPOSE:     Compares the contents of two files
- * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-// #include <string.h>
-// #include <wchar.h>
-#include <assert.h>
-
-#define WIN32_NO_STATUS
-#include <windef.h>
-#include <winbase.h>
-#include <winuser.h>
-
-#include "resource.h"
-
-#define STRBUF 1024
-
-VOID PrintResourceString(INT resID, ...)
-{
-    WCHAR bufSrc[RC_STRING_MAX_SIZE];
-    WCHAR bufFormatted[RC_STRING_MAX_SIZE];
-    CHAR bufFormattedOem[RC_STRING_MAX_SIZE];
-
-    va_list args;
-    va_start(args, resID);
-
-    if (LoadStringW(GetModuleHandleW(NULL), resID, bufSrc, ARRAYSIZE(bufSrc)))
-        vswprintf(bufFormatted, bufSrc, args);
-    else
-        swprintf(bufFormatted, L"Resource loading error!");
-
-    CharToOemW(bufFormatted, bufFormattedOem);
-    fputs(bufFormattedOem, stdout);
-
-    va_end(args);
-}
-
-/* getline:  read a line, return length */
-INT GetBuff(PBYTE buff, FILE* in)
-{
-    return fread(buff, sizeof(BYTE), STRBUF, in);
-}
-
-INT FileSize(FILE* fd)
-{
-    INT result = -1;
-    if (fseek(fd, 0, SEEK_END) == 0 && (result = ftell(fd)) != -1)
-    {
-        /* Restoring file pointer */
-        rewind(fd);
-    }
-    return result;
-}
-
-/* Print program usage */
-VOID Usage(VOID)
-{
-    PrintResourceString(IDS_HELP);
-}
-
-
-int wmain (int argc, WCHAR* argv[])
-{
-    INT i;
-
-    /* File pointers */
-    FILE *fp1 = NULL;
-    FILE *fp2 = NULL;
-
-    INT BufLen1, BufLen2;
-    PBYTE Buff1 = NULL;
-    PBYTE Buff2 = NULL;
-    WCHAR File1[_MAX_PATH + 1], // File paths
-          File2[_MAX_PATH + 1];
-    BOOL bAscii = FALSE,        // /A switch
-         bLineNos = FALSE;      // /L switch
-    UINT LineNumber;
-    UINT Offset;
-    INT  FileSizeFile1;
-    INT  FileSizeFile2;
-    INT  NumberOfOptions = 0;
-    INT  FilesOK = 1;
-    INT  Status = EXIT_SUCCESS;
-
-    /* Parse command line for options */
-    for (i = 1; i < argc; i++)
-    {
-        if (argv[i][0] == L'/')
-        {
-            switch (argv[i][1])
-            {
-                case L'A':
-                    bAscii = TRUE;
-                    NumberOfOptions++;
-                    break;
-
-                case L'L':
-                    bLineNos = TRUE;
-                    NumberOfOptions++;
-                    break;
-
-                case L'?':
-                    Usage();
-                    return EXIT_SUCCESS;
-
-                default:
-                    PrintResourceString(IDS_INVALIDSWITCH, argv[i][1]);
-                    Usage();
-                    return EXIT_FAILURE;
-            }
-        }
-    }
-
-    if (argc - NumberOfOptions == 3)
-    {
-        wcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH);
-        wcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH);
-    }
-    else
-    {
-        PrintResourceString(IDS_BADSYNTAX);
-        return EXIT_FAILURE;
-    }
-
-    Buff1 = (PBYTE)malloc(STRBUF);
-    if (Buff1 == NULL)
-    {
-        wprintf(L"Can't get free memory for Buff1\n");
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    Buff2 = (PBYTE)malloc(STRBUF);
-    if (Buff2 == NULL)
-    {
-        wprintf(L"Can't get free memory for Buff2\n");
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    if ((fp1 = _wfopen(File1, L"rb")) == NULL)
-    {
-        PrintResourceString(IDS_FILEERROR, File1);
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-    if ((fp2 = _wfopen(File2, L"rb")) == NULL)
-    {
-        PrintResourceString(IDS_FILEERROR, File2);
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    PrintResourceString(IDS_COMPARING, File1, File2);
-
-    FileSizeFile1 = FileSize(fp1);
-    if (FileSizeFile1 == -1)
-    {
-        PrintResourceString(IDS_FILESIZEERROR, File1);
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    FileSizeFile2 = FileSize(fp2);
-    if (FileSizeFile2 == -1)
-    {
-        PrintResourceString(IDS_FILESIZEERROR, File2);
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    if (FileSizeFile1 != FileSizeFile2)
-    {
-        PrintResourceString(IDS_SIZEDIFFERS);
-        Status = EXIT_FAILURE;
-        goto Cleanup;
-    }
-
-    LineNumber = 1;
-    Offset = 0;
-    while (1)
-    {
-        BufLen1 = GetBuff(Buff1, fp1);
-        BufLen2 = GetBuff(Buff2, fp2);
-
-        if (ferror(fp1) || ferror(fp2))
-        {
-            PrintResourceString(IDS_READERROR);
-            Status = EXIT_FAILURE;
-            goto Cleanup;
-        }
-
-        if (!BufLen1 && !BufLen2)
-            break;
-
-        assert(BufLen1 == BufLen2);
-        for (i = 0; i < BufLen1; i++)
-        {
-            if (Buff1[i] != Buff2[i])
-            {
-                FilesOK = 0;
-
-                /* Reporting here a mismatch */
-                if (bLineNos)
-                {
-                    PrintResourceString(IDS_MISMATCHLINE, LineNumber);
-                }
-                else
-                {
-                    PrintResourceString(IDS_MISMATCHOFFSET, Offset);
-                }
-
-                if (bAscii)
-                {
-                    PrintResourceString(IDS_ASCIIDIFF, 1, Buff1[i]);
-                    PrintResourceString(IDS_ASCIIDIFF, 2, Buff2[i]);
-                }
-                else
-                {
-                    PrintResourceString(IDS_HEXADECIMALDIFF, 1, Buff1[i]);
-                    PrintResourceString(IDS_HEXADECIMALDIFF, 2, Buff2[i]);
-                }
-            }
-
-            Offset++;
-
-            if (Buff1[i] == '\n')
-                LineNumber++;
-        }
-    }
-
-    if (FilesOK)
-        PrintResourceString(IDS_MATCH);
-
-Cleanup:
-    if (fp2)
-        fclose(fp2);
-    if (fp1)
-        fclose(fp1);
-
-    if (Buff2)
-        free(Buff2);
-    if (Buff1)
-        free(Buff1);
-
-    return Status;
-}
-
-/* EOF */
+/*
+ *  ReactOS Win32 Applications
+ *  Copyright (C) 2005 ReactOS Team
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program 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 General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+/*
+ * PROJECT:     ReactOS Comp utility
+ * COPYRIGHT:   See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/comp/comp.c
+ * PURPOSE:     Compares the contents of two files
+ * PROGRAMMERS: Ged Murphy (gedmurphy@gmail.com)
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
+
+#define WIN32_NO_STATUS
+#include <windef.h>
+#include <winbase.h>
+
+#include <conutils.h>
+
+#include "resource.h"
+
+#define STRBUF 1024
+
+/* getline: read a line, return length */
+INT GetBuff(PBYTE buff, FILE* in)
+{
+    return fread(buff, sizeof(BYTE), STRBUF, in);
+}
+
+INT FileSize(FILE* fd)
+{
+    INT result = -1;
+    if (fseek(fd, 0, SEEK_END) == 0 && (result = ftell(fd)) != -1)
+    {
+        /* Restoring file pointer */
+        rewind(fd);
+    }
+    return result;
+}
+
+
+int wmain(int argc, WCHAR* argv[])
+{
+    INT i;
+
+    /* File pointers */
+    FILE *fp1 = NULL;
+    FILE *fp2 = NULL;
+
+    INT BufLen1, BufLen2;
+    PBYTE Buff1 = NULL;
+    PBYTE Buff2 = NULL;
+    WCHAR File1[_MAX_PATH + 1], // File paths
+          File2[_MAX_PATH + 1];
+    BOOL bAscii = FALSE,        // /A switch
+         bLineNos = FALSE;      // /L switch
+    UINT LineNumber;
+    UINT Offset;
+    INT  FileSizeFile1;
+    INT  FileSizeFile2;
+    INT  NumberOfOptions = 0;
+    INT  FilesOK = 1;
+    INT  Status = EXIT_SUCCESS;
+
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
+    /* Parse command line for options */
+    for (i = 1; i < argc; i++)
+    {
+        if (argv[i][0] == L'/')
+        {
+            switch (towlower(argv[i][1]))
+            {
+                case L'a':
+                    bAscii = TRUE;
+                    NumberOfOptions++;
+                    break;
+
+                case L'l':
+                    bLineNos = TRUE;
+                    NumberOfOptions++;
+                    break;
+
+                case L'?':
+                    ConResPuts(StdOut, IDS_HELP);
+                    return EXIT_SUCCESS;
+
+                default:
+                    ConResPrintf(StdErr, IDS_INVALIDSWITCH, argv[i][1]);
+                    ConResPuts(StdOut, IDS_HELP);
+                    return EXIT_FAILURE;
+            }
+        }
+    }
+
+    if (argc - NumberOfOptions == 3)
+    {
+        wcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH);
+        wcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH);
+    }
+    else
+    {
+        ConResPuts(StdErr, IDS_BADSYNTAX);
+        return EXIT_FAILURE;
+    }
+
+    Buff1 = (PBYTE)malloc(STRBUF);
+    if (Buff1 == NULL)
+    {
+        ConPuts(StdErr, L"Can't get free memory for Buff1\n");
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    Buff2 = (PBYTE)malloc(STRBUF);
+    if (Buff2 == NULL)
+    {
+        ConPuts(StdErr, L"Can't get free memory for Buff2\n");
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    if ((fp1 = _wfopen(File1, L"rb")) == NULL)
+    {
+        ConResPrintf(StdErr, IDS_FILEERROR, File1);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+    if ((fp2 = _wfopen(File2, L"rb")) == NULL)
+    {
+        ConResPrintf(StdErr, IDS_FILEERROR, File2);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    ConResPrintf(StdOut, IDS_COMPARING, File1, File2);
+
+    FileSizeFile1 = FileSize(fp1);
+    if (FileSizeFile1 == -1)
+    {
+        ConResPrintf(StdErr, IDS_FILESIZEERROR, File1);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    FileSizeFile2 = FileSize(fp2);
+    if (FileSizeFile2 == -1)
+    {
+        ConResPrintf(StdErr, IDS_FILESIZEERROR, File2);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    if (FileSizeFile1 != FileSizeFile2)
+    {
+        ConResPuts(StdOut, IDS_SIZEDIFFERS);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    LineNumber = 1;
+    Offset = 0;
+    while (1)
+    {
+        BufLen1 = GetBuff(Buff1, fp1);
+        BufLen2 = GetBuff(Buff2, fp2);
+
+        if (ferror(fp1) || ferror(fp2))
+        {
+            ConResPuts(StdErr, IDS_READERROR);
+            Status = EXIT_FAILURE;
+            goto Cleanup;
+        }
+
+        if (!BufLen1 && !BufLen2)
+            break;
+
+        assert(BufLen1 == BufLen2);
+        for (i = 0; i < BufLen1; i++)
+        {
+            if (Buff1[i] != Buff2[i])
+            {
+                FilesOK = 0;
+
+                /* Reporting here a mismatch */
+                if (bLineNos)
+                    ConResPrintf(StdOut, IDS_MISMATCHLINE, LineNumber);
+                else
+                    ConResPrintf(StdOut, IDS_MISMATCHOFFSET, Offset);
+
+                if (bAscii)
+                {
+                    ConResPrintf(StdOut, IDS_ASCIIDIFF, 1, Buff1[i]);
+                    ConResPrintf(StdOut, IDS_ASCIIDIFF, 2, Buff2[i]);
+                }
+                else
+                {
+                    ConResPrintf(StdOut, IDS_HEXADECIMALDIFF, 1, Buff1[i]);
+                    ConResPrintf(StdOut, IDS_HEXADECIMALDIFF, 2, Buff2[i]);
+                }
+            }
+
+            Offset++;
+
+            if (Buff1[i] == '\n')
+                LineNumber++;
+        }
+    }
+
+    if (FilesOK)
+        ConResPuts(StdOut, IDS_MATCH);
+
+Cleanup:
+    if (fp2)
+        fclose(fp2);
+    if (fp1)
+        fclose(fp1);
+
+    if (Buff2)
+        free(Buff2);
+    if (Buff1)
+        free(Buff1);
+
+    return Status;
+}
+
+/* EOF */

reactos/base/applications/cmdutils/comp/lang/ro-RO.rc

@@ -1,4 +1,4 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
@@ -11,9 +11,9 @@ COMP [/L] [/A] [data1] [data2]\n\n\
   /L         Afișează numărul liniei pentru diferențe.\n"
     IDS_INVALIDSWITCH "Parametru nevalid - /%c\n"
     IDS_BADSYNTAX "Sintaxă eronată\n"
-    IDS_FILEERROR "Nu se poate găsi/deschide fișierul: %s\n"
-    IDS_COMPARING "Se compară %s și %s...\n"
-    IDS_FILESIZEERROR "Nu se poate determina dimensiunea fișierului: %s\n"
+    IDS_FILEERROR "Nu poate fi găsit/deschis fișierul: %s\n"
+    IDS_COMPARING "%s este comparat cu %s...\n"
+    IDS_FILESIZEERROR "Eroare la determinarea dimensiunii fișierului: %s\n"
     IDS_SIZEDIFFERS "Fișierele au dimensiuni diferite.\n"
     IDS_READERROR "Eroare la citirea fișierelor.\n"
     IDS_MISMATCHLINE "Diferență identificată la linia %d\n"

reactos/base/applications/cmdutils/comp/resource.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#define RC_STRING_MAX_SIZE 4096
-
 #define IDS_HELP            100
 #define IDS_INVALIDSWITCH   101
 #define IDS_BADSYNTAX       102

reactos/base/applications/cmdutils/eventcreate/CMakeLists.txt

@@ -0,0 +1,12 @@
+
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
+## The message string templates are in ANSI to reduce binary size
+add_message_headers(ANSI evtmsgstr.mc)
+
+add_executable(eventcreate eventcreate.c eventcreate.rc)
+set_module_type(eventcreate win32cui UNICODE)
+add_dependencies(eventcreate evtmsgstr)
+target_link_libraries(eventcreate conutils ${PSEH_LIB})
+add_importlibs(eventcreate advapi32 msvcrt kernel32)
+add_cd_file(TARGET eventcreate DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/eventcreate/eventcreate.rc

@@ -0,0 +1,32 @@
+#include <windef.h>
+
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS EventCreate Command"
+#define REACTOS_STR_INTERNAL_NAME       "eventcreate"
+#define REACTOS_STR_ORIGINAL_FILENAME   "eventcreate.exe"
+#include <reactos/version.rc>
+
+/* Message Table resource for the message string templates */
+#include <evtmsgstr.rc>
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_FR_FR
+    #include "lang/fr-FR.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif
+#ifdef LANGUAGE_TR_TR
+    #include "lang/tr-TR.rc"
+#endif

reactos/base/applications/cmdutils/eventcreate/evtmsggen.c

@@ -0,0 +1,105 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS EventCreate Command
+ * FILE:            base/applications/cmdutils/eventcreate/evtmsggen.c
+ * PURPOSE:         Generator for the event message string templates file.
+ *                  Creates the message string file in the current directory.
+ * PROGRAMMER:      Hermes Belusca-Maito
+ *
+ * You can compile this generator:
+ *   with GCC : $ gcc -o evtmsggen.exe evtmsggen.c
+ *   with MSVC: $ cl evtmsggen.c (or: $ cl /Fe"evtmsggen.exe" evtmsggen.c)
+ */
+
+#include <stdio.h>
+
+/*
+ * Enable/disable this option to use "English" for the message table language.
+ * The default behaviour when the option is disabled selects "Neutral" language.
+ */
+// #define ENGLISH
+
+/* The default End-Of-Line control for the message file */
+#define EOL     "\r\n"
+
+
+static void usage(char* name)
+{
+    fprintf(stdout, "Usage: %s ID_min ID_max outfile.mc\n", name);
+}
+
+int main(int argc, char* argv[])
+{
+    FILE* outFile;
+    unsigned int id_min, id_max;
+    unsigned int i;
+
+    /* Validate the arguments */
+    if (argc != 4)
+    {
+        usage(argv[0]);
+        return -1;
+    }
+
+    id_min = (unsigned int)atoi(argv[1]);
+    id_max = (unsigned int)atoi(argv[2]);
+    if (id_min > id_max)
+    {
+        fprintf(stderr, "ERROR: Min ID %u cannot be strictly greater than Max ID %u !\n", id_min, id_max);
+        return -1;
+    }
+
+    /* Open the file */
+    outFile = fopen(argv[3], "wb");
+    if (!outFile)
+    {
+        fprintf(stderr, "ERROR: Could not create output file '%s'.\n", argv[3]);
+        return -1;
+    }
+
+    /* Generate the file */
+
+    /* Write the header */
+    fprintf(outFile,
+        ";/*"    EOL
+        "; * %s" EOL
+        "; * Contains event message string templates for the EventCreate Command." EOL
+        "; *"    EOL
+        "; * This file is autogenerated, do not edit." EOL
+        "; * Generated with:" EOL
+        "; *   %s %u %u %s"   EOL
+        "; */"   EOL
+        EOL
+#ifdef ENGLISH
+        "LanguageNames=(English=0x409:MSG00409)"  EOL
+#else
+        "LanguageNames=(Neutral=0x0000:MSG00000)" EOL
+#endif
+        "MessageIdTypedef=DWORD" EOL
+        EOL,
+        argv[3],
+        argv[0], id_min /* argv[1] */, id_max /* argv[2] */, argv[3]);
+
+    /* Write the message string templates */
+    for (i = id_min; i <= id_max; ++i)
+    {
+        fprintf(outFile,
+            "MessageId=0x%X"   EOL
+#ifdef ENGLISH
+            "Language=English" EOL
+#else
+            "Language=Neutral" EOL
+#endif
+            "%%1" EOL
+            "."   EOL
+            EOL,
+            i);
+    }
+
+    /* Close the file */
+    fclose(outFile);
+
+    return 0;
+}
+
+/* EOF */

reactos/base/applications/cmdutils/eventcreate/lang/en-US.rc

@@ -0,0 +1,69 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Type ""EVENTCREATE /?"" for usage information.\n"
+    IDS_HELP "\n\
+EVENTCREATE [/S computer [/U [domain\\]user [/P password]]] /ID EventID\n\
+            {[/L logname] | [/SO source]} /T type /C category /D description\n\
+\n\
+Description:\n\
+    This tool enables an administrator to create a custom event in\n\
+    a specified event log.\n\
+\n\
+Parameters:\n\
+    /S  computer          Specifies the remote computer where to connect.\n\
+\n\
+    /U  [domain\\]user     Specifies the user account under which the command\n\
+                          should execute.\n\
+\n\
+    /P  [password]        Specifies the password of the user account.\n\
+                          Prompts for input if omitted.\n\
+\n\
+    /L  logname           Specifies the name of the log where the event will be\n\
+                          created. The valid names are:\n\
+                          Application, System, Security\n\
+                          (the latter is reserved only for the SYSTEM account).\n\
+\n\
+    /SO source            Specifies the source name to use for the event\n\
+                          (if not specified, the default source name\n\
+                           will be 'eventcreate').\n\
+                          A valid source can be any string and should represent\n\
+                          the application or the component that is generating\n\
+                          the event.\n\
+\n\
+    /T  type              Specifies the type of event to create.\n\
+                          The valid types are: SUCCESS, ERROR, WARNING,\n\
+                          INFORMATION.\n\
+\n\
+    /C  category          Specifies the event category (integer) for the event.\n\
+\n\
+    /ID EventID           Specifies the event ID for the event. This must be\n\
+                          an integer between 0 and 65535.\n\
+\n\
+    /D  description       Specifies the description to use for the newly\n\
+                          created event.\n\
+\n\
+    /?                    Displays this help screen.\n\
+"
+    IDS_INVALIDSWITCH "Invalid switch - '%s'.\n"
+    IDS_BADSYNTAX_0 "Bad command line syntax.\n"
+    IDS_BADSYNTAX_1 "Bad command line syntax. The option '%s' requires a value.\n"
+    IDS_BADSYNTAX_2 "Bad command line syntax. The value for the option '%s' cannot be empty.\n"
+    IDS_BADSYNTAX_3 "Bad command line syntax. The value '%s' is not allowed for the option '%s'.\n"
+    IDS_BADSYNTAX_4 "Bad command line syntax. The value cannot be specified for the option '%s'.\n"
+    IDS_BADSYNTAX_5 "Bad command line syntax. The option '%s' is not allowed more than %lu times.\n"
+    IDS_BADSYNTAX_6 "Bad command line syntax. The mandatory option '%s' is absent.\n"
+    // IDS_BADSYNTAX_7 "Bad command line syntax. The value for the option '%s' is outside the allowed range.\n"
+    IDS_BADSYNTAX_7 "Bad command line syntax. The value for the option '%s' must be between %d and %d.\n"
+
+    IDS_LOG_NOT_FOUND "The log '%s' does not exist. Cannot create the event.\n"
+    IDS_SOURCE_NOCREATE "The new source cannot be created because the log name is not specified.\nPlease use the /L switch to specify the log name.\n"
+    IDS_SOURCE_EXISTS "The source already exists in the log '%s' and cannot be duplicated.\n"
+    IDS_SOURCE_NOT_CUSTOM "The Source parameter is used to identify the custom scripts/applications\n(not the installed applications).\n"
+
+    IDS_SUCCESS_1   "Operation successful: an event of type '%s' has been created in the log '%s'.\n"
+    IDS_SUCCESS_2   "Operation successful: an event of type '%s' has been created with the source '%s'.\n"
+    IDS_SUCCESS_3   "Operation successful: an event of type '%s' has been created\nin the log '%s' with the source '%s'.\n"
+    IDS_SWITCH_UNIMPLEMENTED "The option '%s' is not currently supported, sorry for the inconvenience!\n"
+END

reactos/base/applications/cmdutils/eventcreate/lang/fr-FR.rc

@@ -0,0 +1,70 @@
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Entrez ""EVENTCREATE /?"" pour afficher la syntaxe.\n"
+    IDS_HELP "\n\
+EVENTCREATE [/S système [/U utilisateur [/P mot_de_passe]]] /ID id_événement\n\
+            {[/L journal] | [/SO source]} /T type /C catégorie /D description\n\
+\n\
+Description :\n\
+    Cet outil permet à un administrateur de créer un événement ayant un\n\
+    message et un identificateur personnalisés dans un journal d'événements\n\
+    spécifié.\n\
+\n\
+Liste de paramètres :\n\
+    /S  système           Spécifie le système distant auquel se connecter.\n\
+\n\
+    /U  [domaine\\]utili.  Spécifie le contexte de l'utilisateur\n\
+                          sous lequel la commande doit s'exécuter.\n\
+\n\
+    /P  [mot_de_passe]    Spécifie le mot de passe du contexte\n\
+                          utilisateur donné. Il est demandé s'il est omis.\n\
+\n\
+    /L  journal           Spécifie le journal d'événement dans lequel\n\
+                          l'événementest créé. Les noms valides sont :\n\
+                          Application, System, Security\n\
+                          (le dernier est réservé seulement pour le compte\n\
+                           SYSTEM).\n\
+\n\
+    /SO source            Spécifie la source devant être utilisée pour\n\
+                          l'événement (s'il n'est pas spécifié, la valeur\n\
+                          par défaut de la source sera 'eventcreate').\n\
+                          Une source valide peut être une chaîne et doit\n\
+                          représenter l'application ou le composant qui génère\n\
+                          l'événement.\n\
+\n\
+    /T  type              Spécifie le type d'événement à créer.\n\
+                          Les types autorisés sont : SUCCESS, ERROR, WARNING,\n\
+                          INFORMATION.\n\
+\n\
+    /C  catégorie         Spécifie la catégorie de l'événement (nombre entier).\n\
+\n\
+    /ID identificateur    Spécifie l'ID de l'événement. Un identificateur\n\
+                          peut être un nombre entier compris entre 0 et 65535.\n\
+\n\
+    /D  description       Spécifie la description du nouvel événement.\n\
+\n\
+    /?                    Affiche cet écran d'aide.\n\
+"
+    IDS_INVALIDSWITCH "Option invalide - '%s'.\n"
+    IDS_BADSYNTAX_0 "Syntaxe incorrecte.\n"
+    IDS_BADSYNTAX_1 "Syntaxe incorrecte. L'option '%s' requiert une valeur.\n"
+    IDS_BADSYNTAX_2 "Syntaxe incorrecte. La valeur pour l'option '%s' ne peut pas être vide.\n"
+    IDS_BADSYNTAX_3 "Syntaxe incorrecte. La valeur '%s' n'est pas autorisée pour l'option '%s'.\n"
+    IDS_BADSYNTAX_4 "Syntaxe incorrecte. La valeur ne peut pas être spécifiée pour l'option '%s'.\n"
+    IDS_BADSYNTAX_5 "Syntaxe incorrecte. L'option '%s' n'est pas autorisée plus de %lu fois.\n"
+    IDS_BADSYNTAX_6 "Syntaxe incorrecte. L'option obligatoire '%s' est absente.\n"
+    // IDS_BADSYNTAX_7 "Syntaxe incorrecte. La valeur pour l'option '%s' est en dehors de la plage autorisée.\n"
+    IDS_BADSYNTAX_7 "Syntaxe incorrecte. La valeur pour l'option '%s' doit être comprise entre %d et %d.\n"
+
+    IDS_LOG_NOT_FOUND "Le journal '%s' n'existe pas. Impossible de créer l'événement.\n"
+    IDS_SOURCE_NOCREATE "La nouvelle source ne peut être créée car le nom du journal n'est pas spécifié.\nUtilisez le commutateur /L pour spécifier le nom du journal.\n"
+    IDS_SOURCE_EXISTS "La source existe déjà dans le journal '%s' et ne peut pas être dupliquée.\n"
+    IDS_SOURCE_NOT_CUSTOM "Le paramètre Source est utilisé pour identifier les scripts/applications\npersonnalisées (pas les applications installées).\n"
+
+    IDS_SUCCESS_1   "Opération réussie : un événement de type '%s' a été créé dans le journal '%s'.\n"
+    IDS_SUCCESS_2   "Opération réussie : un événement de type '%s' a été créé avec la source '%s'.\n"
+    IDS_SUCCESS_3   "Opération réussie : un événement de type '%s' a été créé\ndans le journal '%s' avec la source '%s'.\n"
+    IDS_SWITCH_UNIMPLEMENTED "L'option '%s' n'est pas supporté pour le moment, désolé pour le désagrément!\n"
+END

reactos/base/applications/cmdutils/eventcreate/lang/ro-RO.rc

@@ -0,0 +1,71 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
+
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Tastați «EVENTCREATE /?» pentru informații de utilizare.\n"
+    IDS_HELP "\n\
+EVENTCREATE [/S calculator [/U [domeniu\\]nume [/P parolă]]]\n\
+            /ID id_eveniment {[/L nume_jurnal] | [/SO sursă]}\n\
+            /T tip /C categorie /D descriere\n\
+\n\
+Descriere:\n\
+    Acest instrument oferă unui administrator crearea unui eveniment\n\
+    particular într-un jurnal de evenimente specificat.\n\
+\n\
+Parametri:\n\
+    /S  calculator        Specifică sistemul la care se face conectarea.\n\
+\n\
+    /U  [domeniu\\]nume    Numele contului de utilizator sub care va fi\n\
+                          executată comanda.\n\
+\n\
+    /P  [parolă]          Specifică parola contului de utilizator.\n\
+                          Va fi cerută la prompt în cazul omiterii.\n\
+\n\
+    /L  nume_jurnal       Specifică numele jurnalului în care evenimentul va fi\n\
+                          creat. Numele valide sunt:\n\
+                          Application, System, Security\n\
+                          (ultimul este rezervat doar pentru contul SYSTEM).\n\
+\n\
+    /SO sursă             Specifică numele sursei utilizate pentru eveniment.\n\
+                          (Dacă nu e specificat, numele implicit al sursei va\n\
+                           fi «eventcreate».)\n\
+                          O sursă validă poate fi orice șir de caractere și ar\n\
+                          trebui să reprezinte aplicația sau evenimentul care\n\
+                          generează evenimentul.\n\
+\n\
+    /T  tip               Specifică tipul de eveniment creat.\n\
+                          Tipurile valide sunt: SUCCESS, ERROR, WARNING,\n\
+                          INFORMATION.\n\
+\n\
+    /C  categorie         Specifică categoria de eveniment (ca număr întreg).\n\
+\n\
+    /ID id_eveniment      Specifică numărul de identificare pentru eveniment.\n\
+                          Acesta trebuie să fie un număr între 0 și 65535.\n\
+\n\
+    /D  descriere         Specifică o descriere pentru evenimentul nou creat.\n\
+\n\
+    /?                    Afișează acest manual de utilizare.\n\
+"
+    IDS_INVALIDSWITCH "Parametru eronat - «%s».\n"
+    IDS_BADSYNTAX_0 "Comandă cu sintaxă eronată.\n"
+    IDS_BADSYNTAX_1 "Comandă cu sintaxă eronată. Opțiunea «%s» necesită o valoare.\n"
+    IDS_BADSYNTAX_2 "Comandă cu sintaxă eronată. Valoarea pentru opțiunea «%s» nu poate fi omisă.\n"
+    IDS_BADSYNTAX_3 "Comandă cu sintaxă eronată. Valoarea «%s» nu este permisă pentru opțiunea «%s».\n"
+    IDS_BADSYNTAX_4 "Comandă cu sintaxă eronată. Valoarea dată nu poate fi specificată pentru opțiunea «%s».\n"
+    IDS_BADSYNTAX_5 "Comandă cu sintaxă eronată. Opțiunea «%s» nu este permisă mai mult de %lu ori.\n"
+    IDS_BADSYNTAX_6 "Comandă cu sintaxă eronată. Opțiunea obligatorie «%s» a fost omisă.\n"
+    // IDS_BADSYNTAX_7 "Comandă cu sintaxă eronată. Valoarea pentru opțiunea «%s» este în afara domeniului permis.\n"
+    IDS_BADSYNTAX_7 "Comandă cu sintaxă eronată. Valoarea pentru opțiunea «%s» trebuie să fie între %d și %d.\n"
+
+    IDS_LOG_NOT_FOUND "Jurnalul «%s» nu există. Evenimentul nu poate fi creat.\n"
+    IDS_SOURCE_NOCREATE "Sursa nu poate fi creată deoarece numele de jurnal nu este specificat.\nUtilizați parametrul /L pentru a specifica un nume de jurnal.\n"
+    IDS_SOURCE_EXISTS "Sursa deja există în jurnalul «%s» și nu poate fi duplicată.\n"
+    IDS_SOURCE_NOT_CUSTOM "Parametrul de sursă este utilizat pentru a identifica scripturi/aplicații particularizate (nicidecum aplicații instalate).\n"
+
+    IDS_SUCCESS_1   "Operație realizată: un eveniment de tip «%s» a fost creat în jurnalul «%s».\n"
+    IDS_SUCCESS_2   "Operație realizată: un eveniment de tip «%s» a fost creat cu sursa «%s».\n"
+    IDS_SUCCESS_3   "Operație realizată: un eveniment de tip «%s» a fost creat în jurnalul «%s» cu sursa «%s».\n"
+    IDS_SWITCH_UNIMPLEMENTED "Opțiunea «%s» nu este acceptată deocamdată!\n"
+END

reactos/base/applications/cmdutils/eventcreate/lang/ru-RU.rc

@@ -0,0 +1,68 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Введите ""EVENTCREATE /?"" для получения справки по использованию.\n"
+    IDS_HELP "\n\
+EVENTCREATE [/S система [/U [домен\\]пользователь [/P пароль]]] /ID код_события\n\
+            {[/L имя_журнала] | [/SO источник]} /T тип /C категория /D описание\n\
+\n\
+Описание:\n\
+    Эта команда позволяет администратору создать запись об особом событии \n\
+    в указанном журнале событий.\n\
+\n\
+Список параметров:\n\
+    /S  система           Определяет удаленную систему для подключения.\n\
+\n\
+    /U  [домен\\]польз.    Определяет контекст пользователя, под которым\n\
+                          выполняется данная команда.\n\
+\n\
+    /P  [пароль]          Задает пароль для данного контекста пользователя.\n\
+                          Запрашивает ввод пароля, если он не был задан.\n\
+\n\
+    /L  журнал            Журнал в котором будет создано событие.\n\
+                          Доступными именами являются:\n\
+                          Application, System, Security\n\
+                          (последний зарезервирован только для учетной записи SYSTEM).\n\
+\n\
+    /SO источник          Задает имя источника, используемого для события\n\
+                          (если не указано, то по умолчанию имя источника\n\
+                          будет 'eventcreate').\n\
+                          Допустимым источником является любая строка, представляющая\n\
+                          приложение или компонент, который генерирует\n\
+                          событие.\n\
+\n\
+    /T  тип               Тип создаваемого события.\n\
+                          Допустимыми типами являются: SUCCESS, ERROR, WARNING,\n\
+                          INFORMATION.\n\
+\n\
+    /C  категория         Определяет категорию события (число) для события.\n\
+\n\
+    /ID код_события       Код события для этого события. Допустимым кодом\n\
+                          является число в диапазоне от 0 до 65535.\n\
+\n\
+    /D  описание          Описание для создаваемого события.\n\
+\n\
+    /?                    Показать эту справку.\n\
+"
+    IDS_INVALIDSWITCH "Неправильный параметр или аргумент - '%s'.\n"
+    IDS_BADSYNTAX_0 "Синтаксическая ошибка.\n"
+    IDS_BADSYNTAX_1 "Синтаксическая ошибка. Для параметра '%s' должно быть указано значение.\n"
+    IDS_BADSYNTAX_2 "Синтаксическая ошибка. Значение опции '%s' не может быть пустым.\n"
+    IDS_BADSYNTAX_3 "Синтаксическая ошибка. Значение '%s' является недопустимым для опции '%s'.\n"
+    IDS_BADSYNTAX_4 "Синтаксическая ошибка. Для опции '%s' не может быть указано значение.\n"
+    IDS_BADSYNTAX_5 "Синтаксическая ошибка. Опция '%s' не допускается более чем %lu раз.\n"
+    IDS_BADSYNTAX_6 "Синтаксическая ошибка. Отсутствует обязательный параметр '%s'.\n"
+    // IDS_BADSYNTAX_7 "Синтаксическая ошибка. Значение для опции '%s' за пределами разрешенного диапазона.\n"
+    IDS_BADSYNTAX_7 "Синтаксическая ошибка. Значение для опции '%s' должно быть в диапазоне от %d до %d.\n"
+
+    IDS_LOG_NOT_FOUND "Журнал '%s' не существует. Не удалось создать событие.\n"
+    IDS_SOURCE_NOCREATE "Новый источник не может быть создан, поскольку имя журнала не указано.\nИспользуйте параметр /L чтобы указать имя журнала.\n"
+    IDS_SOURCE_EXISTS "Источник уже существует в журнале '%s' и не может быть продублирован.\n"
+    IDS_SOURCE_NOT_CUSTOM "Параметр Источник используется для идентификации сценариев/программ\nпользовательских приложений (не установленных приложений).\n"
+
+    IDS_SUCCESS_1   "Операция выполнена успешно: событие с типом '%s' было успешно создано в журнале '%s'.\n"
+    IDS_SUCCESS_2   "Операция выполнена успешно: событие с типом '%s' было успешно создано с источником '%s'.\n"
+    IDS_SUCCESS_3   "Операция выполнена успешно: событие с типом '%s' было успешно создано\nв журнале '%s' с источником '%s'.\n"
+    IDS_SWITCH_UNIMPLEMENTED "Опция '%s' не поддерживается, приносим извинения за возможное неудобство!\n"
+END

reactos/base/applications/cmdutils/eventcreate/lang/tr-TR.rc

@@ -0,0 +1,72 @@
+/* TRANSLATOR: 2016 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+
+LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Kullanım bilgisi için ""EVENTCREATE /?"" yazınız.\n"
+    IDS_HELP "\n\
+EVENTCREATE [/S bilgisayar [/U [etki alanı\\]kullanıcı [/P şifre]]] \n\
+            /ID olay kimliği {[/L kayıt adı] | [/SO kaynak]} /T tür /C ulam\n\
+            /D tanım\n\
+\n\
+Tanım:\n\
+    Bu araç, bir yöneticiye belirli bir olay kaydı içinde husûsî bir olay\n\
+    oluşturmayı sağlar.\n\
+\n\
+Değişkenler:\n\
+    /S  bilgisayar        Bağlanacak uzak bilgisayarı belirtir.\n\
+\n\
+    /U  [etki alanı\\]kullanıcı Altında komutun çalışacağı kullanıcı hesâbını\n\
+                                belirtir.\n\
+\n\
+    /P  [şifre]           Kullanıcı hesâbının şifresini belirtir.\n\
+                          Kullanılmazsa girdi için sorar.\n\
+\n\
+    /L  kayıt adı         Oluşturulacak olayın kayıt adını belirtir.\n\
+                          Geçerli adlar şunlardır:\n\
+                          Application, System, Security\n\
+                          (İkincisi yalnızca DİZGE hesâbına ayrılmıştır.)\n\
+\n\
+    /SO kaynak            Olay için kullanılacak kaynak adını belirtir.\n\
+                          (Belirtilmezse ön tanımlı kaynak adı\n\
+                          'eventcreate' olacaktır.)\n\
+                          Geçerli bir kaynak, rastgele bir dizgi olabilir ve olayı\n\
+                          oluşturan uygulamayı veyâ bileşeni belirtmelidir.\n\
+\n\
+    /T  tür               Oluşturulacak olayın türünü belirtir.\n\
+                          Geçerli türler: SUCCESS, ERROR, WARNING,\n\
+                          INFORMATION.\n\
+\n\
+    /C  ulam              Olaya göre olay ulamını (tamsayı) belirtir.\n\
+\n\
+    /ID olay kimliği      Olaya göre olay kimliğini belirtir. Bu\n\
+                          0 ile 65535 arasında bir tamsayı olmalıdır.\n\
+\n\
+    /D  tanım             Yeni oluşturulan olay için kullanılacak\n\
+                          tanımı belirtir.\n\
+\n\
+    /?                    Bu yardım görüntülüğünü görüntüler.\n\
+"
+    IDS_INVALIDSWITCH "Geçersiz değişken - ""%s"".\n"
+    IDS_BADSYNTAX_0 "Geçersiz komut yatacı yazımı.\n"
+    IDS_BADSYNTAX_1 "Geçersiz komut yatacı yazımı. ""%s"" seçeneği bir değer gerektirir.\n"
+    IDS_BADSYNTAX_2 "Geçersiz komut yatacı yazımı. ""%s"" seçeneği için değer boş olamaz.\n"
+    IDS_BADSYNTAX_3 "Geçersiz komut yatacı yazımı. Değer ""%s"", ""%s"" seçeneği için izin verilmedi.\n"
+    IDS_BADSYNTAX_4 "Geçersiz komut yatacı yazımı. ""%s"" seçeneği için değer belirtilemiyor.\n"
+    IDS_BADSYNTAX_5 "Geçersiz komut yatacı yazımı. ""%s"" seçeneğine %lu kezden çok izin verilmiyor.\n"
+    IDS_BADSYNTAX_6 "Geçersiz komut yatacı yazımı. Zorunlu ""%s"" seçeneği yok.\n"
+    // IDS_BADSYNTAX_7 "Geçersiz komut yatacı yazımı. ""%s"" seçeneği için değer izin verilen aralığın dışında.\n"
+    IDS_BADSYNTAX_7 "Geçersiz komut yatacı yazımı. ""%s"" seçeneği için değer %d ile %d arasında olmalı.\n"
+
+    IDS_LOG_NOT_FOUND """%s"" kaydı yok. Olay oluşturulamıyor.\n"
+    IDS_SOURCE_NOCREATE "Kayıt adı belirtilmediğinden yeni kaynak oluşturulamıyor.\nKayıt adını belirtmek için lütfen /L seçeneğini kullanınız.\n"
+    IDS_SOURCE_EXISTS "Kaynak ""%s"" kaydında önceden var ve çoğaltılamaz.\n"
+    IDS_SOURCE_NOT_CUSTOM "Kaynak değişkeni, husûsî betikleri veyâ husûsî uygulamaları\n(kurulu uygulamaları değil) belirlemek için kullanılıyor.\n"
+
+    IDS_SUCCESS_1   "İşlem başarılı: ""%s"" türünde bir olay ""%s"" kaydında oluşturuldu.\n"
+    IDS_SUCCESS_2   "İşlem başarılı: ""%s"" türünde bir olay ""%s"" kaynağıyla oluşturuldu.\n"
+    IDS_SUCCESS_3   "İşlem başarılı: ""%s"" türünde bir olay ""%s"" kaydında ""%s"" kaynağıyla oluşturuldu.\n"
+    IDS_SWITCH_UNIMPLEMENTED """%s"" seçeneği şimdilik desteklenmiyor, sıkıntı için üzgünüm!\n"
+END
+

reactos/base/applications/cmdutils/eventcreate/resource.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#define IDS_USAGE           100
+#define IDS_HELP            101
+#define IDS_INVALIDSWITCH   102
+#define IDS_BADSYNTAX_0     103
+#define IDS_BADSYNTAX_1     104
+#define IDS_BADSYNTAX_2     105
+#define IDS_BADSYNTAX_3     106
+#define IDS_BADSYNTAX_4     107
+#define IDS_BADSYNTAX_5     108
+#define IDS_BADSYNTAX_6     109
+#define IDS_BADSYNTAX_7     110
+
+#define IDS_LOG_NOT_FOUND   120
+#define IDS_SOURCE_NOCREATE 121
+#define IDS_SOURCE_EXISTS   122
+#define IDS_SOURCE_NOT_CUSTOM 123
+
+#define IDS_SUCCESS_1       130
+#define IDS_SUCCESS_2       131
+#define IDS_SUCCESS_3       132
+
+#define IDS_SWITCH_UNIMPLEMENTED 135

reactos/base/applications/cmdutils/help/CMakeLists.txt

@@ -1,6 +1,9 @@
 
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
 add_executable(cmd_help help.c help.rc)
 set_module_type(cmd_help win32cui UNICODE)
-add_importlibs(cmd_help user32 msvcrt kernel32)
+target_link_libraries(cmd_help conutils ${PSEH_LIB})
+add_importlibs(cmd_help msvcrt kernel32)
 set_target_properties(cmd_help PROPERTIES OUTPUT_NAME "help")
 add_cd_file(TARGET cmd_help DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/help/help.c

@@ -7,38 +7,21 @@
  *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
  */
 
-#include <stdio.h>
 #include <stdlib.h>
-#include <wchar.h>
 
 #define WIN32_NO_STATUS
 #include <windef.h>
 #include <winbase.h>
-#include <winuser.h>
-#include <wincon.h>
+
 #include <strsafe.h>
 
+#include <conutils.h>
+
 #include "help.h"
 #include "resource.h"
 
-VOID PrintResourceString(INT resID, ...)
-{
-    WCHAR bufSrc[RC_STRING_MAX_SIZE];
-    WCHAR bufFormatted[RC_STRING_MAX_SIZE];
-    CHAR bufFormattedOem[RC_STRING_MAX_SIZE];
-
-    va_list args;
-    va_start(args, resID);
-
-    LoadStringW(GetModuleHandleW(NULL), resID, bufSrc, ARRAYSIZE(bufSrc));
-    vswprintf(bufFormatted, bufSrc, args);
-    CharToOemW(bufFormatted, bufFormattedOem);
-    fputs(bufFormattedOem, stdout);
-
-    va_end(args);
-}
-
-BOOL IsInternalCommand(LPCWSTR Cmd)
+static BOOL
+IsInternalCommand(PCWSTR Cmd)
 {
     size_t i;
     int res;
@@ -73,24 +56,27 @@ int wmain(int argc, WCHAR* argv[])
 {
     WCHAR CmdLine[CMDLINE_LENGTH];
 
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
     /*
      * If the user hasn't asked for specific help,
      * then print out the list of available commands.
      */
     if (argc <= 1)
     {
-        PrintResourceString(IDS_HELP1);
-        PrintResourceString(IDS_HELP2);
+        ConResPuts(StdOut, IDS_HELP1);
+        ConResPuts(StdOut, IDS_HELP2);
         return 0;
     }
 
     /*
      * Bad usage (too much options) or we use the /? switch.
-     * Display help for the help command.
+     * Display help for the HELP command.
      */
     if ((argc > 2) || (wcscmp(argv[1], L"/?") == 0))
     {
-        PrintResourceString(IDS_USAGE);
+        ConResPuts(StdOut, IDS_USAGE);
         return 0;
     }
 
@@ -100,7 +86,7 @@ int wmain(int argc, WCHAR* argv[])
      */
     if (!IsInternalCommand(argv[1]))
     {
-        PrintResourceString(IDS_NO_ENTRY, argv[1]);
+        ConResPrintf(StdOut, IDS_NO_ENTRY, argv[1]);
         return 0;
     }
 
@@ -108,7 +94,7 @@ int wmain(int argc, WCHAR* argv[])
      * Run "<command> /?" in the current command processor.
      */
     StringCbPrintfW(CmdLine, sizeof(CmdLine), L"%ls /?", argv[1]);
-    
+
     _flushall();
     return _wsystem(CmdLine);
 }

reactos/base/applications/cmdutils/help/help.rc

@@ -5,9 +5,9 @@
 
 LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Command Line Help Utility"
-#define REACTOS_STR_INTERNAL_NAME     "help"
-#define REACTOS_STR_ORIGINAL_FILENAME "help.exe"
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Command Line Help Utility"
+#define REACTOS_STR_INTERNAL_NAME       "help"
+#define REACTOS_STR_ORIGINAL_FILENAME   "help.exe"
 #include <reactos/version.rc>
 
 /* UTF-8 */

reactos/base/applications/cmdutils/help/lang/cs-CZ.rc

@@ -0,0 +1,73 @@
+
+LANGUAGE LANG_CZECH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n."
+END
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Provides Help information for ReactOS commands.\n\n\
+HELP [command]\n\n\
+  command - Display help information for this command.\n"
+    IDS_HELP1 "List of all available commands (+ description)\n\n\
+  help command\n\
+  command /?     For more information on a specific command\n\n\
+?        List all available commands (without description).\n\
+ALIAS    Sets, removes or shows aliases.\n\
+ATTRIB   Displays or changes file attributes.\n\
+BEEP     Beep the speaker.\n\
+CALL     Calls one batch program from another.\n\
+CD       Displays the name of or changes the current directory.\n\
+CHCP     Displays or sets the active code page number.\n\
+CHOICE   Waits for the user to choose one of a set of choices.\n\
+CLS      Clears the screen.\n\
+CMD      Starts a new instance of the ReactOS command interpreter.\n\
+COLOR    Sets the default console foreground and background colors.\n\
+COPY     Copies one or more files to another location.\n\
+DATE     Displays or sets the date.\n\
+DELETE   Deletes one or more files.\n\
+DIR      Displays a list of files and subdirectories in a directory.\n\
+ECHO     Displays messages, or turns command echoing on or off.\n\
+ERASE    Deletes one or more files.\n\
+EXIT     Quits the CMD.EXE program (command interpreter).\n\
+FOR      Runs a specified command for each file in a set of files.\n\
+FREE     (free) disc space.\n\
+GOTO     Directs the ReactOS command interpreter to a labeled line in\n\
+         a batch program.\n\
+HELP     Provides Help information for ReactOS commands.\n\
+HISTORY  List all commands which has been used\n\
+IF       Performs conditional processing in batch programs.\n\
+LABEL    Creates, changes, or deletes the volume label of a disk.\n\
+MD       Creates a directory.\n\
+MKDIR    Creates a directory.\n\
+MKLINK   Creates a filesystem link object.\n\
+MOVE     Moves one or more files from one directory to another\n\
+         directory.\n\
+PATH     Displays or sets a search path for executable files.\n\
+PAUSE    Suspends processing of a batch file and displays a message.\n\
+POPD     Restores the previous value of the current directory saved by\n\
+         PUSHD.\n\
+PROMPT   Changes the command prompt.\n\
+PUSHD    Saves the current directory then changes it.\n\
+RD       Removes a directory.\n\
+REM      Records comments (remarks) in batch files.\n\
+REN      Renames a file or files.\n\
+RENAME   Renames a file or files.\n\
+REPLACE  Replaces files.\n\
+RMDIR    Removes a directory.\n\
+SCREEN   Move cursor and optionally print text.\n\
+SET      Displays, sets, or removes ReactOS environment variables.\n\
+SHIFT    Shifts the position of replaceable parameters in batch files.\n"
+    IDS_HELP2 "START    Starts a separate window to run a specified program or command.\n\
+         Executes command.\n\
+TIME     Displays or sets the system time.\n\
+TIMER    Allow the use of ten stopwatches.\n\
+TITLE    Sets the window title for a CMD.EXE session.\n\
+TYPE     Displays the contents of a text file.\n\
+VER      Displays the ReactOS version.\n\
+VERIFY   Tells ReactOS whether to verify that your files are written\n\
+         correctly to a disk.\n\
+VOL      Displays a disk volume label and serial number.\n"
+END

reactos/base/applications/cmdutils/help/lang/en-US.rc

@@ -38,7 +38,7 @@ FREE     (free) disc space.\n\
 GOTO     Directs the ReactOS command interpreter to a labeled line in\n\
          a batch program.\n\
 HELP     Provides Help information for ReactOS commands.\n\
-HISTORY  List all commands which has been used\n\
+HISTORY  Lists all commands which have been used.\n\
 IF       Performs conditional processing in batch programs.\n\
 LABEL    Creates, changes, or deletes the volume label of a disk.\n\
 MD       Creates a directory.\n\

reactos/base/applications/cmdutils/help/lang/tr-TR.rc

@@ -18,7 +18,7 @@ HELP [komut]\n\n\
 ?        Tüm kullanılabilir komutları dizelgele (tanımlar olmadan).\n\
 ALIAS    Başka adları ayarlar, siler ya da gösterir.\n\
 ATTRIB   Kütük öz niteliklerini görüntüler ya da değiştirir.\n\
-BEEP     Hoparlörden ""biip"" sesi çıkart.\n\
+BEEP     Hoparlörden ""bip"" sesi çıkart.\n\
 CALL     Bir toplu iş izlencesini bir başkasından çağırır.\n\
 CD       Şimdiki dizinin adını görüntüler ya da şimdiki dizini değiştirir.\n\
 CHCP     Etkin kod sayfası numarasını görüntüler ya da ayarlar.\n\

reactos/base/applications/cmdutils/help/resource.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#define RC_STRING_MAX_SIZE 4096
-
 #define IDS_USAGE 100
 #define IDS_HELP1 101
 #define IDS_HELP2 102

reactos/base/applications/cmdutils/mode/CMakeLists.txt

@@ -1,6 +1,9 @@
 
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
 add_executable(mode mode.c mode.rc)
 set_module_type(mode win32cui UNICODE)
-set_target_properties(mode PROPERTIES SUFFIX ".com")
+target_link_libraries(mode conutils ${PSEH_LIB})
 add_importlibs(mode user32 msvcrt kernel32)
+set_target_properties(mode PROPERTIES SUFFIX ".com")
 add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/mode/lang/de-DE.rc

@@ -0,0 +1,68 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Konfiguriert Geräte im System.\n\n\
+Gerätestatus:           MODE [Gerät] [/STATUS]\n\
+Serieller Anschluss:    MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\
+                        [to=on|off] [xon=on|off] [odsr=on|off]\n\
+                        [octs=on|off] [dtr=on|off|hs]\n\
+                        [rts=on|off|hs|tg] [idsr=on|off]\n\
+Druckausgabe umleiten:  MODE LPTn[:]=COMm[:]\n\
+Codepage auswählen:     MODE CON[:] CP SELECT=yyy\n\
+Codepagestatus:         MODE CON[:] CP [/STATUS]\n\
+Anzeigemodus:           MODE CON[:] [COLS=c] [LINES=n]\n\
+Tastaturwiederholrate:  MODE CON[:] [RATE=r DELAY=d]\n"
+
+    IDS_QUERY_SERIAL_FOUND "    Serieller Anschluss gefunden - %s\n"
+    IDS_QUERY_PRINTER_FOUND "    Drucker gefunden - %s\n"
+    IDS_QUERY_PARALLEL_FOUND "    Paralleler Anschluss gefunden - %s\n"
+    IDS_QUERY_DOSDEV_FOUND "    Found DOS device - %s\n"
+    // IDS_QUERY_MISC_FOUND "    Found other device - %s\n"
+
+    // IDS_QUERY_DEVICE_FOUND "    Found %s device - %s\n"
+    // IDS_SERIAL  "serial"
+    // IDS_PRINTER "parallel"
+    // IDS_OTHER   "other"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DEVICE_STATUS_HEADER "Status von Gerät %s:"
+
+    IDS_COM_STATUS_BAUD             "    Baud:            %ld\n"
+    IDS_COM_STATUS_PARITY           "    Parität:         %s\n"
+    IDS_COM_STATUS_DATA_BITS        "    Datenbits:       %d\n"
+    IDS_COM_STATUS_STOP_BITS        "    Stopbits:        %s\n"
+    IDS_COM_STATUS_TIMEOUT          "    Timeout:         %s\n"
+    IDS_COM_STATUS_XON_XOFF         "    XON/XOFF:        %s\n"
+    IDS_COM_STATUS_CTS_HANDSHAKING  "    CTS handshaking: %s\n"
+    IDS_COM_STATUS_DSR_HANDSHAKING  "    DSR handshaking: %s\n"
+    IDS_COM_STATUS_DSR_SENSITIVITY  "    DSR sensitivity: %s\n"
+    IDS_COM_STATUS_DTR_CIRCUIT      "    DTR circuit:     %s\n"
+    IDS_COM_STATUS_RTS_CIRCUIT      "    RTS circuit:     %s\n"
+
+    IDS_CONSOLE_STATUS_LINES    "    Zeilen:           %d\n"
+    IDS_CONSOLE_STATUS_COLS     "    Spalten:          %d\n"
+    IDS_CONSOLE_KBD_RATE        "    Wiederholrate:    %ld\n"
+    IDS_CONSOLE_KBD_DELAY       "    Verzögerungszeit: %ld\n"
+    IDS_CONSOLE_CODEPAGE        "    Codepage:         %d\n"
+
+    IDS_PRINTER_OUTPUT_NOT_REROUTED     "    Druckausgabe wird nicht umgeleitet.\n"
+    IDS_PRINTER_OUTPUT_REROUTED_SERIAL  "    Druckausgabe wird an seriellen Anschluss %s umgeleitet.\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n"
+    IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) returned unrecognised form %s.\n"
+    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "ERROR: Unzulässiger Parameter - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Unzulässiger Gerätename - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device COM%d:\n"
+    IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device COM%d:\n"
+    IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n"
+    IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n"
+    IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n"
+    IDS_ERROR_SCREEN_LINES_COL "ERROR: The screen cannot be set to the number of lines and columns specified.\n"
+END

reactos/base/applications/cmdutils/mode/lang/en-US.rc

@@ -0,0 +1,68 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Configure System Devices.\n\n\
+Device Status:     MODE [device] [/STATUS]\n\
+Serial port:       MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\
+                                [to=on|off] [xon=on|off] [odsr=on|off]\n\
+                                [octs=on|off] [dtr=on|off|hs]\n\
+                                [rts=on|off|hs|tg] [idsr=on|off]\n\
+Redirect printing: MODE LPTn[:]=COMm[:]\n\
+Select code page:  MODE CON[:] CP SELECT=yyy\n\
+Code page status:  MODE CON[:] CP [/STATUS]\n\
+Display mode:      MODE CON[:] [COLS=c] [LINES=n]\n\
+Typematic rate:    MODE CON[:] [RATE=r DELAY=d]\n"
+
+    IDS_QUERY_SERIAL_FOUND "    Found serial device - %s\n"
+    IDS_QUERY_PRINTER_FOUND "    Found printer device - %s\n"
+    IDS_QUERY_PARALLEL_FOUND "    Found parallel device - %s\n"
+    IDS_QUERY_DOSDEV_FOUND "    Found DOS device - %s\n"
+    // IDS_QUERY_MISC_FOUND "    Found other device - %s\n"
+
+    // IDS_QUERY_DEVICE_FOUND "    Found %s device - %s\n"
+    // IDS_SERIAL  "serial"
+    // IDS_PRINTER "parallel"
+    // IDS_OTHER   "other"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DEVICE_STATUS_HEADER "Status for device %s:"
+
+    IDS_COM_STATUS_BAUD             "    Baud:            %ld\n"
+    IDS_COM_STATUS_PARITY           "    Parity:          %s\n"
+    IDS_COM_STATUS_DATA_BITS        "    Data Bits:       %d\n"
+    IDS_COM_STATUS_STOP_BITS        "    Stop Bits:       %s\n"
+    IDS_COM_STATUS_TIMEOUT          "    Timeout:         %s\n"
+    IDS_COM_STATUS_XON_XOFF         "    XON/XOFF:        %s\n"
+    IDS_COM_STATUS_CTS_HANDSHAKING  "    CTS handshaking: %s\n"
+    IDS_COM_STATUS_DSR_HANDSHAKING  "    DSR handshaking: %s\n"
+    IDS_COM_STATUS_DSR_SENSITIVITY  "    DSR sensitivity: %s\n"
+    IDS_COM_STATUS_DTR_CIRCUIT      "    DTR circuit:     %s\n"
+    IDS_COM_STATUS_RTS_CIRCUIT      "    RTS circuit:     %s\n"
+
+    IDS_CONSOLE_STATUS_LINES    "    Lines:          %d\n"
+    IDS_CONSOLE_STATUS_COLS     "    Columns:        %d\n"
+    IDS_CONSOLE_KBD_RATE        "    Keyboard rate:  %ld\n"
+    IDS_CONSOLE_KBD_DELAY       "    Keyboard delay: %ld\n"
+    IDS_CONSOLE_CODEPAGE        "    Code page:      %d\n"
+
+    IDS_PRINTER_OUTPUT_NOT_REROUTED     "    Printer output is not being rerouted.\n"
+    IDS_PRINTER_OUTPUT_REROUTED_SERIAL  "    Printer output is being rerouted to serial port %s.\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n"
+    IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) returned unrecognised form %s.\n"
+    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "ERROR: Invalid parameter - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Illegal device name - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device COM%d:\n"
+    IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device COM%d:\n"
+    IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n"
+    IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n"
+    IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n"
+    IDS_ERROR_SCREEN_LINES_COL "ERROR: The screen cannot be set to the number of lines and columns specified.\n"
+END

reactos/base/applications/cmdutils/mode/lang/ro-RO.rc

@@ -0,0 +1,75 @@
+/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Configurează dispozitive de sistem.\n\n\
+Interogarea stării unui dispozitiv:\n\
+    MODE [dispozitiv] [/STATUS]\n\n\
+Configurarea portului serial:\n\
+    MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\
+                 [to=on|off] [xon=on|off] [odsr=on|off]\n\
+                 [octs=on|off] [dtr=on|off|hs]\n\
+                 [rts=on|off|hs|tg] [idsr=on|off]\n\n\
+Redirecția portului paralel:\n\
+    MODE LPTn[:]=COMm[:]\n\n\
+Selecția unui cod de pagină:\n\
+    MODE CON[:] CP SELECT=yyy\n\n\
+Starea codului de pagină:\n\
+    MODE CON[:] CP [/STATUS]\n\n\
+Modul de afișare:\n\
+    MODE CON[:] [COLS=c] [LINES=n]\n\n\
+Rata de repetiție la menținerea unei taste apăsate:\n\
+    MODE CON[:] [RATE=r DELAY=d]\n"
+
+    IDS_QUERY_SERIAL_FOUND "    Depistat dispozitiv la portul serial - %s\n"
+    IDS_QUERY_PRINTER_FOUND "    Depistat dispozitiv de imprimare - %s\n"
+    IDS_QUERY_PARALLEL_FOUND "    Depistat dispozitiv la portul paralel - %s\n"
+    IDS_QUERY_DOSDEV_FOUND "    Depistat dispozitiv de tip DOS - %s\n"
+    // IDS_QUERY_MISC_FOUND "    Found other device - %s\n"
+
+    // IDS_QUERY_DEVICE_FOUND "    Found %s device - %s\n"
+    // IDS_SERIAL  "serial"
+    // IDS_PRINTER "parallel"
+    // IDS_OTHER   "other"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DEVICE_STATUS_HEADER "Starea pentru dispozitivul %s:"
+
+    IDS_COM_STATUS_BAUD             "    Rata de modulare:  %ld\n"
+    IDS_COM_STATUS_PARITY           "    Paritate:          %s\n"
+    IDS_COM_STATUS_DATA_BITS        "    Biți de date:      %d\n"
+    IDS_COM_STATUS_STOP_BITS        "    Biți delimitori:   %s\n"
+    IDS_COM_STATUS_TIMEOUT          "    Timp de expirare:  %s\n"
+    IDS_COM_STATUS_XON_XOFF         "    XON/XOFF:          %s\n"
+    IDS_COM_STATUS_CTS_HANDSHAKING  "    Inițiere CTS:      %s\n"
+    IDS_COM_STATUS_DSR_HANDSHAKING  "    Inițiere DSR:      %s\n"
+    IDS_COM_STATUS_DSR_SENSITIVITY  "    Senzitivitate DSR: %s\n"
+    IDS_COM_STATUS_DTR_CIRCUIT      "    Circuit DTR:       %s\n"
+    IDS_COM_STATUS_RTS_CIRCUIT      "    Circuit RTS:       %s\n"
+
+    IDS_CONSOLE_STATUS_LINES    "    Linii:             %d\n"
+    IDS_CONSOLE_STATUS_COLS     "    Coloane:           %d\n"
+    IDS_CONSOLE_KBD_DELAY       "    Întârziere taste:  %ld\n"
+    IDS_CONSOLE_KBD_RATE        "    Rată taste:        %ld\n"
+    IDS_CONSOLE_CODEPAGE        "    Cod de pagină:     %d\n"
+
+    IDS_PRINTER_OUTPUT_NOT_REROUTED     "    Ieșirea de imprimantă nu este redirecționată.\n"
+    IDS_PRINTER_OUTPUT_REROUTED_SERIAL  "    Ieșirea de imprimantă este redirecționată către portul %s.\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ERROR_QUERY_DEVICES "EROARE: Dispozitivul DOS (0x%lx) nu poate fi interogat.\n"
+    IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) a returnat un formular nerecunoscut %s.\n"
+    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "EROARE: Parametru nevalid - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "EROARE: Nume eronat de dispozitiv - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "EROARE: Nu poate fi determinată starea dispozitivului COM%d:\n"
+    IDS_ERROR_STATUS_SET_DEVICE "EROARE: Nu poate fi schimbată starea pentru dispozitivul COM%d:\n"
+    IDS_ERROR_INVALID_PARITY_BITS "EROARE: Valoare eronată pentru biții de paritate %d:\n"
+    IDS_ERROR_INVALID_STOP_BITS "EROARE: Valoare eronată pentru biții delimitori %d:\n"
+    IDS_ERROR_NO_MEMORY "ERAORE: Nu există suficientă memorie.\n"
+END

reactos/base/applications/cmdutils/mode/lang/ru-RU.rc

@@ -0,0 +1,67 @@
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Настройка системных устройств.\n\n\
+Состояние устройства:   MODE [device] [/STATUS]\n\
+Последовательный порт:  MODE COMm[:] [BAUD=b] [PARITY=p] [DATA=d] [STOP=s]\n\
+                                     [to=on|off] [xon=on|off] [odsr=on|off]\n\
+                                     [octs=on|off] [dtr=on|off|hs]\n\
+                                     [rts=on|off|hs|tg] [idsr=on|off]\n\
+Переадресация печати:   MODE LPTn[:]=COMm[:]\n\
+Выбор кодовой страницы: MODE CON[:] CP SELECT=yyy\n\
+Вывод кодовой страницы: MODE CON[:] CP [/STATUS]\n\
+Режим работы экрана:    MODE CON[:] [COLS=c] [LINES=n]\n\
+Ввод с клавиатуры:      MODE CON[:] [RATE=r DELAY=d]\n"
+
+    IDS_QUERY_SERIAL_FOUND "    Найдено последовательное устройство - %s\n"
+    IDS_QUERY_PRINTER_FOUND "    Найдено устройство печати - %s\n"
+    IDS_QUERY_PARALLEL_FOUND "    Найдено параллельное устройство - %s\n"
+    IDS_QUERY_DOSDEV_FOUND "    Найдено устройство DOS - %s\n"
+    // IDS_QUERY_MISC_FOUND "    Найдено другое устройство - %s\n"
+
+    // IDS_QUERY_DEVICE_FOUND "    Найдено %s устройство - %s\n"
+    // IDS_SERIAL  "последовательное"
+    // IDS_PRINTER "параллельное"
+    // IDS_OTHER   "другое"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_DEVICE_STATUS_HEADER "Состояние устройства %s:"
+
+    IDS_COM_STATUS_BAUD             "    Скорость:              %ld\n"
+    IDS_COM_STATUS_PARITY           "    Четность:              %s\n"
+    IDS_COM_STATUS_DATA_BITS        "    Биты данных:           %d\n"
+    IDS_COM_STATUS_STOP_BITS        "    Стоповые биты:         %s\n"
+    IDS_COM_STATUS_TIMEOUT          "    Таймаут:               %s\n"
+    IDS_COM_STATUS_XON_XOFF         "    XON/XOFF:              %s\n"
+    IDS_COM_STATUS_CTS_HANDSHAKING  "    Синхронизация CTS:     %s\n"
+    IDS_COM_STATUS_DSR_HANDSHAKING  "    Синхронизация DSR:     %s\n"
+    IDS_COM_STATUS_DSR_SENSITIVITY  "    Чувствительность DSR:  %s\n"
+    IDS_COM_STATUS_DTR_CIRCUIT      "    Цепь DTR:              %s\n"
+    IDS_COM_STATUS_RTS_CIRCUIT      "    Цепь RTS:              %s\n"
+
+    IDS_CONSOLE_STATUS_LINES    "    Строки:                %d\n"
+    IDS_CONSOLE_STATUS_COLS     "    Столбцы:               %d\n"
+    IDS_CONSOLE_KBD_DELAY       "    Скорость клавиатуры:   %ld\n"
+    IDS_CONSOLE_KBD_RATE        "    Задержка клавиатуры:   %ld\n"
+    IDS_CONSOLE_CODEPAGE        "    Кодовая страница:      %d\n"
+
+    IDS_PRINTER_OUTPUT_NOT_REROUTED     "    Вывод принтера не переадресован.\n"
+    IDS_PRINTER_OUTPUT_REROUTED_SERIAL  "    Вывод принтера переадресован на последовательный порт %s.\n"
+END
+
+STRINGTABLE
+BEGIN
+    IDS_ERROR_QUERY_DEVICES "ERROR: Unable to query DOS devices (0x%lx).\n"
+    IDS_ERROR_QUERY_DEVICES_FORM "    QueryDosDeviceW(%s) returned unrecognised form %s.\n"
+    IDS_ERROR_SET_PARALLEL_STATE "SetParallelState(%d) - DefineDosDevice(%s) (0x%lx)\n"
+    IDS_ERROR_INVALID_PARAMETER "ERROR: Invalid parameter - %s\n"
+    IDS_ERROR_ILLEGAL_DEVICE_NAME "ERROR: Illegal device name - %s (0x%lx)\n"
+    IDS_ERROR_STATUS_GET_DEVICE "ERROR: Failed to get the status for device COM%d:\n"
+    IDS_ERROR_STATUS_SET_DEVICE "ERROR: Failed to set the status for device COM%d:\n"
+    IDS_ERROR_INVALID_PARITY_BITS "ERROR: Invalid value for Parity Bits %d:\n"
+    IDS_ERROR_INVALID_STOP_BITS "ERROR: Invalid value for Stop Bits %d:\n"
+    IDS_ERROR_NO_MEMORY "ERROR: Not enough memory.\n"
+END

reactos/base/applications/cmdutils/mode/mode.rc

@@ -1,5 +1,26 @@
+#include <windef.h>
+
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 
 #define REACTOS_STR_FILE_DESCRIPTION    "ReactOS Mode Utility"
 #define REACTOS_STR_INTERNAL_NAME       "mode"
 #define REACTOS_STR_ORIGINAL_FILENAME   "mode.com"
 #include <reactos/version.rc>
+
+/* UTF-8 */
+#pragma code_page(65001)
+
+#ifdef LANGUAGE_DE_DE
+    #include "lang/de-DE.rc"
+#endif
+#ifdef LANGUAGE_EN_US
+    #include "lang/en-US.rc"
+#endif
+#ifdef LANGUAGE_RO_RO
+    #include "lang/ro-RO.rc"
+#endif
+#ifdef LANGUAGE_RU_RU
+    #include "lang/ru-RU.rc"
+#endif

reactos/base/applications/cmdutils/mode/resource.h

@@ -0,0 +1,48 @@
+#ifndef RESOURCE_H
+#define RESOURCE_H
+
+#define IDS_USAGE   0
+
+#define IDS_QUERY_SERIAL_FOUND      1
+#define IDS_QUERY_PRINTER_FOUND     2
+#define IDS_QUERY_PARALLEL_FOUND    3
+// #define IDS_QUERY_MISC_FOUND        4
+#define IDS_QUERY_DOSDEV_FOUND      4
+// #define IDS_QUERY_DEVICE_FOUND      1
+// #define IDS_SERIAL                  2
+// #define IDS_PRINTER                 3
+// #define IDS_OTHER                   4
+
+#define IDS_DEVICE_STATUS_HEADER            5
+#define IDS_COM_STATUS_BAUD                 6
+#define IDS_COM_STATUS_PARITY               7
+#define IDS_COM_STATUS_DATA_BITS            8
+#define IDS_COM_STATUS_STOP_BITS            9
+#define IDS_COM_STATUS_TIMEOUT             10
+#define IDS_COM_STATUS_XON_XOFF            11
+#define IDS_COM_STATUS_CTS_HANDSHAKING     12
+#define IDS_COM_STATUS_DSR_HANDSHAKING     13
+#define IDS_COM_STATUS_DSR_SENSITIVITY     14
+#define IDS_COM_STATUS_DTR_CIRCUIT         15
+#define IDS_COM_STATUS_RTS_CIRCUIT         16
+#define IDS_CONSOLE_STATUS_LINES           17
+#define IDS_CONSOLE_STATUS_COLS            18
+#define IDS_CONSOLE_KBD_RATE               19
+#define IDS_CONSOLE_KBD_DELAY              20
+#define IDS_CONSOLE_CODEPAGE               21
+#define IDS_PRINTER_OUTPUT_NOT_REROUTED    22
+#define IDS_PRINTER_OUTPUT_REROUTED_SERIAL 23
+
+#define IDS_ERROR_QUERY_DEVICES         24
+#define IDS_ERROR_QUERY_DEVICES_FORM    25
+#define IDS_ERROR_SET_PARALLEL_STATE    26
+#define IDS_ERROR_INVALID_PARAMETER     27
+#define IDS_ERROR_ILLEGAL_DEVICE_NAME   28
+#define IDS_ERROR_STATUS_GET_DEVICE     29
+#define IDS_ERROR_STATUS_SET_DEVICE     30
+#define IDS_ERROR_INVALID_PARITY_BITS   31
+#define IDS_ERROR_INVALID_STOP_BITS     32
+#define IDS_ERROR_NO_MEMORY             33
+#define IDS_ERROR_SCREEN_LINES_COL      34
+
+#endif /* RESOURCE_H */

reactos/base/applications/cmdutils/more/CMakeLists.txt

@@ -1,6 +1,11 @@
 
+PROJECT(more)
+
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
 add_executable(more more.c more.rc)
-set_module_type(more win32cui)
+set_module_type(more win32cui UNICODE)
+target_link_libraries(more conutils ${PSEH_LIB})
+add_importlibs(more advapi32 user32 msvcrt kernel32)
 set_target_properties(more PROPERTIES SUFFIX ".com")
-add_importlibs(more user32 msvcrt kernel32)
 add_cd_file(TARGET more DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/more/lang/bg-BG.rc

@@ -9,6 +9,7 @@ BEGIN
   [Устройство:][Път]Файлово име    Файл, чието съдържание да бъде показано.\n\
   Команда\t\t     Команда, чийто изход да бъде показан.\n\n\
   При въпроса ""-- Продължаване --"" натиснете произволен клавиш, за показаване на следващата страница.\n"
-    IDS_CONTINUE " -- Продължаване (100%) -- "
-    IDS_FILE_ACCESS "Няма достъп до файл %s."
+    IDS_CONTINUE "-- Продължаване --"
+    IDS_CONTINUE_PROGRESS "-- Продължаване (%d%%) --"
+    IDS_FILE_ACCESS "Няма достъп до файл %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/ca-ES.rc

@@ -9,6 +9,7 @@ BEGIN
   [Unitat:][Ruta]Nom del fitxer    Un fitxer, el contingut del qual serà mostrat.\n\
   Instrucció\t\t     Una instrucció, el resultat de la qual serà mostrada.\n\n\
   Al visualitzar ""-- Continua --"" heu de premer qualsevol tecla per visualitzar la següent pàgina.\n"
-    IDS_CONTINUE " -- Continua (100%) -- "
-    IDS_FILE_ACCESS "No puc accedir al fitxer %s."
+    IDS_CONTINUE "-- Continua --"
+    IDS_CONTINUE_PROGRESS "-- Continua (%d%%) --"
+    IDS_FILE_ACCESS "No puc accedir al fitxer %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/cs-CZ.rc

@@ -16,6 +16,7 @@ BEGIN
   Příkaz\t\t     Příkaz, jehož výstup bude zobrazen.\n\n\
   Při výzvě ""-- Pokračovat --"" lze stisknout libovolnou klávesu\n\
   pro zobrazení další stránky.\n"
-    IDS_CONTINUE " -- Pokračovat (100%) -- "
-    IDS_FILE_ACCESS "Nelze získat přístup k souboru %s."
+    IDS_CONTINUE "-- Pokračovat --"
+    IDS_CONTINUE_PROGRESS "-- Pokračovat (%d%%) --"
+    IDS_FILE_ACCESS "Nelze získat přístup k souboru %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/de-DE.rc

@@ -10,6 +10,7 @@ BEGIN
   Befehl\t\t     Ein Befehl, dessen Ausgabe angezeigt werden soll.\n\n\
   An der Eingabeaufforderung ""-- Fortsetzung --"" kann eine beliebige\n\
   Taste gedrückt werden, um die nächste Seite anzuzeigen.\n"
-    IDS_CONTINUE " -- Fortsetzung (100%) -- "
-    IDS_FILE_ACCESS "Auf die Datei %s kann nicht zugegriffen werden."
+    IDS_CONTINUE "-- Fortsetzung --"
+    IDS_CONTINUE_PROGRESS "-- Fortsetzung (%d%%) --"
+    IDS_FILE_ACCESS "Auf die Datei %s kann nicht zugegriffen werden.\n"
 END

reactos/base/applications/cmdutils/more/lang/el-GR.rc

@@ -9,6 +9,7 @@ BEGIN
   [Δίσκος:][Μονοπάτι]Όνομα αρχείου    Το αρχείο, τα δεδομένα του οποίου θα εμφανιστούν.\n\
   Εντολή\t\t     Η εντολή, της οποίας η έξοδος θα εμφανιστεί.\n\n\
   Στη γραμμή εντολών ""-- Συνέχεια --"" μπορείτε να πατήσετε οποιοδήποτε κουμπί για να δείτε την επόμενη σελίδα.\n"
-    IDS_CONTINUE " -- Συνέχεια (100%) -- "
-    IDS_FILE_ACCESS "Δεν ήταν δυνατή η προσπέλαση του αρχείου %s."
+    IDS_CONTINUE "-- Συνέχεια --"
+    IDS_CONTINUE_PROGRESS "-- Συνέχεια (%d%%) --"
+    IDS_FILE_ACCESS "Δεν ήταν δυνατή η προσπέλαση του αρχείου %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/en-US.rc

@@ -9,6 +9,7 @@ BEGIN
   [Drive:][Path]File name    A file, whose content shall be displayed.\n\
   Command\t\t     A command, whose output shall be displayed.\n\n\
   At the prompt ""-- Continue --"" you can press any key to show the next page.\n"
-    IDS_CONTINUE " -- Continue (100%) -- "
-    IDS_FILE_ACCESS "Cannot access the file %s."
+    IDS_CONTINUE "-- Continue --"
+    IDS_CONTINUE_PROGRESS "-- Continue (%d%%) --"
+    IDS_FILE_ACCESS "Cannot access the file %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/es-ES.rc

@@ -9,6 +9,7 @@ BEGIN
   [Unidad:][Ruta]Nombre del archivo    Un archivo, cuyo contenido pueda ser mostrado.\n\
   Comando\t\t     Un comando, cuya salida pueda ser mostrada.\n\n\
   Al visualizar ""-- Continuar --"" presione cualquier tecla para mostrar la siguiente página.\n"
-    IDS_CONTINUE " -- Continuar (100%) -- "
-    IDS_FILE_ACCESS "No se puede acceder al fichero %s."
+    IDS_CONTINUE "-- Continuar --"
+    IDS_CONTINUE_PROGRESS "-- Continuar (%d%%) --"
+    IDS_FILE_ACCESS "No se puede acceder al fichero %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/fr-FR.rc

@@ -9,6 +9,7 @@ BEGIN
   [Lecteur:][Chemin]Nom du fichier    Un fichier, dont le contenu sera affiché.\n\
   Commande\t\t     Une commande, dont la sortie sera affichée.\n\n\
   À l'invite ""-- Continuer --"" Vous pouvez appuyer sur n'importe quelle touche pour afficher la page suivante.\n"
-    IDS_CONTINUE " -- Continuer (100%) -- "
-    IDS_FILE_ACCESS "Impossible d'accéder au fichier %s."
+    IDS_CONTINUE "-- Continuer --"
+    IDS_CONTINUE_PROGRESS "-- Continuer (%d %%) --"
+    IDS_FILE_ACCESS "Impossible d'accéder au fichier %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/it-IT.rc

@@ -9,6 +9,7 @@ BEGIN
   [Drive:][Path]File    Il file da visualizzare.\n\
   Comando\t\t     Il comando di cui l'output dev'essere visualizzato.\n\n\
   Alla richiesta ""-- Continua --"" premere un tasto qualsiasi per visualizzare la pagina successiva.\n"
-    IDS_CONTINUE " -- Continua (100%) -- "
-    IDS_FILE_ACCESS "Impossibile accedere al file %s."
+    IDS_CONTINUE "-- Continua --"
+    IDS_CONTINUE_PROGRESS "-- Continua (%d%%) --"
+    IDS_FILE_ACCESS "Impossibile accedere al file %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/lt-LT.rc

@@ -21,6 +21,7 @@ BEGIN
                                              būti atvaizduotas.\n\n\
   Pasirodžius raginimui ""-- Toliau --"" spauskite bet kurį klavišą, kad\n\
   pamatytumėte sekantį puslapį.\n"
-    IDS_CONTINUE " -- Toliau (100%) -- "
-    IDS_FILE_ACCESS "Nepavyko atverti bylos %s."
+    IDS_CONTINUE "-- Toliau --"
+    IDS_CONTINUE_PROGRESS "-- Toliau (%d%%) --"
+    IDS_FILE_ACCESS "Nepavyko atverti bylos %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/no-NO.rc

@@ -9,6 +9,7 @@ BEGIN
   [Stasjon:][Mappe]Filnavn    En fil, Velg innhold som skal vises.\n\
   Command\t\t     En kommando, Velg output som skal vises.\n\n\
   At the prompt ""-- Fortsett --"" du kan trykke en tast for å vise neste side.\n"
-    IDS_CONTINUE " -- Fortsett (100%) -- "
-    IDS_FILE_ACCESS "Får ikke tilgang til filen %s."
+    IDS_CONTINUE "-- Fortsett --"
+    IDS_CONTINUE_PROGRESS "-- Fortsett (%d%%) --"
+    IDS_FILE_ACCESS "Får ikke tilgang til filen %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/pl-PL.rc

@@ -17,6 +17,7 @@ BEGIN
   [Napęd:][Ścieżka]Nazwa pliku    Plik, którego zawartość ma być wyświetlona.\n\
   Polecenie\t\t     Polecenie, którego wynik ma być wyświetlony.\n\n\
   Po wyświetleniu ""-- Kontynuuj --"" możesz nacisnąć dowolny klawisz, aby przejść do następnej strony.\n"
-    IDS_CONTINUE " -- Kontynuuj (100%) -- "
-    IDS_FILE_ACCESS "Brak dostępu do pliku: %s."
+    IDS_CONTINUE "-- Kontynuuj --"
+    IDS_CONTINUE_PROGRESS "-- Kontynuuj (%d%%) --"
+    IDS_FILE_ACCESS "Brak dostępu do pliku: %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/ro-RO.rc

@@ -18,6 +18,7 @@ BEGIN
   Comandă                        Comanda a cărei ieșire va fi afișată.\n\n\
   La vederea sugestiei ""-- Continuă --"" veți apăsa o tastă pentru afișarea\n\
   următoarei pagini.\n"
-    IDS_CONTINUE " -- Continuă (100%) -- "
-    IDS_FILE_ACCESS "Fișierul «%s» nu poate fi accesat!"
+    IDS_CONTINUE "-- Continuă --"
+    IDS_CONTINUE_PROGRESS "-- Continuă (%d%%) --"
+    IDS_FILE_ACCESS "Fișierul «%s» nu poate fi accesat!\n"
 END

reactos/base/applications/cmdutils/more/lang/ru-RU.rc

@@ -17,6 +17,7 @@ BEGIN
   [диск:][путь]имя_файла    Файл, отображаемый по фрагментам.\n\
   имя_команды             Команда, вывод которой отображается на экране.\n\n\
   При запросе  ""-- Продолжить --"" вы можете нажать любую клавишу для отображения следующего экрана.\n"
-    IDS_CONTINUE " -- Продолжить (100%) -- "
-    IDS_FILE_ACCESS "Нет доступа к файлу %s."
+    IDS_CONTINUE "-- Продолжить --"
+    IDS_CONTINUE_PROGRESS "-- Продолжить (%d%%) --"
+    IDS_FILE_ACCESS "Нет доступа к файлу %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/sk-SK.rc

@@ -14,6 +14,7 @@ BEGIN
   Príkaz\t\t     Príkaz, ktorého výstup má byť zobrazený.\n\n\
   Pri výzve ""-- Pokračujte --"" môžete stlačiť ľubovoľný kláves\n\
   k zobrazeniu nasledujúcej stránky.\n"
-    IDS_CONTINUE " -- Pokračujte (100%) -- "
-    IDS_FILE_ACCESS "Neviem získať prístup k súboru %s."
+    IDS_CONTINUE "-- Pokračujte --"
+    IDS_CONTINUE_PROGRESS "-- Pokračujte (%d%%) --"
+    IDS_FILE_ACCESS "Neviem získať prístup k súboru %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/sq-AL.rc

@@ -13,6 +13,7 @@ BEGIN
   [Drive:][Path]File name    Nje dokument, përmbajtja e të cilit do të shfaqet.\n\
   Komandë\t\t     Nje komande, nxjerrja e te cilit do të shfaqet.\n\n\
   At the prompt ""-- Vazhdo --"" ju mund të shtypni çfarëdo butoni për të vazhduar në faqen tjetër.\n"
-    IDS_CONTINUE " -- Vazhdo (100%) -- "
-    IDS_FILE_ACCESS "Nuk mund të aksesoj dokumentin %s."
+    IDS_CONTINUE "-- Vazhdo --"
+    IDS_CONTINUE_PROGRESS "-- Vazhdo (%d%%) --"
+    IDS_FILE_ACCESS "Nuk mund të aksesoj dokumentin %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/sv-SE.rc

@@ -16,6 +16,7 @@ BEGIN
   [Enhet:][Mapp]Filnamn    En fil, Välj innehåll som skall visas.\n\
   Kommando\t\t     Ett kommando, Välj vad som skall visas.\n\n\
   vid prompten ""-- Fortsätt --"" du kan trycka valfri knapp för att visa nästa sida.\n"
-    IDS_CONTINUE " -- Fortsätt (100%) -- "
-    IDS_FILE_ACCESS "Får inte tillgång till filen %s."
+    IDS_CONTINUE "-- Fortsätt --"
+    IDS_CONTINUE_PROGRESS "-- Fortsätt (%d%%) --"
+    IDS_FILE_ACCESS "Får inte tillgång till filen %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/tr-TR.rc

@@ -11,6 +11,7 @@ BEGIN
   [Sürücü:][Yol]Kütük adı    İçeriği görüntülenecek bir kütük.\n\
   Komut\t\t     Çıkışı görüntülenecek bir komut.\n\n\
   İstemde ""-- Sürdür --"" ile bir sonraki sayfayı göstermek için rastgele bir düğmeye basabilirsiniz.\n"
-    IDS_CONTINUE " -- Sürdür (%100) -- "
-    IDS_FILE_ACCESS "%s kütüğüne erişilemiyor."
+    IDS_CONTINUE "-- Sürdür --"
+    IDS_CONTINUE_PROGRESS "-- Sürdür (%%%d) --"
+    IDS_FILE_ACCESS "%s kütüğüne erişilemiyor.\n"
 END

reactos/base/applications/cmdutils/more/lang/uk-UA.rc

@@ -17,6 +17,7 @@ BEGIN
   [Диск:][Шлях]Ім'я_файлу    Файл, вмiст якого треба вивести на екран.\n\
   Command\t\t     Команда, результат роботи якої треба вивести на екран.\n\n\
   На запрошення ""-- Далi --"" Ви можете натиснути будь-яку клавiшу щоб побачити наступну сторiнку.\n"
-    IDS_CONTINUE " -- Далi (100%) -- "
-    IDS_FILE_ACCESS "Не можу отримати доступ до файла %s."
+    IDS_CONTINUE "-- Далi --"
+    IDS_CONTINUE_PROGRESS "-- Далi (%d%%) --"
+    IDS_FILE_ACCESS "Не можу отримати доступ до файла %s.\n"
 END

reactos/base/applications/cmdutils/more/lang/zh-CN.rc

@@ -11,6 +11,7 @@ BEGIN
   [驱动器:][路径]文件名    一个将要被如此显示内容的文件。\n\
   命令\t\t     一个输出将要被如此显示的命令。\n\n\
   在 ""-- 继续 --"" 的提示出现时你可以按任意键来显示下一页。\n"
-    IDS_CONTINUE " -- 继续 (100%) -- "
-    IDS_FILE_ACCESS "无法访问文件 %s。"
+    IDS_CONTINUE "-- 继续 --"
+    IDS_CONTINUE_PROGRESS "-- 继续 (%d%%) --"
+    IDS_FILE_ACCESS "无法访问文件 %s。\n"
 END

reactos/base/applications/cmdutils/more/lang/zh-TW.rc

@@ -11,6 +11,7 @@ BEGIN
   [磁碟機:][路徑]檔案名    一個將要被如此顯示內容的檔案。\n\
   命令\t\t     一個輸出將要被如此顯示的命令。\n\n\
   在 ""-- 繼續 --"" 的提示出現時你可以按任意鍵來顯示下一頁。\n"
-    IDS_CONTINUE " -- 繼續 (100%) -- "
-    IDS_FILE_ACCESS "無法訪問檔案 %s。"
+    IDS_CONTINUE "-- 繼續 --"
+    IDS_CONTINUE_PROGRESS "-- 繼續 (%d%%) --"
+    IDS_FILE_ACCESS "無法訪問檔案 %s。\n"
 END

reactos/base/applications/cmdutils/more/more.c

@@ -1,3 +1,14 @@
+/*
+ * COPYRIGHT:       See COPYING in the top level directory
+ * PROJECT:         ReactOS More Command
+ * FILE:            base/applications/cmdutils/more/more.c
+ * PURPOSE:         Displays text stream from STDIN or from an arbitrary number
+ *                  of files to STDOUT, with screen capabilities (more than CAT,
+ *                  but less than LESS ^^).
+ * PROGRAMMERS:     Paolo Pantaleo
+ *                  Timothy Schepens
+ *                  Hermes Belusca-Maito (hermes.belusca@sfr.fr)
+ */
 /*
  * MORE.C - external command.
  *
@@ -5,209 +16,616 @@
  *
  * 26 Sep 1999 - Paolo Pantaleo <paolopan@freemail.it>
  *     started
+ *
  * Oct 2003 - Timothy Schepens <tischepe at fastmail dot fm>
  *     use window size instead of buffer size.
  */
 
 #include <stdio.h>
-#include <malloc.h>
-#include <tchar.h>
 
 #include <windef.h>
 #include <winbase.h>
+#include <winnls.h>
 #include <winuser.h>
-#include <wincon.h>
+
+#include <conutils.h>
 
 #include "resource.h"
 
-static TCHAR szCont[128];
-static DWORD szContLength;
-static HINSTANCE hApp;
+/* PagePrompt statistics for the current file */
+DWORD dwFileSize; // In bytes
+DWORD dwSumReadBytes, dwSumReadChars;
+// The average number of bytes per character is equal to
+// dwSumReadBytes / dwSumReadChars. Note that dwSumReadChars
+// will never be == 0 when ConWritePaging (and possibly PagePrompt)
+// is called.
 
-/*handle for file and console*/
-HANDLE hStdIn;
-HANDLE hStdOut;
-HANDLE hStdErr;
+/* Handles for file and console */
+HANDLE hFile = INVALID_HANDLE_VALUE;
+HANDLE hStdIn, hStdOut;
 HANDLE hKeyboard;
 
 
-static VOID
-GetScreenSize (PSHORT maxx, PSHORT maxy)
+static BOOL
+__stdcall
+PagePrompt(PCON_PAGER Pager, DWORD Done, DWORD Total)
 {
-   CONSOLE_SCREEN_BUFFER_INFO csbi;
+    HANDLE hInput = ConStreamGetOSHandle(StdIn);
+    DWORD dwMode;
+    KEY_EVENT_RECORD KeyEvent;
 
-   GetConsoleScreenBufferInfo (hStdOut, &csbi);
-      *maxx = (csbi.srWindow.Right - csbi.srWindow.Left) + 1;
-      *maxy = (csbi.srWindow.Bottom  - csbi.srWindow.Top) - 4;
-
-}
-
-
-static
-VOID ConOutPuts (LPTSTR szText)
-{
-   DWORD dwWritten;
-   
-   WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), szText, _tcslen(szText), &dwWritten, NULL);
-   WriteFile (GetStdHandle (STD_OUTPUT_HANDLE), "\n", 1, &dwWritten, NULL);
-}
-
-
-static VOID
-ConInKey (VOID)
-{
-   INPUT_RECORD ir;
-   DWORD dwRead;
-
-   do
-   {
-      ReadConsoleInput (hKeyboard, &ir, 1, &dwRead);
-      if ((ir.EventType == KEY_EVENT) &&
-         (ir.Event.KeyEvent.bKeyDown == TRUE))
-         return;
-   }
-   while (TRUE);
-}
-
-
-static VOID
-WaitForKey (VOID)
-{
-   DWORD dwWritten;
-
-    WriteFile (hStdErr, szCont , szContLength, &dwWritten, NULL);
-
-   ConInKey();
-
-   WriteFile (hStdErr, _T("\n"), 1, &dwWritten, NULL);
-
-//	FlushConsoleInputBuffer (hConsoleIn);
-}
-
-
-//INT CommandMore (LPTSTR cmd, LPTSTR param)
-int main (int argc, char **argv)
-{
-   SHORT maxx,maxy;
-   SHORT line_count=0,ch_count=0;
-   DWORD i, last;
-   HANDLE hFile = INVALID_HANDLE_VALUE;
-   TCHAR szFullPath[MAX_PATH];
-    TCHAR szMsg[1024];
-   /*reading/writing buffer*/
-   TCHAR *buff;
-
-   /*bytes written by WriteFile and ReadFile*/
-   DWORD dwRead,dwWritten;
-
-   /*ReadFile() return value*/
-   BOOL bRet;
-
-
-   hStdIn = GetStdHandle(STD_INPUT_HANDLE);
-   hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
-   hStdErr = GetStdHandle(STD_ERROR_HANDLE);
-    hApp = GetModuleHandle(NULL);
-
-   buff=malloc(4096);
-   if (!buff)
-   {
-      ConOutPuts(_T("Error: no memory"));
-      return 1;
-   }
-
-   if (argc > 1 && _tcsncmp (argv[1], _T("/?"), 2) == 0)
-   {
-      if (LoadString(hApp, IDS_USAGE, buff, 4096 / sizeof(TCHAR)) < (int)(4096 / sizeof(TCHAR)))
-      {
-         CharToOem(buff, buff);
-         ConOutPuts(buff);
-      }
-
-      free(buff);
-      return 0;
-   }
-
-   hKeyboard = CreateFile (_T("CONIN$"), GENERIC_READ|GENERIC_WRITE,
-                           0,NULL,OPEN_ALWAYS,0,0);
-
-   GetScreenSize(&maxx,&maxy);
-
-
-
-   FlushConsoleInputBuffer (hKeyboard);
-
-   if(argc > 1)
-   {
-      GetFullPathNameA(argv[1], MAX_PATH, szFullPath, NULL);
-      hFile = CreateFile (szFullPath, 
-                            GENERIC_READ,
-                           0,
-                            NULL,
-                            OPEN_EXISTING,
-                            0,
-                            0);
-      if (hFile == INVALID_HANDLE_VALUE)
-      {
-         if (LoadString(hApp, IDS_FILE_ACCESS, szMsg, sizeof(szMsg) / sizeof(TCHAR)) < (int)(sizeof(szMsg) / sizeof(TCHAR)))
-         {
-            _stprintf(buff, szMsg, szFullPath);
-            CharToOem(buff, buff);
-            ConOutPuts(buff);
-         }
-
-         free(buff);
-         return 0;
-      }
-   }
-   else
-   {
-      hFile = hStdIn;
-   }
-
-    if (!LoadString(hApp, IDS_CONTINUE, szCont, sizeof(szCont) / sizeof(TCHAR)))
+    /*
+     * Just use the simple prompt if the file being displayed is the STDIN,
+     * otherwise use the prompt with progress percentage.
+     *
+     * The progress percentage is evaluated as follows.
+     * So far we have read a total of 'dwSumReadBytes' bytes from the file.
+     * Amongst those is the latest read chunk of 'dwReadBytes' bytes, to which
+     * correspond a number of 'dwReadChars' characters with which we have called
+     * ConWritePaging who called PagePrompt. We then have: Total == dwReadChars.
+     * During this ConWritePaging call the PagePrompt was called after 'Done'
+     * number of characters over 'Total'.
+     * It should be noted that for 'dwSumReadBytes' number of bytes read it
+     * *roughly* corresponds 'dwSumReadChars' number of characters. This is
+     * because there may be some failures happening during the conversion of
+     * the bytes read to the character string for a given encoding.
+     * Therefore the number of characters displayed on screen is equal to:
+     *   dwSumReadChars - Total + Done ,
+     * but the best corresponding approximed number of bytes would be:
+     *   dwSumReadBytes - (Total - Done) * (dwSumReadBytes / dwSumReadChars) ,
+     * where the ratio is the average number of bytes per character.
+     * The percentage is then computed relative to the total file size.
+     */
+    if (hFile == hStdIn)
     {
-        /* Shouldn't happen, so exit */
-        free(buff);
+        ConResPuts(Pager->Screen->Stream, IDS_CONTINUE);
+    }
+    else
+    {
+        ConResPrintf(Pager->Screen->Stream, IDS_CONTINUE_PROGRESS,
+                     // (dwSumReadChars - Total + Done) * 100 / dwFileSize
+                     (dwSumReadBytes - (Total - Done) *
+                        (dwSumReadBytes / dwSumReadChars)) * 100 / dwFileSize
+                     );
+    }
+
+    // TODO: Implement prompt read line!
+
+    // FIXME: Does not support TTY yet!
+
+    /* RemoveBreakHandler */
+    SetConsoleCtrlHandler(NULL, TRUE);
+    /* ConInDisable */
+    GetConsoleMode(hInput, &dwMode);
+    dwMode &= ~ENABLE_PROCESSED_INPUT;
+    SetConsoleMode(hInput, dwMode);
+
+    do
+    {
+        // FIXME: Does not support TTY yet!
+
+        // ConInKey(&KeyEvent);
+        INPUT_RECORD ir;
+        DWORD dwRead;
+        do
+        {
+            ReadConsoleInput(hInput, &ir, 1, &dwRead);
+        }
+        while ((ir.EventType != KEY_EVENT) || (!ir.Event.KeyEvent.bKeyDown));
+
+        /* Got our key, return to caller */
+        KeyEvent = ir.Event.KeyEvent;
+    }
+    while ((KeyEvent.wVirtualKeyCode == VK_SHIFT) ||
+           (KeyEvent.wVirtualKeyCode == VK_MENU) ||
+           (KeyEvent.wVirtualKeyCode == VK_CONTROL));
+
+    /* AddBreakHandler */
+    SetConsoleCtrlHandler(NULL, FALSE);
+    /* ConInEnable */
+    GetConsoleMode(hInput, &dwMode);
+    dwMode |= ENABLE_PROCESSED_INPUT;
+    SetConsoleMode(hInput, dwMode);
+
+    /*
+     * Erase the full line where the cursor is, and move
+     * the cursor back to the beginning of the line.
+     */
+    ConClearLine(Pager->Screen->Stream);
+
+    if ((KeyEvent.wVirtualKeyCode == VK_ESCAPE) ||
+        ((KeyEvent.wVirtualKeyCode == L'C') &&
+         (KeyEvent.dwControlKeyState & (LEFT_CTRL_PRESSED | RIGHT_CTRL_PRESSED))))
+    {
+        /* We break, output a newline */
+        WCHAR ch = L'\n';
+        ConStreamWrite(Pager->Screen->Stream, &ch, 1);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+/*
+ * See base/applications/cmdutils/clip/clip.c!IsDataUnicode()
+ * and base/applications/notepad/text.c!ReadText() for more details.
+ * Also some good code example can be found at:
+ * https://github.com/AutoIt/text-encoding-detect
+ */
+typedef enum
+{
+    ENCODING_ANSI    =  0,
+    ENCODING_UTF16LE =  1,
+    ENCODING_UTF16BE =  2,
+    ENCODING_UTF8    =  3
+} ENCODING;
+
+static BOOL
+IsDataUnicode(
+    IN PVOID Buffer,
+    IN DWORD BufferSize,
+    OUT ENCODING* Encoding OPTIONAL,
+    OUT PDWORD SkipBytes OPTIONAL)
+{
+    PBYTE pBytes = Buffer;
+    ENCODING encFile = ENCODING_ANSI;
+    DWORD dwPos = 0;
+
+    /*
+     * See http://archives.miloush.net/michkap/archive/2007/04/22/2239345.html
+     * for more details about the algorithm and the pitfalls behind it.
+     * Of course it would be actually great to make a nice function that
+     * would work, once and for all, and put it into a library.
+     */
+
+    /* Look for Byte Order Marks */
+    if ((BufferSize >= 2) && (pBytes[0] == 0xFF) && (pBytes[1] == 0xFE))
+    {
+        encFile = ENCODING_UTF16LE;
+        dwPos = 2;
+    }
+    else if ((BufferSize >= 2) && (pBytes[0] == 0xFE) && (pBytes[1] == 0xFF))
+    {
+        encFile = ENCODING_UTF16BE;
+        dwPos = 2;
+    }
+    else if ((BufferSize >= 3) && (pBytes[0] == 0xEF) && (pBytes[1] == 0xBB) && (pBytes[2] == 0xBF))
+    {
+        encFile = ENCODING_UTF8;
+        dwPos = 3;
+    }
+    else
+    {
+        /*
+         * Try using statistical analysis. Do not rely on the return value of
+         * IsTextUnicode as we can get FALSE even if the text is in UTF-16 BE
+         * (i.e. we have some of the IS_TEXT_UNICODE_REVERSE_MASK bits set).
+         * Instead, set all the tests we want to perform, then just check
+         * the passed tests and try to deduce the string properties.
+         */
+
+/*
+ * This mask contains the 3 highest bits from IS_TEXT_UNICODE_NOT_ASCII_MASK
+ * and the 1st highest bit from IS_TEXT_UNICODE_NOT_UNICODE_MASK.
+ */
+#define IS_TEXT_UNKNOWN_FLAGS_MASK  ((7 << 13) | (1 << 11))
+
+        /* Flag out the unknown flags here, the passed tests will not have them either */
+        INT Tests = (IS_TEXT_UNICODE_NOT_ASCII_MASK   |
+                     IS_TEXT_UNICODE_NOT_UNICODE_MASK |
+                     IS_TEXT_UNICODE_REVERSE_MASK | IS_TEXT_UNICODE_UNICODE_MASK)
+                        & ~IS_TEXT_UNKNOWN_FLAGS_MASK;
+        INT Results;
+    
+        IsTextUnicode(Buffer, BufferSize, &Tests);
+        Results = Tests;
+
+        /*
+         * As the IS_TEXT_UNICODE_NULL_BYTES or IS_TEXT_UNICODE_ILLEGAL_CHARS
+         * flags are expected to be potentially present in the result without
+         * modifying our expectations, filter them out now.
+         */
+        Results &= ~(IS_TEXT_UNICODE_NULL_BYTES | IS_TEXT_UNICODE_ILLEGAL_CHARS);
+
+        /*
+         * NOTE: The flags IS_TEXT_UNICODE_ASCII16 and
+         * IS_TEXT_UNICODE_REVERSE_ASCII16 are not reliable.
+         *
+         * NOTE2: Check for potential "bush hid the facts" effect by also
+         * checking the original results (in 'Tests') for the absence of
+         * the IS_TEXT_UNICODE_NULL_BYTES flag, as we may presumably expect
+         * that in UTF-16 text there will be at some point some NULL bytes.
+         * If not, fall back to ANSI. This shows the limitations of using the
+         * IsTextUnicode API to perform such tests, and the usage of a more
+         * improved encoding detection algorithm would be really welcome.
+         */
+        if (!(Results & IS_TEXT_UNICODE_NOT_UNICODE_MASK) &&
+            !(Results & IS_TEXT_UNICODE_REVERSE_MASK)     &&
+             (Results & IS_TEXT_UNICODE_UNICODE_MASK)     &&
+             (Tests   & IS_TEXT_UNICODE_NULL_BYTES))
+        {
+            encFile = ENCODING_UTF16LE;
+            dwPos = (Results & IS_TEXT_UNICODE_SIGNATURE) ? 2 : 0;
+        }
+        else
+        if (!(Results & IS_TEXT_UNICODE_NOT_UNICODE_MASK) &&
+            !(Results & IS_TEXT_UNICODE_UNICODE_MASK)     &&
+             (Results & IS_TEXT_UNICODE_REVERSE_MASK)     &&
+             (Tests   & IS_TEXT_UNICODE_NULL_BYTES))
+        {
+            encFile = ENCODING_UTF16BE;
+            dwPos = (Results & IS_TEXT_UNICODE_REVERSE_SIGNATURE) ? 2 : 0;
+        }
+        else
+        {
+            /*
+             * Either 'Results' has neither of those masks set, as it can be
+             * the case for UTF-8 text (or ANSI), or it has both as can be the
+             * case when analysing pure binary data chunk. This is therefore
+             * invalid and we fall back to ANSI encoding.
+             * FIXME: In case of failure, assume ANSI (as long as we do not have
+             * correct tests for UTF8, otherwise we should do them, and at the
+             * very end, assume ANSI).
+             */
+            encFile = ENCODING_ANSI; // ENCODING_UTF8;
+            dwPos = 0;
+        }
+    }
+
+    if (Encoding)
+        *Encoding = encFile;
+    if (SkipBytes)
+        *SkipBytes = dwPos;
+
+    return (encFile != ENCODING_ANSI);
+}
+
+/*
+ * Adapted from base/shell/cmd/misc.c!FileGetString(), but with correct
+ * text encoding support. Also please note that similar code should be
+ * also used in the CMD.EXE 'TYPE' command.
+ * Contrary to CMD's FileGetString() we do not stop at new-lines.
+ *
+ * Read text data from a file and convert it from a given encoding to UTF-16.
+ *
+ *   IN OUT PVOID pCacheBuffer and IN DWORD CacheBufferLength :
+ *     Implementation detail so that the function uses an external user-provided
+ *     buffer to store the data temporarily read from the file. The function
+ *     could have used an internal buffer instead. The length is in number of bytes.
+ *
+ *   IN OUT PWSTR* pBuffer and IN OUT PDWORD pnBufferLength :
+ *     Reallocated buffer containing the string data converted to UTF-16.
+ *     In input, contains a pointer to the original buffer and its length.
+ *     In output, contains a pointer to the reallocated buffer and its length.
+ *     The length is in number of characters.
+ *
+ *     At first call to this function, pBuffer can be set to NULL, in which case
+ *     when the function returns the pointer will point to a valid buffer.
+ *     After the last call to this function, free the pBuffer pointer with:
+ *     HeapFree(GetProcessHeap(), 0, *pBuffer);
+ *
+ *     If Encoding is set to ENCODING_UTF16LE or ENCODING_UTF16BE, since we are
+ *     compiled in UNICODE, no extra conversion is performed and therefore
+ *     pBuffer is unused (remains unallocated) and one can directly use the
+ *     contents of pCacheBuffer as it is expected to contain valid UTF-16 text.
+ *
+ *   OUT PDWORD pdwReadBytes : Number of bytes read from the file (optional).
+ *   OUT PDWORD pdwReadChars : Corresponding number of characters read (optional).
+ */
+static BOOL
+FileGetString(
+    IN HANDLE hFile,
+    IN ENCODING Encoding,
+    IN OUT PVOID pCacheBuffer,
+    IN DWORD CacheBufferLength,
+    IN OUT PWCHAR* pBuffer,
+    IN OUT PDWORD pnBufferLength,
+    OUT PDWORD pdwReadBytes OPTIONAL,
+    OUT PDWORD pdwReadChars OPTIONAL)
+{
+    BOOL Success;
+    UINT CodePage = (UINT)-1;
+    DWORD dwReadBytes;
+    INT len;
+
+    // ASSERT(pCacheBuffer && (CacheBufferLength > 0));
+    // ASSERT(CacheBufferLength % 2 == 0); // Cache buffer length MUST BE even!
+    // ASSERT(pBuffer && pnBufferLength);
+
+    /* Always reset the retrieved number of bytes/characters */
+    if (pdwReadBytes) *pdwReadBytes = 0;
+    if (pdwReadChars) *pdwReadChars = 0;
+
+    Success = ReadFile(hFile, pCacheBuffer, CacheBufferLength, &dwReadBytes, NULL);
+    if (!Success || dwReadBytes == 0)
+        return FALSE;
+
+    if (pdwReadBytes) *pdwReadBytes = dwReadBytes;
+
+    if ((Encoding == ENCODING_ANSI) || (Encoding == ENCODING_UTF8))
+    {
+        /* Conversion is needed */
+
+        if (Encoding == ENCODING_ANSI)
+            CodePage = GetConsoleCP(); // CP_ACP; // FIXME: Cache GetConsoleCP() value.
+        else // if (Encoding == ENCODING_UTF8)
+            CodePage = CP_UTF8;
+
+        /* Retrieve the needed buffer size */
+        len = MultiByteToWideChar(CodePage, 0, pCacheBuffer, dwReadBytes,
+                                  NULL, 0);
+        if (len == 0)
+        {
+            /* Failure, bail out */
+            return FALSE;
+        }
+
+        /* Initialize the conversion buffer if needed... */
+        if (*pBuffer == NULL)
+        {
+            *pnBufferLength = len;
+            *pBuffer = HeapAlloc(GetProcessHeap(), 0, *pnBufferLength * sizeof(WCHAR));
+            if (*pBuffer == NULL)
+            {
+                // *pBuffer = NULL;
+                *pnBufferLength = 0;
+                // WARN("DEBUG: Cannot allocate memory for *pBuffer!\n");
+                // ConErrFormatMessage(GetLastError());
+                return FALSE;
+            }
+        }
+        /* ... or reallocate only if the new length is greater than the old one */
+        else if (len > *pnBufferLength)
+        {
+            PWSTR OldBuffer = *pBuffer;
+
+            *pnBufferLength = len;
+            *pBuffer = HeapReAlloc(GetProcessHeap(), 0, *pBuffer, *pnBufferLength * sizeof(WCHAR));
+            if (*pBuffer == NULL)
+            {
+                /* Do not leak old buffer */
+                HeapFree(GetProcessHeap(), 0, OldBuffer);
+                // *pBuffer = NULL;
+                *pnBufferLength = 0;
+                // WARN("DEBUG: Cannot reallocate memory for *pBuffer!\n");
+                // ConErrFormatMessage(GetLastError());
+                return FALSE;
+            }
+        }
+
+        /* Now perform the conversion proper */
+        len = MultiByteToWideChar(CodePage, 0, pCacheBuffer, dwReadBytes,
+                                  *pBuffer, len);
+        dwReadBytes = len;
+    }
+    else
+    {
+        /*
+         * No conversion needed, just convert from big to little endian if needed.
+         * pBuffer and pnBufferLength are left untouched and pCacheBuffer can be
+         * directly used.
+         */
+        PWCHAR pWChars = pCacheBuffer;
+        DWORD i;
+
+        dwReadBytes /= sizeof(WCHAR);
+
+        if (Encoding == ENCODING_UTF16BE)
+        {
+            for (i = 0; i < dwReadBytes; i++)
+            {
+                /* Equivalent to RtlUshortByteSwap: reverse high/low bytes */
+                pWChars[i] = MAKEWORD(HIBYTE(pWChars[i]), LOBYTE(pWChars[i]));
+            }
+        }
+        // else if (Encoding == ENCODING_UTF16LE), we are good, nothing to do.
+    }
+
+    /* Return the number of characters (dwReadBytes is converted) */
+    if (pdwReadChars) *pdwReadChars = dwReadBytes;
+
+    return TRUE;
+}
+
+// INT CommandMore(LPTSTR cmd, LPTSTR param)
+int wmain(int argc, WCHAR* argv[])
+{
+    // FIXME this stuff!
+    CON_SCREEN Screen = {StdOut};
+    CON_PAGER Pager = {&Screen, 0};
+
+    int i;
+
+    BOOL bRet, bContinue;
+
+    ENCODING Encoding;
+    DWORD SkipBytes = 0;
+
+#define FileCacheBufferSize 4096
+    PVOID FileCacheBuffer = NULL;
+    PWCHAR StringBuffer = NULL;
+    DWORD StringBufferLength = 0;
+    DWORD dwReadBytes, dwReadChars;
+
+    TCHAR szFullPath[MAX_PATH];
+
+    hStdIn = GetStdHandle(STD_INPUT_HANDLE);
+    hStdOut = GetStdHandle(STD_OUTPUT_HANDLE);
+
+    /* Initialize the Console Standard Streams */
+    ConStreamInit(StdIn , GetStdHandle(STD_INPUT_HANDLE) , UTF8Text, INVALID_CP);
+    ConStreamInit(StdOut, GetStdHandle(STD_OUTPUT_HANDLE), UTF8Text, INVALID_CP);
+    ConStreamInit(StdErr, GetStdHandle(STD_ERROR_HANDLE) , UTF8Text, INVALID_CP);
+
+    /*
+     * Bad usage (too much options) or we use the /? switch.
+     * Display help for the MORE command.
+     */
+    if (argc > 1 && wcscmp(argv[1], L"/?") == 0)
+    {
+        ConResPuts(StdOut, IDS_USAGE);
+        return 0;
+    }
+
+    // FIXME: Parse all the remaining parameters.
+    // Then the file list can be found at the very end.
+    // FIXME2: Use the PARSER api that can be found in EVENTCREATE.
+
+    // NOTE: We might try to duplicate the ConOut for read access... ?
+    hKeyboard = CreateFileW(L"CONIN$", GENERIC_READ|GENERIC_WRITE,
+                            FILE_SHARE_READ|FILE_SHARE_WRITE, NULL,
+                            OPEN_EXISTING, 0, NULL);
+    FlushConsoleInputBuffer(hKeyboard);
+    ConStreamSetOSHandle(StdIn, hKeyboard);
+
+
+    FileCacheBuffer = HeapAlloc(GetProcessHeap(), 0, FileCacheBufferSize);
+    if (!FileCacheBuffer)
+    {
+        ConPuts(StdErr, L"Error: no memory\n");
+        CloseHandle(hKeyboard);
         return 1;
     }
-    szContLength = _tcslen(szCont);
 
+    /* Special case where we run 'MORE' without any argument: we use STDIN */
+    if (argc <= 1)
+    {
+        /*
+         * Assign STDIN handle to hFile so that the page prompt function will
+         * know the data comes from STDIN, and will take different actions.
+         */
+        hFile = hStdIn;
 
+        /* Update the statistics for PagePrompt */
+        dwFileSize = 0;
+        dwSumReadBytes = dwSumReadChars = 0;
 
-   do
-   {
-      bRet = ReadFile(hFile,buff,4096,&dwRead,NULL);
+        /* We suppose we read text from the file */
 
-      for(last=i=0;i<dwRead && bRet;i++)
-      {
-         ch_count++;
-         if(buff[i] == _T('\n') || ch_count == maxx)
-         {
-            ch_count=0;
-            line_count++;
-            if (line_count == maxy)
+        /* For STDIN we always suppose we are in ANSI mode */
+        // SetFilePointer(hFile, 0, NULL, FILE_BEGIN);
+        Encoding = ENCODING_ANSI; // ENCODING_UTF8;
+
+        bContinue = ConPutsPaging(&Pager, PagePrompt, TRUE, L"");
+        if (!bContinue)
+            goto Quit;
+
+        do
+        {
+            bRet = FileGetString(hFile, Encoding,
+                                 FileCacheBuffer, FileCacheBufferSize,
+                                 &StringBuffer, &StringBufferLength,
+                                 &dwReadBytes, &dwReadChars);
+            if (!bRet || dwReadBytes == 0 || dwReadChars == 0)
             {
-               line_count = 0;
-               WriteFile(hStdOut,&buff[last], i-last+1, &dwWritten, NULL);
-               last=i+1;
-               FlushFileBuffers (hStdOut);
-               WaitForKey ();
+                /* We failed at reading the file, bail out */
+                break;
             }
-         }
-      }
-      if (last<dwRead && bRet)
-         WriteFile(hStdOut,&buff[last], dwRead-last, &dwWritten, NULL);
 
-   }
-   while(dwRead>0 && bRet);
+            /* Update the statistics for PagePrompt */
+            dwSumReadBytes += dwReadBytes;
+            dwSumReadChars += dwReadChars;
 
-   free (buff);
-   CloseHandle (hKeyboard);
-   if (hFile != hStdIn)
-      CloseHandle (hFile);
+            bContinue = ConWritePaging(&Pager, PagePrompt, FALSE,
+                                       StringBuffer, dwReadChars);
+            /* If we Ctrl-C/Ctrl-Break, stop everything */
+            if (!bContinue)
+                goto Quit;
+        }
+        while (bRet && dwReadBytes > 0);
+        goto Quit;
+    }
 
-   return 0;
+    /* We have files: read them and output them to STDOUT */
+    for (i = 1; i < argc; i++)
+    {
+        GetFullPathNameW(argv[i], ARRAYSIZE(szFullPath), szFullPath, NULL);
+        hFile = CreateFileW(szFullPath, 
+                            GENERIC_READ,
+                            FILE_SHARE_READ,
+                            NULL,
+                            OPEN_EXISTING,
+                            0, // FILE_ATTRIBUTE_NORMAL,
+                            NULL);
+        if (hFile == INVALID_HANDLE_VALUE)
+        {
+            ConResPrintf(StdErr, IDS_FILE_ACCESS, szFullPath);
+            continue;
+        }
+
+        /* We currently do not support files too big */
+        dwFileSize = GetFileSize(hFile, NULL);
+        if (dwFileSize == INVALID_FILE_SIZE)
+        {
+            ConPuts(StdErr, L"ERROR: Invalid file size!\n");
+            CloseHandle(hFile);
+            continue;
+        }
+
+        /* We suppose we read text from the file */
+
+        /* Check whether the file is UNICODE and retrieve its encoding */
+        SetFilePointer(hFile, 0, NULL, FILE_BEGIN);
+        bRet = ReadFile(hFile, FileCacheBuffer, FileCacheBufferSize, &dwReadBytes, NULL);
+        IsDataUnicode(FileCacheBuffer, dwReadBytes, &Encoding, &SkipBytes);
+        SetFilePointer(hFile, SkipBytes, NULL, FILE_BEGIN);
+
+        /* Update the statistics for PagePrompt */
+        dwSumReadBytes = dwSumReadChars = 0;
+
+        bContinue = ConPutsPaging(&Pager, PagePrompt, TRUE, L"");
+        if (!bContinue)
+        {
+            CloseHandle(hFile);
+            goto Quit;
+        }
+
+        do
+        {
+            bRet = FileGetString(hFile, Encoding,
+                                 FileCacheBuffer, FileCacheBufferSize,
+                                 &StringBuffer, &StringBufferLength,
+                                 &dwReadBytes, &dwReadChars);
+            if (!bRet || dwReadBytes == 0 || dwReadChars == 0)
+            {
+                /*
+                 * We failed at reading the file, bail out and
+                 * continue with the other files.
+                 */
+                break;
+            }
+
+            /* Update the statistics for PagePrompt */
+            dwSumReadBytes += dwReadBytes;
+            dwSumReadChars += dwReadChars;
+
+            if ((Encoding == ENCODING_UTF16LE) || (Encoding == ENCODING_UTF16BE))
+            {
+                bContinue = ConWritePaging(&Pager, PagePrompt, FALSE,
+                                           FileCacheBuffer, dwReadChars);
+            }
+            else
+            {
+                bContinue = ConWritePaging(&Pager, PagePrompt, FALSE,
+                                           StringBuffer, dwReadChars);
+            }
+            /* If we Ctrl-C/Ctrl-Break, stop everything */
+            if (!bContinue)
+            {
+                CloseHandle(hFile);
+                goto Quit;
+            }
+        }
+        while (bRet && dwReadBytes > 0);
+
+        CloseHandle(hFile);
+    }
+
+Quit:
+    if (StringBuffer) HeapFree(GetProcessHeap(), 0, StringBuffer);
+    HeapFree(GetProcessHeap(), 0, FileCacheBuffer);
+    CloseHandle(hKeyboard);
+    return 0;
 }
 
 /* EOF */

reactos/base/applications/cmdutils/more/more.rc

@@ -2,13 +2,16 @@
 
 #include "resource.h"
 
-#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS More Command"
-#define REACTOS_STR_INTERNAL_NAME     "more"
-#define REACTOS_STR_ORIGINAL_FILENAME "more.com"
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION    "ReactOS More Command"
+#define REACTOS_STR_INTERNAL_NAME       "more"
+#define REACTOS_STR_ORIGINAL_FILENAME   "more.com"
 #include <reactos/version.rc>
 
 /* UTF-8 */
 #pragma code_page(65001)
+
 #ifdef LANGUAGE_BG_BG
     #include "lang/bg-BG.rc"
 #endif
@@ -71,4 +74,4 @@
 #endif
 #ifdef LANGUAGE_ZH_TW
     #include "lang/zh-TW.rc"
-#endif
+#endif

reactos/base/applications/cmdutils/more/resource.h

@@ -2,4 +2,5 @@
 
 #define IDS_USAGE       100
 #define IDS_CONTINUE    101
-#define IDS_FILE_ACCESS 102
+#define IDS_CONTINUE_PROGRESS   102
+#define IDS_FILE_ACCESS 103

reactos/base/applications/cmdutils/reg/lang/ro-RO.rc

@@ -15,7 +15,7 @@ STRINGTABLE
     STRING_SUCCESS, "Operația a fost îndeplinită cu succes\n"
     STRING_INVALID_KEY, "Eroare: Nume de cheie nevalid\n"
     STRING_INVALID_CMDLINE, "Eroare: Parametri nevalizi pentru linia de comandă\n"
-    STRING_NO_REMOTE, "Eroare: Nu se pot adăuga chei pe calculatorul de la distanță\n"
+    STRING_NO_REMOTE, "Eroare: Nu pot fi adăugate chei într-un calculator la distanță\n"
     STRING_CANNOT_FIND, "Eroare: Sistemul nu a putut găsi cheia sau valoarea de registru specificată\n"
     STRING_UNSUPPORTED_TYPE, "Eroare: Tip nerecunoscut\n"
     STRING_MISSING_INTEGER, "reg: Opțiunea [/d] trebuie să fie urmată de un număr valid întreg\n"
@@ -31,12 +31,12 @@ STRINGTABLE
     STRING_DELETE_VALUEALL, "Sigur doriți ștergerea tuturor valorilor de registru din «%1»?"
     STRING_DELETE_SUBKEY, "Sigur doriți ștergerea cheii de registru «%1»?"
     STRING_INVALID_STRING, "reg: Opțiunea [/d] trebuie urmată de un șir valid\n"
-    STRING_VALUEALL_FAILED, "reg: Nu se pot șterge toate valorile de registru din «%1». A survenit o eroare neașteptată.\n"
-    STRING_GENERAL_FAILURE, "reg: Nu se poate completa operația specificată. A survenit o eroare neașteptată.\n"
+    STRING_VALUEALL_FAILED, "reg: Nu au putut fi șterse toate valorile de registru din «%1». A survenit o eroare neașteptată.\n"
+    STRING_GENERAL_FAILURE, "reg: Operația specificată nu a putut fi efectuată. A survenit o eroare neașteptată.\n"
     STRING_MATCHES_FOUND, "Căutare efectuată. Numărul de potriviri găsite: %1!d!\n"
     STRING_INVALID_SYNTAX, "reg: Sintaxă nerespectată. "
     STRING_INVALID_OPTION, "reg: Opțiune nevalidă [%1]. "
     STRING_REG_HELP, "Tastați «REG /?» pentru mai multe informații.\n"
     STRING_FUNC_HELP, "Tastați «REG %1 /?» pentru mai multe informații.\n"
-    STRING_VALUE_NOT_SET, "(value not set)"
+    STRING_VALUE_NOT_SET, "(valoare nealocată)"
 }

reactos/base/applications/cmdutils/reg/lang/ru-RU.rc

@@ -14,7 +14,7 @@ STRINGTABLE
     STRING_UNSUPPORTED_TYPE, "Ошибка: Неподдерживаемый тип\n"
     STRING_MISSING_INTEGER, "Ошибка: Задайте допустимое целочисленное значение параметра [/d]\n"
     STRING_MISSING_HEXDATA, "Ошибка: Задайте допустимое шестнадцатеричное значение параметра [/d]\n"
-    STRING_UNHANDLED_TYPE, "reg: Unhandled registry data type [/t 0x%1!x!, /d %2]\n"
+    STRING_UNHANDLED_TYPE, "reg: Неизвестный тип данных реестра [/t 0x%1!x!, /d %2]\n"
     STRING_OVERWRITE_VALUE, "Параметр '%1' уже существует. Заменить?"
     STRING_YESNO, "(Y-да/N-нет)"
     STRING_YES, "Y"
@@ -24,9 +24,9 @@ STRINGTABLE
     STRING_DELETE_VALUE, "Удалить раздел реестра '%1' без возможности восстановления?"
     STRING_DELETE_VALUEALL, "Удалить все параметры из раздела реестра '%1'?"
     STRING_DELETE_SUBKEY, "Удалить параметр реестра '%1' без возможности восстановления?"
-    STRING_INVALID_STRING, "reg: The option [/d] must be followed by a valid string\n"
-    STRING_VALUEALL_FAILED, "reg: Unable to delete all registry values in '%1'. An unexpected error occurred.\n"
-    STRING_GENERAL_FAILURE, "reg: Unable to complete the specified operation. An unexpected error occurred.\n"
+    STRING_INVALID_STRING, "reg: Опция [/d] должна сопровождаться допустимой строкой\n"
+    STRING_VALUEALL_FAILED, "reg: Невозможно удалить все значения реестра в '%1'. Произошла непредвиденная ошибка.\n"
+    STRING_GENERAL_FAILURE, "reg: Не удалось выполнить указанную операцию. Произошла непредвиденная ошибка.\n"
     STRING_MATCHES_FOUND, "Поиск завершен. Количество совпадений: %1!d!\n"
     STRING_INVALID_SYNTAX, "Ошибка: Неверный синтаксис. "
     STRING_INVALID_OPTION, "Ошибка: Недопустимый аргумент или параметр [%1]. "

reactos/base/applications/cmdutils/reg/lang/tr-TR.rc

@@ -34,5 +34,5 @@ STRINGTABLE
     STRING_INVALID_OPTION, "reg: Geçersiz seçenek [%1]. "
     STRING_REG_HELP, "Yardım için ""REG /?"" yazınız.\n"
     STRING_FUNC_HELP, "Yardım için ""REG %1 /?"" yazınız.\n"
-    STRING_VALUE_NOT_SET, "(value not set)"
+    STRING_VALUE_NOT_SET, "(Değer belirlenmemiş.)"
 }

reactos/base/applications/cmdutils/taskkill/lang/ro-RO.rc

@@ -14,8 +14,8 @@ STRINGTABLE
     STRING_CLOSE_PROC_SRCH, "Către fereastra procesului «%1» cu PID %2!u! a fost emis un mesaj de închidere.\n"
     STRING_TERM_PID_SEARCH, "Procesul cu PID %1!u! a fost oprit în mod forțat.\n"
     STRING_TERM_PROC_SEARCH, "Procesul «%1» cu PID %2!u! a fost oprit în mod forțat.\n"
-    STRING_SEARCH_FAILED, "Eroare: Nu se poate găsi procesul «%1».\n"
-    STRING_ENUM_FAILED, "Eroare: Nu se poate enumera lista de procese.\n"
+    STRING_SEARCH_FAILED, "Eroare: Procesul «%1» nu poate fi găsit.\n"
+    STRING_ENUM_FAILED, "Eroare: Procesele nu au putut fi enumerate.\n"
     STRING_TERMINATE_FAILED, "Eroare: Procesul «%1» nu poate fi oprit.\n"
     STRING_SELF_TERMINATION, "Eroare: Auto-terminarea nu este permisă.\n"
 }

reactos/base/applications/cmdutils/tree/CMakeLists.txt

@@ -1,6 +1,9 @@
 
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
 add_executable(tree tree.c tree.rc)
 set_module_type(tree win32cui UNICODE)
+target_link_libraries(tree conutils ${PSEH_LIB})
+add_importlibs(tree msvcrt kernel32)
 set_target_properties(tree PROPERTIES SUFFIX ".com")
-add_importlibs(tree user32 msvcrt kernel32)
 add_cd_file(TARGET tree DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/tree/tree.c

@@ -1,45 +1,30 @@
-/*
+/*
  * PROJECT:     ReactOS
  * LICENSE:     GNU GPLv2 only as published by the Free Software Foundation
- * PURPOSE:     Implements tree.com functionality similar to Windows
+ * PURPOSE:     Implements tree.com command similar to Windows
  * PROGRAMMERS: Asif Bahrainwala (asif_bahrainwala@hotmail.com)
  */
 
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <windef.h>
 #include <winbase.h>
-#include <winuser.h>
+
+#include <conutils.h>
 
 #include "resource.h"
 
 #define STR_MAX 2048
 
-static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine);
+static VOID GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine);
 
-/* if this flag is set to true, files will also be listed */
+/* If this flag is set to true, files will also be listed within the folder structure */
 BOOL bShowFiles = FALSE;
 
-/* if this flag is true, ASCII characters will be used instead of UNICODE ones */
+/* If this flag is true, ASCII characters will be used instead of UNICODE ones */
 BOOL bUseAscii = FALSE;
 
-/*
- * This takes strings from a resource string table
- * and outputs it to the console.
- */
-VOID PrintResourceString(INT resID, ...)
-{
-    WCHAR tmpBuffer[STR_MAX];
-    CHAR tmpBufferA[STR_MAX];
-    va_list arg_ptr;
-
-    va_start(arg_ptr, resID);
-    LoadStringW(GetModuleHandle(NULL), resID, tmpBuffer, STR_MAX);
-    CharToOemW(tmpBuffer, tmpBufferA);
-    vfprintf(stdout, tmpBufferA, arg_ptr);
-    va_end(arg_ptr);
-}
-
 /**
 * @name: HasSubFolder
 *
@@ -47,20 +32,20 @@ VOID PrintResourceString(INT resID, ...)
 * Must specify folder name
 *
 * @return
-* true if folder has sub folders, else will return false
+* true if folder has sub-folders, else will return false
 */
-static BOOL HasSubFolder(const wchar_t *strPath1)
+static BOOL HasSubFolder(PCWSTR strPath1)
 {
     BOOL ret = FALSE;
-    WIN32_FIND_DATA FindFileData;
+    WIN32_FIND_DATAW FindFileData;
     HANDLE hFind = NULL;
-    static wchar_t strPath[STR_MAX] = L"";
+    static WCHAR strPath[STR_MAX] = L"";
     ZeroMemory(strPath, sizeof(strPath));
 
     wcscat(strPath, strPath1);
     wcscat(strPath, L"\\*.");
 
-    hFind = FindFirstFile(strPath, &FindFileData);
+    hFind = FindFirstFileW(strPath, &FindFileData);
     do
     {
         if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
@@ -71,11 +56,11 @@ static BOOL HasSubFolder(const wchar_t *strPath1)
                 continue;
             }
 
-            ret = TRUE;  //found subfolder
+            ret = TRUE;  // Sub-folder found
             break;
         }
     }
-    while (FindNextFile(hFind, &FindFileData));
+    while (FindNextFileW(hFind, &FindFileData));
 
     FindClose(hFind);
     return ret;
@@ -100,22 +85,22 @@ static BOOL HasSubFolder(const wchar_t *strPath1)
  * @return
  * void
  */
-static void DrawTree(const wchar_t* strPath,
-                     const WIN32_FIND_DATA *arrFolder,
+static VOID DrawTree(PCWSTR strPath,
+                     const WIN32_FIND_DATAW* arrFolder,
                      const size_t szArr,
                      UINT width,
-                     const wchar_t *prevLine,
+                     PCWSTR prevLine,
                      BOOL drawfolder)
 {
     BOOL bHasSubFolder = HasSubFolder(strPath);
     UINT i = 0;
 
-    /* this will format the spaces required for correct formatting */
+    /* This will format the spaces required for correct formatting */
     for (i = 0; i < szArr; ++i)
     {
-        wchar_t *consoleOut = (wchar_t*)malloc(sizeof(wchar_t) * STR_MAX);
+        PWSTR consoleOut = (PWSTR)malloc(STR_MAX * sizeof(WCHAR));
         UINT j = 0;
-        static wchar_t str[STR_MAX];
+        static WCHAR str[STR_MAX];
 
         /* As we do not seem to have the _s functions properly set up, use the non-secure version for now */
         //wcscpy_s(consoleOut, STR_MAX, L"");
@@ -125,15 +110,14 @@ static void DrawTree(const wchar_t* strPath,
 
         for (j = 0; j < width - 1; ++j)
         {
-            /* if the previous line has '├' or '│' then the current line will
+            /* If the previous line has '├' or '│' then the current line will
                add '│' to continue the connecting line */
-            if ((BYTE)prevLine[j] == 195 || (BYTE)prevLine[j] == 179 ||
-                (BYTE)prevLine[j] == L'+' || (BYTE)prevLine[j] == L'|')
+            if (prevLine[j] == L'\x251C' || prevLine[j] == L'\x2502' ||
+                prevLine[j] == L'+' || prevLine[j] == L'|')
             {
                 if (!bUseAscii)
                 {
-                    wchar_t a[] = {179, 0};
-                    wcscat(consoleOut, a);
+                    wcscat(consoleOut, L"\x2502");
                 }
                 else
                 {
@@ -150,27 +134,27 @@ static void DrawTree(const wchar_t* strPath,
         {
             if (drawfolder)
             {
-                /* will add '├───Folder name */
+                /* Add '├───Folder name' (\xC3\xC4\xC4\xC4 or \x251C\x2500\x2500\x2500) */
                 if (bUseAscii)
-                    wsprintf(str, L"+---%s", (wchar_t*)arrFolder[i].cFileName);
+                    swprintf(str, L"+---%s", arrFolder[i].cFileName);
                 else
-                    wsprintf(str, L"%c%c%c%c%s", 195, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName);
+                    swprintf(str, L"\x251C\x2500\x2500\x2500%s", arrFolder[i].cFileName);
             }
             else
             {
                 if (bHasSubFolder)
                 {
-                    /* will add '│   FileNamw'  //thie line is added to connect
-                       the belowfolder sub structure */
+                    /* Add '│   FileName' (\xB3 or \x2502) */
+                    // This line is added to connect the below-folder sub-structure
                     if (bUseAscii)
-                        wsprintf(str,L"|   %s", (wchar_t*)arrFolder[i].cFileName);
+                        swprintf(str, L"|   %s", arrFolder[i].cFileName);
                     else
-                        wsprintf(str,L"%c   %s", 179, (wchar_t*)arrFolder[i].cFileName);
+                        swprintf(str, L"\x2502   %s", arrFolder[i].cFileName);
                 }
                 else
                 {
-                    /* will add '    FileNamw' */
-                    wsprintf(str,L"     %s", (wchar_t*)arrFolder[i].cFileName);
+                    /* Add '    FileName' */
+                    swprintf(str, L"    %s", arrFolder[i].cFileName);
                 }
             }
         }
@@ -178,44 +162,44 @@ static void DrawTree(const wchar_t* strPath,
         {
             if (drawfolder)
             {
-                /* '└───Folder name' */
+                /* '└───Folder name' (\xC0\xC4\xC4\xC4 or \x2514\x2500\x2500\x2500) */
                 if (bUseAscii)
-                    wsprintf(str, L"\\---%s", (wchar_t*)arrFolder[i].cFileName);
+                    swprintf(str, L"\\---%s", arrFolder[i].cFileName);
                 else
-                    wsprintf(str, L"%c%c%c%c%s", 192, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName);
+                    swprintf(str, L"\x2514\x2500\x2500\x2500%s", arrFolder[i].cFileName);
             }
             else
             {
                 if (bHasSubFolder)
                 {
-                    /* '│   FileName' */
+                    /* '│   FileName' (\xB3 or \x2502) */
                     if (bUseAscii)
-                        wsprintf(str, L"|   %s", (wchar_t*)arrFolder[i].cFileName);
+                        swprintf(str, L"|   %s", arrFolder[i].cFileName);
                     else
-                        wsprintf(str, L"%c   %s", 179, (wchar_t*)arrFolder[i].cFileName);
+                        swprintf(str, L"\x2502   %s", arrFolder[i].cFileName);
                 }
                 else
                 {
                     /* '    FileName' */
-                    wsprintf(str, L"     %s", (wchar_t*)arrFolder[i].cFileName);
+                    swprintf(str, L"    %s", arrFolder[i].cFileName);
                 }
             }
         }
 
         wcscat(consoleOut, str);
-        wprintf(L"%s\n", consoleOut);
+        ConPrintf(StdOut, L"%s\n", consoleOut);
 
         if (drawfolder)
         {
-          wchar_t *str = (wchar_t*)malloc(STR_MAX * sizeof(wchar_t));
-          ZeroMemory(str, STR_MAX * sizeof(wchar_t));
+            PWSTR str = (PWSTR)malloc(STR_MAX * sizeof(WCHAR));
+            ZeroMemory(str, STR_MAX * sizeof(WCHAR));
 
-          wcscat(str, strPath);
-          wcscat(str, L"\\");
-          wcscat(str, arrFolder[i].cFileName);
-          GetDirectoryStructure(str, width + 4, consoleOut);
+            wcscat(str, strPath);
+            wcscat(str, L"\\");
+            wcscat(str, arrFolder[i].cFileName);
+            GetDirectoryStructure(str, width + 4, consoleOut);
 
-          free(str);
+            free(str);
         }
         free(consoleOut);
     }
@@ -235,27 +219,27 @@ static void DrawTree(const wchar_t* strPath,
  * @return
  * void
  */
-static void
-GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine)
+static VOID
+GetDirectoryStructure(PWSTR strPath, UINT width, PCWSTR prevLine)
 {
-    WIN32_FIND_DATA FindFileData;
+    WIN32_FIND_DATAW FindFileData;
     HANDLE hFind = NULL;
     //DWORD err = 0;
-    /* will fill up with names of all sub folders */
-    WIN32_FIND_DATA *arrFolder = NULL;
+    /* Fill up with names of all sub-folders */
+    WIN32_FIND_DATAW *arrFolder = NULL;
     UINT arrFoldersz = 0;
-    /* will fill up with names of all sub folders */
-    WIN32_FIND_DATA *arrFile = NULL;
+    /* Fill up with names of all sub-folders */
+    WIN32_FIND_DATAW *arrFile = NULL;
     UINT arrFilesz = 0;
 
     ZeroMemory(&FindFileData, sizeof(FindFileData));
 
     {
-        static wchar_t tmp[STR_MAX] = L"";
+        static WCHAR tmp[STR_MAX] = L"";
         ZeroMemory(tmp, sizeof(tmp));
         wcscat(tmp, strPath);
         wcscat(tmp, L"\\*.*");
-        hFind = FindFirstFile(tmp, &FindFileData);
+        hFind = FindFirstFileW(tmp, &FindFileData);
         //err = GetLastError(); 
     }
 
@@ -271,7 +255,7 @@ GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine)
                 continue;
 
             ++arrFoldersz;
-            arrFolder = (WIN32_FIND_DATA*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData));
+            arrFolder = (WIN32_FIND_DATAW*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData));
 
             if (arrFolder == NULL)
                 exit(-1);
@@ -282,7 +266,7 @@ GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine)
         else
         {
             ++arrFilesz;
-            arrFile = (WIN32_FIND_DATA*)realloc(arrFile, arrFilesz * sizeof(FindFileData));
+            arrFile = (WIN32_FIND_DATAW*)realloc(arrFile, arrFilesz * sizeof(FindFileData));
 
             if(arrFile == NULL)
                 exit(-1);
@@ -290,17 +274,17 @@ GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine)
             arrFile[arrFilesz - 1] = FindFileData;
         }
     }
-    while (FindNextFile(hFind, &FindFileData));
+    while (FindNextFileW(hFind, &FindFileData));
 
     FindClose(hFind);
 
     if (bShowFiles)
     {
-        /* will free(arrFile) */
+        /* Will free(arrFile) */
         DrawTree(strPath, arrFile, arrFilesz, width, prevLine, FALSE);
     }
 
-    /* will free(arrFile) */
+    /* Will free(arrFile) */
     DrawTree(strPath, arrFolder, arrFoldersz, width, prevLine, TRUE);
 
     free(arrFolder);
@@ -314,18 +298,21 @@ GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine)
 * @return
 * error /success value
 */
-int wmain( int argc, wchar_t *argv[])
+int wmain(int argc, WCHAR* argv[])
 {
     DWORD dwSerial = 0;
-    wchar_t t = 0;
-    wchar_t *strPath = NULL;
+    WCHAR t = 0;
+    PWSTR strPath = NULL;
     DWORD sz = 0;
-    //wchar_t *context = NULL;
-    wchar_t *driveLetter = NULL;
+    //PWSTR context = NULL;
+    PWSTR driveLetter = NULL;
 
     int i;
 
-    /* parse the command line */
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
+    /* Parse the command line */
     for (i = 1; i < argc; ++i)
     {
         if (argv[i][0] == L'-' || argv[i][0] == L'/')
@@ -333,49 +320,51 @@ int wmain( int argc, wchar_t *argv[])
             switch (towlower(argv[i][1]))
             {
                 case L'?':
-                    /* will print help and exit after */
-                    PrintResourceString(IDS_USAGE);
+                    /* Print help and exit after */
+                    ConResPuts(StdOut, IDS_USAGE);
                     return 0;
+
                 case L'f':
-                    /* if set to true, will populate all the files within the folder structure */
                     bShowFiles = TRUE;
                     break;
+
                 case L'a':
                     bUseAscii = TRUE;
                     break;
+
                 default:
                     break;
             }
         }
         else
         {
-            /* this must be path to some folder */
+            /* This must be path to some folder */
 
-            /* will set the current directory for this executable */
+            /* Set the current directory for this executable */
             BOOL b = SetCurrentDirectoryW(argv[i]);
             if (b == FALSE)
             {
-                PrintResourceString(IDS_NO_SUBDIRECTORIES);
+                ConResPuts(StdOut, IDS_NO_SUBDIRECTORIES);
                 return 1;
             }
         }
     }
 
-    PrintResourceString(IDS_FOLDER_PATH);
+    ConResPuts(StdOut, IDS_FOLDER_PATH);
 
-    GetVolumeInformation(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0);
-    PrintResourceString(IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff);
+    GetVolumeInformationW(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0);
+    ConResPrintf(StdOut, IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff);
 
     /* get the buffer size */
-    sz = GetCurrentDirectory(1, &t);
+    sz = GetCurrentDirectoryW(1, &t);
     /* must not return before calling delete[] */
-    strPath = (wchar_t*)malloc(sizeof(wchar_t) * sz);
+    strPath = (PWSTR)malloc(sz * sizeof(WCHAR));
 
     /* get the current directory */
-    GetCurrentDirectory(sz, strPath);
+    GetCurrentDirectoryW(sz, strPath);
 
     /* get the drive letter , must not return before calling delete[] */
-    driveLetter = (wchar_t*)malloc(sizeof(wchar_t) * sz);
+    driveLetter = (PWSTR)malloc(sz * sizeof(WCHAR));
 
     /* As we do not seem to have the _s functions properly set up, use the non-secure version for now */
     //wcscpy_s(driveLetter,sz,strPath);
@@ -383,15 +372,15 @@ int wmain( int argc, wchar_t *argv[])
     wcscpy(driveLetter, strPath);
     wcstok(driveLetter, L":");
 
-    wprintf(L"%s:.\n", driveLetter);
+    ConPrintf(StdOut, L"%s:.\n", driveLetter);
 
     free(driveLetter);
 
-    /* get the sub directories within this current folder */
+    /* get the sub-directories within this current folder */
     GetDirectoryStructure(strPath, 1, L"          ");
 
     free(strPath);
-    wprintf(L"\n");
+    ConPuts(StdOut, L"\n");
 
     return 0;
 }

reactos/base/applications/cmdutils/whoami/CMakeLists.txt

@@ -1,5 +1,8 @@
 
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/conutils)
+
 add_executable(whoami whoami.c whoami.rc)
 set_module_type(whoami win32cui UNICODE)
+target_link_libraries(whoami conutils ${PSEH_LIB})
 add_importlibs(whoami user32 secur32 advapi32 msvcrt kernel32)
 add_cd_file(TARGET whoami DESTINATION reactos/system32 FOR all)

reactos/base/applications/cmdutils/whoami/lang/ro-RO.rc

@@ -1,3 +1,4 @@
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
@@ -29,8 +30,8 @@ BEGIN
     IDS_UNKNOWN_DESCRIPTION "???"
     IDS_STATE_ENABLED "Activat"
     IDS_STATE_DISABLED "Dezactivat"
-    IDS_ERROR_UPN "EROARE: Nu se poate obține Numele Principal al Utilizatorului (UPN) deoarece\n utilizatorul actualmente autentificat nu este un un utilizator de domeniu.\n"
-    IDS_ERROR_FQDN "EROARE: Nu se poate obține Numele Complet Distinctiv Calificat (FQDN) deoarece\nutilizatorul actualmente autentificat nu este un un utilizator de domeniu.\n"
+    IDS_ERROR_UPN "EROARE: Numele Principal al Utilizatorului (UPN) nu poate fi obținut deoarece\n utilizatorul actualmente autentificat nu este un un utilizator de domeniu.\n"
+    IDS_ERROR_FQDN "EROARE: Numele Complet Distinctiv Calificat (FQDN) nu poate fi obținut\ndeoarece utilizatorul actualmente autentificat nu este un un utilizator\nde domeniu.\n"
     IDS_ERROR_VALUEXPECTED "EROARE: Sintaxă eronată. Este așteptată o valoare pentru «/fo».\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
     IDS_ERROR_VALUENOTALLOWED "EROARE: Sintaxă eronată. Valoarea «%s» nu este permisă pentru opțiunea «/fo».\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
     IDS_ERROR_1TIMES "EROARE: Sintaxă eronată. Utilizarea opțiunii «%s» nu este permisă mai mult de o\nsingură dată.\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
@@ -39,8 +40,8 @@ BEGIN
     IDS_ERROR_NH_LIST "EROARE: Opțiunea /NH nu poate fi utilizată în formatul LIST.\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
     IDS_HELP "DESCRIERE:\n\
   Afișează informațiile de utilizator, de grup, și de privilegii pentru un\n\
-  utilizator autentificat local. Dacă nu sunt furnizate argumente, se vor afișa\n\
-  numele și domeniul utilizatorului curent.\n\
+  utilizator autentificat local. Dacă nu sunt furnizate argumente, vor fi\n\
+  afișate numele și domeniul utilizatorului curent.\n\
   \n\
   Formatele disponibile pentru opțiunea «/fo» sunt «csv», «list», și «table».\n\
   Argumentul «/nh» ascunde anteturile. Datele sunt implicit afișate tabelar.\n\

reactos/base/applications/cmdutils/whoami/whoami.c

@@ -6,69 +6,16 @@
  * PROGRAMMERS: Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com)
  */
 
-
 #define SECURITY_WIN32
 #include <security.h>
 #include <sddl.h>
-
 #include <strsafe.h>
 
+#include <conutils.h>
+
 #include "resource.h"
 
-
-/* Unicode (W) to ANSI OEM wrapper function, as console and Unicode don't mix well, sigh */
-static void WhoamiOemConversion_printf(const WCHAR *lpSourceFormatW, ...)
-{
-    CHAR  *lpBufferA = NULL;
-    WCHAR *lpBufferW = NULL;
-
-    UINT Size;
-    va_list Args;
-
-    /* first let's find out the final output'ed length of the wprintf routine */
-    va_start(Args, lpSourceFormatW);
-
-    Size = _vscwprintf(lpSourceFormatW, Args);
-
-    va_end(Args);
-
-    /* allocate a proportional memory chunk taking into account the char width */
-    lpBufferW = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (Size + 1) * sizeof(WCHAR));
-
-    if (!lpBufferW)
-        return;
-
-    /* do wprintf to this newly allocated buffer of ours */
-    va_start(Args, lpSourceFormatW);
-
-    _vsnwprintf(lpBufferW, Size, lpSourceFormatW, Args);
-
-    va_end(Args);
-
-    /* allocate a similarly sized buffer for the ANSI/OEM version of our string */
-    lpBufferA = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (Size + 1) * sizeof(CHAR));
-
-    if (!lpBufferA)
-    {
-        HeapFree(GetProcessHeap(), 0, lpBufferW);
-        return;
-    }
-
-    /* convert our Unicode/Wide char string into a proper ANSI/OEM
-       string that our console may understand, at least in theory */
-    CharToOemBuffW(lpBufferW,
-                   lpBufferA,
-                   Size);
-
-    /* print the converted OEM string into the console's output and call it a day */
-    printf("%s", lpBufferA);
-
-    /* clean everything up */
-    HeapFree(GetProcessHeap(), 0, lpBufferW);
-    HeapFree(GetProcessHeap(), 0, lpBufferA);
-}
-
-#define wprintf WhoamiOemConversion_printf
+#define wprintf(...) ConPrintf(StdOut, ##__VA_ARGS__)
 
 BOOL NoHeader = FALSE;
 UINT NoHeaderArgCount = 0;
@@ -194,7 +141,6 @@ void WhoamiPrintHeader(int HeaderId)
     while (Length--)
         wprintf(L"-");
 
-    /* _putws seems to be broken in ReactOS' CRT ??? */
     wprintf(L"\n\n");
 }
 
@@ -718,13 +664,16 @@ int WhoamiPriv(void)
 
 int wmain(int argc, WCHAR* argv[])
 {
-    INT i;
-    BYTE WamBit = 0;
-
     #define WAM_USER   1<<0
     #define WAM_GROUPS 1<<1
     #define WAM_PRIV   1<<2
 
+    INT i;
+    BYTE WamBit = 0;
+
+    /* Initialize the Console Standard Streams */
+    ConInitStdStreams();
+
 
     /* * * * * * * * * * * * * * * *
      * A: no parameters whatsoever */

reactos/base/applications/cmdutils/wmic/lang/ro-RO.rc

@@ -5,7 +5,7 @@ LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 STRINGTABLE
 {
     STRING_CMDLINE_NOT_SUPPORTED, "Eroare: Comandă nerecunoscută.\n"
-    STRING_ALIAS_NOT_FOUND, "Eroare: Nu se poate găsi alias.\n"
+    STRING_ALIAS_NOT_FOUND, "Eroare: Alias necunoscut.\n"
     STRING_INVALID_QUERY, "Eroare: Cerere nevalidă.\n"
     STRING_INVALID_PATH, "Conținutul din «PATH» este sintactic nevalid.\n"
 }

reactos/base/applications/cmdutils/xcopy/lang/ro-RO.rc

@@ -1,4 +1,4 @@
-/* Ștefan Fulea (stefan dot fulea at mail dot md) */
+/* Translator: Ștefan Fulea (stefan dot fulea at mail dot md) */
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 
 STRINGTABLE
@@ -10,7 +10,7 @@ STRINGTABLE
     STRING_COPY,     "%1!d! fișier(e) copiat(e)\n"
     STRING_QISDIR,   "«%1» este un nume de fișier sau un director\ndin destinație?\n(F - Fișier, D - Director)\n"
     STRING_SRCPROMPT,"%1? (Da|Nu)\n"
-    STRING_OVERWRITE,"Se suprascrie %1? (Da|Nu|Toate)\n"
+    STRING_OVERWRITE,"Suprascrieți %1? (Da|Nu|Toate)\n"
     STRING_COPYFAIL, "Copierea «%1» în «%2» a eșuat cu cod de retur %3!d!\n"
     STRING_OPENFAIL, "Deschiderea «%1» a eșuat\n"
     STRING_READFAIL, "Citirea «%1» a eșuat\n"
@@ -28,7 +28,7 @@ XCOPY sursă [destinație] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \nCu:\n\
 \n\
-[/I]  Creează director dacă destinația nu există și se copiază două sau\n\
+[/I]  Creează director dacă destinația nu există și copiază două sau\n\
 \tmai multe fișiere.\n\
 [/S]  Copiază directoarele și subdirectoarele.\n\
 [/E]  Copiază directoarele și subdirectoarele, inclusiv pe cele goale.\n\

reactos/base/applications/cmdutils/xcopy/lang/ru-RU.rc

@@ -11,8 +11,8 @@ STRINGTABLE
     STRING_COPY,     "%1!d! файл(ов) скопировано.\n"
     STRING_QISDIR,   "'%1' является файлом или папкой?\n\
                      (F - Файл, D - Папка)\n"
-    STRING_SRCPROMPT,"%1? (Yes|No)\n"
-    STRING_OVERWRITE,"Переписать %1? (Yes|No|All)\n"
+    STRING_SRCPROMPT,"%1? (Yes-Да|No-Нет)\n"
+    STRING_OVERWRITE,"Переписать %1? (Yes-Да|No-Нет|All-Все)\n"
     STRING_COPYFAIL, "При копировании '%1' в '%2' произошла ошибка: %3!d!\n"
     STRING_OPENFAIL, "Невозможно открыть '%1'\n"
     STRING_READFAIL, "При чтении '%1' произошла ошибка\n"

reactos/base/applications/dxdiag/ddtest.c

@@ -31,7 +31,7 @@ BOOL StartDDTest(HWND hWnd, HINSTANCE hInstance, INT resTestDescription, INT res
     WCHAR szError[256];
     BOOL Result;
 
-    LoadStringW(hInstance, IDS_DDTEST_TITLE, szCaption, sizeof(szCaption) / sizeof(WCHAR));
+    LoadStringW(hInstance, IDS_MAIN_DIALOG, szCaption, sizeof(szCaption) / sizeof(WCHAR));
     LoadStringW(hInstance, IDS_DDTEST_ERROR, szError, sizeof(szError) / sizeof(WCHAR));
     LoadStringW(hInstance, resTestDescription, szTestDescription, sizeof(szTestDescription) / sizeof(WCHAR));
     LoadStringW(hInstance, resResult, szResult, sizeof(szResult) / sizeof(WCHAR));
@@ -103,7 +103,7 @@ VOID DDTests()
     }
 
     LoadStringW(hInstance, IDS_DDTEST_DESCRIPTION, szDescription, sizeof(szDescription) / sizeof(WCHAR));
-    LoadStringW(hInstance, IDS_DDTEST_DESCRIPTION, szCaption, sizeof(szCaption) / sizeof(WCHAR));
+    LoadStringW(hInstance, IDS_MAIN_DIALOG, szCaption, sizeof(szCaption) / sizeof(WCHAR));
     if(MessageBox(NULL, szDescription, szCaption, MB_YESNO | MB_ICONQUESTION) == IDNO)
         return;
 

reactos/base/applications/dxdiag/lang/ro-RO.rc

@@ -256,5 +256,5 @@ BEGIN
     IDS_DMUSIC_DLS "DLS de suport"
     IDS_DMUSIC_EXT "Extern"
     IDS_DMUSIC_PORT "Port implicit"
-    IDS_DDDISABLE_MSG "Se vor dezactiva toate accelerările fizice DirectDraw pentru toate dispozitivele.\nDoriți să continuați?\n"
+    IDS_DDDISABLE_MSG "Accelerările fizice DirectDraw vor fi dezactivate pentru toate dispozitivele.\nDoriți să continuați?\n"
 END