[FOSDEM 2015]

- Import the <msg> code again. reactos.exe doesn't show a "Finish" button as promised, but instead presents you with an unfinished GUI installer.
- Also import the messages. The French translation is copied from reactos.exe, so it isn't as exact as the English or German ones, but it carries the meaning.

svn path=/branches/ReactOS-0.3.17-FOSDEM2015/; revision=66121

reactos/base/applications/CMakeLists.txt

@@ -19,10 +19,11 @@ add_subdirectory(mmc)
 add_subdirectory(mplay32)
 add_subdirectory(msconfig)
 add_subdirectory(mscutils)
+add_subdirectory(mspaint)
 add_subdirectory(mstsc)
 add_subdirectory(network)
 add_subdirectory(notepad)
-add_subdirectory(mspaint)
+add_subdirectory(osk)
 add_subdirectory(rapps)
 add_subdirectory(regedit)
 add_subdirectory(regedt32)

reactos/base/applications/cacls/cacls.c

@@ -19,6 +19,11 @@
 
 #include "precomp.h"
 
+/* command line options */
+BOOL OptionT = FALSE, OptionE = FALSE, OptionC = FALSE;
+BOOL OptionG = FALSE, OptionR = FALSE, OptionP = FALSE, OptionD = FALSE;
+LPCTSTR GUser, GPerm, RUser, PUser, PPerm, DUser;
+
 static GENERIC_MAPPING FileGenericMapping =
 {
     FILE_GENERIC_READ,
@@ -512,92 +517,500 @@ PrintSpecialAccess:
     return Ret;
 }
 
