Ros-diffs April 2017

ros-diffs@reactos.org

14 participants
179 discussions

[ekohl] 74336: [FONTVIEW] Update the russain translation. CORE-12525
by ekohl＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: ekohl Date: Sun Apr 16 21:30:29 2017 New Revision: 74336 URL: http://svn.reactos.org/svn/reactos?rev=74336&view=rev Log: [FONTVIEW] Update the russain translation. CORE-12525 Modified: trunk/reactos/base/applications/fontview/fontview.h trunk/reactos/base/applications/fontview/lang/ru-RU.rc Modified: trunk/reactos/base/applications/fontview/fontview.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/fontview.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/fontview.h [iso-8859-1] Sun Apr 16 21:30:29 2017 @@ -6,7 +6,7 @@ #define HEADER_SIZE 37 #define BUTTON_POS_X 6 #define BUTTON_POS_Y 8 -#define BUTTON_WIDTH 72 +#define BUTTON_WIDTH 80 #define BUTTON_HEIGHT 21 #define BUTTON_PADDING 8 Modified: trunk/reactos/base/applications/fontview/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… ============================================================================== --- trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/fontview/lang/ru-RU.rc [iso-8859-1] Sun Apr 16 21:30:29 2017 @@ -19,6 +19,6 @@ OpenType ÑÑÐ¸ÑÑÑ (*.otf)\0*.otf\0\ OpenType Font Collection (*.otc)\0*.otc\0\ ÐÑÐµ ÑÐ°Ð¹Ð»Ñ (*.*)\0*.*\0" - IDS_PREVIOUS "< P&revious" - IDS_NEXT "&Next >" + IDS_PREVIOUS "< &ÐÑÐµÐ´ÑÐ´ÑÑÐ¸Ð¹" + IDS_NEXT "&Ð¡Ð»ÐµÐ´ÑÑÑÐ¸Ð¹ >" END

1 0

[ekohl] 74335: [SHELL32] Translate folder options. CORE-12525
by ekohl＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: ekohl Date: Sun Apr 16 21:26:05 2017 New Revision: 74335 URL: http://svn.reactos.org/svn/reactos?rev=74335&view=rev Log: [SHELL32] Translate folder options. CORE-12525 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] Sun Apr 16 21:26:05 2017 @@ -838,23 +838,23 @@ IDS_OBJECTS "ÐÐ±ÑÐµÐºÑÐ¾Ð²: %d" IDS_OBJECTS_SELECTED "ÐÑÐ´ÐµÐ»ÐµÐ½Ð¾ Ð¾Ð±ÑÐµÐºÑÐ¾Ð²: %d" - IDS_ADVANCED_FOLDER "Files and Folders" - IDS_ADVANCED_NET_CRAWLER "Automatically search for network folders and printers" - IDS_ADVANCED_FOLDER_SIZE_TIP "Display file size information in folder tips" - IDS_ADVANCED_FRIENDLY_TREE "Display simple folder view in Explorer's Folders list" - IDS_ADVANCED_WEB_VIEW_BARRICADE "Display the contents of system folders" - IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "Display the full path in address bar" - IDS_ADVANCED_SHOW_FULL_PATH "Display the full path in the title bar" - IDS_ADVANCED_DISABLE_THUMB_CACHE "Do not cache thumbnails" - IDS_ADVANCED_HIDDEN "Hidden files and folders" - IDS_ADVANCED_DONT_SHOW_HIDDEN "Do not show hidden files and folders" - IDS_ADVANCED_SHOW_HIDDEN "Show hidden files and folders" - IDS_ADVANCED_HIDE_FILE_EXT "Hide extensions for known file types" - IDS_ADVANCED_SUPER_HIDDEN "Hide protected operating system files (Recommended)" - IDS_ADVANCED_DESKTOP_PROCESS "Launch folder windows in a separate process" - IDS_ADVANCED_CLASSIC_VIEW_STATE "Remember each folder's view settings" - IDS_ADVANCED_PERSIST_BROWSERS "Restore previous folder windows at logon" - IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "Show Control Panel in My Computer" - IDS_ADVANCED_SHOW_COMP_COLOR "Show encrypted or compressed NTFS files in color" - IDS_ADVANCED_SHOW_INFO_TIP "Show pop-up description for folder and desktop items" -END + IDS_ADVANCED_FOLDER "Ð¤Ð°Ð¹Ð»Ñ Ð¸ Ð¿Ð°Ð¿ÐºÐ¸" + IDS_ADVANCED_NET_CRAWLER "ÐÐ²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ Ð¿Ð¾Ð¸ÑÐº ÑÐµÑÐµÐ²ÑÑ Ð¿Ð°Ð¿Ð¾Ðº Ð¸ Ð¿ÑÐ¸Ð½ÑÐµÑÐ¾Ð²" + IDS_ADVANCED_FOLDER_SIZE_TIP "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÐ²ÐµÐ´ÐµÐ½Ð¸Ñ Ð¾ ÑÐ°Ð·Ð¼ÐµÑÐµ ÑÐ°Ð¹Ð»Ð¾Ð² Ð² Ð¿Ð¾Ð´ÑÐºÐ°Ð·ÐºÐ°Ñ Ð¿Ð°Ð¿Ð¾Ðº" + IDS_ADVANCED_FRIENDLY_TREE "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð¿ÑÐ¾ÑÑÐ¾Ð¹ Ð²Ð¸Ð´ Ð¿Ð°Ð¿Ð¾Ðº Ð² ÑÐ¿Ð¸ÑÐºÐµ Ð¿Ð°Ð¿Ð¾Ðº Ð¿ÑÐ¾Ð²Ð¾Ð´Ð½Ð¸ÐºÐ°" + IDS_ADVANCED_WEB_VIEW_BARRICADE "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÐ¾Ð´ÐµÑÐ¶Ð¸Ð¼Ð¾Ðµ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÑ Ð¿Ð°Ð¿Ð¾Ðº" + IDS_ADVANCED_SHOW_FULL_PATH_ADDRESS "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð¿Ð¾Ð»Ð½ÑÐ¹ Ð¿ÑÑÑ Ð² Ð°Ð´ÑÐµÑÐ½Ð¾Ð¹ ÑÑÑÐ¾ÐºÐµ" + IDS_ADVANCED_SHOW_FULL_PATH "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð¿Ð¾Ð»Ð½ÑÐ¹ Ð¿ÑÑÑ Ð² ÑÑÑÐ¾ÐºÐµ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ°" + IDS_ADVANCED_DISABLE_THUMB_CACHE "ÐÐµ ÐºÑÑÐ¸ÑÐ¾Ð²Ð°ÑÑ ÑÑÐºÐ¸Ð·Ñ" + IDS_ADVANCED_HIDDEN "Ð¡ÐºÑÑÑÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¸ Ð¿Ð°Ð¿ÐºÐ¸" + IDS_ADVANCED_DONT_SHOW_HIDDEN "ÐÐµ Ð¿Ð¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÑÐºÑÑÑÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¸ Ð¿Ð°Ð¿ÐºÐ¸" + IDS_ADVANCED_SHOW_HIDDEN "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÑÑ ÑÐºÑÑÑÑÐµ ÑÐ°Ð¹Ð»Ñ Ð¸ Ð¿Ð°Ð¿ÐºÐ¸" + IDS_ADVANCED_HIDE_FILE_EXT "Ð¡ÐºÑÑÐ²Ð°ÑÑ ÑÐ°ÑÑÐ¸ÑÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð·Ð°ÑÐµÐ³Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ ÑÐ¸Ð¿Ð¾Ð² ÑÐ°Ð¹Ð»Ð¾Ð²" + IDS_ADVANCED_SUPER_HIDDEN "Ð¡ÐºÑÑÐ²Ð°ÑÑ Ð·Ð°ÑÐ¸ÑÐµÐ½Ð½ÑÐµ ÑÐ¸ÑÑÐµÐ¼Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ (ÑÐµÐºÐ¾Ð¼ÐµÐ½Ð´ÑÐµÑÑÑ)" + IDS_ADVANCED_DESKTOP_PROCESS "ÐÑÐºÑÑÐ²Ð°ÑÑ ÐºÐ°Ð¶Ð´ÑÑ Ð¿Ð°Ð¿ÐºÑ Ð² Ð¾ÑÐ´ÐµÐ»ÑÐ½Ð¾Ð¼ Ð¿ÑÐ¾ÑÐµÑÑÐµ" + IDS_ADVANCED_CLASSIC_VIEW_STATE "ÐÐ¾Ð¼Ð½Ð¸ÑÑ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÑ Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ Ð¿Ð°Ð¿ÐºÐ¸" + IDS_ADVANCED_PERSIST_BROWSERS "ÐÐ¾ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÑÑ Ð¿ÑÐµÐ¶Ð½Ð¸Ðµ Ð¾ÐºÐ½Ð° Ð¿Ð°Ð¿Ð¾Ðº Ð¿ÑÐ¸ Ð²ÑÐ¾Ð´Ðµ Ð² ÑÐ¸ÑÑÐµÐ¼Ñ" + IDS_ADVANCED_CONTROL_PANEL_IN_MY_COMPUTER "ÐÐ¾ÐºÐ°Ð·Ð°ÑÑ ""ÐÐ°Ð½ÐµÐ»Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ"" Ð² ""ÐÐ¾Ð¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ""" + IDS_ADVANCED_SHOW_COMP_COLOR "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ ÑÐ¶Ð°ÑÑÐµ Ð¸Ð»Ð¸ Ð·Ð°ÑÐ¸ÑÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÐ°Ð¹Ð»Ñ NTFS Ð´ÑÑÐ³Ð¸Ð¼ ÑÐ²ÐµÑÐ¾Ð¼" + IDS_ADVANCED_SHOW_INFO_TIP "ÐÑÐ¾Ð±ÑÐ°Ð¶Ð°ÑÑ Ð¾Ð¿Ð¸ÑÐ°Ð½Ð¸Ðµ Ð´Ð»Ñ Ð¿Ð°Ð¿Ð¾Ðº Ð¸ ÑÐ»ÐµÐ¼ÐµÐ½ÑÐ¾Ð² ÑÐ°Ð±Ð¾ÑÐµÐ³Ð¾ ÑÑÐ¾Ð»Ð°" +END

