From 19556df888534f9a00ff6bb9cf8bd64a9edf2f74 Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 7 Sep 2003 14:36:03 +0000 Subject: [PATCH] Temporary workaround to FindControlIdx returning -1 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2874 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 10 +++++++++- Plugins/InstallOptions.dll | Bin 13824 -> 13824 bytes 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index c22cb006..c494ac90 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -663,6 +663,8 @@ LRESULT WMCommandProc(HWND hWnd, UINT id, HWND hwndCtl, UINT codeNotify) { case BN_CLICKED: { int nIdx = FindControlIdx(id); + if (nIdx < 0) + break; if (pFields[nIdx].nType == FIELD_BROWSEBUTTON) { int nParentIdx = pFields[nIdx].nParentIdx; switch(pFields[nParentIdx].nType) { @@ -726,7 +728,10 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, HFONT OldFont; LOGFONT lf; #endif - + + if (nIdx < 0) + break; + #ifdef IO_LINK_UNDERLINED GetObject(GetCurrentObject(lpdis->hDC, OBJ_FONT), sizeof(lf), &lf); lf.lfUnderline = TRUE; @@ -789,6 +794,9 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, int WINAPI StaticLINKWindowProc(HWND hWin, UINT uMsg, LPARAM wParam, WPARAM lParam) { int StaticField = FindControlIdx(GetDlgCtrlID(hWin)); + if (StaticField < 0) + return 0; + switch(uMsg) { case WM_GETDLGCODE: diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 5b0f6cb628554ea5ab511b6d21d9b629e2009cba..f9f9411a6b0450e1e9940db5249ed3a1f31a8c76 100644 GIT binary patch delta 1067 zcmYk3eN0tl9LLXd1%(TGFK{6!F$jcdQ=W6rJLs9d; z&z9O+IyjEgVgSc^Ue}yvvK{I)RYRuKL}_@w;%zkbjgV38Fyeb5XZKBbr)@2jY?&Pa z#B_VYGoHtW(cELdA8$7L%(j}a;H@dc@C~}XL$)@Sr zA7q;{QzLh;<+v+mJofL;WDy|39}eB1AtXZuDHTeUa!fg`oK?D%&lR9Pp{`M7wMjjy zUQn;9->P@iyXv26xMtOowAEU+mZ$B~s$$^GiVkSsYY{Y0WG0r4fHiyN%zrO+DzY}@6u!RG(Aht z(=Pf2?V&emFYTwpG)N!NDaxgA+)?wVOQ03T!&I07G1Or;%!fs=488*Q!fIFt+aZG| z;79NhybFJZAvgtRAjezz1b!{g^96h{@8);&o&5X!8U7sKaFM^v-{SlE5dV;mbjCW< zozU6r6a+=MEL<0U5`w}5;i15}B3+wYn_UN84K9bcO57|KiKF7UI3>=AI?6%Mp;EL1 z?L{@H6}6*J(Is>Rb)(zp4jMwgpx@Crnnbf`sbrH9B$t#el}kIN15&MYxIt={j!UPc zt5T12TN;(dq)BN`vf$-74kzJMyas1s5i2+!7vr6{279p&Gkgl4$DiRZaR7gVd+{J1 z#v^zPPvC#>BWxwHB$1?$Od=9Wa!COxCfi8`*-z?7E9oR35I?y_`p7*pPUZ-;$qsq7 zyj~{q2034TK`xQsls$62d`Rw)kIP@l-ST(xkMgiQD*q*iDOM#;S*fHcP{~$aQno5@ K`%ehFEdK);os@n6 delta 1065 zcmYk3eN0tl9LLXdMdRhdJ-oGeE7(8^GoEwLJBN_ECZOoz zl1kdH6?CfMd?{#UTMdlsbWPZRT#drKO#`tMHxn*G=4{+z7^ee&@yGA?`+R?|fBc%Z zH*IgZx~!#fZR>9-Aft751PuFr0Tp2&*~pG~%JyfhQDudhSmXVOKY+tmYkwAi_k6vP zi6E-dtW6IMl+T#vw!RlijLE2#;iW;-ESXAo2i!)2LjxC$Vn;TJF%CI$Ly8XkyUOr8 z;vPQ&I8H;BtB=sI6&%fbEx&cjtcx?_{gC6m_nL!_gPROHk3?vdym@?ofOk92G|ZdkfeZYkW1(CZ_foN09}@8YZ5{VsHTLmtV~Fp}C=>fCD+YM(W$$!Ru{CAJ z@3FSK1HSvF>3!2W~chlcItBXr*cMlpv0)@s-*5# z-%&qP&!|1>p!&0VOPy8c)krNtlQmT<)3#_$T9-DU{i=;?b6S}0&;?!9*Xt#EmHxWE zNB>YitM}^P>4W+ueORB+@9L%=!D3hvOJh$kC&O$F%lEJsSurbT8`%z4$M&+f*b(*t zYhx$b=j=2)%X-)V8)R45H8#fnVnN2Ga$Jk`SO6no3`~bvFdIsc!F;$5mcdtH4QzlO z*bH0X3HUu6f+KJY-iFgK2yMc{LW+Qe93f9A6dHv?!n?vpg6EjfE_^Et2qVHxVMdr2 zcxSS6hx0KpQ*0N%5q}h~h}XoM;kzj4QFBr=imZdjd$YR*n_>e4S$Niz+dBT+=DOR zL3{}h$(;!J*glyWEW{9hsh_Ti}aG8$S9d0Y>sd= znkLc=x|&Lq(lxY{ZlGJ}8+0GtPrsy{^c?M@gVay2(|a^XO&Y2=lw>7a(Un|fv+t<5 G+4et6-kg;H