From 7cc613e50fa565f1cd0184eff47585f275092fb5 Mon Sep 17 00:00:00 2001 From: kichik Date: Thu, 19 Sep 2002 15:57:59 +0000 Subject: [PATCH] Added /TIMEOUT= option git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1047 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/NSISdl/ReadMe.txt | 2 ++ Contrib/NSISdl/nsisdl.cpp | 5 +++++ Plugins/nsisdl.dll | Bin 12800 -> 12800 bytes 3 files changed, 7 insertions(+) diff --git a/Contrib/NSISdl/ReadMe.txt b/Contrib/NSISdl/ReadMe.txt index 35bcaac9..5f7fb364 100644 --- a/Contrib/NSISdl/ReadMe.txt +++ b/Contrib/NSISdl/ReadMe.txt @@ -25,6 +25,7 @@ This dll can be used from NSIS to download files via http. How to use (for another example, see waplugin.nsi in the nsis directory): Pass the url and filename on the stack + You can also pass /TIMEOUT=### to set the timeout in milliseconds Result is returned in $0 "cancel" if cancelled "success" if success @@ -37,6 +38,7 @@ Example: ; make the call to download Push "http://www.xcf.berkeley.edu/~yaroslav/photos/mike/mike1-full.jpg" Push "$INSTDIR\test.jpg" + ; Push /TIMEOUT=10000 ; 10 seconds timeout CallInstDLL $TEMP\nsdtmp09.dll download ; for a quiet install, use download_quiet ; delete DLL from temporary directory diff --git a/Contrib/NSISdl/nsisdl.cpp b/Contrib/NSISdl/nsisdl.cpp index 1f9bcb25..8b112576 100644 --- a/Contrib/NSISdl/nsisdl.cpp +++ b/Contrib/NSISdl/nsisdl.cpp @@ -355,6 +355,11 @@ __declspec(dllexport) void download (HWND parent, g_stacktop = stacktop; popstring (filename); + lstrcpyn(buf, filename, 10); + if (!lstrcmp(buf, "/TIMEOUT=")) { + g_timeout_ms=my_atoi(filename+9); + popstring (filename); + } popstring (url); HANDLE hFile = CreateFile(filename,GENERIC_WRITE,FILE_SHARE_READ,NULL,CREATE_ALWAYS,0,NULL); diff --git a/Plugins/nsisdl.dll b/Plugins/nsisdl.dll index 485808316e20e8de9f0f73e204ec08a779194d40..99512be11604d8c94fb5ba41b403982aa69c99c7 100644 GIT binary patch delta 7031 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