1 0

[ekohl] 74334: [NEWDEV] Fix control sizes in russian dialogs. CORE-12525
by ekohl＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: ekohl Date: Sun Apr 16 21:21:36 2017 New Revision: 74334 URL: http://svn.reactos.org/svn/reactos?rev=74334&view=rev Log: [NEWDEV] Fix control sizes in russian dialogs. CORE-12525 Modified: trunk/reactos/dll/win32/newdev/lang/ru-RU.rc Modified: trunk/reactos/dll/win32/newdev/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/newdev/lang/ru-R… ============================================================================== --- trunk/reactos/dll/win32/newdev/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/newdev/lang/ru-RU.rc [iso-8859-1] Sun Apr 16 21:21:36 2017 @@ -9,7 +9,7 @@ LTEXT "ÐÑÐ¾Ñ Ð¼Ð°ÑÑÐµÑ ÑÑÑÐ°Ð½Ð°Ð²Ð»Ð¸Ð²Ð°ÐµÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð´Ð»Ñ:", IDC_STATIC, 120, 21, 195, 16 LTEXT "ÐÐ»Ñ Ð¿ÑÐ¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ°Ð»ÐµÐµ"".", IDC_STATIC, 120, 169, 195, 16 LTEXT "ÐÐµÐ¸Ð·Ð²ÐµÑÑÐ½Ð¾Ðµ ÑÑÑÑÐ¾Ð¹ÑÑÐ²Ð¾", IDC_DEVICE, 148, 36, 147, 12 - LTEXT "ÐÐÐÐÐÐÐÐ! Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°ÐºÐ¾Ð½ÑÐ¸ÑÑÑÑ Ð·Ð°Ð²Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° Ð¸Ð»Ð¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐµÐ³Ð¾!", IDC_STATIC, 120, 59, 195, 16 + LTEXT "ÐÐÐÐÐÐÐÐ! Ð£ÑÑÐ°Ð½Ð¾Ð²ÐºÐ° Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¼Ð¾Ð¶ÐµÑ Ð·Ð°ÐºÐ¾Ð½ÑÐ¸ÑÑÑÑ Ð·Ð°Ð²Ð¸ÑÐ°Ð½Ð¸ÐµÐ¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° Ð¸Ð»Ð¸ Ð½ÐµÐ²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑÑÑ Ð·Ð°Ð³ÑÑÐ·Ð¸ÑÑ ÐµÐ³Ð¾!", IDC_STATIC, 120, 59, 195, 24 CONTROL "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð°Ð²ÑÐ¾Ð¼Ð°ÑÐ¸ÑÐµÑÐºÐ¸", IDC_RADIO_AUTO, "Button", BS_AUTORADIOBUTTON, 120, 112, 195, 12 CONTROL "Ð£ÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð´ÑÐ°Ð¹Ð²ÐµÑ Ð¸Ð· ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¼ÐµÑÑÐ°", IDC_RADIO_MANUAL, "Button", BS_AUTORADIOBUTTON, 120, 133, 195, 12 END @@ -21,7 +21,7 @@ BEGIN LTEXT "ÐÑÐ¾ Ð¾Ð±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð¸ÑÑ Ð½Ðµ ÑÐ´Ð°Ð»Ð¾ÑÑ", IDC_FINISHTITLE, 120, 8, 195, 16 LTEXT "ÐÐ±Ð¾ÑÑÐ´Ð¾Ð²Ð°Ð½Ð¸Ðµ Ð½Ðµ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¾, Ð¿Ð¾ÑÐºÐ¾Ð»ÑÐºÑ Ð¼Ð°ÑÑÐµÑ Ð½Ðµ ÑÐ¼Ð¾Ð³ Ð½Ð°Ð¹ÑÐ¸ Ð½ÑÐ¶Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ñ.", IDC_STATIC, 120, 32, 195, 16 - LTEXT "ÐÑÐ»Ð¸ Ð¸Ð¼ÐµÑÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð¾ÑÐ½ÑÐµ Ð´Ð¸ÑÐºÐ¸ Ð¸Ð»Ð¸ Ð¸Ð·Ð²ÐµÑÑÐ½Ð¾ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½ÑÐ¶Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ñ, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ°Ð·Ð°Ð´"".", IDC_STATIC, 120, 98, 195, 16 + LTEXT "ÐÑÐ»Ð¸ Ð¸Ð¼ÐµÑÑÑÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð¾ÑÐ½ÑÐµ Ð´Ð¸ÑÐºÐ¸ Ð¸Ð»Ð¸ Ð¸Ð·Ð²ÐµÑÑÐ½Ð¾ ÑÐ°ÑÐ¿Ð¾Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ Ð½ÑÐ¶Ð½Ð¾Ð³Ð¾ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼Ð½Ð¾Ð³Ð¾ Ð¾Ð±ÐµÑÐ¿ÐµÑÐµÐ½Ð¸Ñ, Ð½Ð°Ð¶Ð¼Ð¸ÑÐµ ÐºÐ½Ð¾Ð¿ÐºÑ ""ÐÐ°Ð·Ð°Ð´"".", IDC_STATIC, 120, 98, 195, 24 CONTROL "ÐÐ¾Ð»ÑÑÐµ Ð½Ðµ Ð½Ð°Ð¿Ð¾Ð¼Ð¸Ð½Ð°ÑÑ Ð¾Ð± ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐµ ÑÑÐ¾Ð³Ð¾ Ð´ÑÐ°Ð¹Ð²ÐµÑÐ°.", IDC_DONOTSHOWDLG, "Button", BS_AUTOCHECKBOX | WS_TABSTOP, 120, 170, 195, 12 END

1 0