-
-int
-__cdecl
-_tmain(int argc, const TCHAR *argv[])
+/* add a backslash at end to a path string if necessary */
+static VOID
+AddBackslash(LPTSTR FilePath)
 {
-    if (argc < 2)
+    INT len = lstrlen(FilePath);
+    LPTSTR pch = CharPrev(FilePath, FilePath + len);
+    if (*pch != _T('\\'))
+        lstrcat(pch, _T("\\"));
+}
+
+static BOOL
+GetPathOfFile(LPTSTR FilePath, LPCTSTR pszFiles)
+{
+    TCHAR FullPath[MAX_PATH];
+    LPTSTR pch;
+    DWORD attrs;
+
+    lstrcpyn(FilePath, pszFiles, MAX_PATH);
+    pch = _tcsrchr(FilePath, _T('\\'));
+    if (pch != NULL)
     {
-        PrintHelp();
-        return 1;
+        *pch = 0;
+        if (!GetFullPathName(FilePath, MAX_PATH, FullPath, NULL))
+        {
+            PrintErrorMessage(GetLastError());
+            return FALSE;
+        }
+        lstrcpyn(FilePath, FullPath, MAX_PATH);
+
+        attrs = GetFileAttributes(FilePath);
+        if (attrs == 0xFFFFFFFF || !(attrs & FILE_ATTRIBUTE_DIRECTORY))
+        {
+            PrintErrorMessage(ERROR_DIRECTORY);
+            return FALSE;
+        }
     }
     else
-    {
-        TCHAR FullPath[MAX_PATH + 1];
-        TCHAR *FilePart = NULL;
+        GetCurrentDirectory(MAX_PATH, FilePath);
+
+    AddBackslash(FilePath);
+    return TRUE;
+}
+
+static BOOL
+PrintDaclsOfFiles(LPCTSTR pszFiles)
+{
+    TCHAR FilePath[MAX_PATH];
     WIN32_FIND_DATA FindData;
     HANDLE hFind;
     DWORD LastError;
 
-        if (argc > 2)
-        {
-            /* FIXME - parse arguments */
-        }
+    /*
+     * get the file path
+     */
+    if (!GetPathOfFile(FilePath, pszFiles))
+        return FALSE;
 
-        /* get the full path of where we're searching in */
-        if (GetFullPathName(argv[1],
-                            sizeof(FullPath) / sizeof(FullPath[0]),
-                            FullPath,
-                            &FilePart) != 0)
-        {
-            if (FilePart != NULL)
-                *FilePart = _T('\0');
-        }
-        else
-            goto Error;
+    /*
+     * search for the files
+     */
+    hFind = FindFirstFile(pszFiles, &FindData);
+    if (hFind == INVALID_HANDLE_VALUE)
+        return FALSE;
 
-        /* find the file(s) */
-        hFind = FindFirstFile(argv[1],
-                              &FindData);
-        if (hFind != INVALID_HANDLE_VALUE)
-        {
     do
     {
-                if (!(FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) ||
-                    (_tcscmp(FindData.cFileName,
-                             _T(".")) &&
-                     _tcscmp(FindData.cFileName,
-                             _T(".."))))
-                {
-                    if (argc > 2)
-                    {
-                        /* FIXME - edit or replace the descriptor */
-                    }
-                    else
-                    {
-                        if (!PrintFileDacl(FullPath,
-                                           FindData.cFileName))
+        if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+            continue;
+
+        if (!PrintFileDacl(FilePath, FindData.cFileName))
         {
             LastError = GetLastError();
-
             if (LastError == ERROR_ACCESS_DENIED)
             {
                 PrintErrorMessage(LastError);
+                if (!OptionC)
+                {
+                    FindClose(hFind);
+                    return FALSE;
+                }
             }
             else
                 break;
         }
         else
             _tprintf(_T("\n"));
-                    }
-                }
-            } while (FindNextFile(hFind,
-                                  &FindData));
-
+    } while(FindNextFile(hFind, &FindData));
+    LastError = GetLastError();
     FindClose(hFind);
 
-            if (GetLastError() != ERROR_NO_MORE_FILES)
+    if (LastError != ERROR_NO_MORE_FILES)
     {
-                goto Error;
+        PrintErrorMessage(LastError);
+        return FALSE;
     }
+
+    return TRUE;
+}
+
+static BOOL
+GrantUserAccessRights(LPCTSTR FilePath, LPCTSTR File, LPCTSTR User, TCHAR Perm)
+{
+    /* TODO & FIXME */
+    switch(Perm)
+    {
+        case _T('R'): // Read
+            break;
+        case _T('W'): // Write
+            break;
+        case _T('C'): // Change (write)
+            break;
+        case _T('F'): // Full control
+            break;
+        default:
+            break;
+    }
+    return FALSE;
+}
+
+static BOOL
+ReplaceUserAccessRights(
+    LPCTSTR FilePath,
+    LPCTSTR File,
+    LPCTSTR User,
+    TCHAR Perm)
+{
+    /* TODO & FIXME */
+    switch(Perm)
+    {
+        case _T('N'): // None
+            break;
+        case _T('R'): // Read
+            break;
+        case _T('W'): // Write
+            break;
+        case _T('C'): // Change (write)
+            break;
+        case _T('F'): // Full control
+            break;
+        default:
+            break;
+    }
+    return FALSE;
+}
+
+static BOOL
+EditUserAccessRights(
+    LPCTSTR FilePath,
+    LPCTSTR File,
+    LPCTSTR User,
+    TCHAR Perm)
+{
+    /* TODO & FIXME */
+    switch(Perm)
+    {
+        case _T('N'): // None
+            break;
+        case _T('R'): // Read
+            break;
+        case _T('W'): // Write
+            break;
+        case _T('C'): // Change (write)
+            break;
+        case _T('F'): // Full control
+            break;
+        default:
+            break;
+    }
+    return FALSE;
+}
+
+static BOOL
+DenyUserAccess(LPCTSTR FilePath, LPCTSTR File, LPCTSTR User)
+{
+    /* TODO & FIXME */
+    return FALSE;
+}
+
+static BOOL
+RevokeUserAccessRights(LPCTSTR FilePath, LPCTSTR File, LPCTSTR User)
+{
+    /* TODO & FIXME */
+    return FALSE;
+}
+
+static BOOL
+ChangeFileACL(LPCTSTR FilePath, LPCTSTR File)
+{
+    if (OptionG)
+    {
+        /* Grant specified user access rights. */
+        GrantUserAccessRights(FilePath, File, GUser, *GPerm);
+    }
+
+    if (OptionP)
+    {
+        if (!OptionE)
+        {
+            /* Replace specified user's access rights. */
+            ReplaceUserAccessRights(FilePath, File, PUser, *PPerm);
         }
         else
         {
-Error:
-            PrintErrorMessage(GetLastError());
+            /* Edit ACL instead of replacing it. */
+            EditUserAccessRights(FilePath, File, PUser, *PPerm);
+        }
+    }
+
+    if (OptionD)
+    {
+        /* Deny specified user access. */
+        DenyUserAccess(FilePath, File, DUser);
+    }
+
+    if (OptionR)
+    {
+        /* Revoke specified user's access rights. */
+        RevokeUserAccessRights(FilePath, File, RUser);
+    }
+
+    return TRUE;
+}
+
+static BOOL
+ChangeACLsOfFiles(LPCTSTR pszFiles)
+{
+    TCHAR FilePath[MAX_PATH];
+    HANDLE hFind;
+    WIN32_FIND_DATA FindData;
+    DWORD LastError;
+
+    /*
+     * get the file path
+     */
+    if (!GetPathOfFile(FilePath, pszFiles))
+        return FALSE;
+
+    /*
+     * search for files in current directory
+     */
+    hFind = FindFirstFile(pszFiles, &FindData);
+    if (hFind == INVALID_HANDLE_VALUE)
+        return FALSE;
+
+    do
+    {
+        if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+            continue;
+
+        if (!ChangeFileACL(FilePath, FindData.cFileName))
+        {
+            LastError = GetLastError();
+            if (LastError == ERROR_ACCESS_DENIED)
+            {
+                PrintErrorMessage(LastError);
+                if (!OptionC)
+                {
+                    FindClose(hFind);
+                    return FALSE;
+                }
+            }
+            else
+                break;
+        }
+    } while(FindNextFile(hFind, &FindData));
+
+    LastError = GetLastError();
+    FindClose(hFind);
+
+    if (LastError != ERROR_NO_MORE_FILES)
+    {
+        PrintErrorMessage(LastError);
+        return FALSE;
+    }
+
+    return TRUE;
+}
+
+static BOOL
+ChangeACLsOfFilesInCurDir(LPCTSTR pszFiles)
+{
+    HANDLE hFind;
+    WIN32_FIND_DATA FindData;
+    TCHAR szCurDir[MAX_PATH];
+    DWORD LastError;
+
+    /*
+     * get the file path (current directory)
+     */
+    GetCurrentDirectory(MAX_PATH, szCurDir);
+    AddBackslash(szCurDir);
+
+    /*
+     * search for files in current directory
+     */
+    hFind = FindFirstFile(pszFiles, &FindData);
+    if (hFind == INVALID_HANDLE_VALUE)
+        return FALSE;
+
+    do
+    {
+        if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+            continue;
+
+        if (!ChangeFileACL(szCurDir, FindData.cFileName))
+        {
+            LastError = GetLastError();
+            if (LastError == ERROR_ACCESS_DENIED)
+            {
+                PrintErrorMessage(LastError);
+                if (!OptionC)
+                {
+                    FindClose(hFind);
+                    return FALSE;
+                }
+            }
+            else
+                break;
+        }
+    } while(FindNextFile(hFind, &FindData));
+
+    LastError = GetLastError();
+    FindClose(hFind);
+
+    if (LastError != ERROR_NO_MORE_FILES)
+    {
+        PrintErrorMessage(LastError);
+        return FALSE;
+    }
+
+    /*
+     * search for subdirectory in current directory
+     */
+    hFind = FindFirstFile(_T("*"), &FindData);
+    if (hFind == INVALID_HANDLE_VALUE)
+        return FALSE;
+    do
+    {
+        if (_tcscmp(FindData.cFileName, _T(".")) == 0 ||
+            _tcscmp(FindData.cFileName, _T("..")) == 0)
+            continue;
+
+        if (FindData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+        {
+            GetCurrentDirectory(MAX_PATH, szCurDir);
+            if (SetCurrentDirectory(FindData.cFileName))
+            {
+                ChangeACLsOfFilesInCurDir(pszFiles);
+                SetCurrentDirectory(szCurDir);
+            }
+            else
+            {
+                LastError = GetLastError();
+                if (LastError == ERROR_ACCESS_DENIED)
+                {
+                    PrintErrorMessage(LastError);
+                    if (!OptionC)
+                    {
+                        FindClose(hFind);
+                        return FALSE;
+                    }
+                }
+                else
+                    break;
+            }
+        }
+    } while(FindNextFile(hFind, &FindData));
+    LastError = GetLastError();
+    FindClose(hFind);
+
+    if (LastError != ERROR_NO_MORE_FILES)
+    {
+        PrintErrorMessage(LastError);
+        return FALSE;
+    }
+    return TRUE;
+}
+
+int
+__cdecl
+_tmain(int argc, const TCHAR *argv[])
+{
+    INT i;
+    LPTSTR pch;
+    BOOL InvalidParameter = FALSE;
+
+    if (argc <= 1)
+    {
+        PrintHelp();
+        return 0;
+    }
+
+    /*
+     * parse command line options
+     */
+    for (i = 2; i < argc; i++)
+    {
+        if (lstrcmpi(argv[i], _T("/T")) == 0)
+        {
+            OptionT = TRUE;
+        }
+        else if (lstrcmpi(argv[i], _T("/E")) == 0)
+        {
+            OptionE = TRUE;
+        }
+        else if (lstrcmpi(argv[i], _T("/C")) == 0)
+        {
+            OptionC = TRUE;
+        }
+        else if (lstrcmpi(argv[i], _T("/G")) == 0)
+        {
+            if (i + 1 < argc)
+            {
+                pch = _tcschr(argv[++i], _T(':'));
+                if (pch != NULL)
+                {
+                    OptionG = TRUE;
+                    *pch = 0;
+                    GUser = argv[i];
+                    GPerm = pch + 1;
+                    continue;
+                }
+            }
+            InvalidParameter = TRUE;
+            break;
+        }
+        else if (lstrcmpi(argv[i], _T("/R")) == 0)
+        {
+            if (i + 1 < argc)
+            {
+                RUser = argv[++i];
+                OptionR = TRUE;
+                continue;
+            }
+            InvalidParameter = TRUE;
+            break;
+        }
+        else if (lstrcmpi(argv[i], _T("/P")) == 0)
+        {
+            if (i + 1 < argc)
+            {
+                pch = _tcschr(argv[++i], _T(':'));
+                if (pch != NULL)
+                {
+                    OptionP = TRUE;
+                    *pch = 0;
+                    PUser = argv[i];
+                    PPerm = pch + 1;
+                    continue;
+                }
+            }
+            InvalidParameter = TRUE;
+            break;
+        }
+        else if (lstrcmpi(argv[i], _T("/D")) == 0)
+        {
+            if (i + 1 < argc)
+            {
+                OptionD = TRUE;
+                DUser = argv[++i];
+                continue;
+            }
+            InvalidParameter = TRUE;
+            break;
+        }
+        else
+        {
+            InvalidParameter = TRUE;
+            break;
+        }
+    }
+
+    if (InvalidParameter)
+    {
+        PrintErrorMessage(ERROR_INVALID_PARAMETER);
+        PrintHelp();
         return 1;
     }
+
+    /* /R is only valid with /E */
+    if (OptionR && !OptionE)
+    {
+        OptionR = FALSE;
+    }
+
+    PrintDaclsOfFiles(argv[1]);
+
+    if (OptionT)
+    {
+        ChangeACLsOfFilesInCurDir(argv[1]);
+    }
+    else
+    {
+        ChangeACLsOfFiles(argv[1]);
     }
 
     return 0;

reactos/base/applications/calc/lang/bg-BG.rc

@@ -336,8 +336,8 @@ BEGIN
     END
     POPUP "Изглед"
     BEGIN
-        MENUITEM "Обикновен", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Обикновен", IDM_VIEW_STANDARD
+        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC
         MENUITEM "Преобразуване", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шестнaдесетичен\tF5", IDM_VIEW_HEX, CHECKED
@@ -368,8 +368,8 @@ BEGIN
     END
     POPUP "Изглед"
     BEGIN
-        MENUITEM "Стандартно", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Стандартно", IDM_VIEW_STANDARD
+        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC
         MENUITEM "Преобразуване", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шестнaдесетичен\tF5", IDM_VIEW_HEX, CHECKED
@@ -401,8 +401,8 @@ BEGIN
     END
     POPUP "Изглед"
     BEGIN
-        MENUITEM "Стандартно", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Стандартно", IDM_VIEW_STANDARD
+        MENUITEM "Научен", IDM_VIEW_SCIENTIFIC
         MENUITEM "Преобразуване", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Разделяне на хилядите", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/cs-CZ.rc

@@ -335,8 +335,8 @@ BEGIN
     END
     POPUP "Zobrazit"
     BEGIN
-        MENUITEM "Standardní", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standardní", IDM_VIEW_STANDARD
+        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC
         MENUITEM "Převody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Šestnáctkově\tF5", IDM_VIEW_HEX, CHECKED
@@ -367,8 +367,8 @@ BEGIN
     END
     POPUP "Zobrazit"
     BEGIN
-        MENUITEM "Standardní", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standardní", IDM_VIEW_STANDARD
+        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC
         MENUITEM "Převody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Šestnáctkově\tF5", IDM_VIEW_HEX, CHECKED
@@ -400,8 +400,8 @@ BEGIN
     END
     POPUP "Zobrazit"
     BEGIN
-        MENUITEM "Standardní", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standardní", IDM_VIEW_STANDARD
+        MENUITEM "Vědecká", IDM_VIEW_SCIENTIFIC
         MENUITEM "Převody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Seskupování číslic", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/de-DE.rc

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Ansicht"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Ansicht"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Ansicht"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Wissenschaftlich", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Zifferngruppierung", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Τυπική", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Τυπική", IDM_VIEW_STANDARD
+        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC
         MENUITEM "Μετατροπή", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Τυπική", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Τυπική", IDM_VIEW_STANDARD
+        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC
         MENUITEM "Μετατροπή", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Δεκαεξαδικό\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Τυπική", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Τυπική", IDM_VIEW_STANDARD
+        MENUITEM "Επιστημονική", IDM_VIEW_SCIENTIFIC
         MENUITEM "Μετατροπή", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Ομαδοποίηση ψηφίων", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Scientific", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Group digits", IDM_VIEW_GROUP, CHECKED

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

@@ -336,8 +336,8 @@ BEGIN
     END
     POPUP "Ver"
     BEGIN
-        MENUITEM "Estándar", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Estándar", IDM_VIEW_STANDARD
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversión", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -368,8 +368,8 @@ BEGIN
     END
     POPUP "Ver"
     BEGIN
-        MENUITEM "Estándar", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Estándar", IDM_VIEW_STANDARD
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversión", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -401,8 +401,8 @@ BEGIN
     END
     POPUP "Ver"
     BEGIN
-        MENUITEM "Estándar", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Estándar", IDM_VIEW_STANDARD
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversión", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Agrupar dígitos", IDM_VIEW_GROUP, CHECKED
@@ -488,9 +488,9 @@ BEGIN
     IDS_AREA_SQUARE_METER "Metros cuadrado"
     IDS_AREA_SQUARE_MILES "Millas cuadradas"
     IDS_AREA_SQUARE_MILLIMETERS "Milímetros cuadrados"
-    IDS_AREA_SQUARE_SHAKU "Square shaku"
-    IDS_AREA_SQUARE_TSUEN "Square tsuen"
-    IDS_AREA_SQUARE_VA "Square va" /* ??? (unused in the source code) */
+    IDS_AREA_SQUARE_SHAKU "Shaku cuadrado"
+    IDS_AREA_SQUARE_TSUEN "Tsuen cuadrados"
+    IDS_AREA_SQUARE_VA "Va cuadrados" /* ??? (unused in the source code) */
     IDS_AREA_SQUARE_YARD "Yarda cuadrada"
     IDS_AREA_TAN "Tan"
     IDS_AREA_TSUBO "Tsubo"

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Affichage"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadécimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Affichage"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadécimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Affichage"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Scientifique", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversion", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Grouper les chiffres", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/he-IL.rc

@@ -332,8 +332,8 @@ BEGIN
     END
     POPUP "תצוגה"
     BEGIN
-        MENUITEM "רגילה", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "רגילה", IDM_VIEW_STANDARD
+        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC
         MENUITEM "המרה", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "הקס\tF5", IDM_VIEW_HEX, CHECKED
@@ -364,8 +364,8 @@ BEGIN
     END
     POPUP "תצוגה"
     BEGIN
-        MENUITEM "רגילה", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "רגילה", IDM_VIEW_STANDARD
+        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC
         MENUITEM "המרה", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "הקס\tF5", IDM_VIEW_HEX, CHECKED
@@ -397,8 +397,8 @@ BEGIN
     END
     POPUP "תצוגה"
     BEGIN
-        MENUITEM "רגילה", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "רגילה", IDM_VIEW_STANDARD
+        MENUITEM "מדעית", IDM_VIEW_SCIENTIFIC
         MENUITEM "המרה", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "קיבוץ ספרות", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/hu-HU.rc

@@ -338,8 +338,8 @@ BEGIN
     END
     POPUP "&Nézet"
     BEGIN
-        MENUITEM "&Szokásos", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "&Szokásos", IDM_VIEW_STANDARD
+        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC
         MENUITEM "Át&váltás", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Hexadecimális\tF5", IDM_VIEW_HEX, CHECKED
@@ -370,8 +370,8 @@ BEGIN
     END
     POPUP "&Nézet"
     BEGIN
-        MENUITEM "&Szokásos", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "&Szokásos", IDM_VIEW_STANDARD
+        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC
         MENUITEM "Át&váltás", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Hexadecimális\tF5", IDM_VIEW_HEX, CHECKED
@@ -403,8 +403,8 @@ BEGIN
     END
     POPUP "&Nézet"
     BEGIN
-        MENUITEM "&Szokásos", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "&Szokásos", IDM_VIEW_STANDARD
+        MENUITEM "&Tudományos", IDM_VIEW_SCIENTIFIC
         MENUITEM "Át&váltás", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Számjegyek &csoportosítása", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/it-IT.rc

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Visualizza"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversione", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Visualizza"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversione", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Visualizza"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Scientifica", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversione", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Raggruppamento cifre", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/ja-JP.rc

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "表示(&V)"
     BEGIN
-        MENUITEM "標準(&T)", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "標準(&T)", IDM_VIEW_STANDARD
+        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC
         MENUITEM "変換(&C)", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "1&6進\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "表示(&V)"
     BEGIN
-        MENUITEM "標準(&T)", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "標準(&T)", IDM_VIEW_STANDARD
+        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC
         MENUITEM "変換(&C)", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "1&6進\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "表示"
     BEGIN
-        MENUITEM "標準(&T)", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "標準(&T)", IDM_VIEW_STANDARD
+        MENUITEM "関数電卓(&S)", IDM_VIEW_SCIENTIFIC
         MENUITEM "変換(&C)", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "桁を区切る(&I)", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/ko-KR.rc

@@ -332,8 +332,8 @@ BEGIN
     END
     POPUP "보기"
     BEGIN
-        MENUITEM "일반", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "공학", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "일반", IDM_VIEW_STANDARD
+        MENUITEM "공학", IDM_VIEW_SCIENTIFIC
         MENUITEM "전환", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -364,8 +364,8 @@ BEGIN
     END
     POPUP "보기"
     BEGIN
-        MENUITEM "일반", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "공학", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "일반", IDM_VIEW_STANDARD
+        MENUITEM "공학", IDM_VIEW_SCIENTIFIC
         MENUITEM "전환", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -397,8 +397,8 @@ BEGIN
     END
     POPUP "보기"
     BEGIN
-        MENUITEM "일반", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "공학", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "일반", IDM_VIEW_STANDARD
+        MENUITEM "공학", IDM_VIEW_SCIENTIFIC
         MENUITEM "전환", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "자릿수 구분 단위", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Beeld"
     BEGIN
-        MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standaard", IDM_VIEW_STANDARD
+        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC
         MENUITEM "Converteren", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Beeld"
     BEGIN
-        MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standaard", IDM_VIEW_STANDARD
+        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC
         MENUITEM "Converteren", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "View"
     BEGIN
-        MENUITEM "Standaard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standaard", IDM_VIEW_STANDARD
+        MENUITEM "Wetenschappelijk", IDM_VIEW_SCIENTIFIC
         MENUITEM "Converteren", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Cijfergroeperingen", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/no-NO.rc

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Vis"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Vis"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC
         MENUITEM "konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Heksadesimalt\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Vis"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Vitenskapelig", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED
@@ -405,7 +405,7 @@ BEGIN
     BEGIN
         MENUITEM "Emner i hjelp", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Om Reactos Kalkulator", IDM_HELP_ABOUT
+        MENUITEM "Om ReactOS Kalkulator", IDM_HELP_ABOUT
     END
 END
 

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

@@ -339,8 +339,8 @@ BEGIN
     END
     POPUP "Wygląd"
     BEGIN
-        MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standardowy", IDM_VIEW_STANDARD
+        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC
         MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Szesnastkowy\tF5", IDM_VIEW_HEX, CHECKED
@@ -371,8 +371,8 @@ BEGIN
     END
     POPUP "Wygląd"
     BEGIN
-        MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standardowy", IDM_VIEW_STANDARD
+        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC
         MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Szesnastkowo\tF5", IDM_VIEW_HEX, CHECKED
@@ -404,8 +404,8 @@ BEGIN
     END
     POPUP "Wygląd"
     BEGIN
-        MENUITEM "Standardowy", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standardowy", IDM_VIEW_STANDARD
+        MENUITEM "Naukowy", IDM_VIEW_SCIENTIFIC
         MENUITEM "Przeliczanie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Grupowanie cyfr", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/pt-BR.rc

@@ -332,8 +332,8 @@ BEGIN
     END
     POPUP "Visualizar"
     BEGIN
-        MENUITEM "Padrão", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Padrão", IDM_VIEW_STANDARD
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversão", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -364,8 +364,8 @@ BEGIN
     END
     POPUP "Visualizar"
     BEGIN
-        MENUITEM "Padrão", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Padrão", IDM_VIEW_STANDARD
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversão", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -397,8 +397,8 @@ BEGIN
     END
     POPUP "Visualizar"
     BEGIN
-        MENUITEM "Padrão", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Padrão", IDM_VIEW_STANDARD
+        MENUITEM "Científica", IDM_VIEW_SCIENTIFIC
         MENUITEM "Conversão", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Agrupar dígitos", IDM_VIEW_GROUP, CHECKED

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

@@ -331,8 +331,8 @@ BEGIN
     END
     POPUP "&Afișare"
     BEGIN
-        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD
+        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC
         MENUITEM "Con&versie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -363,8 +363,8 @@ BEGIN
     END
     POPUP "&Afișare"
     BEGIN
-        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD
+        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC
         MENUITEM "Con&versie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Hexazecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -396,8 +396,8 @@ BEGIN
     END
     POPUP "&Afișare"
     BEGIN
-        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Mod st&andard", IDM_VIEW_STANDARD
+        MENUITEM "Mod știi&nțific", IDM_VIEW_SCIENTIFIC
         MENUITEM "Con&versie", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Grupează &cifre", IDM_VIEW_GROUP, CHECKED

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

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "Вид"
     BEGIN
-        MENUITEM "Обычный", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Обычный", IDM_VIEW_STANDARD
+        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC
         MENUITEM "Преобразование", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шестнадцатеричный\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "Вид"
     BEGIN
-        MENUITEM "Обычный", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Обычный", IDM_VIEW_STANDARD
+        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC
         MENUITEM "Преобразование", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шестнадцатеричный\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "Вид"
     BEGIN
-        MENUITEM "Обычный", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Обычный", IDM_VIEW_STANDARD
+        MENUITEM "Научный", IDM_VIEW_SCIENTIFIC
         MENUITEM "Преобразование", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Количество цифр в группе", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/sk-SK.rc

@@ -337,8 +337,8 @@ BEGIN
     END
     POPUP "Zobraziť"
     BEGIN
-        MENUITEM "Štandardná", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Štandardná", IDM_VIEW_STANDARD
+        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC
         MENUITEM "Prevody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Šestnástková\tF5", IDM_VIEW_HEX, CHECKED
@@ -369,8 +369,8 @@ BEGIN
     END
     POPUP "Zobraziť"
     BEGIN
-        MENUITEM "Štandardná", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Štandardná", IDM_VIEW_STANDARD
+        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC
         MENUITEM "Prevody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Šestnástková\tF5", IDM_VIEW_HEX, CHECKED
@@ -402,8 +402,8 @@ BEGIN
     END
     POPUP "Zobraziť"
     BEGIN
-        MENUITEM "Štandardná", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Štandardná", IDM_VIEW_STANDARD
+        MENUITEM "Vedecká", IDM_VIEW_SCIENTIFIC
         MENUITEM "Prevody", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Zoskupovať číslice", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/sq-AL.rc

@@ -334,8 +334,8 @@ BEGIN
     END
     POPUP "Modifko"
     BEGIN
-        MENUITEM "Standart", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standart", IDM_VIEW_STANDARD
+        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konvertim", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -366,8 +366,8 @@ BEGIN
     END
     POPUP "Vëzhgo"
     BEGIN
-        MENUITEM "Standart", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standart", IDM_VIEW_STANDARD
+        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konverto", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hex\tF5", IDM_VIEW_HEX, CHECKED
@@ -399,8 +399,8 @@ BEGIN
     END
     POPUP "Vëzhgo"
     BEGIN
-        MENUITEM "Standar", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standar", IDM_VIEW_STANDARD
+        MENUITEM "Shkencor", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konverto", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Grupim numeror", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/sv-SE.rc

@@ -337,8 +337,8 @@ BEGIN
     END
     POPUP "Visa"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -369,8 +369,8 @@ BEGIN
     END
     POPUP "Vis"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Vetenskaplig", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Hexadecimal\tF5", IDM_VIEW_HEX, CHECKED
@@ -402,8 +402,8 @@ BEGIN
     END
     POPUP "Visa"
     BEGIN
-        MENUITEM "Standard", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Vetenskapelig", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Standard", IDM_VIEW_STANDARD
+        MENUITEM "Vetenskapelig", IDM_VIEW_SCIENTIFIC
         MENUITEM "Konvertering", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Siffergruppering", IDM_VIEW_GROUP, CHECKED
@@ -412,7 +412,7 @@ BEGIN
     BEGIN
         MENUITEM "Visa hjälp", IDM_HELP_HELP
         MENUITEM SEPARATOR
-        MENUITEM "Om Reactos Kalkylator", IDM_HELP_ABOUT
+        MENUITEM "Om ReactOS Kalkylator", IDM_HELP_ABOUT
     END
 END
 

reactos/base/applications/calc/lang/th-TH.rc

@@ -330,8 +330,8 @@ BEGIN
     END
     POPUP "&มุมมอง"
     BEGIN
-        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD
+        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC
         MENUITEM "ความเปลี่ยนแปลง", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "ฐานสิบหก\tF5", IDM_VIEW_HEX, CHECKED
@@ -362,8 +362,8 @@ BEGIN
     END
     POPUP "&มุมมอง"
     BEGIN
-        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD
+        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC
         MENUITEM "ความเปลี่ยนแปลง", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "ฐานสิบหก\tF5", IDM_VIEW_HEX, CHECKED
@@ -395,8 +395,8 @@ BEGIN
     END
     POPUP "&มุมมอง"
     BEGIN
-        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "แบบมาตรฐาน", IDM_VIEW_STANDARD
+        MENUITEM "แบบวิทยาศาสตร์", IDM_VIEW_SCIENTIFIC
         MENUITEM "ความเปลี่ยนแปลง", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "แสดงหลักตัวเลข", IDM_VIEW_GROUP, CHECKED

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

@@ -332,8 +332,8 @@ BEGIN
     END
     POPUP "&Görünüm"
     BEGIN
-        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD
+        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
         MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Onaltılık\tF5", IDM_VIEW_HEX, CHECKED
@@ -364,8 +364,8 @@ BEGIN
     END
     POPUP "&Görünüm"
     BEGIN
-        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD
+        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
         MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "&Onaltılık\tF5", IDM_VIEW_HEX, CHECKED
@@ -397,8 +397,8 @@ BEGIN
     END
     POPUP "&Görünüm"
     BEGIN
-        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "&Ölçünlü", IDM_VIEW_STANDARD
+        MENUITEM "&Bilimlik", IDM_VIEW_SCIENTIFIC
         MENUITEM "&Dönüştürme", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "B&asamakları Takımla", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/uk-UA.rc

@@ -338,8 +338,8 @@ BEGIN
     END
     POPUP "Вигляд"
     BEGIN
-        MENUITEM "Звичайний", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Звичайний", IDM_VIEW_STANDARD
+        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC
         MENUITEM "Перетворення", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шістнадцятковий\tF5", IDM_VIEW_HEX, CHECKED
@@ -370,8 +370,8 @@ BEGIN
     END
     POPUP "Вигляд"
     BEGIN
-        MENUITEM "Звичайний", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Звичайний", IDM_VIEW_STANDARD
+        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC
         MENUITEM "Перетворення", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Шістнадцятковий\tF5", IDM_VIEW_HEX, CHECKED
@@ -403,8 +403,8 @@ BEGIN
     END
     POPUP "Вигляд"
     BEGIN
-        MENUITEM "Звичайний", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "Звичайний", IDM_VIEW_STANDARD
+        MENUITEM "Науковий", IDM_VIEW_SCIENTIFIC
         MENUITEM "Перетворення", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "Кількість цифр у групі", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/lang/zh-CN.rc

@@ -332,8 +332,8 @@ BEGIN
     END
     POPUP "查看"
     BEGIN
-        MENUITEM "标准型", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "标准型", IDM_VIEW_STANDARD
+        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC
         MENUITEM "转换", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "十六进制\tF5", IDM_VIEW_HEX, CHECKED
@@ -364,8 +364,8 @@ BEGIN
     END
     POPUP "查看"
     BEGIN
-        MENUITEM "标准型", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "标准型", IDM_VIEW_STANDARD
+        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC
         MENUITEM "转换", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "十六进制\tF5", IDM_VIEW_HEX, CHECKED
@@ -397,8 +397,8 @@ BEGIN
     END
     POPUP "查看"
     BEGIN
-        MENUITEM "标准型", IDM_VIEW_STANDARD, CHECKED
-        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC, CHECKED
+        MENUITEM "标准型", IDM_VIEW_STANDARD
+        MENUITEM "科学型", IDM_VIEW_SCIENTIFIC
         MENUITEM "转换", IDM_VIEW_CONVERSION
         MENUITEM SEPARATOR
         MENUITEM "数字分组", IDM_VIEW_GROUP, CHECKED

reactos/base/applications/calc/winmain.c

@@ -225,38 +225,40 @@ calc_t calc;
 
 static void load_config(void)
 {
-    TCHAR buf[32];
     DWORD tmp;
-#if _WIN32_WINNT >= 0x0500
     HKEY hKey;
-#endif
     
+    /* If no settings are found in the registry, then use the default options */
+    calc.layout = CALC_LAYOUT_STANDARD;
+    calc.usesep = FALSE;
+
+    /* Get the configuration based on what version of Windows that's being used */
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) 
+    {
         /* Try to load last selected layout */
-    GetProfileString(TEXT("SciCalc"), TEXT("layout"), TEXT("0"), buf, SIZEOF(buf));
-    if (_stscanf(buf, TEXT("%lu"), &calc.layout) != 1)
+        tmp = sizeof(calc.layout);
+        if (RegQueryValueEx(hKey, TEXT("layout"), NULL, NULL, (LPBYTE)&calc.layout, &tmp) != ERROR_SUCCESS)
             calc.layout = CALC_LAYOUT_STANDARD;
 
         /* Try to load last selected formatting option */
-    GetProfileString(TEXT("SciCalc"), TEXT("UseSep"), TEXT("0"), buf, SIZEOF(buf));
-    if (_stscanf(buf, TEXT("%lu"), &tmp) != 1)
+        tmp = sizeof(calc.usesep);
+        if (RegQueryValueEx(hKey, TEXT("UseSep"), NULL, NULL, (LPBYTE)&calc.usesep, &tmp) != ERROR_SUCCESS)
             calc.usesep = FALSE;
-    else
-        calc.usesep = (tmp == 1) ? TRUE : FALSE;
+
+        /* close the key */
+        RegCloseKey(hKey);
+    }
 
     /* memory is empty at startup */
     calc.is_memory = FALSE;
 
-#if _WIN32_WINNT >= 0x0500
     /* empty these values */
     calc.sDecimal[0] = TEXT('\0');
     calc.sThousand[0] = TEXT('\0');
 
     /* try to open the registry */
-    if (RegOpenKeyEx(HKEY_CURRENT_USER, 
-                     TEXT("Control Panel\\International"),
-                     0,
-                     KEY_QUERY_VALUE,
-                     &hKey) == ERROR_SUCCESS) {
+    if (RegOpenKeyEx(HKEY_CURRENT_USER, TEXT("Control Panel\\International"), 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS)
+    {
         /* get these values (ignore errors) */
         tmp = sizeof(calc.sDecimal);
         RegQueryValueEx(hKey, TEXT("sDecimal"), NULL, NULL, (LPBYTE)calc.sDecimal, &tmp);
@@ -277,20 +279,24 @@ static void load_config(void)
     /* get the string lengths */
     calc.sDecimal_len = _tcslen(calc.sDecimal);
     calc.sThousand_len = _tcslen(calc.sThousand);
-#else
-    /* acquire regional settings */
-    calc.sDecimal_len  = GetProfileString(TEXT("intl"), TEXT("sDecimal"), TEXT("."), calc.sDecimal, SIZEOF(calc.sDecimal));
-    calc.sThousand_len = GetProfileString(TEXT("intl"), TEXT("sThousand"), TEXT(","), calc.sThousand, SIZEOF(calc.sThousand));
-#endif
 }
 
 static void save_config(void)
 {
-    TCHAR buf[32];
+    HKEY hKey;
+    DWORD sepValue;
 
-    _stprintf(buf, TEXT("%lu"), calc.layout);
-    WriteProfileString(TEXT("SciCalc"), TEXT("layout"), buf);
-    WriteProfileString(TEXT("SciCalc"), TEXT("UseSep"), (calc.usesep==TRUE) ? TEXT("1") : TEXT("0"));
+    if (RegCreateKeyEx(HKEY_CURRENT_USER, TEXT("SOFTWARE\\Microsoft\\Calc"), 0, NULL, REG_OPTION_NON_VOLATILE, KEY_SET_VALUE, NULL, &hKey, NULL) != ERROR_SUCCESS)
+    {
+        return;
+    }
+    
+    sepValue = (calc.usesep) ? 1 : 0;
+
+    RegSetValueEx(hKey, TEXT("layout"), 0, REG_DWORD, (const BYTE*)&calc.layout, sizeof(calc.layout));
+    RegSetValueEx(hKey, TEXT("UseSep"), 0, REG_DWORD, (const BYTE*)&sepValue, sizeof(sepValue));
+
+    RegCloseKey(hKey);
 }
 
 static LRESULT post_key_press(LPARAM lParam, WORD idc)
@@ -657,7 +663,33 @@ static void update_menu(HWND hwnd)
     HMENU        hMenu = GetSubMenu(GetMenu(hwnd), 1);
     unsigned int x;
 
-    for (x=0; x<SIZEOF(upd); x++) {
+    /* Sets the state of the layout in the menu based on the configuration file */
+    if (calc.layout == CALC_LAYOUT_SCIENTIFIC)
+    {
+        CheckMenuRadioItem(GetMenu(hwnd),
+                           IDM_VIEW_STANDARD,
+                           IDM_VIEW_CONVERSION,
+                           IDM_VIEW_SCIENTIFIC,
+                           MF_BYCOMMAND);
+    }
+    else if (calc.layout == CALC_LAYOUT_CONVERSION)
+    {
+        CheckMenuRadioItem(GetMenu(hwnd),
+                           IDM_VIEW_STANDARD,
+                           IDM_VIEW_CONVERSION,
+                           IDM_VIEW_CONVERSION,
+                           MF_BYCOMMAND);
+    }
+    else
+    {
+        CheckMenuRadioItem(GetMenu(hwnd),
+                           IDM_VIEW_STANDARD,
+                           IDM_VIEW_CONVERSION,
+                           IDM_VIEW_STANDARD,
+                           MF_BYCOMMAND);
+    }
+
+    for (x=3; x<SIZEOF(upd); x++) {
         if (*(upd[x].sel) != upd[x].idc) {
             CheckMenuItem(hMenu, upd[x].idm, MF_BYCOMMAND|MF_UNCHECKED);
             SendMessage((HWND)GetDlgItem(hwnd,upd[x].idc),BM_SETCHECK,FALSE,0L);
@@ -1225,6 +1257,7 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
 {
     unsigned int x;
     RECT         rc;
+    HMENU        hMenu;
 
     switch (msg) {
     case WM_DRAWITEM:
@@ -1258,6 +1291,11 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
         /* set our calc icon */
         SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_BIG)));
         SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)LoadIcon(calc.hInstance, MAKEINTRESOURCE(IDI_CALC_SMALL)));
+
+        /* Sets the state of the option to group digits */
+        hMenu = GetSubMenu(GetMenu(hWnd), 1);
+        CheckMenuItem(hMenu, IDM_VIEW_GROUP, (calc.usesep ? MF_CHECKED : MF_UNCHECKED));
+
         /* update text for decimal button */
         SendDlgItemMessage(hWnd, IDC_BUTTON_DOT, WM_SETTEXT, (WPARAM)0, (LPARAM)calc.sDecimal);
         /* Fill combo box for conversion */
@@ -1312,18 +1350,36 @@ static INT_PTR CALLBACK DlgMainProc(HWND hWnd, UINT msg, WPARAM wp, LPARAM lp)
             calc.action = IDM_VIEW_STANDARD;
             DestroyWindow(hWnd);
             save_config();
+
+            CheckMenuRadioItem(GetMenu(hWnd),
+                               IDM_VIEW_STANDARD,
+                               IDM_VIEW_CONVERSION,
+                               IDM_VIEW_STANDARD,
+                               MF_BYCOMMAND);
             return TRUE;
         case IDM_VIEW_SCIENTIFIC:
             calc.layout = CALC_LAYOUT_SCIENTIFIC;
             calc.action = IDM_VIEW_SCIENTIFIC;
             DestroyWindow(hWnd);
             save_config();
+
+            CheckMenuRadioItem(GetMenu(hWnd),
+                               IDM_VIEW_STANDARD,
+                               IDM_VIEW_CONVERSION,
+                               IDM_VIEW_SCIENTIFIC,
+                               MF_BYCOMMAND);
             return TRUE;
         case IDM_VIEW_CONVERSION:
             calc.layout = CALC_LAYOUT_CONVERSION;
             calc.action = IDM_VIEW_CONVERSION;
             DestroyWindow(hWnd);
             save_config();
+
+            CheckMenuRadioItem(GetMenu(hWnd),
+                               IDM_VIEW_STANDARD,
+                               IDM_VIEW_CONVERSION,
+                               IDM_VIEW_CONVERSION,
+                               MF_BYCOMMAND);
             return TRUE;
         case IDM_VIEW_HEX:
         case IDM_VIEW_DEC:
@@ -1715,8 +1771,7 @@ int WINAPI _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdL
         /* ignore hwnd: dialogs are already visible! */
         if (calc.layout == CALC_LAYOUT_SCIENTIFIC)
             dwLayout = IDD_DIALOG_SCIENTIFIC;
-        else
-        if (calc.layout == CALC_LAYOUT_CONVERSION)
+        else if (calc.layout == CALC_LAYOUT_CONVERSION)
             dwLayout = IDD_DIALOG_CONVERSION;
         else
             dwLayout = IDD_DIALOG_STANDARD;

reactos/base/applications/charmap/charmap.c

@@ -34,6 +34,9 @@ EnumFontNames(ENUMLOGFONTEXW *lpelfe,
     HWND hwndCombo = (HWND)lParam;
     LPWSTR pszName  = lpelfe->elfLogFont.lfFaceName;
 
+    /* Skip rotated font */
+    if(pszName[0] == L'@') return 1;
+
     /* make sure font doesn't already exist in our list */
     if(SendMessageW(hwndCombo,
                     CB_FINDSTRINGEXACT,
@@ -321,7 +324,7 @@ CharMapDlgProc(HWND hDlg,
 
             ChangeMapFont(hDlg);
 
-            // Configure Richedi control for sending notification changes.
+            // Configure Richedit control for sending notification changes.
             evMask = SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_GETEVENTMASK, 0, 0);
             evMask |= ENM_CHANGE;
             SendDlgItemMessage(hDlg, IDC_TEXTBOX, EM_SETEVENTMASK, 0, (LPARAM)evMask);

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

@@ -50,7 +50,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) koşulları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBİR GÜVENCESİ YOKTUR, SATILABİLİRLİĞİN ve BELİRLİ BİR AMACA UYGUNLUĞUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eğer yoksa Özgür Yazılım Vakfı AŞ'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis 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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBİR GÜVENCESİ YOKTUR, SATILABİLİRLİĞİN ve BELİRLİ BİR AMACA UYGUNLUĞUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eğer yoksa Özgür Yazılım Vakfı AŞ'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis 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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
     IDS_ABOUT "&Üzerine..."
     IDS_TITLE "Damga Eşlemi"
 END

reactos/base/applications/charmap/lrgcell.c

@@ -35,7 +35,7 @@ SetLrgFont(PMAP infoPtr)
         {
             SendMessageW(hCombo,
                          WM_GETTEXT,
-                         31,
+                         Len + 1,
                          (LPARAM)lpFontName);
 
             ZeroMemory(&lf,

reactos/base/applications/charmap/map.c

@@ -14,6 +14,8 @@
 static const WCHAR szMapWndClass[] = L"FontMapWnd";
 static const WCHAR szLrgCellWndClass[] = L"LrgCellWnd";
 
+#define MAX_ROWS (0xFFFF / XCELLS) + 1 - YCELLS
+
 static
 VOID
 TagFontToCell(PCELL pCell,
@@ -377,7 +379,7 @@ OnCreate(PMAP infoPtr,
 
             SetGrid(infoPtr);
 
-            SetScrollRange(hwnd, SB_VERT, 0, 255, FALSE);
+            SetScrollRange(hwnd, SB_VERT, 0, MAX_ROWS, FALSE);
             SetScrollPos(hwnd, SB_VERT, 0, TRUE);
 
             Ret = TRUE;
@@ -423,7 +425,7 @@ OnVScroll(PMAP infoPtr,
        }
 
     infoPtr->iYStart = max(0,
-                         min(infoPtr->iYStart, 255*16));
+                         min(infoPtr->iYStart, MAX_ROWS));
 
     iYDiff = iOldYStart - infoPtr->iYStart;
     if (iYDiff)

reactos/base/applications/cmdutils/CMakeLists.txt

@@ -11,6 +11,8 @@ add_subdirectory(more)
 add_subdirectory(reg)
 add_subdirectory(sort)
 add_subdirectory(taskkill)
+add_subdirectory(tree)
+add_subdirectory(whoami)
 add_subdirectory(wmic)
 add_subdirectory(wscript)
 add_subdirectory(xcopy)

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

@@ -27,61 +27,88 @@
  *
  */
 
-
 #include <windows.h>
 #include <tchar.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <assert.h>
 
 #define STRBUF 1024
 
 /* getline:  read a line, return length */
-INT GetLine(char *line, FILE *in)
+INT GetBuff(char *buff, FILE *in)
 {
-    if (fgets(line, STRBUF, in) == NULL)
-        return 0;
-    else
-        return strlen(line);
+    return fread(buff, 1, STRBUF, in);
 }
 
-/* print program usage */
+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)
 {
     _tprintf(_T("\nCompares the contents of two files or sets of files.\n\n"
-                "COMP [data1] [data2]\n\n"
+                "COMP [/L] [/A] [data1] [data2]\n\n"
                 "  data1      Specifies location and name of first file to compare.\n"
-                "  data2      Specifies location and name of second file to compare.\n"));
+                "  data2      Specifies location and name of second file to compare.\n"
+                "  /A         Display differences in ASCII characters.\n"
+                "  /L         Display line numbers for differences.\n"));
 }
 
 
 int _tmain (int argc, TCHAR *argv[])
 {
     INT i;
-    FILE *fp1, *fp2;           // file pointers
-    PTCHAR Line1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR));
-    PTCHAR Line2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR));
-    TCHAR File1[_MAX_PATH],    // file paths
-          File2[_MAX_PATH];
-    BOOL bMatch = TRUE,        // files match
-         bAscii = FALSE,       // /A switch
-         bLineNos = FALSE;     // /L switch
 
-    /* parse command line for options */
+    /* File pointers */
+    FILE *fp1 = NULL;
+    FILE *fp2 = NULL;
+
+    INT BufLen1, BufLen2;
+    PTCHAR Buff1 = NULL;
+    PTCHAR Buff2 = NULL;
+    TCHAR 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] == '/')
         {
-            --argc;
-            switch (argv[i][1]) {
-               case 'A': bAscii = TRUE;
-                         _tprintf(_T("/a not Supported\n")); (void)bAscii;   /*FIXME: needs adding */
+            switch (argv[i][1])
+            {
+                case 'A':
+                    bAscii = TRUE;
+                    NumberOfOptions++;
                     break;
-               case 'L': bLineNos = TRUE;
-                         _tprintf(_T("/l not supported\n")); (void)bLineNos; /*FIXME: needs adding */
+
+                case 'L':
+                    bLineNos = TRUE;
+                    NumberOfOptions++;
                     break;
-               case '?': Usage();
+
+                case '?':
+                    Usage();
                     return EXIT_SUCCESS;
+
                 default:
                     _tprintf(_T("Invalid switch - /%c\n"), argv[i][1]);
                     Usage();
@@ -90,92 +117,139 @@ int _tmain (int argc, TCHAR *argv[])
         }
     }
 
-    switch (argc)
+    if (argc - NumberOfOptions == 3)
     {
-        case 1 :
-                 _tprintf(_T("Name of first file to compare: "));
-                 fgets(File1, _MAX_PATH, stdin);
-                 for (i=0; i<_MAX_PATH; i++)
-                 {
-                     if (File1[i] == '\n')
-                     {
-                         File1[i] = '\0';
-                         break;
+        _tcsncpy(File1, argv[1 + NumberOfOptions], _MAX_PATH);
+        _tcsncpy(File2, argv[2 + NumberOfOptions], _MAX_PATH);
     }
-                 }
-
-                 _tprintf(_T("Name of second file to compare: "));
-                 fgets(File2, _MAX_PATH, stdin);
-                 for (i=0; i<_MAX_PATH; i++)
+    else
     {
-                     if (File2[i] == '\n')
-                     {
-                         File2[i] = '\0';
-                         break;
-                     }
-                 }
-                 break;
-        case 2 :
-                 _tcsncpy(File1, argv[1], _MAX_PATH);
-                 _tprintf(_T("Name of second file to compare: "));
-                 fgets(File2, _MAX_PATH, stdin);
-                 for (i=0; i<_MAX_PATH; i++)
-                 {
-                     if (File2[i] == '\n')
-                     {
-                         File2[i] = '\0';
-                         break;
-                     }
-                 }
-                 break;
-        case 3 :
-                 _tcsncpy(File1, argv[1], _MAX_PATH);
-                 _tcsncpy(File2, argv[2], _MAX_PATH);
-                 break;
-        default :
         _tprintf(_T("Bad command line syntax\n"));
         return EXIT_FAILURE;
-                  break;
     }
 
+    Buff1 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR));
+    if (Buff1 == NULL)
+    {
+        _tprintf(_T("Can't get free memory for Buff1\n"));
+        return EXIT_FAILURE;
+    }
 
+    Buff2 = (TCHAR *)malloc(STRBUF * sizeof(TCHAR));
+    if (Buff2 == NULL)
+    {
+        _tprintf(_T("Can't get free memory for Buff2\n"));
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
 
-    if ((fp1 = fopen(File1, "r")) == NULL)
+    if ((fp1 = fopen(File1, "rb")) == NULL)
     {
         _tprintf(_T("Can't find/open file: %s\n"), File1);
-        return EXIT_FAILURE;
+        Status = EXIT_FAILURE;
+        goto Cleanup;
     }
-    if ((fp2 = fopen(File2, "r")) == NULL)
+    if ((fp2 = fopen(File2, "rb")) == NULL)
     {
         _tprintf(_T("Can't find/open file: %s\n"), File2);
-        fclose(fp1);
-        return EXIT_FAILURE;
+        Status = EXIT_FAILURE;
+        goto Cleanup;
     }
 
 
     _tprintf(_T("Comparing %s and %s...\n"), File1, File2);
 
-    while ((GetLine(Line1, fp1) != 0) &&
-           (GetLine(Line2, fp2) != 0))
+    FileSizeFile1 = FileSize(fp1);
+    if (FileSizeFile1 == -1)
     {
-        // LineCount++;
-        while ((*Line1 != '\0') && (*Line2 != '\0'))
+        _tprintf(_T("Can't determine size of file: %s\n"), File1);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    FileSizeFile2 = FileSize(fp2);
+    if (FileSizeFile2 == -1)
     {
-            if (*Line1 != *Line2)
+        _tprintf(_T("Can't determine size of file: %s\n"), File2);
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    if (FileSizeFile1 != FileSizeFile2)
     {
-                bMatch = FALSE;
+        _tprintf(_T("Files are different sizes.\n"));
+        Status = EXIT_FAILURE;
+        goto Cleanup;
+    }
+
+    LineNumber = 1;
+    Offset = 0;
+    while (1)
+    {
+        BufLen1 = GetBuff(Buff1, fp1);
+        BufLen2 = GetBuff(Buff2, fp2);
+
+        if (ferror(fp1) || ferror(fp2))
+        {
+            _tprintf(_T("Files read error.\n"));
+            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)
+                {
+                    _tprintf(_T("Compare error at LINE %d\n"), LineNumber);
+                }
+                else
+                {
+                    _tprintf(_T("Compare error at OFFSET %d\n"), Offset);
+                }
+
+                if (bAscii)
+                {
+                    _tprintf(_T("file1 = %c\n"), Buff1[i]);
+                    _tprintf(_T("file2 = %c\n"), Buff2[i]);
+                }
+                else
+                {
+                    _tprintf(_T("file1 = %X\n"), Buff1[i]);
+                    _tprintf(_T("file2 = %X\n"), Buff2[i]);
+                }
+
+                Offset++;
+
+                if (Buff1[i] == '\n')
+                    LineNumber++;
             }
-            Line1++, Line2++;
          }
     }
 
-    bMatch ? _tprintf(_T("Files compare OK\n")) : _tprintf(_T("Files are different sizes.\n"));
+    if (FilesOK)
+        _tprintf(_T("Files compare OK\n"));
 
+Cleanup:
+    if (fp1)
         fclose(fp1);
+    if (fp2)
         fclose(fp2);
 
+    if (Buff1)
+        free(Buff1);
+    if (Buff2)
+        free(Buff2);
 
-    return EXIT_SUCCESS;
+    return Status;
 }
+
 /* EOF */

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

@@ -6,7 +6,7 @@
  *             2011-10-17  diacritics change, other minor changes
  */
 
-LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN

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

@@ -1,4 +1,4 @@
-/*
+/*
  * Russian language file by Andrey Korotaev (unC0Rr@inbox.ru) and Aleksey Bragin (aleksey@reactos.com)
  * Copyright 2005
  */

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

@@ -4,14 +4,14 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 STRINGTABLE
 BEGIN
-    IDS_NO_ENTRY "This command is not supported by the help utility.\nTry ""%s /?""\n."
+    IDS_NO_ENTRY "通过帮助实用程序不支持此命令。\n试 ""%s /?""\n。"
 END
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "Provides Help information for ReactOS commands.\n\n\
+    IDS_USAGE "提供ReactOS命令的帮助信息。\n\n\
 HELP [command]\n\n\
-  command - Display help information for this command.\n"
+  command - 显示此命令的帮助信息。\n"
     IDS_HELP1 "列出所有可用命令 (+ 它们的描述)\n\n\
   help 命令\n\
   命令 /?         得到特定命令的更多信息\n\n\

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

@@ -2,7 +2,7 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
-    IDS_USAGE "Wy<EFBFBD>wietla obecn<EFBFBD> nazw<EFBFBD> komputera.\n\nhostname"
+    IDS_USAGE "Wyświetla obecną nazwę komputera.\n\nhostname"
     IDS_NOSET "Opcja hostname -s nie jest wspierana."
-    IDS_ERROR "B<EFBFBD><EFBFBD>d Win32"
+    IDS_ERROR "Błąd Win32"
 END

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

@@ -0,0 +1,6 @@
+
+add_executable(tree tree.c tree.rc)
+set_module_type(tree win32cui UNICODE)
+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/lang/de-DE.rc

@@ -0,0 +1,12 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Zeigt die Ordnerstruktur eines Laufwerks oder Pfads grafisch an.\n\n\
+TREE [Laufwerk:][Pfad] [/F] [/A]\n\n\
+\t/F   Zeigt die Namen der Dateien in jedem Ordner an.\n\
+\t/A   Verwendet den ASCII- statt des erweiterten Zeichensatzes.\n"
+    IDS_NO_SUBDIRECTORIES "Es sind keine Unterordner vorhanden"
+    IDS_FOLDER_PATH "Auflistung der Ordnerpfade\n"
+    IDS_VOL_SERIAL "Volumeseriennummer : %x:%x\n"
+END

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

@@ -0,0 +1,12 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Visually displays the folder structure of a drive or path.\n\n\
+TREE [drive:][path] [/F] [/A]\n\n\
+\t/F   Display the names of the files in each folder.\n\
+\t/A   Use ASCII instead of extended characters.\n"
+    IDS_NO_SUBDIRECTORIES "No subdirectories exist"
+    IDS_FOLDER_PATH "Folder PATH Listing\n"
+    IDS_VOL_SERIAL "Volume serial number is %x:%x\n"
+END

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

@@ -0,0 +1,12 @@
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Affiche graphiquement la structure des dossiers d'un lecteur ou d'un chemin.\n\n\
+TREE [lecteur:][chemin] [/F] [/A]\n\n\
+\t/F   Affiche le nom des fichiers dans chaque dossier.\n\
+\t/A   Utiliser l'ASCII au lieu de l'unicode.\n"
+    IDS_NO_SUBDIRECTORIES "Aucun sous-répertoire n'existe"
+    IDS_FOLDER_PATH "Énumération du dossier\n"
+    IDS_VOL_SERIAL "Le numéro de série du volume est %x:%x\n"
+END

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

@@ -0,0 +1,12 @@
+LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Afișează o structura de fișiere a unui director sau unități de stocare.\n\n\
+TREE [unitate:][cale] [/F] [/A]\n\n\
+\t/F   Afișează numele fișierelor din fiecare director.\n\
+\t/A   Folosește ASCII în loc de caractere extinse.\n"
+    IDS_NO_SUBDIRECTORIES "Nu există subdirectoare"
+    IDS_FOLDER_PATH "Enumerarea directorului CALE\n"
+    IDS_VOL_SERIAL "Numărul de serie al volumului este %x:%x\n"
+END

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

@@ -0,0 +1,14 @@
+/* Russian translation by Kudratov Olimjon (olim98@bk.ru) */
+
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USAGE "Графическое представление структуры папок или пути.\n\n\
+TREE [диск:][путь] [/F] [/A]\n\n\
+\t/F   Вывод имен файлов в каждой папке.\n\
+\t/A   Использовать символы ASCII вместо символов национальных алфавитов..\n"
+    IDS_NO_SUBDIRECTORIES "Подпапки отсутствуют"
+    IDS_FOLDER_PATH "Структура папок\n"
+    IDS_VOL_SERIAL "Серийный номер тома %x:%x\n"
+END

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

@@ -0,0 +1,6 @@
+#pragma once
+
+#define IDS_USAGE              0
+#define IDS_NO_SUBDIRECTORIES  1
+#define IDS_FOLDER_PATH        2
+#define IDS_VOL_SERIAL         3

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

@@ -0,0 +1,397 @@
+/*
+ * PROJECT:     ReactOS
+ * LICENSE:     GNU GPLv2 only as published by the Free Software Foundation
+ * PURPOSE:     Implements tree.com functionality 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 "resource.h"
+
+#define STR_MAX 2048
+
+static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine);
+
+/* if this flag is set to true, files will also be listed */
+BOOL bShowFiles = FALSE;
+
+/* 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
+*
+* @param strPath 
+* Must specify folder name
+*
+* @return
+* true if folder has sub folders, else will return false
+*/
+static BOOL HasSubFolder(const wchar_t *strPath1)
+{
+    BOOL ret = FALSE;
+    WIN32_FIND_DATA FindFileData;
+    HANDLE hFind = NULL;
+    static wchar_t strPath[STR_MAX] = L"";
+    ZeroMemory(strPath, sizeof(strPath));
+
+    wcscat(strPath, strPath1);
+    wcscat(strPath, L"\\*.");
+
+    hFind = FindFirstFile(strPath, &FindFileData);
+    do
+    {
+        if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+        {
+            if (wcscmp(FindFileData.cFileName, L".") == 0 ||
+                wcscmp(FindFileData.cFileName, L"..") == 0 )
+            {
+                continue;
+            }
+
+            ret = TRUE;  //found subfolder
+            break;
+        }
+    }
+    while (FindNextFile(hFind, &FindFileData));
+
+    FindClose(hFind);
+    return ret;
+}
+
+/**
+ * @name: DrawTree
+ *
+ * @param strPath
+ * Must specify folder name
+ *
+ * @param arrFolder
+ * must be a list of folder names to be drawn in tree format
+ *
+ * @param width
+ * specifies drawing distance for correct formatting of tree structure being drawn on console screen
+ * used internally for adding spaces
+ *
+ * @param prevLine
+ * used internally for formatting reasons
+ *
+ * @return
+ * void
+ */
+static void DrawTree(const wchar_t* strPath,
+                     const WIN32_FIND_DATA *arrFolder,
+                     const size_t szArr,
+                     UINT width,
+                     const wchar_t *prevLine,
+                     BOOL drawfolder)
+{
+    BOOL bHasSubFolder = HasSubFolder(strPath);
+    UINT i = 0;
+
+    /* 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);
+        UINT j = 0;
+        static wchar_t 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"");
+        //wcscpy_s(str, STR_MAX, L"");
+        wcscpy(consoleOut, L"");
+        wcscpy(str, L"");
+
+        for (j = 0; j < width - 1; ++j)
+        {
+            /* 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 (bUseAscii)
+                {
+                    wchar_t a[] = {179, 0};
+                    wcscat(consoleOut, a);
+                }
+                else
+                {
+                    wcscat(consoleOut, L"|");
+                }
+            }
+            else
+            {
+                wcscat(consoleOut, L" ");
+            }
+        }
+
+        if (szArr - 1 != i)
+        {
+            if (drawfolder)
+            {
+                /* will add '├───Folder name */
+                if (bUseAscii)
+                    wsprintf(str, L"+---%s", (wchar_t*)arrFolder[i].cFileName);
+                else
+                    wsprintf(str, L"%c%c%c%c%s", 195, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName);
+            }
+            else
+            {
+                if (bHasSubFolder)
+                {
+                    /* will add '│   FileNamw'  //thie line is added to connect
+                       the belowfolder sub structure */
+                    if (bUseAscii)
+                        wsprintf(str,L"|   %s", (wchar_t*)arrFolder[i].cFileName);
+                    else
+                        wsprintf(str,L"%c   %s", 179, (wchar_t*)arrFolder[i].cFileName);
+                }
+                else
+                {
+                    /* will add '    FileNamw' */
+                    wsprintf(str,L"     %s", (wchar_t*)arrFolder[i].cFileName);
+                }
+            }
+        }
+        else
+        {
+            if (drawfolder)
+            {
+                /* '└───Folder name' */
+                if (bUseAscii)
+                    wsprintf(str, L"\\---%s", (wchar_t*)arrFolder[i].cFileName);
+                else
+                    wsprintf(str, L"%c%c%c%c%s", 192, 196, 196, 196, (wchar_t*)arrFolder[i].cFileName);
+            }
+            else
+            {
+                if (bHasSubFolder)
+                {
+                    /* '│   FileName' */
+                    if (bUseAscii)
+                        wsprintf(str, L"|   %s", (wchar_t*)arrFolder[i].cFileName);
+                    else
+                        wsprintf(str, L"%c   %s", 179, (wchar_t*)arrFolder[i].cFileName);
+                }
+                else
+                {
+                    /* '    FileName' */
+                    wsprintf(str, L"     %s", (wchar_t*)arrFolder[i].cFileName);
+                }
+            }
+        }
+
+        wcscat(consoleOut, str);
+        wprintf(L"%s\n", consoleOut);
+
+        if (drawfolder)
+        {
+          wchar_t *str = (wchar_t*)malloc(STR_MAX * sizeof(wchar_t));
+          ZeroMemory(str, STR_MAX * sizeof(wchar_t));
+
+          wcscat(str, strPath);
+          wcscat(str, L"\\");
+          wcscat(str, arrFolder[i].cFileName);
+          GetDirectoryStructure(str, width + 4, consoleOut);
+
+          free(str);
+        }
+        free(consoleOut);
+    }
+}
+
+/**
+ * @name: GetDirectoryStructure
+ * 
+ * @param strPath
+ * Must specify folder name
+ *
+ * @param width
+ * specifies drawing distance for correct formatting of tree structure being drawn on console screen
+ *
+ * @param prevLine
+ * specifies the previous line written on console, is used for correct formatting
+ * @return
+ * void
+ */
+static void
+GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine)
+{
+    WIN32_FIND_DATA FindFileData;
+    HANDLE hFind = NULL;
+    //DWORD err = 0;
+    /* will fill up with names of all sub folders */
+    WIN32_FIND_DATA *arrFolder = NULL;
+    UINT arrFoldersz = 0;
+    /* will fill up with names of all sub folders */
+    WIN32_FIND_DATA *arrFile = NULL;
+    UINT arrFilesz = 0;
+
+    ZeroMemory(&FindFileData, sizeof(FindFileData));
+
+    {
+        static wchar_t tmp[STR_MAX] = L"";
+        ZeroMemory(tmp, sizeof(tmp));
+        wcscat(tmp, strPath);
+        wcscat(tmp, L"\\*.*");
+        hFind = FindFirstFile(tmp, &FindFileData);
+        //err = GetLastError(); 
+    }
+
+    if (hFind == INVALID_HANDLE_VALUE)
+        return;
+
+    do
+    {
+        if (FindFileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
+        {
+            if (wcscmp(FindFileData.cFileName, L".") == 0 ||
+                wcscmp(FindFileData.cFileName, L"..") == 0)
+                continue;
+
+            ++arrFoldersz;
+            arrFolder = (WIN32_FIND_DATA*)realloc(arrFolder, arrFoldersz * sizeof(FindFileData));
+
+            if (arrFolder == NULL)
+                exit(-1);
+
+            arrFolder[arrFoldersz - 1] = FindFileData;
+
+        }
+        else
+        {
+            ++arrFilesz;
+            arrFile = (WIN32_FIND_DATA*)realloc(arrFile, arrFilesz * sizeof(FindFileData));
+
+            if(arrFile == NULL)
+                exit(-1);
+
+            arrFile[arrFilesz - 1] = FindFileData;
+        }
+    }
+    while (FindNextFile(hFind, &FindFileData));
+
+    FindClose(hFind);
+
+    if (bShowFiles)
+    {
+        /* will free(arrFile) */
+        DrawTree(strPath, arrFile, arrFilesz, width, prevLine, FALSE);
+    }
+
+    /* will free(arrFile) */
+    DrawTree(strPath, arrFolder, arrFoldersz, width, prevLine, TRUE);
+
+    free(arrFolder);
+    free(arrFile);
+}
+
+/**
+* @name: main
+* standard main functionality as required by C/C++ for application startup
+*
+* @return
+* error /success value
+*/
+int wmain( int argc, wchar_t *argv[])
+{
+    DWORD dwSerial = 0;
+    wchar_t t = 0;
+    wchar_t *strPath = NULL;
+    DWORD sz = 0;
+    //wchar_t *context = NULL;
+    wchar_t *driveLetter = NULL;
+
+    int i;
+
+    /* parse the command line */
+    for (i = 1; i < argc; ++i)
+    {
+        if (argv[i][0] == L'-' || argv[i][0] == L'/')
+        {
+            switch (towlower(argv[i][1]))
+            {
+                case L'?':
+                    /* will print help and exit after */
+                    PrintResourceString(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 */
+
+            /* will set the current directory for this executable */
+            BOOL b = SetCurrentDirectoryW(argv[i]);
+            if (b == FALSE)
+            {
+                PrintResourceString(IDS_NO_SUBDIRECTORIES);
+                return 1;
+            }
+        }
+    }
+
+    PrintResourceString(IDS_FOLDER_PATH);
+
+    GetVolumeInformation(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0);
+    PrintResourceString(IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff);
+
+    /* get the buffer size */
+    sz = GetCurrentDirectory(1, &t);
+    /* must not return before calling delete[] */
+    strPath = (wchar_t*)malloc(sizeof(wchar_t) * sz);
+
+    /* get the current directory */
+    GetCurrentDirectory(sz, strPath);
+
+    /* get the drive letter , must not return before calling delete[] */
+    driveLetter = (wchar_t*)malloc(sizeof(wchar_t) * sz);
+
+    /* 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);
+    //wcstok_s(driveLetter,L":", &context); //parse for the drive letter
+    wcscpy(driveLetter, strPath);
+    wcstok(driveLetter, L":");
+
+    wprintf(L"%s:.\n", driveLetter);
+
+    free(driveLetter);
+
+    /* get the sub directories within this current folder */
+    GetDirectoryStructure(strPath, 1, L"          ");
+
+    free(strPath);
+    wprintf(L"\n");
+
+    return 0;
+}

reactos/base/applications/cmdutils/tree/tree.rc

@@ -0,0 +1,28 @@
+#include <windef.h>
+
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION  "ReactOS Tree Walk Utility"
+#define REACTOS_STR_INTERNAL_NAME     "tree"
+#define REACTOS_STR_ORIGINAL_FILENAME "tree.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_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

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

@@ -0,0 +1,5 @@
+
+add_executable(whoami whoami.c whoami.rc)
+set_module_type(whoami win32cui UNICODE)
+add_importlibs(whoami user32 secur32 advapi32 msvcrt kernel32)
+add_cd_file(TARGET whoami DESTINATION reactos/system32 FOR all)

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

@@ -0,0 +1,56 @@
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USER_HEADER "BENUTZERINFORMATIONEN"
+    IDS_GROU_HEADER "GRUPPENINFORMATIONEN"
+    IDS_PRIV_HEADER "BERECHTIGUNGSINFORMATIONEN"
+    IDS_COL_USER_NAME "Benutzername"
+    IDS_COL_GROUP_NAME "Gruppenname"
+    IDS_COL_TYPE "Typ"
+    IDS_COL_SID "SID"
+    IDS_COL_ATTRIB "Attribute"
+    IDS_COL_PRIV_NAME "Berechtigungsname"
+    IDS_COL_DESCRIPTION "Beschreibung"
+    IDS_COL_STATE "Status"
+    IDS_TP_WELL_KNOWN_GROUP "Bekannte Gruppe"
+    IDS_TP_ALIAS "Alias"
+    IDS_TP_LABEL "Bezeichnung"
+
+    /* [!] important note from the programmer: the program tries to remove
+       the last ', ' after concatenating, so keep than in mind when translating.
+
+       you can test your translation of these attributes by using 'whoami /groups' */
+
+    IDS_ATTR_GROUP_MANDATORY "Verbindliche Gruppe, "
+    IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Standardmäßig aktiviert, "
+    IDS_ATTR_GROUP_ENABLED "Aktivierte Gruppe, "
+    IDS_ATTR_GROUP_OWNER "Gruppenbesitzer, "
+    IDS_UNKNOWN_DESCRIPTION "???"
+    IDS_STATE_ENABLED "Aktiviert"
+    IDS_STATE_DISABLED "Deaktiviert"
+    IDS_ERROR_UPN "FEHLER: Der UPN (User Principal Name) konnte nicht abgerufen werden, da\nder aktuelle Benutzer kein Domänenbenutzer ist.\n"
+    IDS_ERROR_FQDN "FEHLER: Der FQDN (Fully Qualified Distinguished Name) konnte nicht\nabgerufen werden, da der aktuelle Benutzer kein Domänenbenutzer ist.\n"
+    IDS_ERROR_VALUEXPECTED "FEHLER: Ungültige Syntax. Wert für '/fo' erwartet.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n"
+    IDS_ERROR_VALUENOTALLOWED "FEHLER: Das angegebene Format (/FO) ist ungültig.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n"
+    IDS_ERROR_1TIMES "FEHLER: Ungültige Syntax. Option ""%s"" darf nicht mehr als '1' Mal verwendet werden.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n"
+    IDS_ERROR_INVALIDSYNTAX "FEHLER: Ungültige Syntax.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n"
+    IDS_ERROR_INVALIDARG "FEHLER: Argument/Option ungültig - '%s'.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n"
+    IDS_ERROR_NH_LIST "FEHLER: Option /NH kann nicht mit Format LIST verwendet werden.\nGeben Sie ""WHOAMI /?"" ein, um die Syntax anzuzeigen.\n"
+    IDS_HELP "BESCHREIBUNG:\n\
+  Ermittelt Benutzername, Gruppen und Berechtigungen für den aktuellen Benutzer auf dem lokalen System.\n\
+  Ohne Parameterangabe werden die aktuelle Domäne und Benutzername angezeigt.\n\
+\n\
+  Gültige Ausgabeformate für den '/fo' Parameter sind 'CSV', 'LIST' und 'TABLE'.\n\
+  '/nh' legt fest, dass der Spaltenheader nicht in der Ausgabe angezeigt wird. Standardmäßig werden diese in einer TABLE angezeigt.\n\
+\n\
+SYNTAX:\n\
+  whoami [/upn | /fqdn | /logonid] \n\
+  whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\
+  whoami /all [/fo <Format>] [/nh] \n\
+\n\
+BEISPIELE: \n\
+  whoami /groups /priv /nh /fo csv \n\
+  whoami /logonid \n\
+  whoami \n"
+END

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

@@ -0,0 +1,56 @@
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+
+STRINGTABLE
+BEGIN
+    IDS_USER_HEADER "USER INFORMATION"
+    IDS_GROU_HEADER "GROUP INFORMATION"
+    IDS_PRIV_HEADER "PRIVILEGES INFORMATION"
+    IDS_COL_USER_NAME "User Name"
+    IDS_COL_GROUP_NAME "Group Name"
+    IDS_COL_TYPE "Type"
+    IDS_COL_SID "SID"
+    IDS_COL_ATTRIB "Attributes"
+    IDS_COL_PRIV_NAME "Privilege Name"
+    IDS_COL_DESCRIPTION "Description"
+    IDS_COL_STATE "State"
+    IDS_TP_WELL_KNOWN_GROUP "Well-known group"
+    IDS_TP_ALIAS "Alias"
+    IDS_TP_LABEL "Label"
+
+    /* [!] important note from the programmer: the program tries to remove
+       the last ', ' after concatenating, so keep than in mind when translating.
+
+       you can test your translation of these attributes by using 'whoami /groups' */
+
+    IDS_ATTR_GROUP_MANDATORY "Mandatory group, "
+    IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Enabled by default, "
+    IDS_ATTR_GROUP_ENABLED "Enabled group, "
+    IDS_ATTR_GROUP_OWNER "Group owner, "
+    IDS_UNKNOWN_DESCRIPTION "???"
+    IDS_STATE_ENABLED "Enabled"
+    IDS_STATE_DISABLED "Disabled"
+    IDS_ERROR_UPN "ERROR: Unable to get User Principal Name (UPN) as the current logged-on user\nis not a domain user.\n"
+    IDS_ERROR_FQDN "ERROR: Unable to get Fully Qualified Distinguished Name (FQDN) as the current\nlogged-on user is not a domain user.\n"
+    IDS_ERROR_VALUEXPECTED "ERROR: Invalid syntax. Value expected for '/fo'.\nType ""WHOAMI /?"" for usage.\n"
+    IDS_ERROR_VALUENOTALLOWED "ERROR: Invalid syntax. '%s' value is not allowed for '/fo' option.\nType ""WHOAMI /?"" for usage.\n"
+    IDS_ERROR_1TIMES "ERROR: Invalid syntax. '%s' option is not allowed more than '1' time(s).\nType ""WHOAMI /?"" for usage.\n"
+    IDS_ERROR_INVALIDSYNTAX "ERROR: Invalid syntax.\nType ""WHOAMI /?"" for usage.\n"
+    IDS_ERROR_INVALIDARG "ERROR: Invalid argument/option - '%s'.\nType ""WHOAMI /?"" for usage.\n"
+    IDS_ERROR_NH_LIST "ERROR: /NH switch cannot be used with the LIST format.\nType ""WHOAMI /?"" for usage.\n"
+    IDS_HELP "DESCRIPTION:\n\
+  Display user, group and privileges information for the local logged-on user.\n\
+  If no arguments are provided, displays the current domain and user name.\n\
+\n\
+  Available output formats for the '/fo' option are 'csv', 'list' and 'table'.\n\
+  Use '/nh' to hide headers. By default the data is displayed in a table.\n\
+\n\
+SYNTAX:\n\
+  whoami [/upn | /fqdn | /logonid] \n\
+  whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\
+  whoami /all [/fo <Format>] [/nh] \n\
+\n\
+EXAMPLES: \n\
+  whoami /groups /priv /nh /fo csv \n\
+  whoami /logonid \n\
+  whoami \n"
+END

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

@@ -0,0 +1,58 @@
+/* Spanish translation by Swyter */
+LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USER_HEADER "INFORMACIÓN DE USUARIO"
+    IDS_GROU_HEADER "INFORMACIÓN DE GRUPO"
+    IDS_PRIV_HEADER "INFORMACIÓN DE PRIVILEGIOS"
+    IDS_COL_USER_NAME "Nombre de usuario"
+    IDS_COL_GROUP_NAME "Nombre de grupo"
+    IDS_COL_TYPE "Tipo"
+    IDS_COL_SID "SID"
+    IDS_COL_ATTRIB "Atributos"
+    IDS_COL_PRIV_NAME "Nombre de privilegio"
+    IDS_COL_DESCRIPTION "Descripción"
+    IDS_COL_STATE "Estado"
+    IDS_TP_WELL_KNOWN_GROUP "Grupo conocido"
+    IDS_TP_ALIAS "Alias"
+    IDS_TP_LABEL "Etiqueta"
+
+    /* [!] important note from the programmer: the program tries to remove
+       the last ', ' after concatenating, so keep than in mind when translating.
+
+       you can test your translation of these attributes by using 'whoami /groups' */
+
+    IDS_ATTR_GROUP_MANDATORY "Grupo obligatorio, "
+    IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Habilitado de manera predeterminada, "
+    IDS_ATTR_GROUP_ENABLED "Grupo habilitado, "
+    IDS_ATTR_GROUP_OWNER "Propietario de grupo, "
+    IDS_UNKNOWN_DESCRIPTION "¿?"
+    IDS_STATE_ENABLED "Habilitada"
+    IDS_STATE_DISABLED "Deshabilitado"
+    IDS_ERROR_UPN "ERROR: no se puede obtener el nombre principal de usuario (UPN) porque el\nusuario que ha iniciado sesión no es un usuario de dominio.\n"
+    IDS_ERROR_FQDN "ERROR: no se puede obtener el nombre distintivo completo (FQDN) porque el usuario\nque ha iniciado sesión no es un usuario de dominio.\n"
+    IDS_ERROR_VALUEXPECTED "ERROR: Sintaxis no válida. Se esperaba un valor para ""/fo"".\nEscriba ""WHOAMI /?"" para su uso.\n"
+    IDS_ERROR_VALUENOTALLOWED "ERROR: Sintaxis no válida. El valor ""%s"" no está permitido para la opción ""/fo"".\nEscriba ""WHOAMI /?"" para su uso.\n"
+    IDS_ERROR_1TIMES "ERROR: Sintaxis no válida. La opción ""%s"" no está permitida más de ""1"" veces.\nEscriba ""WHOAMI /?"" para su uso.\n"
+    IDS_ERROR_INVALIDSYNTAX "ERROR: sintaxis no válida.\nEscriba ""WHOAMI /?"" para obtener detalles de uso.\n"
+    IDS_ERROR_INVALIDARG "ERROR: Argumento u opción no válido - ""%s"".\nEscriba ""WHOAMI /?"" para su uso.\n"
+    IDS_ERROR_NH_LIST "ERROR: no se puede usar el modificador /NH con el formato LIST.\nEscriba ""WHOAMI /?"" para obtener detalles de uso.\n"
+    IDS_HELP "DESCRIPCIÓN:\n\
+  Muestra información sobre el usuario local, sus privilegios y grupos.\n\
+  Si no se añaden argumentos se mostrará el usuario y dominio actual.\n\
+\n\
+  Los formatos disponibles para '/fo' son 'csv', 'list' y 'table'.\n\
+  Por defecto los datos se muestran en una tabla (opción 'table').\n\
+  Puedes utilizar '/nh' para ocultar los encabezados. \n\
+\n\
+SINTAXIS:\n\
+  whoami [/upn | /fqdn | /logonid] \n\
+  whoami {[/user] [/groups] [/priv]} [/fo <Formato>] [/nh] \n\
+  whoami /all [/fo <Formato>] [/nh] \n\
+\n\
+EJEMPLOS: \n\
+  whoami /groups /priv /nh /fo csv \n\
+  whoami /logonid \n\
+  whoami \n"
+END

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

@@ -0,0 +1,56 @@
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+
+STRINGTABLE
+BEGIN
+    IDS_USER_HEADER "INFORMATIONS UTILISATEUR"
+    IDS_GROU_HEADER "INFORMATIONS GROUPE"
+    IDS_PRIV_HEADER "INFORMATIONS PRIVILEGES"
+    IDS_COL_USER_NAME "Nom d'utilisateur"
+    IDS_COL_GROUP_NAME "Nom du groupe"
+    IDS_COL_TYPE "Type"
+    IDS_COL_SID "SID"
+    IDS_COL_ATTRIB "Attributs"
+    IDS_COL_PRIV_NAME "Nom du privilège"
+    IDS_COL_DESCRIPTION "Description"
+    IDS_COL_STATE "Statut"
+    IDS_TP_WELL_KNOWN_GROUP "Groupe connu"
+    IDS_TP_ALIAS "Alias"
+    IDS_TP_LABEL "Label"
+
+    /* [!] important note from the programmer: the program tries to remove
+       the last ', ' after concatenating, so keep than in mind when translating.
+
+       you can test your translation of these attributes by using 'whoami /groups' */
+
+    IDS_ATTR_GROUP_MANDATORY "Groupe obligatoire, "
+    IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Activé par défaut, "
+    IDS_ATTR_GROUP_ENABLED "Groupe activé, "
+    IDS_ATTR_GROUP_OWNER "Propriétaire du groupe, "
+    IDS_UNKNOWN_DESCRIPTION "???"
+    IDS_STATE_ENABLED "Activé"
+    IDS_STATE_DISABLED "Désactivé"
+    IDS_ERROR_UPN "Erreur : impossible de récupérer le nom d'utilisateur principal (UPN) étant donné que l'utilisateur actuel\nn'est pas un utilisateur du domaine.\n"
+    IDS_ERROR_FQDN "Errur : impossible de récupérer Fully Qualified Distinguished Name (FQDN) as the current\nlogged-on user is not a domain user.\n"
+    IDS_ERROR_VALUEXPECTED "Erreur : syntaxe incorrecte. Une valeur est attendue pour '/fo'.\nTapez ""WHOAMI /?"" pour l'aide.\n"
+    IDS_ERROR_VALUENOTALLOWED "Erreur : syntaxe incorrecte. La valeur '%s' n'est pas autorisée pour l'option '/fo'.\nTapez ""WHOAMI /?"" pour l'aide.\n"
+    IDS_ERROR_1TIMES "Erreur : syntaxe incorrecte. L'option '%s' n'est pas autorisée plus de '1' fois.\nTapez ""WHOAMI /?"" pour l'aide.\n"
+    IDS_ERROR_INVALIDSYNTAX "Erreur : syntaxe incorrecte.\nTapez ""WHOAMI /?"" pour l'aide.\n"
+    IDS_ERROR_INVALIDARG "Erreur : Argument/option non valide - '%s'.\nTapez ""WHOAMI /?"" pour l'aide.\n"
+    IDS_ERROR_NH_LIST "Erreur : l'argument /NH ne peut pas être utilisé avec le format LIST.\nTapez ""WHOAMI /?"" pour l'aide.\n"
+    IDS_HELP "DESCRIPTION:\n\
+  Affiche les informations sur l'utilisateur, les groupes et les privilèges pour l'utilisateur actuellement connecté.\n\
+  Si aucun argument n'est fourni, affiche le domaine et le nom d'utilisateur en cours d'usage.\n\
+\n\
+  Les formats de sortie disponibles pour l'option '/fo' sont 'csv', 'list' et 'table'.\n\
+  Utilisez '/nh' pour cacher les entêtes. Par défaut, les données sont affichées dans un tableau.\n\
+\n\
+SYNTAX:\n\
+  whoami [/upn | /fqdn | /logonid] \n\
+  whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\
+  whoami /all [/fo <Format>] [/nh] \n\
+\n\
+EXAMPLES: \n\
+  whoami /groups /priv /nh /fo csv \n\
+  whoami /logonid \n\
+  whoami \n"
+END

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

@@ -0,0 +1,57 @@
+LANGUAGE LANG_ROMANIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USER_HEADER "INFORMAȚII DE UTILIZATOR"
+    IDS_GROU_HEADER "INFORMAȚII DE GRUP"
+    IDS_PRIV_HEADER "INFORMAȚII DE PRIVILEGIU"
+    IDS_COL_USER_NAME "Nume utilizator"
+    IDS_COL_GROUP_NAME "Nume grup"
+    IDS_COL_TYPE "Tip"
+    IDS_COL_SID "SID"
+    IDS_COL_ATTRIB "Atribute"
+    IDS_COL_PRIV_NAME "Privilegiu"
+    IDS_COL_DESCRIPTION "Descriere"
+    IDS_COL_STATE "Stare"
+    IDS_TP_WELL_KNOWN_GROUP "Grup binecunoscut"
+    IDS_TP_ALIAS "Alias"
+    IDS_TP_LABEL "Etichetă"
+
+    /* [!] important note from the programmer: the program tries to remove
+       the last ', ' after concatenating, so keep than in mind when translating.
+
+       you can test your translation of these attributes by using 'whoami /groups' */
+
+    IDS_ATTR_GROUP_MANDATORY "Grup obligatoriu, "
+    IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Activat implicit, "
+    IDS_ATTR_GROUP_ENABLED "Grup activat, "
+    IDS_ATTR_GROUP_OWNER "Posesorul grupului, "
+    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_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"
+    IDS_ERROR_INVALIDSYNTAX "EROARE: Sintaxă eronată.\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
+    IDS_ERROR_INVALIDARG "EROARE: Argument/opțiune eronat(ă) - «%s».\nTastați ""WHOAMI /?"" pentru informații de utilizare.\n"
+    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\
+  \n\
+  Formatele disponibile pentru opțiunea «/fo» sunt «csv», «list», și «table».\n\
+  Argumentul «/nh» ascunde anteturile. Datele sunt implicit afișate tabelar.\n\
+  \n\
+            SINTAXĂ:\n\
+  whoami [/upn | /fqdn | /logonid] \n\
+  whoami {[/user] [/groups] [/priv]} [/fo <Format>] [/nh] \n\
+  whoami /all [/fo <Format>] [/nh] \n\
+  \n\
+            EXEMPLE: \n\
+  whoami /groups /priv /nh /fo csv \n\
+  whoami /logonid \n\
+  whoami \n"
+END

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

@@ -0,0 +1,58 @@
+/* Russian language resource file by Kudratov Olimjon (olim98@bk.ru) */
+
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+
+STRINGTABLE
+BEGIN
+    IDS_USER_HEADER "Сведения о пользователе"
+    IDS_GROU_HEADER "Сведения о группах"
+    IDS_PRIV_HEADER "Сведения о привилегиях"
+    IDS_COL_USER_NAME "Пользователь"
+    IDS_COL_GROUP_NAME "Группа"
+    IDS_COL_TYPE "Тип"
+    IDS_COL_SID "SID"
+    IDS_COL_ATTRIB "Атрибуты"
+    IDS_COL_PRIV_NAME "Имя привилегии"
+    IDS_COL_DESCRIPTION "Описание"
+    IDS_COL_STATE "Состояние"
+    IDS_TP_WELL_KNOWN_GROUP "Хорошо известная группа"
+    IDS_TP_ALIAS "Псевдоним"
+    IDS_TP_LABEL "Метка"
+
+    /* [!] important note from the programmer: the program tries to remove
+       the last ', ' after concatenating, so keep than in mind when translating.
+
+       you can test your translation of these attributes by using 'whoami /groups' */
+
+    IDS_ATTR_GROUP_MANDATORY "Обязательная группа, "
+    IDS_ATTR_GROUP_ENABLED_BY_DEFAULT "Включена по умолчанию, "
+    IDS_ATTR_GROUP_ENABLED "Включенная группа, "
+    IDS_ATTR_GROUP_OWNER "Владелец группы, "
+    IDS_UNKNOWN_DESCRIPTION "???"
+    IDS_STATE_ENABLED "Включен"
+    IDS_STATE_DISABLED "Отключен"
+    IDS_ERROR_UPN "ОШИБКА: Не удается получить имя участника-пользователя (UPN), поскольку текущий\nвошедший пользователь не является пользователем домена.\n"
+    IDS_ERROR_FQDN "ОШИБКА: Не удается получить полное доменное имя (FQDN), поскольку текущий\nвошедший пользователь не является пользователем домена.\n"
+    IDS_ERROR_VALUEXPECTED "ОШИБКА: Указан недопустимый формат (/FO).\nВведите ""WHOAMI /?"" для получения справки по использованию.\n"
+    IDS_ERROR_VALUENOTALLOWED "ОШИБКА: Неверный синтаксис. Значение '%s' запрещено для параметра '/fo'.\nВведите ""WHOAMI /?"" для получения справки по использованию.\n"
+    IDS_ERROR_1TIMES "ОШИБКА: Неверный синтаксис. Запрещено использовать параметр '%s' более '1' раз(а).\nВведите ""WHOAMI /?"" для получения справки по использованию.\n"
+    IDS_ERROR_INVALIDSYNTAX "ОШИБКА: Синтаксическая ошибка. \nВведите ""WHOAMI /?"" для получения справки по использованию.\n"
+    IDS_ERROR_INVALIDARG "ОШИБКА: Неправильный параметр или аргумент - '%s'.\nВведите ""WHOAMI /?"" для получения справки по использованию.\n"
+    IDS_ERROR_NH_LIST "ОШИБКА: Параметр /NH нельзя использовать с форматом LIST.\nВведите ""WHOAMI /?"" для получения справки по использованию.\n"
+    IDS_HELP "Описание:\n\
+  Отображает информацию об пользователе, группе и привилегиях для локально вошедших пользователей.\n\
+  Если не указано аргументов, то отображает текущий домен и текущего пользователя (домен/пользователь).\n\
+\n\
+  Доступные форматы для параметра '/fo' - 'csv', 'list' и 'table'.\n\
+  Используйте '/nh' чтобы скрыть заголовки. По умолчанию данные отображаются в таблице.\n\
+\n\
+Синтаксис:\n\
+  whoami [/upn | /fqdn | /logonid] \n\
+  whoami {[/user] [/groups] [/priv]} [/fo <формат>] [/nh] \n\
+  whoami /all [/fo <формат>] [/nh] \n\
+\n\
+Примеры:\n\
+  whoami /groups /priv /nh /fo csv \n\
+  whoami /logonid \n\
+  whoami \n"
+END

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

@@ -0,0 +1,39 @@
+#pragma once
+
+#define IDS_USER_HEADER 0
+#define IDS_GROU_HEADER 1
+#define IDS_PRIV_HEADER 2
+
+#define IDS_COL_USER_NAME 3
+#define IDS_COL_GROUP_NAME 4
+#define IDS_COL_TYPE 5
+#define IDS_COL_SID 6
+#define IDS_COL_ATTRIB 7
+#define IDS_COL_PRIV_NAME 8
+#define IDS_COL_DESCRIPTION 9
+#define IDS_COL_STATE 10
+
+#define IDS_TP_WELL_KNOWN_GROUP 11
+#define IDS_TP_ALIAS 12
+#define IDS_TP_LABEL 13
+
+#define IDS_ATTR_GROUP_MANDATORY 14
+#define IDS_ATTR_GROUP_ENABLED_BY_DEFAULT 15
+#define IDS_ATTR_GROUP_ENABLED 16
+#define IDS_ATTR_GROUP_OWNER 17
+
+#define IDS_UNKNOWN_DESCRIPTION 18
+
+#define IDS_STATE_ENABLED 19
+#define IDS_STATE_DISABLED 20
+
+#define IDS_ERROR_UPN 21
+#define IDS_ERROR_FQDN 22
+#define IDS_ERROR_VALUEXPECTED 23
+#define IDS_ERROR_VALUENOTALLOWED 24
+#define IDS_ERROR_1TIMES 25
+#define IDS_ERROR_INVALIDSYNTAX 26
+#define IDS_ERROR_INVALIDARG 27
+#define IDS_ERROR_NH_LIST 28
+
+#define IDS_HELP 29

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

@@ -0,0 +1,966 @@
+/*
+ * PROJECT:     ReactOS Whoami
+ * LICENSE:     GPL - See COPYING in the top level directory
+ * FILE:        base/applications/cmdutils/whoami/whoami.c
+ * PURPOSE:     Displays information about the current local user, groups and privileges.
+ * PROGRAMMERS: Ismael Ferreras Morezuelas (swyterzone+ros@gmail.com)
+ */
+
+
+#define SECURITY_WIN32
+#include <security.h>
+#include <sddl.h>
+
+#include <strsafe.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
+
+BOOL NoHeader = FALSE;
+UINT NoHeaderArgCount = 0;
+UINT PrintFormatArgCount = 0;
+
+enum
+{
+    undefined,
+    table,
+    list,
+    csv
+} PrintFormat = undefined;
+
+
+BOOL GetArgument(WCHAR* arg, int argc, WCHAR* argv[])
+{
+    int i;
+
+    if (!arg)
+        return FALSE;
+
+    for (i = 1; i < argc; i++)
+    {
+        if (wcsicmp(argv[i], arg) == 0)
+            return TRUE;
+    }
+
+    return FALSE;
+}
+
+/* blanking out the accepted modifiers will make filtering easier later on */
+void BlankArgument(int argc, WCHAR* argv[])
+{
+    argv[argc] = L"";
+}
+
+/* helper functions; let's keep it tidy to avoid redundancies */
+
+LPWSTR WhoamiGetUser(EXTENDED_NAME_FORMAT NameFormat)
+{
+    LPWSTR UsrBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_PATH);
+    ULONG UsrSiz = MAX_PATH;
+
+    if (UsrBuf == NULL)
+        return NULL;
+
+    if (GetUserNameExW(NameFormat, UsrBuf, &UsrSiz))
+    {
+        CharLowerW(UsrBuf);
+        return UsrBuf;
+    }
+
+    HeapFree(GetProcessHeap(), 0, UsrBuf);
+    return NULL;
+}
+
+BOOL WhoamiFree(VOID* Buffer)
+{
+    return HeapFree(GetProcessHeap(), 0, Buffer);
+}
+
+
+VOID* WhoamiGetTokenInfo(TOKEN_INFORMATION_CLASS TokenType)
+{
+    HANDLE hToken = 0;
+    DWORD dwLength = 0;
+    VOID* pTokenInfo = 0;
+
+    if (OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &hToken))
+    {
+        GetTokenInformation(hToken,
+                            TokenType,
+                            NULL,
+                            dwLength,
+                            &dwLength);
+
+        if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+        {
+            pTokenInfo = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dwLength);
+            if (pTokenInfo == NULL)
+            {
+                wprintf(L"ERROR: not enough memory to allocate the token structure.\r\n");
+                exit(1);
+            }
+        }
+
+        if (!GetTokenInformation(hToken, TokenType,
+                                 (LPVOID)pTokenInfo,
+                                 dwLength,
+                                 &dwLength))
+        {
+            wprintf(L"ERROR 0x%x: could not get token information.\r\n", GetLastError());
+            WhoamiFree(pTokenInfo);
+            exit(1);
+        }
+
+        CloseHandle(hToken);
+    }
+
+    return pTokenInfo;
+}
+
+LPWSTR WhoamiLoadRcString(INT ResId)
+{
+    #define RC_STRING_MAX_SIZE 850
+    static WCHAR TmpBuffer[RC_STRING_MAX_SIZE];
+
+    LoadStringW(GetModuleHandleW(NULL), ResId, TmpBuffer, RC_STRING_MAX_SIZE);
+
+    return TmpBuffer;
+}
+
+void WhoamiPrintHeader(int HeaderId)
+{
+    PWSTR Header = WhoamiLoadRcString(HeaderId);
+    DWORD Length = wcslen(Header);
+
+    if (NoHeader || PrintFormat == csv)
+        return;
+
+    wprintf(L"\n%s\n", Header);
+
+    while (Length--)
+        wprintf(L"-");
+
+    /* _putws seems to be broken in ReactOS' CRT ??? */
+    wprintf(L"\n\n");
+}
+
+typedef struct
+{
+    UINT Rows;
+    UINT Cols;
+    LPWSTR Content[1];
+} WhoamiTable;
+
+/* create and prepare a new table for printing */
+WhoamiTable *WhoamiAllocTable(UINT Rows, UINT Cols)
+{
+    WhoamiTable *pTable = HeapAlloc(GetProcessHeap(),
+                                    HEAP_ZERO_MEMORY,
+                                    sizeof(WhoamiTable) + sizeof(LPWSTR) * Rows * Cols);
+
+    // wprintf(L"DEBUG: Allocating %dx%d elem table for printing.\r\n\r\n", Rows, Cols);
+
+    if (!pTable)
+    {
+        wprintf(L"ERROR: Not enough memory for displaying the table.");
+        exit(1);
+    }
+
+    pTable->Rows = Rows;
+    pTable->Cols = Cols;
+
+    return pTable;
+}
+
+/* allocate and fill a new entry in the table */
+void WhoamiSetTable(WhoamiTable *pTable, WCHAR *Entry, UINT Row, UINT Col)
+{
+    LPWSTR Target = HeapAlloc(GetProcessHeap(),
+                              HEAP_ZERO_MEMORY,
+                              1 + wcslen(Entry) * sizeof(Entry[0]));
+
+    // wprintf(L"DEBUG: Setting table value '%lp' '%ls' for %lu %lu.\n", entry, entry, row, col);
+
+    if (!Target)
+        exit(1);
+
+    wcscpy(Target, Entry);
+
+    pTable->Content[Row * pTable->Cols + Col] = Target;
+}
+
+/* fill a new entry in the table */
+void WhoamiSetTableDyn(WhoamiTable *pTable, WCHAR *Entry, UINT Row, UINT Col)
+{
+    pTable->Content[Row * pTable->Cols + Col] = Entry;
+}
+
+/* print and deallocate the table */
+void WhoamiPrintTable(WhoamiTable *pTable)
+{
+    UINT i, j;
+    UINT CurRow, CurCol;
+    UINT *ColLength;
+
+
+    if (!pTable)
+    {
+        wprintf(L"ERROR: The table passed for display is empty.");
+        exit(1);
+    }
+
+    /* if we are going to print a *list* or *table*; take note of the total
+       column size, as we will need it later on when printing them in a tabular
+       fashion, according to their windows counterparts */
+
+    if (PrintFormat != csv)
+    {
+        ColLength = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(UINT) * pTable->Cols);
+
+        if (PrintFormat == list)
+        {
+            for (j = 0; j < pTable->Cols; j++)
+                if (pTable->Content[j])
+                {
+                    UINT ThisLength = wcslen(pTable->Content[j]);
+
+                    /* now that we're here, seize the opportunity and add those pesky ":" */
+                    pTable->Content[j][ThisLength++] = L':';
+                    pTable->Content[j][ThisLength] = UNICODE_NULL;
+
+                    ColLength[0] = max(ThisLength, ColLength[0]);
+                }
+        }
+        else
+        {
+            for (j = 0; j < pTable->Cols; j++)
+                for (i = 0; i < pTable->Rows; i++)
+                    if (pTable->Content[i * pTable->Cols + j])
+                    {
+                        UINT ThisLength = wcslen(pTable->Content[i * pTable->Cols + j]);
+                        ColLength[j] = max(ThisLength, ColLength[j]);
+                    }
+        }
+    }
+
+    switch (PrintFormat)
+    {
+        case csv:
+        {
+            for (i = 0; i < pTable->Rows; i++)
+            {
+                if (!pTable->Content[i * pTable->Cols])
+                    continue;
+
+                /* if the user especified /nh then skip the column labels */
+                if (NoHeader && i == 0)
+                    continue;
+
+                for (j = 0; j < pTable->Cols; j++)
+                {
+                    if (pTable->Content[i * pTable->Cols + j])
+                    {
+                        wprintf(L"\"%s\"%s",
+                                pTable->Content[i * pTable->Cols + j],
+                                (j+1 < pTable->Cols ? L"," : L""));
+                    }
+                }
+                wprintf(L"\n");
+            }
+
+            break;
+
+        }
+
+        case list:
+        {
+            UINT FinalRow = 0;
+
+            /* fixme: we need to do two passes to find out which entry is the last one shown, or not null this is not exactly optimal */
+            for (CurRow = 1; CurRow < pTable->Rows; CurRow++)
+            {
+                /* if the first member of this row isn't available, then forget it */
+                if (!pTable->Content[CurRow * pTable->Cols])
+                    continue;
+
+                FinalRow = CurRow;
+            }
+
+            for (CurRow = 1; CurRow < pTable->Rows; CurRow++)
+            {
+                /* if the first member of this row isn't available, then forget it */
+                if (!pTable->Content[CurRow * pTable->Cols])
+                    continue;
+
+                /* if the user especified /nh then skip the column labels */
+                if (NoHeader && i == 0)
+                    continue;
+
+                for (CurCol = 0; CurCol < pTable->Cols; CurCol++)
+                {
+                    wprintf(L"%-*s %s\n",
+                            ColLength[0],
+                            pTable->Content[CurCol],
+                            pTable->Content[CurRow * pTable->Cols + CurCol]);
+                }
+
+                /* don't add two carriage returns at the very end */
+                if (CurRow != FinalRow)
+                    wprintf(L"\n");
+            }
+
+            break;
+        }
+
+
+        case table:
+        default:
+        {
+            for (i = 0; i < pTable->Rows; i++)
+            {
+                /* if the first member of this row isn't available, then forget it */
+                if (!pTable->Content[i * pTable->Cols])
+                    continue;
+
+                /* if the user especified /nh then skip the column labels too */
+                if (NoHeader && i == 0)
+                    continue;
+
+                for (j = 0; j < pTable->Cols; j++)
+                {
+                    if (pTable->Content[i * pTable->Cols + j])
+                    {
+                        wprintf(L"%-*s ", ColLength[j], pTable->Content[i * pTable->Cols + j]);
+                    }
+                }
+                wprintf(L"\n");
+
+                /* add the cute underline thingie for the table header */
+                if (i == 0)
+                {
+                    for (j = 0; j < pTable->Cols; j++)
+                    {
+                        DWORD Length = ColLength[j];
+
+                        while (Length--)
+                            wprintf(L"=");
+
+                        /* a spacing between all the columns except for the last one */
+                        if (pTable->Cols != (i + 1))
+                            wprintf(L" ");
+                    }
+
+                    wprintf(L"\n");
+                }
+            }
+
+        }
+    }
+
+    /* fixme: when many tables are displayed in a single run we
+              have to sandwich carriage returns in between. */
+    // if (!final_entry)
+        wprintf(L"\n");
+
+    for (i = 0; i < pTable->Rows; i++)
+        for (j = 0; j < pTable->Cols; j++)
+            WhoamiFree(pTable->Content[i * pTable->Cols + j]);
+
+    WhoamiFree(pTable);
+}
+
+int WhoamiLogonId(void)
+{
+    PTOKEN_GROUPS pGroupInfo = (PTOKEN_GROUPS) WhoamiGetTokenInfo(TokenGroups);
+    DWORD dwIndex = 0;
+    LPWSTR pSidStr = 0;
+    PSID pSid = 0;
+
+    if (pGroupInfo == NULL)
+        return 0;
+
+    /* lets see if we can find the logon SID in that list, should be there */
+    for (dwIndex = 0; dwIndex < pGroupInfo->GroupCount; dwIndex++)
+    {
+        if ((pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID) == SE_GROUP_LOGON_ID)
+        {
+            pSid = pGroupInfo->Groups[dwIndex].Sid;
+        }
+    }
+
+    if (pSid == 0)
+    {
+        WhoamiFree(pGroupInfo);
+        wprintf(L"ERROR: Couldn't find the logon SID.\n");
+        return 1;
+    }
+    if (!ConvertSidToStringSidW(pSid, &pSidStr))
+    {
+        WhoamiFree(pGroupInfo);
+        wprintf(L"ERROR: Couldn't convert the logon SID to a string.\n");
+        return 1;
+    }
+    else
+    {
+        /* let's show our converted logon SID */
+        wprintf(L"%s\n", pSidStr);
+    }
+
+    /* cleanup our allocations */
+    LocalFree(pSidStr);
+    WhoamiFree(pGroupInfo);
+
+    return 0;
+}
+
+int WhoamiUser(void)
+{
+    PTOKEN_USER pUserInfo = (PTOKEN_USER) WhoamiGetTokenInfo(TokenUser);
+    LPWSTR pUserStr = NULL;
+    LPWSTR pSidStr = NULL;
+    WhoamiTable *UserTable = NULL;
+
+    if (pUserInfo == NULL)
+    {
+        return 1;
+    }
+
+    pUserStr = WhoamiGetUser(NameSamCompatible);
+    if (pUserStr == NULL)
+    {
+        WhoamiFree(pUserInfo);
+        return 1;
+    }
+
+    UserTable = WhoamiAllocTable(2, 2);
+
+    WhoamiPrintHeader(IDS_USER_HEADER);
+
+    /* set the column labels */
+    WhoamiSetTable(UserTable, WhoamiLoadRcString(IDS_COL_USER_NAME), 0, 0);
+    WhoamiSetTable(UserTable, WhoamiLoadRcString(IDS_COL_SID), 0, 1);
+
+    ConvertSidToStringSidW(pUserInfo->User.Sid, &pSidStr);
+
+    /* set the values for our single row of data */
+    WhoamiSetTable(UserTable, pUserStr, 1, 0);
+    WhoamiSetTable(UserTable, pSidStr, 1, 1);
+
+    WhoamiPrintTable(UserTable);
+
+    /* cleanup our allocations */
+    LocalFree(pSidStr);
+    WhoamiFree(pUserInfo);
+    WhoamiFree(pUserStr);
+
+    return 0;
+}
+
+int WhoamiGroups(void)
+{
+    DWORD dwIndex = 0;
+    LPWSTR pSidStr = 0;
+
+    static WCHAR szGroupName[255] = {0};
+    static WCHAR szDomainName[255] = {0};
+
+    DWORD cchGroupName  = _countof(szGroupName);
+    DWORD cchDomainName = _countof(szGroupName);
+
+    SID_NAME_USE Use = 0;
+    BYTE SidNameUseStr[12] =
+    {
+        /* SidTypeUser           */ -1,
+        /* SidTypeGroup          */ -1,
+        /* SidTypeDomain         */ -1,
+        /* SidTypeUser           */ -1,
+        /* SidTypeAlias          */ IDS_TP_ALIAS,
+        /* SidTypeWellKnownGroup */ IDS_TP_WELL_KNOWN_GROUP,
+        /* SidTypeDeletedAccount */ -1,
+        /* SidTypeInvalid        */ -1,
+        /* SidTypeUnknown        */ -1,
+        /* SidTypeComputer       */ -1,
+        /* SidTypeLabel          */ IDS_TP_LABEL
+    };
+
+    PTOKEN_GROUPS pGroupInfo = (PTOKEN_GROUPS)WhoamiGetTokenInfo(TokenGroups);
+    UINT PrintingRow;
+    WhoamiTable *GroupTable = NULL;
+
+    if (pGroupInfo == NULL)
+    {
+        return 1;
+    }
+
+    /* the header is the first (0) row, so we start in the second one (1) */
+    PrintingRow = 1;
+
+    GroupTable = WhoamiAllocTable(pGroupInfo->GroupCount + 1, 4);
+
+    WhoamiPrintHeader(IDS_GROU_HEADER);
+
+    WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_GROUP_NAME), 0, 0);
+    WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_TYPE), 0, 1);
+    WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_SID), 0, 2);
+    WhoamiSetTable(GroupTable, WhoamiLoadRcString(IDS_COL_ATTRIB), 0, 3);
+
+    for (dwIndex = 0; dwIndex < pGroupInfo->GroupCount; dwIndex++)
+    {
+        LookupAccountSidW(NULL,
+                          pGroupInfo->Groups[dwIndex].Sid,
+                          (LPWSTR)&szGroupName,
+                          &cchGroupName,
+                          (LPWSTR)&szDomainName,
+                          &cchDomainName,
+                          &Use);
+
+        /* the original tool seems to limit the list to these kind of SID items */
+        if ((Use == SidTypeWellKnownGroup || Use == SidTypeAlias ||
+            Use == SidTypeLabel) && !(pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID))
+        {
+                wchar_t tmpBuffer[666];
+
+            /* looks like windows treats 0x60 as 0x7 for some reason, let's just nod and call it a day:
+               0x60 is SE_GROUP_INTEGRITY | SE_GROUP_INTEGRITY_ENABLED
+               0x07 is SE_GROUP_MANDATORY | SE_GROUP_ENABLED_BY_DEFAULT | SE_GROUP_ENABLED */
+
+            if (pGroupInfo->Groups[dwIndex].Attributes == 0x60)
+                pGroupInfo->Groups[dwIndex].Attributes = 0x07;
+
+            /* 1- format it as DOMAIN\GROUP if the domain exists, or just GROUP if not */
+            _snwprintf((LPWSTR)&tmpBuffer,
+                       _countof(tmpBuffer),
+                       L"%s%s%s",
+                       szDomainName,
+                       cchDomainName ? L"\\" : L"",
+                       szGroupName);
+
+            WhoamiSetTable(GroupTable, tmpBuffer, PrintingRow, 0);
+
+            /* 2- let's find out the group type by using a simple lookup table for lack of a better method */
+            WhoamiSetTable(GroupTable, WhoamiLoadRcString(SidNameUseStr[Use]), PrintingRow, 1);
+
+            /* 3- turn that SID into text-form */
+            ConvertSidToStringSidW(pGroupInfo->Groups[dwIndex].Sid, &pSidStr);
+
+            WhoamiSetTable(GroupTable, pSidStr, PrintingRow, 2);
+
+            LocalFree(pSidStr);
+
+            /* 4- reuse that buffer for appending the attributes in text-form at the very end */
+            ZeroMemory(tmpBuffer, sizeof(tmpBuffer));
+
+            if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_MANDATORY)
+                StringCchCat(tmpBuffer, _countof(tmpBuffer), WhoamiLoadRcString(IDS_ATTR_GROUP_MANDATORY));
+            if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED_BY_DEFAULT)
+                StringCchCat(tmpBuffer, _countof(tmpBuffer), WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED_BY_DEFAULT));
+            if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED)
+                StringCchCat(tmpBuffer, _countof(tmpBuffer), WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED));
+            if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_OWNER)
+                StringCchCat(tmpBuffer, _countof(tmpBuffer), WhoamiLoadRcString(IDS_ATTR_GROUP_OWNER));
+
+            /* remove the last comma (', ' which is 2 wchars) of the buffer, let's keep it simple */
+            tmpBuffer[max(wcslen(tmpBuffer) - 2, 0)] = UNICODE_NULL;
+
+            WhoamiSetTable(GroupTable, tmpBuffer, PrintingRow, 3);
+
+            PrintingRow++;
+        }
+
+        /* reset the buffers so that we can reuse them */
+        ZeroMemory(szGroupName, sizeof(szGroupName));
+        ZeroMemory(szDomainName, sizeof(szDomainName));
+
+        cchGroupName = 255;
+        cchDomainName = 255;
+    }
+
+    WhoamiPrintTable(GroupTable);
+
+    /* cleanup our allocations */
+    WhoamiFree((LPVOID)pGroupInfo);
+
+    return 0;
+}
+
+int WhoamiPriv(void)
+{
+    PTOKEN_PRIVILEGES pPrivInfo = (PTOKEN_PRIVILEGES) WhoamiGetTokenInfo(TokenPrivileges);
+    DWORD dwResult = 0, dwIndex = 0;
+    WhoamiTable *PrivTable = NULL;
+
+    if (pPrivInfo == NULL)
+    {
+        return 1;
+    }
+
+    PrivTable = WhoamiAllocTable(pPrivInfo->PrivilegeCount + 1, 3);
+
+    WhoamiPrintHeader(IDS_PRIV_HEADER);
+
+    WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_PRIV_NAME), 0, 0);
+    WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_DESCRIPTION), 0, 1);
+    WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_COL_STATE), 0, 2);
+
+    for (dwIndex = 0; dwIndex < pPrivInfo->PrivilegeCount; dwIndex++)
+    {
+        PWSTR PrivName = NULL, DispName = NULL;
+        DWORD PrivNameSize = 0, DispNameSize = 0;
+        BOOL ret = FALSE;
+
+        ret = LookupPrivilegeNameW(NULL,
+                                   &pPrivInfo->Privileges[dwIndex].Luid,
+                                   NULL,
+                                   &PrivNameSize);
+
+        PrivName = HeapAlloc(GetProcessHeap(), 0, ++PrivNameSize*sizeof(WCHAR));
+
+        LookupPrivilegeNameW(NULL,
+                             &pPrivInfo->Privileges[dwIndex].Luid,
+                             PrivName,
+                             &PrivNameSize);
+
+        WhoamiSetTableDyn(PrivTable, PrivName, dwIndex + 1, 0);
+
+
+        /* try to grab the size of the string, also, beware, as this call is
+           unimplemented in ReactOS/Wine at the moment */
+
+        LookupPrivilegeDisplayNameW(NULL, PrivName, NULL, &DispNameSize, &dwResult);
+
+        DispName = HeapAlloc(GetProcessHeap(), 0, ++DispNameSize * sizeof(WCHAR));
+
+        ret = LookupPrivilegeDisplayNameW(NULL, PrivName, DispName, &DispNameSize, &dwResult);
+
+        if (ret && DispName)
+        {
+            // wprintf(L"DispName: %d %x '%s'\n", DispNameSize, GetLastError(), DispName);
+            WhoamiSetTableDyn(PrivTable, DispName, dwIndex + 1, 1);
+        }
+        else
+        {
+            WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_UNKNOWN_DESCRIPTION), dwIndex + 1, 1);
+
+            if (DispName != NULL)
+                WhoamiFree(DispName);
+        }
+
+        if (pPrivInfo->Privileges[dwIndex].Attributes & SE_PRIVILEGE_ENABLED)
+            WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_STATE_ENABLED),  dwIndex + 1, 2);
+        else
+            WhoamiSetTable(PrivTable, WhoamiLoadRcString(IDS_STATE_DISABLED), dwIndex + 1, 2);
+    }
+
+    WhoamiPrintTable(PrivTable);
+
+    /* cleanup our allocations */
+    WhoamiFree(pPrivInfo);
+
+    return 0;
+}
+
+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
+
+
+    /* * * * * * * * * * * * * * * *
+     * A: no parameters whatsoever */
+
+    if (argc == 1)
+    {
+        /* if there's no arguments just choose the simple path and display the user's identity in lowercase */
+        LPWSTR UserBuffer = WhoamiGetUser(NameSamCompatible);
+
+        if (UserBuffer)
+        {
+            wprintf(L"%s\n", UserBuffer);
+            WhoamiFree(UserBuffer);
+            return 0;
+        }
+        else
+        {
+            return 1;
+        }
+    }
+
+    /* first things first-- let's detect and manage both printing modifiers (/fo and /nh) */
+    for (i = 1; i < argc; i++)
+    {
+        if (wcsicmp(argv[i], L"/nh") == 0)
+        {
+            NoHeaderArgCount++;
+
+            if (NoHeader != TRUE)
+            {
+                NoHeader = TRUE;
+                // wprintf(L"Headers disabled!\n");
+                BlankArgument(i, argv);
+            }
+        }
+    }
+
+    for (i = 1; i < argc; i++)
+    {
+        if (wcsicmp(argv[i], L"/fo") == 0)
+        {
+            if ((i + 1) < argc)
+            {
+                // wprintf(L"exists another param after /fo\n");
+
+                PrintFormatArgCount++;
+
+                if (wcsicmp(argv[i + 1], L"table") == 0 && PrintFormat != table)
+                {
+                    PrintFormat = table;
+                    // wprintf(L"Changed to table format\n");
+                    BlankArgument(i, argv);
+                    BlankArgument(i + 1, argv);
+                }
+                else if (wcsicmp(argv[i + 1], L"list") == 0 && PrintFormat != list)
+                {
+                    PrintFormat = list;
+                    // wprintf(L"Changed to list format\n");
+                    BlankArgument(i, argv);
+                    BlankArgument(i + 1, argv);
+
+                    /* looks like you can't use the "/fo list /nh" options together
+                       for some stupid reason */
+                    if (PrintFormat == list && NoHeader == TRUE)
+                    {
+                        wprintf(WhoamiLoadRcString(IDS_ERROR_NH_LIST));
+                        return 1;
+                    }
+                }
+                else if (wcsicmp(argv[i + 1], L"csv") == 0 && PrintFormat != csv)
+                {
+                    PrintFormat = csv;
+                    // wprintf(L"Changed to csv format\n");
+                    BlankArgument(i, argv);
+                    BlankArgument(i + 1, argv);
+                }
+                /* /nh or /fo after /fo isn't parsed as a value */
+                else if (wcsicmp(argv[i + 1], L"/nh") == 0 || wcsicmp(argv[i + 1], L"/fo") == 0
+
+                /* same goes for the other named options, not ideal, but works */
+                         || wcsicmp(argv[i + 1], L"/priv") == 0
+                         || wcsicmp(argv[i + 1], L"/groups") == 0
+                         || wcsicmp(argv[i + 1], L"/user") == 0
+                         || wcsicmp(argv[i + 1], L"/all") == 0
+                         || wcsicmp(argv[i + 1], L"") == 0)
+                {
+                    goto FoValueExpected;
+                }
+                else
+                {
+                    wprintf(WhoamiLoadRcString(IDS_ERROR_VALUENOTALLOWED), argv[i + 1]);
+                    return 1;
+                }
+            }
+            else
+            {
+                FoValueExpected:
+
+                wprintf(WhoamiLoadRcString(IDS_ERROR_VALUEXPECTED));
+                return 1;
+            }
+        }
+    }
+
+    if (NoHeaderArgCount >= 2)
+    {
+        wprintf(WhoamiLoadRcString(IDS_ERROR_1TIMES), L"/nh");
+        return 1;
+    }
+    /* special case when there's just a /nh as argument; it outputs nothing */
+    else if (NoHeaderArgCount == 1 && argc == 2)
+    {
+        return 0;
+    }
+
+    if (PrintFormatArgCount >= 2)
+    {
+        wprintf(WhoamiLoadRcString(IDS_ERROR_1TIMES), L"/fo");
+        return 1;
+    }
+    /* if there's just /fo <format>... call it invalid */
+    else if (PrintFormatArgCount == 1 && argc == 3)
+    {
+        goto InvalidSyntax;
+    }
+
+    /* * * * * * * * * * * * * *
+     * B: one single parameter */
+
+    if (argc == 2)
+    {
+        /* now let's try to parse the triumvirate of simpler, single (1) arguments... plus help */
+        if (wcsicmp(argv[1], L"/?") == 0)
+        {
+            wprintf(WhoamiLoadRcString(IDS_HELP));
+            return 0;
+        }
+
+        else if (wcsicmp(argv[1], L"/upn") == 0)
+        {
+            LPWSTR UserBuffer = WhoamiGetUser(NameUserPrincipal);
+
+            if (UserBuffer)
+            {
+                wprintf(L"%s\n", UserBuffer);
+                WhoamiFree(UserBuffer);
+                return 0;
+            }
+            else
+            {
+                wprintf(WhoamiLoadRcString(IDS_ERROR_UPN));
+                return 1;
+            }
+        }
+
+        else if (wcsicmp(argv[1], L"/fqdn") == 0)
+        {
+            LPWSTR UserBuffer = WhoamiGetUser(NameFullyQualifiedDN);
+
+            if (UserBuffer)
+            {
+                wprintf(L"%s\n", UserBuffer);
+                WhoamiFree(UserBuffer);
+                return 0;
+            }
+            else
+            {
+                wprintf(WhoamiLoadRcString(IDS_ERROR_FQDN));
+                return 1;
+            }
+        }
+
+        else if (wcsicmp(argv[1], L"/logonid") == 0)
+        {
+            return WhoamiLogonId();
+        }
+    }
+
+    /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+     * C: One main parameter with extra tasty modifiers to play with */
+
+    /* sometimes is just easier to whitelist for lack of a better method */
+    for (i=1; i<argc; i++)
+    {
+        if ((wcsicmp(argv[i], L"/user") != 0) &&
+            (wcsicmp(argv[i], L"/groups") != 0) &&
+            (wcsicmp(argv[i], L"/priv") != 0) &&
+            (wcsicmp(argv[i], L"/all") != 0) &&
+            (wcsicmp(argv[i], L"") != 0))
+        {
+            wprintf(WhoamiLoadRcString(IDS_ERROR_INVALIDARG), argv[i]);
+            return 1;
+        }
+    }
+
+    if (GetArgument(L"/user", argc, argv))
+    {
+        WamBit |= WAM_USER;
+    }
+
+    if (GetArgument(L"/groups", argc, argv))
+    {
+        WamBit |= WAM_GROUPS;
+    }
+
+    if (GetArgument(L"/priv", argc, argv))
+    {
+        WamBit |= WAM_PRIV;
+    }
+
+    if (GetArgument(L"/all", argc, argv))
+    {
+        /* one can't have it /all and any of the other options at the same time */
+        if ((WamBit & (WAM_USER | WAM_GROUPS | WAM_PRIV)) == 0)
+        {
+            WamBit |= (WAM_USER | WAM_GROUPS | WAM_PRIV);
+        }
+        else
+        {
+            goto InvalidSyntax;
+        }
+    }
+
+    if (WamBit & WAM_USER)
+    {
+        WhoamiUser();
+    }
+    if (WamBit & WAM_GROUPS)
+    {
+        WhoamiGroups();
+    }
+    if (WamBit & WAM_PRIV)
+    {
+        WhoamiPriv();
+    }
+
+    return 0;
+
+InvalidSyntax:
+    wprintf(WhoamiLoadRcString(IDS_ERROR_INVALIDSYNTAX));
+    return 1;
+}

