Ros-diffs March 2015

ros-diffs@reactos.org

18 participants
496 discussions

[dreimer] 66693: [RAPPS] Update russian description for Tuxpaint in rapps by Petr Akhlamov CORE-9153 #resolve #comment Added. Thx.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Mar 14 12:39:55 2015 New Revision: 66693 URL: http://svn.reactos.org/svn/reactos?rev=66693&view=rev Log: [RAPPS] Update russian description for Tuxpaint in rapps by Petr Akhlamov CORE-9153 #resolve #comment Added. Thx. Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt Modified: trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps/tuxpaint.txt [iso-8859-1] Sat Mar 14 12:39:55 2015 @@ -38,6 +38,9 @@ Description = Un editor grafic bitmap, adresat copiilor. Size = 13,5 Mo +[Section.0419] +Description = Ð¡Ð²Ð¾Ð±Ð¾Ð´Ð½ÑÐ¹ Ð³ÑÐ°ÑÐ¸ÑÐµÑÐºÐ¸Ð¹ ÑÐµÐ´Ð°ÐºÑÐ¾Ñ Ð´Ð»Ñ Ð´ÐµÑÐµÐ¹. + [Section.041f] Description = KÃ¼Ã§Ã¼k Ã§ocuklar iÃ§in yapÄ±lmÄ±Å bir aÃ§Ä±k kaynak bit eÅlem Ã§izge dÃ¼zenleyicisi. Size = 13,5 MB

9 years, 6 months

[tkreuzer] 66692: [PSDK] Sync winternl.h with wine

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 12:32:08 2015 New Revision: 66692 URL: http://svn.reactos.org/svn/reactos?rev=66692&view=rev Log: [PSDK] Sync winternl.h with wine Modified: trunk/reactos/include/psdk/winternl.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re…

9 years, 6 months

[dreimer] 66691: [RAPPS] Add File search 6.8.1 to Database. Updates and German translation by me. CORE-9338 #resolve #comment Added, thx for reporting.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Mar 14 12:28:12 2015 New Revision: 66691 URL: http://svn.reactos.org/svn/reactos?rev=66691&view=rev Log: [RAPPS] Add File search 6.8.1 to Database. Updates and German translation by me. CORE-9338 #resolve #comment Added, thx for reporting. Added: trunk/reactos/base/applications/rapps/rapps/efserch.txt (with props) Added: trunk/reactos/base/applications/rapps/rapps/efserch.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps/efserch.txt (added) +++ trunk/reactos/base/applications/rapps/rapps/efserch.txt [iso-8859-1] Sat Mar 14 12:28:12 2015 @@ -0,0 +1,15 @@ +ï»¿; UTF-8 + +[Section] +Name = Effective File search +Version = 6.8.1 +Licence = Freeware +Description = File search compatible with ReactOS +Size = 944 kB +Category = 12 +URLSite = http://www.sowsoft.com +URLDownload = http://www.sowsoft.com/download/efsearch.zip +CDPath = none + +[Section.0407] +Description = ReactOS kompatibles Dateisuchprogramm Propchange: trunk/reactos/base/applications/rapps/rapps/efserch.txt ------------------------------------------------------------------------------ svn:eol-style = native

9 years, 6 months

[dreimer] 66690: [RAPPS] lack of a proxy configuration by Peter Hater. German translation updated by me. CORE-4852 #resolve #comment Committed, thx for help.

by dreimer＠svn.reactos.org