[ekohl] 74333: [AT] Added RU translation to the AT command. [BLACKSHADE] Added RU translation to the blackshade theme. CORE-12961
by ekohl＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: ekohl Date: Sun Apr 16 20:57:30 2017 New Revision: 74333 URL: http://svn.reactos.org/svn/reactos?rev=74333&view=rev Log: [AT] Added RU translation to the AT command. [BLACKSHADE] Added RU translation to the blackshade theme. CORE-12961 Added: trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc (with props) trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/at/at.rc trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc Modified: trunk/reactos/base/applications/cmdutils/at/at.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/at.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/cmdutils/at/at.rc [iso-8859-1] Sun Apr 16 20:57:30 2017 @@ -15,3 +15,6 @@ #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" #endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc (added) +++ trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc [iso-8859-1] Sun Apr 16 20:57:30 2017 @@ -0,0 +1,50 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +BEGIN + IDS_USAGE "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° AT Ð¿ÑÐµÐ´Ð½Ð°Ð·Ð½Ð°ÑÐµÐ½Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´ Ð¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼\n\ +Ð² ÑÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ðµ Ð²ÑÐµÐ¼Ñ Ð¿Ð¾ Ð¾Ð¿ÑÐµÐ´ÐµÐ»ÐµÐ½Ð½ÑÐ¼ Ð´Ð½ÑÐ¼. ÐÐ»Ñ ÑÐ°Ð±Ð¾ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ð½ÐµÐ¾Ð±ÑÐ¾Ð´Ð¸Ð¼Ð¾, ÑÑÐ¾Ð±Ñ\n\ +Ð±ÑÐ»Ð° Ð·Ð°Ð¿ÑÑÐµÐ½Ð° ÑÐ»ÑÐ¶Ð±Ð° Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²ÑÐ¸ÐºÐ° (Schedule service).\n\n\ +AT [\\\\Ð¸Ð¼Ñ_ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°] [ [id] [/DELETE] | /DELETE [/YES]]\n\ +AT [\\\\Ð¸Ð¼Ñ_ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°] Ð²ÑÐµÐ¼Ñ [/INTERACTIVE]\n\ + [ /EVERY:Ð´ÐµÐ½Ñ[,...] | /NEXT:Ð´ÐµÐ½Ñ[,...]] ""ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°""\n\n\ +\\\\Ð¸Ð¼Ñ_ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ° ÐÐ¼Ñ ÑÐ´Ð°Ð»ÐµÐ½Ð½Ð¾Ð³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°. ÐÑÐ»Ð¸ ÑÑÐ¾Ñ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½, \n\ + Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ Ð»Ð¾ÐºÐ°Ð»ÑÐ½ÑÐ¹ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑ.\n\ +id ÐÐ¾ÑÑÐ´ÐºÐ¾Ð²ÑÐ¹ Ð½Ð¾Ð¼ÐµÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½Ð¾Ð¹ Ð·Ð°Ð´Ð°ÑÐ¸.\n\ +/DELETE ÐÑÐ¼ÐµÐ½ÑÐµÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ. ÐÑÐ»Ð¸ Ð¿Ð°ÑÐ°Ð¼ÐµÑÑ is Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½, ÑÐ¾\n\ + Ð²ÑÐµ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ, Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð½Ð° Ð´Ð°Ð½Ð½Ð¾Ð¼ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ, Ð±ÑÐ´ÑÑ Ð¾ÑÐ¼ÐµÐ½ÐµÐ½Ñ.\n\ +/YES ÐÑÐ¼ÐµÐ½Ð° Ð·Ð°Ð¿ÑÐ¾ÑÐ° Ð½Ð° Ð¿Ð¾Ð´ÑÐ²ÐµÑÐ¶Ð´ÐµÐ½Ð¸Ðµ Ð¿ÑÐ¸ Ð¾ÑÐ¼ÐµÐ½Ðµ Ð²ÑÐµÑ\n\ + Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð·Ð°Ð´Ð°Ñ.\n\ +Ð²ÑÐµÐ¼Ñ ÐÑÐµÐ¼Ñ Ð·Ð°Ð¿ÑÑÐºÐ° ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ.\n\ +/INTERACTIVE Ð Ð°Ð·ÑÐµÑÐ°ÐµÑ Ð²Ð·Ð°Ð¸Ð¼Ð¾Ð´ÐµÐ¹ÑÑÐ²Ð¸Ðµ Ð·Ð°Ð´Ð°ÑÐ¸ Ñ Ð¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°ÑÐµÐ»ÐµÐ¼,\n\ + ÑÐ°Ð±Ð¾ÑÐ°ÑÑÐ¸Ð¼ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ Ð²Ð¾ Ð²ÑÐµÐ¼Ñ Ð·Ð°Ð¿ÑÑÐºÐ° Ð·Ð°Ð´Ð°ÑÐ¸.\n\ +/EVERY:Ð´ÐµÐ½Ñ[,...] ÐÐ°Ð´Ð°ÑÐ° Ð±ÑÐ´ÐµÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÑÑÑÑÑ ÐºÐ°Ð¶Ð´ÑÐ¹ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð´ÐµÐ½Ñ (Ð´Ð½Ð¸) Ð¸Ð»Ð¸\n\ + Ð¼ÐµÑÑÑ. ÐÑÐ»Ð¸ Ð´Ð°ÑÐ° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°, Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´ÐµÐ½Ñ \n\ + Ð¼ÐµÑÑÑÐ°.\n\ +/NEXT:Ð´ÐµÐ½Ñ[,...] ÐÐ°Ð´Ð°ÑÐ° Ð±ÑÐ´ÐµÑ Ð·Ð°Ð¿ÑÑÐµÐ½Ð° Ð² ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹ ÑÐºÐ°Ð·Ð°Ð½Ð½ÑÐ¹ Ð´ÐµÐ½Ñ Ð½ÐµÐ´ÐµÐ»Ð¸\n\ + (Ð½Ð°Ð¿ÑÐ¸Ð¼ÐµÑ, Ð² ÑÐ»ÐµÐ´ÑÑÑÐ¸Ð¹ ÑÐµÑÐ²ÐµÑÐ³). ÐÑÐ»Ð¸ Ð´Ð°ÑÐ° Ð½Ðµ ÑÐºÐ°Ð·Ð°Ð½Ð°, ÑÐ¾ \n\ + Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÐµÑÑÑ ÑÐµÐºÑÑÐ¸Ð¹ Ð´ÐµÐ½Ñ Ð¼ÐµÑÑÑÐ°.\n\ +""ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°"" ÐÐ¾Ð¼Ð°Ð½Ð´Ð° Ð¸Ð»Ð¸ Ð¸Ð¼Ñ Ð¿Ð°ÐºÐµÑÐ½Ð¾Ð³Ð¾ ÑÐ°Ð¹Ð»Ð° Ð´Ð»Ñ Ð·Ð°Ð¿ÑÑÐºÐ°.\n" + + IDS_CONFIRM_DELETE "ÐÑÐ° Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ñ ÑÐ´Ð°Ð»Ð¸Ñ Ð²ÑÐµ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ Ð·Ð°Ð´Ð°Ð½Ð¸Ñ.\nÐÑÐ¾Ð´Ð¾Ð»Ð¶Ð¸ÑÑ Ð²ÑÐ¿Ð¾Ð»Ð½ÐµÐ½Ð¸Ðµ Ð¾Ð¿ÐµÑÐ°ÑÐ¸Ð¸? (Y-Ð´Ð°/N-Ð½ÐµÑ) [N] " + IDS_NEW_JOB "ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¾ Ð½Ð¾Ð²Ð¾Ðµ Ð·Ð°Ð´Ð°Ð½Ð¸Ðµ Ñ ID = %lu\n" + IDS_JOBS_LIST "Ð¡ÑÐ°ÑÑÑ ID ÐÐµÐ½Ñ ÐÑÐµÐ¼Ñ ÐÐ¾Ð¼Ð°Ð½Ð´Ð°\n" + IDS_NO_ENTRIES "Ð ÑÐ¿Ð¸ÑÐºÐµ Ð½ÐµÑ Ð·Ð°Ð¿Ð»Ð°Ð½Ð¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÑ Ð·Ð°Ð´Ð°Ñ.\n" + + IDS_TODAY "Ð¡ÐµÐ³Ð¾Ð´Ð½Ñ" + IDS_TOMORROW "ÐÐ°Ð²ÑÑÐ°" + IDS_EVERY "ÐÐ°Ð¶Ð´ÑÐ¹" + IDS_NEXT "Ð¡Ð»ÐµÐ´ÑÑÑÐ¸Ð¹" + + IDS_YES "ÐÐ°" + IDS_NO "ÐÐµÑ" + IDS_ERROR "ÐÐ¨ÐÐÐÐ" + IDS_OK "ÐÐ" + + IDS_TASKID "ID Ð·Ð°Ð´Ð°ÑÐ¸: %lu\n" + IDS_STATUS "Ð¡Ð¾ÑÑÐ¾ÑÐ½Ð¸Ðµ: %s\n" + IDS_SCHEDULE "Ð Ð°ÑÐ¿Ð¸ÑÐ°Ð½Ð¸Ðµ: %s\n" + IDS_TIME "ÐÑÐµÐ¼Ñ ÑÑÑÐ¾Ðº: %s\n" + IDS_INTERACTIVE "Interactive: %s\n" + IDS_COMMAND "ÐÐ¾Ð¼Ð°Ð½Ð´Ð°: %s\n" +END Propchange: trunk/reactos/base/applications/cmdutils/at/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc [iso-8859-1] (original) +++ trunk/reactos/media/themes/blackshade.msstyles/blackshade.rc [iso-8859-1] Sun Apr 16 20:57:30 2017 @@ -183,5 +183,9 @@ #pragma code_page(65001) -#include "lang/en-US.rc" - +#ifdef LANGUAGE_EN_US + #include "lang/en-US.rc" +#endif +#ifdef LANGUAGE_RU_RU + #include "lang/ru-RU.rc" +#endif Added: trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/themes/blackshade.ms… ============================================================================== --- trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc (added) +++ trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc [iso-8859-1] Sun Apr 16 20:57:30 2017 @@ -0,0 +1,37 @@ +LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT + +STRINGTABLE +{ +1000, "Black Shade" +} + +STRINGTABLE +{ +2000, "Black Shade" +} + +STRINGTABLE +{ +3000, "ÐÐ±ÑÑÐ½ÑÐ¹" +3001, "ÐÑÑÐ¿Ð½ÑÐ¹ ÑÑÐ¸ÑÑ" +3002, "ÐÐ³ÑÐ¾Ð¼Ð½ÑÐ¹ ÑÑÐ¸ÑÑ" +} + +STRINGTABLE +{ +4000, "ÐÐ±ÑÑÐ½ÑÐ¹" +4001, "ÐÑÑÐ¿Ð½ÑÐ¹ ÑÑÐ¸ÑÑ" +4002, "ÐÐ³ÑÐ¾Ð¼Ð½ÑÐ¹ ÑÑÐ¸ÑÑ" +} + +STRINGTABLE +{ +5000, "Black Shade" +5001, "ÐÐ¸Ð·ÑÐ°Ð»ÑÐ½ÑÐ¹ Ð¡ÑÐ¸Ð»Ñ" +5002, "ÐÐ¾Ð¼Ð°Ð½Ð´Ð° ReactOS" +5003, "ÐÐ·Ð¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ Ð¾Ñ David Quintana <gigaherz(a)gmail.com>" +5004, "ÐÑÐ¿ÑÑÐµÐ½Ñ Ð¿Ð¾Ð´ CC-BY-SA 4.0" +5005, "http://www.reactos.org" +5006, "1.0" +5007, "ÐÐ¸Ð·ÑÐ°Ð»ÑÐ½ÑÐ¹ ÑÑÐ¸Ð»Ñ Ð´Ð»Ñ ReactOS" +} Propchange: trunk/reactos/media/themes/blackshade.msstyles/lang/ru-RU.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 74332: [DESK] Added en-GB to desk.cpl. CORE-13014
by ekohl＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: ekohl Date: Sun Apr 16 20:39:37 2017 New Revision: 74332 URL: http://svn.reactos.org/svn/reactos?rev=74332&view=rev Log: [DESK] Added en-GB to desk.cpl. CORE-13014 Added: trunk/reactos/dll/cpl/desk/lang/en-GB.rc (with props) Modified: trunk/reactos/dll/cpl/desk/desk.rc Modified: trunk/reactos/dll/cpl/desk/desk.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.rc?rev=7… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.rc [iso-8859-1] Sun Apr 16 20:39:37 2017 @@ -37,6 +37,9 @@ #endif #ifdef LANGUAGE_EL_GR #include "lang/el-GR.rc" +#endif +#ifdef LANGUAGE_EN_GB + #include "lang/en-GB.rc" #endif #ifdef LANGUAGE_EN_US #include "lang/en-US.rc" Added: trunk/reactos/dll/cpl/desk/lang/en-GB.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/lang/en-GB.rc… ============================================================================== --- trunk/reactos/dll/cpl/desk/lang/en-GB.rc (added) +++ trunk/reactos/dll/cpl/desk/lang/en-GB.rc [iso-8859-1] Sun Apr 16 20:39:37 2017 @@ -0,0 +1,255 @@ +LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK + +IDD_BACKGROUND DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Background" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_BACKGROUND_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 80, 0 + CONTROL "", IDC_BACKGROUND_LIST, "SysListView32", LVS_REPORT | LVS_SINGLESEL | + LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SHOWSELALWAYS | WS_BORDER | WS_TABSTOP, 8, 114, 174, 78 + LTEXT "Select an image to use as your des&ktop wallpaper", IDC_STATIC, 8, 103, 230, 9 + PUSHBUTTON "&Browse...", IDC_BROWSE_BUTTON, 188, 114, 55, 15 + PUSHBUTTON "&Colour...", IDC_COLOR_BUTTON, 188, 177, 55, 15 + LTEXT "&Placement", IDC_STATIC, 188, 138, 55, 9 + COMBOBOX IDC_PLACEMENT_COMBO, 188, 149, 55, 54, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP +END + +IDD_SCREENSAVER DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Screensaver" +FONT 8, "MS Shell Dlg", 0, 0 +BEGIN + CONTROL "", IDC_SCREENS_PREVIEW, "Static", SS_OWNERDRAW, 70, 10, 105, 70, WS_EX_STATICEDGE + GROUPBOX "&Screensaver", IDC_SCREENS_DUMMY, 8, 92, 230, 52 + COMBOBOX IDC_SCREENS_LIST, 14, 103, 100, 100, CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "Se&ttings", IDC_SCREENS_SETTINGS, 120, 103, 50, 13, WS_GROUP + PUSHBUTTON "Pre&view", IDC_SCREENS_TESTSC, 175, 103, 50, 13 + LTEXT "&Wait", IDC_WAITTEXT, 14, 125, 20, 9 + EDITTEXT IDC_SCREENS_TIMEDELAY, 36, 123, 32, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_SCREENS_TIME, UPDOWN_CLASS, UDS_SETBUDDYINT | UDS_ALIGNRIGHT | + UDS_AUTOBUDDY | UDS_ARROWKEYS | WS_BORDER | WS_GROUP, 56, 123, 12, 13 + LTEXT "minutes", IDC_MINTEXT, 70, 125, 26, 9 + CONTROL "Ask for &password on resume", IDC_SCREENS_USEPASSCHK, "button", + BS_AUTOCHECKBOX | WS_TABSTOP, 108, 120, 117, 19 + GROUPBOX "&Energy Saving features of monitor", IDC_SCREENS_DUMMY2, 6, 155, 232, 41 + LTEXT "To adjust the power settings for your monitor, click on Power Settings.", IDC_STATIC, 14, 166, 146, 27 + PUSHBUTTON "P&ower...", IDC_SCREENS_POWER_BUTTON, 165, 171, 61, 13 +END + +IDD_APPEARANCE DIALOGEX 0, 0, 246, 234 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "&Visual Style", IDC_STATIC, 7, 130, 104, 9 + COMBOBOX IDC_APPEARANCE_VISUAL_STYLE, 7, 140, 134, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "&Colour scheme", IDC_STATIC, 7, 160, 104, 9 + COMBOBOX IDC_APPEARANCE_COLORSCHEME, 7, 170, 134, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "&Font size", IDC_STATIC, 7, 190, 104, 9 + COMBOBOX IDC_APPEARANCE_SIZE, 7, 200, 134, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + PUSHBUTTON "&Effects...", IDC_APPEARANCE_EFFECTS, 182, 150, 56, 15 + PUSHBUTTON "A&dvanced...", IDC_APPEARANCE_ADVANCED, 182, 170, 56, 15 +END + +IDD_ADVAPPEARANCE DIALOGEX 0, 0, 250, 239 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Advanced Appearance" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "", IDC_APPEARANCE_PREVIEW, "PreviewWndClass", WS_VISIBLE | WS_BORDER, 7, 7, 232, 120 + LTEXT "&Element", 8, 5, 160, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_ELEMENT, 5, 170, 130, 90, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | CBS_SORT | WS_CHILD | WS_VSCROLL | WS_TABSTOP + LTEXT "&Size", IDC_ADVAPPEARANCE_SIZE_T, 142, 160, 39, 9 + EDITTEXT IDC_ADVAPPEARANCE_SIZE_E, 142, 170, 38, 13, ES_RIGHT | WS_GROUP + CONTROL "", IDC_ADVAPPEARANCE_SIZE_UD, UPDOWN_CLASS, UDS_AUTOBUDDY | WS_BORDER | WS_GROUP | + UDS_ALIGNRIGHT | UDS_ARROWKEYS | UDS_SETBUDDYINT | WS_CHILD | WS_VISIBLE, 172, 170, 10, 13 + LTEXT "&1st Colour", IDC_ADVAPPEARANCE_COLOR1_T, 184, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR1_B, 184, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + LTEXT "&2nd Colour", IDC_ADVAPPEARANCE_COLOR2_T, 216, 160, 40, 9 + CHECKBOX "-", IDC_ADVAPPEARANCE_COLOR2_B, 216, 170, 28, 13, BS_PUSHLIKE | BS_BITMAP + LTEXT "&Font", IDC_ADVAPPEARANCE_FONT_T, 5, 190, 50, 9 + COMBOBOX IDC_ADVAPPEARANCE_FONT_C, 5, 200, 130, 90, CBS_DROPDOWN | + CBS_HASSTRINGS | CBS_SORT | WS_VSCROLL | WS_TABSTOP + LTEXT "Font Si&ze", IDC_ADVAPPEARANCE_FONTSIZE_T, 142, 190, 39, 9 + COMBOBOX IDC_ADVAPPEARANCE_FONTSIZE_E, 142, 200, 38, 200, CBS_DROPDOWN | WS_VSCROLL + LTEXT "Colou&r", IDC_ADVAPPEARANCE_FONTCOLOR_T, 184, 190, 28, 9 + CHECKBOX "", IDC_ADVAPPEARANCE_FONTCOLOR_B, 184, 200, 28, 13, BS_PUSHLIKE | BS_BITMAP + AUTOCHECKBOX "B", IDC_ADVAPPEARANCE_FONTBOLD, 216, 200, 14, 13, BS_PUSHLIKE + AUTOCHECKBOX "I ", IDC_ADVAPPEARANCE_FONTITALIC, 230, 200, 14, 13, BS_PUSHLIKE + PUSHBUTTON "Cancel", IDCANCEL, 191, 220, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 137, 220, 50, 14 +END + +IDD_EFFAPPEARANCE DIALOGEX 0, 0, 285, 185 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE +CAPTION "Effects" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "&Use the following transition effect for menus and tooltips", + IDC_EFFAPPEARANCE_ANIMATION, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 5, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_ANIMATIONTYPE, 20, 25, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "U&se the following method to smooth edges of screen fonts", IDC_EFFAPPEARANCE_SMOOTHING, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 42, 267, 19 + COMBOBOX IDC_EFFAPPEARANCE_SMOOTHINGTYPE, 20, 62, 95, 19, CBS_DROPDOWNLIST | + CBS_HASSTRINGS | WS_CHILD | WS_VSCROLL | WS_TABSTOP + CONTROL "Us&e large icons", IDC_EFFAPPEARANCE_LARGEICONS, "button", + BS_AUTOCHECKBOX | WS_TABSTOP | WS_DISABLED, 10, 80, 267, 19 + CONTROL "Show sh&adows under menus", IDC_EFFAPPEARANCE_SETDROPSHADOW, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 95, 267, 19 + CONTROL "Show &window contents while dragging", IDC_EFFAPPEARANCE_DRAGFULLWINDOWS, + "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 110, 267, 19 + CONTROL "&Hide underlined letters for keyboard navigation until I press the Alt key", + IDC_EFFAPPEARANCE_KEYBOARDCUES, "button", BS_AUTOCHECKBOX | WS_TABSTOP, 10, 125, 267, 19 + PUSHBUTTON "Cancel", IDCANCEL, 226, 165, 50, 14 + DEFPUSHBUTTON "OK", IDOK, 172, 165, 50, 14 +END + +IDD_SETTINGS DIALOGEX 0, 0, 246, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "Settings" +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Drag the monitor icons to match the physical arrangement of your monitors.", -1, 3, 3, 240, 20 + CONTROL "", IDC_SETTINGS_MONSEL, "MONITORSELWNDCLASS", WS_CHILD | WS_VISIBLE | + WS_TABSTOP, 3, 23, 240, 82, WS_EX_CLIENTEDGE + LTEXT "&Display:", 1820, 3, 107, 70, 9 + LTEXT "<none>", IDC_SETTINGS_DEVICE, 3, 116, 224, 9 + GROUPBOX "&Screen area", 1818, 3, 127, 115, 43 + CONTROL "", IDC_SETTINGS_RESOLUTION, "msctls_trackbar32", TBS_AUTOTICKS | WS_TABSTOP, 30, 137, 58, 17 + LTEXT "Less", 1815, 9, 137, 25, 9, NOT WS_GROUP + LTEXT "More", 1816, 93, 137, 20, 9, NOT WS_GROUP + LTEXT "", IDC_SETTINGS_RESOLUTION_TEXT, 10, 157, 100, 10, NOT WS_GROUP | SS_CENTER + GROUPBOX "&Colours", 1817, 125, 127, 115, 43 + COMBOBOX IDC_SETTINGS_BPP, 131, 137, 103, 80, CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP + CONTROL "", IDC_SETTINGS_SPECTRUM, "Static", SS_OWNERDRAW | SS_SUNKEN, 131, 155, 103, 9 + PUSHBUTTON "Ad&vanced...", IDC_SETTINGS_ADVANCED, 170, 174, 70, 14 +END + +IDD_ADVANCED_GENERAL DIALOGEX 0, 0, 253, 204 +STYLE DS_SHELLFONT | WS_CHILD | WS_DISABLED | WS_CAPTION +CAPTION "General" +FONT 8, "MS Shell Dlg" +BEGIN + GROUPBOX "Display:", -1, 7, 6, 237, 56, WS_GROUP + LTEXT "Font Size", -1, 14, 20, 222, 9 + COMBOBOX IDC_FONTSIZE_COMBO, 14, 30, 223, 80, CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + LTEXT "", IDC_FONTSIZE_CUSTOM, 14, 46, 223, 12 + GROUPBOX "Compatibility", -1, 7, 67, 237, 97 + LTEXT "Some programs operate improperly if you do not restart your computer after you change colour settings.\n\nAfter I change colour settings", -1, 12, 78, 228, 34 + AUTORADIOBUTTON "&Restart the computer before applying the new colour settings.", IDC_RESTART_RB, 14, 116, 228, 10 + AUTORADIOBUTTON "Apply the new colour settings without restarting.", IDC_WITHOUTREBOOT_RB, 14, 131, 228, 10 + AUTORADIOBUTTON "Ask me before applying the new colour settings.", IDC_ASKME_RB, 14, 146, 228, 10 +END + +IDR_PREVIEW_MENU MENU +BEGIN + MENUITEM "Normal", ID_MENU_NORMAL + MENUITEM "Disabled", ID_MENU_DISABLED + MENUITEM "Selected", ID_MENU_SELECTED +END + +IDM_MONITOR_MENU MENU +BEGIN + POPUP "" + BEGIN + MENUITEM "&Attached", ID_MENU_ATTACHED + MENUITEM "&Primary", ID_MENU_PRIMARY + MENUITEM SEPARATOR + MENUITEM "&Identify", ID_MENU_IDENTIFY + MENUITEM "P&roperties", ID_MENU_PROPERTIES + END +END + +STRINGTABLE +BEGIN + IDS_SLIDEEFFECT "Slide effect" + IDS_FADEEFFECT "Fade effect" +END + +STRINGTABLE +BEGIN + IDS_STANDARDEFFECT "Standard" + IDS_CLEARTYPEEFFECT "FreeType Antialiased" +END + +STRINGTABLE +BEGIN + IDS_MULTIPLEMONITORS "(Multiple Monitors)" + IDS_UNKNOWNMONITOR "(Unknown Monitor)" + IDS_ADVANCEDTITLEFMT "%s and %s" +END + +STRINGTABLE +BEGIN + IDS_CPLNAME "Display" + IDS_CPLDESCRIPTION "Customizes the desktop display and screen saver." + IDS_NONE "(None)" + IDS_CENTER "Center" + IDS_STRETCH "Stretch" + IDS_TILE "Tile" +END + +STRINGTABLE +BEGIN + IDS_COLOR_4BIT "16 Colours" + IDS_COLOR_8BIT "256 Colours" + IDS_COLOR_16BIT "High Colour (16 Bit)" + IDS_COLOR_24BIT "True Colour (24 Bit)" + IDS_COLOR_32BIT "True Colour (32 Bit)" + IDS_PIXEL "%lux%lu pixels" +END + +STRINGTABLE +BEGIN + IDS_BACKGROUND_COMDLG_FILTER "Pictures" +END + +STRINGTABLE +BEGIN + IDS_INACTWIN "Inactive Window" + IDS_ACTWIN "Active Window" + IDS_WINTEXT "Window Text" + IDS_MESSBOX "Message Box" + IDS_MESSTEXT "Message Text" + IDS_BUTTEXT "OK" + IDS_CLASSIC_THEME "Classic Theme" +END + +STRINGTABLE +BEGIN + IDS_ELEMENT_0 "Desktop" + IDS_ELEMENT_1 "Caption of inactive windows" + IDS_ELEMENT_2 "Border of inactive windows" + IDS_ELEMENT_3 "Caption of active windows" + IDS_ELEMENT_4 "Border of active windows" + IDS_ELEMENT_5 "Menu" + IDS_ELEMENT_6 "Selected Items" + IDS_ELEMENT_7 "Windows" + IDS_ELEMENT_8 "Scrollbars" + IDS_ELEMENT_9 "3D objects" + IDS_ELEMENT_10 "Palette title" + IDS_ELEMENT_11 "Caption bar buttons" + IDS_ELEMENT_12 "Dialog" + IDS_ELEMENT_13 "Application background" + IDS_ELEMENT_14 "Icon distance (horizontal)" + IDS_ELEMENT_15 "Icon distance (vertical)" + IDS_ELEMENT_16 "Quickinfo" + IDS_ELEMENT_17 "Icon" +// IDS_ELEMENT_18 "Deactivated menu elements" +END + +STRINGTABLE +BEGIN + IDS_DISPLAY_SETTINGS "Display settings" + IDS_APPLY_FAILED "Failed to apply new settings..." + IDS_APPLY_NEEDS_RESTART "You need to restart your computer to apply changes." +END Propchange: trunk/reactos/dll/cpl/desk/lang/en-GB.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[ekohl] 74331: [USETUP] base/setup/usetup/it-IT translation patch. CORE-12999 #resolve #comment Thanks a lot!
by ekohl＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: ekohl Date: Sun Apr 16 20:22:03 2017 New Revision: 74331 URL: http://svn.reactos.org/svn/reactos?rev=74331&view=rev Log: [USETUP] base/setup/usetup/it-IT translation patch. CORE-12999 #resolve #comment Thanks a lot! Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h Modified: trunk/reactos/base/setup/usetup/lang/it-IT.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/it-… ============================================================================== --- trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/lang/it-IT.h [iso-8859-1] Sun Apr 16 20:22:03 2017 @@ -595,7 +595,7 @@ { 10, 9, - "tutti i CD-ROMs dalle unit.", + "Tutti i CD-ROMs dalle unità.", TEXT_STYLE_NORMAL }, { @@ -797,20 +797,19 @@ { 8, 15, - "\x07 Press P to create a primary partition.", -// "\x07 Premere C per creare una nuova partizione.", + "\x07 Premere P per creare una nuova partizione.", TEXT_STYLE_NORMAL }, { 8, 17, - "\x07 Press E to create an extended partition.", + "\x07 Premere E per creare una partizione estesa.", TEXT_STYLE_NORMAL }, { 8, 19, - "\x07 Press L to create a logical partition.", + "\x07 Premere L per creare una partizione logica.", TEXT_STYLE_NORMAL }, { @@ -844,79 +843,79 @@ { 6, 8, - "You have chosen to delete the system partition.", + "Hai scelto di eliminare la partizione di sistema.", TEXT_STYLE_NORMAL }, { 6, 10, - "System partitions can contain diagnostic programs, hardware configuration", + "Le partizioni di sistema possono contenere i programmi diagnostici, configurazione hardware", TEXT_STYLE_NORMAL }, { 6, 11, - "programs, programs to start an operating system (like ReactOS) or other", + "Programmi utilizzati per l'avvio di un sistema operativo (come ReactOS) o altri.", TEXT_STYLE_NORMAL }, { 6, 12, - "programs provided by the hardware manufacturer.", + "Programmi forniti dal produttore dell'hardware.", TEXT_STYLE_NORMAL }, { 6, 14, - "Delete a system partition only when you are sure that there are no such", + "Elimina una partizione di sistema solo quando sei sicuro che non ci siano", TEXT_STYLE_NORMAL }, { 6, 15, - "programs on the partition, or when you are sure you want to delete them.", + "programmi sulla partizione, o quando sei sicuro di eliminarla.", TEXT_STYLE_NORMAL }, { 6, 16, - "When you delete the partition, you might not be able to boot the", + "Cancellando una partizione, non sarÃ piÃ¹ possibile avviare", TEXT_STYLE_NORMAL }, { 6, 17, - "computer from the harddisk until you finished the ReactOS Setup.", + "il computer dall'harddisk fino al termine del setup di ReactOS.", TEXT_STYLE_NORMAL }, { 8, 20, - "\x07 Press ENTER to delete the system partition. You will be asked", + "\x07 Primere INVIO per eliminare una partizione di sistema. Ti sarÃ chiesto", TEXT_STYLE_NORMAL }, { 8, 21, - " to confirm the deletion of the partition again later.", + " di confermare ancora l'eliminazione della partizione.", TEXT_STYLE_NORMAL }, { 8, 24, - "\x07 Press ESC to return to the previous page. The partition will", + "\x07 Premere ESC per ritornare alla pagina precedente. La partizione", TEXT_STYLE_NORMAL }, { 8, 25, - " not be deleted.", - TEXT_STYLE_NORMAL - }, - { - 0, - 0, - "ENTER=Continue ESC=Cancel", + " non verrÃ cancellata.", + TEXT_STYLE_NORMAL + }, + { + 0, + 0, + "INVIO=Continua ESC=Annulla", TEXT_TYPE_STATUS | TEXT_PADDING_BIG }, { @@ -1365,7 +1364,7 @@ { { // NOT_AN_ERROR - "Success\n" + "Successo\n" }, { //ERROR_NOT_INSTALLED @@ -1573,37 +1572,37 @@ }, { //ERROR_DIRECTORY_NAME, - "Invalid directory name.\n" + "Nome della cartella non valido.\n" "\n" - " * Press any key to continue." + " * Premere un tasto qualsiasi per continuare." }, { //ERROR_INSUFFICIENT_PARTITION_SIZE, - "The selected partition is not large enough to install ReactOS.\n" - "The install partition must have a size of at least %lu MB.\n" + "Spazio nella partizione insufficiente per installare ReactOS.\n" + "La partizione deve avere una dimensione di almeno %lu MB.\n" "\n" " * Premere un tasto qualsiasi per continuare.", NULL }, { //ERROR_PARTITION_TABLE_FULL, - "You can not create a new primary or extended partition in the\n" - "partition table of this disk because the partition table is full.\n" + "Non Ã¨ possibile creare una partizione primaria o secondaria nella\n" + "tabella delle partizioni del disco perchÃ¨ questa Ã¨ piena.\n" "\n" - " * Press any key to continue." + " * Premere un tasto qualsiasi per continuare." }, { //ERROR_ONLY_ONE_EXTENDED, - "You can not create more than one extended partition per disk.\n" + "Impossibile creare piÃ¹ di una partizione primaria per disco.\n" "\n" - " * Press any key to continue." + " * Premere un tasto qualsiasi per continuare." }, { //ERROR_FORMATTING_PARTITION, - "Setup is unable to format the partition:\n" + "Setup non Ã¨ riuscito a formattare la partizione:\n" " %S\n" "\n" - "ENTER = Reboot computer" + "ENTER = Riavvia il computer" }, { NULL, @@ -1720,23 +1719,21 @@ {STRING_PLEASEWAIT, " Attendere..."}, {STRING_INSTALLCREATEPARTITION, - " ENTER = Install P = Create Primary E = Create Extended F3 = Quit"}, -// " INVIO = Installa C = Crea Partizione F3 = Esci"}, + " INVIO = Installa P = Crea Partizione E = Crea Partizione Estesa F3 = Esci"}, {STRING_INSTALLCREATELOGICAL, - " ENTER = Install L = Create Logical Partition F3 = Quit"}, + " INVIO = Installa L = Crea Partizione Lgica F3 = Esci"}, {STRING_INSTALLDELETEPARTITION, " INVIO = Installa D = Rimuovi Partizione F3 = Esci"}, {STRING_DELETEPARTITION, - " D = Delete Partition F3 = Quit"}, + " D = Elimina Partizione F3 = Esci"}, {STRING_PARTITIONSIZE, "Dimensione della nuova partizione:"}, {STRING_CHOOSENEWPARTITION, - "You have chosen to create a primary partition on"}, -// "Avete scelto di creare una nuova partizione su"}, + "Si Ã¨ scelto di creare una nuova partizione primaria su"}, {STRING_CHOOSE_NEW_EXTENDED_PARTITION, - "You have chosen to create an extended partition on"}, + "Si Ã¨ scelto di creare una nuova partizione estesa su"}, {STRING_CHOOSE_NEW_LOGICAL_PARTITION, - "You have chosen to create a logical partition on"}, + "Si Ã¨ scelto di creare una nuova partizione logica su"}, {STRING_HDDSIZE, "Indicare la dimensione della nuova partizione in megabyte."}, {STRING_CREATEPARTITION, @@ -1746,9 +1743,9 @@ {STRING_NONFORMATTEDPART, "Avete scelto di installare ReactOS su una partizione nuova o non formattata."}, {STRING_NONFORMATTEDSYSTEMPART, - "The system partition is not formatted yet."}, + "La partizione di sistema non Ã¨ stata ancora formattata."}, {STRING_NONFORMATTEDOTHERPART, - "The new partition is not formatted yet."}, + "La nuova partizione non Ã¨ stata ancora formattata."}, {STRING_INSTALLONPART, "Setup installer ReactOS sulla partitione"}, {STRING_CHECKINGPART,

