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

- Leave function of instfiles will be called if installation aborted too so the MUI will be able to set the title

Browse source 
- Cancel button now set default if installation canceled


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2422 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-04-04 12:27:58 +00:00
parent 4f54f7fc16
commit e1bc9f0971
1 changed files with 13 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Source/exehead/Ui.c
View file

@ -50,7 +50,6 @@ int g_quit_flag; // set when Quit has been called (meaning bail out ASAP)
#error invalid value for NSIS_MAX_INST_TYPES #error invalid value for NSIS_MAX_INST_TYPES
#endif #endif
//int g_autoclose;
int progress_bar_pos, progress_bar_len; int progress_bar_pos, progress_bar_len;
int g_is_uninstaller; int g_is_uninstaller;
@ -545,7 +544,12 @@ nextPage:
SetDlgItemTextFromLang(hwndDlg,IDOK,this_page->next); SetDlgItemTextFromLang(hwndDlg,IDOK,this_page->next);
hwndtmp=GetDlgItem(hwndDlg,IDC_BACK); hwndtmp=GetDlgItem(hwndDlg,IDC_BACK);
SendMessage(g_hwnd,DM_SETDEFID,IDOK,0); if (g_flags.abort)
{
this_page->button_states|=16|4;
SendMessage(g_hwnd,DM_SETDEFID,IDCANCEL,0);
}
else SendMessage(g_hwnd,DM_SETDEFID,IDOK,0);
SetWindowLong(hwndtmp,GWL_STYLE,GetWindowLong(hwndtmp,GWL_STYLE)&~BS_DEFPUSHBUTTON); SetWindowLong(hwndtmp,GWL_STYLE,GetWindowLong(hwndtmp,GWL_STYLE)&~BS_DEFPUSHBUTTON);
ShowWindow(hwndtmp,this_page->button_states&SW_SHOWNA);// SW_HIDE = 0, SW_SHOWNA = 8 ShowWindow(hwndtmp,this_page->button_states&SW_SHOWNA);// SW_HIDE = 0, SW_SHOWNA = 8
EnableWindow(hwndtmp,this_page->button_states&2); EnableWindow(hwndtmp,this_page->button_states&2);
@ -565,7 +569,8 @@ nextPage:
if (this_page->id!=NSIS_PAGE_COMPLETED) DestroyWindow(m_curwnd); if (this_page->id!=NSIS_PAGE_COMPLETED) DestroyWindow(m_curwnd);
else { else {
if (g_flags.autoclose) goto nextPage; if (g_flags.abort) SetFocus(m_hwndCancel);
else if (g_flags.autoclose) goto nextPage;
return 0; return 0;
} }
@ -1358,7 +1363,7 @@ static DWORD WINAPI install_thread(LPVOID p)
#ifdef NSIS_CONFIG_UNINSTALL_SUPPORT #ifdef NSIS_CONFIG_UNINSTALL_SUPPORT
} }
#endif #endif
if (m_curwnd) SendMessage(m_curwnd,WM_NOTIFY_INSTPROC_DONE,g_flags.abort,0); if (m_curwnd) SendMessage(m_curwnd,WM_NOTIFY_INSTPROC_DONE,0,0);
return g_flags.abort; return g_flags.abort;
} }
@ -1444,20 +1449,12 @@ static BOOL CALLBACK InstProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
m_retcode=1; m_retcode=1;
outernotify(NOTIFY_BYE_BYE); outernotify(NOTIFY_BYE_BYE);
} }
else if (!wParam)
{
HWND h=m_hwndOK;
EnableWindow(h,1);
ShowWindow(g_hwnd,SW_SHOWNA);
update_status_text_from_lang(LANG_COMPLETED,"");
outernotify(1);
SetFocus(h);
}
else else
{ {
HWND h=m_hwndCancel; ShowWindow(g_hwnd,SW_SHOWNA);
EnableWindow(h,1); if (!g_flags.abort)
SetFocus(h); update_status_text_from_lang(LANG_COMPLETED,"");
outernotify(1);
} }
} }
//>>>Ximon Eighteen aka Sunjammer 30th August 2002 //>>>Ximon Eighteen aka Sunjammer 30th August 2002