reactos/base/applications/cmdutils/whoami/whoami.rc

@@ -0,0 +1,33 @@
+#include <windef.h>
+
+#include "resource.h"
+
+LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
+
+#define REACTOS_STR_FILE_DESCRIPTION  "whoami: display information about logged-on users"
+#define REACTOS_STR_INTERNAL_NAME     "whoami"
+#define REACTOS_STR_ORIGINAL_FILENAME "whoami.exe"
+
+#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_ES_ES
+    #include "lang/es-ES.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

reactos/base/applications/cmdutils/xcopy/lang/Da.rc

@@ -2,19 +2,19 @@ LANGUAGE LANG_DANISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_INVPARMS, "Ugyldigt antal parametere; brug <EFBFBD>xcopy /?<EFBFBD> for hjelp\n"
-    STRING_INVPARM,  "Ugyldigt parameter <EFBFBD>%1<EFBFBD>; brug <EFBFBD>xcopy /?<EFBFBD> for hjelp\n"
+    STRING_INVPARMS, "Ugyldigt antal parametere; brug «xcopy /?» for hjelp\n"
+    STRING_INVPARM,  "Ugyldigt parameter «%1»; brug «xcopy /?» for hjelp\n"
     STRING_PAUSE,    "Tryk Enter for at begynde at kopiere\n"
     STRING_SIMCOPY,  "%1!d! fil(er) vil blive kopieret\n"
     STRING_COPY,     "%1!d! fil(er) kopieret\n"