1 0

[gadamopoulos] 74330: [SHLWAPI_UNDOC.H] -Fix definition of IUnknown_SetOwner.
by gadamopoulos＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: gadamopoulos Date: Sun Apr 16 19:35:19 2017 New Revision: 74330 URL: http://svn.reactos.org/svn/reactos?rev=74330&view=rev Log: [SHLWAPI_UNDOC.H] -Fix definition of IUnknown_SetOwner. Modified: trunk/reactos/sdk/include/reactos/shlwapi_undoc.h Modified: trunk/reactos/sdk/include/reactos/shlwapi_undoc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/include/reactos/shlwap… ============================================================================== --- trunk/reactos/sdk/include/reactos/shlwapi_undoc.h [iso-8859-1] (original) +++ trunk/reactos/sdk/include/reactos/shlwapi_undoc.h [iso-8859-1] Sun Apr 16 19:35:19 2017 @@ -103,7 +103,7 @@ #define SHCreateWorkerWindow SHCreateWorkerWindowA #endif -HRESULT WINAPI IUnknown_SetOwner(IUnknown *pUnk, ULONG arg); +HRESULT WINAPI IUnknown_SetOwner(IUnknown *iface, IUnknown *pUnk); HRESULT WINAPI IUnknown_GetClassID(IUnknown *lpUnknown, CLSID *lpClassId); HRESULT WINAPI IUnknown_QueryServiceExec(IUnknown *lpUnknown, REFIID service, const GUID *group, DWORD cmdId, DWORD cmdOpt, VARIANT *pIn, VARIANT *pOut); HRESULT WINAPI IUnknown_UIActivateIO(IUnknown *unknown, BOOL activate, LPMSG msg);

