Ros-diffs December 2014

ros-diffs@reactos.org

17 participants
387 discussions

[akhaldi] 65794: [NOTEPAD] Uzbek translation by Kudratov Olimjon. CORE-8948

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 22 19:01:03 2014 New Revision: 65794 URL: http://svn.reactos.org/svn/reactos?rev=65794&view=rev Log: [NOTEPAD] Uzbek translation by Kudratov Olimjon. CORE-8948 Added: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc (with props) Modified: trunk/reactos/base/applications/notepad/rsrc.rc Added: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/lang/uz-UZ.rc (added) +++ trunk/reactos/base/applications/notepad/lang/uz-UZ.rc [iso-8859-1] Mon Dec 22 19:01:03 2014 @@ -0,0 +1,173 @@ +LANGUAGE LANG_UZBEK, SUBLANG_DEFAULT + +ID_ACCEL ACCELERATORS +BEGIN + "^A", CMD_SELECT_ALL + "^C", CMD_COPY + "^F", CMD_SEARCH + "^G", CMD_GOTO + "H", CMD_REPLACE, VIRTKEY, CONTROL + "^N", CMD_NEW + "^O", CMD_OPEN + "^P", CMD_PRINT + "^S", CMD_SAVE + "^V", CMD_PASTE + "^X", CMD_CUT + "^Z", CMD_UNDO + VK_F3, CMD_SEARCH_NEXT, VIRTKEY + VK_F5, CMD_TIME_DATE, VIRTKEY +END + +MAIN_MENU MENU +BEGIN + POPUP "&Fayl" + BEGIN + MENUITEM "&Yangi\tCtrl+N", CMD_NEW + MENUITEM "Oc&hmoq...\tCtrl+O", CMD_OPEN + MENUITEM "&Saqlamoq\tCtrl+S", CMD_SAVE + MENUITEM "Quyid&agicha saqlamoq...", CMD_SAVE_AS + MENUITEM SEPARATOR + MENUITEM "Sahi&fa parametrlari...", CMD_PAGE_SETUP + MENUITEM "Chop &etmoq...\tCtrl+P", CMD_PRINT + MENUITEM "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿ÑÐ¸Ð½ÑÐµÑÐ°...", CMD_PRINTER_SETUP + MENUITEM SEPARATOR + MENUITEM "Chiq&moq", CMD_EXIT + END + POPUP "Oâ&zgartirmoq" + BEGIN + MENUITEM "&Bekor qilmoq\tCtrl+Z", CMD_UNDO + MENUITEM SEPARATOR + MENUITEM "Qi&rqib olmoq\tCtrl+X", CMD_CUT + MENUITEM "&Nusxa koâchirmoq\tCtrl+C", CMD_COPY + MENUITEM "Qoâs&hib qoâymoq\tCtrl+V", CMD_PASTE + MENUITEM "&Yoâq qilmoq\tDel", CMD_DELETE + MENUITEM SEPARATOR + MENUITEM "&Topmoq...", CMD_SEARCH + MENUITEM "K&eyingisini topmoq\tF3", CMD_SEARCH_NEXT + MENUITEM "Al&mashtirmoq...\tCtrl+H", CMD_REPLACE + MENUITEM "&Oâtmoq...\tCtrl+G", CMD_GOTO + MENUITEM SEPARATOR + MENUITEM "B&archasini belgilamoq", CMD_SELECT_ALL + MENUITEM "Vaqt/&Sana\tF5", CMD_TIME_DATE + END + POPUP "For&matlamoq" + BEGIN + MENUITEM "Soâ&zlarni koâchirish", CMD_WRAP + MENUITEM "&Shrift...", CMD_FONT + END + POPUP "Koâ&rib chiqmoq" + BEGIN + MENUITEM "&Holat satri", CMD_STATUSBAR + END + POPUP "&Yordam" + BEGIN + MENUITEM "&Ð¡Ð¾Ð´ÐµÑÐ¶Ð°Ð½Ð¸Ðµ", CMD_HELP_CONTENTS + MENUITEM "&ÐÐ¾Ð¸ÑÐº...", CMD_HELP_SEARCH + MENUITEM "&ÐÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÐ¿ÑÐ°Ð²ÐºÐ¸", CMD_HELP_ON_HELP + MENUITEM SEPARATOR + MENUITEM "Bloknot h&aqida", CMD_ABOUT + MENUITEM "&Ð¡Ð²ÐµÐ´ÐµÐ½Ð¸Ñ...", CMD_ABOUT_WINE + END +END + +/* Dialog 'Page setup' */ +DIALOG_PAGESETUP DIALOGEX 0, 0, 225, 95 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Sahifa parametrlari" +BEGIN + LTEXT "Sa&rlavha:", 0x140, 10, 07, 40, 15 + EDITTEXT 0x141, 60, 05, 110, 12, WS_BORDER | WS_TABSTOP + LTEXT "Pastki kolontit&ul:", 0x142, 10, 24, 40, 15 + EDITTEXT 0x143, 60, 22, 110, 12, WS_BORDER | WS_TABSTOP + GROUPBOX "Chegaralar (Ð¼Ð¼):", 0x144, 10, 43, 160, 45 + LTEXT "C&hap:", 0x145, 20, 55, 30, 10, WS_CHILD + EDITTEXT /*STRING_PAGESETUP_LEFTVALUE,*/ 0x147, 50, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "&Yuqori:", 0x148, 20, 73, 30, 10, WS_CHILD + EDITTEXT /*STRING_PAGESETUP_TOPVALUE,*/ 0x14A, 50, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "Oâ&ng:", 0x14B, 100, 55, 30, 10, WS_CHILD + EDITTEXT /*STRING_PAGESETUP_RIGHTVALUE,*/ 0x14D, 130, 55, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "Pa&st:", 0x14E, 100, 73, 30, 10, WS_CHILD + EDITTEXT /*STRING_PAGESETUP_BOTTOMVALUE,*/ 0x150, 130, 73, 35, 11, WS_CHILD | WS_BORDER | WS_TABSTOP + DEFPUSHBUTTON "Ha", IDOK, 180, 3, 40, 15, WS_TABSTOP + PUSHBUTTON "Bekor qilmoq", IDCANCEL, 180, 21, 40, 15, WS_TABSTOP + PUSHBUTTON "&Ð¡Ð¿ÑÐ°Ð²ÐºÐ°", IDHELP, 180, 39, 40, 15, WS_TABSTOP +END + +/* Dialog 'Encoding' */ +DIALOG_ENCODING DIALOGEX 0, 0, 256, 44 +STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD | WS_CLIPSIBLINGS | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "ÐÐ¾Ð´Ð¸ÑÐ¾Ð²ÐºÐ° ÑÐ¸Ð¼Ð²Ð¾Ð»Ð¾Ð²" +BEGIN + COMBOBOX ID_ENCODING, 54, 0, 156, 80, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Kodlash:", 0x155, 5, 2, 41, 12 + COMBOBOX ID_EOLN, 54, 18, 156, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "ÐÐ¾Ð½ÐµÑ ÑÑÑÐ¾ÐºÐ¸:", 0x156, 5, 20, 50, 12 +END + +/* Dialog 'Go To' */ +DIALOG_GOTO DIALOGEX 0, 0, 165, 50 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +FONT 8, "MS Shell Dlg" +CAPTION "Qatorga oâtish" +BEGIN + EDITTEXT ID_LINENUMBER, 54, 10, 106, 12, WS_CHILD | WS_BORDER | WS_TABSTOP + LTEXT "Q&ator raqami:", 0x155, 5, 12, 49, 12, WS_CHILD | WS_TABSTOP | ES_NUMBER + DEFPUSHBUTTON "Oâtmoq", IDOK, 75, 30, 40, 15, WS_CHILD | WS_TABSTOP + PUSHBUTTON "Bekor qilmoq", IDCANCEL, 120, 30, 40, 15, WS_CHILD | WS_TABSTOP +END + +IDD_ABOUTBOX DIALOGEX 22, 16, 284, 170 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_CAPTION | WS_SYSMENU +CAPTION "Ð Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ðµ ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "ÐÐ»Ð¾ÐºÐ½Ð¾Ñ ReactOS v1.0\r\nCopyright 1997,98 Marcel Baur <mbaur(a)g26.ethz.ch>\r\nCopyright 2000 Mike McCormack <Mike_McCormack(a)looksmart.com.au>\r\nCopyright 2002 Sylvain Petreolle <spetreolle(a)yahoo.fr>\r\nCopyright 2002 Andriy Palamarchuk\r\n ", -1, "Static", SS_LEFTNOWORDWRAP | WS_GROUP, 46, 7, 232, 39 + CONTROL " ", -1, "Static", 0x50000000, 8, 48, 272, 11 + DEFPUSHBUTTON "ÐÐ°ÐºÑÑÑÑ", IDOK, 114, 149, 44, 15, WS_GROUP + ICON IDI_NPICON, -1, 12, 9, 20, 30 + EDITTEXT IDC_LICENSE, 8, 64, 272, 81, ES_MULTILINE | ES_READONLY | WS_VSCROLL +END + +STRINGTABLE +BEGIN + STRING_LICENSE "ÐÑÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° ÑÐ²Ð»ÑÐµÑÑÑ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÐ¼Ð¾Ð¹; ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÑ ÐµÐµ Ð¿Ð¾Ð²ÑÐ¾ÑÐ½Ð¾ Ð¸ (Ð¸Ð»Ð¸) Ð¸Ð·Ð¼ÐµÐ½ÑÑÑ, ÑÐ¾Ð±Ð»ÑÐ´Ð°Ñ ÑÑÐ»Ð¾Ð²Ð¸Ñ ÐÑÐºÑÑÑÐ¾Ð³Ð¾ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ð³Ð¾ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ñ GNU, Ð¾Ð¿ÑÐ±Ð»Ð¸ÐºÐ¾Ð²Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¤Ð¾Ð½Ð´Ð¾Ð¼ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÐ¼Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ñ; Ð»Ð¸Ð±Ð¾ ÑÐµÐ´Ð°ÐºÑÐ¸Ð¸ 2 Ð¡Ð¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ñ, Ð»Ð¸Ð±Ð¾ (Ð½Ð° Ð²Ð°ÑÐµ ÑÑÐ¼Ð¾ÑÑÐµÐ½Ð¸Ðµ) Ð»ÑÐ±Ð¾Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¸Ð¸, Ð²ÑÐ¿ÑÑÐµÐ½Ð½Ð¾Ð¹ Ð¿Ð¾Ð·Ð¶Ðµ.\r\n\r\nÐÑÐ° Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð° ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÑÑÑ Ð² Ð½Ð°Ð´ÐµÐ¶Ð´Ðµ Ð½Ð° ÑÐ¾, ÑÑÐ¾ Ð¾Ð½Ð° Ð¾ÐºÐ°Ð¶ÐµÑÑÑ Ð¿Ð¾Ð»ÐµÐ·Ð½Ð¾Ð¹, Ð½Ð¾ ÐÐÐ ÐÐÐÐÐ¥-ÐÐÐÐ ÐÐÐ ÐÐÐ¢ÐÐ, Ð²ÐºÐ»ÑÑÐ°Ñ Ð¿Ð¾Ð´ÑÐ°Ð·ÑÐ¼ÐµÐ²Ð°ÐµÐ¼ÑÑ Ð³Ð°ÑÐ°Ð½ÑÐ¸Ñ ÐÐÐ§ÐÐ¡Ð¢ÐÐ Ð»Ð¸Ð±Ð¾ ÐÐ ÐÐÐÐÐÐÐ¡Ð¢Ð ÐÐÐ¯ ÐÐÐ ÐÐÐÐÐÐÐÐ«Ð¥ Ð¦ÐÐÐÐ. ÐÐ¾Ð´ÑÐ¾Ð±Ð½Ð¾ÑÑÐ¸ ÑÐ¾Ð´ÐµÑÐ¶Ð°ÑÑÑ Ð² ÐÑÐºÑÑÑÐ¾Ð¼ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ð¼ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ð¸ GNU.\r\n\r\nÐÐ¼ÐµÑÑÐµ Ñ ÑÑÐ¾Ð¹ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð¾Ð¹ Ð´Ð¾Ð»Ð¶ÐµÐ½ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÑÑÑÑ ÑÐºÐ·ÐµÐ¼Ð¿Ð»ÑÑ ÐÑÐºÑÑÑÐ¾Ð³Ð¾ Ð»Ð¸ÑÐµÐ½Ð·Ð¸Ð¾Ð½Ð½Ð¾Ð³Ð¾ ÑÐ¾Ð³Ð»Ð°ÑÐµÐ½Ð¸Ñ GNU, ÐµÑÐ»Ð¸ Ð¾Ð½ Ð¾ÑÑÑÑÑÑÐ²ÑÐµÑ, ÑÐ¾Ð¾Ð±ÑÐ¸ÑÐµ Ð¾Ð± ÑÑÐ¾Ð¼ Ð² Ð¤Ð¾Ð½Ð´ ÑÐ²Ð¾Ð±Ð¾Ð´Ð½Ð¾ ÑÐ°ÑÐ¿ÑÐ¾ÑÑÑÐ°Ð½ÑÐµÐ¼Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ñ (Free Software Foundation, Inc.), 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA." +END + +STRINGTABLE +BEGIN + STRING_PAGESETUP_HEADERVALUE "&n" /* FIXME */ + STRING_PAGESETUP_FOOTERVALUE "Sahifa &s" /* FIXME */ + STRING_PAGESETUP_LEFTVALUE "20 Ð¼Ð¼" /* FIXME */ + STRING_PAGESETUP_RIGHTVALUE "20 Ð¼Ð¼" /* FIXME */ + STRING_PAGESETUP_TOPVALUE "25 Ð¼Ð¼" /* FIXME */ + STRING_PAGESETUP_BOTTOMVALUE "25 Ð¼Ð¼" /* FIXME */ + STRING_NOTEPAD "Bloknot" + STRING_ERROR "ÐÐ¨ÐÐÐÐ" + STRING_WARNING "ÐÐÐÐÐÐÐÐ" + STRING_INFO "ÐÐ½ÑÐ¾ÑÐ¼Ð°ÑÐ¸Ñ" + STRING_UNTITLED "Nomsiz" + STRING_ALL_FILES "Barcha fayllar(*.*)" + STRING_TEXT_FILES_TXT "Matn hujjatlari (*.txt)" + STRING_TOOLARGE "'%s' fayli Bloknot uchun juda katta.\n\ +Faylni oâzgartirish uchun boshqa matn muharriridan foydalaning." + STRING_NOTEXT "ÐÑ Ð½Ðµ Ð²Ð²ÐµÐ»Ð¸ ÑÐµÐºÑÑ.\n\ +ÐÐ²ÐµÐ´Ð¸ÑÐµ ÑÑÐ¾-Ð½Ð¸Ð±ÑÐ´Ñ Ð¸ Ð¿Ð¾Ð¿ÑÐ¾Ð±ÑÐ¹ÑÐµ ÐµÑÐµ." + STRING_DOESNOTEXIST "'%s'\nfaylni topa olmadi\n\n\ +Yangi fayl yaratishni istaysizmi?" + STRING_NOTSAVED "'%s'\nfayldagi matn oâzgartirilgan.\n\n\ +Oâzgarishlarni saqlashni istaysizmi?" + STRING_NOTFOUND "'%s' ni topa olmadi." + STRING_OUT_OF_MEMORY "Ushbu operatsiyani tugatish uchun yetarlicha xotira mavjud emas.\ +\nMavjud xotirani koâpaytirish uchun bir yoki bir necha dasturlarni yoping va qaytadan harakat qiling." + STRING_CANNOTFIND "'%s' ni topa olmadi" + STRING_ANSI "ANSI" + STRING_UNICODE "Unicode" + STRING_UNICODE_BE "Unicode (big endian)" + STRING_UTF8 "UTF-8" + STRING_CRLF "Windows (CR + LF)" + STRING_LF "Unix (LF)" + STRING_CR "Macintosh (CR)" + STRING_LINE_COLUMN "Qator %d, Ustun %d" +END Propchange: trunk/reactos/base/applications/notepad/lang/uz-UZ.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/notepad/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… ============================================================================== --- trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/notepad/rsrc.rc [iso-8859-1] Mon Dec 22 19:01:03 2014 @@ -109,6 +109,9 @@ #ifdef LANGUAGE_UK_UA #include "lang/uk-UA.rc" #endif +#ifdef LANGUAGE_UZ_UZ + #include "lang/uz-UZ.rc" +#endif #ifdef LANGUAGE_SK_SK #include "lang/sk-SK.rc" #endif

