Index: reactos/base/applications/rapps/CMakeLists.txt
===================================================================
--- reactos/base/applications/rapps/CMakeLists.txt	(revision 66620)
+++ reactos/base/applications/rapps/CMakeLists.txt	(working copy)
@@ -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)
Index: reactos/base/applications/rapps/lang/bg-BG.rc
===================================================================
--- reactos/base/applications/rapps/lang/bg-BG.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/bg-BG.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/cs-CZ.rc
===================================================================
--- reactos/base/applications/rapps/lang/cs-CZ.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/cs-CZ.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/de-DE.rc
===================================================================
--- reactos/base/applications/rapps/lang/de-DE.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/de-DE.rc	(working copy)
@@ -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 "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 "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
Index: reactos/base/applications/rapps/lang/en-US.rc
===================================================================
--- reactos/base/applications/rapps/lang/en-US.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/en-US.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/es-ES.rc
===================================================================
--- reactos/base/applications/rapps/lang/es-ES.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/es-ES.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/fr-FR.rc
===================================================================
--- reactos/base/applications/rapps/lang/fr-FR.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/fr-FR.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/he-IL.rc
===================================================================
--- reactos/base/applications/rapps/lang/he-IL.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/he-IL.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/it-IT.rc
===================================================================
--- reactos/base/applications/rapps/lang/it-IT.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/it-IT.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/ja-JP.rc
===================================================================
--- reactos/base/applications/rapps/lang/ja-JP.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/ja-JP.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/no-NO.rc
===================================================================
--- reactos/base/applications/rapps/lang/no-NO.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/no-NO.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/pl-PL.rc
===================================================================
--- reactos/base/applications/rapps/lang/pl-PL.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/pl-PL.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/pt-BR.rc
===================================================================
--- reactos/base/applications/rapps/lang/pt-BR.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/pt-BR.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/ro-RO.rc
===================================================================
--- reactos/base/applications/rapps/lang/ro-RO.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/ro-RO.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/ru-RU.rc
===================================================================
--- reactos/base/applications/rapps/lang/ru-RU.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/ru-RU.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/sk-SK.rc
===================================================================
--- reactos/base/applications/rapps/lang/sk-SK.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/sk-SK.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/sq-AL.rc
===================================================================
--- reactos/base/applications/rapps/lang/sq-AL.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/sq-AL.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/sv-SE.rc
===================================================================
--- reactos/base/applications/rapps/lang/sv-SE.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/sv-SE.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/tr-TR.rc
===================================================================
--- reactos/base/applications/rapps/lang/tr-TR.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/tr-TR.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/uk-UA.rc
===================================================================
--- reactos/base/applications/rapps/lang/uk-UA.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/uk-UA.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/zh-CN.rc
===================================================================
--- reactos/base/applications/rapps/lang/zh-CN.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/zh-CN.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/lang/zh-TW.rc
===================================================================
--- reactos/base/applications/rapps/lang/zh-TW.rc	(revision 66620)
+++ reactos/base/applications/rapps/lang/zh-TW.rc	(working copy)
@@ -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
Index: reactos/base/applications/rapps/loaddlg.c
===================================================================
--- reactos/base/applications/rapps/loaddlg.c	(revision 66620)
+++ reactos/base/applications/rapps/loaddlg.c	(working copy)
@@ -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
     {
Index: reactos/base/applications/rapps/rapps.h
===================================================================
--- reactos/base/applications/rapps/rapps.h	(revision 66620)
+++ reactos/base/applications/rapps/rapps.h	(working copy)
@@ -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;
 
Index: reactos/base/applications/rapps/resource.h
===================================================================
--- reactos/base/applications/rapps/resource.h	(revision 66620)
+++ reactos/base/applications/rapps/resource.h	(working copy)
@@ -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
Index: reactos/base/applications/rapps/settingsdlg.c
===================================================================
--- reactos/base/applications/rapps/settingsdlg.c	(revision 66620)
+++ reactos/base/applications/rapps/settingsdlg.c	(working copy)
@@ -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,11 +121,21 @@
                 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 &&
                         (dwAttr & FILE_ATTRIBUTE_DIRECTORY))
@@ -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;
Index: reactos/base/applications/rapps/winmain.c
===================================================================
--- reactos/base/applications/rapps/winmain.c	(revision 66620)
+++ reactos/base/applications/rapps/winmain.c	(working copy)
@@ -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