Author: dreimer Date: Sat Mar 14 12:20:45 2015 New Revision: 66690 URL: http://svn.reactos.org/svn/reactos?rev=66690&view=rev Log: [RAPPS] lack of a proxy configuration by Peter Hater. German translation updated by me. CORE-4852 #resolve #comment Committed, thx for help. Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt trunk/reactos/base/applications/rapps/lang/bg-BG.rc trunk/reactos/base/applications/rapps/lang/cs-CZ.rc trunk/reactos/base/applications/rapps/lang/de-DE.rc trunk/reactos/base/applications/rapps/lang/en-US.rc trunk/reactos/base/applications/rapps/lang/es-ES.rc trunk/reactos/base/applications/rapps/lang/fr-FR.rc trunk/reactos/base/applications/rapps/lang/he-IL.rc trunk/reactos/base/applications/rapps/lang/it-IT.rc trunk/reactos/base/applications/rapps/lang/ja-JP.rc trunk/reactos/base/applications/rapps/lang/no-NO.rc trunk/reactos/base/applications/rapps/lang/pl-PL.rc trunk/reactos/base/applications/rapps/lang/pt-BR.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ru-RU.rc trunk/reactos/base/applications/rapps/lang/sk-SK.rc trunk/reactos/base/applications/rapps/lang/sq-AL.rc trunk/reactos/base/applications/rapps/lang/sv-SE.rc trunk/reactos/base/applications/rapps/lang/tr-TR.rc trunk/reactos/base/applications/rapps/lang/uk-UA.rc trunk/reactos/base/applications/rapps/lang/zh-CN.rc trunk/reactos/base/applications/rapps/lang/zh-TW.rc trunk/reactos/base/applications/rapps/loaddlg.c trunk/reactos/base/applications/rapps/rapps.h trunk/reactos/base/applications/rapps/resource.h trunk/reactos/base/applications/rapps/settingsdlg.c trunk/reactos/base/applications/rapps/winmain.c Modified: trunk/reactos/base/applications/rapps/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/CM… ============================================================================== --- trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/CMakeLists.txt [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -20,7 +20,7 @@ add_executable(rapps ${SOURCE} rapps.rc) set_module_type(rapps win32gui UNICODE) target_link_libraries(rapps uuid) -add_importlibs(rapps advapi32 comctl32 gdi32 urlmon wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) +add_importlibs(rapps advapi32 comctl32 gdi32 wininet user32 shell32 shlwapi ole32 msvcrt kernel32 ntdll) add_pch(rapps rapps.h SOURCE) add_dependencies(rapps rappsmsg) add_message_headers(ANSI rappsmsg.mc) Modified: trunk/reactos/base/applications/rapps/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/bg-BG.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -56,7 +56,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 254, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 254, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸" FONT 8, "MS Shell Dlg" @@ -70,9 +70,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "ÐÐ·&Ð±Ð¾Ñ", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "Ð¡Ð»ÐµÐ´ ÑÐ»Ð°Ð³Ð°Ð½Ðµ, Ð¸Ð·Ð¿Ð¾Ð»Ð·Ð²Ð°Ð½Ð¸ÑÐµ ÑÐ°Ð¹Ð»Ð¾Ð²Ðµ Ð´Ð° ÑÐµ Ð¸Ð·ÑÑÐ¸Ð²Ð°Ñ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "ÐÐ¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð¾", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 116, 124, 60, 14 - PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "ÐÐ¾Ð´ÑÐ°Ð·Ð±Ð¸ÑÐ°Ð½Ð¾", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "ÐÐ¾Ð±ÑÐµ", IDOK, 116, 180, 60, 14 + PUSHBUTTON "ÐÑÐºÐ°Ð·", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/cs-CZ.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -57,7 +57,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "NastavenÃ" FONT 8, "MS Shell Dlg" @@ -71,9 +71,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&ProchÃ¡zet...", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Smazat instalÃ¡tor programu po dokonÄenÃ instalace", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "VÃ½chozÃ", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Storno", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "VÃ½chozÃ", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Storno", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/de-DE.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Einstellungen" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&WÃ¤hlen", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Installer nach Programminstallation lÃ¶schen", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Vorgabe", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Abbrechen", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "Proxy Einstellungen des Systems verwenden", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 160, 10 + CONTROL "Direkt (Kein Proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "Kein Proxy", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Vorgabe", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Abbrechen", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/en-US.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Settings" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Delete program installer after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/es-ES.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -55,7 +55,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ajustes" FONT 8, "MS Shell Dlg" @@ -69,9 +69,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Seleccionar", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Borrar el instalador del programa tras su instalaciÃ³n", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Por defecto", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "Aceptar", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Por defecto", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "Aceptar", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/fr-FR.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Configuration" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&SÃ©lectionner", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Supprimer l'installateur du programme aprÃ¨s l'installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Par dÃ©faut", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "Accepter", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Annuler", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Par dÃ©faut", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "Accepter", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Annuler", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/he-IL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/he-IL.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "××××¨××ª" FONT 8, "MS Shell Dlg" @@ -68,9 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "×××¨", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "×××§ ××ª ×§×××¥ ×××ª×§× × ××××¨ ×¡××× ×××ª×§× ×", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "××¨××¨×ª ××××", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "×××©××¨", IDOK, 116, 124, 60, 14 - PUSHBUTTON "×××××", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "××¨××¨×ª ××××", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "×××©××¨", IDOK, 116, 180, 60, 14 + PUSHBUTTON "×××××", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/it-IT.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Impostazioni" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Scegli", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Rimuovere la procedura di installazione dopo l'uso", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Predefiniti", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Annulla", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Predefiniti", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Annulla", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ja-JP.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "è¨å®" FONT 9, "MS UI Gothic" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "é¸æ(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "ã¤ã³ã¹ãã¼ã«å¾ã«ããã°ã©ã ã®ã¤ã³ã¹ãã¼ã©ãåé¤ãã(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "ããã©ã«ã", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "ããã©ã«ã", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "ãã£ã³ã»ã«", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/no-NO.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Settings" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Choose", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Delete installers of programs after installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancel", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Default", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Cancel", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pl-PL.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -60,7 +60,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ustawienia" FONT 8, "MS Shell Dlg" @@ -73,10 +73,17 @@ LTEXT "Katalog dla pobranych plikÃ³w:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP PUSHBUTTON "&Wybierz", IDC_CHOOSE, 187, 85, 50, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL AUTOCHECKBOX "&UsuÅ instalatory programÃ³w po ich zainstalowaniu", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "DomyÅlne", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Anuluj", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "DomyÅlne", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Anuluj", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/pt-BR.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ConfiguraÃ§Ãµes" FONT 8, "MS Shell Dlg" @@ -67,10 +67,17 @@ LTEXT "Pasta de download:", -1, 16, 75, 100, 9 EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&Escolher", IDC_CHOOSE, 187, 85, 50, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL AUTOCHECKBOX "&Deletar instalador apÃ³s a instalaÃ§Ã£o do programa", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "PadrÃ£o", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Cancelar", IDCANCEL, 181, 124, 60, 14 + PUSHBUTTON "PadrÃ£o", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Cancelar", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ro-RO.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -58,7 +58,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "PreferinÈe" FONT 8, "MS Shell Dlg" @@ -72,9 +72,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Spe&cificareâ¦", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "Èt&erge aplicaÈia de instalare dupÄ instalarea programului", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "&Implicite", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "Con&firmÄ", IDOK, 116, 124, 60, 14 - PUSHBUTTON "A&nuleazÄ", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "&Implicite", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "Con&firmÄ", IDOK, 116, 180, 60, 14 + PUSHBUTTON "A&nuleazÄ", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/ru-RU.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -52,7 +52,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ°ÑÐ°Ð¼ÐµÑÑÑ" FONT 8, "MS Shell Dlg" @@ -66,9 +66,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Ð&ÑÐ±ÑÐ°ÑÑ", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Ð£Ð´Ð°Ð»ÑÑÑ Ð¸Ð½ÑÑÐ°Ð»Ð»ÑÑÐ¾ÑÑ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼Ð¼ Ð¿Ð¾ÑÐ»Ðµ ÑÑÑÐ°Ð½Ð¾Ð²ÐºÐ¸", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "ÐÑÐ¼ÐµÐ½Ð°", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sk-SK.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -57,7 +57,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Nastavenia" FONT 8, "MS Shell Dlg" @@ -71,9 +71,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&VybraÅ¥", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&ZmazaÅ¥ inÅ¡talaÄnÃ© programy po nainÅ¡talovanÃ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "PredvolenÃ©", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "PredvolenÃ©", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "ZruÅ¡iÅ¥", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sq-AL.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -56,7 +56,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Konfigurime" FONT 8, "MS Shell Dlg" @@ -70,9 +70,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "Zgjedh", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "Fshi instaluesit e programeve pas instalimit", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Parazgjedhur", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Anulo", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Parazgjedhur", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Anulo", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/sv-SE.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -59,7 +59,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "InstÃ¤llningar" FONT 8, "MS Shell Dlg" @@ -73,9 +73,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&VÃ¤lj", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Ta bort programinstallerare efter installation", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Standard", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Avbryt", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Standard", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Avbryt", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/tr-TR.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "Ayarlar" FONT 8, "MS Shell Dlg" @@ -68,9 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&SeÃ§", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&Kurulumdan Sonra Ä°zlencenin Kurulum KÃ¼tÃ¼ÄÃ¼nÃ¼ Sil", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Ãn TanÄ±mlÄ±lar", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "Tamam", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Ä°ptal", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Ãn TanÄ±mlÄ±lar", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "Tamam", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Ä°ptal", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/uk-UA.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -60,7 +60,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "ÐÐ°Ð»Ð°ÑÑÑÐ²Ð°Ð½Ð½Ñ" FONT 8, "MS Shell Dlg" @@ -74,9 +74,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "&ÐÐ±ÑÐ°ÑÐ¸", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "&ÐÐ¸Ð´Ð°Ð»ÑÑÐ¸ ÑÐ½ÑÑÐ°Ð»ÑÑÐ¾ÑÐ¸ Ð¿ÑÐ¾Ð³ÑÐ°Ð¼ Ð¿ÑÑÐ»Ñ Ð²ÑÑÐ°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "OK", IDOK, 116, 124, 60, 14 - PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "Ð¡ÑÐ°Ð½Ð´Ð°ÑÑÐ½Ð¾", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "OK", IDOK, 116, 180, 60, 14 + PUSHBUTTON "Ð¡ÐºÐ°ÑÑÐ²Ð°ÑÐ¸", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-CN.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "è®¾ç½®" FONT 8, "MS Shell Dlg" @@ -68,9 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "éæ©(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£å®ç¨åºåå é¤å®è£ç¨åº(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "ç¼ºç", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "ç¡®å®", IDOK, 116, 124, 60, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "ç¼ºç", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "ç¡®å®", IDOK, 116, 180, 60, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/lang/zh-TW.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… ============================================================================== --- trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/lang/zh-TW.rc [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -54,7 +54,7 @@ END END -IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 144 +IDD_SETTINGS_DIALOG DIALOGEX 0, 0, 250, 200 STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU CAPTION "è¨å®" FONT 8, "MS Shell Dlg" @@ -68,9 +68,16 @@ EDITTEXT IDC_DOWNLOAD_DIR_EDIT, 15, 86, 166, 12, WS_CHILD | WS_VISIBLE | WS_GROUP | ES_AUTOHSCROLL PUSHBUTTON "é¸æ(&C)", IDC_CHOOSE, 187, 85, 50, 14 AUTOCHECKBOX "å¨å®è£å®ç¨å¼å¾åªé¤å®è£ç¨å¼(&D)", IDC_DEL_AFTER_INSTALL, 16, 100, 218, 12 - PUSHBUTTON "é è¨", IDC_DEFAULT_SETTINGS, 8, 124, 60, 14 - PUSHBUTTON "ç¢ºå®", IDOK, 116, 124, 60, 14 - PUSHBUTTON "åæ¶", IDCANCEL, 181, 124, 60, 14 + GROUPBOX "Proxy", -1, 4, 116, 240, 61 + CONTROL "System proxy settings", IDC_PROXY_DEFAULT, "Button", BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP, 15, 130, 87, 10 + CONTROL "Direct (No proxy)", IDC_NO_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 145, 71, 10 + CONTROL "Proxy", IDC_USE_PROXY, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 15, 160, 35, 10 + EDITTEXT IDC_PROXY_SERVER, 50, 160, 70, 14, ES_AUTOHSCROLL + LTEXT "No proxy for", -1, 122, 160, 42, 8 + EDITTEXT IDC_NO_PROXY_FOR, 165, 160, 70, 14, ES_AUTOHSCROLL + PUSHBUTTON "é è¨", IDC_DEFAULT_SETTINGS, 8, 180, 60, 14 + PUSHBUTTON "ç¢ºå®", IDOK, 116, 180, 60, 14 + PUSHBUTTON "åæ¶", IDCANCEL, 181, 180, 60, 14 END IDD_INSTALL_DIALOG DIALOGEX 0, 0, 216, 97 Modified: trunk/reactos/base/applications/rapps/loaddlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/lo… ============================================================================== --- trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/loaddlg.c [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -220,6 +220,8 @@ HANDLE hOut = INVALID_HANDLE_VALUE; unsigned char lpBuffer[4096]; const LPWSTR lpszAgent = L"RApps/1.0"; + URL_COMPONENTS urlComponents; + size_t urlLength; /* built the path for the download */ p = wcsrchr(AppInfo->szUrlDownload, L'/'); @@ -264,16 +266,41 @@ dl = CreateDl(Context, &bCancelled); if (dl == NULL) goto end; - hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + switch(SettingsInfo.Proxy) + { + case 0: /* preconfig */ + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + break; + case 1: /* direct (no proxy) */ + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); + break; + case 2: /* use proxy */ + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PROXY, SettingsInfo.szProxyServer, SettingsInfo.szNoProxyFor, 0); + break; + default: /* preconfig */ + hOpen = InternetOpenW(lpszAgent, INTERNET_OPEN_TYPE_PRECONFIG, NULL, NULL, 0); + break; + } if (!hOpen) goto end; hFile = InternetOpenUrlW(hOpen, AppInfo->szUrlDownload, NULL, 0, INTERNET_FLAG_PRAGMA_NOCACHE|INTERNET_FLAG_KEEP_CONNECTION, 0); - if(!hFile) goto end; + if (!hFile) goto end; + + memset(&urlComponents, 0, sizeof(urlComponents)); + urlComponents.dwStructSize = sizeof(urlComponents); + if(FAILED(StringCbLengthW(AppInfo->szUrlDownload, sizeof(AppInfo->szUrlDownload), &urlLength))) goto end; + urlComponents.dwSchemeLength = urlLength*sizeof(WCHAR); + urlComponents.lpszScheme = malloc(urlComponents.dwSchemeLength); + if(!InternetCrackUrlW(AppInfo->szUrlDownload, urlLength+1, ICU_DECODE | ICU_ESCAPE, &urlComponents)) goto end; + if(urlComponents.nScheme == INTERNET_SCHEME_HTTP || urlComponents.nScheme == INTERNET_SCHEME_HTTPS) + HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwBufLen, 0); + if(urlComponents.nScheme == INTERNET_SCHEME_FTP) + dwContentLen = FtpGetFileSize(hFile, &dwBufLen); + free(urlComponents.lpszScheme); hOut = CreateFileW(path, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, CREATE_ALWAYS, 0, NULL); if (hOut == INVALID_HANDLE_VALUE) goto end; - HttpQueryInfo(hFile, HTTP_QUERY_CONTENT_LENGTH | HTTP_QUERY_FLAG_NUMBER, &dwContentLen, &dwBufLen, 0); do { Modified: trunk/reactos/base/applications/rapps/rapps.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/ra… ============================================================================== --- trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/rapps.h [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -104,6 +104,10 @@ INT Top; INT Width; INT Height; + /* Proxy settings */ + INT Proxy; + WCHAR szProxyServer[MAX_PATH]; + WCHAR szNoProxyFor[MAX_PATH]; } SETTINGS_INFO, *PSETTINGS_INFO; Modified: trunk/reactos/base/applications/rapps/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/re… ============================================================================== --- trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/resource.h [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -45,6 +45,11 @@ #define IDC_INSTALL_TEXT 1010 #define IDC_CD_INSTALL 1011 #define IDC_DOWNLOAD_INSTALL 1012 +#define IDC_PROXY_DEFAULT 1013 +#define IDC_NO_PROXY 1014 +#define IDC_USE_PROXY 1015 +#define IDC_PROXY_SERVER 1016 +#define IDC_NO_PROXY_FOR 1017 /* Dialogs */ #define IDD_SETTINGS_DIALOG 300 Modified: trunk/reactos/base/applications/rapps/settingsdlg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/se… ============================================================================== --- trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/settingsdlg.c [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -57,6 +57,11 @@ SetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT), Info->szDownloadDir); + + CheckRadioButton(hDlg, IDC_PROXY_DEFAULT, IDC_USE_PROXY, IDC_PROXY_DEFAULT+Info->Proxy); + + SetWindowTextW(GetDlgItem(hDlg, IDC_PROXY_SERVER), Info->szProxyServer); + SetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), Info->szNoProxyFor); } static @@ -96,6 +101,18 @@ IS_CHECKED(NewSettingsInfo.bDelInstaller, IDC_DEL_AFTER_INSTALL); break; + case IDC_PROXY_DEFAULT: + NewSettingsInfo.Proxy = 0; + break; + + case IDC_NO_PROXY: + NewSettingsInfo.Proxy = 1; + break; + + case IDC_USE_PROXY: + NewSettingsInfo.Proxy = 2; + break; + case IDC_DEFAULT_SETTINGS: FillDefaultSettings(&NewSettingsInfo); InitSettingsControls(hDlg, &NewSettingsInfo); @@ -104,10 +121,20 @@ case IDOK: { WCHAR szDir[MAX_PATH]; + WCHAR szProxy[MAX_PATH]; + WCHAR szNoProxy[MAX_PATH]; DWORD dwAttr; GetWindowTextW(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT), szDir, MAX_PATH); + + GetWindowTextW(GetDlgItem(hDlg, IDC_PROXY_SERVER), + szProxy, MAX_PATH); + StringCbCopyW(NewSettingsInfo.szProxyServer, sizeof(NewSettingsInfo.szProxyServer), szProxy); + + GetWindowTextW(GetDlgItem(hDlg, IDC_NO_PROXY_FOR), + szNoProxy, MAX_PATH); + StringCbCopyW(NewSettingsInfo.szNoProxyFor, sizeof(NewSettingsInfo.szNoProxyFor), szNoProxy); dwAttr = GetFileAttributesW(szDir); if (dwAttr != INVALID_FILE_ATTRIBUTES && @@ -132,9 +159,11 @@ EndDialog(hDlg, LOWORD(wParam)); } } - - SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT)); - break; + else + { + SetFocus(GetDlgItem(hDlg, IDC_DOWNLOAD_DIR_EDIT)); + break; + } } SettingsInfo = NewSettingsInfo; Modified: trunk/reactos/base/applications/rapps/winmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/wi… ============================================================================== --- trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/rapps/winmain.c [iso-8859-1] Sat Mar 14 12:20:45 2015 @@ -46,6 +46,10 @@ pSettingsInfo->Top = CW_USEDEFAULT; pSettingsInfo->Width = 680; pSettingsInfo->Height = 450; + + pSettingsInfo->Proxy = 0; + StringCbCopyW(pSettingsInfo->szProxyServer, sizeof(pSettingsInfo->szProxyServer), L""); + StringCbCopyW(pSettingsInfo->szNoProxyFor, sizeof(pSettingsInfo->szNoProxyFor), L""); } static BOOL