-    STRING_QISDIR,   "Er <EFBFBD>%1<EFBFBD> et filnavn eller katalog\n\
-                     p<EFBFBD> destinationen?\n\
+    STRING_QISDIR,   "Er «%1» et filnavn eller katalog\n\
+                     på destinationen?\n\
                      (F - Fil, K - Katalog)\n"
     STRING_SRCPROMPT, "%1? (Ja|Nei)\n"
-    STRING_OVERWRITE, "Overskrive <EFBFBD>%1<EFBFBD>? (Ja|Nei|Alle)\n"
-    STRING_COPYFAIL, "Kunne ikke kopiere <EFBFBD>%1<EFBFBD> til <EFBFBD>%2<EFBFBD>; fejlet med r/c %3!d!\n"
-    STRING_OPENFAIL, "Kunne ikke <EFBFBD>bne <EFBFBD>%1<EFBFBD>\n"
-    STRING_READFAIL, "Kunne ikke l<EFBFBD>se <EFBFBD>%1<EFBFBD>\n"
+    STRING_OVERWRITE, "Overskrive «%1»? (Ja|Nei|Alle)\n"
+    STRING_COPYFAIL, "Kunne ikke kopiere «%1» til «%2»; fejlet med r/c %3!d!\n"
+    STRING_OPENFAIL, "Kunne ikke åbne «%1»\n"
+    STRING_READFAIL, "Kunne ikke læse «%1»\n"
     STRING_YES_CHAR, "J"
     STRING_NO_CHAR,  "N"
     STRING_ALL_CHAR, "A"
