Ros-diffs November 2016

ros-diffs@reactos.org

15 participants
317 discussions

[gadamopoulos] 73140: [SHELL32] - Make most dll dependencies to be delay loaded just like windows.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Nov 5 17:04:15 2016 New Revision: 73140 URL: http://svn.reactos.org/svn/reactos?rev=73140&view=rev Log: [SHELL32] - Make most dll dependencies to be delay loaded just like windows. Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sat Nov 5 17:04:15 2016 @@ -105,8 +105,8 @@ set_module_type(shell32 win32dll UNICODE) target_link_libraries(shell32 shellmenu shelldesktop atlnew wine uuid recyclebin) -add_delay_importlibs(shell32 uxtheme ole32 oleaut32 userenv version fmifs) -add_importlibs(shell32 advapi32 browseui gdi32 user32 powrprof comctl32 comdlg32 shdocvw shlwapi devmgr winspool winmm mpr msvcrt kernel32 ntdll) +add_delay_importlibs(shell32 powrprof shdocvw devmgr winspool winmm mpr uxtheme ole32 oleaut32 userenv browseui version fmifs) +add_importlibs(shell32 advapi32 gdi32 user32 comctl32 comdlg32 shlwapi msvcrt kernel32 ntdll) add_dependencies(shell32 stdole2) # shell32_shldisp.tlb needs stdole2.tlb add_pch(shell32 precomp.h SOURCE) add_cd_file(TARGET shell32 DESTINATION reactos/system32 FOR all)

7 years, 11 months

[gadamopoulos] 73139: [SHELL32] - Add missing resource strings for the description of some shell folders.

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Nov 5 16:45:41 2016 New Revision: 73139 URL: http://svn.reactos.org/svn/reactos?rev=73139&view=rev Log: [SHELL32] - Add missing resource strings for the description of some shell folders. 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/en-US.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/ru-RU.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 trunk/reactos/dll/win32/shell32/shresdef.h 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "ÐÑÐ¸Ð»Ð¾ Ð·Ð° ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ" IDS_ADMINISTRATIVETOOLS "Ð£Ð¿ÑÐ°Ð²Ð½Ð¸ÑÐµÑÐºÐ¸ ÑÑÐµÐ´ÑÑÐ²Ð°" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&ÐÐ¾Ð»ÐµÐ¼Ð¸ Ð·Ð½Ð°ÑÐµÑÐ°" IDS_VIEW_SMALL "&ÐÐ°Ð»ÐºÐ¸ Ð·Ð½Ð°ÑÐµÑÐ°" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" 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] Sat Nov 5 16:45:41 2016 @@ -673,6 +673,12 @@ IDS_CONTROLPANEL "OvlÃ¡dacÃ panely" IDS_ADMINISTRATIVETOOLS "NÃ¡stroje sprÃ¡vy" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&Vedle sebe" IDS_VIEW_SMALL "&Ikony" 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] Sat Nov 5 16:45:41 2016 @@ -673,6 +673,12 @@ IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Sto&re Ikoner" IDS_VIEW_SMALL "S&mÃ¥ Ikoner" 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] Sat Nov 5 16:45:41 2016 @@ -668,6 +668,12 @@ IDS_CONTROLPANEL "Systemsteuerung" IDS_ADMINISTRATIVETOOLS "Verwaltung" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&GroÃe Symbole" IDS_VIEW_SMALL "&Kleine Symbole" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Î Î¯Î½Î±ÎºÎ±Ï ÎµÎ»ÎÎ³ÏÎ¿Ï" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&ÎÎµÎ³Î¬Î»Î± ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î±" IDS_VIEW_SMALL "Î&Î¹ÎºÏÎ¬ ÎµÎ¹ÎºÎ¿Î½Î¯Î´Î¹Î±" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" 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] Sat Nov 5 16:45:41 2016 @@ -669,6 +669,12 @@ IDS_CONTROLPANEL "Panel de control" IDS_ADMINISTRATIVETOOLS "Herramientas administrativas" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Iconos &grandes" IDS_VIEW_SMALL "Iconos &pequeÃ±os" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&Suuret Kuvakkeet" IDS_VIEW_SMALL "&Pienet Kuvakkeet" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Panneau de configuration" IDS_ADMINISTRATIVETOOLS "Outils d'administration" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&Grandes icÃ´nes" IDS_VIEW_SMALL "&Petites icÃ´nes" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "××× ×××§×¨×" IDS_ADMINISTRATIVETOOLS "××× × ××××" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "×¡×××× ××××××" IDS_VIEW_SMALL "×¡×××× ×§×× ××" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Nagy kÃ©pek" IDS_VIEW_SMALL "Kis kÃ©pek" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Pannello di controllo" IDS_ADMINISTRATIVETOOLS "Strumenti di amministrazione" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&Icone Grandi" IDS_VIEW_SMALL "I&cone Piccole" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "ã³ã³ããã¼ã« ããã«" IDS_ADMINISTRATIVETOOLS "ç®¡çãã¼ã«" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "å¤§ããã¢ã¤ã³ã³(&G)" IDS_VIEW_SMALL "å°ããã¢ã¤ã³ã³(&M)" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Kontrollpanel" IDS_ADMINISTRATIVETOOLS "Administrative verktÃ¸y" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&Store ikoner" IDS_VIEW_SMALL "S&mÃ¥ ikoner" 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] Sat Nov 5 16:45:41 2016 @@ -671,6 +671,12 @@ IDS_CONTROLPANEL "Panel sterowania" IDS_ADMINISTRATIVETOOLS "NarzÄdzia administracyjne" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&DuÅ¼e Ikony" IDS_VIEW_SMALL "&MaÅe Ikony" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Painel de Controle" IDS_ADMINISTRATIVETOOLS "Ferramentas Administrativas" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Ãcones &Grandes" IDS_VIEW_SMALL "Ãcones &Pequenos" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Painel de Controlo" IDS_ADMINISTRATIVETOOLS "Ferramentas Administrativas" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Ãcones &grandes" IDS_VIEW_SMALL "Ãcones &pequenos" 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] Sat Nov 5 16:45:41 2016 @@ -669,6 +669,12 @@ IDS_CONTROLPANEL "Panoul de control" IDS_ADMINISTRATIVETOOLS "Instrumente administrative" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "D&ale" IDS_VIEW_SMALL "&Pictograme" 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] Sat Nov 5 16:45:41 2016 @@ -669,6 +669,12 @@ IDS_CONTROLPANEL "ÐÐ°Ð½ÐµÐ»Ñ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ" IDS_ADMINISTRATIVETOOLS "ÐÐ´Ð¼Ð¸Ð½Ð¸ÑÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð¸Ðµ" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¿Ð°ÑÐ°Ð¼ÐµÑÑÐ¾Ð² ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð²Ð°ÑÐµÐ³Ð¾ ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐ°." + IDS_FOLDER_OPTIONS_DESCRIPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ° Ð¾ÑÐ¾Ð±ÑÐ°Ð¶ÐµÐ½Ð¸Ñ ÑÐ°Ð¹Ð»Ð¾Ð² Ð¸ Ð¿Ð°Ð¿Ð¾Ðº Ð¸ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ ÑÐ¾Ð¿Ð¾ÑÑÐ°Ð²Ð»ÐµÐ½Ð¸Ð¹ ÑÐ°Ð¹Ð»Ð¾Ð²." + IDS_FONTS_DESCRIPTION "ÐÐ¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ðµ, Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð¸ ÑÐ¿ÑÐ°Ð²Ð»ÐµÐ½Ð¸Ðµ ÑÑÐ¸ÑÑÐ°Ð¼Ð¸ Ð½Ð° ÐºÐ¾Ð¼Ð¿ÑÑÑÐµÑÐµ." + IDS_PRINTERS_DESCRIPTION "ÐÐ¾ÐºÐ°Ð·ÑÐ²Ð°ÐµÑ ÑÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½ÑÐµ Ð¿ÑÐ¸Ð½ÑÐµÑÑ Ð¸ ÑÐ°ÐºÑÑ Ð¸ Ð¿Ð¾Ð¼Ð¾Ð¶ÐµÑ Ð²Ð°Ð¼ Ð´Ð¾Ð±Ð°Ð²Ð¸ÑÑ Ð½Ð¾Ð²ÑÐµ." + /* context menus */ IDS_VIEW_LARGE "&ÐÐ¾Ð»ÑÑÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸" IDS_VIEW_SMALL "&ÐÐµÐ»ÐºÐ¸Ðµ Ð·Ð½Ð°ÑÐºÐ¸" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "OvlÃ¡dacÃ panel" IDS_ADMINISTRATIVETOOLS "NÃ¡stroje na sprÃ¡vu" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&VeÄ¾kÃ© ikony" IDS_VIEW_SMALL "&MalÃ© ikony" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Control Panel" IDS_ADMINISTRATIVETOOLS "Administrative Tools" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Lar&ge Icons" IDS_VIEW_SMALL "S&mall Icons" 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] Sat Nov 5 16:45:41 2016 @@ -671,6 +671,12 @@ IDS_CONTROLPANEL "Paneli Kontrollit" IDS_ADMINISTRATIVETOOLS "Vegla Administrative" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Ikonat e mÃ«dha" IDS_VIEW_SMALL "Ikonat e vogla" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "Kontrollpanelen" IDS_ADMINISTRATIVETOOLS "Administrativa verktyg" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "Sto&ra ikoner" IDS_VIEW_SMALL "S&mÃ¥ ikoner" 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] Sat Nov 5 16:45:41 2016 @@ -669,6 +669,12 @@ IDS_CONTROLPANEL "Denetim MasasÄ±" IDS_ADMINISTRATIVETOOLS "YÃ¶netim AraÃ§larÄ±" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&BÃ¼yÃ¼k Simgeler" IDS_VIEW_SMALL "&KÃ¼Ã§Ã¼k Simgeler" 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] Sat Nov 5 16:45:41 2016 @@ -667,6 +667,12 @@ IDS_CONTROLPANEL "ÐÐ°Ð½ÐµÐ»Ñ ÐºÐµÑÑÐ²Ð°Ð½Ð½Ñ" IDS_ADMINISTRATIVETOOLS "ÐÐ´Ð¼ÑÐ½ÑÑÑÑÑÐ²Ð°Ð½Ð½Ñ" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "&ÐÐµÐ»Ð¸ÐºÑ Ð·Ð½Ð°ÑÐºÐ¸" IDS_VIEW_SMALL "&ÐÑÑÐ±Ð½Ñ Ð·Ð½Ð°ÑÐºÐ¸" 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] Sat Nov 5 16:45:41 2016 @@ -674,6 +674,12 @@ IDS_CONTROLPANEL "æ§å¶é¢æ¿" IDS_ADMINISTRATIVETOOLS "ç®¡çå·¥å·" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "å¤§å¾æ (&G)" IDS_VIEW_SMALL "å°å¾æ (&M)" 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] Sat Nov 5 16:45:41 2016 @@ -675,6 +675,12 @@ IDS_CONTROLPANEL "æ§å¶å°" IDS_ADMINISTRATIVETOOLS "ç®¡çå·¥å·" + /* special folders descriptions */ + IDS_ADMINISTRATIVETOOLS_DESCRIPTION "Configure administrative settings for your computer." + IDS_FOLDER_OPTIONS_DESCRIPTION "Customize the display of files and folders and change file associations." + IDS_FONTS_DESCRIPTION "Add, change, and manage fonts on your computer." + IDS_PRINTERS_DESCRIPTION "Shows installed printers and fax printers and helps you add new ones." + /* context menus */ IDS_VIEW_LARGE "å¤§åç¤º(&G)" IDS_VIEW_SMALL "å°åç¤º(&M)" Modified: trunk/reactos/dll/win32/shell32/shresdef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shresdef… ============================================================================== --- trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shresdef.h [iso-8859-1] Sat Nov 5 16:45:41 2016 @@ -222,6 +222,10 @@ /* Note: those strings are referenced from the registry */ #define IDS_RECYCLEBIN_FOLDER_NAME 8964 +#define IDS_PRINTERS_DESCRIPTION 12696 +#define IDS_FONTS_DESCRIPTION 22920 +#define IDS_ADMINISTRATIVETOOLS_DESCRIPTION 22921 +#define IDS_FOLDER_OPTIONS_DESCRIPTION 22924 #define IDS_ADMINISTRATIVETOOLS 22982 #define IDS_FOLDER_OPTIONS 22985 #define IDS_FONTS 22981

