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

Now only shows the unpacking dialog if the NSIS window hasn't been created yet

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1113 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2002-09-21 15:17:42 +00:00
parent 1d98414847
commit fc2c45cb92
2 changed files with 61 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Source/exehead/Ui.c
View file

@ -81,7 +81,7 @@ static void NSISCALL outernotify(char num) {
}
#ifdef NSIS_CONFIG_VISIBLE_SUPPORT
static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
static int CALLBACK WINAPI BrowseCallbackProc( HWND hwnd, UINT uMsg, LPARAM lParam, LPARAM lpData);
#ifdef NSIS_CONFIG_LICENSEPAGE
static BOOL CALLBACK LicenseProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
@ -405,8 +405,9 @@ int NSISCALL ui_doinstall(void)
static char str2[]="RichEdit20A";
if (!LoadLibrary(str1))
{
str1[6]='3';
str1[7]='2';
((short*)str1)[3]=*(short*)"32";
//str1[6]='3';
//str1[7]='2';
LoadLibrary(str1);
}
@ -463,7 +464,7 @@ static int CALLBACK WINAPI BrowseCallbackProc( HWND hwnd, UINT uMsg, LPARAM lPar
}
static BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
{
static HICON hIcon;
if (uMsg == WM_DESTROY && hIcon) { DeleteObject(hIcon); hIcon=0; }

3
Source/exehead/fileform.c
View file

@ -226,6 +226,7 @@ static char _outbuffer[OBUFSIZE];
extern int m_length;
extern int m_pos;
extern BOOL CALLBACK verProc(HWND, UINT, WPARAM, LPARAM);
extern BOOL CALLBACK DialogProc(HWND, UINT, WPARAM, LPARAM);
static int NSISCALL __ensuredata(int amount)
{
HWND hwnd=NULL;
@ -259,7 +260,7 @@ static int NSISCALL __ensuredata(int amount)
m_pos=m_length-(amount-(dbd_size-dbd_pos));
while (PeekMessage(&msg,NULL,0,0,PM_REMOVE)) DispatchMessage(&msg);
}
else if (g_hwnd && GetTickCount() > verify_time)
else if (GetWindowLong(g_hwnd,GWL_WNDPROC) != (long)DialogProc && GetTickCount() > verify_time)
hwnd=CreateDialogParam(
g_hInstance,
MAKEINTRESOURCE(IDD_VERIFY),