@@ -22,10 +22,10 @@ STRINGTABLE
     STRING_DIR_CHAR, "K"
 
     STRING_HELP,
-"XCOPY - Kopierer filer eller katalogtre til en m<EFBFBD>lplassering\n\
+"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\
 \n\
 Syntaks:\n\
-XCOPY kilde [m<EFBFBD>l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 hvor:\n\
@@ -33,25 +33,25 @@ hvor:\n\
 [/I]  Antag at destinationen er et katalog hvis destinationen ikke\n\
 \tfindes og 2 eller flere filer bliver kopieret\n\
 [/S]  Kopier kataloger og underkataloger\n\
-[/E]  Kopier kataloger og underkataloger, ogs<EFBFBD> tomme kataloger\n\
-[/Q]  V<EFBFBD>r stille : vis ikke filnavne under kopiering\n\
-[/F]  Fil hele kilde- og m<EFBFBD>lnavn under kopiering\n\
-[/L]  Simul<EFBFBD>r operationen; vis kun, g<EFBFBD>r intet\n\
-[/W]  Sp<EFBFBD>rg f<EFBFBD>r koperingen starter\n\
+[/E]  Kopier kataloger og underkataloger, også tomme kataloger\n\
+[/Q]  Vær stille : vis ikke filnavne under kopiering\n\
+[/F]  Fil hele kilde- og målnavn under kopiering\n\
+[/L]  Simulér operationen; vis kun, gør intet\n\
+[/W]  Spørg før koperingen starter\n\
 [/T]  Lav tom katalogstruktur; kopier ikke filer\n\
-[/Y]  Sp<EFBFBD>rg ikke om filer skal overskrives\n\
-[/-Y] Sp<EFBFBD>rg f<EFBFBD>r om filer skal overskrives\n\
-[/P]  Sp<EFBFBD>rg om hver enkelt fil der skal kopieres\n\
+[/Y]  Spørg ikke om filer skal overskrives\n\
+[/-Y] Spørg før om filer skal overskrives\n\
+[/P]  Spørg om hver enkelt fil der skal kopieres\n\
 [/N]  Kopier som korte filnavn (8.3 tegn)\n\
-[/U]  Kopier kun filer som allerede findes p<EFBFBD> destinationen\n\
+[/U]  Kopier kun filer som allerede findes på destinationen\n\
 [/R]  Overskriv filer som er skrivebeskyttet\n\
 [/H]  Kopier skjulte filer og systemfiler\n\
-[/C]  Forts<EFBFBD>t selv om det opst<EFBFBD>r fejl under kopieringen\n\
+[/C]  Fortsæt selv om det opstår fejl under kopieringen\n\
 [/A]  Kopier ikke filer som er markeret som arkiv\n\
 [/M]  Kopier kun filer som er markeret som akriv; fjerner denne markering\n\
-[/D | /D:m-d-<EFBFBD>] Kopier kun nye filer eller dem som er <EFBFBD>ndret efter\n\
+[/D | /D:m-d-å] Kopier kun nye filer eller dem som er ændret efter\n\
 \t\tden opgivne dato.\n\
 \t\tHvis ingen dato opgives kopieres kun de filer hvor\n\
-\t\tdestinationen er <EFBFBD>ldre end kilden\n\n"
+\t\tdestinationen er ældre end kilden\n\n"
 
 }

reactos/base/applications/cmdutils/xcopy/lang/No.rc

@@ -2,19 +2,19 @@ LANGUAGE LANG_NORWEGIAN, SUBLANG_NORWEGIAN_BOKMAL
 
 STRINGTABLE
 {
-    STRING_INVPARMS, "Ugyldig antall parametere; bruk <EFBFBD>xcopy /?<EFBFBD> for hjelp\n"
-    STRING_INVPARM,  "Ugyldig parameter <EFBFBD>%1<EFBFBD>; bruk <EFBFBD>xcopy /?<EFBFBD> for hjelp\n"
-    STRING_PAUSE,    "Trykk Enter for <EFBFBD> begynne <EFBFBD> kopiere\n"
+    STRING_INVPARMS, "Ugyldig antall parametere; bruk «xcopy /?» for hjelp\n"
+    STRING_INVPARM,  "Ugyldig parameter «%1»; bruk «xcopy /?» for hjelp\n"
+    STRING_PAUSE,    "Trykk Enter for å begynne å kopiere\n"
     STRING_SIMCOPY,  "%1!d! fil(er) ville blitt kopiert\n"
     STRING_COPY,     "%1!d! fil(er) kopiert\n"
-    STRING_QISDIR,   "Eer <EFBFBD>%1<EFBFBD> et filnevn eller katalog\n\
-                     i m<EFBFBD>let?\n\
+    STRING_QISDIR,   "Eer «%1» et filnevn eller katalog\n\
+                     i målet?\n\
                      (F - Fil, K - Katalog)\n"
     STRING_SRCPROMPT,"%1? (Ja|Nei)\n"
-    STRING_OVERWRITE,"Skrive over <EFBFBD>%1<EFBFBD>? (Ja|Nei|Alle)\n"
-    STRING_COPYFAIL, "Klarte ikke kopiere <EFBFBD>%1<EFBFBD> til <EFBFBD>%2<EFBFBD>; feilet med r/c %3!d!\n"
-    STRING_OPENFAIL, "Klarte ikke <EFBFBD>pne <EFBFBD>%1<EFBFBD>\n"
-    STRING_READFAIL, "Klarte ikke lese <EFBFBD>%1<EFBFBD>\n"
+    STRING_OVERWRITE,"Skrive over «%1»? (Ja|Nei|Alle)\n"
+    STRING_COPYFAIL, "Klarte ikke kopiere «%1» til «%2»; feilet med r/c %3!d!\n"
+    STRING_OPENFAIL, "Klarte ikke åpne «%1»\n"
+    STRING_READFAIL, "Klarte ikke lese «%1»\n"
     STRING_YES_CHAR, "J"
     STRING_NO_CHAR,  "N"
     STRING_ALL_CHAR, "A"
@@ -22,36 +22,36 @@ STRINGTABLE
     STRING_DIR_CHAR, "K"
 
     STRING_HELP,
-"XCOPY - Kopierer filer eller katalogtre til en m<EFBFBD>lplassering\n\
+"XCOPY - Kopierer filer eller katalogtre til en målplassering\n\
 \n\
 Syntax:\n\
-XCOPY kilde [m<EFBFBD>l] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+XCOPY kilde [mål] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Where:\n\
 \n\
-[/I]  Anta at m<EFBFBD>let er en katalog hvis m<EFBFBD>let ikke finnes og 2 eller\n\
+[/I]  Anta at målet er en katalog hvis målet ikke finnes og 2 eller\n\
 \tflere filer blir kopiert\n\
 [/S]  Kopier kataloger og underkataloger\n\
 [/E]  Kopier kataloger og underkataloger, ta med tomme kataloger\n\
 [/Q]  Stille modus: ikke vis filnavn under kopiering\n\
-[/F]  Fil hele kilde- og m<EFBFBD>lnavn under kopiering\n\
+[/F]  Fil hele kilde- og målnavn under kopiering\n\
 [/L]  Simuler operasjonen; vis bare hva som ville blitt kopiert\n\
-[/W]  Sp<EFBFBD>r for koperingen starter\n\
+[/W]  Spør for koperingen starter\n\
 [/T]  Lag tom  katalogstruktur; ikke kopier filer\n\
-[/Y]  Ikke sp<EFBFBD>r n<EFBFBD>r filer skal overskrives\n\
-[/-Y] Sp<EFBFBD>r f<EFBFBD>r filer skal overskrives\n\
-[/P]  Sp<EFBFBD>r for hver kildefil som skal kopieres\n\
+[/Y]  Ikke spør når filer skal overskrives\n\
+[/-Y] Spør før filer skal overskrives\n\
+[/P]  Spør for hver kildefil som skal kopieres\n\
 [/N]  Kopier som korte filnavn (8.3 tegn)\n\
-[/U]  Bare kopier filer som allerede finnes i m<EFBFBD>let\n\
+[/U]  Bare kopier filer som allerede finnes i målet\n\
 [/R]  Skriv over filer som er skrivebeskyttet\n\
 [/H]  Kopier skjulte filer og systemfiler\n\
-[/C]  Fortsett selv om det oppst<EFBFBD>r feil under kopieringen\n\
+[/C]  Fortsett selv om det oppstår feil under kopieringen\n\
 [/A]  Ikke kopier filer som er markert som arkiv\n\
 [/M]  Bare kopier filer som er markert som akriv; fjerner denne merkingen\n\
-[/D | /D:m-d-<EFBFBD>] Kopier nye filer eller de som er endret etter\n\
+[/D | /D:m-d-å] Kopier nye filer eller de som er endret etter\n\
 \t\tden oppgitte datoen.\n\
 \t\tHvis ingen dato oppgis kopieres bare de filene som er\n\
-\t\teldre i m<EFBFBD>let enn i kilden\n\n"
+\t\teldre i målet enn i kilden\n\n"
 
 }

reactos/base/applications/cmdutils/xcopy/lang/Pl.rc