7 years, 11 months

[janderwald] 73138: [USBAUDIO] - store remaining audio bytes in a common buffer, which will be sent on next request - fixes some of audio distortion issues

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Nov 5 16:38:59 2016 New Revision: 73138 URL: http://svn.reactos.org/svn/reactos?rev=73138&view=rev Log: [USBAUDIO] - store remaining audio bytes in a common buffer, which will be sent on next request - fixes some of audio distortion issues Modified: trunk/reactos/drivers/usb/usbaudio/pin.c trunk/reactos/drivers/usb/usbaudio/usbaudio.c trunk/reactos/drivers/usb/usbaudio/usbaudio.h Modified: trunk/reactos/drivers/usb/usbaudio/pin.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/pin.c… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/pin.c [iso-8859-1] Sat Nov 5 16:38:59 2016 @@ -308,7 +308,73 @@ } while (Count); } - +NTSTATUS +RenderInitializeUrbAndIrp( + IN PKSPIN Pin, + IN PPIN_CONTEXT PinContext, + IN OUT PIRP Irp, + IN PVOID TransferBuffer, + IN ULONG TransferBufferSize, + IN ULONG PacketSize) +{ + ULONG Index, PacketCount; + PURB Urb; + PIO_STACK_LOCATION IoStack; + + /* initialize irp */ + IoInitializeIrp(Irp, IoSizeOfIrp(PinContext->DeviceExtension->LowerDevice->StackSize), PinContext->DeviceExtension->LowerDevice->StackSize); + + /* set irp members */ + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + Irp->IoStatus.Information = 0; + Irp->Flags = 0; + Irp->UserBuffer = NULL; + + /* init stack location */ + IoStack = IoGetNextIrpStackLocation(Irp); + IoStack->DeviceObject = PinContext->DeviceExtension->LowerDevice; + IoStack->Parameters.Others.Argument2 = NULL; + IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; + IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; + + /* set completion routine */ + IoSetCompletionRoutine(Irp, UsbAudioRenderComplete, Pin, TRUE, TRUE, TRUE); + + /* calculate packet count */ + PacketCount = TransferBufferSize / PacketSize; + ASSERT(TransferBufferSize % PacketSize == 0); + + /* lets allocate urb */ + Urb = (PURB)AllocFunction(GET_ISO_URB_SIZE(PacketCount)); + if (!Urb) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* init urb */ + Urb->UrbIsochronousTransfer.Hdr.Function = URB_FUNCTION_ISOCH_TRANSFER; + Urb->UrbIsochronousTransfer.Hdr.Length = GET_ISO_URB_SIZE(PacketCount); + Urb->UrbIsochronousTransfer.PipeHandle = PinContext->DeviceExtension->InterfaceInfo->Pipes[0].PipeHandle; + Urb->UrbIsochronousTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_OUT | USBD_START_ISO_TRANSFER_ASAP; + Urb->UrbIsochronousTransfer.TransferBufferLength = TransferBufferSize; + Urb->UrbIsochronousTransfer.TransferBuffer = TransferBuffer; + Urb->UrbIsochronousTransfer.NumberOfPackets = PacketCount; + Urb->UrbIsochronousTransfer.StartFrame = 0; + + for (Index = 0; Index < PacketCount; Index++) + { + Urb->UrbIsochronousTransfer.IsoPacket[Index].Offset = Index * PacketSize; + } + + /* store urb */ + IoStack->Parameters.Others.Argument1 = Urb; + Irp->Tail.Overlay.DriverContext[0] = Urb; + + + /* done */ + return STATUS_SUCCESS; +} VOID CaptureInitializeUrbAndIrp( @@ -567,12 +633,27 @@ ULONG Index; PIRP Irp; PPIN_CONTEXT PinContext; + PKSDATAFORMAT_WAVEFORMATEX WaveFormatEx; PIO_STACK_LOCATION IoStack; DPRINT1("InitStreamPin\n"); /* get pin context */ PinContext = Pin->Context; + + /* allocate 1 sec buffer */ + WaveFormatEx = (PKSDATAFORMAT_WAVEFORMATEX)Pin->ConnectionFormat; + PinContext->Buffer = AllocFunction(WaveFormatEx->WaveFormatEx.nAvgBytesPerSec); + if (!PinContext->Buffer) + { + /* no memory */ + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* init buffer size*/ + PinContext->BufferSize = WaveFormatEx->WaveFormatEx.nAvgBytesPerSec; + PinContext->BufferOffset = 0; + PinContext->BufferLength = 0; /* init irps */ for (Index = 0; Index < 12; Index++) @@ -706,7 +787,8 @@ KIRQL OldLevel; PKSSTREAM_POINTER StreamPointerClone; NTSTATUS Status; - + PURB Urb; + /* get pin context */ Pin = Context; PinContext = Pin->Context; @@ -717,6 +799,12 @@ /* get streampointer */ StreamPointerClone = Irp->Tail.Overlay.DriverContext[1]; + /* get urb */ + Urb = Irp->Tail.Overlay.DriverContext[0]; + + /* and free it */ + FreeFunction(Urb); + /* acquire lock */ KeAcquireSpinLock(&PinContext->IrpListLock, &OldLevel); @@ -726,15 +814,18 @@ /* release lock */ KeReleaseSpinLock(&PinContext->IrpListLock, OldLevel); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status) && StreamPointerClone) { /* set status code because it failed */ - //KsStreamPointerSetStatusCode(StreamPointerClone, STATUS_DEVICE_DATA_ERROR); + KsStreamPointerSetStatusCode(StreamPointerClone, STATUS_DEVICE_DATA_ERROR); DPRINT1("UsbAudioRenderComplete failed with %x\n", Status); } - /* lets delete the stream pointer clone */ - KsStreamPointerDelete(StreamPointerClone); + if (StreamPointerClone) + { + /* lets delete the stream pointer clone */ + KsStreamPointerDelete(StreamPointerClone); + } /* done */ return STATUS_MORE_PROCESSING_REQUIRED; @@ -789,6 +880,36 @@ return STATUS_MORE_PROCESSING_REQUIRED; } +PIRP +PinGetIrpFromReadyList( + IN PKSPIN Pin) +{ + PPIN_CONTEXT PinContext; + PLIST_ENTRY CurEntry; + KIRQL OldLevel; + PIRP Irp = NULL; + + /* get pin context */ + PinContext = Pin->Context; + + /* acquire spin lock */ + KeAcquireSpinLock(&PinContext->IrpListLock, &OldLevel); + + if (!IsListEmpty(&PinContext->IrpListHead)) + { + /* remove entry from list */ + CurEntry = RemoveHeadList(&PinContext->IrpListHead); + + /* get irp offset */ + Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); + } + + /* release lock */ + KeReleaseSpinLock(&PinContext->IrpListLock, OldLevel); + + return Irp; +} + NTSTATUS PinRenderProcess( IN PKSPIN Pin) @@ -796,13 +917,10 @@ PKSSTREAM_POINTER LeadingStreamPointer; PKSSTREAM_POINTER CloneStreamPointer; NTSTATUS Status; - KIRQL OldLevel; PPIN_CONTEXT PinContext; - PURB Urb; - ULONG PacketCount, TotalPacketSize, Index; + ULONG PacketCount, TotalPacketSize, Offset; PKSDATAFORMAT_WAVEFORMATEX WaveFormatEx; - PIO_STACK_LOCATION IoStack; - PLIST_ENTRY CurEntry; + PUCHAR TransferBuffer; PIRP Irp = NULL; //DPRINT1("PinRenderProcess\n"); @@ -817,26 +935,14 @@ { Status = KsStreamPointerAdvance(LeadingStreamPointer); DPRINT1("Advancing Streampointer\n"); - } + } /* get pin context */ PinContext = Pin->Context; - /* acquire spin lock */ - KeAcquireSpinLock(&PinContext->IrpListLock, &OldLevel); - - if (!IsListEmpty(&PinContext->IrpListHead)) - { - /* remove entry from list */ - CurEntry = RemoveHeadList(&PinContext->IrpListHead); - - /* get irp offset */ - Irp = (PIRP)CONTAINING_RECORD(CurEntry, IRP, Tail.Overlay.ListEntry); - } - - /* release lock */ - KeReleaseSpinLock(&PinContext->IrpListLock, OldLevel); + /* get irp from ready list */ + Irp = PinGetIrpFromReadyList(Pin); if (!Irp) { @@ -856,65 +962,86 @@ return STATUS_SUCCESS; } - - /* initialize irp */ - IoInitializeIrp(Irp, IoSizeOfIrp(PinContext->DeviceExtension->LowerDevice->StackSize), PinContext->DeviceExtension->LowerDevice->StackSize); - - Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; - Irp->IoStatus.Information = 0; - Irp->Flags = 0; - Irp->UserBuffer = NULL; - - IoStack = IoGetNextIrpStackLocation(Irp); - IoStack->DeviceObject = PinContext->DeviceExtension->LowerDevice; - IoStack->Parameters.Others.Argument2 = NULL; - IoStack->MajorFunction = IRP_MJ_INTERNAL_DEVICE_CONTROL; - IoStack->Parameters.DeviceIoControl.IoControlCode = IOCTL_INTERNAL_USB_SUBMIT_URB; - - IoSetCompletionRoutine(Irp, UsbAudioRenderComplete, Pin, TRUE, TRUE, TRUE); - /* calculate packet count */ /* FIXME support various sample rates */ WaveFormatEx = (PKSDATAFORMAT_WAVEFORMATEX)Pin->ConnectionFormat; TotalPacketSize = WaveFormatEx->WaveFormatEx.nAvgBytesPerSec / 1000; - ASSERT(TotalPacketSize <= PinContext->DeviceExtension->InterfaceInfo->Pipes[0].MaximumPacketSize); + + /* init transfer buffer*/ + TransferBuffer = CloneStreamPointer->StreamHeader->Data; + + Offset = 0; + + /* are there bytes from previous request*/ + if (PinContext->BufferLength) + { + ASSERT(PinContext->BufferLength < TotalPacketSize); + + /* calculate offset*/ + Offset = TotalPacketSize - PinContext->BufferLength; + + if (PinContext->BufferOffset + Offset >= PinContext->BufferSize) + { + RtlMoveMemory(PinContext->Buffer, &PinContext->Buffer[PinContext->BufferOffset - PinContext->BufferLength], PinContext->BufferLength); + PinContext->BufferOffset = PinContext->BufferLength; + } + + /* copy audio bytes */ + RtlCopyMemory(&PinContext->Buffer[PinContext->BufferOffset], TransferBuffer, Offset); + + /* init irp*/ + Status = RenderInitializeUrbAndIrp(Pin, PinContext, Irp, &PinContext->Buffer[PinContext->BufferOffset-PinContext->BufferLength], TotalPacketSize, TotalPacketSize); + if (NT_SUCCESS(Status)) + { + /* render audio bytes */ + Status = IoCallDriver(PinContext->LowerDevice, Irp); + } + else + { + ASSERT(FALSE); + } + + PinContext->BufferLength = 0; + PinContext->BufferOffset += Offset; + + /* get new irp from ready list */ + Irp = PinGetIrpFromReadyList(Pin); + ASSERT(Irp); + + } /* FIXME correct MaximumPacketSize ? */ - PacketCount = CloneStreamPointer->OffsetIn.Remaining / TotalPacketSize; - - ASSERT(PacketCount < 255); - - Urb = (PURB)AllocFunction(GET_ISO_URB_SIZE(PacketCount)); - ASSERT(Urb); - - /* init urb */ - Urb->UrbIsochronousTransfer.Hdr.Function = URB_FUNCTION_ISOCH_TRANSFER; - Urb->UrbIsochronousTransfer.Hdr.Length = GET_ISO_URB_SIZE(PacketCount); - Urb->UrbIsochronousTransfer.PipeHandle = PinContext->DeviceExtension->InterfaceInfo->Pipes[0].PipeHandle; - Urb->UrbIsochronousTransfer.TransferFlags = USBD_TRANSFER_DIRECTION_OUT | USBD_START_ISO_TRANSFER_ASAP; - Urb->UrbIsochronousTransfer.TransferBufferLength = PacketCount * TotalPacketSize; - Urb->UrbIsochronousTransfer.TransferBuffer = CloneStreamPointer->StreamHeader->Data; - Urb->UrbIsochronousTransfer.NumberOfPackets = PacketCount; - Urb->UrbIsochronousTransfer.StartFrame = 0; - - for (Index = 0; Index < PacketCount; Index++) - { - Urb->UrbIsochronousTransfer.IsoPacket[Index].Offset = Index * TotalPacketSize; - } - - /* store urb */ - IoStack = IoGetNextIrpStackLocation(Irp); - IoStack->Parameters.Others.Argument1 = Urb; - - /* store in irp context */ - Irp->Tail.Overlay.DriverContext[0] = Urb; - Irp->Tail.Overlay.DriverContext[1] = CloneStreamPointer; - - Status = IoCallDriver(PinContext->LowerDevice, Irp); + PacketCount = (CloneStreamPointer->OffsetIn.Remaining - Offset) / TotalPacketSize; + + Status = RenderInitializeUrbAndIrp(Pin, PinContext, Irp, &TransferBuffer[Offset], PacketCount * TotalPacketSize, TotalPacketSize); + if (NT_SUCCESS(Status)) + { + /* store in irp context */ + Irp->Tail.Overlay.DriverContext[1] = CloneStreamPointer; + + if ((PacketCount * TotalPacketSize) + Offset < CloneStreamPointer->OffsetIn.Remaining) + { + /* calculate remaining buffer bytes */ + PinContext->BufferLength = CloneStreamPointer->OffsetIn.Remaining - ((PacketCount * TotalPacketSize) + Offset); + + /* check for overflow */ + if (PinContext->BufferOffset + Offset >= PinContext->BufferSize) + { + /* reset buffer offset*/ + PinContext->BufferOffset = 0; + } + RtlCopyMemory(&PinContext->Buffer[PinContext->BufferOffset], &TransferBuffer[(PacketCount * TotalPacketSize) + Offset], PinContext->BufferLength); + PinContext->BufferOffset += PinContext->BufferLength; + } + + /* render audio bytes */ + Status = IoCallDriver(PinContext->LowerDevice, Irp); + } + /* unlock stream pointer and finish*/ KsStreamPointerUnlock(LeadingStreamPointer, TRUE); - return Status; + return STATUS_PENDING; } NTSTATUS Modified: trunk/reactos/drivers/usb/usbaudio/usbaudio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.c [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.c [iso-8859-1] Sat Nov 5 16:38:59 2016 @@ -324,7 +324,7 @@ Status = USBAudioStartDevice(Device); if (NT_SUCCESS(Status)) { - /* TODO build filter topology and pin descriptors and retrieve interface */ + /* TODO retrieve interface */ Status = USBAudioCreateFilterContext(Device); } } Modified: trunk/reactos/drivers/usb/usbaudio/usbaudio.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/usb/usbaudio/usbau… ============================================================================== --- trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] (original) +++ trunk/reactos/drivers/usb/usbaudio/usbaudio.h [iso-8859-1] Sat Nov 5 16:38:59 2016 @@ -200,12 +200,13 @@ KSPIN_LOCK IrpListLock; /* irp list lock*/ PUCHAR Buffer; /* iso buffer*/ ULONG BufferSize; /* iso buffer size */ + ULONG BufferOffset; /* buffer offset */ + ULONG BufferLength; /* remaining render bytes */ PUSB_INTERFACE_DESCRIPTOR InterfaceDescriptor; /* interface descriptor */ WORK_QUEUE_ITEM CaptureWorkItem; /* work item */ PKSWORKER CaptureWorker; /* capture worker */ WORK_QUEUE_ITEM StarvationWorkItem; /* work item */ PKSWORKER StarvationWorker; /* capture worker */ - ULONG BufferOffset; }PIN_CONTEXT, *PPIN_CONTEXT; /* filter.c */