9 years, 9 months

[akhaldi] 65793: [MPLAY32] Fix some entries in the Chinese (zh-CN) translation. Spotted by Alexander Misel and fixed by Henry Tang Ih. CORE-8918

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 22 18:52:25 2014 New Revision: 65793 URL: http://svn.reactos.org/svn/reactos?rev=65793&view=rev Log: [MPLAY32] Fix some entries in the Chinese (zh-CN) translation. Spotted by Alexander Misel and fixed by Henry Tang Ih. CORE-8918 Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc Modified: trunk/reactos/base/applications/mplay32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/lang/zh-CN.rc [iso-8859-1] Mon Dec 22 18:52:25 2014 @@ -11,22 +11,22 @@ MENUITEM SEPARATOR MENUITEM "éåº(&E)", IDM_EXIT END - POPUP "&ææ¾" + POPUP "ææ¾(&P)" BEGIN - MENUITEM "ææ¾/&æå\tCtrl+P", IDC_PLAY - MENUITEM "å&æ¢\tCtrl+S", IDC_STOP + MENUITEM "ææ¾/æå(&P)\tCtrl+P", IDC_PLAY + MENUITEM "åæ¢(&S)\tCtrl+S", IDC_STOP MENUITEM SEPARATOR - MENUITEM "é&å¤\tCtrl+T", IDM_REPEAT + MENUITEM "éå¤(&R)\tCtrl+T", IDM_REPEAT END - POPUP "&è§å¾" + POPUP "è§å¾(&V)" BEGIN - MENUITEM "åçª &æ¨¡å¼", IDM_SWITCHVIEW + MENUITEM "åçªæ¨¡å¼(&M)", IDM_SWITCHVIEW END - POPUP "&è®¾å¤" + POPUP "è®¾å¤(&D)" BEGIN - MENUITEM "&å±æ§", IDM_DEVPROPS + MENUITEM "å±æ§(%P)", IDM_DEVPROPS MENUITEM SEPARATOR - MENUITEM "&é³éæ§å¶", IDM_VOLUMECTL + MENUITEM "é³éæ§å¶(&V)", IDM_VOLUMECTL END POPUP "å¸®å©(&H)" BEGIN

