dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Unable to open file error was still set in $0 instead of on the stack

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2515 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-04-30 12:48:48 +00:00
parent d506d0879a
commit 024ea9c1b6
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Contrib/NSISdl/nsisdl.cpp
View file

@ -120,6 +120,8 @@ __declspec(dllexport) void download (HWND parent,
HWND dlg=0; HWND dlg=0;
HWND childwnd=0; HWND childwnd=0;
char *error=NULL;
static char szDownloading[32];//= "Downloading %s"; static char szDownloading[32];//= "Downloading %s";
static char szConnecting[32];//= "Connecting ..."; static char szConnecting[32];//= "Connecting ...";
static char szSecond[32];//= "second"; static char szSecond[32];//= "second";
@ -164,8 +166,9 @@ __declspec(dllexport) void download (HWND parent,
if (hFile == INVALID_HANDLE_VALUE) { if (hFile == INVALID_HANDLE_VALUE) {
wsprintf (buf, "Unable to open %s", filename); wsprintf (buf, "Unable to open %s", filename);
setuservariable(INST_0, buf); error=buf;
} else { goto done;
} else {
if (parent) if (parent)
{ {
childwnd=FindWindowEx(parent,NULL,"#32770",NULL); childwnd=FindWindowEx(parent,NULL,"#32770",NULL);
@ -213,7 +216,6 @@ __declspec(dllexport) void download (HWND parent,
g_hwndProgressBar = GetDlgItem (dlg, IDC_PROGRESS1); g_hwndProgressBar = GetDlgItem (dlg, IDC_PROGRESS1);
JNL_HTTPGet *get; JNL_HTTPGet *get;
char *error=NULL;
{ {
WSADATA wsaData; WSADATA wsaData;
@ -395,6 +397,8 @@ __declspec(dllexport) void download (HWND parent,
if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),0); if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),0);
} }
done:
if (g_cancelled) { if (g_cancelled) {
pushstring("cancel"); pushstring("cancel");
DeleteFile(filename); DeleteFile(filename);
@ -405,7 +409,7 @@ __declspec(dllexport) void download (HWND parent,
pushstring(error); pushstring(error);
} }
delete get; if (get) delete get;
} }
} }

BIN
Plugins/nsisdl.dll
View file

Binary file not shown.