7 years, 11 months

[gadamopoulos] 73137: [SHELL32] - Properly add Printers folder in Control Panel. CORE-12193

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Nov 5 16:33:24 2016 New Revision: 73137 URL: http://svn.reactos.org/svn/reactos?rev=73137&view=rev Log: [SHELL32] - Properly add Printers folder in Control Panel. CORE-12193 Modified: trunk/reactos/dll/win32/shell32/res/rgs/printers.rgs Modified: trunk/reactos/dll/win32/shell32/res/rgs/printers.rgs URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/res/rgs/… ============================================================================== --- trunk/reactos/dll/win32/shell32/res/rgs/printers.rgs [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/res/rgs/printers.rgs [iso-8859-1] Sat Nov 5 16:33:24 2016 @@ -5,9 +5,9 @@ ForceRemove {2227A280-3AEA-1069-A2DE-08002B30309D} = s 'Printers and Faxes' { val '{305CA226-D286-468e-B848-2B2E8E697B74} 2' = d '2' - val 'InfoTip' = e '@%%SystemRoot%%\system32\SHELL32.dll,-12696' - val 'IntroText' = e '@%%SystemRoot%%\system32\SHELL32.dll,-31757' - val 'LocalizedString' = e '@%%SystemRoot%%\system32\SHELL32.dll,-9319' + val InfoTip = e '@%%SystemRoot%%\system32\SHELL32.dll,-12696' + val IntroText = e '@%%SystemRoot%%\system32\SHELL32.dll,-31757' + val LocalizedString = e '@%%SystemRoot%%\system32\SHELL32.dll,-9319' DefaultIcon = e '%%SystemRoot%%\System32\shell32.dll,-138' InprocServer32 = s '%MODULE%' { @@ -36,13 +36,7 @@ { NoRemove NameSpace { - Printers = s '{2227A280-3AEA-1069-A2DE-08002B30309D}' - { - val 'IconIndex' = d '&H0000012C' - val 'Info' = s 'Adds, removes and changes settings for printers.' - val 'Module' = e '%%SystemRoot%%\system32\main.cpl' - val 'Name' = s 'Printers and Faxes' - } + '{2227A280-3AEA-1069-A2DE-08002B30309D}' = s 'Printers' } } }

7 years, 11 months

[mjansen] 73136: [SHELL32] Improve the choose icon dialog. Patch by Jared Smudde, edited by me. CORE-11792 #resolve Translators, please check this dialog in your language, some text is changed!

by mjansen＠svn.reactos.org