9 years, 9 months

[akhaldi] 65792: [SHELL32] Sync translations to the English one. Translators, you're on!

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 22 18:48:47 2014 New Revision: 65792 URL: http://svn.reactos.org/svn/reactos?rev=65792&view=rev Log: [SHELL32] Sync translations to the English one. Translators, you're on! Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc trunk/reactos/dll/win32/shell32/lang/ca-ES.rc trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc trunk/reactos/dll/win32/shell32/lang/da-DK.rc trunk/reactos/dll/win32/shell32/lang/de-DE.rc trunk/reactos/dll/win32/shell32/lang/el-GR.rc trunk/reactos/dll/win32/shell32/lang/en-GB.rc trunk/reactos/dll/win32/shell32/lang/es-ES.rc trunk/reactos/dll/win32/shell32/lang/fi-FI.rc trunk/reactos/dll/win32/shell32/lang/fr-FR.rc trunk/reactos/dll/win32/shell32/lang/he-IL.rc trunk/reactos/dll/win32/shell32/lang/hu-HU.rc trunk/reactos/dll/win32/shell32/lang/it-IT.rc trunk/reactos/dll/win32/shell32/lang/ja-JP.rc trunk/reactos/dll/win32/shell32/lang/ko-KR.rc trunk/reactos/dll/win32/shell32/lang/nl-NL.rc trunk/reactos/dll/win32/shell32/lang/no-NO.rc trunk/reactos/dll/win32/shell32/lang/pl-PL.rc trunk/reactos/dll/win32/shell32/lang/pt-BR.rc trunk/reactos/dll/win32/shell32/lang/pt-PT.rc trunk/reactos/dll/win32/shell32/lang/ro-RO.rc trunk/reactos/dll/win32/shell32/lang/sk-SK.rc trunk/reactos/dll/win32/shell32/lang/sl-SI.rc trunk/reactos/dll/win32/shell32/lang/sq-AL.rc trunk/reactos/dll/win32/shell32/lang/sv-SE.rc trunk/reactos/dll/win32/shell32/lang/tr-TR.rc trunk/reactos/dll/win32/shell32/lang/uk-UA.rc trunk/reactos/dll/win32/shell32/lang/zh-CN.rc trunk/reactos/dll/win32/shell32/lang/zh-TW.rc Modified: trunk/reactos/dll/win32/shell32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/bg-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/bg-BG.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Ð¡Ð²Ð¾Ð¹ÑÑÐ²Ð°", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/ca-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ca-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ca-ES.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/cs-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/cs-CZ.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -45,6 +45,23 @@ MENUITEM SEPARATOR MENUITEM "&Vlastnosti", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -801,4 +818,6 @@ IDS_BYTES_FORMAT "bajtÅ¯" IDS_UNKNOWN_APP "NeznÃ¡mÃ¡ aplikace" IDS_EXE_DESCRIPTION "Popis:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/da-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/da-DK.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -45,6 +45,23 @@ MENUITEM SEPARATOR MENUITEM "Egenskaber", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -801,4 +818,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/de-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/de-DE.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -812,6 +812,6 @@ IDS_BYTES_FORMAT "Bytes" IDS_UNKNOWN_APP "Unbekannte Anwendung" IDS_EXE_DESCRIPTION "Beschreibung:" - + IDS_MENU_EMPTY "(Leer)" END Modified: trunk/reactos/dll/win32/shell32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/el-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/el-GR.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "ÎÎ´Î¹ÏÏÎ·ÏÎµÏ", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-GB.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/es-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/es-ES.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Propiedades", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fi-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fi-FI.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Ominaisuudet", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/fr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/fr-FR.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "PropriÃ©tÃ©s", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "octets" IDS_UNKNOWN_APP "Application inconnue" IDS_EXE_DESCRIPTION "Description :" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/he-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/he-IL.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "×××¤××× ××", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/hu-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/hu-HU.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "BeÃ¡llÃtÃ¡sok", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/it-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/it-IT.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "ProprietÃ ", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "byte" IDS_UNKNOWN_APP "Applicazione sconosciuta" IDS_EXE_DESCRIPTION "Descrizione:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ja-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ja-JP.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "ããããã£", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ko-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ko-KR.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/nl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/nl-NL.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/no-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/no-NO.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Egenskaper", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pl-PL.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "WÅaÅciwoÅci", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bajtÃ³w" IDS_UNKNOWN_APP "Nieznana aplikacja" IDS_EXE_DESCRIPTION "Opis:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-BR.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Aplicativo desconhecido" IDS_EXE_DESCRIPTION "DescriÃ§Ã£o:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/pt-PT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/pt-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/pt-PT.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Propriedades", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ro-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ro-RO.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -41,6 +41,23 @@ MENUITEM SEPARATOR MENUITEM "&ProprietÄÈi", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -797,4 +814,6 @@ IDS_BYTES_FORMAT "octeÈi" IDS_UNKNOWN_APP "AplicaÈie nespecificatÄ" IDS_EXE_DESCRIPTION "Descriere:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sk-SK.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Vl&astnosti", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/sl-SI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sl-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sl-SI.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sq-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sq-AL.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -43,6 +43,23 @@ MENUITEM SEPARATOR MENUITEM "CilÃ«sime", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -799,4 +816,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Aplikacion panjohur" IDS_EXE_DESCRIPTION "PÃ«rshkrimi:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/sv-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/sv-SE.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Properties", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/tr-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/tr-TR.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "Ãzellikler", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bayt" IDS_UNKNOWN_APP "Bilinmeyen uygulama" IDS_EXE_DESCRIPTION "AÃ§Ä±klama:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/uk-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/uk-UA.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -39,6 +39,23 @@ MENUITEM SEPARATOR MENUITEM "ÐÐ»Ð°ÑÑÐ¸Ð²Ð¾ÑÑÑ", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -795,4 +812,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-CN.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -48,6 +48,23 @@ MENUITEM SEPARATOR MENUITEM "å±æ§", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -804,4 +821,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END Modified: trunk/reactos/dll/win32/shell32/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/zh-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/zh-TW.rc [iso-8859-1] Mon Dec 22 18:48:47 2014 @@ -47,6 +47,23 @@ MENUITEM SEPARATOR MENUITEM "å±¬æ§", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&Undo\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "Cu&t\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&Copy\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "&Paste\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "Paste &shortcut", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "Copy to &folder...", FCIDM_SHVIEW_COPYTO + MENUITEM "Mo&ve to folder...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "Select &all\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "&Invert Selection", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -803,4 +820,6 @@ IDS_BYTES_FORMAT "bytes" IDS_UNKNOWN_APP "Unknown application" IDS_EXE_DESCRIPTION "Description:" -END + + IDS_MENU_EMPTY "(Empty)" +END