@@ -2,19 +2,19 @@ LANGUAGE LANG_POLISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 {
-    STRING_INVPARMS, "Niew<EFBFBD>a<EFBFBD>ciwa liczba parametr<EFBFBD>w - uruchom xcopy /? aby wy<EFBFBD>wietli<EFBFBD> pomoc\n"
-    STRING_INVPARM,  "Nieznany parameter '%1' -  uruchom xcopy /? aby wy<EFBFBD>wietli<EFBFBD> pomoc\n"
-    STRING_PAUSE,    "Naci<EFBFBD>nij <enter> aby rozpocz<EFBFBD><EFBFBD> kopiowanie\n"
-    STRING_SIMCOPY,  "%1!d! plik(<EFBFBD>w) zosta<EFBFBD>oby skopiowanych\n"
-    STRING_COPY,     "%1!d! plik(<EFBFBD>w) skopiowanych\n"
-    STRING_QISDIR,   "Czy '%1' jest nazw<EFBFBD> pliku czy katalogu\n\
+    STRING_INVPARMS, "Niewłaściwa liczba parametrów - uruchom xcopy /? aby wyświetlić pomoc\n"
+    STRING_INVPARM,  "Nieznany parameter '%1' -  uruchom xcopy /? aby wyświetlić pomoc\n"
+    STRING_PAUSE,    "Naciśnij <enter> aby rozpocząć kopiowanie\n"
+    STRING_SIMCOPY,  "%1!d! plik(ów) zostałoby skopiowanych\n"
+    STRING_COPY,     "%1!d! plik(ów) skopiowanych\n"
+    STRING_QISDIR,   "Czy '%1' jest nazwą pliku czy katalogu\n\
                      docelowego?\n\
                      (P - plik, K - katalog)\n"
     STRING_SRCPROMPT,"%1? (Tak|Nie)\n"
-    STRING_OVERWRITE,"Zast<EFBFBD>pi<EFBFBD> %1? (Tak|Nie|Wszystkie)\n"
-    STRING_COPYFAIL, "Kopiowanie '%1' do '%2' nie powiod<EFBFBD>o si<EFBFBD> - kod b<EFBFBD><EFBFBD>du %3!d!\n"
-    STRING_OPENFAIL, "Nie uda<EFBFBD>o si<EFBFBD> otworzy<EFBFBD> '%1'\n"
-    STRING_READFAIL, "B<EFBFBD><EFBFBD>d podczas czytania '%1'\n"
+    STRING_OVERWRITE,"Zastąpić %1? (Tak|Nie|Wszystkie)\n"
+    STRING_COPYFAIL, "Kopiowanie '%1' do '%2' nie powiodło się - kod błędu %3!d!\n"
+    STRING_OPENFAIL, "Nie udało się otworzyć '%1'\n"
+    STRING_READFAIL, "Błąd podczas czytania '%1'\n"
     STRING_YES_CHAR, "T"
     STRING_NO_CHAR,  "N"
     STRING_ALL_CHAR, "W"
@@ -22,35 +22,35 @@ STRINGTABLE
     STRING_DIR_CHAR, "K"
 
     STRING_HELP,
-"XCOPY - kopiuje pliki lub drzewa katalog<EFBFBD>w\n\
+"XCOPY - kopiuje pliki lub drzewa katalogów\n\
 \n\
-Sk<EFBFBD>adnia:\n\
-XCOPY <EFBFBD>r<EFBFBD>d<EFBFBD>o [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
+Składnia:\n\
+XCOPY źródło [cel] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n\
 \t     [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n\
 \n\
 Gdzie:\n\
 \n\
-[/I]  Je<EFBFBD>eli ""cel"" nie istnieje i kopiowane s<EFBFBD> co najmniej dwa pliki,\n\
-\tzak<EFBFBD>ada, <EFBFBD>e ""cel"" powien by<EFBFBD> katalogiem\n\
+[/I]  Jeżeli ""cel"" nie istnieje i kopiowane są co najmniej dwa pliki,\n\
+\tzakłada, że ""cel"" powien być katalogiem\n\
 [/S]  Kopiuje katalogi i podkatalogi\n\
-[/E]  Kopiuje katalogi i podkatalogi, <EFBFBD><EFBFBD>cznie z pustymi\n\
-[/Q]  Nie wypisuje nazw plik<EFBFBD>w podczas kopiowania (tryb cichy)\n\
-[/F]  Wypisuje pe<EFBFBD>ne <EFBFBD>cie<EFBFBD>ki <EFBFBD>r<EFBFBD>d<EFBFBD>owe i docelowe podczas kopiowania\n\
-[/L]  Jedynie symuluje operacj<EFBFBD>, pokazuj<EFBFBD>c pliki, kt<EFBFBD>re by<EFBFBD>yby kopiowane\n\
-[/W]  Prosi o potwierdzenie przed rozpocz<EFBFBD>ciem kopiowania\n\
-[/T]  Tworzy puste katalogi, ale nie kopiuje plik<EFBFBD>w\n\
-[/Y]  Zast<EFBFBD>puje pliki bez pro<EFBFBD>by o potwierdzenie\n\
-[/-Y] Zawsze prosi o potwierdzenie przed zast<EFBFBD>pieniem pliku\n\
-[/P]  Prosi o potwierdzenie przed skopiowaniem ka<EFBFBD>dego pliku\n\
-[/N]  Kopiuje u<EFBFBD>ywaj<EFBFBD>c kr<EFBFBD>tkich nazw plik<EFBFBD>w\n\
-[/U]  Kopiuje tylko pliki, kt<EFBFBD>re ju<EFBFBD> istniej<EFBFBD> w miejscu docelowym\n\
-[/R]  Zast<EFBFBD>puje pliki tylko do odczytu\n\
-[/H]  Kopiuje r<EFBFBD>wnie<EFBFBD> pliki ukryte i systemowe\n\
-[/C]  Kontynuuje nawet je<EFBFBD>eli podczas kopiowania wyst<EFBFBD>pi<EFBFBD>y b<EFBFBD><EFBFBD>dy\n\
+[/E]  Kopiuje katalogi i podkatalogi, łącznie z pustymi\n\
+[/Q]  Nie wypisuje nazw plików podczas kopiowania (tryb cichy)\n\
+[/F]  Wypisuje pełne ścieżki źródłowe i docelowe podczas kopiowania\n\
+[/L]  Jedynie symuluje operację, pokazując pliki, które byłyby kopiowane\n\
+[/W]  Prosi o potwierdzenie przed rozpoczęciem kopiowania\n\
+[/T]  Tworzy puste katalogi, ale nie kopiuje plików\n\
+[/Y]  Zastępuje pliki bez prośby o potwierdzenie\n\
+[/-Y] Zawsze prosi o potwierdzenie przed zastąpieniem pliku\n\
+[/P]  Prosi o potwierdzenie przed skopiowaniem każdego pliku\n\
+[/N]  Kopiuje używając krótkich nazw plików\n\
+[/U]  Kopiuje tylko pliki, które już istnieją w miejscu docelowym\n\
+[/R]  Zastępuje pliki tylko do odczytu\n\
+[/H]  Kopiuje również pliki ukryte i systemowe\n\
+[/C]  Kontynuuje nawet jeżeli podczas kopiowania wystąpiły błędy\n\
 [/A]  Kopiuje tylko pliki z atrybutem archiwalny\n\
 [/M]  Kopiuje tylko pliki z atrybutem archiwalny i usuwa ten atrybut\n\
 [/D | /D:m-d-y] Kopiuje tylko nowe pliki lub te zmodifikowane po podanej dacie.\n\
-\t\tJe<EFBFBD>eli nie podano <EFBFBD>adnej daty, to kopiowane s<EFBFBD> pliki, kt<EFBFBD>re s<EFBFBD>\n\
-\t\tnowsze ni<EFBFBD> w katalogu docelowym\n\n"
+\t\tJeżeli nie podano żadnej daty, to kopiowane są pliki, które są\n\
+\t\tnowsze niż w katalogu docelowym\n\n"
 
 }

reactos/base/applications/cmdutils/xcopy/rsrc.rc

@@ -25,28 +25,21 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #define REACTOS_STR_ORIGINAL_FILENAME "xcopy.exe"
 #include <reactos/version.rc>
 
+/* UTF-8 */
+#pragma code_page(65001)
+
 #ifdef LANGUAGE_DA_DK
     #include "lang/Da.rc"
 #endif
+#ifdef LANGUAGE_DE_DE
+    #include "lang/De.rc"
+#endif
 #ifdef LANGUAGE_EN_US
     #include "lang/En.rc"
 #endif
-#ifdef LANGUAGE_NO_NO
-    #include "lang/No.rc"
-#endif
-#ifdef LANGUAGE_PL_PL
-    #include "lang/Pl.rc"
-#endif
 #ifdef LANGUAGE_ES_ES
     #include "lang/Es.rc"
 #endif
-
-/* UTF-8 */
-#pragma code_page(65001)
-
-#ifdef LANGUAGE_DE_DE
-    #include "lang/De.rc"
-#endif
 #ifdef LANGUAGE_FR_FR
     #include "lang/Fr.rc"
 #endif
@@ -65,6 +58,12 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
 #ifdef LANGUAGE_NL_NL
     #include "lang/Nl.rc"
 #endif
+#ifdef LANGUAGE_NO_NO
+    #include "lang/No.rc"
+#endif
+#ifdef LANGUAGE_PL_PL
+    #include "lang/Pl.rc"
+#endif
 #ifdef LANGUAGE_PT_PT
     #include "lang/Pt.rc"
 #endif

reactos/base/applications/dxdiag/dxdiag.c

@@ -174,11 +174,11 @@ InitializeTabCtrl(HWND hwndDlg, PDXDIAG_CONTEXT pContext)
     pContext->hTabCtrl = hTabCtrlWnd;
 
     /* create the dialogs */
-    pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), pContext->hMainDialog, SystemPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[0]);
-    pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), pContext->hMainDialog, MusicPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[1]);
-    pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), pContext->hMainDialog, InputPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[2]);
-    pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), pContext->hMainDialog, NetworkPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[3]);
-    pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), pContext->hMainDialog, HelpPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[4]);
+    pContext->hDialogs[0] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_SYSTEM_DIALOG), pContext->hTabCtrl, SystemPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[0]);
+    pContext->hDialogs[1] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_MUSIC_DIALOG), pContext->hTabCtrl, MusicPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[1]);
+    pContext->hDialogs[2] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_INPUT_DIALOG), pContext->hTabCtrl, InputPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[2]);
+    pContext->hDialogs[3] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_NETWORK_DIALOG), pContext->hTabCtrl, NetworkPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[3]);
+    pContext->hDialogs[4] = CreateDialogParamW(hInst, MAKEINTRESOURCEW(IDD_HELP_DIALOG), pContext->hTabCtrl, HelpPageWndProc, (LPARAM)pContext); EnableDialogTheme(pContext->hDialogs[4]);
 
     /* insert tab ctrl items */
     InsertTabCtrlItem(hTabCtrlWnd, 0, MAKEINTRESOURCEW(IDS_SYSTEM_DIALOG));

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

@@ -216,6 +216,6 @@ BEGIN
     IDS_FORMAT_ADAPTER_MEM "%u Mo"
     IDS_FORMAT_ADAPTER_MODE "%04u x %04u (%u bit)(%uHz)"
     IDS_OPTION_NO "Non"
-    IDS_D3DTEST_DESCRIPTION "This will start Direct3D interface test. Continue?"
-    IDS_D3DTEST_D3Dx "This test will use hardware-accelerated Direct3D %u interface."
+    IDS_D3DTEST_DESCRIPTION "Ceci va démarrer le test de l'interface Direct3D. Continuer ?"
+    IDS_D3DTEST_D3Dx "Ce test va utiliser l'interface Direct3D %u accélérée matériellement."
 END

reactos/base/applications/fontview/lang/it-IT.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_ITALIAN, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN

reactos/base/applications/fontview/lang/zh-CN.rc

@@ -10,10 +10,10 @@ LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
 STRINGTABLE
 BEGIN
-    IDS_INSTALL "Install"
+    IDS_INSTALL "安装"
     IDS_PRINT "列印"
     IDS_STRING "ReactOS 给所有人一个自由的操作系统！1234567890"
-    IDS_OPEN "Open Font..."
+    IDS_OPEN "打开字体档案..."
     IDS_ERROR "错误"
     IDS_ERROR_NOMEM "没有足够的内存来完成操作。"
     IDS_ERROR_NOFONT "％1不是一个有效的字体档案。"

reactos/base/applications/games/winmine/lang/tr-TR.rc

@@ -1,11 +1,11 @@
-/* TRANSLATORS: 2006 Fatih Aşıcı; 2013, 2014 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
+/* TRANSLATORS: 2006 Fatih Aşıcı, 2013-2015 Erdem Ersoy (eersoy93) (erdemersoy@live.com) */
 
 LANGUAGE LANG_TURKISH, SUBLANG_DEFAULT
 
 STRINGTABLE
 BEGIN
     IDS_APPNAME "Mayın Tarlası"
-    IDS_NOBODY "Hiç Kimse"
+    IDS_NOBODY "Bir kişi bile"
     IDS_ABOUT "Telif Hakkı: 2000 - Joshua Thielen"
 END
 

reactos/base/applications/mmc/lang/zh-CN.rc

@@ -12,7 +12,7 @@ IDM_CONSOLE_SMALL MENU
 BEGIN
     POPUP "档案(&F)"
     BEGIN
-        MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "新建\tCtrl+N", IDM_FILE_NEW
         MENUITEM SEPARATOR
         MENUITEM "结束(&X)\tAlt+F4", IDM_FILE_EXIT
     END
@@ -26,13 +26,13 @@ IDM_CONSOLE_LARGE MENU
 BEGIN
     POPUP "档案(&F)"
     BEGIN
-        MENUITEM "New\tCtrl+N", IDM_FILE_NEW
+        MENUITEM "新建\tCtrl+N", IDM_FILE_NEW
         MENUITEM SEPARATOR
         MENUITEM "结束(&X)\tAlt+F4", IDM_FILE_EXIT
     END
-    POPUP "&Windows"
+    POPUP "窗口(&W)"
     BEGIN
-        MENUITEM "List", IDM_WINDOWS_LIST
+        MENUITEM "列表", IDM_WINDOWS_LIST
     END
     POPUP "帮助(&H)"
     BEGIN

reactos/base/applications/mplay32/lang/zh-CN.rc

@@ -11,22 +11,22 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "退出(&E)", IDM_EXIT
     END
-    POPUP "&Play"
+    POPUP "播放(&P)"
     BEGIN
-        MENUITEM "Play/&Pause\tCtrl+P", IDC_PLAY
-        MENUITEM "St&op\tCtrl+S", IDC_STOP
+        MENUITEM "播放/暂停(&P)\tCtrl+P", IDC_PLAY
+        MENUITEM "停止(&S)\tCtrl+S", IDC_STOP
         MENUITEM SEPARATOR
-        MENUITEM "Repea&t\tCtrl+T", IDM_REPEAT
+        MENUITEM "重复(&R)\tCtrl+T", IDM_REPEAT
     END
-    POPUP "&View"
+    POPUP "视图(&V)"
     BEGIN
-        MENUITEM "Single-Window &Mode", IDM_SWITCHVIEW
+        MENUITEM "单窗模式(&M)", IDM_SWITCHVIEW
     END
-    POPUP "&Device"
+    POPUP "设备(&D)"
     BEGIN
-        MENUITEM "&Properties", IDM_DEVPROPS
+        MENUITEM "属性(&P)", IDM_DEVPROPS
         MENUITEM SEPARATOR
-        MENUITEM "&Volume Control", IDM_VOLUMECTL
+        MENUITEM "音量控制(&V)", IDM_VOLUMECTL
     END
     POPUP "帮助(&H)"
     BEGIN
@@ -55,6 +55,6 @@ BEGIN
     IDS_TOOLTIP_FORWARD "向前跳过"
     IDS_APPTITLE "ReactOS 多媒体播放器"
     IDS_PLAY "播放"
-    IDS_DEFAULTMCIERRMSG "No description is available for this error."
-    IDS_UNKNOWNFILEEXT "Cannot determine the device type from the given filename extension."
+    IDS_DEFAULTMCIERRMSG "该错误没有可用的描述."
+    IDS_UNKNOWNFILEEXT "该设备类型从给定的文件扩展名无法断定."
 END

reactos/base/applications/mscutils/devmgmt/lang/bg-BG.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
+LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDR_MAINMENU MENU
 BEGIN

reactos/base/applications/mscutils/devmgmt/lang/de-DE.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_GERMAN, SUBLANG_NEUTRAL
 
 IDR_MAINMENU MENU
 BEGIN

reactos/base/applications/mscutils/devmgmt/lang/el-GR.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
+LANGUAGE LANG_GREEK, SUBLANG_DEFAULT
 
 IDR_MAINMENU MENU
 BEGIN

reactos/base/applications/mscutils/devmgmt/lang/es-ES.rc

@@ -1,6 +1,7 @@
-/*
+/*
  * Spanish Language resource file
  * Traducido por: Javier Remacha 2007-12-21
+ * Corregido por: Ismael Ferrera Morezuelas 2014-12-31
  */
 
 LANGUAGE LANG_SPANISH, SUBLANG_NEUTRAL
@@ -26,7 +27,7 @@ BEGIN
         MENUITEM "Recursos por tipo", IDC_RESBYTYPE, GRAYED
         MENUITEM "Recursos por conexión", IDC_RESBYCONN, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "Show hidden devices", IDC_SHOWHIDDEN
+        MENUITEM "Mostrar dispositivos ocultos", IDC_SHOWHIDDEN
     END
     POPUP "Ayuda"
     BEGIN
@@ -46,11 +47,11 @@ BEGIN
 END
 
 IDD_ABOUTBOX DIALOGEX 22, 16, 190, 182
-CAPTION "Acerca del Gestor de Dispositivos"
+CAPTION "Acerca del Administrador de dispositivos"
 FONT 8, "MS Shell Dlg", 0, 0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-    LTEXT "Gestor de Dispositivos v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
+    LTEXT "Administrador de dispositivos v0.1\nCopyright (C) 2006\nCreado por Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
     PUSHBUTTON "Cerrar", IDOK, 75, 162, 44, 15
     ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
     EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
@@ -58,7 +59,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_LICENSE "Este programa es software libre; puedes redistribuirlo y/o modificarlo bajo los términos de la GNU General Public License tal y como fueron publicados por la Free Software Foundation; ya sea la versión 2 de la Licencia, o (bajo tu discreción) cualquier versión posterior.\r\n\r\nEste programa se distribuye con el fin de ser útil, pero viene SIN NINGUNA GARANTÍA; sin tan siquiera la garantía implícita de COMERCIALIZACIÓN o la de IDONEIDAD PARA UN PROPÓSITO CONCRETO. Para más información lee la GNU General Public License.\r\n\r\nDeberías de haber recibido una copia de la GNU General Public License con el programa; si no, puedes escribir a la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 EE.UU."
 END
 
 STRINGTABLE
@@ -72,17 +73,17 @@ END
 /* Hints */
 STRINGTABLE
 BEGIN
-    IDS_APPNAME "Gestor de Dispositivos de ReactOS"
+    IDS_APPNAME "Administrador de dispositivos de ReactOS"
     IDS_HINT_BLANK " "
-    IDS_HINT_EXIT " Cerrar el programa."
+    IDS_HINT_EXIT " Cierra el programa."
     IDS_HINT_REFRESH " Actualizar la lista de servicios."
     IDS_HINT_PROP " Abre la pestaña de propiedades de la selección actual."
     IDS_HINT_HELP " Mostrar la ventana de ayuda."
-    IDS_HINT_ABOUT " Acerca del Gestor de Dispositivos de ReactOS."
+    IDS_HINT_ABOUT " Acerca del Administrador de dispositivos de ReactOS."
     IDS_HINT_SYS_RESTORE " Devuelve esta ventana al tamaño normal."
     IDS_HINT_SYS_MOVE " Mueve esta ventana."
     IDS_HINT_SYS_SIZE " Redimensiona esta ventana."
-    IDS_HINT_SYS_MINIMIZE " Colapsa esta ventana a un icono."
-    IDS_HINT_SYS_MAXIMIZE " Expande esta ventana hasta llenar esta pantalla."
-    IDS_HINT_SYS_CLOSE " Cerrar esta ventana."
+    IDS_HINT_SYS_MINIMIZE " Contrae esta ventana en un icono."
+    IDS_HINT_SYS_MAXIMIZE " Expande esta ventana hasta ocupar la pantalla."
+    IDS_HINT_SYS_CLOSE " Cierra esta ventana."
 END

reactos/base/applications/mscutils/devmgmt/lang/fr-FR.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
+LANGUAGE LANG_FRENCH, SUBLANG_NEUTRAL
 
 IDR_MAINMENU MENU
 BEGIN

reactos/base/applications/mscutils/devmgmt/lang/it-IT.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_ITALIAN, SUBLANG_NEUTRAL
 
 IDR_MAINMENU MENU
 BEGIN

reactos/base/applications/mscutils/devmgmt/lang/ko-KR.rc

@@ -1,4 +1,4 @@
-/* Korean translation by manatails007(www.manatails007.org) */
+/* Korean translation by manatails007(www.manatails007.org) */
 
 LANGUAGE LANG_KOREAN, SUBLANG_DEFAULT
 

reactos/base/applications/mscutils/devmgmt/lang/no-NO.rc

@@ -1,4 +1,4 @@
-LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
+LANGUAGE LANG_NORWEGIAN, SUBLANG_NEUTRAL
 
 IDR_MAINMENU MENU
 BEGIN

reactos/base/applications/mscutils/devmgmt/lang/pl-PL.rc

@@ -1,4 +1,4 @@
-/*
+/*
  *    Translated by xrogers
  *    xxrogers@users.sourceforge.net
  *    https://sourceforge.net/projects/reactospl

reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc

@@ -1,4 +1,4 @@
-/* 2011.10.19 - Fulea Ștefan: minor changes */
+/* 2011.10.19 - Fulea Ștefan: minor changes */
 
 LANGUAGE LANG_ROMANIAN, SUBLANG_NEUTRAL
 

reactos/base/applications/mscutils/devmgmt/lang/ru-RU.rc

@@ -1,4 +1,4 @@
-/* Russian language resource file (Dmitry Chapyshev, 2007-06-10) */
+/* Russian language resource file (Dmitry Chapyshev, 2007-06-10) */
 
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 

reactos/base/applications/mscutils/devmgmt/lang/sk-SK.rc

@@ -1,4 +1,4 @@
-/* TRANSLATOR:  Mário Kačmár /Mario Kacmar/ aka Kario (kario@szm.sk)
+/* TRANSLATOR:  Mário Kačmár /Mario Kacmar/ aka Kario (kario@szm.sk)
  * DATE OF TR.: 14-02-2008
  * LAST CHANGE: 29-08-2008
  */

reactos/base/applications/mscutils/devmgmt/lang/sv-SE.rc

@@ -1,4 +1,4 @@
-/*
+/*
  * PROJECT:    ReactOS MSCUTILS
  * FILE:       base\applications\mscutils\devmgmt\lang\sv-SE.rc
  * PURPOSE:    Swedish resource file

reactos/base/applications/mscutils/devmgmt/lang/th-TH.rc

@@ -1,4 +1,4 @@
-/*
+/*
  * PROJECT:   ReactOS Device Management
  * LICENSE:   GPL - See COPYING in the top level directory
  * FILE:      base/applications/devmgmt/lang/th-TH.rc

reactos/base/applications/mscutils/devmgmt/lang/tr-TR.rc

@@ -55,7 +55,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) koşulları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBİR GÜVENCESİ YOKTUR, SATILABİLİRLİĞİN ve BELİRLİ BİR AMACA UYGUNLUĞUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eğer yoksa Özgür Yazılım Vakfı AŞ'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis 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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+    IDS_LICENSE "ÖNEMLİ: Aşağıdaki metin, özgün metnin resmî olmayan çevirisidir. Çeviri metniyle özgün metin arasında ayrım olabilir. Özgün metin, çeviri metninin altındadır.\r\n\r\n***\r\n\r\nBu izlence özgür yazılımdır; bunu, Özgür Yazılım Vakfı'nın yayımladığı GNU Umûmî Kamu Ruhsatı'nın, 2. sürümünün ya da daha sonraki bir sürümünün (Orası size bağlı.) şartları altında yeniden dağıtabilir veyâ değiştirebilirsiniz.\r\n\r\nBu izlence, kullanışlı olabileceği beklentisiyle dağıtılmıştır ancak bu izlencenin HİÇBİR GÜVENCESİ YOKTUR, SATILABİLİRLİĞİN ve BELİRLİ BİR AMACA UYGUNLUĞUN demek istenilen güvencesi bile. Daha çok bilgi için GNU Umûmî Kamu Ruhsatı'na bakınız.\r\n\r\nBu izlenceyle birlikte GNU Umûmî Kamu Ruhsatı'nın bir kopyasını almış olmalısınız, eğer yoksa Özgür Yazılım Vakfı AŞ'ye (51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 ABD) yazınız.\r\n\r\n***\r\n\r\nThis 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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
 STRINGTABLE
@@ -73,13 +73,13 @@ BEGIN
     IDS_HINT_BLANK        " "
     IDS_HINT_EXIT         " İzlenceden çıkar."
     IDS_HINT_REFRESH      " Hizmet dizelgesini yeniler."
-    IDS_HINT_PROP         " Seçilen için husûsiyetler penceresini açar."
-    IDS_HINT_HELP         " Yardım penceresini açar."
+    IDS_HINT_PROP         " Şimdiki seçilen için husûsiyet penceresini açar."
+    IDS_HINT_HELP         " Yardım penceresini görüntüler."
     IDS_HINT_ABOUT        " Aygıt Yöneticisi üzerine."
-    IDS_HINT_SYS_RESTORE  " Bu pencereyi eski boyutlarına döndürür."
+    IDS_HINT_SYS_RESTORE  " Bu pencereyi düzgülük boyutlarına döndürür."
     IDS_HINT_SYS_MOVE     " Bu pencereyi devindirir."
-    IDS_HINT_SYS_SIZE     " Bu pencerenin boyutlarını değiştirir."
-    IDS_HINT_SYS_MINIMIZE " Bu pencereyi simge durumuna küçültür."
+    IDS_HINT_SYS_SIZE     " Bu pencereyi yeniden boyutlandırır."
+    IDS_HINT_SYS_MINIMIZE " Bu pencereyi bir simgeye küçültür."
     IDS_HINT_SYS_MAXIMIZE " Bu pencereyi, bu görüntülüğü kaplatana dek genişletir."
     IDS_HINT_SYS_CLOSE    " Bu pencereyi kapatır."
 END

reactos/base/applications/mscutils/devmgmt/lang/uk-UA.rc

@@ -1,4 +1,4 @@
-/*
+/*
  * PROJECT:    ReactOS Device Management
  * LICENSE:    GPL - See COPYING in the top level directory
  * FILE:       base/applications/devmgmt/lang/uk-UA.rc

reactos/base/applications/mscutils/devmgmt/lang/zh-CN.rc

@@ -1,4 +1,4 @@
-/* Translated by Song Fuchang (0xfc) <sfc_0@yahoo.com.cn> */
+/* Translated by Song Fuchang (0xfc) <sfc_0@yahoo.com.cn> */
 
 LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
 
@@ -23,7 +23,7 @@ BEGIN
         MENUITEM "资源，按类型", IDC_RESBYTYPE, GRAYED
         MENUITEM "资源，按连接", IDC_RESBYCONN, GRAYED
         MENUITEM SEPARATOR
-        MENUITEM "Show hidden devices", IDC_SHOWHIDDEN
+        MENUITEM "显示隐藏的设备", IDC_SHOWHIDDEN
     END
     POPUP "帮助"
     BEGIN

reactos/base/applications/mscutils/devmgmt_new/DeviceView.cpp

@@ -1,24 +1,69 @@
-#include "StdAfx.h"
+/*
+* PROJECT:     ReactOS Device Manager
+* LICENSE:     GPL - See COPYING in the top level directory
+* FILE:        base/applications/mscutils/devmgmt/deviceview.cpp
+* PURPOSE:     Implements the tree view which holds the devices
+* COPYRIGHT:   Copyright 2014 Ged Murphy <gedmurphy@gmail.com>
+*
+*/
+
+
+#include "stdafx.h"
 #include "devmgmt.h"
 #include "DeviceView.h"
 
 
-CDeviceView::CDeviceView(HWND hMainWnd) :
+/* DATA *********************************************/
+
+#define DEVICE_NAME_LEN     256
+#define CLASS_NAME_LEN      256
+#define CLASS_DESC_LEN      256
+
+INT_PTR
+WINAPI
+DevicePropertiesExW(
+    IN HWND hWndParent OPTIONAL,
+    IN LPCWSTR lpMachineName OPTIONAL,
+    IN LPCWSTR lpDeviceID OPTIONAL,
+    IN DWORD dwFlags OPTIONAL,
+    IN BOOL bShowDevMgr
+);
+
+typedef INT_PTR(WINAPI *pDevicePropertiesExW)(HWND,LPCWSTR,LPCWSTR,DWORD,BOOL);
+
+
+/* PUBLIC METHODS *************************************/
+
+CDeviceView::CDeviceView(
+    HWND hMainWnd,
+    ListDevices List
+    ) :
+    m_Devices(NULL),
     m_hMainWnd(hMainWnd),
     m_hTreeView(NULL),
     m_hPropertyDialog(NULL),
-    m_hShortcutMenu(NULL)
+    m_hShortcutMenu(NULL),
+    m_ListDevices(List),
+    m_ShowHidden(FALSE)
 {
+    m_Devices = new CDevices();
 }
 
-
 CDeviceView::~CDeviceView(void)
 {
+    delete m_Devices;
+    m_Devices = NULL;
 }
 
 BOOL
 CDeviceView::Initialize()
 {
+    BOOL bSuccess;
+
+    /* Initialize the devices class */
+    bSuccess = m_Devices->Initialize();
+    if (bSuccess == FALSE) return FALSE;
+
     /* Create the main treeview */
     m_hTreeView = CreateWindowExW(WS_EX_CLIENTEDGE,
                                   WC_TREEVIEW,
@@ -32,19 +77,38 @@ CDeviceView::Initialize()
                                   NULL);
     if (m_hTreeView)
     {
+        /* Get the devices image list */
+        m_ImageList = m_Devices->GetImageList();
 
+        /* Set the image list against the treeview */
+        (VOID)TreeView_SetImageList(m_hTreeView,
+                                    m_ImageList,
+                                    TVSIL_NORMAL);
+
+        /* Give the treeview arrows instead of +/- boxes (on Win7) */
+        SetWindowTheme(m_hTreeView, L"explorer", NULL);
     }
 
     return !!(m_hTreeView);
+}
+
+BOOL
+CDeviceView::Uninitialize()
+{
+    EmptyDeviceView();
+
+    (VOID)m_Devices->Uninitialize();
 
     return TRUE;
 }
 
 VOID