Author: mjansen Date: Sat Nov 5 16:12:09 2016 New Revision: 73136 URL: http://svn.reactos.org/svn/reactos?rev=73136&view=rev Log: [SHELL32] Improve the choose icon dialog. Patch by Jared Smudde, edited by me. CORE-11792 #resolve Translators, please check this dialog in your language, some text is changed! 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/en-US.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/ru-RU.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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ð¡Ð¼ÑÐ½Ð° Ð½Ð° Ð·Ð½Ð°ÑÐµ" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Ð¤Ð°Ð¹Ð»Ð¾Ð² Ð¸Ð¼Ðµ:", -1, 7, 14, 208, 10 - PUSHBUTTON "ÐÐ±Ð·Ð¾Ñ...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "ÐÐ½Ð°ÑÐµÑÐ°:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 107, 181, 50, 14 - PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "ÐÐ±Ð·Ð¾Ñ...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 81, 179, 50, 14 + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -611,18 +611,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ZmÄnit ikonu" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "NÃ¡zev souboru:", -1, 7, 14, 208, 10 - PUSHBUTTON "ProchÃ¡zet...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Ikony:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Storno", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "ProchÃ¡zet...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Storno", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -611,18 +611,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Anderes Symbol" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Dateiname:", -1, 7, 14, 208, 10 - PUSHBUTTON "Durchsuchen...", IDC_BUTTON_PATH, 148, 24,67,14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Symbole:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Durchsuchen...", IDC_BUTTON_PATH, 126, 17, 59, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 114, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 80 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 Modified: trunk/reactos/dll/win32/shell32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/lang/en-… ============================================================================== --- trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/lang/en-US.rc [iso-8859-1] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -607,18 +607,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Cambiar icono" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Archivo:", -1, 7, 14, 208, 10 - PUSHBUTTON "Examinar...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Iconos:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "Aceptar", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Examinar...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Aceptar", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Changer l'icÃ´ne" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Nom de fichier :", -1, 7, 14, 208, 10 - PUSHBUTTON "Parcourir...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "IcÃ´nes :", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Annuler", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Parcourir...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Annuler", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Cambia icona" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Nome del file:", -1, 7, 14, 208, 10 - PUSHBUTTON "Sfoglia...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icone:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Annulla", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Sfoglia...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Annulla", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ã¢ã¤ã³ã³ã®å¤æ´" FONT 9, "MS UI Gothic", 400, 0, 0x1 BEGIN - LTEXT "ãã¡ã¤ã«å:", -1, 7, 14, 208, 10 - PUSHBUTTON "åç§...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "ã¢ã¤ã³ã³:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "åç§...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 9, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Endre ikon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filnavn:", -1, 7, 14, 208, 10 - PUSHBUTTON "Utforsk...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Utforsk...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -609,18 +609,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Zmiana Ikony" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Plik:", -1, 7, 14, 208, 10 - PUSHBUTTON "PrzeglÄdaj...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Ikony:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "PrzeglÄdaj...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Alterar Ãcone" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Nome do arquivo:", -1, 7, 14, 208, 10 - PUSHBUTTON "Procurar...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Ãcones:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Trocar Icone" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Nome do ficheiro:", -1, 7, 14, 208, 10 - PUSHBUTTON "procurar...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "procurar...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -607,18 +607,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Schimbare pictogramÄ" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Nume fiÈier:", -1, 7, 14, 208, 10 - PUSHBUTTON "Spe&cificareâ¦", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Pictograme:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "Con&firmÄ", IDOK, 107, 181, 50, 14 - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Spe&cificareâ¦", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Con&firmÄ", IDOK, 81, 179, 50, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -607,18 +607,18 @@ LTEXT "", 14003, 9, 69, 204, 22 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ÐÐ·Ð¼ÐµÐ½ÐµÐ½Ð¸Ðµ Ð·Ð½Ð°ÑÐºÐ°" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "ÐÐ¼Ñ ÑÐ°Ð¹Ð»Ð°:", -1, 7, 14, 208, 10 - PUSHBUTTON "ÐÐ±Ð·Ð¾Ñ...",IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "ÐÐ½Ð°ÑÐºÐ¸:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°",IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "ÐÐ±Ð·Ð¾Ñ...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Zmena ikony" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "NÃ¡zov sÃºboru:", -1, 7, 14, 208, 10 - PUSHBUTTON "&PrehÄ¾adÃ¡vaÅ¥...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Ikony:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "&PrehÄ¾adÃ¡vaÅ¥...", IDC_BUTTON_PATH, 128, 17, 57, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 117, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -609,18 +609,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ndrysho IkonÃ«" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Dokument:", -1, 7, 14, 208, 10 - PUSHBUTTON "Shfleto...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Ikona:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Anulo", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Shfleto...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Anulo", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Ãndra ikon" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filnamn:", -1, 7, 14, 208, 10 - PUSHBUTTON "BlÃ¤ddra...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Ikoner:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "BlÃ¤ddra...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -607,18 +607,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Simge DeÄiÅtir" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "KÃ¼tÃ¼k AdÄ±:", -1, 7, 14, 208, 10 - PUSHBUTTON "GÃ¶z At...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Simgeler:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "Tamam", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Ä°ptal", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "GÃ¶z At...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "Tamam", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -605,18 +605,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "ÐÐ¼ÑÐ½Ð° Ð·Ð½Ð°ÑÐºÐ°" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "ÐÐ¼'Ñ ÑÐ°Ð¹Ð»Ð°:", -1, 7, 14, 208, 10 - PUSHBUTTON "Ð&Ð³Ð»ÑÐ´...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "ÐÐ½Ð°ÑÐºÐ¸:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Ð&Ð³Ð»ÑÐ´...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -614,18 +614,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "æ´æ¹å¾æ " FONT 9, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "æä»¶å:", -1, 7, 14, 208, 10 - PUSHBUTTON "æµè§...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "å¾æ :", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "ç¡®å®", IDOK, 107, 181, 50, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "æµè§...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "ç¡®å®", IDOK, 81, 179, 50, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75 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] Sat Nov 5 16:12:09 2016 @@ -613,18 +613,18 @@ LTEXT "", 14003, 60, 80, 170, 10 END -IDD_PICK_ICON DIALOGEX 0, 0, 237, 204 +IDD_PICK_ICON DIALOGEX 0, 0, 193, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CONTEXTHELP | WS_POPUPWINDOW | WS_VISIBLE | WS_CAPTION CAPTION "Change Icon" FONT 9, "MS Shell Dlg", 400, 0, 0x1 BEGIN - LTEXT "Filename:", -1, 7, 14, 208, 10 - PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 148, 24, 67, 14 - EDITTEXT IDC_EDIT_PATH, 6, 24, 135, 15, ES_AUTOHSCROLL - LTEXT "Icons:", -1, 7, 47, 208, 10 - LISTBOX IDC_PICKICON_LIST, 7, 57, 208, 119, LBS_OWNERDRAWFIXED | LBS_HASSTRINGS | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | WS_VSCROLL | WS_HSCROLL | WS_TABSTOP, WS_EX_STATICEDGE - DEFPUSHBUTTON "OK", IDOK, 107, 181, 50, 14 - PUSHBUTTON "Cancel", IDCANCEL, 167, 181, 50, 14 + LTEXT "Look for icons in this file:", -1, 7, 7, 179, 10 + PUSHBUTTON "Browse...", IDC_BUTTON_PATH, 135, 17, 50, 14 + EDITTEXT IDC_EDIT_PATH, 7, 17, 123, 14, ES_AUTOHSCROLL + LTEXT "Select an icon from the list below:", -1, 7, 36, 179, 10 + LISTBOX IDC_PICKICON_LIST, 7, 47, 181, 120, LBS_OWNERDRAWFIXED | LBS_NOINTEGRALHEIGHT | LBS_MULTICOLUMN | LBS_DISABLENOSCROLL | WS_HSCROLL | WS_TABSTOP + DEFPUSHBUTTON "OK", IDOK, 81, 179, 50, 14 + PUSHBUTTON "Cancel", IDCANCEL, 135, 179, 50, 14 END IDD_NOOPEN DIALOGEX 0, 0, 240, 75

7 years, 11 months