9 years, 9 months

[akhaldi] 65791: [SHELL32] Update Russian translation by Petr Akhlamov. CORE-8942

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Mon Dec 22 18:38:27 2014 New Revision: 65791 URL: http://svn.reactos.org/svn/reactos?rev=65791&view=rev Log: [SHELL32] Update Russian translation by Petr Akhlamov. CORE-8942 Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/shell32/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/ru-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/ru-RU.rc [iso-8859-1] Mon Dec 22 18:38:27 2014 @@ -41,6 +41,23 @@ MENUITEM SEPARATOR MENUITEM "Ð¡Ð²Ð¾&Ð¹ÑÑÐ²Ð°", FCIDM_SHVIEW_PROPERTIES END +END + +/* menubar EDIT menu */ +MENU_003 MENU +BEGIN + MENUITEM "&ÐÑÐ¼ÐµÐ½Ð¸ÑÑ\tCtrl+Z", FCIDM_SHVIEW_UNDO + MENUITEM SEPARATOR + MENUITEM "&ÐÑÑÐµÐ·Ð°ÑÑ\tCtrl+X", FCIDM_SHVIEW_CUT + MENUITEM "&ÐÐ¾Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ\tCtrl+C", FCIDM_SHVIEW_COPY + MENUITEM "ÐÑÑ&Ð°Ð²Ð¸ÑÑ\tCtrl+V", FCIDM_SHVIEW_INSERT + MENUITEM "ÐÑÑÐ°Ð²Ð¸ÑÑ &ÑÑÐ»ÑÐº", FCIDM_SHVIEW_INSERTLINK + MENUITEM SEPARATOR + MENUITEM "ÐÐ¾&Ð¿Ð¸ÑÐ¾Ð²Ð°ÑÑ Ð² Ð¿Ð°Ð¿ÐºÑ...", FCIDM_SHVIEW_COPYTO + MENUITEM "Ð&ÐµÑÐµÐ¼ÐµÑÑÐ¸ÑÑ Ð² Ð¿Ð°Ð¿ÐºÑ...", FCIDM_SHVIEW_MOVETO + MENUITEM SEPARATOR + MENUITEM "ÐÑÐ´ÐµÐ»Ð¸ÑÑ Ð²&ÑÐµ\tCtrl+A", FCIDM_SHVIEW_SELECTALL + MENUITEM "ÐÐ±ÑÐ°ÑÐ¸ÑÑ Ð²&ÑÐ´ÐµÐ»ÐµÐ½Ð¸Ðµ", FCIDM_SHVIEW_INVERTSELECTION END /* shellview item menu */ @@ -610,16 +627,15 @@ IDD_NOOPEN DIALOGEX 0, 0, 240, 75 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Caution" +CAPTION "ÐÑÐµÐ´ÑÐ¿ÑÐµÐ¶Ð´ÐµÐ½Ð¸Ðµ" FONT 8, "MS Shell Dlg" BEGIN ICON IDI_SHELL_DOCUMENT, IDI_SHELL_DOCUMENT, 5, 5, 21, 20 - LTEXT "This file could either be used by the operating system or by\n\ -another application. Modifying this file might damage your\n\ -system or make it less functional.\n\n\ -Are you sure you want to open this file?", IDC_STATIC, 35, 5, 230, 60 - DEFPUSHBUTTON "Yes", IDYES, 125, 55, 50, 14 - PUSHBUTTON "No", IDNO, 180, 55, 50, 14 + LTEXT "ÐÑÐ¾Ñ ÑÐ°Ð¹Ð» Ð¼Ð¾Ð¶ÐµÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÑÑÑ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¾Ð½Ð½Ð¾Ð¹ ÑÐ¸ÑÑÐµÐ¼Ð¾Ð¹ Ð¸Ð»Ð¸\n\ +Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð°Ð¼Ð¸. ÐÐ³Ð¾ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¼Ð¾Ð¶ÐµÑ Ð¿Ð¾Ð²ÑÐµÐ´Ð¸ÑÑ ÑÐ¸ÑÑÐµÐ¼Ñ.\n\n\ +ÐÑ Ð´ÐµÐ¹ÑÑÐ²Ð¸ÑÐµÐ»ÑÐ½Ð¾ ÑÐ¾ÑÐ¸ÑÐµ Ð¾ÑÐºÑÑÑÑ ÑÑÐ¾Ñ ÑÐ°Ð¹Ð»?", IDC_STATIC, 35, 5, 230, 60 + DEFPUSHBUTTON "ÐÐ°", IDYES, 125, 55, 50, 14 + PUSHBUTTON "ÐÐµÑ", IDNO, 180, 55, 50, 14 END STRINGTABLE @@ -797,4 +813,6 @@ IDS_BYTES_FORMAT "Ð±Ð°Ð¹Ñ" IDS_UNKNOWN_APP "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾Ðµ Ð¿ÑÐ¸Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ" IDS_EXE_DESCRIPTION "ÐÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ:" -END + + IDS_MENU_EMPTY "(Ð¿ÑÑÑÐ¾)" +END