1 0

[gadamopoulos] 74329: [EXPLORER] -If rshell is present and CBandSiteMenu_CreateInstance or CBandSite_CreateInstance are exported, use them instead of using the one provided by the system. Now we ca...
by gadamopoulos＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: gadamopoulos Date: Sun Apr 16 19:29:27 2017 New Revision: 74329 URL: http://svn.reactos.org/svn/reactos?rev=74329&view=rev Log: [EXPLORER] -If rshell is present and CBandSiteMenu_CreateInstance or CBandSite_CreateInstance are exported, use them instead of using the one provided by the system. Now we can start developing CBandSite and CBandSiteMenu on windows to implement support for taskbar toolbars. Modified: trunk/reactos/base/shell/explorer/explorer.cpp trunk/reactos/base/shell/explorer/precomp.h trunk/reactos/base/shell/explorer/rshell.cpp trunk/reactos/base/shell/explorer/tbsite.cpp Modified: trunk/reactos/base/shell/explorer/explorer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… ============================================================================== --- trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/explorer.cpp [iso-8859-1] Sun Apr 16 19:29:27 2017 @@ -205,6 +205,8 @@ */ SetProcessShutdownParameters(2, 0); + InitRSHELL(); + #if !WIN7_COMPAT_MODE BOOL CreateShellDesktop = FALSE; Modified: trunk/reactos/base/shell/explorer/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/precom… ============================================================================== --- trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/precomp.h [iso-8859-1] Sun Apr 16 19:29:27 2017 @@ -108,11 +108,14 @@ * rshell.c */ +VOID InitRSHELL(VOID); HRESULT WINAPI _CStartMenu_Constructor(REFIID riid, void **ppv); HANDLE WINAPI _SHCreateDesktop(IShellDesktopTray *ShellDesk); BOOL WINAPI _SHDesktopMessageLoop(HANDLE hDesktop); DWORD WINAPI _WinList_Init(void); void WINAPI _ShellDDEInit(BOOL bInit); +HRESULT WINAPI _CBandSiteMenu_CreateInstance(REFIID riid, void **ppv); +HRESULT WINAPI _CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv); /* * traywnd.c Modified: trunk/reactos/base/shell/explorer/rshell.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/rshell… ============================================================================== --- trunk/reactos/base/shell/explorer/rshell.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/rshell.cpp [iso-8859-1] Sun Apr 16 19:29:27 2017 @@ -20,20 +20,20 @@ #include "precomp.h" -static HINSTANCE hRShell = NULL; +static HINSTANCE ghRShell = NULL; typedef HRESULT(WINAPI * PSTARTMENU_CONSTRUCTOR)(REFIID riid, void **ppv); +VOID InitRSHELL(VOID) +{ + ghRShell = LoadLibraryW(L"rshell.dll"); +} + HRESULT WINAPI _CStartMenu_Constructor(REFIID riid, void **ppv) { - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PSTARTMENU_CONSTRUCTOR func = (PSTARTMENU_CONSTRUCTOR)GetProcAddress(hRShell, "CStartMenu_Constructor"); + if (ghRShell) + { + PSTARTMENU_CONSTRUCTOR func = (PSTARTMENU_CONSTRUCTOR)GetProcAddress(ghRShell, "CStartMenu_Constructor"); if (func) { return func(riid, ppv); @@ -44,7 +44,7 @@ NULL, CLSCTX_INPROC_SERVER, riid, - ppv); + ppv); } typedef HANDLE(WINAPI * PSHCREATEDESKTOP)(IShellDesktopTray *ShellDesk); @@ -53,14 +53,9 @@ { HINSTANCE hFallback; - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PSHCREATEDESKTOP func = (PSHCREATEDESKTOP)GetProcAddress(hRShell, "SHCreateDesktop"); + if (ghRShell) + { + PSHCREATEDESKTOP func = (PSHCREATEDESKTOP)GetProcAddress(ghRShell, "SHCreateDesktop"); if (func) { return func(ShellDesk); @@ -87,14 +82,9 @@ { HINSTANCE hFallback; - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PSHDESKTOPMESSAGELOOP func = (PSHDESKTOPMESSAGELOOP)GetProcAddress(hRShell, "SHDesktopMessageLoop"); + if (ghRShell) + { + PSHDESKTOPMESSAGELOOP func = (PSHDESKTOPMESSAGELOOP)GetProcAddress(ghRShell, "SHDesktopMessageLoop"); if (func) { return func(hDesktop); @@ -121,14 +111,9 @@ { HINSTANCE hFallback; - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PWINLIST_INIT func = (PWINLIST_INIT)GetProcAddress(hRShell, "WinList_Init"); + if (ghRShell) + { + PWINLIST_INIT func = (PWINLIST_INIT)GetProcAddress(ghRShell, "WinList_Init"); if (func) { return func(); @@ -155,14 +140,9 @@ { HINSTANCE hFallback; - if (!hRShell) - { - hRShell = LoadLibraryW(L"rshell.dll"); - } - - if (hRShell) - { - PSHELLDDEINIT func = (PSHELLDDEINIT)GetProcAddress(hRShell, "ShellDDEInit"); + if (ghRShell) + { + PSHELLDDEINIT func = (PSHELLDDEINIT)GetProcAddress(ghRShell, "ShellDDEInit"); if (func) { func(bInit); @@ -182,3 +162,42 @@ } } } + +typedef HRESULT (WINAPI *CBANDSITEMENU_CREATEINSTANCE)(REFIID riid, void **ppv); +HRESULT WINAPI _CBandSiteMenu_CreateInstance(REFIID riid, void **ppv) +{ + if (ghRShell) + { + CBANDSITEMENU_CREATEINSTANCE func = (CBANDSITEMENU_CREATEINSTANCE)GetProcAddress(ghRShell, "CBandSiteMenu_CreateInstance"); + if (func) + { + return func(riid, ppv); + } + } + + return CoCreateInstance(CLSID_BandSiteMenu, + NULL, + CLSCTX_INPROC_SERVER, + riid, + ppv); +} + +typedef HRESULT (WINAPI *CBANDSITE_CREATEINSTANCE)(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv); +HRESULT WINAPI _CBandSite_CreateInstance(LPUNKNOWN pUnkOuter, REFIID riid, void **ppv) +{ + if (ghRShell) + { + CBANDSITE_CREATEINSTANCE func = (CBANDSITE_CREATEINSTANCE)GetProcAddress(ghRShell, "CBandSite_CreateInstance"); + if (func) + { + return func(pUnkOuter, riid, ppv); + } + } + + return CoCreateInstance(CLSID_RebarBandSite, + pUnkOuter, + CLSCTX_INPROC_SERVER, + riid, + ppv); +} + Modified: trunk/reactos/base/shell/explorer/tbsite.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tbsite… ============================================================================== --- trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] (original) +++ trunk/reactos/base/shell/explorer/tbsite.cpp [iso-8859-1] Sun Apr 16 19:29:27 2017 @@ -285,26 +285,17 @@ IN UINT uFlags, OUT IContextMenu **ppcm) { + HRESULT hRet; + if (m_ContextMenu == NULL) { - HRESULT hRet; - CComPtr<IShellService> pSs; - /* Cache the context menu so we don't need to CoCreateInstance all the time... */ - hRet = CoCreateInstance(CLSID_BandSiteMenu, NULL, CLSCTX_INPROC_SERVER, IID_PPV_ARG(IShellService, &pSs)); - TRACE("CoCreateInstance(CLSID_BandSiteMenu) for IShellService returned: 0x%x\n", hRet); - if (!SUCCEEDED(hRet)) + hRet = _CBandSiteMenu_CreateInstance(IID_PPV_ARG(IContextMenu, &m_ContextMenu)); + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; - hRet = pSs->SetOwner((IBandSite*)this); - if (!SUCCEEDED(hRet)) - { - return hRet; - } - - hRet = pSs->QueryInterface(IID_PPV_ARG(IContextMenu, &m_ContextMenu)); - - if (!SUCCEEDED(hRet)) + hRet = IUnknown_SetOwner(m_ContextMenu, (IBandSite*)this); + if (FAILED_UNEXPECTEDLY(hRet)) return hRet; } @@ -315,7 +306,11 @@ } /* Add the menu items */ - return m_ContextMenu->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + hRet = m_ContextMenu->QueryContextMenu(hmenu, indexMenu, idCmdFirst, idCmdLast, uFlags); + if (FAILED_UNEXPECTEDLY(hRet)) + return hRet; + + return S_OK; } virtual HRESULT STDMETHODCALLTYPE Lock(IN BOOL bLock) @@ -643,10 +638,7 @@ m_TaskBand = pTaskBand; /* Create the RebarBandSite */ - hRet = CoCreateInstance(CLSID_RebarBandSite, - static_cast<IBandSite*>(this), - CLSCTX_INPROC_SERVER, - IID_PPV_ARG(IUnknown, &m_Inner)); + hRet = _CBandSite_CreateInstance(static_cast<IBandSite*>(this), IID_PPV_ARG(IUnknown, &m_Inner)); if (FAILED_UNEXPECTEDLY(hRet)) return hRet;