9 years, 6 months

[akhaldi] 66689: [SHELL32] Show/Hide hidden files/folders through registry. By Lee Schroeder. CORE-9207

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 14 12:18:33 2015 New Revision: 66689 URL: http://svn.reactos.org/svn/reactos?rev=66689&view=rev Log: [SHELL32] Show/Hide hidden files/folders through registry. By Lee Schroeder. CORE-9207 Modified: trunk/reactos/boot/bootdata/hivedef.inf trunk/reactos/dll/win32/shell32/CDefView.cpp Modified: trunk/reactos/boot/bootdata/hivedef.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivedef.inf?… ============================================================================== --- trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivedef.inf [iso-8859-1] Sat Mar 14 12:18:33 2015 @@ -1842,6 +1842,7 @@ HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","ListviewShadow",0x00010001,0x00000001 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","HideFileExt",0x00010001,0x00000000 HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","StartMenuLogoff",0x00010001,0x00000001 +HKCU,"SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced","Hidden",0x00010003,1 ; default shell HKCU,"SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon",,0x00000012 Modified: trunk/reactos/dll/win32/shell32/CDefView.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CDefView… ============================================================================== --- trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CDefView.cpp [iso-8859-1] Sat Mar 14 12:18:33 2015 @@ -860,16 +860,34 @@ HRESULT CDefView::FillList() { CComPtr<IEnumIDList> pEnumIDList; - PITEMID_CHILD pidl; - DWORD dwFetched; - HRESULT hRes; - HDPA hdpa; + PITEMID_CHILD pidl; + DWORD dwFetched; + HRESULT hRes; + HDPA hdpa; + HKEY hKey; + DWORD dFlags = SHCONTF_NONFOLDERS | SHCONTF_FOLDERS; TRACE("%p\n", this); - /* get the itemlist from the shfolder*/ - /* FIXME: make showing hidden files a setting. */ - hRes = m_pSFParent->EnumObjects(m_hWnd, SHCONTF_NONFOLDERS | SHCONTF_FOLDERS | SHCONTF_INCLUDEHIDDEN, &pEnumIDList); + /* determine if there is a setting to show all the hidden files/folders */ + if (RegOpenKeyExW(HKEY_CURRENT_USER, L"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Advanced", 0, KEY_QUERY_VALUE, &hKey) == ERROR_SUCCESS) + { + DWORD dataLength, flagVal; + + dataLength = sizeof(flagVal); + if (RegQueryValueExW(hKey, L"Hidden", NULL, NULL, (LPBYTE)&flagVal, &dataLength) == ERROR_SUCCESS) + { + /* if the value is 1, then show all hidden files/folders */ + if (flagVal == 1) + dFlags |= SHCONTF_INCLUDEHIDDEN; + } + + /* close the key */ + RegCloseKey(hKey); + } + + /* get the itemlist from the shfolder */ + hRes = m_pSFParent->EnumObjects(m_hWnd, dFlags, &pEnumIDList); if (hRes != S_OK) { if (hRes == S_FALSE)

9 years, 6 months

[akhaldi] 66688: [DESK] Implement and export InstallScreenSaver{A, W}. By Peter Hater. CORE-6812

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 14 12:10:33 2015 New Revision: 66688 URL: http://svn.reactos.org/svn/reactos?rev=66688&view=rev Log: [DESK] Implement and export InstallScreenSaver{A,W}. By Peter Hater. CORE-6812 Modified: trunk/reactos/dll/cpl/desk/desk.c trunk/reactos/dll/cpl/desk/desk.spec Modified: trunk/reactos/dll/cpl/desk/desk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.c?rev=66… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.c [iso-8859-1] Sat Mar 14 12:10:33 2015 @@ -10,6 +10,7 @@ #include "desk.h" #include <cplext.h> +#include <debug.h> #define NUM_APPLETS (1) @@ -209,6 +210,82 @@ return FALSE; } +void +WINAPI +InstallScreenSaverW( + IN HWND hWindow, + IN HANDLE hInstance, + IN LPCWSTR pszFile, + IN UINT nCmdShow) +{ + WCHAR pszSystemDir[MAX_PATH]; + WCHAR pszDrive[2]; + WCHAR pszPath[MAX_PATH]; + WCHAR pszFilename[MAX_PATH]; + WCHAR pszExt[MAX_PATH]; + LPWSTR pszOutName; + UINT uCompressionType=FILE_COMPRESSION_NONE; + DWORD dwSourceSize; + DWORD dwTargetSize; + DWORD rc; + + if (!pszFile) + { + DPRINT("InstallScreenSaver() null file\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return; + } + DPRINT("InstallScreenSaver() Installing screensaver %ls\n", pszFile); + + rc = SetupGetFileCompressionInfoW(pszFile, &pszOutName, &dwSourceSize, &dwTargetSize, &uCompressionType); + if (ERROR_SUCCESS != rc) + { + DPRINT("InstallScreenSaver() SetupGetFileCompressionInfo failed with error 0x%lx\n", rc); + SetLastError(rc); + return; + } + if (!GetSystemDirectoryW((LPWSTR)pszSystemDir, sizeof(pszSystemDir)/sizeof(WCHAR))) + { + MyFree(pszOutName); + DPRINT("InstallScreenSaver() GetSystemDirectory failed with error 0x%lx\n", GetLastError()); + return; + } + _wsplitpath(pszOutName, pszDrive, pszPath, pszFilename, pszExt); + MyFree(pszOutName); + StringCbCatW(pszSystemDir, sizeof(pszSystemDir), L"\\"); + StringCbCatW(pszSystemDir, sizeof(pszSystemDir), pszFilename); + StringCbCatW(pszSystemDir, sizeof(pszSystemDir), pszExt); + rc = SetupDecompressOrCopyFileW(pszFile, pszSystemDir, &uCompressionType); + DPRINT("InstallScreenSaver() Copying to %ls, compression type %d return 0x%lx\n", pszFile, uCompressionType, rc); +} + +void +WINAPI +InstallScreenSaverA( + IN HWND hWindow, + IN HANDLE hInstance, + IN LPCSTR pszFile, + IN UINT nCmdShow) +{ + LPWSTR lpwString; + + if (!pszFile) + { + DPRINT("InstallScreenSaver() null file\n"); + SetLastError(ERROR_INVALID_PARAMETER); + return; + } + DPRINT("InstallScreenSaver() Install from file %s\n", pszFile); + lpwString = pSetupMultiByteToUnicode(pszFile, 0); + if (!lpwString) + { + DPRINT("InstallScreenSaver() not enough memory to convert string to unicode\n"); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return; + } + InstallScreenSaverW(hWindow, hInstance, lpwString, nCmdShow); + MyFree(lpwString); +} BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD dwReason, LPVOID lpvReserved) Modified: trunk/reactos/dll/cpl/desk/desk.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/desk/desk.spec?rev… ============================================================================== --- trunk/reactos/dll/cpl/desk/desk.spec [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/desk/desk.spec [iso-8859-1] Sat Mar 14 12:10:33 2015 @@ -1,3 +1,5 @@ @ stdcall CPlApplet(ptr long ptr ptr) @ stdcall DisplayClassInstaller(long ptr ptr) -@ stdcall DisplaySaveSettings(ptr ptr) +@ stdcall DisplaySaveSettings(ptr ptr) +@ stdcall InstallScreenSaverW(long long ptr long) +@ stdcall InstallScreenSaverA(long long ptr long)

9 years, 6 months

[akhaldi] 66687: [MPLAY32] Remove szPrevFile and related code without removing the part that invokes the file open dialog if playback is started when no media file is opened. By Ricardo Hanke. CORE...

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 14 12:05:49 2015 New Revision: 66687 URL: http://svn.reactos.org/svn/reactos?rev=66687&view=rev Log: [MPLAY32] Remove szPrevFile and related code without removing the part that invokes the file open dialog if playback is started when no media file is opened. By Ricardo Hanke. CORE-8477 Modified: trunk/reactos/base/applications/mplay32/mplay32.c Modified: trunk/reactos/base/applications/mplay32/mplay32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… ============================================================================== --- trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/mplay32/mplay32.c [iso-8859-1] Sat Mar 14 12:05:49 2015 @@ -18,7 +18,6 @@ HMENU hMainMenu = NULL; TCHAR szAppTitle[256] = _T(""); -TCHAR szPrevFile[MAX_PATH] = _T(""); TCHAR szDefaultFilter[MAX_PATH] = _T(""); TCHAR *szFilter = NULL; @@ -429,7 +428,6 @@ MaxFilePos = mciStatus.dwReturn; wDeviceId = mciOpen.wDeviceID; - StringCbCopy(szPrevFile, sizeof(szPrevFile), lpFileName); EnableMenuItems(hwnd); @@ -689,27 +687,14 @@ OpenMediaFile(HWND hwnd, LPTSTR lpFileName) { MCIERROR mciError; - TCHAR szLocalFileName[MAX_PATH]; - - if (lpFileName == NULL) - { - if (szPrevFile[0] == _T('\0')) - return; - - StringCbCopy(szLocalFileName, sizeof(szLocalFileName), szPrevFile); - } - else - { - StringCbCopy(szLocalFileName, sizeof(szLocalFileName), lpFileName); - } - - if (GetFileAttributes(szLocalFileName) == INVALID_FILE_ATTRIBUTES) + + if (GetFileAttributes(lpFileName) == INVALID_FILE_ATTRIBUTES) return; if (wDeviceId) CloseMediaFile(hwnd); - mciError = OpenMciDevice(hwnd, NULL, szLocalFileName); + mciError = OpenMciDevice(hwnd, NULL, lpFileName); if (mciError != 0) { ShowMCIError(hwnd, mciError); @@ -1103,10 +1088,7 @@ } else { - if (szPrevFile[0] == _T('\0')) - OpenFileDialog(hwnd); - else - OpenMediaFile(hwnd, NULL); + OpenFileDialog(hwnd); } break; } @@ -1137,7 +1119,6 @@ return 0; case IDM_CLOSE_FILE: - szPrevFile[0] = _T('\0'); CloseMediaFile(hwnd); break;

9 years, 6 months