[tfaber] 73135: [CRT] - Remove SEH code that's duplicated in the pseh library. CORE-12283

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Nov 5 16:05:02 2016 New Revision: 73135 URL: http://svn.reactos.org/svn/reactos?rev=73135&view=rev Log: [CRT] - Remove SEH code that's duplicated in the pseh library. CORE-12283 Removed: trunk/reactos/sdk/lib/crt/except/i386/seh.s trunk/reactos/sdk/lib/crt/except/i386/seh_prolog.s Modified: trunk/reactos/sdk/lib/crt/crt.cmake trunk/reactos/sdk/lib/crt/libcntpr.cmake trunk/reactos/sdk/lib/pseh/CMakeLists.txt Modified: trunk/reactos/sdk/lib/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/sdk/lib/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/crt.cmake [iso-8859-1] Sat Nov 5 16:05:02 2016 @@ -365,8 +365,6 @@ list(APPEND CRT_ASM_SOURCE except/i386/chkesp.s except/i386/prolog.s - except/i386/seh.s - except/i386/seh_prolog.s math/i386/alldiv_asm.s math/i386/alldvrm_asm.s math/i386/allmul_asm.s Removed: trunk/reactos/sdk/lib/crt/except/i386/seh.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/except/i386/se… ============================================================================== --- trunk/reactos/sdk/lib/crt/except/i386/seh.s [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/except/i386/seh.s (removed) @@ -1,441 +0,0 @@ -/* - * COPYRIGHT: See COPYING in the top level directory - * PROJECT: ReactOS CRT - * FILE: lib/sdk/crt/except/i386/seh.s - * PURPOSE: SEH Support for the CRT - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -#define DISPOSITION_DISMISS 0 -#define DISPOSITION_CONTINUE_SEARCH 1 -#define DISPOSITION_COLLIDED_UNWIND 3 - -#define EXCEPTION_EXIT_UNWIND 4 -#define EXCEPTION_UNWINDING 2 - - -EXTERN _RtlUnwind@16:PROC - -/* GLOBALS *******************************************************************/ - -PUBLIC __global_unwind2 -PUBLIC __local_unwind2 -PUBLIC __abnormal_termination -PUBLIC __except_handler2 -PUBLIC __except_handler3 - -/* FUNCTIONS *****************************************************************/ - -.code -_unwind_handler: - - /* Check if we were unwinding and continue search if not */ - mov ecx, [esp+4] - test dword ptr [ecx+4], EXCEPTION_EXIT_UNWIND + EXCEPTION_UNWINDING - mov eax, DISPOSITION_CONTINUE_SEARCH - jz unwind_handler_return - - /* We have a collision, do a local unwind */ - mov eax, [esp+20] - push ebp - mov ebp, [eax+16] - mov edx, [eax+40] - push edx - mov edx, [eax+36] - push edx - call __local_unwind2 - add esp, 8 - pop ebp - - /* Set new try level */ - mov eax, [esp+8] - mov edx, [esp+16] - mov [edx], eax - - /* Return collided unwind */ - mov eax, DISPOSITION_COLLIDED_UNWIND - -unwind_handler_return: - ret - - -__global_unwind2: - - /* Create stack and save all registers */ - push ebp - mov ebp, esp - push ebx - push esi - push edi - push ebp - - /* Call unwind */ - push 0 - push 0 - push glu_return - push [ebp+8] - call _RtlUnwind@16 - -glu_return: - /* Restore registers and return */ - pop ebp - pop edi - pop esi - pop ebx - mov esp, ebp - pop ebp - ret - - -__abnormal_termination: - - /* Assume false */ - xor eax, eax - - /* Check if the handler is the unwind handler */ - mov ecx, fs:0 - cmp dword ptr [ecx+4], offset _unwind_handler - jne short ab_return - - /* Get the try level */ - mov edx, [ecx+12] - mov edx, [edx+12] - - /* Compare it */ - cmp [ecx+8], edx - jne ab_return - - /* Return true */ - mov eax, 1 - - /* Return */ -ab_return: - ret - - -__local_unwind2: - - /* Save volatiles */ - push ebx - push esi - push edi - - /* Get the exception registration */ - mov eax, [esp+16] - - /* Setup SEH to protect the unwind */ - push ebp - push eax - push -2 - push offset _unwind_handler - push fs:0 - mov fs:0, esp - -unwind_loop: - /* Get the exception registration and try level */ - mov eax, [esp+36] - mov ebx, [eax+8] - mov esi, [eax+12] - - /* Validate the unwind */ - cmp esi, -1 - je unwind_return - cmp dword ptr [esp+40], -1 - je unwind_ok - cmp esi, [esp+40] - jbe unwind_return - -unwind_ok: - /* Get the new enclosing level and save it */ - lea esi, [esi+esi*2] - mov ecx, [ebx+esi*4] - mov [esp+8], ecx - mov [eax+12], ecx - - /* Check the filter type */ - cmp dword ptr [ebx+esi*4+4], 0 - jnz __NLG_Return2 - - /* FIXME: NLG Notification */ - - /* Call the handler */ - call dword ptr [ebx+esi*4+8] - -__NLG_Return2: - /* Unwind again */ - jmp unwind_loop - -unwind_return: - /* Cleanup SEH */ - pop fs:0 - add esp, 16 - pop edi - pop esi - pop ebx - ret - - -__except_handler2: - - /* Setup stack and save volatiles */ - push ebp - mov ebp, esp - sub esp, 8 - push ebx - push esi - push edi - push ebp - - /* Clear direction flag */ - cld - - /* Get exception registration and record */ - mov ebx, [ebp+12] - mov eax, [ebp+8] - - /* Check if this is an unwind */ - test dword ptr [eax+4], EXCEPTION_EXIT_UNWIND + EXCEPTION_UNWINDING - jnz except_unwind2 - - /* Save exception pointers structure */ - mov [ebp-8], eax - mov eax, [ebp+16] - mov [ebp-4], eax - lea eax, [ebp-8] - mov [ebx+20], eax - - /* Get the try level and scope table */ - mov esi, [ebx+12] - mov edi, [ebx+8] - -except_loop2: - /* Validate try level */ - cmp esi, -1 - je except_search2 - - /* Check if this is the termination handler */ - lea ecx, [esi+esi*2] - cmp dword ptr [edi+ecx*4+4], 0 - jz except_continue2 - - /* Save registers and call filter, then restore them */ - push esi - push ebp - mov ebp, [ebx+16] - call dword ptr [edi+ecx*4+4] - pop ebp - pop esi - - /* Restore ebx and check the result */ - mov ebx, [ebp+12] - or eax, eax - jz except_continue2 - js except_dismiss2 - - /* So this is an accept, call the termination handlers */ - mov edi, [ebx+8] - push ebx - call __global_unwind2 - add esp, 4 - - /* Restore ebp */ - mov ebp, [ebx+16] - - /* Do local unwind */ - push esi - push ebx - call __local_unwind2 - add esp, 8 - - /* Set new try level */ - lea ecx, [esi+esi*2] - mov eax, [edi+ecx*4] - mov [ebx+12], eax - - /* Call except handler */ - call dword ptr [edi+ecx*4+8] - -except_continue2: - /* Reload try level and except again */ - mov edi, [ebx+8] - lea ecx, [esi+esi*2] - mov esi, [edi+ecx*4] - jmp except_loop2 - -except_dismiss2: - /* Dismiss it */ - mov eax, DISPOSITION_DISMISS - jmp except_return2 - -except_search2: - /* Continue searching */ - mov eax, DISPOSITION_CONTINUE_SEARCH - jmp except_return2 - - /* Do local unwind */ -except_unwind2: - push ebp - mov ebp, [ebx+16] - push -1 - push ebx - call __local_unwind2 - add esp, 8 - - /* Retore EBP and set return disposition */ - pop ebp - mov eax, DISPOSITION_CONTINUE_SEARCH - -except_return2: - /* Restore registers and stack */ - pop ebp - pop edi - pop esi - pop ebx - mov esp, ebp - pop ebp - ret - - -__except_handler3: - - /* Setup stack and save volatiles */ - push ebp - mov ebp, esp - sub esp, 8 - push ebx - push esi - push edi - push ebp - - /* Clear direction flag */ - cld - - /* Get exception registration and record */ - mov ebx, [ebp+12] - mov eax, [ebp+8] - - /* Check if this is an unwind */ - test dword ptr [eax+4], EXCEPTION_EXIT_UNWIND + EXCEPTION_UNWINDING - jnz except_unwind3 - - /* Save exception pointers structure */ - mov [ebp-8], eax - mov eax, [ebp+16] - mov [ebp-4], eax - lea eax, [ebp-8] - mov [ebx-4], eax - - /* Get the try level and scope table */ - mov esi, [ebx+12] - mov edi, [ebx+8] - - /* FIXME: Validate the SEH exception */ - -except_loop3: - /* Validate try level */ - cmp esi, -1 - je except_search3 - - /* Check if this is the termination handler */ - lea ecx, [esi+esi*2] - mov eax, [edi+ecx*4+4] - or eax, eax - jz except_continue3 - - /* Save registers clear them all */ - push esi - push ebp - lea ebp, [ebx+16] - xor ebx, ebx - xor ecx, ecx - xor edx, edx - xor esi, esi - xor edi, edi - - /* Call the filter and restore our registers */ - call eax - pop ebp - pop esi - - /* Restore ebx and check the result */ - mov ebx, [ebp+12] - or eax, eax - jz except_continue3 - js except_dismiss3 - - /* So this is an accept, call the termination handlers */ - mov edi, [ebx+8] - push ebx - call __global_unwind2 - add esp, 4 - - /* Restore ebp */ - lea ebp, [ebx+16] - - /* Do local unwind */ - push esi - push ebx - call __local_unwind2 - add esp, 8 - - /* FIXME: Do NLG Notification */ - - /* Set new try level */ - lea ecx, [esi+esi*2] - mov eax, [edi+ecx*4] - mov [ebx+12], eax - - /* Clear registers and call except handler */ - mov eax, [edi+ecx*4+8] - xor ebx, ebx - xor ecx, ecx - xor edx, edx - xor esi, esi - xor edi, edi - call eax - -except_continue3: - /* Reload try level and except again */ - mov edi, [ebx+8] - lea ecx, [esi+esi*2] - mov esi, [edi+ecx*4] - jmp except_loop3 - -except_dismiss3: - /* Dismiss it */ - mov eax, DISPOSITION_DISMISS - jmp except_return3 - -except_search3: - /* Continue searching */ - mov eax, DISPOSITION_CONTINUE_SEARCH - jmp except_return3 - - /* Do local unwind */ -except_unwind3: - push ebp - mov ebp, [ebx+16] - push -1 - push ebx - call __local_unwind2 - add esp, 8 - - /* Retore EBP and set return disposition */ - pop ebp - mov eax, DISPOSITION_CONTINUE_SEARCH - -except_return3: - /* Restore registers and stack */ - pop ebp - pop edi - pop esi - pop ebx - mov esp, ebp - pop ebp - ret - -END Removed: trunk/reactos/sdk/lib/crt/except/i386/seh_prolog.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/except/i386/se… ============================================================================== --- trunk/reactos/sdk/lib/crt/except/i386/seh_prolog.s [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/except/i386/seh_prolog.s (removed) @@ -1,152 +0,0 @@ -/* - * COPYRIGHT: GNU GPL, see COPYING in the top level directory - * PROJECT: ReactOS CRT - * FILE: lib/sdk/crt/except/i386/seh_prolog.s - * PURPOSE: SEH Support for MSVC - * PROGRAMMERS: Timo Kreuzer - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.inc> - -EXTERN __except_handler3:PROC - -/* The very first thing a function compiled with MSVC containing SEH - * will do is call __SEH_prolog like this: - * - * push <Number of stackbytes> - * push <Address of exception handler> - * call __SEH_prolog - * - * When entering the function the stack layout is like this: - * - * esp + 08: OLDFRAME.StackBytes - * esp + 04: OLDFRAME.SEHTable - * esp + 00: OLDFRAME.ReturnAddress - * - * __SEH_prolog will now setup the stack to the following layout: - * - * esp + N + 24: SEH_FRAME.OriginalEbp OLDFRAME.StackBytes - * esp + N + 20: SEH_FRAME.Disable OLDFRAME.SEHTable - * esp + N + 1C: SEH_FRAME.SEHTable OLDFRAME.ReturnAddress - * esp + N + 18: SEH_FRAME.Handler - * esp + N + 14: SEH_FRAME.PreviousRecord - * esp + N + 10: SEH_FRAME.unused - * esp + N + 0c: SEH_FRAME.NewEsp - * - * N bytes local variables - * ... - * esp + 08: SAFE_AREA.Ebx - * esp + 04: SAFE_AREA.Esi - * esp + 00: SAFE_AREA.Edi - * - * all this is documented here (with some minor errors): - * http://reactos-blog.blogspot.com/2009/08/inside-mind-of-reactos-developer.h… - */ - -OLDFRAME_ReturnAddress = 0 /* 0x00 */ -OLDFRAME_SEHTable = 4 /* 0x04 */ -OLDFRAME_StackBytes = 8 /* 0x08 */ -OLDFRAME_Size = 12 /* 0x0c */ - -SEH_FRAME_NewEsp = 0 /* 0x00 */ -SEH_FRAME_unused = 4 /* 0x04 */ -SEH_FRAME_PreviousRecord = 8 /* 0x08 */ -SEH_FRAME_Handler = 12 /* 0x0c */ -SEH_FRAME_SEHTable = 16 /* 0x10 */ -SEH_FRAME_Disable = 20 /* 0x14 */ -SEH_FRAME_OriginalEbp = 24 /* 0x18 */ -SEH_FRAME_Size = 28 /* 0x1c */ - -SAFE_AREA_Edi = 0 /* 0x00 */ -SAFE_AREA_Esi = 4 /* 0x04 */ -SAFE_AREA_Ebx = 8 /* 0x08 */ -SAFE_AREA_Size = 12 /* 0x0c */ - - -.code - -PUBLIC __SEH_prolog -__SEH_prolog: - - /* Get the number of stack bytes to reserve */ - mov eax, [esp + OLDFRAME_StackBytes] - - /* Push address of __except_handler3 on the stack */ - push offset __except_handler3 - - /* Push the old exception record on the stack */ - push dword ptr fs:0 - - /* Adjust stack allocation, add size of the stack frame minus 2 pushes */ - add eax, SEH_FRAME_Size + SAFE_AREA_Size - OLDFRAME_Size - 8 - - /* Save old ebp, overwriting OLDFRAME.StackBytes */ - mov [esp + 8 + OLDFRAME_StackBytes], ebp - - /* Load new ebp, pointing to OLDFRAME.StackBytes */ - lea ebp, [esp + 8 + OLDFRAME_StackBytes] - - /* Allocate stack space */ - sub esp, eax - - /* Push the return address on the stack */ - push dword ptr [ebp - OLDFRAME_StackBytes + OLDFRAME_ReturnAddress] - - /* Get address of the SEH table */ - mov eax, [ebp + OLDFRAME_SEHTable] - - /* Save new esp */ - mov [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_NewEsp], esp - - /* Safe SEH table, overwriting OLDFRAME.ReturnAddress */ - mov [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_SEHTable], eax - - /* Safe the disable value, overwriting OLDFRAME.SEHTable */ - mov dword ptr [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_Disable], -1 - - /* Load the address of the new registration record */ - lea eax, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] - - /* Save registers */ - mov [esp + SAFE_AREA_Edi], edi - mov [esp + SAFE_AREA_Esi], esi - mov [esp + SAFE_AREA_Ebx], ebx - - /* Enqueue the new record */ - mov fs:[0], eax - - /* Return to the caller */ - ret - - -PUBLIC __SEH_epilog -__SEH_epilog: - - /* Restore the previous exception registration record */ - mov ecx, [ebp - SEH_FRAME_OriginalEbp + SEH_FRAME_PreviousRecord] - mov fs:[0], ecx - - /* Restore saved registers */ - mov edi, [esp + 4 + SAFE_AREA_Edi] - mov esi, [esp + 4 + SAFE_AREA_Esi] - mov ebx, [esp + 4 + SAFE_AREA_Ebx] - - /* Get the return address */ - mov ecx, [esp] - - /* Clean up stack */ - mov esp, ebp - - /* Get previous ebp */ - mov ebp, [esp] - - /* Save return address */ - mov [esp], ecx - - /* Return to the caller */ - ret - - -END Modified: trunk/reactos/sdk/lib/crt/libcntpr.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/crt/libcntpr.cmake… ============================================================================== --- trunk/reactos/sdk/lib/crt/libcntpr.cmake [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/crt/libcntpr.cmake [iso-8859-1] Sat Nov 5 16:05:02 2016 @@ -72,8 +72,6 @@ if(ARCH STREQUAL "i386") list(APPEND LIBCNTPR_ASM_SOURCE except/i386/chkstk_asm.s - except/i386/seh.s - except/i386/seh_prolog.s setjmp/i386/setjmp.s math/i386/alldiv_asm.s math/i386/alldvrm_asm.s Modified: trunk/reactos/sdk/lib/pseh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/pseh/CMakeLists.tx… ============================================================================== --- trunk/reactos/sdk/lib/pseh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/pseh/CMakeLists.txt [iso-8859-1] Sat Nov 5 16:05:02 2016 @@ -1,3 +1,9 @@ + +if(ARCH STREQUAL "i386") + list(APPEND ASM_SOURCE + i386/seh.s + i386/seh_prolog.s) +endif() if(NOT MSVC) @@ -19,24 +25,19 @@ list(APPEND SOURCE powerpc/framebased.S) endif() - add_library(pseh ${SOURCE}) + add_library(pseh ${SOURCE} ${ASM_SOURCE}) target_link_libraries(pseh chkstk) add_dependencies(pseh psdk) else() - if(ARCH STREQUAL "i386") - list(APPEND ASM_SOURCE - i386/seh.s - i386/seh_prolog.s) - elseif(ARCH STREQUAL "amd64") + if(ARCH STREQUAL "amd64") list(APPEND ASM_SOURCE amd64/seh.s amd64/seh_prolog.s) elseif(ARCH STREQUAL "arm") list(APPEND ASM_SOURCE arm/seh_prolog.s) - list(APPEND SOURCE dummy.c) endif() list(APPEND SOURCE dummy.c)