1 0

[cfinck] 74328: Fix GCC build, part 4/X (losing my optimism)
by cfinck＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: cfinck Date: Sun Apr 16 15:51:44 2017 New Revision: 74328 URL: http://svn.reactos.org/svn/reactos?rev=74328&view=rev Log: Fix GCC build, part 4/X (losing my optimism) Modified: trunk/rostests/apitests/spoolss/PackStrings.c Modified: trunk/rostests/apitests/spoolss/PackStrings.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/spoolss/PackStri… ============================================================================== --- trunk/rostests/apitests/spoolss/PackStrings.c [iso-8859-1] (original) +++ trunk/rostests/apitests/spoolss/PackStrings.c [iso-8859-1] Sun Apr 16 15:51:44 2017 @@ -2,7 +2,7 @@ * PROJECT: ReactOS Spooler Router API Tests * LICENSE: GNU GPLv2 or any later version as published by the Free Software Foundation * PURPOSE: Tests for PackStrings - * COPYRIGHT: Copyright 2015 Colin Finck <colin(a)reactos.org> + * COPYRIGHT: Copyright 2015-2017 Colin Finck <colin(a)reactos.org> */ #include <apitest.h> @@ -21,8 +21,8 @@ START_TEST(PackStrings) { - PCWSTR Source1[] = { L"Test", L"String" }; - PCWSTR Source2[] = { L"Test", NULL }; + PWSTR Source1[] = { L"Test", L"String" }; + PWSTR Source2[] = { L"Test", NULL }; BYTE Buffer[50]; PBYTE pEnd;

