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

Use a undocumented variable as the nsDialogs::OnNotify return value so we don't have to worry about restoring it

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7055 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2018-11-27 22:36:58 +00:00
parent a523c05626
commit fa85ddb775
5 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Contrib/nsDialogs/nsDialogs.c
View file

@ -19,7 +19,7 @@
HINSTANCE g_hInstance;
struct nsDialog g_dialog;
extra_parameters* g_pluginParms;
LPTSTR g_var0;
LPTSTR g_callbackRetVar;
static COLORREF GetLinkColor()
{
@ -165,7 +165,7 @@ INT_PTR CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPara
g_pluginParms->ExecuteCodeSegment(ctl->callbacks.onNotify - 1, 0);
ret = *pFlag, *pFlag = orgFlag;
if (ret)
return DlgRet(hwndDlg, StrToIntPtr(g_var0));
return DlgRet(hwndDlg, StrToIntPtr(g_callbackRetVar));
}
break;
@ -273,7 +273,7 @@ void __declspec(dllexport) Create(HWND hwndParent, int string_size, TCHAR *varia
g_dialog.hwParent = hwndParent;
g_pluginParms = extra;
g_var0 = variables;
g_callbackRetVar = GetVar(variables, string_size, 31); // The undocumented $_OUTDIR variable
hwPlacementRect = GetDlgItem(hwndParent, popint());
GetWindowRect(hwPlacementRect, &rcPlacement);