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

nsDialogs::OnNotify can now return values back to Windows, also fixes bug #1216

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7054 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-11-27 22:15:26 +00:00
parent 4f695dbd30
commit a523c05626
6 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Contrib/nsDialogs/nsDialogs.c
View file

@ -19,6 +19,7 @@
HINSTANCE g_hInstance;
struct nsDialog g_dialog;
extra_parameters* g_pluginParms;
LPTSTR g_var0;
static COLORREF GetLinkColor()
{
@ -149,6 +150,7 @@ INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
{
LPNMHDR nmhdr = (LPNMHDR) lParam;
struct nsControl* ctl = GetControl(nmhdr->hwndFrom);
int *pFlag = &g_pluginParms->exec_flags->silent, orgFlag, ret; // The silent flag can only be changed in .onInit and custom pages will not be displayed in silent mode so we can use this flag in the callback
if (ctl == NULL)
break;
@ -156,11 +158,16 @@ INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
if (!ctl->callbacks.onNotify)
break;
orgFlag = *pFlag, *pFlag = 0;
pushintptr((INT_PTR) nmhdr);
pushintptr(nmhdr->code);
pushintptr((INT_PTR) nmhdr->hwndFrom);
g_pluginParms->ExecuteCodeSegment(ctl->callbacks.onNotify - 1, 0);
ret = *pFlag, *pFlag = orgFlag;
if (ret)
return DlgRet(hwndDlg, StrToIntPtr(g_var0));
}
break;
// handle links
case WM_DRAWITEM:
@ -266,6 +273,7 @@ void __declspec(dllexport) Create(HWND hwndParent, int string_size, TCHAR *varia
g_dialog.hwParent = hwndParent;
g_pluginParms = extra;
g_var0 = variables;
hwPlacementRect = GetDlgItem(hwndParent, popint());
GetWindowRect(hwPlacementRect, &rcPlacement);