7 years, 11 months

[gadamopoulos] 73134: [SHELL32] CDesktopBrowser: Forward the parameters pased in CDesktopBrowser::BrowseObject to SHOpenNewFrame. Thus the same parameters are eventually passed to CShellBrowser::In...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Nov 5 15:05:00 2016 New Revision: 73134 URL: http://svn.reactos.org/svn/reactos?rev=73134&view=rev Log: [SHELL32] CDesktopBrowser: Forward the parameters pased in CDesktopBrowser::BrowseObject to SHOpenNewFrame. Thus the same parameters are eventually passed to CShellBrowser::Initialize. [BROWSEUI] CShellBrowser: Handle SBSP_EXPLOREMODE flag so as to show the tree view when the user selects the Explore option from the context menu. Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Nov 5 15:05:00 2016 @@ -780,6 +780,9 @@ if (FAILED_UNEXPECTEDLY(hResult)) return hResult; + if ((dwFlags & SBSP_EXPLOREMODE) != NULL) + ShowBand(CLSID_ExplorerBand, true); + ShowWindow(SW_SHOWNORMAL); return S_OK; @@ -2182,6 +2185,9 @@ HRESULT STDMETHODCALLTYPE CShellBrowser::BrowseObject(LPCITEMIDLIST pidl, UINT wFlags) { + if ((wFlags & SBSP_EXPLOREMODE) != NULL) + ShowBand(CLSID_ExplorerBand, true); + return BrowseToPIDL(pidl, BTP_UPDATE_CUR_HISTORY | BTP_UPDATE_NEXT_HISTORY); } Modified: trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shelldes… ============================================================================== --- trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shelldesktop/CDesktopBrowser.cpp [iso-8859-1] Sat Nov 5 15:05:00 2016 @@ -284,7 +284,7 @@ * find an open shell window that shows the requested pidl and activate it */ - return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, 0); + return SHOpenNewFrame((LPITEMIDLIST)pidl, NULL, 0, wFlags); } HRESULT STDMETHODCALLTYPE CDesktopBrowser::GetViewStateStream(DWORD grfMode, IStream **ppStrm)

7 years, 11 months