[akhaldi] 66686: [INETCPL] Add a certificate picture to the Content Tab. Brought to you by Jared. CORE-9263

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Sat Mar 14 12:00:24 2015 New Revision: 66686 URL: http://svn.reactos.org/svn/reactos?rev=66686&view=rev Log: [INETCPL] Add a certificate picture to the Content Tab. Brought to you by Jared. CORE-9263 Added: trunk/reactos/dll/cpl/inetcpl/resources/ (with props) trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/ (with props) trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/COPYING (with props) trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Tango.txt (with props) trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Trusted.txt (with props) trunk/reactos/dll/cpl/inetcpl/resources/certificates.ico (with props) trunk/reactos/dll/cpl/inetcpl/resources/history.ico (with props) trunk/reactos/dll/cpl/inetcpl/resources/home.ico (with props) trunk/reactos/dll/cpl/inetcpl/resources/inetcpl.ico - copied unchanged from r66676, trunk/reactos/dll/cpl/inetcpl/inetcpl.ico trunk/reactos/dll/cpl/inetcpl/resources/restricted.ico (with props) trunk/reactos/dll/cpl/inetcpl/resources/trusted.ico (with props) Removed: trunk/reactos/dll/cpl/inetcpl/inetcpl.ico Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc trunk/reactos/dll/cpl/inetcpl/lang/He.rc trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc trunk/reactos/dll/cpl/inetcpl/lang/cs-CZ.rc trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc trunk/reactos/dll/cpl/inetcpl/lang/es-ES.rc trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc trunk/reactos/dll/cpl/inetcpl/lang/sq-AL.rc trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc trunk/reactos/dll/cpl/inetcpl/resource.h Removed: trunk/reactos/dll/cpl/inetcpl/inetcpl.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.ic… ============================================================================== Binary file - no diff available. Modified: trunk/reactos/dll/cpl/inetcpl/inetcpl.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/inetcpl.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/inetcpl.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -104,5 +104,10 @@ #include "wine/wine_common_ver.rc" /* @makedep: inetcpl.ico */ -ICO_MAIN ICON "inetcpl.ico" -ICO_INTERNET ICON "inetcpl.ico" +ICO_MAIN ICON "resources/inetcpl.ico" +ICO_INTERNET ICON "resources/inetcpl.ico" +ICO_CERTIFICATES ICON "resources/certificates.ico" +ICO_RESTRICTED ICON "resources/restricted.ico" +ICO_HISTORY ICON "resources/history.ico" +ICO_TRUSTED ICON "resources/trusted.ico" +ICO_HOME ICON "resources/home.ico" Modified: trunk/reactos/dll/cpl/inetcpl/lang/He.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/He.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/He.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/He.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -48,15 +48,17 @@ BEGIN GROUPBOX " ××£ ××××ª ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "×××¤×©×¨××ª× ×××××¨ ××ª ×××ª×××ª ×©×ª×©××© ×××£ ××××ª ×©××.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "××¢××× ×&× ××××", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "×¢××× &××¨×¨×ª ×××××", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "×¢××× &×¨××§", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "×××¡×××¨××ª ××××©× ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "××× × ×××× ×××××§ ××ª ××××××, ×¢×××××ª, ×××¡××¨×× ××¢×× ...", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "×××§ ×§××¦××...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "××××¨××ª...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -111,8 +113,9 @@ BEGIN GROUPBOX "×××©××¨×× ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "×××©××¨×× ××©××©×× ××× ×××××ª ×××ª× ××× ××× ×××××ª ×¨×©××××ª ×××¤××¦××.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "×××©××¨××...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "××¤××¦××...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/Sr.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -45,15 +45,17 @@ BEGIN GROUPBOX "ÐÐ¾ÑÐµÑÐ½Ð° ÑÑÑÐ°Ð½Ð°", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "ÐÐ·Ð°Ð±ÐµÑÐ¸ÑÐµ Ð°Ð´ÑÐµÑÑ ÐºÐ¾ÑÐ° ÑÐµ ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐ¸ÑÐ¸ Ð·Ð° Ð¿Ð¾ÑÐµÑÐ½Ñ ÑÑÑÐ°Ð½Ñ.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Ð¢ÐµÐºÑÑÐ° ÑÑÑÐ°Ð½Ð°", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&ÐÐ¾Ð´ÑÐ°Ð·ÑÐ¼ÐµÐ²Ð°Ð½Ð° ÑÑÑÐ°Ð½Ð°", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "ÐÑÐ°Ð·Ð½Ð° &ÑÑÑÐ°Ð½Ð°", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Browsing history", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "You can delete cached pages, cookies and other data.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -108,7 +110,7 @@ GROUPBOX "Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸", IDC_STATIC, 4, 4, 312, 50 LTEXT "Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸ ÑÐµ ÐºÐ¾ÑÐ¸ÑÑÐµ Ð·Ð° Ð»Ð¸ÑÐ½Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸ÑÑ, ÐºÐ°Ð¾ Ð¸ Ð·Ð° Ð¿ÑÐµÐ¿Ð¾Ð·Ð½Ð°Ð²Ð°ÑÐµ Ð°ÑÑÐ¾ÑÐ¸ÑÐµÑÐ° Ð¸ Ð¸Ð·Ð´Ð°Ð²Ð°ÑÐ° ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ°.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "ÐÐ·Ð´Ð°Ð²Ð°ÑÐ¸...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 @@ -138,8 +140,8 @@ GROUPBOX "PoÄetna strana", IDC_STATIC, 4, 4, 312, 56 LTEXT "Izaberite adresu koja Äe se koristiti za poÄetnu stranu.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&TekuÄa strana", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&Podrazumevana strana", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "Prazna &strana", IDC_HOME_BLANK, 230, 42, 80, 14 @@ -199,8 +201,9 @@ BEGIN GROUPBOX "Sertifikati", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Sertifikati se koriste za liÄnu identifikaciju, kao i za prepoznavanje autoriteta i izdavaÄa sertifikata.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Sertifikati...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "IzdavaÄi...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/cs-CZ… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/cs-CZ.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/cs-CZ.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -29,15 +29,17 @@ BEGIN GROUPBOX " DomovskÃ¡ strÃ¡nka ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "ZvolenÃ¡ adresa bude uloÅ¾ena jako domovskÃ¡ strÃ¡nka.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&AktuÃ¡lnÃ strÃ¡nka", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&VÃ½chozÃ strÃ¡nka", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&PrÃ¡zdnÃ¡ strÃ¡nka", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Historie prohlÃÅ¾enÃ ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "Lze smazat strÃ¡nky v mezipamÄti, cookies a dalÅ¡Ã data.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Smazat &soubory...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&NastavenÃ...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -91,8 +93,9 @@ BEGIN GROUPBOX " CertifikÃ¡ty ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "CertifikÃ¡ty slouÅ¾Ã k osobnÃ identifikaci a k identifikaci certifikaÄnÃch autorit a vydavatelÅ¯.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "CertifikÃ¡ty...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "VydavatelÃ©...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/de-DE… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/de-DE.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -44,15 +44,17 @@ BEGIN GROUPBOX " Startseite ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Sie kÃ¶nnen eine Adresse wÃ¤hlen, die als Startseite verwendet wird.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "A&ktuelle Seite", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&Standardseite", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&Leere Seite", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX " Browserverlauf ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "Sie kÃ¶nnen temporÃ¤re Dateien, Cookies und andere Daten lÃ¶schen.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "&Daten lÃ¶schen...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Einstellungen...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -106,8 +108,9 @@ BEGIN GROUPBOX " Zertifikate ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Zertifikate werden benutzt, um sich persÃ¶nlich, Zertifizierungsstellen und Herausgeber von Zertifikaten zu identifizieren.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Zertifikate...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Herausgeber...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/en-US… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/en-US.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -42,15 +42,17 @@ BEGIN GROUPBOX "Home page", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "You can choose the address that will be used as your home page.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Current page", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&Default page", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&Blank page", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Browsing history", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "You can delete cached pages, cookies and other data.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -104,8 +106,9 @@ BEGIN GROUPBOX "Certificates", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Certificates are used for your personal identification and to identify certificate authorities and publishers.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Certificates...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Publishers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/es-ES… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/es-ES.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/es-ES.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -22,15 +22,17 @@ BEGIN GROUPBOX "PÃ¡gina de inicio", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Puede elegir la direcciÃ³n que se mostrarÃ¡ al abrir el navegador.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "PÃ¡gina &actual", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&Predeterminada", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&En blanco", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Historial de navegaciÃ³n", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "Puede borrar pÃ¡ginas en cachÃ©, cookies y otros elementos.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "&Borrar archivos...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Ajustes...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -84,8 +86,9 @@ BEGIN GROUPBOX "Certificados", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Los certificados se utilizan para su identificaciÃ³n personal y para identificar tanto autoridades de certificaciÃ³n como certificadores.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Certificados...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Autoridades...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/fr-FR… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/fr-FR.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -46,15 +46,17 @@ BEGIN GROUPBOX " Page d'accueil ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Vous pouvez spÃ©cifier l'adresse Ã utiliser comme page d'accueil :", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "Page &courante", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "Page par &dÃ©faut", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "Page &blanche", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Historique de navigation ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "Vous pouvez effacer les pages en cache, les cookies et d'autres donnÃ©es.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "&Effacer les fichiers...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&ParamÃ¨tres...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -108,8 +110,9 @@ BEGIN GROUPBOX " Certificats ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Les certificats sont utilisÃ©s pour votre identification personnelle, celle d'autoritÃ©s de certification ou d'Ã©diteurs.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Certificats...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Ãditeurs...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/it-IT… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/it-IT.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -45,15 +45,17 @@ BEGIN GROUPBOX "Pagina iniziale ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Puoi scegliere l'indirizzo che sarÃ usato come tua pagina iniziale.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "Pagina &attuale", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "Pagina &predefinita", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "Pagina &vuota", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Storia navigazione ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "E' possibile cancellare le pagine in cache,i cookies e altri dati.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Cancella...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Impostazioni...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -107,8 +109,9 @@ BEGIN GROUPBOX " Certificati ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "I certificati sono usati per la tua identificazione personale e per identificare le autoritÃ e gli editori dei certificati.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Certificati...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Editori...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ja-JP… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/ja-JP.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -46,15 +46,17 @@ BEGIN GROUPBOX "ãã¼ã ãã¼ã¸ ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "ãã¼ã ãã¼ã¸ã¨ãã¦ä½¿ãããã¢ãã¬ã¹ãé¸ã¹ã¾ãã", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "ç¾å¨ã®ãã¼ã¸(&C)", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "ããã©ã«ã(&D)", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "ç©ºç½(&B)", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "é²è¦§å±¥æ´ ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "ãã£ãã·ã¥ããããã¼ã¸ãã¯ããã¼ããã®ä»ã®ãã¼ã¿ãåé¤ã§ãã¾ãã", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "ãã¡ã¤ã«ãåé¤(&F)...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "è¨å®(&S)...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -108,8 +110,9 @@ BEGIN GROUPBOX "è¨¼ææ¸ ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "è¨¼ææ¸ã¯åäººèªè¨¼ãè¨¼ææ¸ã®æ¨©éã¨çºè¡åãç¢ºèªããããã«ä½¿ããã¾ãã", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "è¨¼ææ¸...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "çºè¡å...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ko-KR… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/ko-KR.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -45,15 +45,17 @@ BEGIN GROUPBOX "í íì´ì§ ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "ííì´ì§ë¡ ì¬ì©í ì£¼ìë¥¼ ì íí ì ììµëë¤.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "íì¬ íì´ì§(&C)", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "ê¸°ë³¸ íì´ì§(&D)", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "ë¹ íì´ì§(&B)", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "ë°©ë¬¸ ê¸°ë¡ ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "ë¹ì ì ìºìë íì´ì§,ì¿ í¤ë ë¤ë¥¸ ë°ì´í°ë¥¼ ì§ì¸ ì ììµëë¤.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "íì¼ë¤ ì§ì°ê¸°(&F)...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "ì¤ì (&S)...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -107,8 +109,9 @@ BEGIN GROUPBOX "ì¸ì¦ì ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "ì¸ì¦ìë ë¹ì ì ê°ì¸ ìë³ê³¼ ì¸ì¦ê¸°ê´ê³¼ ê²ìì ìë³ì ì¬ì©ë©ëë¤.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "ì¸ì¦ì...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "ë°íì...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/lt-LT… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/lt-LT.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -45,15 +45,17 @@ BEGIN GROUPBOX "PradÅ¾ios tinklalapis ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Galite pasirinkti adresÄ, kuris bus naudojamas kaip jÅ«sÅ³ pradÅ¾ios tinklalapis.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Dabartinis puslapis", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&Numatytasis puslapis", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&TuÅ¡Äias puslapis", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "NarÅ¡ymo istorija ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "JÅ«s galite paÅ¡alinti puslapius podÄlyje, slapukus ir kitus duomenis.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Å alinti &failus...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "Nuo&statos...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -107,8 +109,9 @@ BEGIN GROUPBOX "Liudijimai ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Liudijimai yra naudojami jÅ«sÅ³ tapatumo nustatymui ir liudijimo Ä¯staigÅ³ bei publikuotojÅ³ tapatumui nustatyti.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Liudijimai...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Publikuotojai...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/nl-NL… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/nl-NL.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -42,15 +42,17 @@ BEGIN GROUPBOX "Startpagina ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Hier kunt u het adres kiezen dat gebruikt wordt als uw startpagina.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Huidige pagina", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&Standaardpagina", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&Lege pagina", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Browsing history", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "You can delete cached pages, cookies and other data.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -104,8 +106,9 @@ BEGIN GROUPBOX "Certificaten ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Certificaten worden gebruikt voor uw persoonlijke identificatie en om certificaat-autoriteiten en uitgevers te identificeren.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Certificaten...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Uitgevers...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pl-PL… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pl-PL.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -45,15 +45,17 @@ BEGIN GROUPBOX "Strona domowa ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "MoÅ¼esz wybraÄ adres strony, ktÃ³ra bÄdzie twojÄ stronÄ domowÄ.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "UÅ¼yj &bieÅ¼Äcej", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "UÅ¼yj d&omyÅlnej", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "UÅ¼yj pu&stej", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Historia przeglÄdania ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "MoÅ¼esz usunÄÄ przechowywane strony, ciasteczka i inne dane.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "&UsuÅ pliki...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "Ustawie&nia...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -107,8 +109,9 @@ BEGIN GROUPBOX "Certyfikaty ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Certyfikaty sÄ uÅ¼ywane do twojej osobistej identyfikacji oraz do identyfikacji wydawcÃ³w i urzÄdÃ³w certyfikujÄcych.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Certyfikaty...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Wydawcy...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/pt-BR… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/pt-BR.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -44,15 +44,17 @@ BEGIN GROUPBOX "PÃ¡gina inicial ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Escolha o endereÃ§o que serÃ¡ usado como pÃ¡gina inicial.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "PÃ¡gina &atual", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "PÃ¡gina &padrÃ£o", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "PÃ¡gina em &branco", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Browsing history", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "You can delete cached pages, cookies and other data.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -106,8 +108,9 @@ BEGIN GROUPBOX "Certificados ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Certificados sÃ£o usados para sua identificaÃ§Ã£o pessoal e para identificar certificados de autoridades e editores.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Certificados...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Editores...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ro-RO… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/ro-RO.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -44,15 +44,17 @@ BEGIN GROUPBOX "PaginÄ implicitÄ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "AlegeÈi o adresÄ la care veÈi reveni frecvent (deschisÄ odatÄ cu navigatorul).", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "Pagina &curentÄ", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "Pagina i&mplicitÄ", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&PaginÄ goalÄ", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Istoric de navigare", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "PuteÈi elimina datele stocate temporar, indicatoarele de conexiune Èi alte date.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "&Eliminare fiÈiereâ¦", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&OpÈiuniâ¦", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -106,8 +108,9 @@ BEGIN GROUPBOX "Certificate", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Certificatele sunt utilizate pentru identificarea personalÄ, pentru identificarea autoritÄÈilor emitente de certificate Èi pentru identificarea agenÈilor publici.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "&Certificateâ¦", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "AgenÈi pu&bliciâ¦", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/ru-RU… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/ru-RU.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -45,15 +45,17 @@ BEGIN GROUPBOX "ÐÐ¾Ð¼Ð°ÑÐ½ÑÑ ÑÑÑÐ°Ð½Ð¸ÑÐ° ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Ð£ÐºÐ°Ð¶Ð¸ÑÐµ Ð°Ð´ÑÐµÑ Ð´Ð»Ñ Ð²Ð°ÑÐµÐ¹ Ð´Ð¾Ð¼Ð°ÑÐ½ÐµÐ¹ ÑÑÑÐ°Ð½Ð¸ÑÑ:", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Ð¢ÐµÐºÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&ÐÐ¾ ÑÐ¼Ð¾Ð»ÑÐ°Ð½Ð¸Ñ", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "ÐÑ&ÑÑÐ°Ñ ÑÑÑÐ°Ð½Ð¸ÑÐ°", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX " ÐÑÑÐ¾ÑÐ¸Ñ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð±ÑÐ°ÑÐ·ÐµÑÐ° ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "ÐÑ Ð¼Ð¾Ð¶ÐµÑÐµ ÑÐ´Ð°Ð»Ð¸ÑÑ ÐºÑÑÐ¸ÑÐ¾Ð²Ð°Ð½Ð½ÑÐµ ÑÑÑÐ°Ð½Ð¸ÑÑ, ÑÐ°Ð¹Ð»Ñ cookies Ð¸ Ð´ÑÑÐ³Ð¸Ðµ Ð´Ð°Ð½Ð½ÑÐµ.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Ð£Ð´Ð°Ð»Ð¸ÑÑ &ÑÐ°Ð¹Ð»Ñ...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&ÐÐ°ÑÑÑÐ¾Ð¹ÐºÐ¸...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -107,8 +109,9 @@ BEGIN GROUPBOX "Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÑ ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÑ Ð¸ÑÐ¿Ð¾Ð»ÑÐ·ÑÑÑÑÑ Ð´Ð»Ñ Ð¸Ð´ÐµÐ½ÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸ Ð»Ð¸ÑÐ½Ð¾ÑÑÐ¸, Ð° ÑÐ°ÐºÐ¶Ðµ Ð´Ð»Ñ Ð¿ÑÐ¾Ð²ÐµÑÐºÐ¸ Ð¿Ð¾Ð´Ð»Ð¸Ð½Ð½Ð¾ÑÑÐ¸ ÑÐµÐ½ÑÑÐ¾Ð² ÑÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÐ¸Ð¸ Ð¸ Ð¸Ð·Ð´Ð°ÑÐµÐ»ÐµÐ¹.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Ð¡ÐµÑÑÐ¸ÑÐ¸ÐºÐ°ÑÑ...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "ÐÐ·Ð´Ð°ÑÐµÐ»Ð¸...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/sq-AL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/sq-AL… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/sq-AL.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/sq-AL.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -44,15 +44,17 @@ BEGIN GROUPBOX "Faqja ShtÃ«pi ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Ju mund tÃ« zgjidhni adresÃ«n qÃ« do tÃ« pÃ«rdoret si faqja juaj shtÃ«pi.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Faqja e tanishme", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&Faqja e parazgjedhur", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&Faqja bosh", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Historia Shfletimit ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "You can delete cached pages, cookies and other data.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Fshi &dokumentat...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Konfigurime...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -106,8 +108,9 @@ BEGIN GROUPBOX "Certifikata ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Certifikatat janÃ« pÃ«rdorur pÃ«r identifikimin tuaj personale dhe pÃ«r tÃ« identifikuar autoritetet certifikuese dhe botuesit.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Certifikata...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Botuesit...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/sv-SE… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/sv-SE.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -44,15 +44,17 @@ BEGIN GROUPBOX "Startsida ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Du kan vÃ¤lja vilken adress som ska anvÃ¤ndas som startsida.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Aktuell sida", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "FÃ¶r&vald sida", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&Blank sida", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "BlÃ¤ddringshistorik ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "Du kan ta bort cachade sidor, kakor och annan data.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Ta bort &filer...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&InstÃ¤llningar...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -106,8 +108,9 @@ BEGIN GROUPBOX "Certifikat ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Certifikat anvÃ¤nds fÃ¶r din personliga identifikation samt fÃ¶r att identifiera certifikats-auktoriteter och -utgivare.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Certifikat...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "Utgivare...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/tr-TR… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/tr-TR.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -45,15 +45,17 @@ BEGIN GROUPBOX "Ana Sayfa ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "Ana sayfanÄ±z olarak kullanÄ±lacak adresi deÄiÅtirebilirsiniz.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&Åimdiki Sayfa", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&Ãn TanÄ±mlÄ± Sayfa", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "&BoÅ Sayfa", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Tarama GeÃ§miÅi ", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "Saklanan sayfalarÄ±, tanÄ±mlama bilgilerini ve baÅka verileri silebilirsiniz.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "&KÃ¼tÃ¼kleri Sil...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Ayarlar...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -107,8 +109,9 @@ BEGIN GROUPBOX "Onay Belgeleri ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Onay belgeleri, ÅahsÃ® tanÄ±lamanÄ±zda ve onay belgesi yetkilileriyle yayÄ±mcÄ±larÄ± tanÄ±mada kullanÄ±lÄ±r.", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "&Onay Belgeleri...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "&YayÄ±mcÄ±lar...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/lang/uk-UA… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/lang/uk-UA.rc [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -46,15 +46,17 @@ BEGIN GROUPBOX "ÐÐ¾Ð¼Ð°ÑÐ½Ñ ÑÑÐ¾ÑÑÐ½ÐºÐ° ", IDC_STATIC, 4, 4, 312, 56 + ICON ICO_HOME, ICO_HOME, 10, 15, 21, 20 LTEXT "ÐÐ¸ Ð¼Ð¾Ð¶ÐµÑÐµ Ð²ÐºÐ°Ð·Ð°ÑÐ¸ Ð°Ð´ÑÐµÑÑ, ÑÐ¾ Ð±ÑÐ´Ðµ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ°Ð½Ð° ÑÐº Ð´Ð¾Ð¼Ð°ÑÐ½Ñ ÑÑÐ¾ÑÑÐ½ÐºÐ°.", - IDC_STATIC, 10, 14, 300, 10 - EDITTEXT IDC_HOME_EDIT, 10, 26, 300, 12, WS_VISIBLE | ES_AUTOHSCROLL + IDC_STATIC, 40, 14, 265, 10 + EDITTEXT IDC_HOME_EDIT, 40, 26, 270, 12, WS_VISIBLE | ES_AUTOHSCROLL PUSHBUTTON "&ÐÐ¾ÑÐ¾ÑÐ½Ð° ÑÑÐ¾ÑÑÐ½ÐºÐ°", IDC_HOME_CURRENT, 58, 42, 80, 14 PUSHBUTTON "&ÐÐ° Ð·Ð°Ð¼Ð¾Ð²ÑÑÐ²Ð°Ð½Ð½ÑÐ¼", IDC_HOME_DEFAULT, 144, 42, 80, 14 PUSHBUTTON "ÐÐ¾&ÑÐ¾Ð¶Ð½Ñ ÑÑÐ¾ÑÑÐ½ÐºÐ°", IDC_HOME_BLANK, 230, 42, 80, 14 GROUPBOX "Browsing history", IDC_STATIC, 4, 66, 312, 42 + ICON ICO_HISTORY, ICO_HISTORY, 10, 78, 80, 14 LTEXT "You can delete cached pages, cookies and other data.", - IDC_STATIC, 10, 76, 300, 10 + IDC_STATIC, 40, 76, 270, 10 PUSHBUTTON "Delete &files...", IDC_HISTORY_DELETE, 144, 90, 80, 14 PUSHBUTTON "&Settings...", IDC_HISTORY_SETTINGS, 230, 90, 80, 14 @@ -108,8 +110,9 @@ BEGIN GROUPBOX "Ð¡ÐµÑÑÐ¸ÑÑÐºÐ°ÑÐ¸ ", IDC_STATIC, 4, 4, 312, 50 + ICON ICO_CERTIFICATES, ICO_CERTIFICATES, 10, 15, 21, 20 LTEXT "Ð¡ÐµÑÑÐ¸ÑÑÐºÐ°ÑÐ¸ Ð²Ð¸ÐºÐ¾ÑÐ¸ÑÑÐ¾Ð²ÑÑÑÑÑÑ Ð´Ð»Ñ Ð²Ð°ÑÐ¾Ñ ÑÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÑÑ ÑÐ° Ð´Ð»Ñ ÑÐ´ÐµÐ½ÑÐ¸ÑÑÐºÐ°ÑÑÑ Ð¾ÑÐ³Ð°Ð½ÑÐ² ÑÐµÑÑÐ¸ÑÑÐºÐ°ÑÑÑ ÑÐ° Ð²Ð¸Ð´Ð°Ð²ÑÑÐ².", - IDC_STATIC, 58, 14, 252, 18 + IDC_STATIC, 40, 14, 252, 18 PUSHBUTTON "Ð¡ÐµÑÑÐ¸ÑÑÐºÐ°ÑÐ¸...", IDC_CERT, 146, 34, 80, 14 PUSHBUTTON "ÐÐ¸Ð´Ð°Ð²ÑÑ...", IDC_CERT_PUBLISHER, 230, 34, 80, 14 Modified: trunk/reactos/dll/cpl/inetcpl/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resource.h… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/resource.h [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/inetcpl/resource.h [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -2,7 +2,12 @@ /* icons */ #define ICO_MAIN 100 +#define ICO_RESTRICTED 4481 +#define ICO_TRUSTED 4480 #define ICO_INTERNET 1313 +#define ICO_CERTIFICATES 1314 +#define ICO_HISTORY 1315 +#define ICO_HOME 1316 /* strings */ #define IDS_CPL_NAME 1 Propchange: trunk/reactos/dll/cpl/inetcpl/resources/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Mar 14 12:00:24 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/cpl/inetcpl/resources/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/cpl/inetcpl/resources/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/cpl/inetcpl/resources/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Propchange: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Sat Mar 14 12:00:24 2015 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/COPYING URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/COPYING (added) +++ trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/COPYING [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -0,0 +1,67 @@ +Creative Commons Attribution-ShareAlike 2.5 License Agreement + +CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE. + +License + +THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED. + +BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE TO BE BOUND BY THE TERMS OF THIS LICENSE. THE LICENSOR GRANTS YOU THE RIGHTS CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND CONDITIONS. + +1. Definitions + + 1. "Collective Work" means a work, such as a periodical issue, anthology or encyclopedia, in which the Work in its entirety in unmodified form, along with a number of other contributions, constituting separate and independent works in themselves, are assembled into a collective whole. A work that constitutes a Collective Work will not be considered a Derivative Work (as defined below) for the purposes of this License. + 2. "Derivative Work" means a work based upon the Work or upon the Work and other pre-existing works, such as a translation, musical arrangement, dramatization, fictionalization, motion picture version, sound recording, art reproduction, abridgment, condensation, or any other form in which the Work may be recast, transformed, or adapted, except that a work that constitutes a Collective Work will not be considered a Derivative Work for the purpose of this License. For the avoidance of doubt, where the Work is a musical composition or sound recording, the synchronization of the Work in timed-relation with a moving image ("synching") will be considered a Derivative Work for the purpose of this License. + 3. "Licensor" means the individual or entity that offers the Work under the terms of this License. + 4. "Original Author" means the individual or entity who created the Work. + 5. "Work" means the copyrightable work of authorship offered under the terms of this License. + 6. "You" means an individual or entity exercising rights under this License who has not previously violated the terms of this License with respect to the Work, or who has received express permission from the Licensor to exercise rights under this License despite a previous violation. + 7. "License Elements" means the following high-level license attributes as selected by Licensor and indicated in the title of this License: Attribution, ShareAlike. + +2. Fair Use Rights. Nothing in this license is intended to reduce, limit, or restrict any rights arising from fair use, first sale or other limitations on the exclusive rights of the copyright owner under copyright law or other applicable laws. + +3. License Grant. Subject to the terms and conditions of this License, Licensor hereby grants You a worldwide, royalty-free, non-exclusive, perpetual (for the duration of the applicable copyright) license to exercise the rights in the Work as stated below: + + 1. to reproduce the Work, to incorporate the Work into one or more Collective Works, and to reproduce the Work as incorporated in the Collective Works; + 2. to create and reproduce Derivative Works; + 3. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission the Work including as incorporated in Collective Works; + 4. to distribute copies or phonorecords of, display publicly, perform publicly, and perform publicly by means of a digital audio transmission Derivative Works. + 5. + + For the avoidance of doubt, where the work is a musical composition: + 1. Performance Royalties Under Blanket Licenses. Licensor waives the exclusive right to collect, whether individually or via a performance rights society (e.g. ASCAP, BMI, SESAC), royalties for the public performance or public digital performance (e.g. webcast) of the Work. + 2. Mechanical Rights and Statutory Royalties. Licensor waives the exclusive right to collect, whether individually or via a music rights society or designated agent (e.g. Harry Fox Agency), royalties for any phonorecord You create from the Work ("cover version") and distribute, subject to the compulsory license created by 17 USC Section 115 of the US Copyright Act (or the equivalent in other jurisdictions). + 6. Webcasting Rights and Statutory Royalties. For the avoidance of doubt, where the Work is a sound recording, Licensor waives the exclusive right to collect, whether individually or via a performance-rights society (e.g. SoundExchange), royalties for the public digital performance (e.g. webcast) of the Work, subject to the compulsory license created by 17 USC Section 114 of the US Copyright Act (or the equivalent in other jurisdictions). + +The above rights may be exercised in all media and formats whether now known or hereafter devised. The above rights include the right to make such modifications as are technically necessary to exercise the rights in other media and formats. All rights not expressly granted by Licensor are hereby reserved. + +4. Restrictions.The license granted in Section 3 above is expressly made subject to and limited by the following restrictions: + + 1. You may distribute, publicly display, publicly perform, or publicly digitally perform the Work only under the terms of this License, and You must include a copy of, or the Uniform Resource Identifier for, this License with every copy or phonorecord of the Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Work that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder. You may not sublicense the Work. You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Work itself to be made subject to the terms of this License. If You create a Collective Work, upon notice from any Licensor You must, to the extent practicable, remove from the Collective Work any credit as required by clause 4(c), as requested. If You create a Derivative Work, upon notice from any Licensor You must, to the extent practicable, remove from the Derivative Work any credit as required by clause 4(c), as requested. + 2. You may distribute, publicly display, publicly perform, or publicly digitally perform a Derivative Work only under the terms of this License, a later version of this License with the same License Elements as this License, or a Creative Commons iCommons license that contains the same License Elements as this License (e.g. Attribution-ShareAlike 2.5 Japan). You must include a copy of, or the Uniform Resource Identifier for, this License or other license specified in the previous sentence with every copy or phonorecord of each Derivative Work You distribute, publicly display, publicly perform, or publicly digitally perform. You may not offer or impose any terms on the Derivative Works that alter or restrict the terms of this License or the recipients' exercise of the rights granted hereunder, and You must keep intact all notices that refer to this License and to the disclaimer of warranties. You may not distribute, publicly display, publicly perform, or publicly digitally perform the Derivative Work with any technological measures that control access or use of the Work in a manner inconsistent with the terms of this License Agreement. The above applies to the Derivative Work as incorporated in a Collective Work, but this does not require the Collective Work apart from the Derivative Work itself to be made subject to the terms of this License. + 3. If you distribute, publicly display, publicly perform, or publicly digitally perform the Work or any Derivative Works or Collective Works, You must keep intact all copyright notices for the Work and provide, reasonable to the medium or means You are utilizing: (i) the name of the Original Author (or pseudonym, if applicable) if supplied, and/or (ii) if the Original Author and/or Licensor designate another party or parties (e.g. a sponsor institute, publishing entity, journal) for attribution in Licensor's copyright notice, terms of service or by other reasonable means, the name of such party or parties; the title of the Work if supplied; to the extent reasonably practicable, the Uniform Resource Identifier, if any, that Licensor specifies to be associated with the Work, unless such URI does not refer to the copyright notice or licensing information for the Work; and in the case of a Derivative Work, a credit identifying the use of the Work in the Derivative Work (e.g., "French translation of the Work by Original Author," or "Screenplay based on original Work by Original Author"). Such credit may be implemented in any reasonable manner; provided, however, that in the case of a Derivative Work or Collective Work, at a minimum such credit will appear where any other comparable authorship credit appears and in a manner at least as prominent as such other comparable authorship credit. + +5. Representations, Warranties and Disclaimer + +UNLESS OTHERWISE AGREED TO BY THE PARTIES IN WRITING, LICENSOR OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY KIND CONCERNING THE MATERIALS, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE, INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY, FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS, WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU. + +6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. + +7. Termination + + 1. This License and the rights granted hereunder will terminate automatically upon any breach by You of the terms of this License. Individuals or entities who have received Derivative Works or Collective Works from You under this License, however, will not have their licenses terminated provided such individuals or entities remain in full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will survive any termination of this License. + 2. Subject to the above terms and conditions, the license granted here is perpetual (for the duration of the applicable copyright in the Work). Notwithstanding the above, Licensor reserves the right to release the Work under different license terms or to stop distributing the Work at any time; provided, however that any such election will not serve to withdraw this License (or any other license that has been, or is required to be, granted under the terms of this License), and this License will continue in full force and effect unless terminated as stated above. + +8. Miscellaneous + + 1. Each time You distribute or publicly digitally perform the Work or a Collective Work, the Licensor offers to the recipient a license to the Work on the same terms and conditions as the license granted to You under this License. + 2. Each time You distribute or publicly digitally perform a Derivative Work, Licensor offers to the recipient a license to the original Work on the same terms and conditions as the license granted to You under this License. + 3. If any provision of this License is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this License, and without further action by the parties to this agreement, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable. + 4. No term or provision of this License shall be deemed waived and no breach consented to unless such waiver or consent shall be in writing and signed by the party to be charged with such waiver or consent. + 5. This License constitutes the entire agreement between the parties with respect to the Work licensed here. There are no understandings, agreements or representations with respect to the Work not specified here. Licensor shall not be bound by any additional provisions that may appear in any communication from You. This License may not be modified without the mutual written agreement of the Licensor and You. + +Creative Commons is not a party to this License, and makes no warranty whatsoever in connection with the Work. Creative Commons will not be liable to You or any party on any legal theory for any damages whatsoever, including without limitation any general, special, incidental or consequential damages arising in connection to this license. Notwithstanding the foregoing two (2) sentences, if Creative Commons has expressly identified itself as the Licensor hereunder, it shall have all rights and obligations of Licensor. + +Except for the limited purpose of indicating to the public that the Work is licensed under the CCPL, neither party will use the trademark "Creative Commons" or any related trademark or logo of Creative Commons without the prior written consent of Creative Commons. Any permitted use will be in compliance with Creative Commons' then-current trademark usage guidelines, as may be published on its website or otherwise made available upon request from time to time. + +Creative Commons may be contacted at http://creativecommons.org/. Propchange: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/COPYING ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Tango.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Tango.txt (added) +++ trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Tango.txt [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -0,0 +1,127 @@ +The following icons are the property of the Tango project and are +released under Creative Commons Attribution-ShareAlike 2.5 License. +Please see COPYING for details + +1.ico +2.ico +3.ico +4.ico +5.ico +6.ico +7.ico +8.ico +9.ico +10.ico +11.ico +12.ico +13.ico +14.ico +15.ico +16.ico +17.ico +18.ico +19.ico +20.ico +21.ico +22.ico +23.ico +24.ico +25.ico +28.ico +29.ico +30.ico +32.ico +33.ico +35.ico +36.ico +37.ico +38.ico +39.ico +41.ico +44.ico +45.ico +46.ico +47.ico +48.ico +54.ico +137.ico +138.ico +151.ico +152.ico +153.ico +154.ico +155.ico +156.ico +157.ico +160.ico +161.ico +172.ico +173.ico +191.ico +192.ico +210.ico +220.ico +221.ico +222.ico +224.ico +225.ico +226.ico +228.ico +233.ico +235.ico +236.ico +237.ico +238.ico +240.ico +245.ico +246.ico +248.ico +249.ico +250.ico +252.ico +254.ico +255.ico +263.ico +265.ico +268.ico +269.ico +270.ico +271.ico +277.ico +279.ico +289.ico +290.ico +291.ico +292.ico +293.ico +294.ico +295.ico +296.ico +297.ico +298.ico +299.ico +302.ico +304.ico +305.ico +309.ico +315.ico +317.ico +318.ico +319.ico +322.ico +323.ico +324.ico +325.ico +326.ico +327.ico +328.ico +329.ico +330.ico +1001.ico +1004.ico +8240.ico +16710.ico +16715.ico +16717.ico +16718.ico +16721.ico Propchange: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Tango.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Trusted.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== --- trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Trusted.txt (added) +++ trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Trusted.txt [iso-8859-1] Sat Mar 14 12:00:24 2015 @@ -0,0 +1 @@ +The file trusted.ico was retrived from here http://lists.freedesktop.org/archives/tango-artists/attachments/20051206/36… and is released under public domain. Propchange: trunk/reactos/dll/cpl/inetcpl/resources/Icon_Licence/Trusted.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/cpl/inetcpl/resources/certificates.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/inetcpl/resources/certificates.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/inetcpl/resources/history.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/inetcpl/resources/history.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/inetcpl/resources/home.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/inetcpl/resources/home.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/inetcpl/resources/restricted.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/inetcpl/resources/restricted.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: trunk/reactos/dll/cpl/inetcpl/resources/trusted.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/inetcpl/resources/… ============================================================================== Binary file - no diff available. Propchange: trunk/reactos/dll/cpl/inetcpl/resources/trusted.ico ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream

