From 4cb6161b0f6ef9a8d27d8a9783f0d63c0867f45c Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 2 Sep 2004 21:07:12 +0000 Subject: [PATCH] added /NOIEPROXY (based on memph's code) git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3643 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/NSISdl/ReadMe.txt | 7 +++++++ Contrib/NSISdl/nsisdl.cpp | 7 ++++++- Plugins/nsisdl.dll | Bin 12800 -> 12800 bytes 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/Contrib/NSISdl/ReadMe.txt b/Contrib/NSISdl/ReadMe.txt index 0f0605bf..c8ec07f5 100644 --- a/Contrib/NSISdl/ReadMe.txt +++ b/Contrib/NSISdl/ReadMe.txt @@ -43,6 +43,13 @@ NSISdl reads the proxy configuration from Internet Explorer's registry key under HKLM\Software\Microsoft\Windows\CurrentVersion\Internet Settings. It reads and parses ProxyEnable and ProxyServer. +If you don't want NSISdl to use Internet Explorer's settings, use the +/NOIEPROXY flag. /NOIEPROXY should be used after /TRANSLATE and +/TIMEOUT. For example: + +NSISdl::download /NOIEPROXY http://www.domain.com/file localfile.exe +NSISdl::download /TIMEOUT=30000 /NOIEPROXY http://www.domain.com/file localfile.exe + TRANSLATE --------- diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index 6bde5ebd..124a126b 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -232,6 +232,7 @@ __declspec(dllexport) void download (HWND parent, char filename[1024]; BOOL bSuccess=FALSE; int timeout_ms=30000; + int getieproxy=1; char *error=NULL; @@ -273,6 +274,10 @@ __declspec(dllexport) void download (HWND parent, timeout_ms=my_atoi(url+9); popstring(url); } + if (!lstrcmpi(url, "/NOIEPROXY")) { + getieproxy=0; + popstring(url); + } popstring(filename); HANDLE hFile = CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ,NULL,CREATE_ALWAYS,0,NULL); @@ -311,7 +316,7 @@ __declspec(dllexport) void download (HWND parent, char *p=NULL; HKEY hKey; - if (RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",0,KEY_READ,&hKey) == ERROR_SUCCESS) + if (getieproxy && RegOpenKeyEx(HKEY_CURRENT_USER,"Software\\Microsoft\\Windows\\CurrentVersion\\Internet Settings",0,KEY_READ,&hKey) == ERROR_SUCCESS) { DWORD l = 4; DWORD t; diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll index 01e7e15503ebd72f54c64f686143d86c895ed5dd..e2d64a851ee34e6d67a11ac60d919365b0828bc7 100644 GIT binary patch delta 3395 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 delta 3365 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 X@V@4K-TS8Zm=|>{s5-)IugdrzoTa&q