9 years, 9 months

[hbelusca] 65790: [WHOAMI] - In German translation, replace erroneous \" to "" for putting quotes inside strings. Fixes resource compilation in GCC/MSVC. - Make proper help string indentation in re...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Mon Dec 22 12:28:05 2014 New Revision: 65790 URL: http://svn.reactos.org/svn/reactos?rev=65790&view=rev Log: [WHOAMI] - In German translation, replace erroneous \" to "" for putting quotes inside strings. Fixes resource compilation in GCC/MSVC. - Make proper help string indentation in resource files. NOTE FOR TRANSLATORS: Please keep the identation correct! Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] Mon Dec 22 12:28:05 2014 @@ -31,26 +31,26 @@ 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_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" + 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 Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc [iso-8859-1] Mon Dec 22 12:28:05 2014 @@ -38,19 +38,19 @@ 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" + 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 Modified: trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc [iso-8859-1] Mon Dec 22 12:28:05 2014 @@ -39,20 +39,20 @@ 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" + 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

9 years, 9 months

[dreimer] 65789: [WHOAMI] German translation

by dreimer＠svn.reactos.org

Author: dreimer Date: Mon Dec 22 11:40:58 2014 New Revision: 65789 URL: http://svn.reactos.org/svn/reactos?rev=65789&view=rev Log: [WHOAMI] German translation Added: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc Added: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc [iso-8859-1] Mon Dec 22 11:40:58 2014 @@ -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 Propchange: trunk/reactos/base/applications/cmdutils/whoami/lang/de-DE.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] Mon Dec 22 11:40:58 2014 @@ -14,6 +14,9 @@ /* 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