9 years, 6 months

[tkreuzer] 66685: [WIN32K] Initialize list entry after removing a message from DispatchingMessagesHead. Fixes list corruption. CORE-9357 #resolve

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Sat Mar 14 11:22:31 2015 New Revision: 66685 URL: http://svn.reactos.org/svn/reactos?rev=66685&view=rev Log: [WIN32K] Initialize list entry after removing a message from DispatchingMessagesHead. Fixes list corruption. CORE-9357 #resolve Modified: trunk/reactos/win32ss/user/ntuser/message.c trunk/reactos/win32ss/user/ntuser/msgqueue.c Modified: trunk/reactos/win32ss/user/ntuser/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/messag… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/message.c [iso-8859-1] Sat Mar 14 11:22:31 2015 @@ -1699,7 +1699,6 @@ Message->ptiSender = NULL; // mjmartin, you are right! This is null. Message->ptiCallBackSender = Win32Thread; InitializeListHead(&Message->DispatchingListEntry); - //Message->DispatchingListEntry.Flink = NULL; Message->CompletionCallback = CompletionCallback; Message->CompletionCallbackContext = CompletionCallbackContext; Message->HookMessage = MSQ_NORMAL; Modified: trunk/reactos/win32ss/user/ntuser/msgqueue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/msgque… ============================================================================== --- trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/ntuser/msgqueue.c [iso-8859-1] Sat Mar 14 11:22:31 2015 @@ -2128,6 +2128,7 @@ { CurrentEntry = RemoveHeadList(&pti->DispatchingMessagesHead); CurrentSentMessage = CONTAINING_RECORD(CurrentEntry, USER_SENT_MESSAGE, DispatchingListEntry); + InitializeListHead(&CurrentSentMessage->DispatchingListEntry); CurrentSentMessage->CompletionEvent = NULL; CurrentSentMessage->Result = NULL;