[akhaldi] 73133: [BASE] Spelling fixes by Josh Soref. CORE-12286

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 5 14:55:55 2016 New Revision: 73133 URL: http://svn.reactos.org/svn/reactos?rev=73133&view=rev Log: [BASE] Spelling fixes by Josh Soref. CORE-12286 Modified: trunk/reactos/base/applications/atactl/atactl.cpp trunk/reactos/base/applications/calc/help.txt trunk/reactos/base/applications/calc/rpn.c trunk/reactos/base/applications/calc/rpn_mpfr.c trunk/reactos/base/applications/calc/utl.c trunk/reactos/base/applications/calc/whatsnew.txt trunk/reactos/base/applications/calc/winmain.c trunk/reactos/base/applications/charmap/settings.c trunk/reactos/base/applications/charmap_new/GridView.cpp trunk/reactos/base/applications/clipbrd/scrollutils.c trunk/reactos/base/applications/clipbrd/scrollutils.h trunk/reactos/base/applications/dxdiag/sound.c trunk/reactos/base/applications/fltmc/lang/en-US.rc trunk/reactos/base/applications/fontview/display.c trunk/reactos/base/applications/fontview/fontview.c trunk/reactos/base/applications/games/solitaire/solgame.cpp trunk/reactos/base/applications/kbswitch/kbswitch.c trunk/reactos/base/applications/magnify/lang/en-US.rc trunk/reactos/base/applications/mplay32/mplay32.c trunk/reactos/base/applications/msconfig_new/srvpage.cpp trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc trunk/reactos/base/applications/mscutils/servman/misc.c trunk/reactos/base/applications/mstsc/bitmap.c trunk/reactos/base/applications/mstsc/cache.c trunk/reactos/base/applications/mstsc/connectdialog.c trunk/reactos/base/applications/mstsc/constants.h trunk/reactos/base/applications/mstsc/licence.c trunk/reactos/base/applications/mstsc/precomp.h trunk/reactos/base/applications/mstsc/rdesktop.h trunk/reactos/base/applications/mstsc/rdp.c trunk/reactos/base/applications/mstsc/secure.c trunk/reactos/base/applications/mstsc/win32.c trunk/reactos/base/applications/network/arp/arp.c trunk/reactos/base/applications/network/ftp/cmds.c trunk/reactos/base/applications/network/ftp/ftp.c trunk/reactos/base/applications/network/ipconfig/ipconfig.c trunk/reactos/base/applications/network/netstat/netstat.c trunk/reactos/base/applications/network/netstat/netstat.h trunk/reactos/base/applications/network/tracert/tracert.c trunk/reactos/base/applications/network/tracert/tracert.h trunk/reactos/base/applications/rapps/available.c trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/resource.h trunk/reactos/base/applications/rapps/winmain.c trunk/reactos/base/applications/rapps_new/available.cpp trunk/reactos/base/applications/rapps_new/gui.cpp trunk/reactos/base/applications/rapps_new/loaddlg.cpp trunk/reactos/base/applications/rapps_new/resource.h trunk/reactos/base/applications/sc/usage.c trunk/reactos/base/applications/screensavers/logon/logon.c trunk/reactos/base/applications/shutdown/shutdown.c trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp trunk/reactos/base/applications/sndrec32/audio_membuffer.hpp trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp trunk/reactos/base/applications/sndrec32/audio_wavein.cpp trunk/reactos/base/applications/sndrec32/audio_wavein.hpp trunk/reactos/base/applications/sndrec32/sndrec32.cpp trunk/reactos/base/applications/sndvol32/dialog.c trunk/reactos/base/applications/sndvol32/sndvol32.c trunk/reactos/base/applications/taskmgr/graphctl.c trunk/reactos/base/applications/taskmgr/perfdata.c trunk/reactos/base/applications/taskmgr/perfpage.c trunk/reactos/base/applications/taskmgr/taskmgr.h trunk/reactos/base/services/eventlog/file.c trunk/reactos/base/services/svchost/svchost.c trunk/reactos/base/services/tcpsvcs/chargen.c trunk/reactos/base/services/tcpsvcs/qotd.c trunk/reactos/base/services/telnetd/syslog.c trunk/reactos/base/services/telnetd/syslog.h trunk/reactos/base/setup/usetup/cabinet.h trunk/reactos/base/setup/usetup/inicache.c trunk/reactos/base/setup/usetup/inicache.h trunk/reactos/base/setup/usetup/interface/devinst.c trunk/reactos/base/setup/usetup/interface/usetup.c trunk/reactos/base/setup/usetup/partlist.c trunk/reactos/base/setup/usetup/partlist.h trunk/reactos/base/setup/usetup/progress.c trunk/reactos/base/setup/welcome/welcome.c trunk/reactos/base/shell/cmd/assoc.c trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/call.c trunk/reactos/base/shell/cmd/choice.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/cmdinput.c trunk/reactos/base/shell/cmd/cmdtable.c trunk/reactos/base/shell/cmd/copy.c trunk/reactos/base/shell/cmd/del.c trunk/reactos/base/shell/cmd/dir.c trunk/reactos/base/shell/cmd/filecomp.c trunk/reactos/base/shell/cmd/files.txt trunk/reactos/base/shell/cmd/for.c trunk/reactos/base/shell/cmd/goto.c trunk/reactos/base/shell/cmd/history.txt trunk/reactos/base/shell/cmd/if.c trunk/reactos/base/shell/cmd/internal.c trunk/reactos/base/shell/cmd/lang/en-US.rc trunk/reactos/base/shell/cmd/misc.c trunk/reactos/base/shell/cmd/move.c trunk/reactos/base/shell/cmd/msgbox.c trunk/reactos/base/shell/cmd/pause.c trunk/reactos/base/shell/cmd/readme.txt trunk/reactos/base/shell/cmd/readme2.txt trunk/reactos/base/shell/cmd/ren.c trunk/reactos/base/shell/cmd/ren.txt trunk/reactos/base/shell/cmd/replace.c trunk/reactos/base/shell/cmd/strtoclr.c trunk/reactos/base/shell/cmd/where.c trunk/reactos/base/shell/explorer/shellservice.cpp trunk/reactos/base/shell/explorer/startmnucust.cpp trunk/reactos/base/shell/explorer/taskswnd.cpp trunk/reactos/base/shell/explorer/trayntfy.cpp trunk/reactos/base/shell/explorer/traywnd.cpp trunk/reactos/base/system/diskpart/interpreter.c trunk/reactos/base/system/diskpart/lang/en-US.rc trunk/reactos/base/system/diskpart/partlist.c trunk/reactos/base/system/regsvr32/regsvr32.c trunk/reactos/base/system/rundll32/rundll32.c trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.c trunk/reactos/base/system/services/services.h trunk/reactos/base/system/smss/pagefile.c trunk/reactos/base/system/smss/sminit.c trunk/reactos/base/system/smss/smloop.c trunk/reactos/base/system/smss/smsubsys.c trunk/reactos/base/system/winlogon/winlogon.c trunk/reactos/base/system/winlogon/winlogon.h trunk/reactos/base/system/winlogon/wlx.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/atactl/atactl.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/atactl/a… Modified: trunk/reactos/base/applications/calc/help.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/hel… Modified: trunk/reactos/base/applications/calc/rpn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… Modified: trunk/reactos/base/applications/calc/rpn_mpfr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/rpn… Modified: trunk/reactos/base/applications/calc/utl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/utl… Modified: trunk/reactos/base/applications/calc/whatsnew.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/wha… Modified: trunk/reactos/base/applications/calc/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/win… Modified: trunk/reactos/base/applications/charmap/settings.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/charmap_new/GridView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap_… Modified: trunk/reactos/base/applications/clipbrd/scrollutils.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/clipbrd/scrollutils.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/clipbrd/… Modified: trunk/reactos/base/applications/dxdiag/sound.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/s… Modified: trunk/reactos/base/applications/fltmc/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fltmc/la… Modified: trunk/reactos/base/applications/fontview/display.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/fontview/fontview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/solgame.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/kbswitch/kbswitch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/kbswitch… Modified: trunk/reactos/base/applications/magnify/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig_new/srvpage.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/devmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/eventvwr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv1.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/dependencies_tv2.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mstsc/bitmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/bi… Modified: trunk/reactos/base/applications/mstsc/cache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/ca… Modified: trunk/reactos/base/applications/mstsc/connectdialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… Modified: trunk/reactos/base/applications/mstsc/constants.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/co… Modified: trunk/reactos/base/applications/mstsc/licence.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/li… Modified: trunk/reactos/base/applications/mstsc/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/pr… Modified: trunk/reactos/base/applications/mstsc/rdesktop.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/rdp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/rd… Modified: trunk/reactos/base/applications/mstsc/secure.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/se… Modified: trunk/reactos/base/applications/mstsc/win32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/wi… Modified: trunk/reactos/base/applications/network/arp/arp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ftp/cmds.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ftp/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ipconfig/ipconfig.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/netstat/netstat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/netstat/netstat.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/tracert/tracert.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/tracert/tracert.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/rapps/available.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/av… Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… Modified: trunk/reactos/base/applications/rapps_new/available.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/gui.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/loaddlg.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/rapps_new/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps_ne… Modified: trunk/reactos/base/applications/sc/usage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sc/usage… Modified: trunk/reactos/base/applications/screensavers/logon/logon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/shutdown/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndrec32/audio_membuffer.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_membuffer.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_resampler_acm.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_wavein.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/audio_wavein.hpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndrec32/sndrec32.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/sndvol32/sndvol32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/graphctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/perfdata.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/perfpage.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/applications/taskmgr/taskmgr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/services/eventlog/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/eventlog/fil… Modified: trunk/reactos/base/services/svchost/svchost.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/svchost/svch… Modified: trunk/reactos/base/services/tcpsvcs/chargen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/char… Modified: trunk/reactos/base/services/tcpsvcs/qotd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/tcpsvcs/qotd… Modified: trunk/reactos/base/services/telnetd/syslog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/sysl… Modified: trunk/reactos/base/services/telnetd/syslog.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/telnetd/sysl… Modified: trunk/reactos/base/setup/usetup/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/cabinet.… Modified: trunk/reactos/base/setup/usetup/inicache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… Modified: trunk/reactos/base/setup/usetup/inicache.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/inicache… Modified: trunk/reactos/base/setup/usetup/interface/devinst.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… Modified: trunk/reactos/base/setup/usetup/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… Modified: trunk/reactos/base/setup/usetup/partlist.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/partlist… Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… Modified: trunk/reactos/base/setup/welcome/welcome.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/welcome… Modified: trunk/reactos/base/shell/cmd/assoc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/assoc.c?rev… Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… Modified: trunk/reactos/base/shell/cmd/call.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/call.c?rev=… Modified: trunk/reactos/base/shell/cmd/choice.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/choice.c?re… Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=7… Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=7… Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… Modified: trunk/reactos/base/shell/cmd/cmdtable.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdtable.c?… Modified: trunk/reactos/base/shell/cmd/copy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/copy.c?rev=… Modified: trunk/reactos/base/shell/cmd/del.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/del.c?rev=7… Modified: trunk/reactos/base/shell/cmd/dir.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/dir.c?rev=7… Modified: trunk/reactos/base/shell/cmd/filecomp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/filecomp.c?… Modified: trunk/reactos/base/shell/cmd/files.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/files.txt?r… Modified: trunk/reactos/base/shell/cmd/for.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/for.c?rev=7… Modified: trunk/reactos/base/shell/cmd/goto.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/goto.c?rev=… Modified: trunk/reactos/base/shell/cmd/history.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/history.txt… Modified: trunk/reactos/base/shell/cmd/if.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/if.c?rev=73… Modified: trunk/reactos/base/shell/cmd/internal.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/internal.c?… Modified: trunk/reactos/base/shell/cmd/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/en-US.… Modified: trunk/reactos/base/shell/cmd/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/misc.c?rev=… Modified: trunk/reactos/base/shell/cmd/move.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/move.c?rev=… Modified: trunk/reactos/base/shell/cmd/msgbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/msgbox.c?re… Modified: trunk/reactos/base/shell/cmd/pause.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/pause.c?rev… Modified: trunk/reactos/base/shell/cmd/readme.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme.txt?… Modified: trunk/reactos/base/shell/cmd/readme2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/readme2.txt… Modified: trunk/reactos/base/shell/cmd/ren.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.c?rev=7… Modified: trunk/reactos/base/shell/cmd/ren.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/ren.txt?rev… Modified: trunk/reactos/base/shell/cmd/replace.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/replace.c?r… Modified: trunk/reactos/base/shell/cmd/strtoclr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/strtoclr.c?… Modified: trunk/reactos/base/shell/cmd/where.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/where.c?rev… Modified: trunk/reactos/base/shell/explorer/shellservice.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/shells… Modified: trunk/reactos/base/shell/explorer/startmnucust.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/startm… Modified: trunk/reactos/base/shell/explorer/taskswnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/tasksw… Modified: trunk/reactos/base/shell/explorer/trayntfy.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traynt… Modified: trunk/reactos/base/shell/explorer/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/traywn… Modified: trunk/reactos/base/system/diskpart/interpreter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/inter… Modified: trunk/reactos/base/system/diskpart/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/diskpart/partlist.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/partl… Modified: trunk/reactos/base/system/regsvr32/regsvr32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/regsv… Modified: trunk/reactos/base/system/rundll32/rundll32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rundl… Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/datab… Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… Modified: trunk/reactos/base/system/services/services.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/servi… Modified: trunk/reactos/base/system/smss/pagefile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/pagefile.… Modified: trunk/reactos/base/system/smss/sminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/sminit.c?… Modified: trunk/reactos/base/system/smss/smloop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smloop.c?… Modified: trunk/reactos/base/system/smss/smsubsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smsubsys.… Modified: trunk/reactos/base/system/winlogon/winlogon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… Modified: trunk/reactos/base/system/winlogon/winlogon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/winlo… Modified: trunk/reactos/base/system/winlogon/wlx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/wlx.c…

7 years, 11 months