9 years, 9 months

[pschweitzer] 65788: [WHOAMI] Fix invalid memory usage, memory leaks, partial zeroes, big if blocks, ... Would be nice also to check all the allocations which are not checked yet CORE-8533

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Mon Dec 22 09:53:24 2014 New Revision: 65788 URL: http://svn.reactos.org/svn/reactos?rev=65788&view=rev Log: [WHOAMI] Fix invalid memory usage, memory leaks, partial zeroes, big if blocks, ... Would be nice also to check all the allocations which are not checked yet CORE-8533 Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c Modified: trunk/reactos/base/applications/cmdutils/whoami/whoami.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] Mon Dec 22 09:53:24 2014 @@ -33,7 +33,7 @@ int i; if (!arg) - goto BailOut; + return FALSE; for (i = 1; i < argc; i++) { @@ -41,7 +41,6 @@ return TRUE; } - BailOut: return FALSE; } @@ -58,12 +57,16 @@ LPWSTR UsrBuf = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, MAX_PATH); ULONG UsrSiz = MAX_PATH; - if (UsrBuf && GetUserNameExW(NameFormat, UsrBuf, &UsrSiz)) + if (UsrBuf == NULL) + return NULL; + + if (GetUserNameExW(NameFormat, UsrBuf, &UsrSiz)) { CharLowerW(UsrBuf); return UsrBuf; } + HeapFree(GetProcessHeap(), 0, UsrBuf); return NULL; } @@ -103,6 +106,7 @@ &dwLength)) { wprintf(L"ERROR 0x%x: could not get token information.\r\n", GetLastError()); + WhoamiFree(pTokenInfo); exit(1); } @@ -370,35 +374,33 @@ LPWSTR pSidStr = 0; PSID pSid = 0; - if (pGroupInfo) - { - /* 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 || !ConvertSidToStringSidW(pSid, &pSidStr)) - { - 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); - } + 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 || !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 */ - if (pSidStr) - LocalFree(pSidStr); - - if (pGroupInfo) - WhoamiFree(pGroupInfo); + LocalFree(pSidStr); + WhoamiFree(pGroupInfo); return 0; } @@ -406,41 +408,42 @@ int WhoamiUser(void) { PTOKEN_USER pUserInfo = (PTOKEN_USER) WhoamiGetTokenInfo(TokenUser); - LPWSTR pUserStr = WhoamiGetUser(NameSamCompatible); + LPWSTR pUserStr = NULL; LPWSTR pSidStr = NULL; - - if (pUserInfo && pUserStr) - { - WhoamiTable *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); - } - else + 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 */ - if (pSidStr) - LocalFree(pSidStr); - - if (pUserInfo) - WhoamiFree(pUserInfo); - - if (pUserStr) - WhoamiFree(pUserStr); + LocalFree(pSidStr); + WhoamiFree(pUserInfo); + WhoamiFree(pUserStr); return 0; } @@ -473,175 +476,171 @@ }; PTOKEN_GROUPS pGroupInfo = (PTOKEN_GROUPS)WhoamiGetTokenInfo(TokenGroups); - - if (pGroupInfo) - { - /* the header is the first (0) row, so we start in the second one (1) */ - UINT PrintingRow = 1; - - WhoamiTable *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)) - { + 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, - 666, - 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, 666); - - if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_MANDATORY) - StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_MANDATORY)); - if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED_BY_DEFAULT) - StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED_BY_DEFAULT)); - if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED) - StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED)); - if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_OWNER) - StringCchCat(tmpBuffer, 666, 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, 255); - ZeroMemory(szDomainName, 255); - - cchGroupName = 255; - cchDomainName = 255; - } - - WhoamiPrintTable(GroupTable); - } - else + /* 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); + + ret = LookupPrivilegeDisplayNameW(NULL, PrivName, NULL, &DispNameSize, &dwResult); + + if (!ret || GetLastError() == ERROR_NO_SUCH_PRIVILEGE) + { + DispName = HeapAlloc(GetProcessHeap(), 0, ++DispNameSize * sizeof(WCHAR)); + + LookupPrivilegeDisplayNameW(NULL, PrivName, DispName, &DispNameSize, &dwResult); + + //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 (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 */ - if (pGroupInfo) - WhoamiFree((LPVOID)pGroupInfo); - - return 0; -} - -int WhoamiPriv(void) -{ - PTOKEN_PRIVILEGES pPrivInfo = (PTOKEN_PRIVILEGES) WhoamiGetTokenInfo(TokenPrivileges); - - if (pPrivInfo) - { - DWORD dwResult = 0, dwIndex = 0; - - WhoamiTable *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); - - ret = LookupPrivilegeDisplayNameW(NULL, PrivName, NULL, &DispNameSize, &dwResult); - - if (!ret || GetLastError() == ERROR_NO_SUCH_PRIVILEGE) - { - DispName = HeapAlloc(GetProcessHeap(), 0, ++DispNameSize * sizeof(WCHAR)); - - LookupPrivilegeDisplayNameW(NULL, PrivName, DispName, &DispNameSize, &dwResult); - - //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 (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); - } - else - { - return 1; - } - - /* cleanup our allocations */ - if (pPrivInfo) - WhoamiFree(pPrivInfo); + WhoamiFree(pPrivInfo); return 0; }

9 years, 9 months

