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

Crash fixes, including firewall problems, many Optimizations

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3243 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
ramon18 2003-12-02 01:13:35 +00:00
parent 17b58ae2d9
commit 959b379381
4 changed files with 167 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Contrib/NSISdl/Script1.rc
View file

@ -26,8 +26,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Dialog // Dialog
// //
IDD_DIALOG1 DIALOG DISCARDABLE 0, 0, 265, 104 IDD_DIALOG1 DIALOGEX 0, 0, 265, 104
STYLE DS_CONTROL | WS_CHILD STYLE DS_CONTROL | WS_CHILD
EXSTYLE WS_EX_NOPARENTNOTIFY
FONT 8, "MS Sans Serif" FONT 8, "MS Sans Serif"
BEGIN BEGIN
CONTROL "Progress1",IDC_PROGRESS1,"msctls_progress32",NOT CONTROL "Progress1",IDC_PROGRESS1,"msctls_progress32",NOT

3
Contrib/NSISdl/httpget.cpp
View file

@ -341,7 +341,8 @@ int JNL_HTTPGet::run()
run_again: run_again:
static char buf[4096]; static char main_buf[4096];
char *buf = main_buf;
m_con->run(); m_con->run();
if (m_con->get_state()==JNL_Connection::STATE_ERROR) if (m_con->get_state()==JNL_Connection::STATE_ERROR)

252
Contrib/NSISdl/nsisdl.cpp
View file