9 years, 6 months

[janderwald] 66684: [MMSYS] - hardware ids must be terminated by 2 zero bytes [KS] - more fixes to software bus pnp enumerator [MMIXER] - dont assert on buggy topology lines [NTOS] - keys must be R...

by janderwald＠svn.reactos.org

Author: janderwald Date: Sat Mar 14 11:12:32 2015 New Revision: 66684 URL: http://svn.reactos.org/svn/reactos?rev=66684&view=rev Log: [MMSYS] - hardware ids must be terminated by 2 zero bytes [KS] - more fixes to software bus pnp enumerator [MMIXER] - dont assert on buggy topology lines [NTOS] - keys must be REG_OPTION_VOLATILE - allocate file object with correct tag [INF] - register wdmaudio as pnp software device (not yet ready) Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c trunk/reactos/drivers/ksfilter/ks/swenum.c trunk/reactos/drivers/ksfilter/swenum/swenum.c trunk/reactos/lib/drivers/sound/mmixer/controls.c trunk/reactos/media/inf/wdmaudio.inf trunk/reactos/ntoskrnl/io/iomgr/deviface.c trunk/reactos/ntoskrnl/ob/oblink.c Modified: trunk/reactos/dll/cpl/mmsys/mmsys.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/mmsys/mmsys.c?rev=… ============================================================================== --- trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/mmsys/mmsys.c [iso-8859-1] Sat Mar 14 11:12:32 2015 @@ -544,7 +544,7 @@ } wcscpy(pBuffer, L"inf\\machine.inf"); - InstallSoftwareBusPnpEnumerator(szBuffer, L"ROOT\\SWENUM"); + InstallSoftwareBusPnpEnumerator(szBuffer, L"ROOT\\SWENUM\0"); } hSCManager = OpenSCManager(NULL, NULL, SC_MANAGER_CONNECT); Modified: trunk/reactos/drivers/ksfilter/ks/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/swenum… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/swenum.c [iso-8859-1] Sat Mar 14 11:12:32 2015 @@ -98,7 +98,7 @@ RtlInitUnicodeString(&ReferenceString, DeviceEntry->DeviceName); /* register device interface */ - Status = IoRegisterDeviceInterface(BusDeviceExtension->PhysicalDeviceObject, &DeviceEntry->DeviceGuid, NULL, &BusInstanceEntry->SymbolicLink); + Status = IoRegisterDeviceInterface(BusDeviceExtension->PhysicalDeviceObject, &BusInstanceEntry->InterfaceGuid, &ReferenceString, &BusInstanceEntry->SymbolicLink); /* check for success */ if (!NT_SUCCESS(Status)) @@ -255,8 +255,8 @@ IN PHANDLE hKey, IN PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension, IN PBUS_DEVICE_ENTRY DeviceEntry, - IN LPWSTR ReferenceString, - IN LPWSTR InterfaceString) + IN LPWSTR InterfaceString, + IN LPWSTR ReferenceString) { GUID InterfaceGUID; NTSTATUS Status; @@ -699,8 +699,8 @@ /* construct buffer */ swprintf(Buffer, L"%s\\%s", DeviceEntry->PDODeviceName, DeviceEntry->Instance); - - ExFreePool(IoStack->FileObject->FileName.Buffer); + // HACK + //ExFreePool(IoStack->FileObject->FileName.Buffer); /* store new file name */ RtlInitUnicodeString(&IoStack->FileObject->FileName, Buffer); @@ -906,7 +906,7 @@ ASSERT(DeviceEntry->Instance); /* calculate length */ - Length = wcslen(DeviceEntry->Instance) + 1; + Length = wcslen(DeviceEntry->Instance) + 2; /* allocate buffer */ Name = AllocateItem(PagedPool, Length * sizeof(WCHAR)); @@ -945,11 +945,11 @@ Length = wcslen(BusDeviceExtension->BusIdentifier); Length += wcslen(DeviceEntry->BusId); - /* extra length for '\\' and zero byte */ - Length += 2; + /* extra length for '\\' and 2 zero bytes */ + Length += 4; /* allocate buffer */ - Name = ExAllocatePool(PagedPool, Length * sizeof(WCHAR)); + Name = AllocateItem(PagedPool, Length * sizeof(WCHAR)); if (!Name) { /* failed to allocate buffer */ @@ -957,7 +957,10 @@ } /* construct id */ - swprintf(Name, L"%s\\%s", BusDeviceExtension->BusIdentifier, DeviceEntry->BusId); + wcscpy(Name, BusDeviceExtension->BusIdentifier); + wcscat(Name, L"\\"); + wcscat(Name, DeviceEntry->BusId); + //swprintf(Name, L"%s\\%s", BusDeviceExtension->BusIdentifier, DeviceEntry->BusId); /* store result */ Irp->IoStatus.Information = (ULONG_PTR)Name; @@ -1205,7 +1208,7 @@ if (Diff.QuadPart > Int32x32To64(15000, 10000)) { - DPRINT1("DeviceID %S Instance %S TimeCreated %I64u Now %I64u Diff %I64u hung\n", DeviceEntry->DeviceName, DeviceEntry->Instance, DeviceEntry->TimeCreated.QuadPart, Time.QuadPart, Diff.QuadPart); + //DPRINT1("DeviceID %S Instance %S TimeCreated %I64u Now %I64u Diff %I64u hung\n", DeviceEntry->DeviceName, DeviceEntry->Instance, DeviceEntry->TimeCreated.QuadPart, Time.QuadPart, Diff.QuadPart); /* release spin lock */ KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); @@ -1509,6 +1512,9 @@ UNICODE_STRING ServiceKeyPath = RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\SYSTEM\\CurrentControlSet\\Services\\"); PBUS_ENUM_DEVICE_EXTENSION BusDeviceExtension; PDEV_EXTENSION DeviceExtension; + PBUS_DEVICE_ENTRY DeviceEntry; + PLIST_ENTRY Entry; + KIRQL OldLevel; DPRINT1("KsCreateBusEnumObject %S BusDeviceObject %p\n", ServiceRelativePath, BusDeviceObject); @@ -1677,6 +1683,39 @@ FreeItem(BusDeviceExtension); } + /* acquire device entry lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); + + /* now iterate all device entries */ + Entry = BusDeviceExtension->Common.Entry.Flink; + while(Entry != &BusDeviceExtension->Common.Entry) + { + /* get device entry */ + DeviceEntry = (PBUS_DEVICE_ENTRY)CONTAINING_RECORD(Entry, BUS_DEVICE_ENTRY, Entry); + if (!DeviceEntry->PDO) + { + /* release device entry lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); + + /* create pdo */ + Status = KspCreatePDO(BusDeviceExtension, DeviceEntry, &DeviceEntry->PDO); + + /* acquire device entry lock */ + KeAcquireSpinLock(&BusDeviceExtension->Lock, &OldLevel); + + /* done */ + break; + } + /* move to next entry */ + Entry = Entry->Flink; + } + + /* release device entry lock */ + KeReleaseSpinLock(&BusDeviceExtension->Lock, OldLevel); + + + /* invalidate device relations */ + IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); DPRINT("KsCreateBusEnumObject Status %x\n", Status); /* done */ return Status; @@ -1908,7 +1947,8 @@ Status = KspDoReparseForIrp(Irp, DeviceEntry); DPRINT("REPARSE Irp %p '%wZ'\n", Irp, &IoStack->FileObject->FileName); - Irp->IoStatus.Status = Status; + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = IO_REPARSE; return Status; } @@ -2051,11 +2091,8 @@ /* set state no notstarted */ DeviceEntry->DeviceState = NotStarted; - /* time to create PDO */ - KspCreatePDO(BusDeviceExtension, DeviceEntry, &DeviceEntry->PDO); - - /* invalidate device relations */ - IoInvalidateDeviceRelations(BusDeviceExtension->PhysicalDeviceObject, BusRelations); + /* complete pending irps */ + KspCompletePendingIrps(DeviceEntry, STATUS_DEVICE_REMOVED); /* done */ Status = STATUS_SUCCESS; Modified: trunk/reactos/drivers/ksfilter/swenum/swenum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/swenum/sw… ============================================================================== --- trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/swenum/swenum.c [iso-8859-1] Sat Mar 14 11:12:32 2015 @@ -110,7 +110,7 @@ Status = KsServiceBusEnumPnpRequest(DeviceObject, Irp); /* check if the request was for a pdo */ - if (!ChildDevice) + if (ChildDevice) { if (Status != STATUS_NOT_SUPPORTED) { @@ -144,9 +144,9 @@ if (!NT_SUCCESS(Status)) { /* failed to get pnp object */ - Irp->IoStatus.Status = Status; - IoCompleteRequest(Irp, IO_NO_INCREMENT); - return Status; + Irp->IoStatus.Status = STATUS_NOT_SUPPORTED; + IoCompleteRequest(Irp, IO_NO_INCREMENT); + return STATUS_NOT_SUPPORTED; } /* sanity check */ Modified: trunk/reactos/lib/drivers/sound/mmixer/controls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/sound/mmixer/c… ============================================================================== --- trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/sound/mmixer/controls.c [iso-8859-1] Sat Mar 14 11:12:32 2015 @@ -1358,7 +1358,10 @@ /* sanity checks */ ASSERT(PinsCount != 0); - ASSERT(PinsCount == 1); + if (PinsCount != 1) + { + DPRINT1("MMixerHandlePhysicalConnection Expected 1 pin but got %lu\n", PinsCount); + } /* create destination line */ Status = MMixerBuildMixerDestinationLine(MixerContext, MixerInfo, MixerData->hDevice, Pins[0], bInput); Modified: trunk/reactos/media/inf/wdmaudio.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/media/inf/wdmaudio.inf?rev… ============================================================================== --- trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] (original) +++ trunk/reactos/media/inf/wdmaudio.inf [iso-8859-1] Sat Mar 14 11:12:32 2015 @@ -25,8 +25,11 @@ ExcludeFromSelect = WDMAUDIO_CopyFilesOnlyId [GenericMfg] +;%WDM_KMIXER.DeviceDesc% = WDM_KMIXER, SW\{B7EAFDC0-A680-11D0-96D8-00AA0051E51D} +;%WDM_SYSAUDIO.DeviceDesc% = WDM_SYSAUDIO, SW\{A7C7A5B0-5AF3-11D1-9CED-00A024BF0407} %WDM_WDMAUD.DeviceDesc% = WDM_WDMAUD, SW\{CD171DE3-69E5-11D2-B56D-0000F8754380} -%WDM_DRMKAUD.DeviceDesc% = WDM_DRMKAUD, SW\{EEC12DB6-AD9C-4168-8658-B03DAEF417FE} +;%WDM_DRMKAUD.DeviceDesc% = WDM_DRMKAUD, SW\{EEC12DB6-AD9C-4168-8658-B03DAEF417FE} + %WDMAUDIO_CopyFilesOnlyId.DeviceDesc% = WDMAUDIO.CopyFilesOnly, WDMAUDIO_CopyFilesOnlyId [WDMAUDIO.CopyFilesOnly] @@ -43,11 +46,69 @@ CopyFiles = WDM.CopyFiles [DeviceRegistration] +; Kmixer swenum install +;HKLM,%RunOnce%,"WDM_KMIXER0",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_MIXER%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" +;HKLM,%RunOnce%,"WDM_KMIXER1",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_KMIXER.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_AUDIO%,%17%\WDMAUDIO.inf,WDM_KMIXER.Interface.Install" + +; Sysaudio swenum install +;HKLM,%RunOnce%,"WDM_SYSAUDIO",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_SYSAUDIO.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_SYSAUDIO%,%17%\WDMAUDIO.inf,WDM_SYSAUDIO.Interface.Install" + ; WDMAud install HKLM,%RunOnce%,"WDM_WDMAUD",,"rundll32.exe streamci.dll,StreamingDeviceSetup %WDM_WDMAUD.DeviceId%,%KSNAME_Filter%,%KSCATEGORY_WDMAUD%,%17%\WDMAUDIO.inf,WDM_WDMAUD.Interface.Install" + ; DRMKAUD install -HKLM,%RunOnce%,"WDM_DRMKAUD",,"rundll32.exe streamci,StreamingDeviceSetup %WDM_DRMKAUD.DeviceId%,%KSNAME_DRMKAUD%,%KSCATEGORY_DRM_DESCRAMBLE%,%17%\WDMAUDIO.inf,WDM_DRMKAUD.Interface.Install" - +;HKLM,%RunOnce%,"WDM_DRMKAUD",,"rundll32.exe streamci,StreamingDeviceSetup %WDM_DRMKAUD.DeviceId%,%KSNAME_DRMKAUD%,%KSCATEGORY_DRM_DESCRAMBLE%,%17%\WDMAUDIO.inf,WDM_DRMKAUD.Interface.Install" + +;-------------------------------------------------------------------------------- +; SysAudio Install +[WDM_SYSAUDIO.Interface.Install] +AddReg=WDM_SYSAUDIO.Interface.AddReg + +[WDM_SYSAUDIO.Interface.AddReg] +HKR,,CLSID,,%Proxy.CLSID% +HKR,,FriendlyName,,%WDM_SYSAUDIO.FriendlyName% + +[WDM_SYSAUDIO] +CopyFiles = WDM_SYSAUDIO.CopyFiles + + +[WDM_SYSAUDIO.CopyFiles] +sysaudio.sys + +[WDM_SYSAUDIO.Services] +AddService = sysaudio,0x00000002, sysaudio_Service_Inst + +[sysaudio_Service_Inst] +DisplayName = %sysaudio.SvcDesc% +ServiceType = 1 ; SERVICE_KERNEL_DRIVER +StartType = 3 ; SERVICE_DEMAND_START +ErrorControl = 1 ; SERVICE_ERROR_NORMAL +ServiceBinary = %10%\system32\drivers\sysaudio.sys + +;-------------------------------------------------------------------------------- +; KMixer Install +[WDM_KMIXER.Interface.Install] +AddReg=WDM_KMIXER.Interface.AddReg + +[WDM_KMIXER.Interface.AddReg] +HKR,,CLSID,,%Proxy.CLSID% +HKR,,FriendlyName,,%WDM_KMIXER.FriendlyName% + +[WDM_KMIXER] +CopyFiles = WDM_KMIXER.CopyFiles + +[WDM_KMIXER.CopyFiles] +kmixer.sys + +[WDM_KMIXER.Services] +AddService = kmixer, 0x00000002, kmixer_Service_Inst + +[kmixer_Service_Inst] +DisplayName = %kmixer.SvcDesc% +ServiceType = 1 ; SERVICE_KERNEL_DRIVER +StartType = 3 ; SERVICE_DEMAND_START +ErrorControl = 1 ; SERVICE_ERROR_NORMAL +ServiceBinary = %10%\system32\drivers\kmixer.sys ;-------------------------------------------------------------------------------- ; WDMAUD Install [WDM_WDMAUD.Interface.Install] @@ -119,6 +180,8 @@ Proxy.CLSID = "{17CCA71B-ECD7-11D0-B908-00A0C9223196}" KSNAME_Filter = "{9B365890-165F-11D0-A195-0020AFD156E4}" KSNAME_DRMKAUD = "{ABD61E00-9350-47e2-A632-4438B90C6641}" +WDM_SYSAUDIO.DeviceId = "{A7C7A5B0-5AF3-11D1-9CED-00A024BF0407}" +KSCATEGORY_SYSAUDIO = "{A7C7A5B1-5AF3-11D1-9CED-00A024BF0407}" WDM_DRMKAUD.DeviceId = "{EEC12DB6-AD9C-4168-8658-B03DAEF417FE}" KSCATEGORY_DRM_DESCRAMBLE = "{FFBB6E3F-CCFE-4D84-90D9-421418B03A8E}" KSCATEGORY_DATATRANSFORM = "{2EB07EA0-7E70-11D0-A5D6-28DB04C10000}" @@ -129,6 +192,12 @@ ;Localizable +WDM_KMIXER.DeviceDesc = "ReactOS Wave Audio Mixer" +WDM_KMIXER.FriendlyName = "ReactOS Wave Audio Mixer" +kmixer.SvcDesc = "ReactOS Wave Audio Mixer" +WDM_SYSAUDIO.DeviceDesc = "ReactOS System audio device" +WDM_SYSAUDIO.FriendlyName = "ReactOS System audio device" +sysaudio.SvcDesc = "ReactOS System audio device" WDM_DRMKAUD.DeviceDesc = "ReactOS Trusted Audio Drivers" WDM_DRMKAUD.FriendlyName = "ReactOS Trusted Audio Drivers" drmkaud.SvcDesc = "ReactOS Trusted Audio Drivers" Modified: trunk/reactos/ntoskrnl/io/iomgr/deviface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/deviface… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/deviface.c [iso-8859-1] Sat Mar 14 11:12:32 2015 @@ -103,7 +103,7 @@ &ObjectAttributes, 0, NULL, - REG_OPTION_NON_VOLATILE, + REG_OPTION_VOLATILE, NULL); ZwClose(ClassesKey); if (!NT_SUCCESS(Status)) @@ -154,11 +154,11 @@ &ObjectAttributes, 0, NULL, - REG_OPTION_NON_VOLATILE, + REG_OPTION_VOLATILE, NULL); if (!NT_SUCCESS(Status)) { - DPRINT1("Failed to open %wZ%wZ\\%wZ\n", &BaseKeyU, &GuidString, &SubKeyName); + DPRINT1("Failed to open %wZ%wZ\\%wZ Status %x\n", &BaseKeyU, &GuidString, &SubKeyName, Status); goto cleanup; } @@ -172,7 +172,7 @@ &ObjectAttributes, 0, NULL, - REG_OPTION_NON_VOLATILE, + REG_OPTION_VOLATILE, NULL); if (!NT_SUCCESS(Status)) { Modified: trunk/reactos/ntoskrnl/ob/oblink.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/oblink.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/oblink.c [iso-8859-1] Sat Mar 14 11:12:32 2015 @@ -452,7 +452,7 @@ MaximumLength = LengthUsed + sizeof(WCHAR); NewTargetPath = ExAllocatePoolWithTag(NonPagedPool, MaximumLength, - TAG_SYMLINK_TTARGET); + OB_NAME_TAG); if (!NewTargetPath) return STATUS_INSUFFICIENT_RESOURCES; } else

9 years, 6 months

← Newer
1
...
29
30
31
32
33
34
35
...
50
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 March 2015