[akhaldi] 65787: [WHOAMI] Add preliminary version of whoami utility by Ismael Ferreras Morezuelas (with some changes by me). CORE-8533

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 21 23:10:46 2014 New Revision: 65787 URL: http://svn.reactos.org/svn/reactos?rev=65787&view=rev Log: [WHOAMI] Add preliminary version of whoami utility by Ismael Ferreras Morezuelas (with some changes by me). CORE-8533 Added: trunk/reactos/base/applications/cmdutils/whoami/ trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt (with props) trunk/reactos/base/applications/cmdutils/whoami/lang/ trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc (with props) trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc (with props) trunk/reactos/base/applications/cmdutils/whoami/resource.h (with props) trunk/reactos/base/applications/cmdutils/whoami/whoami.c (with props) trunk/reactos/base/applications/cmdutils/whoami/whoami.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt Modified: trunk/reactos/base/applications/cmdutils/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/CMakeLists.txt [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -12,6 +12,7 @@ add_subdirectory(sort) add_subdirectory(taskkill) add_subdirectory(tree) +add_subdirectory(whoami) add_subdirectory(wmic) add_subdirectory(wscript) add_subdirectory(xcopy) Added: trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt (added) +++ trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -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) Propchange: trunk/reactos/base/applications/cmdutils/whoami/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -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 Propchange: trunk/reactos/base/applications/cmdutils/whoami/lang/en-US.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -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 Propchange: trunk/reactos/base/applications/cmdutils/whoami/lang/es-ES.rc ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/resource.h (added) +++ trunk/reactos/base/applications/cmdutils/whoami/resource.h [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -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 Propchange: trunk/reactos/base/applications/cmdutils/whoami/resource.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/whoami.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.c (added) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.c [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -0,0 +1,899 @@ +/* + * 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(a)gmail.com) + */ + + +#define SECURITY_WIN32 +#include <security.h> +#include <sddl.h> + +#include <strsafe.h> + +#include "resource.h" + +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) + goto BailOut; + + for (i = 1; i < argc; i++) + { + if (wcsicmp(argv[i], arg) == 0) + return TRUE; + } + + BailOut: + 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 && GetUserNameExW(NameFormat, UsrBuf, &UsrSiz)) + { + CharLowerW(UsrBuf); + return 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()); + 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(L"\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) + { + /* 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 || !ConvertSidToStringSidW(pSid, &pSidStr)) + { + 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 */ + if (pSidStr) + LocalFree(pSidStr); + + if (pGroupInfo) + WhoamiFree(pGroupInfo); + + return 0; +} + +int WhoamiUser(void) +{ + PTOKEN_USER pUserInfo = (PTOKEN_USER) WhoamiGetTokenInfo(TokenUser); + LPWSTR pUserStr = WhoamiGetUser(NameSamCompatible); + LPWSTR pSidStr = NULL; + + if (pUserInfo && pUserStr) + { + WhoamiTable *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); + } + else + { + return 1; + } + + /* cleanup our allocations */ + if (pSidStr) + LocalFree(pSidStr); + + if (pUserInfo) + WhoamiFree(pUserInfo); + + if (pUserStr) + 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); + + if (pGroupInfo) + { + /* the header is the first (0) row, so we start in the second one (1) */ + UINT PrintingRow = 1; + + WhoamiTable *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, + 666, + 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, 666); + + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_MANDATORY) + StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_MANDATORY)); + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED_BY_DEFAULT) + StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED_BY_DEFAULT)); + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_ENABLED) + StringCchCat(tmpBuffer, 666, WhoamiLoadRcString(IDS_ATTR_GROUP_ENABLED)); + if (pGroupInfo->Groups[dwIndex].Attributes & SE_GROUP_OWNER) + StringCchCat(tmpBuffer, 666, 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, 255); + ZeroMemory(szDomainName, 255); + + cchGroupName = 255; + cchDomainName = 255; + } + + WhoamiPrintTable(GroupTable); + } + else + { + return 1; + } + + /* cleanup our allocations */ + if (pGroupInfo) + WhoamiFree((LPVOID)pGroupInfo); + + return 0; +} + +int WhoamiPriv(void) +{ + PTOKEN_PRIVILEGES pPrivInfo = (PTOKEN_PRIVILEGES) WhoamiGetTokenInfo(TokenPrivileges); + + if (pPrivInfo) + { + DWORD dwResult = 0, dwIndex = 0; + + WhoamiTable *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); + + ret = LookupPrivilegeDisplayNameW(NULL, PrivName, NULL, &DispNameSize, &dwResult); + + if (!ret || GetLastError() == ERROR_NO_SUCH_PRIVILEGE) + { + DispName = HeapAlloc(GetProcessHeap(), 0, ++DispNameSize * sizeof(WCHAR)); + + LookupPrivilegeDisplayNameW(NULL, PrivName, DispName, &DispNameSize, &dwResult); + + //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 (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); + } + else + { + return 1; + } + + /* cleanup our allocations */ + if (pPrivInfo) + 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; +} Propchange: trunk/reactos/base/applications/cmdutils/whoami/whoami.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/whoami/whoami.rc (added) +++ trunk/reactos/base/applications/cmdutils/whoami/whoami.rc [iso-8859-1] Sun Dec 21 23:10:46 2014 @@ -0,0 +1,22 @@ +#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" +#define REACTOS_STR_COMPANY_NAME "Ismael Ferreras Morezuelas" + +#include <reactos/version.rc> + +/* UTF-8 */ +#pragma code_page(65001) + +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_ES_ES + #include "lang/es-ES.rc" +#endif Propchange: trunk/reactos/base/applications/cmdutils/whoami/whoami.rc ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 9 months

