From f28bb70254af8c2fe4467bf80d77ad9cd40aed8d Mon Sep 17 00:00:00 2001 From: kichik Date: Sun, 21 Sep 2003 16:22:34 +0000 Subject: [PATCH] a bit more testing git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2945 212acab6-be3b-0410-9dea-997c60f758d6 --- Contrib/InstallOptions/InstallerOptions.cpp | 7 +++++-- Plugins/InstallOptions.dll | Bin 13312 -> 13312 bytes 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp index 1fb062a1..d6177eb6 100644 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -55,6 +55,7 @@ char *STRDUP(const char *c) return lstrcpy(t,c); } +#define FIELD_INVALID (0) #define FIELD_LABEL (1) #define FIELD_ICON (2) #define FIELD_BITMAP (3) @@ -345,12 +346,14 @@ bool SaveSettings(void) { int CurrField = 1; for(nIdx = 0; nIdx < nNumFields; nIdx++) { - if ( pFields[nIdx].nType == FIELD_BROWSEBUTTON ) + if (pFields[nIdx].nType == FIELD_BROWSEBUTTON) continue; hwnd = pFields[nIdx].hwnd; wsprintf(szField, "Field %d", CurrField); switch(pFields[nIdx].nType) { + case FIELD_INVALID: + break; case FIELD_CHECKBOX: case FIELD_RADIOBUTTON: { @@ -544,7 +547,7 @@ int ReadSettings(void) { // Get the control type pFields[nIdx].nType = LookupToken(TypeTable, szResult); - if (!pFields[nIdx].nType) + if (pFields[nIdx].nType == FIELD_INVALID) continue; // Lookup flags associated with the control type diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll index 46a8d8ad17e4bf37fe945396048f376702c8f04c..f3c20bca4d950c041d49f385206bbaca6b5e7e78 100644 GIT binary patch delta 1227 zcmYk5du&ui6vlV9mF>1mcS*NyA3QBsS|Hrry>n*f?!9*!3i6Ui8oE%L7()mJWebs) zylkOcMcYDg1j<9DY6u1b$QBjkQ3|CXF#!UB2vXEwE+v7IB3NZ}z1_b^W-`C?WzL+* z`DUsYRxfP4l_YmYw%#6u_}1Q=s5^EQMP5OR1b6syitIMq$K!{4n`bSsdFtLA?oB#d z^S(FP9ZeTY9r^y?wVLy;x=G&9&+h0MWV6-uB6l>FfMoaP9$TN%&%L=l0cq~q-^FQ% zZ)D*M)0|!R*vPcjy6&>tXJzhaiJt5(6VYK&>I^x~$4xVA zM8pnf7>yK3YSqsy@i8AcMS5QlxmXn^SPwW3Y2maLx; zDi%v~4%`2ID2C-u8PjB#rio>%l}1AXX&-J(pxTG45?IuSi$zoJ>uiE0BzkWy@0VnL+^!lhxUaIhJFm44ms38>R7c%-K6ePThw;-7xlJ!PyJg>(>&S`ZIm`y zo32H)wc4lJCGC#(ShMMwdY)dOPu0VEL|>t=)j!cc(~s!a^jrE}{i%+4D);bgK7{A< z(cI5fUd*TSQvNotsNxa6o=5o>zMb#qhj@%1=jZrkewE+hfA9zV1-D-NP-|GvE8Ew`tV zFquyllT~CRX&_DHD{`D%A~(tX36|%GX3`uwiprGJiF5{?Ma$`Ox`x)!db*A7p>6ac jy-I(jf6^}coTf4l%Vw{!0tRd{o5S8>8(3_p|DOGSfK5&KfrLi_xV_R*#S}dhiuxP4QW7GQRBQ=7}ip584K?L0Hk^W&OllgpqGr!+2 zneR-cuhO^UO60^qaoumJh}HF7MqQzcsB9Qotn(P>SUExvYG!3PK3uRwNDAgJAIcRq^JiJkcuh zAaL5|9o#s!(2xd9^ZDQ%V}i8??-o_}6xpkeS!D{01S?W~qR8qz+FsRYg@Wo`E4MOJ zSZ)np(26`~UJmGKu?rI$`c1RwX1GUqPp^rc;A;6_EKf97DdwnfYVd*8Go{d&XPw@< z(otYg{cLOwx~nJ0<)EYbOL5+qGlQmCXq4-_;|kGK{hzpdC{_Qb=(ZL1Sp9Ehw8i%*)vvP$RKldbd;e!rs9ohkEtXh{V^45B13F(jpZXhrNa$!CcKnW~{GN^z`*bLiY7rX}_!2vh~P0#{u za0V{G4d{kP5J_xg6iFqM2@p;e5Fe=^8~sEljpS3(LRv`&=_b8ofF#mXnn9;fLN%I0 z^Jp=Bg|4I3w3gP~Buiipmddi&R7RM>3Ro%gu@!6wYhb%s z6YFHRSuYzVC(9mruDnPtm;Lf~xnABUH_Pp^|CTIz!Mnu!s<+;|*Sp_)#Cyz(6sIy- zk(Eu#F6EGNTsf`$qWr4dQHH5Db&Tp#XR5jCQgw~`wt7;%q~25?s&*|^o2bp!^0lSf zN^Ol+rESv=YUi|{v@6uw6+)uhycfPySz1N-NY4V)&bb7iy_dNq1mR*|No9&W9Qj63kMPVEEKY=sx z6s+PBybQ0#>#!eh!8(2)@59IOd3+sr;a)t56JR8yKnBc$Ij{hh!Ae+b`Mm{p!aJ}B z_FHa$3C(Z<&cjvcf_|`(Br=+05I13#*Rx4JDIrV9Yh*pyLUxi5NQj&y7s;Qbdp7AO zcIu!mI+Zdyoz9{2XaQY8SJMr2Gu=)bXbWwlXX(%M586rZ(I{qP$!r{($V4`iJ