[gadamopoulos] 73132: [BROWSEUI] - CShellBrowser: Add some checks for failures that we re missing. - CAddressEditBox: Add some checks for failures that we re missing. - SHCreateFromDesktop: Actuall...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Sat Nov 5 14:40:55 2016 New Revision: 73132 URL: http://svn.reactos.org/svn/reactos?rev=73132&view=rev Log: [BROWSEUI] - CShellBrowser: Add some checks for failures that we re missing. - CAddressEditBox: Add some checks for failures that we re missing. - SHCreateFromDesktop: Actually create the proxy desktop window when needed and keep its handle and prefer it when we try to find the proxy desktop window. - Wake the message queue of the proxy desktop after a browser thread exits so the proxy desktop can exit when the last browser thread exits. - Add a hack to prefer to show my documents if we ended up trying to open a browser window with a NULL pidl. This is a hack that is needed because SHExplorerParseCmdLine is broken. - Finally this fixes using "explorer /separate" and also fixes the separate process to exit when the last browser gets closed (this fix also applies to filebrowser.exe which no longer lives forever). CORE-12168 Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp trunk/reactos/dll/win32/browseui/desktopipc.cpp trunk/reactos/dll/win32/browseui/shellbrowser.cpp Modified: trunk/reactos/dll/win32/browseui/addresseditbox.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/address… ============================================================================== --- trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/addresseditbox.cpp [iso-8859-1] Sat Nov 5 14:40:55 2016 @@ -348,13 +348,22 @@ hr = IUnknown_QueryService(fSite, SID_STopLevelBrowser, IID_PPV_ARG(IBrowserService, &isb)); if (FAILED_UNEXPECTEDLY(hr)) return hr; - isb->GetPidl(&absolutePIDL); - - SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - - sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); - - StrRetToBufW(&ret, pidlChild, buf, 4095); + + hr = isb->GetPidl(&absolutePIDL); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = sf->GetDisplayNameOf(pidlChild, SHGDN_FORADDRESSBAR | SHGDN_FORPARSING, &ret); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; + + hr = StrRetToBufW(&ret, pidlChild, buf, 4095); + if (FAILED_UNEXPECTEDLY(hr)) + return hr; indexClosed = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); Modified: trunk/reactos/dll/win32/browseui/desktopipc.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/desktop… ============================================================================== --- trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/desktopipc.cpp [iso-8859-1] Sat Nov 5 14:40:55 2016 @@ -5,6 +5,7 @@ #define PROXY_DESKTOP_CLASS L"Proxy Desktop" BOOL g_SeparateFolders = FALSE; +HWND g_hwndProxyDesktop = NULL; // fields indented more are unknown ;P struct HNFBlock @@ -70,13 +71,13 @@ END_MSG_MAP() }; -static CProxyDesktop * CreateProxyDesktop(IEThreadParamBlock * parameters) -{ - return new CProxyDesktop(parameters); -} - HWND FindShellProxy(LPITEMIDLIST pidl) { + /* If there is a proxy desktop in the current process use it */ + if (g_hwndProxyDesktop) + return g_hwndProxyDesktop; + + /* Try to find the desktop of the main explorer process */ if (!g_SeparateFolders) { HWND shell = GetShellWindow(); @@ -92,6 +93,7 @@ TRACE("Separate folders setting enabled. Ignoring main desktop.\n"); } + /* The main desktop can't be find so try to see if another process has a proxy desktop */ HWND proxy = FindWindow(PROXY_DESKTOP_CLASS, NULL); if (proxy) { @@ -355,6 +357,12 @@ if (parameters && parameters->offsetF8) parameters->offsetF8->AddRef(); + // HACK! This shouldn't happen! SHExplorerParseCmdLine needs fixing. + if (!parameters->directoryPIDL) + { + SHGetFolderLocation(NULL, CSIDL_PERSONAL, NULL, NULL, &parameters->directoryPIDL); + } + hResult = CShellBrowser_CreateInstance(parameters->directoryPIDL, parameters->dwFlags, IID_PPV_ARG(IBrowserService2, &browser)); if (FAILED_UNEXPECTEDLY(hResult)) return hResult; @@ -401,6 +409,10 @@ /* Destroying the parameters releases the thread reference */ SHDestroyIETHREADPARAM(parameters); + + /* Wake up the proxy desktop thread so it can check whether the last browser thread exited */ + /* Use PostMessage in order to force GetMessage to return and check if all browser windows have exited */ + PostMessageW(FindShellProxy(NULL), WM_EXPLORER_1037, 0, 0); OleUninitialize(); @@ -630,9 +642,11 @@ // Else, start our own message loop! HRESULT hr = CoInitialize(NULL); - CProxyDesktop * proxy = CreateProxyDesktop(parameters); + CProxyDesktop * proxy = new CProxyDesktop(parameters); if (proxy) { + g_hwndProxyDesktop = proxy->Create(0); + LONG refCount; CComPtr<IUnknown> thread; if (SHCreateThreadRef(&refCount, &thread) >= 0) @@ -652,6 +666,8 @@ DispatchMessageW(&Msg); } + DestroyWindow(g_hwndProxyDesktop); + delete proxy; } Modified: trunk/reactos/dll/win32/browseui/shellbrowser.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/browseui/shellbr… ============================================================================== --- trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/browseui/shellbrowser.cpp [iso-8859-1] Sat Nov 5 14:40:55 2016 @@ -1040,25 +1040,27 @@ HIMAGELIST himlSmall, himlLarge; CComPtr<IShellFolder> sf; - SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); - - index = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); - - Shell_GetImageLists(&himlLarge, &himlSmall); - - HICON icSmall = ImageList_GetIcon(himlSmall, indexOpen, 0); - HICON icLarge = ImageList_GetIcon(himlLarge, indexOpen, 0); - - /* Hack to make it possible to release the old icons */ - /* Something seems to go wrong with WM_SETICON */ - HICON oldSmall = (HICON)SendMessage(WM_GETICON, ICON_SMALL, 0); - HICON oldLarge = (HICON)SendMessage(WM_GETICON, ICON_BIG, 0); - - SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); - SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); - - DestroyIcon(oldSmall); - DestroyIcon(oldLarge); + hResult = SHBindToParent(absolutePIDL, IID_PPV_ARG(IShellFolder, &sf), &pidlChild); + if (SUCCEEDED(hResult)) + { + index = SHMapPIDLToSystemImageListIndex(sf, pidlChild, &indexOpen); + + Shell_GetImageLists(&himlLarge, &himlSmall); + + HICON icSmall = ImageList_GetIcon(himlSmall, indexOpen, 0); + HICON icLarge = ImageList_GetIcon(himlLarge, indexOpen, 0); + + /* Hack to make it possible to release the old icons */ + /* Something seems to go wrong with WM_SETICON */ + HICON oldSmall = (HICON)SendMessage(WM_GETICON, ICON_SMALL, 0); + HICON oldLarge = (HICON)SendMessage(WM_GETICON, ICON_BIG, 0); + + SendMessage(WM_SETICON, ICON_SMALL, reinterpret_cast<LPARAM>(icSmall)); + SendMessage(WM_SETICON, ICON_BIG, reinterpret_cast<LPARAM>(icLarge)); + + DestroyIcon(oldSmall); + DestroyIcon(oldLarge); + } } FireCommandStateChangeAll();

7 years, 11 months

[akhaldi] 73131: [0.4.3] * Merge shell32 fixes by Giannis in r73128. CORE-12106

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Nov 5 11:07:31 2016 New Revision: 73131 URL: http://svn.reactos.org/svn/reactos?rev=73131&view=rev Log: [0.4.3] * Merge shell32 fixes by Giannis in r73128. CORE-12106 Modified: branches/ros-branch-0_4_3/ (props changed) branches/ros-branch-0_4_3/reactos/ (props changed) branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CFSFolder.cpp branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CRegFolder.cpp branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shfldr.h branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shlfolder.cpp Propchange: branches/ros-branch-0_4_3/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 5 11:07:31 2016 @@ -1 +1 @@ -/trunk:73043,73072,73075,73077,73112-73114,73117 +/trunk:73043,73072,73075,73077,73112-73114,73117,73128 Propchange: branches/ros-branch-0_4_3/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Nov 5 11:07:31 2016 @@ -21,4 +21,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:73043,73072,73075,73077,73112-73114,73117 +/trunk/reactos:73043,73072,73075,73077,73112-73114,73117,73128 Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CDrivesFolder.cpp [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -358,6 +358,8 @@ HRESULT WINAPI CDrivesFolder::CompareIDs(LPARAM lParam, PCUIDLIST_RELATIVE pidl1, PCUIDLIST_RELATIVE pidl2) { + HRESULT hres; + if (!pidl1 || !pidl2) { ERR("Got null pidl pointer (%Ix %p %p)!\n", lParam, pidl1, pidl2); @@ -365,7 +367,7 @@ } if (_ILIsSpecialFolder(pidl1) || _ILIsSpecialFolder(pidl2)) - m_regFolder->CompareIDs(lParam, pidl1, pidl2); + return m_regFolder->CompareIDs(lParam, pidl1, pidl2); if (!_ILIsDrive(pidl1) || !_ILIsDrive(pidl2) || LOWORD(lParam) >= MYCOMPUTERSHELLVIEWCOLUMNS) return E_INVALIDARG; @@ -379,10 +381,12 @@ case 0: /* name */ { result = stricmp(pszDrive1, pszDrive2); - return MAKE_COMPARE_HRESULT(result); + hres = MAKE_COMPARE_HRESULT(result); + break; } case 1: /* Type */ { + /* We want to return immediately because SHELL32_CompareDetails also compares children. */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } case 2: /* Size */ @@ -406,10 +410,17 @@ else /* Size available */ Diff.QuadPart = Drive1Available.QuadPart - Drive2Available.QuadPart; - return MAKE_COMPARE_HRESULT(Diff.QuadPart); - } - } - return E_INVALIDARG; + hres = MAKE_COMPARE_HRESULT(Diff.QuadPart); + break; + } + default: + return E_INVALIDARG; + } + + if (HRESULT_CODE(hres) == 0) + return SHELL32_CompareChildren(this, lParam, pidl1, pidl2); + + return hres; } /************************************************************************** Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CFSFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CFSFolder.cpp [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -344,6 +344,10 @@ case 4: /* Attributes */ return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } + + if (result == 0) + return SHELL32_CompareChildren(this, lParam, pidl1, pidl2); + return MAKE_COMPARE_HRESULT(result); } Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CRegFolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/folders/CRegFolder.cpp [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -282,21 +282,24 @@ return E_INVALIDARG; } - BOOL bIsGuidFolder1 = _ILIsSpecialFolder(pidl1); - BOOL bIsGuidFolder2 = _ILIsSpecialFolder(pidl2); - - if (!bIsGuidFolder1 && !bIsGuidFolder2) + GUID const *clsid1 = _ILGetGUIDPointer (pidl1); + GUID const *clsid2 = _ILGetGUIDPointer (pidl2); + + if (!clsid1 && !clsid2) { ERR("Got no guid pidl!\n"); return E_INVALIDARG; } - else if (bIsGuidFolder1 && bIsGuidFolder2) - { + else if (clsid1 && clsid2) + { + if (memcmp(clsid1, clsid2, sizeof(GUID)) == 0) + return SHELL32_CompareChildren(this, lParam, pidl1, pidl2); + return SHELL32_CompareDetails(this, lParam, pidl1, pidl2); } /* Guid folders come first compared to everything else */ - return MAKE_COMPARE_HRESULT(bIsGuidFolder1 ? -1 : 1); + return MAKE_COMPARE_HRESULT(clsid1 ? -1 : 1); } HRESULT WINAPI CRegFolder::CreateViewObject(HWND hwndOwner, REFIID riid, LPVOID *ppvOut) Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shfldr.h URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shfldr.h [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -53,6 +53,8 @@ HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); +HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2); + HRESULT SHELL32_CoCreateInitSF (LPCITEMIDLIST pidlRoot, LPCWSTR pathRoot, LPCITEMIDLIST pidlChild, const GUID* clsid, int csidl, REFIID riid, LPVOID *ppvOut); Modified: branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shlfolder.cpp URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_4_3/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] (original) +++ branches/ros-branch-0_4_3/reactos/dll/win32/shell32/shlfolder.cpp [iso-8859-1] Sat Nov 5 11:07:31 2016 @@ -435,6 +435,29 @@ return S_OK; } +HRESULT SHELL32_CompareChildren(IShellFolder2* psf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) +{ + PUIDLIST_RELATIVE nextpidl1 = ILGetNext (pidl1); + PUIDLIST_RELATIVE nextpidl2 = ILGetNext (pidl2); + + bool isEmpty1 = _ILIsDesktop(nextpidl1); + bool isEmpty2 = _ILIsDesktop(nextpidl2); + if (isEmpty1 || isEmpty2) + return MAKE_COMPARE_HRESULT(isEmpty2 - isEmpty1); + + PITEMID_CHILD firstpidl = ILCloneFirst (pidl1); + if (!firstpidl) + return E_OUTOFMEMORY; + + CComPtr<IShellFolder> psf2; + HRESULT hr = psf->BindToObject(firstpidl, 0, IID_PPV_ARG(IShellFolder, &psf2)); + ILFree(firstpidl); + if (FAILED(hr)) + return MAKE_COMPARE_HRESULT(0); + + return psf2->CompareIDs(lParam, nextpidl1, nextpidl2); +} + HRESULT SHELL32_CompareDetails(IShellFolder2* isf, LPARAM lParam, LPCITEMIDLIST pidl1, LPCITEMIDLIST pidl2) { SHELLDETAILS sd; @@ -458,6 +481,8 @@ return MAKE_COMPARE_HRESULT(1); int ret = wcsicmp(wszItem1, wszItem2); + if (ret == 0) + return SHELL32_CompareChildren(isf, lParam, pidl1, pidl2); return MAKE_COMPARE_HRESULT(ret); }

7 years, 11 months

← Newer
1
...
25
26
27
28
29
30
31
32
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 November 2016