André Hentschel : mshtml: Remove obsolete proxy handling.
Alexandre Julliard
julliard at winehq.org
Thu Aug 25 13:00:13 CDT 2011
Module: wine
Branch: master
Commit: da7f9ed16b6c1537a5a1933c0a545c63737542b9
URL: http://source.winehq.org/git/wine.git/?a=commit;h=da7f9ed16b6c1537a5a1933c0a545c63737542b9
Author: André Hentschel <nerv at dawncrow.de>
Date: Mon Aug 22 20:48:06 2011 +0200
mshtml: Remove obsolete proxy handling.
---
dlls/mshtml/nsembed.c | 50 -------------------------------------------------
1 files changed, 0 insertions(+), 50 deletions(-)
diff --git a/dlls/mshtml/nsembed.c b/dlls/mshtml/nsembed.c
index 2bebf8b..b6de72f 100644
--- a/dlls/mshtml/nsembed.c
+++ b/dlls/mshtml/nsembed.c
@@ -486,55 +486,6 @@ static void set_lang(nsIPrefBranch *pref)
set_string_pref(pref, "intl.accept_languages", langs);
}
-static void set_proxy(nsIPrefBranch *pref)
-{
- char proxy[512];
- char * proxy_port;
- int proxy_port_num;
- DWORD enabled = 0, res, size, type;
- HKEY hkey;
-
- static const WCHAR proxy_keyW[] =
- {'S','o','f','t','w','a','r','e',
- '\\','M','i','c','r','o','s','o','f','t',
- '\\','W','i','n','d','o','w','s',
- '\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n',
- '\\','I','n','t','e','r','n','e','t',' ','S','e','t','t','i','n','g','s',0};
-
- res = RegOpenKeyW(HKEY_CURRENT_USER, proxy_keyW, &hkey);
- if(res != ERROR_SUCCESS)
- return;
-
- size = sizeof(enabled);
- res = RegQueryValueExA(hkey, "ProxyEnable", 0, &type, (LPBYTE)&enabled, &size);
- if(res != ERROR_SUCCESS || type != REG_DWORD || enabled == 0)
- {
- RegCloseKey(hkey);
- return;
- }
-
- size = sizeof(proxy);
- res = RegQueryValueExA(hkey, "ProxyServer", 0, &type, (LPBYTE)proxy, &size);
- RegCloseKey(hkey);
- if(res != ERROR_SUCCESS || type != REG_SZ)
- return;
-
- proxy_port = strchr(proxy, ':');
- if (!proxy_port)
- return;
-
- *proxy_port = 0;
- proxy_port_num = atoi(proxy_port + 1);
- TRACE("Setting proxy to %s, port %d\n", debugstr_a(proxy), proxy_port_num);
-
- set_string_pref(pref, "network.proxy.http", proxy);
- set_string_pref(pref, "network.proxy.ssl", proxy);
-
- set_int_pref(pref, "network.proxy.type", 1);
- set_int_pref(pref, "network.proxy.http_port", proxy_port_num);
- set_int_pref(pref, "network.proxy.ssl_port", proxy_port_num);
-}
-
static void set_preferences(void)
{
nsIPrefBranch *pref;
@@ -548,7 +499,6 @@ static void set_preferences(void)
}
set_lang(pref);
- set_proxy(pref);
set_bool_pref(pref, "security.warn_entering_secure", FALSE);
set_bool_pref(pref, "security.warn_submit_insecure", FALSE);
set_int_pref(pref, "layout.spellcheckDefault", 0);
More information about the wine-cvs
mailing list