-CDeviceView::Size(INT x,
-                  INT y,
-                  INT cx,
-                  INT cy)
+CDeviceView::Size(
+    _In_ INT x,
+    _In_ INT y,
+    _In_ INT cx,
+    _In_ INT cy
+    )
 {
     /* Resize the treeview */
     SetWindowPos(m_hTreeView,
@@ -56,23 +120,503 @@ CDeviceView::Size(INT x,
                  SWP_NOZORDER);
 }
 
-BOOL
-CDeviceView::Uninitialize()
-{
-    return TRUE;
-}
 
 VOID
 CDeviceView::Refresh()
 {
+    HANDLE hThread;
+
+    /* Run on a new thread to keep the gui responsive */
+    hThread = (HANDLE)_beginthreadex(NULL,
+                                     0,
+                                     &ListDevicesThread,
+                                     this,
+                                     0,
+                                     NULL);
+
+    if (hThread) CloseHandle(hThread);
 }
 
 VOID
 CDeviceView::DisplayPropertySheet()
 {
+#ifndef __REACTOS__
+    pDevicePropertiesExW DevicePropertiesExW;
+    HMODULE hModule;
+
+    hModule = LoadLibraryW(L"devmgr.dll");
+    if (hModule == NULL) return;
+
+    DevicePropertiesExW = (pDevicePropertiesExW)GetProcAddress(hModule,
+                                                               "DevicePropertiesExW");
+    if (DevicePropertiesExW == NULL)
+    {
+        FreeLibrary(hModule);
+        return;
+    }
+#endif
+
+    TV_ITEM tvItem;
+
+    tvItem.hItem = TreeView_GetSelection(m_hTreeView);
+    tvItem.mask = TVIF_PARAM;
+
+    if (TreeView_GetItem(m_hTreeView, &tvItem) &&
+        (LPTSTR)tvItem.lParam != NULL)
+    {
+        DevicePropertiesExW(m_hTreeView,
+                            NULL,
+                            (LPTSTR)tvItem.lParam,
+                            1,//DPF_EXTENDED,
+                            FALSE);
+    }
+
+#ifndef __REACTOS__
+    FreeLibrary(hModule);
+#endif
 }
 
 VOID
 CDeviceView::SetFocus()
 {
 }
+
+
+/* PRIVATE METHODS ********************************************/
+
+unsigned int __stdcall CDeviceView::ListDevicesThread(void *Param)
+{
+    CDeviceView *This = (CDeviceView *)Param;
+
+    /* Clear any existing data */
+    This->EmptyDeviceView();
+
+    /* Reset the tree root */
+    This->m_hTreeRoot = NULL;
+
+    switch (This->m_ListDevices)
+    {
+    case DevicesByType:
+        (VOID)This->ListDevicesByType();
+        break;
+
+    case DevicesByConnection:
+        (VOID)This->ListDevicesByConnection();
+        break;
+
+    case ResourcesByType:
+        break;
+
+    case ResourcesByConnection:
+        break;
+    }
+    return 0;
+}
+
+
+BOOL
+CDeviceView::ListDevicesByType()
+{
+    HTREEITEM hDevItem = NULL;
+    GUID ClassGuid;
+    WCHAR ClassName[CLASS_NAME_LEN];
+    WCHAR ClassDescription[CLASS_DESC_LEN];
+    INT ClassIndex;
+    INT ClassImage;
+    LPTSTR DeviceId = NULL;
+    BOOL bSuccess;
+
+
+    /* Get the details of the root of the device tree */
+    bSuccess = m_Devices->GetDeviceTreeRoot(ClassName, CLASS_NAME_LEN, &ClassImage);
+    if (bSuccess)
+    {
+        /* Add the root of the device tree to the treeview */
+        m_hTreeRoot = InsertIntoTreeView(NULL,
+                                         ClassName,
+                                         NULL,
+                                         ClassImage,
+                                         0);
+    }
+
+    /* If something went wrong, bail */
+    if (m_hTreeRoot == NULL) return FALSE;
+
+    ClassIndex = 0;
+    do
+    {
+        /* Get the next device class */
+        bSuccess = m_Devices->EnumClasses(ClassIndex,
+                                          &ClassGuid,
+                                          ClassName,
+                                          CLASS_NAME_LEN,
+                                          ClassDescription,
+                                          CLASS_DESC_LEN,
+                                          &ClassImage);
+        if (bSuccess)
+        {
+            BOOL bDevSuccess, AddedParent;
+            HANDLE Handle = NULL;
+            WCHAR DeviceName[DEVICE_NAME_LEN];
+            INT DeviceIndex = 0;
+            BOOL MoreItems = FALSE;
+            BOOL DeviceHasProblem = FALSE;
+            ULONG DeviceStatus = 0;
+            ULONG ProblemNumber = 0;
+            ULONG OverlayImage = 0;
+
+            AddedParent = FALSE;
+
+            do
+            {
+                /* Enum all the devices that belong to this class */
+                bDevSuccess = m_Devices->EnumDevicesForClass(&Handle,
+                                                             &ClassGuid,
+                                                             DeviceIndex,
+                                                             &MoreItems,
+                                                             DeviceName,
+                                                             DEVICE_NAME_LEN,
+                                                             &DeviceId,
+                                                             &DeviceStatus,
+                                                             &ProblemNumber);
+                if (bDevSuccess)
+                {
+                    /* Check if this is a hidden device */
+                    if (DeviceStatus & DN_NO_SHOW_IN_DM)
+                    {
+                        if (m_ShowHidden == FALSE)
+                        {
+                            DeviceIndex++;
+                            continue;
+                        }
+                    }
+
+                    /* Check if the device has a problem */
+                    if (DeviceStatus & DN_HAS_PROBLEM)
+                    {
+                        DeviceHasProblem = TRUE;
+                        OverlayImage = 1;
+                    }
+
+                    /* The disabled overlay takes precidence over the problem overlay */
+                    if (ProblemNumber == CM_PROB_HARDWARE_DISABLED)
+                    {
+                        OverlayImage = 2;
+                    }
+
+
+                    /* We have a device, we're gonna need to add the parent first */
+                    if (AddedParent == FALSE)
+                    {
+                        /* Insert the new class under the root item */
+                        hDevItem = InsertIntoTreeView(m_hTreeRoot,
+                                                      ClassDescription,
+                                                      NULL,
+                                                      ClassImage,
+                                                      0);
+
+                        /* Don't add it again */
+                        AddedParent = TRUE;
+                    }
+
+                    /* Add the device under the class item */
+                    (VOID)InsertIntoTreeView(hDevItem,
+                                             DeviceName,
+                                             (LPARAM)DeviceId,
+                                             ClassImage,
+                                             OverlayImage);
+
+                    /* Check if there's a problem with the device */
+                    if (DeviceHasProblem)
+                    {
+                        /* Expand the class */
+                        (VOID)TreeView_Expand(m_hTreeView,
+                                              hDevItem,
+                                              TVE_EXPAND);
+                    }
+                }
+
+                DeviceIndex++;
+
+            } while (MoreItems);
+
+            /* Check if this class has any devices */
+            if (AddedParent == TRUE)
+            {
+                /* Sort the devices alphabetically */
+                (VOID)TreeView_SortChildren(m_hTreeView,
+                                            hDevItem,
+                                            0);
+            }
+        }
+
+        ClassIndex++;
+
+    } while (bSuccess);
+
+    /* Sort the classes alphabetically */
+    (VOID)TreeView_SortChildren(m_hTreeView,
+                                m_hTreeRoot,
+                                0);
+
+    /* Expand the root item */
+    (VOID)TreeView_Expand(m_hTreeView,
+                          m_hTreeRoot,
+                          TVE_EXPAND);
+
+    /* Pre-select the root item */
+    (VOID)TreeView_SelectItem(m_hTreeView,
+                              m_hTreeRoot);
+
+    return 0;
+}
+
+BOOL
+CDeviceView::ListDevicesByConnection()
+{
+    WCHAR DeviceName[DEVICE_NAME_LEN];
+    INT ClassImage;
+    BOOL bSuccess;
+
+    /* Get the details of the root of the device tree */
+    bSuccess = m_Devices->GetDeviceTreeRoot(DeviceName, DEVICE_NAME_LEN, &ClassImage);
+    if (bSuccess)
+    {
+        /* Add the root of the device tree to the treeview */
+        m_hTreeRoot = InsertIntoTreeView(NULL,
+                                         DeviceName,
+                                         NULL,
+                                         ClassImage,
+                                         0);
+    }
+
+    /* Walk the device tree and add all the devices */
+    RecurseChildDevices(m_Devices->GetRootDevice(), m_hTreeRoot);
+
+    /* Expand the root item */
+    (VOID)TreeView_Expand(m_hTreeView,
+                          m_hTreeRoot,
+                          TVE_EXPAND);
+
+    return TRUE;
+}
+
+VOID
+CDeviceView::RecurseChildDevices(
+    _In_ DEVINST ParentDevice,
+    _In_ HTREEITEM hParentTreeItem
+    )
+{
+    HTREEITEM hDevItem = NULL;
+    DEVINST Device;
+    WCHAR DeviceName[DEVICE_NAME_LEN];
+    LPTSTR DeviceId = NULL;
+    INT ClassImage;
+    BOOL IsUnknown = FALSE;
+    BOOL IsHidden = FALSE;
+    ULONG DeviceStatus = 0;
+    ULONG ProblemNumber = 0;
+    UINT OverlayImage = 0;
+    BOOL bSuccess;
+
+    /* Check if the parent has any child devices */
+    if (m_Devices->GetChildDevice(ParentDevice, &Device) == FALSE)
+        return;
+
+    /* Lookup the info about this device */
+    bSuccess = m_Devices->GetDevice(Device,
+                                    DeviceName,
+                                    DEVICE_NAME_LEN,
+                                    &DeviceId,
+                                    &ClassImage,
+                                    &DeviceStatus,
+                                    &ProblemNumber);
+    if (bSuccess)
+    {
+        /* Check if this is a hidden device */
+        if ((m_ShowHidden == TRUE) || (!(DeviceStatus & DN_NO_SHOW_IN_DM)))
+        {
+            /* Check if the device has a problem */
+            if (DeviceStatus & DN_HAS_PROBLEM)
+            {
+                OverlayImage = 1;
+            }
+
+            /* The disabled overlay takes precidence over the problem overlay */
+            if (ProblemNumber == CM_PROB_HARDWARE_DISABLED)
+            {
+                OverlayImage = 2;
+            }
+
+            /* Add this device to the tree under its parent */
+            hDevItem = InsertIntoTreeView(hParentTreeItem,
+                                          DeviceName,
+                                          (LPARAM)DeviceId,
+                                          ClassImage,
+                                          0);
+
+
+            if (hDevItem)
+            {
+                /* Check if this child has any children itself */
+                RecurseChildDevices(Device, hDevItem);
+            }
+        }
+    }
+
+
+    for (;;)
+    {
+        /* Check if the parent device has anything at the same level */
+        bSuccess = m_Devices->GetSiblingDevice(Device, &Device);
+        if (bSuccess == FALSE) break;
+
+        /* Lookup the info about this device */
+        bSuccess = m_Devices->GetDevice(Device,
+                                        DeviceName,
+                                        DEVICE_NAME_LEN,
+                                        &DeviceId,
+                                        &ClassImage,
+                                        &DeviceStatus,
+                                        &ProblemNumber);
+        if (bSuccess)
+        {
+            /* Check if this is a hidden device */
+            if (DeviceStatus & DN_NO_SHOW_IN_DM)
+            {
+                if (m_ShowHidden == FALSE)
+                    continue;
+            }
+
+            /* Check if the device has a problem */
+            if (DeviceStatus & DN_HAS_PROBLEM)
+            {
+                OverlayImage = 1;
+            }
+
+            /* The disabled overlay takes precidence over the problem overlay */
+            if (ProblemNumber == CM_PROB_HARDWARE_DISABLED)
+            {
+                OverlayImage = 2;
+            }
+
+
+            /* Add this device to the tree under its parent */
+            hDevItem = InsertIntoTreeView(hParentTreeItem,
+                                            DeviceName,
+                                            (LPARAM)DeviceId,
+                                            ClassImage,
+                                            0);
+            if (hDevItem)
+            {
+                /* Check if this child has any children itself */
+                RecurseChildDevices(Device, hDevItem);
+            }
+        }
+    }
+
+    (void)TreeView_SortChildren(m_hTreeView,
+                                hParentTreeItem,
+                                0);
+}
+
+ HTREEITEM
+CDeviceView::InsertIntoTreeView(
+    _In_ HTREEITEM hParent,
+    _In_z_ LPWSTR lpLabel,
+    _In_ LPARAM lParam,
+    _In_ INT DevImage,
+    _In_ UINT OverlayImage
+    )
+{
+    TV_ITEMW tvi;
+    TV_INSERTSTRUCT tvins;
+
+    ZeroMemory(&tvi, sizeof(tvi));
+    ZeroMemory(&tvins, sizeof(tvins));
+
+    tvi.mask = TVIF_TEXT | TVIF_PARAM | TVIF_IMAGE | TVIF_SELECTEDIMAGE;
+    tvi.pszText = lpLabel;
+    tvi.cchTextMax = wcslen(lpLabel);
+    tvi.lParam = lParam;
+    tvi.iImage = DevImage;
+    tvi.iSelectedImage = DevImage;
+
+    if (OverlayImage != 0)
+    {
+        tvi.mask |= TVIF_STATE;
+        tvi.stateMask = TVIS_OVERLAYMASK;
+        tvi.state = INDEXTOOVERLAYMASK(OverlayImage);
+    }
+
+    tvins.item = tvi;
+    tvins.hParent = hParent;
+
+    return TreeView_InsertItem(m_hTreeView, &tvins);
+}
+
+VOID
+CDeviceView::RecurseDeviceView(
+    _In_ HTREEITEM hParentItem
+    )
+{
+    HTREEITEM hItem;
+    TVITEMW tvItem;
+
+    /* Check if this node has any children */
+    hItem = TreeView_GetChild(m_hTreeView, hParentItem);
+    if (hItem == NULL) return;
+
+    /* The lParam contains the device id */
+    tvItem.hItem = hItem;
+    tvItem.mask = TVIF_PARAM;
+
+    /* Get the item data */
+    if (TreeView_GetItem(m_hTreeView, &tvItem) &&
+        tvItem.lParam != NULL)
+    {
+        /* Free the device id */
+        HeapFree(GetProcessHeap(), 0, (LPVOID)tvItem.lParam);
+    }
+
+    /* This node may have its own children */
+    RecurseDeviceView(hItem);
+
+    for (;;)
+    {
+        /* Get the next item at this level */
+        hItem = TreeView_GetNextSibling(m_hTreeView, hItem);
+        if (hItem == NULL) break;
+
+        /* The lParam contains the device id */
+        tvItem.hItem = hItem;
+        tvItem.mask = TVIF_PARAM;
+
+        /* Get the item data and free the device id */
+        if (TreeView_GetItem(m_hTreeView, &tvItem))
+        {
+            if (tvItem.lParam != NULL)
+                HeapFree(GetProcessHeap(), 0, (LPVOID)tvItem.lParam);
+        }
+
+        /* This node may have its own children */
+        RecurseDeviceView(hItem);
+    }
+}
+
+
+VOID
+CDeviceView::EmptyDeviceView()
+{
+    HTREEITEM hItem;
+
+    /* Check if there are any items in the tree */
+    hItem = TreeView_GetRoot(m_hTreeView);
+    if (hItem == NULL) return;
+
+    /* Free all the Device Ids */
+    RecurseDeviceView(hItem);
+
+    /* Delete all the items */
+    (VOID)TreeView_DeleteAllItems(m_hTreeView);
+}

reactos/base/applications/mscutils/devmgmt_new/DeviceView.h

@@ -1,23 +1,88 @@
 #pragma once
 #include "Devices.h"
 
+enum ListDevices
+{
+    DevicesByType,
+    DevicesByConnection,
+    ResourcesByType,
+    ResourcesByConnection
+};
+
 class CDeviceView : public CDevices
 {
+    CDevices *m_Devices;
     HWND m_hMainWnd;
     HWND m_hTreeView;
     HWND m_hPropertyDialog;
     HWND m_hShortcutMenu;
+    ListDevices m_ListDevices;
+
+    HIMAGELIST m_ImageList;
+    HTREEITEM m_hTreeRoot;
+
+    BOOL m_ShowHidden;
 
 public:
-    CDeviceView(HWND hMainWnd);
+    CDeviceView(
+        HWND hMainWnd,
+        ListDevices List
+        );
+
     ~CDeviceView(void);
 
     BOOL Initialize();
     BOOL Uninitialize();
 
-    VOID Size(INT x, INT y, INT cx, INT cy);
+    VOID Size(
+        _In_ INT x,
+        _In_ INT y,
+        _In_ INT cx,
+        _In_ INT cy
+        );
+
     VOID Refresh();
     VOID DisplayPropertySheet();
     VOID SetFocus();
+
+    VOID SetDeviceListType(ListDevices List)
+    {
+        m_ListDevices = List;
+    }
+
+    VOID ShowHiddenDevices(_In_ BOOL ShowHidden)
+    {
+        m_ShowHidden = ShowHidden;
+    }
+
+private:
+    static unsigned int __stdcall ListDevicesThread(
+        void *Param
+        );
+
+    BOOL ListDevicesByConnection(
+        );
+    BOOL ListDevicesByType(
+        );
+
+    VOID RecurseChildDevices(
+        _In_ DEVINST ParentDevice,
+        _In_ HTREEITEM hParentTreeItem
+        );
+
+    HTREEITEM InsertIntoTreeView(
+        _In_ HTREEITEM hParent,
+        _In_z_ LPWSTR lpLabel,
+        _In_ LPARAM lParam,
+        _In_ INT DevImage,
+        _In_ UINT OverlayImage
+        );
+
+    VOID RecurseDeviceView(
+        _In_ HTREEITEM hParentItem
+        );
+
+    VOID EmptyDeviceView(
+        );
 };
 

reactos/base/applications/mscutils/devmgmt_new/Devices.cpp

@@ -1,12 +1,622 @@
-#include "StdAfx.h"
+/*
+* PROJECT:     ReactOS Device Manager
+* LICENSE:     GPL - See COPYING in the top level directory
+* FILE:        base/applications/mscutils/devmgmt/devices.cpp
+* PURPOSE:     Wrapper around setupapi functions
+* COPYRIGHT:   Copyright 2014 Ged Murphy <gedmurphy@gmail.com>
+*
+*/
+
+#include "stdafx.h"
+#include "devmgmt.h"
 #include "Devices.h"
 
 
-CDevices::CDevices(void)
-{
-}
+/* PUBLIC METHODS *****************************************/
 
+CDevices::CDevices(void) :
+    m_bInitialized(FALSE),
+    m_RootImageIndex(-1)
+{
+    ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA));
+
+    m_RootName[0] = UNICODE_NULL;
+}
 
 CDevices::~CDevices(void)
 {
+    ATLASSERT(m_bInitialized == FALSE);
 }
+
+BOOL
+CDevices::Initialize()
+{
+    BOOL bSuccess;
+
+    ATLASSERT(m_bInitialized == FALSE);
+
+    /* Get the device image list */
+    m_ImageListData.cbSize = sizeof(SP_CLASSIMAGELIST_DATA);
+    bSuccess = SetupDiGetClassImageList(&m_ImageListData);
+    if (bSuccess == FALSE) return FALSE;
+
+    bSuccess = CreateRootDevice();
+    if (bSuccess) m_bInitialized = TRUE;
+
+    return m_bInitialized;
+}
+
+BOOL
+CDevices::Uninitialize()
+{
+    if (m_ImageListData.ImageList != NULL)
+    {
+        SetupDiDestroyClassImageList(&m_ImageListData);
+        ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA));
+    }
+
+    m_bInitialized = FALSE;
+
+    return TRUE;
+}
+
+BOOL
+CDevices::GetDeviceTreeRoot(
+    _Out_ LPWSTR RootName,
+    _In_ DWORD RootNameSize,
+    _Out_ PINT RootImageIndex
+    )
+{
+    wcscpy_s(RootName, RootNameSize, m_RootName);
+    *RootImageIndex = m_RootImageIndex;
+
+    return TRUE;
+}
+
+BOOL
+CDevices::GetChildDevice(
+    _In_ DEVINST ParentDevInst,
+    _Out_ PDEVINST DevInst
+    )
+{
+    CONFIGRET cr;
+
+    cr = CM_Get_Child(DevInst,
+                      ParentDevInst,
+                      0);
+    return (cr == CR_SUCCESS);
+}
+
+BOOL
+CDevices::GetSiblingDevice(
+    _In_ DEVINST PrevDevice,
+    _Out_ PDEVINST DevInst
+    )
+{
+    CONFIGRET cr;
+
+    cr = CM_Get_Sibling(DevInst,
+                        PrevDevice,
+                        0);
+    return (cr == CR_SUCCESS);
+}
+
+BOOL
+CDevices::GetDeviceStatus(
+    _In_ LPWSTR DeviceId,
+    _Out_ PULONG Status,
+    _Out_ PULONG ProblemNumber
+    )
+{
+    DEVINST DeviceInstance;
+    CONFIGRET cr;
+
+    *Status = 0;
+    *ProblemNumber = 0;
+
+    /* Use the device id string to lookup the instance */
+    cr = CM_Locate_DevNodeW(&DeviceInstance,
+                            DeviceId,
+                            CM_LOCATE_DEVNODE_NORMAL);
+    if (cr == CR_SUCCESS)
+    {
+        /* Get the status of this device */
+        cr = CM_Get_DevNode_Status_Ex(Status,
+                                      ProblemNumber,
+                                      DeviceInstance,
+                                      0,
+                                      NULL);
+    }
+
+    return (cr == CR_SUCCESS) ? TRUE : FALSE;
+}
+
+BOOL
+CDevices::GetDevice(
+    _In_ DEVINST Device,
+    _Out_writes_(DeviceNameSize) LPWSTR DeviceName,
+    _In_ DWORD DeviceNameSize,
+    _Outptr_ LPWSTR *DeviceId,
+    _Out_ PINT ClassImage,
+    _Out_ PULONG Status,
+    _Out_ PULONG ProblemNumber
+    )
+{
+    WCHAR ClassGuidString[MAX_GUID_STRING_LEN];
+    GUID ClassGuid;
+    ULONG ulLength;
+    CONFIGRET cr;
+    BOOL bSuccess;
+
+    *DeviceId = NULL;
+
+    /* Get the length of the device id string */
+    cr = CM_Get_Device_ID_Size(&ulLength, Device, 0);
+    if (cr == CR_SUCCESS)
+    {
+        /* We alloc heap here because this will be stored in the lParam of the TV */
+        *DeviceId = (LPWSTR)HeapAlloc(GetProcessHeap(),
+                                      0,
+                                      (ulLength + 1) * sizeof(WCHAR));
+        if (*DeviceId)
+        {
+            /* Now get the actual device id */
+            cr = CM_Get_Device_IDW(Device,
+                                   *DeviceId,
+                                   ulLength + 1,
+                                   0);
+            if (cr != CR_SUCCESS)
+            {
+                HeapFree(GetProcessHeap(), 0, *DeviceId);
+                *DeviceId = NULL;
+            }
+        }
+    }
+
+    /* Make sure we got the string */
+    if (*DeviceId == NULL)
+        return FALSE;
+
+
+    /* Get the current status of the device */
+    bSuccess = GetDeviceStatus(*DeviceId, Status, ProblemNumber);
+    if (bSuccess == FALSE)
+    {
+        HeapFree(GetProcessHeap(), 0, *DeviceId);
+        *DeviceId = NULL;
+        return FALSE;
+    }
+
+    /* Get the class guid for this device */
+    ulLength = MAX_GUID_STRING_LEN * sizeof(WCHAR);
+    cr = CM_Get_DevNode_Registry_PropertyW(Device,
+                                           CM_DRP_CLASSGUID,
+                                           NULL,
+                                           ClassGuidString,
+                                           &ulLength,
+                                           0);
+    if (cr == CR_SUCCESS)
+    {
+        /* Convert the string to a proper guid */
+        CLSIDFromString(ClassGuidString, &ClassGuid);
+    }
+    else
+    {
+        /* It's a device with no driver */
+        ClassGuid = GUID_DEVCLASS_UNKNOWN;
+    }
+
+
+    /* Get the image for the class this device is in */
+    SetupDiGetClassImageIndex(&m_ImageListData,
+                              &ClassGuid,
+                              ClassImage);
+
+    /* Get the description for the device */
+    ulLength = DeviceNameSize * sizeof(WCHAR);
+    cr = CM_Get_DevNode_Registry_PropertyW(Device,
+                                          CM_DRP_FRIENDLYNAME,
+                                          NULL,
+                                          DeviceName,
+                                          &ulLength,
+                                          0);
+    if (cr != CR_SUCCESS)
+    {
+        ulLength = DeviceNameSize * sizeof(WCHAR);
+        cr = CM_Get_DevNode_Registry_PropertyW(Device,
+                                              CM_DRP_DEVICEDESC,
+                                              NULL,
+                                              DeviceName,
+                                              &ulLength,
+                                              0);
+
+    }
+
+    /* Cleanup if something failed */
+    if (cr != CR_SUCCESS)
+    {
+        HeapFree(GetProcessHeap(), 0, *DeviceId);
+        *DeviceId = NULL;
+    }
+
+    return (cr == CR_SUCCESS ? TRUE : FALSE);
+}
+
+BOOL
+CDevices::EnumClasses(
+    _In_ ULONG ClassIndex,
+    _Out_writes_bytes_(sizeof(GUID)) LPGUID ClassGuid,
+    _Out_writes_(ClassNameSize) LPWSTR ClassName,
+    _In_ DWORD ClassNameSize,
+    _Out_writes_(ClassDescSize) LPWSTR ClassDesc,
+    _In_ DWORD ClassDescSize,
+    _Out_ PINT ClassImage
+    )
+{
+    DWORD RequiredSize, Type, Size;
+    CONFIGRET cr;
+    DWORD Success;
+    HKEY hKey;
+
+    ClassName[0] = UNICODE_NULL;
+    ClassDesc[0] = UNICODE_NULL;
+    *ClassImage = -1;
+
+    /* Get the next class in the list */
+    cr = CM_Enumerate_Classes(ClassIndex,
+                              ClassGuid,
+                              0);
+    if (cr != CR_SUCCESS) return FALSE;
+
+    /* Get the name of the device class */
+    RequiredSize = MAX_CLASS_NAME_LEN;
+    (VOID)SetupDiClassNameFromGuidW(ClassGuid,
+                                    ClassName,
+                                    RequiredSize,
+                                    &RequiredSize);
+
+    /* Open the registry key for this class */
+    hKey = SetupDiOpenClassRegKeyExW(ClassGuid,
+                                     MAXIMUM_ALLOWED,
+                                     DIOCR_INSTALLER,
+                                     NULL,
+                                     0);
+    if (hKey != INVALID_HANDLE_VALUE)
+    {
+        Size = ClassDescSize;
+        Type = REG_SZ;
+
+        /* Lookup the class description (win7+) */
+        Success = RegQueryValueExW(hKey,
+                                   L"ClassDesc",
+                                   NULL,
+                                   &Type,
+                                   (LPBYTE)ClassDesc,
+                                   &Size);
+        if (Success == ERROR_SUCCESS)
+        {
+            /* Check if the string starts with an @ */
+            if (ClassDesc[0] == L'@')
+            {
+                /* The description is located in a module resource */
+                Success = ConvertResourceDescriptorToString(ClassDesc, ClassDescSize);
+            }
+        }
+        else if (Success == ERROR_FILE_NOT_FOUND)
+        {
+            /* WinXP stores the description in the default value */
+            Success = RegQueryValueExW(hKey,
+                                       NULL,
+                                       NULL,
+                                       &Type,
+                                       (LPBYTE)ClassDesc,
+                                       &Size);
+        }
+
+        /* Close the registry key */
+        RegCloseKey(hKey);
+    }
+    else
+    {
+        Success = GetLastError();
+    }
+
+    /* Check if we failed to get the class description */
+    if (Success != ERROR_SUCCESS)
+    {
+        /* Use the class name as the description */
+        wcscpy_s(ClassDesc, ClassDescSize, ClassName);
+    }
+
+    /* Get the image index for this class */
+    (VOID)SetupDiGetClassImageIndex(&m_ImageListData,
+                                    ClassGuid,
+                                    ClassImage);
+
+    return TRUE;
+}
+
+BOOL
+CDevices::EnumDevicesForClass(
+    _Inout_opt_ LPHANDLE DeviceHandle,
+    _In_ LPCGUID ClassGuid,
+    _In_ DWORD Index,
+    _Out_ LPBOOL MoreItems,
+    _Out_ LPTSTR DeviceName,
+    _In_ DWORD DeviceNameSize,
+    _Outptr_ LPTSTR *DeviceId,
+    _Out_ PULONG Status,
+    _Out_ PULONG ProblemNumber
+    )
+{
+    SP_DEVINFO_DATA DeviceInfoData;
+    DWORD DevIdSize;
+    HDEVINFO hDevInfo;
+    BOOL bUnknown, bSuccess;
+
+    *MoreItems = FALSE;
+    *DeviceName = NULL;
+    *DeviceId = NULL;
+    bUnknown = FALSE;
+
+    /* The unknown class is a special case */
+    if (IsEqualGUID(*ClassGuid, GUID_DEVCLASS_UNKNOWN))
+        bUnknown = TRUE;
+
+
+    /* Check if this is the first call for this class */
+    if (*DeviceHandle == NULL)
+    {
+        ATLASSERT(Index == 0);
+
+        /* Check for the special case */
+        if (bUnknown == TRUE)
+        {
+            /* Get device info for all devices for all classes */
+            hDevInfo = SetupDiGetClassDevsW(NULL,
+                                            NULL,
+                                            NULL,
+                                            DIGCF_ALLCLASSES);
+            if (hDevInfo == INVALID_HANDLE_VALUE)
+                return FALSE;
+        }
+        else
+        {
+            /* We only want the devices for this class */
+            hDevInfo = SetupDiGetClassDevsW(ClassGuid,
+                                            NULL,
+                                            NULL,
+                                            DIGCF_PRESENT);
+            if (hDevInfo == INVALID_HANDLE_VALUE)
+                return FALSE;
+        }
+
+        /* Store the handle for the next call */
+        *DeviceHandle = (HANDLE)hDevInfo;
+    }
+    else
+    {
+        hDevInfo = (HDEVINFO)*DeviceHandle;
+    }
+
+
+    /* Get the device info for this device in the class */
+    ZeroMemory(&DeviceInfoData, sizeof(SP_DEVINFO_DATA));
+    DeviceInfoData.cbSize = sizeof(SP_DEVINFO_DATA);
+    bSuccess = SetupDiEnumDeviceInfo(hDevInfo,
+                                     Index,
+                                     &DeviceInfoData);
+    if (bSuccess == FALSE) goto Quit;
+
+
+
+    /* We found a device, let the caller know they might be more */
+    *MoreItems = TRUE;
+
+    /* Check if this is the unknown class */
+    if (bUnknown)
+    {
+        /* We're looking for devices without guids */
+        if (IsEqualGUID(DeviceInfoData.ClassGuid, GUID_NULL) == FALSE)
+        {
+            /* This is a known device, we aren't interested in it */
+            return FALSE;
+        }
+    }
+
+    /* Get the size required to hold the device id */
+    bSuccess = SetupDiGetDeviceInstanceIdW(hDevInfo,
+                                           &DeviceInfoData,
+                                           NULL,
+                                           0,
+                                           &DevIdSize);
+    if (bSuccess == FALSE && (GetLastError() != ERROR_INSUFFICIENT_BUFFER))
+        goto Quit;
+
+    /* Allocate some heap to hold the device string */
+    *DeviceId = (LPTSTR)HeapAlloc(GetProcessHeap(),
+                                  0,
+                                  DevIdSize * sizeof(WCHAR));
+    if (*DeviceId == NULL) goto Quit;
+
+    /* Now get the device id string */
+    bSuccess = SetupDiGetDeviceInstanceIdW(hDevInfo,
+                                           &DeviceInfoData,
+                                           *DeviceId,
+                                           DevIdSize,
+                                           NULL);
+    if (bSuccess == FALSE) goto Quit;
+
+    /* Skip the root device */
+    if (*DeviceId != NULL &&
+        wcscmp(*DeviceId, L"HTREE\\ROOT\\0") == 0)
+    {
+        bSuccess = FALSE;
+        goto Quit;
+    }
+
+
+    /* Get the current status of the device */
+    bSuccess = GetDeviceStatus(*DeviceId, Status, ProblemNumber);
+    if (bSuccess == FALSE) goto Quit;
+
+
+    /* Get the device's friendly name */
+    bSuccess = SetupDiGetDeviceRegistryPropertyW(hDevInfo,
+                                                 &DeviceInfoData,
+                                                 SPDRP_FRIENDLYNAME,
+                                                 0,
+                                                 (BYTE*)DeviceName,
+                                                 256,
+                                                 NULL);
+    if (bSuccess == FALSE)
+    {
+        /* if the friendly name fails, try the description instead */
+        bSuccess = SetupDiGetDeviceRegistryPropertyW(hDevInfo,
+                                                     &DeviceInfoData,
+                                                     SPDRP_DEVICEDESC,
+                                                     0,
+                                                     (BYTE*)DeviceName,
+                                                     256,
+                                                     NULL);
+    }
+
+    /* If we didn't find a name, check if this is an unknown device */
+    if (bSuccess == FALSE && bUnknown == TRUE)
+    {
+        /* We add in our own text */
+        wcscpy_s(DeviceName, 256, L"Unknown device");
+        bSuccess = TRUE;
+    }
+
+Quit:
+    if (MoreItems == FALSE)
+        SetupDiDestroyDeviceInfoList(hDevInfo);
+
+    if (bSuccess == FALSE)
+    {
+        if (*DeviceId)
+        {
+            HeapFree(GetProcessHeap(), 0, *DeviceId);
+            *DeviceId = NULL;
+        }
+    }
+
+    return bSuccess;
+}
+
+
+/* PRIVATE METHODS ******************************************/
+
+BOOL
+CDevices::CreateRootDevice()
+{
+    HBITMAP hRootImage = NULL;
+    DWORD Size = ROOT_NAME_SIZE;
+    BOOL bSuccess = FALSE;
+    CONFIGRET cr;
+
+    /* The root name is the computer name */
+    (VOID)GetComputerNameW(m_RootName, &Size);
+
+    /* Load the bitmap we'll be using as the root image */
+    hRootImage = LoadBitmapW(g_hInstance,
+                             MAKEINTRESOURCEW(IDB_ROOT_IMAGE));
+    if (hRootImage == NULL) goto Cleanup;
+
+    /* Add this bitmap to the device image list. This is a bit hacky, but it's safe */
+    m_RootImageIndex = ImageList_Add(m_ImageListData.ImageList,
+                                    hRootImage,
+                                    NULL);
+    if (m_RootImageIndex == -1)
+        goto Cleanup;
+
+    /* Get the root instance */
+    cr = CM_Locate_DevNodeW(&m_RootDevInst,
+                            NULL,
+                            CM_LOCATE_DEVNODE_NORMAL);
+    if (cr == CR_SUCCESS)
+        bSuccess = TRUE;
+
+Cleanup:
+    if (bSuccess == FALSE)
+    {
+        SetupDiDestroyClassImageList(&m_ImageListData);
+        ZeroMemory(&m_ImageListData, sizeof(SP_CLASSIMAGELIST_DATA));
+    }
+
+    if (hRootImage) DeleteObject(hRootImage);
+
+    return bSuccess;
+}
+
+DWORD
+CDevices::ConvertResourceDescriptorToString(
+    _Inout_z_ LPWSTR ResourceDescriptor,
+    _In_ DWORD ResourceDescriptorSize
+    )
+{
+    WCHAR ModulePath[MAX_PATH];
+    WCHAR ResString[256];
+    INT ResourceId;
+    HMODULE hModule;
+    LPWSTR ptr;
+    DWORD Size;
+    DWORD dwError;
+    
+
+    /* First check for a semi colon */
+    ptr = wcschr(ResourceDescriptor, L';');
+    if (ptr)
+    {
+        /* This must be an inf based descriptor, the desc is after the semi colon */
+        wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ++ptr);
+        dwError = ERROR_SUCCESS;
+    }
+    else
+    {
+        /* This must be a dll resource based descriptor. Find the comma */
+        ptr = wcschr(ResourceDescriptor, L',');
+        if (ptr == NULL) return ERROR_INVALID_DATA;
+
+        /* Terminate the string where the comma was */
+        *ptr = UNICODE_NULL;
+
+        /* Expand any environment strings */
+        Size = ExpandEnvironmentStringsW(&ResourceDescriptor[1], ModulePath, MAX_PATH);
+        if (Size > MAX_PATH) return ERROR_BUFFER_OVERFLOW;
+        if (Size == 0) return GetLastError();
+
+        /* Put the comma back and move past it */
+        *ptr = L',';
+        ptr++;
+
+        /* Load the dll */
+        hModule = LoadLibraryExW(ModulePath, NULL, LOAD_LIBRARY_AS_DATAFILE);
+        if (hModule == NULL) return GetLastError();
+
+        /* Convert the resource id to a number */
+        ResourceId = _wtoi(ptr);
+
+        /* If the number is negative, make it positive */
+        if (ResourceId < 0) ResourceId = -ResourceId;
+
+        /* Load the string from the dll */
+        if (LoadStringW(hModule, ResourceId, ResString, 256))
+        {
+            wcscpy_s(ResourceDescriptor, ResourceDescriptorSize, ResString);
+            dwError = ERROR_SUCCESS;
+        }
+        else
+        {
+            dwError = GetLastError();
+        }
+
+        /* Free the library */
+        FreeLibrary(hModule);
+    }
+
+    return dwError;
+}
+
+