@ -23,8 +23,9 @@
Note: this source code is pretty hacked together right now, improvements Note: this source code is pretty hacked together right now, improvements
and cleanups will come later. and cleanups will come later.
*/ IMPORTANT: The dialog must have the style "No Parent Notify"
*/
#include <windows.h> #include <windows.h>
#include <stdio.h> #include <stdio.h>
#include <commctrl.h> #include <commctrl.h>
@ -35,8 +36,6 @@
#include "httpget.h" #include "httpget.h"
#include "../exdll/exdll.h" #include "../exdll/exdll.h"
int g_timeout_ms=30000;
void *operator new( unsigned int num_bytes ) void *operator new( unsigned int num_bytes )
{ {
return GlobalAlloc(GPTR,num_bytes); return GlobalAlloc(GPTR,num_bytes);
@ -45,9 +44,12 @@ void operator delete( void *p ) { if (p) GlobalFree(p); }
HANDLE hModule; HANDLE hModule;
HWND g_dialog;
HWND g_hwndProgressBar; HWND g_hwndProgressBar;
static int g_cancelled; static int g_cancelled;
long lBusy;
ULONG idThreadOwner;
ULONG ulRefCount;
static void *lpWndProcOld;
BOOL CALLBACK DownloadDialogProc(HWND hwndDlg, BOOL CALLBACK DownloadDialogProc(HWND hwndDlg,
UINT uMsg, UINT uMsg,
@ -57,17 +59,65 @@ BOOL CALLBACK DownloadDialogProc(HWND hwndDlg,
return 0; return 0;
} }
BOOL TryEnterCS()
{
DWORD CurThreadID = ::GetCurrentThreadId();
BOOL bRet = TRUE;
long *plBusy = &lBusy;
while (::InterlockedExchange(plBusy, 1) != 0)
{
Sleep(0);
}
static void *lpWndProcOld; if (idThreadOwner == 0)
{
idThreadOwner = CurThreadID;
ulRefCount = 1;
}
else if (idThreadOwner == CurThreadID)
{
ulRefCount++;
}
else
{
bRet = FALSE;
}
::InterlockedExchange(plBusy, 0);
return bRet;
}
void LeaveCS()
{
long *plBusy = &lBusy;
while (::InterlockedExchange(plBusy, 1) != 0)
{
Sleep(0);
}
if (idThreadOwner == ::GetCurrentThreadId())
{
if (--ulRefCount == 0)
{
// No owner from now
idThreadOwner = 0;
}
}
::InterlockedExchange(plBusy, 0);
}
static LRESULT CALLBACK ParentWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) static LRESULT CALLBACK ParentWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
{ {
LRESULT Res = 0;
while ( !TryEnterCS() ) Sleep(0);
if (message == WM_COMMAND && LOWORD(wParam) == IDCANCEL) if (message == WM_COMMAND && LOWORD(wParam) == IDCANCEL)
{ {
g_cancelled = 1; g_cancelled = 1;
return 0;
} }
return CallWindowProc((long (__stdcall *)(struct HWND__ *,unsigned int,unsigned int,long))lpWndProcOld,hwnd,message,wParam,lParam); else
Res = CallWindowProc((long (__stdcall *)(struct HWND__ *,unsigned int,unsigned int,long))lpWndProcOld,hwnd,message,wParam,lParam);
LeaveCS();
return Res;
} }
BOOL APIENTRY DllMain( HANDLE _hModule, BOOL APIENTRY DllMain( HANDLE _hModule,
@ -81,35 +131,27 @@ BOOL APIENTRY DllMain( HANDLE _hModule,
static int g_file_size; static int g_file_size;
static DWORD g_dwLastTick = 0;
static void progress_callback(char *msg, int read_bytes) void progress_callback(HWND dlg, char *msg, int read_bytes)
{ {
// flicker reduction by A. Schiffler // flicker reduction by A. Schiffler
static DWORD dwLastTick = 0; DWORD dwLastTick = g_dwLastTick;
DWORD dwThisTick = GetTickCount(); DWORD dwThisTick = GetTickCount();
if (g_dialog) if (dlg)
{ {
if (dwThisTick - dwLastTick > 500) if (dwThisTick - dwLastTick > 500)
{ {
SetDlgItemText (g_dialog, IDC_STATIC2, msg); SetDlgItemText (dlg, IDC_STATIC2, msg);
dwLastTick = dwThisTick; dwLastTick = dwThisTick;
} }
if (g_file_size) SendMessage(g_hwndProgressBar, PBM_SETPOS, (WPARAM)MulDiv(read_bytes,30000,g_file_size), 0); if (g_file_size) SendMessage(g_hwndProgressBar, PBM_SETPOS, (WPARAM)MulDiv(read_bytes,30000,g_file_size), 0);
g_dwLastTick = dwLastTick;
} }
} }
extern char *_strstr(char *i, char *s); extern char *_strstr(char *i, char *s);
#define strstr _strstr #define strstr _strstr
RECT r, cr;
void AdjustSize(int id)
{
GetWindowRect(GetDlgItem(g_dialog,id),&cr);
ScreenToClient(g_dialog,(LPPOINT)&cr);
ScreenToClient(g_dialog,((LPPOINT)&cr)+1);
SetWindowPos(GetDlgItem(g_dialog,id),0,0,0,r.right-r.left,cr.bottom-cr.top,SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
}
extern "C" extern "C"
{ {
@ -118,27 +160,31 @@ __declspec(dllexport) void download (HWND parent,
char *variables, char *variables,
stack_t **stacktop) stack_t **stacktop)
{ {
static char buf[1024]; char buf[1024];
static char url[1024]; char url[1024];
static char filename[1024]; char filename[1024];
int wasen=0; int wasen=0;
HWND hwndAux;
HWND hwndL=0; HWND hwndL=0;
HWND hwndB=0; HWND hwndB=0;
HWND dlg=0; HWND dlg=0;
HWND childwnd=0; HWND childwnd=0;
BOOL bSuccess=FALSE;
RECT r, cr, orig_childRc;
int timeout_ms=30000;
JNL_HTTPGet *get = 0; JNL_HTTPGet *get = 0;
char *error=NULL; char *error=NULL;
static char szDownloading[32];//= "Downloading %s"; char szDownloading[32];//= "Downloading %s";
static char szConnecting[32];//= "Connecting ..."; char szConnecting[32];//= "Connecting ...";
static char szSecond[32];//= "second"; char szSecond[32];//= "second";
static char szMinute[32];//= "minute"; char szMinute[32];//= "minute";
static char szHour[32];//= "hour"; char szHour[32];//= "hour";
static char szPlural[32];//= "s"; char szPlural[32];//= "s";
static char szProgress[128];//= "%dkB (%d%%) of %dkB @ %d.%01dkB/s"; char szProgress[128];//= "%dkB (%d%%) of %dkB @ %d.%01dkB/s";
static char szRemaining[128];//= " (%d %s%s remaining)"; char szRemaining[128];//= " (%d %s%s remaining)";
EXDLL_INIT(); EXDLL_INIT();
@ -166,7 +212,7 @@ __declspec(dllexport) void download (HWND parent,
} }
lstrcpyn(buf, url, 10); lstrcpyn(buf, url, 10);
if (!lstrcmpi(buf, "/TIMEOUT=")) { if (!lstrcmpi(buf, "/TIMEOUT=")) {
g_timeout_ms=my_atoi(url+9); timeout_ms=my_atoi(url+9);
popstring(url); popstring(url);
} }
popstring(filename); popstring(filename);
@ -182,18 +228,18 @@ __declspec(dllexport) void download (HWND parent,
childwnd=FindWindowEx(parent,NULL,"#32770",NULL); childwnd=FindWindowEx(parent,NULL,"#32770",NULL);
hwndL=GetDlgItem(childwnd,1016); hwndL=GetDlgItem(childwnd,1016);
hwndB=GetDlgItem(childwnd,1027); hwndB=GetDlgItem(childwnd,1027);
if (hwndL && IsWindowVisible(hwndL)) ShowWindow(hwndL,SW_HIDE); if ( IsWindowVisible(hwndL) ) ShowWindow(hwndL,SW_HIDE);
else hwndL=NULL; else hwndL=NULL;
if (hwndB && IsWindowVisible(hwndB)) ShowWindow(hwndB,SW_HIDE); if (IsWindowVisible(hwndB)) ShowWindow(hwndB,SW_HIDE);
else hwndB=NULL; else hwndB=NULL;
wasen=EnableWindow(GetDlgItem(parent,IDCANCEL),1); wasen=EnableWindow(GetDlgItem(parent,IDCANCEL),1);
lpWndProcOld = (void *) GetWindowLong(parent,GWL_WNDPROC);
SetWindowLong(parent,GWL_WNDPROC,(long)ParentWndProc);
dlg = g_dialog = CreateDialog((HINSTANCE)hModule, lpWndProcOld = (void *)SetWindowLong(parent,GWL_WNDPROC,(long)ParentWndProc);
dlg = CreateDialog((HINSTANCE)hModule,
MAKEINTRESOURCE(IDD_DIALOG1), MAKEINTRESOURCE(IDD_DIALOG1),
childwnd, parent,
DownloadDialogProc); DownloadDialogProc);
if (dlg) if (dlg)
{ {
@ -221,16 +267,34 @@ __declspec(dllexport) void download (HWND parent,
ShowWindow(pb, SW_SHOW); ShowWindow(pb, SW_SHOW);
GetWindowRect(childwnd,&orig_childRc);
GetWindowRect(dlg,&cr); GetWindowRect(dlg,&cr);
ScreenToClient(dlg,(LPPOINT)&cr); ScreenToClient(dlg,(LPPOINT)&cr);
ScreenToClient(dlg,((LPPOINT)&cr)+1); ScreenToClient(dlg,((LPPOINT)&cr)+1);
GetWindowRect(GetDlgItem(childwnd,1016),&r);
hwndAux = GetDlgItem(childwnd,1016);
GetWindowRect(hwndAux,&r);
ScreenToClient(childwnd,(LPPOINT)&r); ScreenToClient(childwnd,(LPPOINT)&r);
ScreenToClient(childwnd,((LPPOINT)&r)+1); ScreenToClient(childwnd,((LPPOINT)&r)+1);
SetWindowPos(dlg,0,r.left,r.top,r.right-r.left,cr.bottom-cr.top,SWP_NOACTIVATE|SWP_NOZORDER); SetWindowPos(childwnd,0,0,0,r.right-r.left,r.top,SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOMOVE);
AdjustSize(IDC_STATIC2);
AdjustSize(pbid); GetWindowRect(hwndAux,&r);
ShowWindow(dlg,SW_SHOWNA); ScreenToClient(parent,(LPPOINT)&r);
ScreenToClient(parent,((LPPOINT)&r)+1);
SetWindowPos(dlg,0,r.left,r.top,r.right-r.left,cr.bottom-cr.top,SWP_NOACTIVATE|SWP_NOZORDER|SWP_SHOWWINDOW);
hwndAux = GetDlgItem(dlg,IDC_STATIC2);
GetWindowRect(hwndAux,&cr);
ScreenToClient(dlg,(LPPOINT)&cr);
ScreenToClient(dlg,((LPPOINT)&cr)+1);
SetWindowPos(hwndAux,0,0,0,r.right-r.left,cr.bottom-cr.top,SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
hwndAux = GetDlgItem(dlg,pbid);
GetWindowRect(hwndAux,&cr);
ScreenToClient(dlg,(LPPOINT)&cr);
ScreenToClient(dlg,((LPPOINT)&cr)+1);
SetWindowPos(hwndAux,0,0,0,r.right-r.left,cr.bottom-cr.top,SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOZORDER);
char *p=filename; char *p=filename;
while (*p) p++; while (*p) p++;
while (*p != '\\' && p != filename) p=CharPrev(filename,p); while (*p != '\\' && p != filename) p=CharPrev(filename,p);
@ -244,12 +308,12 @@ __declspec(dllexport) void download (HWND parent,
SendDlgItemMessage(dlg, IDC_STATIC2, WM_SETFONT, hFont, 0); SendDlgItemMessage(dlg, IDC_STATIC2, WM_SETFONT, hFont, 0);
} }
} }
{ {
WSADATA wsaData; WSADATA wsaData;
WSAStartup(MAKEWORD(1, 1), &wsaData); WSAStartup(MAKEWORD(1, 1), &wsaData);
static char buf[8192]=""; static char main_buf[8192];
char *buf=main_buf;
char *p=NULL; char *p=NULL;
HKEY hKey; HKEY hKey;
@ -293,46 +357,74 @@ __declspec(dllexport) void download (HWND parent,
get->connect (url); get->connect (url);
while (1) { while (1) {
if (dlg) do
{ {
MSG msg; if ( dlg )
while (PeekMessage(&msg,dlg,0,0,PM_REMOVE))
{ {
TranslateMessage(&msg); MSG msg;
DispatchMessage(&msg); while (PeekMessage(&msg,dlg,0,0,PM_REMOVE))
} {
TranslateMessage(&msg);
DispatchMessage(&msg);
}
}
}
while (!TryEnterCS()); // Process messages
if ((g_cancelled || error) && dlg)
DestroyWindow(dlg);
LeaveCS();
if ( g_cancelled || error )
{
if (parent)
{
SetWindowLong(parent,GWL_WNDPROC,(long)lpWndProcOld);
if (hwndB) ShowWindow(hwndB,SW_SHOWNA);
if (hwndL) ShowWindow(hwndL,SW_SHOWNA);
SetWindowPos(childwnd,0,0,0,orig_childRc.right-orig_childRc.left,orig_childRc.bottom-orig_childRc.top,SWP_NOACTIVATE|SWP_NOZORDER|SWP_NOMOVE);
if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),0);
}
if ( !error )
error = "cancel";
break;
} }
Sleep(25); Sleep(25);
if (g_cancelled) break;
st = get->run (); st = get->run ();
if (st == -1) { if (st == -1) {
error=get->geterrorstr(); error=get->geterrorstr();
break; //break;
} else if (st == 1) { } else if (st == 1) {
if (sofar < cl) if (sofar < cl)
error="download incomplete"; error="download incomplete";
break; else
{
bSuccess=TRUE;
error = "success";
}
//break;
} else { } else {
if (get->get_status () == 0) { if (get->get_status () == 0) {
// progressFunc ("Connecting ...", 0); // progressFunc ("Connecting ...", 0);
if (last_recv_time+g_timeout_ms < GetTickCount()) if (last_recv_time+timeout_ms < GetTickCount())
{ {
error = "Timed out on connecting."; error = "Timed out on connecting.";
break; //break;
} }
} else if (get->get_status () == 1) { } else if (get->get_status () == 1) {
progress_callback("Reading headers", 0); progress_callback(dlg, "Reading headers", 0);
if (last_recv_time+g_timeout_ms < GetTickCount()) if (last_recv_time+timeout_ms < GetTickCount())
{ {
error = "Timed out on getting headers."; error = "Timed out on getting headers.";
break; //break;
} }
} else if (get->get_status () == 2) { } else if (get->get_status () == 2) {
@ -344,7 +436,7 @@ __declspec(dllexport) void download (HWND parent,
cl = get->content_length (); cl = get->content_length ();
if (cl == 0) { if (cl == 0) {
error = "Server did not specify content length."; error = "Server did not specify content length.";
break; //break;
} else if (dlg) { } else if (dlg) {
SendMessage(g_hwndProgressBar, PBM_SETRANGE, 0, MAKELPARAM(0,30000)); SendMessage(g_hwndProgressBar, PBM_SETRANGE, 0, MAKELPARAM(0,30000));
g_file_size=cl; g_file_size=cl;
@ -386,23 +478,21 @@ __declspec(dllexport) void download (HWND parent,
rtext, rtext,
remain==1?"":szPlural remain==1?"":szPlural
); );
progress_callback(buf, sofar); progress_callback(dlg, buf, sofar);
} else { } else {
if (sofar < cl) if (sofar < cl)
error = "Server aborted."; error = "Server aborted.";
//break;
break;
} }
} }
if (GetTickCount() > last_recv_time+g_timeout_ms) if (GetTickCount() > last_recv_time+timeout_ms)
{ {
error = "Downloading timed out."; error = "Downloading timed out.";
break; //break;
} }
} else { } else {
error = "Bad response status."; error = "Bad response status.";
break;
} }
} }
@ -410,32 +500,16 @@ __declspec(dllexport) void download (HWND parent,
WSACleanup(); WSACleanup();
} }
CloseHandle(hFile); CloseHandle(hFile);
if (parent)
{
if (dlg) DestroyWindow(dlg);
if (lpWndProcOld)
SetWindowLong(parent,GWL_WNDPROC,(long)lpWndProcOld);
if (childwnd)
{
if (hwndB) ShowWindow(hwndB,SW_SHOWNA);
if (hwndL) ShowWindow(hwndL,SW_SHOWNA);
}
if (wasen) EnableWindow(GetDlgItem(parent,IDCANCEL),0);
}
} }
if (g_cancelled) { if (g_cancelled || !bSuccess) {
pushstring("cancel");
DeleteFile(filename); DeleteFile(filename);
} else if (error == NULL) {
pushstring("success");
} else {
DeleteFile(filename);
pushstring(error);
} }
pushstring(error);
if (get) delete get; if (get) delete get;
} }

BIN
Plugins/nsisdl.dll
View file

Binary file not shown.