[akhaldi] 65786: [TREE] Attempt to fix some style & formatting crimes. Improve header inclusions. CORE-8529

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 21 18:48:33 2014 New Revision: 65786 URL: http://svn.reactos.org/svn/reactos?rev=65786&view=rev Log: [TREE] Attempt to fix some style & formatting crimes. Improve header inclusions. CORE-8529 Modified: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt trunk/reactos/base/applications/cmdutils/tree/tree.c trunk/reactos/base/applications/cmdutils/tree/tree.rc Modified: trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/CMakeLists.txt [iso-8859-1] Sun Dec 21 18:48:33 2014 @@ -2,5 +2,5 @@ add_executable(tree tree.c tree.rc) set_module_type(tree win32cui UNICODE) set_target_properties(tree PROPERTIES SUFFIX ".com") -add_importlibs(tree msvcrt kernel32 user32) +add_importlibs(tree user32 msvcrt kernel32) add_cd_file(TARGET tree DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/base/applications/cmdutils/tree/tree.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.c [iso-8859-1] Sun Dec 21 18:48:33 2014 @@ -1,23 +1,27 @@ ï»¿/* - * 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(a)hotmail.com) + * 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(a)hotmail.com) */ #include <stdio.h> -//#include <stdarg.h> -#include <windows.h> +#include <stdlib.h> +#include <windef.h> +#include <winbase.h> +#include <winuser.h> #include "resource.h" #define STR_MAX 2048 -static void DrawTree(const wchar_t* strPath, const WIN32_FIND_DATA *arrFolder, const size_t szArr, UINT width, const wchar_t *prevLine, BOOL drawfolder); static void GetDirectoryStructure(wchar_t* strPath, UINT width, const wchar_t* prevLine); -BOOL bShowFiles = FALSE; //if this flag is set to true, files will also be listed -BOOL bUseAscii = FALSE; //if this flag is true, ASCII characters will be used instead of UNICODE ones +/* 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 @@ -50,28 +54,28 @@ BOOL ret = FALSE; WIN32_FIND_DATA FindFileData; HANDLE hFind = NULL; - static wchar_t strPath[STR_MAX]= L""; + static wchar_t strPath[STR_MAX] = L""; ZeroMemory(strPath, sizeof(strPath)); - wcscat(strPath,strPath1); - wcscat(strPath,L"\\*."); - - hFind=FindFirstFile(strPath, &FindFileData); + 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 ) + if (wcscmp(FindFileData.cFileName, L".") == 0 || + wcscmp(FindFileData.cFileName, L"..") == 0 ) { continue; } - ret=TRUE; //found subfolder + ret = TRUE; //found subfolder break; } } - while(FindNextFile(hFind, &FindFileData)); + while (FindNextFile(hFind, &FindFileData)); FindClose(hFind); return ret; @@ -96,50 +100,57 @@ * @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) +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) + /* 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; + 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 + /* 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'|') + 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"|"); + 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 + 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 @@ -147,9 +158,10 @@ } else { - if(bHasSubFolder) - { - // will add 'â FileNamw' //thie line is added to connect the belowfolder sub structure + 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 @@ -157,16 +169,16 @@ } else { - // will add ' FileNamw' + /* will add ' FileNamw' */ wsprintf(str,L" %s", (wchar_t*)arrFolder[i].cFileName); } } } else { - if(drawfolder) - { - // 'ââââFolder name' + if (drawfolder) + { + /* 'ââââFolder name' */ if (bUseAscii) wsprintf(str, L"\\---%s", (wchar_t*)arrFolder[i].cFileName); else @@ -174,18 +186,18 @@ } else { - if(bHasSubFolder) - { - // 'â FileName' + if (bHasSubFolder) + { + /* 'â FileName' */ if (bUseAscii) - wsprintf(str,L"| %s", (wchar_t*)arrFolder[i].cFileName); + 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); + wsprintf(str, L"%c %s", 179, (wchar_t*)arrFolder[i].cFileName); + } + else + { + /* ' FileName' */ + wsprintf(str, L" %s", (wchar_t*)arrFolder[i].cFileName); } } } @@ -193,15 +205,15 @@ wcscat(consoleOut, str); wprintf(L"%s\n", consoleOut); - if(drawfolder) + if (drawfolder) { wchar_t *str = (wchar_t*)malloc(STR_MAX * sizeof(wchar_t)); - ZeroMemory(str, 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); + GetDirectoryStructure(str, width + 4, consoleOut); free(str); } @@ -223,75 +235,76 @@ * @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) - { - DrawTree(strPath, arrFile, arrFilesz, width, prevLine, FALSE); //will free(arrFile) - } - - DrawTree(strPath, arrFolder, arrFoldersz, width, prevLine, TRUE); //will free(arrFile) - - free(arrFolder); - free(arrFile); +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); } /** @@ -304,37 +317,43 @@ int wmain( int argc, wchar_t *argv[]) { DWORD dwSerial = 0; - wchar_t t=0; + wchar_t t = 0; wchar_t *strPath = NULL; DWORD sz = 0; - //wchar_t *context = NULL ; + //wchar_t *context = NULL; wchar_t *driveLetter = NULL; int i; - - for(i = 1; i < argc; ++i) //parse the command line + + /* 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'?': - PrintResourceString(IDS_USAGE); //will print help and exit after - return 0; - case L'f': - bShowFiles=TRUE; //if set to true, will populate all the files within the folder structure - break; - case L'a': - bUseAscii=TRUE; - break; - default:break; + 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 - BOOL b=SetCurrentDirectoryW(argv[i]); //will set the current directory for this executable - if(b==FALSE) + /* 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; @@ -345,27 +364,31 @@ PrintResourceString(IDS_FOLDER_PATH); GetVolumeInformation(NULL, NULL, 0, &dwSerial, NULL, NULL, NULL, 0); - PrintResourceString(IDS_VOL_SERIAL, dwSerial >> 16, dwSerial & 0xffff); - - sz = GetCurrentDirectory(1, &t); //get the buffer size - strPath = (wchar_t*)malloc(sizeof(wchar_t) * sz); //must not return before calling delete[] - - GetCurrentDirectory(sz, strPath); //get the current directory - - - driveLetter = (wchar_t*)malloc(sizeof(wchar_t) * sz); //get the drive letter , must not return before calling delete[] - - // As we do not seem to have the _s functions properly set up, use the non-secure version for now + 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); + wcscpy(driveLetter, strPath); wcstok(driveLetter, L":"); - wprintf(L"%s:.\n",driveLetter); + wprintf(L"%s:.\n", driveLetter); free(driveLetter); - GetDirectoryStructure(strPath, 1, L" "); //get the sub directories within this current folder + /* get the sub directories within this current folder */ + GetDirectoryStructure(strPath, 1, L" "); free(strPath); wprintf(L"\n"); Modified: trunk/reactos/base/applications/cmdutils/tree/tree.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/tree/tree.rc [iso-8859-1] Sun Dec 21 18:48:33 2014 @@ -1,13 +1,12 @@ #include <windef.h> -#include <winuser.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" +#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 */

9 years, 9 months

[akhaldi] 65785: [NTDLL_WINETEST] Properly enable back the LdrAddRefDll tests. CORE-8102

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sun Dec 21 18:00:03 2014 New Revision: 65785 URL: http://svn.reactos.org/svn/reactos?rev=65785&view=rev Log: [NTDLL_WINETEST] Properly enable back the LdrAddRefDll tests. CORE-8102 Modified: trunk/rostests/winetests/ntdll/rtl.c Modified: trunk/rostests/winetests/ntdll/rtl.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/rtl.c?rev… ============================================================================== --- trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/rtl.c [iso-8859-1] Sun Dec 21 18:00:03 2014 @@ -1504,14 +1504,6 @@ return; } -#ifndef __REACTOS__ - if (!winetest_interactive) - { - skip("Skipping LdrAddRefDll tests. See CORE-8102\n"); - return; - } -#endif - mod = LoadLibraryA("comctl32.dll"); ok(mod != NULL, "got %p\n", mod); ret = FreeLibrary(mod);

9 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
39
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2014