reactos/base/applications/mscutils/devmgmt_new/Devices.h

@@ -1,8 +1,97 @@
 #pragma once
+
+#define ROOT_NAME_SIZE  MAX_COMPUTERNAME_LENGTH + 1
+
 class CDevices
 {
+private:
+    SP_CLASSIMAGELIST_DATA m_ImageListData;
+    BOOL m_bInitialized;
+
+    DEVINST m_RootDevInst;
+    WCHAR m_RootName[ROOT_NAME_SIZE];
+    INT m_RootImageIndex;
+
 public:
     CDevices(void);
     ~CDevices(void);
+
+    BOOL Initialize(
+        );
+
+    BOOL Uninitialize(
+        );
+
+    BOOL GetDeviceTreeRoot(
+        _Out_ LPWSTR RootName,
+        _In_ DWORD RootNameSize,
+        _Out_ PINT RootImageIndex
+        );
+
+    BOOL GetChildDevice(
+        _In_ DEVINST ParentDevInst,
+        _Out_ PDEVINST DevInst
+        );
+
+    BOOL GetSiblingDevice(
+        _In_ DEVINST PrevDevice,
+        _Out_ PDEVINST DevInst
+        );
+
+    BOOL GetDevice(
+        _In_ DEVINST Device,
+        _Out_writes_(DeviceNameSize) LPTSTR DeviceName,
+        _In_ DWORD DeviceNameSize,
+        _Outptr_ LPTSTR *DeviceId,
+        _Out_ PINT ClassImage,
+        _Out_ PULONG Status,
+        _Out_ PULONG ProblemNumber
+        );
+
+    BOOL EnumClasses(
+        _In_ ULONG ClassIndex,
+        _Out_writes_bytes_(sizeof(GUID)) LPGUID ClassGuid,
+        _Out_writes_(ClassNameSize) LPWSTR ClassName,
+        _In_ DWORD ClassNameSize,
+        _Out_writes_(ClassDescSize) LPWSTR ClassDesc,
+        _In_ DWORD ClassDescSize,
+        _Out_ PINT ClassImage
+        );
+
+    BOOL EnumDevicesForClass(
+        _Inout_opt_ LPHANDLE DeviceHandle,
+        _In_ LPCGUID ClassGuid,
+        _In_ DWORD Index,
+        _Out_ LPBOOL MoreItems,
+        _Out_writes_(DeviceNameSize)  LPTSTR DeviceName,
+        _In_ DWORD DeviceNameSize,
+        _Outptr_ LPTSTR *DeviceId,
+        _Out_ PULONG Status,
+        _Out_ PULONG ProblemNumber
+        );
+
+    BOOL GetDeviceStatus(
+        _In_ LPWSTR DeviceId,
+        _Out_ PULONG pulStatus,
+        _Out_ PULONG pulProblemNumber
+        );
+  
+
+    HIMAGELIST GetImageList() { return m_ImageListData.ImageList; }
+    DEVINST GetRootDevice() { return m_RootDevInst; }
+
+private:
+    BOOL CreateImageList(
+        );
+
+    BOOL CreateRootDevice(
+        );
+
+    DWORD ConvertResourceDescriptorToString(
+        _Inout_z_ LPWSTR ResourceDescriptor,
+        _In_ DWORD ResourceDescriptorSize
+        );
+
+
 };
 

reactos/base/applications/mscutils/devmgmt_new/MainWindow.h

@@ -14,10 +14,25 @@ class CMainWindow
     HWND m_hMainWnd;
     HWND m_hStatusBar;
     HWND m_hToolBar;
+    HIMAGELIST m_ToolbarhImageList;
+    HMENU m_hMenu;
     int m_CmdShow;
 
+public:
+    CMainWindow(void);
+    ~CMainWindow(void);
+
+    BOOL Initialize(LPCTSTR lpCaption, int nCmdShow);
+    INT Run();
+    VOID Uninitialize();
+
 private:
-    static LRESULT CALLBACK MainWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
+    static LRESULT CALLBACK MainWndProc(
+        HWND hwnd,
+        UINT msg,
+        WPARAM wParam,
+        LPARAM lParam
+        );
 
     LRESULT OnCreate(HWND hwnd);
     LRESULT OnDestroy();
@@ -28,16 +43,23 @@ private:
 
     BOOL CreateToolBar();
     BOOL CreateStatusBar();
-    BOOL StatusBarLoadString(HWND hStatusBar, INT PartId, HINSTANCE hInstance, UINT uID);
 
-public:
-    CMainWindow(void);
-    ~CMainWindow(void);
-
-    BOOL Initialize(LPCTSTR lpCaption, int nCmdShow);
-    INT Run();
-    VOID Uninitialize();
+    BOOL StatusBarLoadString(
+        HWND hStatusBar,
+        INT PartId,
+        HINSTANCE hInstance,
+        UINT uID
+        );
 
+    BOOL MainWndMenuHint(
+        WORD CmdId,
+        const MENU_HINT *HintArray,
+        DWORD HintsCount,
+        UINT DefHintId
+        );
 
+    BOOL UpdateDevicesDisplay(
+        ListDevices List
+        );
 };
 

reactos/base/applications/mscutils/devmgmt_new/Resource.h

@@ -19,12 +19,15 @@
 #define IDR_MAINMENU        102
 #define IDR_POPUP           103
 #define IDC_DEVBYTYPE       104
+#define IDC_DEVBYCONN       105
+#define IDC_RESBYTYPE       106
+#define IDC_RESBYCONN       107
+#define IDC_SHOWHIDDEN      108
 
 /* tooltips */
 #define IDS_TOOLTIP_PROP    6000
 #define IDS_TOOLTIP_REFRESH 6001
 #define IDS_TOOLTIP_HELP    6002
-#define IDS_TOOLTIP_EXIT    6003
 
 /* button bitmaps */
 #define IDB_PROP            10000
@@ -34,7 +37,6 @@
 #define TBICON_PROP         0
 #define TBICON_REFRESH      1
 #define TBICON_HELP         2
-#define TBICON_EXIT         3
 
 /* about box info */
 #define IDD_ABOUTBOX        200
@@ -51,6 +53,11 @@
 #define IDS_HINT_ABOUT          20005
 #define IDS_HINT_EXIT           20006
 
+#define IDS_HINT_DEV_BY_TYPE    20020
+#define IDS_HINT_DEV_BY_CONN    20021
+#define IDS_HINT_RES_BY_TYPE    20022
+#define IDS_HINT_RES_BY_CONN    20023
+
 /* system menu hints */
 #define IDS_HINT_SYS_RESTORE    21001
 #define IDS_HINT_SYS_MOVE       21002

reactos/base/applications/mscutils/devmgmt_new/devmgmt.cpp

@@ -19,12 +19,12 @@ wWinMain(HINSTANCE hThisInstance,
     int Ret = 1;
 
     /* Check if the app is already running */
-    hMutex = CreateMutexW(NULL, TRUE, L"devmgmt_mutex");
+    hMutex = CreateMutexW(NULL, TRUE, L"devmgmt_mutex2");
     if (hMutex == NULL || GetLastError() == ERROR_ALREADY_EXISTS)
     {
         /* Cleanup and exit */
-        if (hMutex) CloseHandle(hMutex);
-        return 0;
+        //if (hMutex) CloseHandle(hMutex);
+        //return 0;
     }
 
     /* Store the global values */
@@ -40,8 +40,7 @@ wWinMain(HINSTANCE hThisInstance,
     if (szAppName.LoadStringW(g_hInstance, IDS_APPNAME))
     {
         /* Initialize the main window */
-        if (MainWindow.Initialize(szAppName,
-                                  nCmdShow))
+        if (MainWindow.Initialize(szAppName, nCmdShow))
         {
             /* Run the application */
             Ret = MainWindow.Run();

reactos/base/applications/mscutils/devmgmt_new/devmgmt.exe.manifest

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly
+  xmlns="urn:schemas-microsoft-com:asm.v1"
+  manifestVersion="1.0">
+<assemblyIdentity
+    name="ReactOS.Apps.devmgmt"
+    processorArchitecture="*"
+    version="1.0.0.0"
+    type="win32"/>
+<description>ReactOS Device Manager</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="*"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
+

reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.sln

@@ -1,7 +1,9 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "devmgmt_new", "devmgmt_new.vcxproj", "{A5AB2C1A-A085-4A2A-951C-F3CF22DA2890}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30501.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "devmgmt_new", "devmgmt_new.vcxproj", "{47B3358F-E7C3-4D02-9310-68813B9292E0}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -9,10 +11,12 @@ Global
 		Release|Win32 = Release|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A5AB2C1A-A085-4A2A-951C-F3CF22DA2890}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A5AB2C1A-A085-4A2A-951C-F3CF22DA2890}.Debug|Win32.Build.0 = Debug|Win32
-		{A5AB2C1A-A085-4A2A-951C-F3CF22DA2890}.Release|Win32.ActiveCfg = Release|Win32
-		{A5AB2C1A-A085-4A2A-951C-F3CF22DA2890}.Release|Win32.Build.0 = Release|Win32
+		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Debug|Win32.ActiveCfg = Debug|Win32
+		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Debug|Win32.Build.0 = Debug|Win32
+		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Debug|Win32.Deploy.0 = Debug|Win32
+		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Release|Win32.ActiveCfg = Release|Win32
+		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Release|Win32.Build.0 = Release|Win32
+		{47B3358F-E7C3-4D02-9310-68813B9292E0}.Release|Win32.Deploy.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -11,7 +11,7 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{A5AB2C1A-A085-4A2A-951C-F3CF22DA2890}</ProjectGuid>
+    <ProjectGuid>{47B3358F-E7C3-4D02-9310-68813B9292E0}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>devmgmt_new</RootNamespace>
   </PropertyGroup>
@@ -19,15 +19,15 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
-    <UseOfAtl>Static</UseOfAtl>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v120_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <UseOfAtl>Static</UseOfAtl>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -41,13 +41,16 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
+    <GenerateManifest>false</GenerateManifest>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -55,13 +58,17 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>comctl32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>UxTheme.lib;comctl32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>LANGUAGE_EN_US;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <ClCompile>
       <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
@@ -72,8 +79,16 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalDependencies>UxTheme.lib;comctl32.lib;setupapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="Devices.cpp" />
+    <ClCompile Include="DeviceView.cpp" />
+    <ClCompile Include="devmgmt.cpp" />
+    <ClCompile Include="MainWindow.cpp" />
+    <ClCompile Include="stdafx.cpp" />
+  </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Devices.h" />
     <ClInclude Include="DeviceView.h" />
@@ -82,16 +97,6 @@
     <ClInclude Include="Resource.h" />
     <ClInclude Include="stdafx.h" />
   </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Devices.cpp" />
-    <ClCompile Include="DeviceView.cpp" />
-    <ClCompile Include="devmgmt.cpp" />
-    <ClCompile Include="MainWindow.cpp" />
-    <ClCompile Include="stdafx.cpp">
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
-    </ClCompile>
-  </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="devmgmt.rc" />
   </ItemGroup>

reactos/base/applications/mscutils/devmgmt_new/devmgmt_new.vcxproj.filters

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Devices.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="DeviceView.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="devmgmt.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="MainWindow.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="stdafx.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Devices.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="DeviceView.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="devmgmt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="MainWindow.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="Resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="stdafx.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="devmgmt.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>

reactos/base/applications/mscutils/devmgmt_new/lang/bg-BG.rc

@@ -2,26 +2,26 @@ LANGUAGE LANG_BULGARIAN, SUBLANG_DEFAULT
 
 IDR_MAINMENU MENU
 BEGIN
-  POPUP "&<EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+  POPUP "&Файл"
   BEGIN
-    MENUITEM "<EFBFBD><EFBFBD>&<26><><EFBFBD>",                   IDC_EXIT
+    MENUITEM "Из&ход",                   IDC_EXIT
   END
-  POPUP "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+  POPUP "Действие"
   BEGIN
-    MENUITEM "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",                   IDC_PRINT, GRAYED
+    MENUITEM "Отпечатване",                   IDC_PRINT, GRAYED
     MENUITEM SEPARATOR
-    MENUITEM "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              IDC_PROP, GRAYED
+    MENUITEM "Свойства",              IDC_PROP, GRAYED
   END
-  POPUP "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+  POPUP "Изглед"
   BEGIN
-    MENUITEM "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",   IDC_STATIC, GRAYED
-    MENUITEM "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>",       IDC_STATIC, GRAYED
-    MENUITEM "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", IDC_STATIC, GRAYED
+    MENUITEM "Устройствата според вид",         IDC_DEVBYTYPE, CHECKED
+    MENUITEM "Устройствата според свързването",   IDC_STATIC, GRAYED
+    MENUITEM "Средствата според вида",       IDC_STATIC, GRAYED
+    MENUITEM "Средствата според свързването", IDC_STATIC, GRAYED
   END
-  POPUP "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+  POPUP "Помощ"
   BEGIN
-    MENUITEM "<EFBFBD><EFBFBD>",                   IDC_ABOUT
+    MENUITEM "За",                   IDC_ABOUT
   END
 END
 
@@ -29,12 +29,12 @@ IDR_POPUP MENU
 BEGIN
   POPUP "popup"
   BEGIN
-    MENUITEM "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>",              IDC_PROP, GRAYED
+    MENUITEM "Свойства",              IDC_PROP, GRAYED
   END
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,190,182
-CAPTION "<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+CAPTION "За управителя на устройствата"
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
@@ -44,34 +44,34 @@ BEGIN
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_LICENSE "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.\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_TOOLTIP_PROP      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_REFRESH   "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_HELP      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
-  IDS_TOOLTIP_EXIT      "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+  IDS_TOOLTIP_PROP      "Свойства"
+  IDS_TOOLTIP_REFRESH   "Опресняване"
+  IDS_TOOLTIP_HELP      "Помощ"
+  IDS_TOOLTIP_EXIT      "Изход"
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_APPNAME "<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"
+  IDS_APPNAME "Управител на устройствата на РеактОС"
   IDS_HINT_BLANK        " "
-  IDS_HINT_EXIT         " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_REFRESH      " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_PROP         " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_HELP         " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_ABOUT        " <EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+  IDS_HINT_EXIT         " Излиза от приложението."
+  IDS_HINT_REFRESH      " Опреснява списъка на услугите."
+  IDS_HINT_PROP         " Отваря лист за свойства за текущия избор."
+  IDS_HINT_HELP         " Показва помощен прозорец."
+  IDS_HINT_ABOUT        " За управителя на устрйствата на РеактОС."
 
-  IDS_HINT_SYS_RESTORE  " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_MOVE     " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_SIZE     " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_MINIMIZE " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_MAXIMIZE " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>."
-  IDS_HINT_SYS_CLOSE    " <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>."
+  IDS_HINT_SYS_RESTORE  " Възстановява прозореца до обичайния му рамер."
+  IDS_HINT_SYS_MOVE     " Премества прозореца."
+  IDS_HINT_SYS_SIZE     " Преоразмерява прозореца."
+  IDS_HINT_SYS_MINIMIZE " Свива прозореца в значка."
+  IDS_HINT_SYS_MAXIMIZE " Разгръща прозореца, докато запълни целия екран."
+  IDS_HINT_SYS_CLOSE    " Затваря прозореца."
 END

reactos/base/applications/mscutils/devmgmt_new/lang/de-DE.rc

@@ -14,8 +14,8 @@ BEGIN
   END
   POPUP "Ansicht"
   BEGIN
-    MENUITEM "Ger<EFBFBD>te nach Typ",         IDC_DEVBYTYPE, CHECKED
-    MENUITEM "Ger<EFBFBD>te nach Verbindung",   IDC_STATIC, GRAYED
+    MENUITEM "Geräte nach Typ",         IDC_DEVBYTYPE, CHECKED
+    MENUITEM "Geräte nach Verbindung",   IDC_STATIC, GRAYED
     MENUITEM "Resourcen nach Typ",       IDC_STATIC, GRAYED
     MENUITEM "Resourcen nach Verbindung", IDC_STATIC, GRAYED
   END
@@ -34,22 +34,22 @@ BEGIN
 END
 
 IDD_ABOUTBOX DIALOGEX 22,16,190,182
-CAPTION "<EFBFBD>ber Ger<EFBFBD>te-Manager"
+CAPTION "Über Geräte-Manager"
 FONT 8,"MS Shell Dlg",0,0
 STYLE DS_SHELLFONT | WS_BORDER | WS_DLGFRAME | WS_SYSMENU | DS_MODALFRAME
 BEGIN
-  LTEXT "Ger<EFBFBD>te-Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
-  PUSHBUTTON "Schlie<EFBFBD>en", IDOK, 75, 162, 44, 15
+  LTEXT "Geräte-Manager v0.1\nCopyright (C) 2006\nby Ged Murphy (gedmurphy@gmail.com)", IDC_STATIC, 48, 7, 130, 26
+  PUSHBUTTON "Schließen", IDOK, 75, 162, 44, 15
   ICON IDI_MAIN_ICON, IDC_STATIC, 10, 10, 7, 30
   EDITTEXT IDC_LICENSE_EDIT, 8, 44, 174, 107, WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | ES_READONLY | ES_MULTILINE
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_LICENSE "Dieses Programm ist kostenlos; Sie k<EFBFBD>nnen es frei verteilen mit od. ohne <EFBFBD>nderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation ver<EFBFBD>ffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine sp<EFBFBD>tere Version (ihrer Wahl).\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
+  IDS_LICENSE "Dieses Programm ist kostenlos; Sie können es frei verteilen mit od. ohne Änderungen unter der GNU Lesser General Public License, wie es von der Free Software Foundation veröffentlicht wurde; entweder Version 2.1 der Lizenz, oder eine spätere Version (ihrer Wahl).\r\n\r\nThis 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.\r\n\r\nYou should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA."
 END
 
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
   IDS_TOOLTIP_PROP      "Eigenschaften"
   IDS_TOOLTIP_REFRESH   "Aktualisieren"
@@ -58,20 +58,20 @@ BEGIN
 END
 
 /* Hints */
-STRINGTABLE
+STRINGTABLE DISCARDABLE
 BEGIN
-  IDS_APPNAME "ReactOS Ger<EFBFBD>te-Manager"
+  IDS_APPNAME "ReactOS Geräte-Manager"
   IDS_HINT_BLANK        " "
   IDS_HINT_EXIT         " Das Programm beenden."
   IDS_HINT_REFRESH      " Die Service-Liste aktualisieren."
-  IDS_HINT_PROP         " Eigenschaften-Seite f<EFBFBD>r die aktuelle Auswahl anzeigen."
+  IDS_HINT_PROP         " Eigenschaften-Seite für die aktuelle Auswahl anzeigen."
   IDS_HINT_HELP         " Hilfe-Fenster anzeigen."
-  IDS_HINT_ABOUT        " <EFBFBD>ber ReactOS Ger<EFBFBD>te-Manager."
+  IDS_HINT_ABOUT        " Über ReactOS Geräte-Manager."
 
-  IDS_HINT_SYS_RESTORE  " Dieses Fenster auf normale Gr<EFBFBD><EFBFBD>e wiederherstellen."
+  IDS_HINT_SYS_RESTORE  " Dieses Fenster auf normale Größe wiederherstellen."
   IDS_HINT_SYS_MOVE     " Dieses Fenster verschieben."
-  IDS_HINT_SYS_SIZE     " Gr<EFBFBD><EFBFBD>e dieses Fensters <EFBFBD>ndern."
+  IDS_HINT_SYS_SIZE     " Größe dieses Fensters ändern."
   IDS_HINT_SYS_MINIMIZE " Dieses Fenster zu einem Symbol verkleinern."
-  IDS_HINT_SYS_MAXIMIZE " Dieses Fenster auf Bildschirmgr<EFBFBD><EFBFBD>e vergr<EFBFBD><EFBFBD>ern."
-  IDS_HINT_SYS_CLOSE    " Dieses Fenster schlie<EFBFBD>en."
+  IDS_HINT_SYS_MAXIMIZE " Dieses Fenster auf Bildschirmgröße vergrößern."
+  IDS_HINT_SYS_CLOSE    " Dieses Fenster schließen."
 END