1 0

[cfinck] 74327: Fix GCC build (3/3) :)
by cfinck＠svn.reactos.org 16 Apr '17

16 Apr '17

Author: cfinck Date: Sun Apr 16 15:44:22 2017 New Revision: 74327 URL: http://svn.reactos.org/svn/reactos?rev=74327&view=rev Log: Fix GCC build (3/3) :) Modified: trunk/reactos/win32ss/printing/processors/winprint/main.c Modified: trunk/reactos/win32ss/printing/processors/winprint/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/printing/processor… ============================================================================== --- trunk/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/printing/processors/winprint/main.c [iso-8859-1] Sun Apr 16 15:44:22 2017 @@ -8,7 +8,7 @@ #include "precomp.h" // Local Constants -static PCWSTR _pwszDatatypes[] = { +static PWSTR _pwszDatatypes[] = { L"RAW", 0 }; @@ -114,7 +114,7 @@ DWORD dwDatatypeCount = 0; DWORD dwErrorCode; DWORD dwOffsets[_countof(_pwszDatatypes)]; - PCWSTR* pCurrentDatatype; + PWSTR* pCurrentDatatype; PDWORD pCurrentOffset = dwOffsets; TRACE("EnumPrintProcessorDatatypesW(%S, %S, %lu, %p, %lu, %p, %p)\n", pName, pPrintProcessorName, Level, pDatatypes, cbBuf, pcbNeeded, pcReturned);

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
18
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs April 2017