From d5c0749312e4897bba1ee93f0e11f165710fc539 Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Tue, 5 Aug 2003 15:05:49 +0000
Subject: [PATCH] - Removed SS_NOPREFIX - Made IO return error instead of
 crashing if there are no fields in the INI

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2788 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/InstallOptions/InstallerOptions.cpp |  14 +++++++++-----
 Contrib/InstallOptions/io.dsp               |   3 ++-
 Plugins/InstallOptions.dll                  | Bin 13824 -> 13824 bytes
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp
index 00bb93f2..f207115f 100644
--- a/Contrib/InstallOptions/InstallerOptions.cpp
+++ b/Contrib/InstallOptions/InstallerOptions.cpp
@@ -18,7 +18,6 @@
 #include "../exdll/exdll.h"
 #undef popstring
 
-
 static int popstring(char *str)
 {
   stack_t *th;
@@ -451,7 +450,7 @@ char * WINAPI myGetProfileStringDup(LPCTSTR lpAppName, LPCTSTR lpKeyName)
     return NULL;
 }
 
-bool ReadSettings(void) {
+int ReadSettings(void) {
   static char szField[25];
   int nIdx, nCtrlIdx;
 
@@ -642,8 +641,7 @@ bool ReadSettings(void) {
     }
   }
 
-
-  return true;
+  return nNumFields;
 }
 
 
@@ -906,7 +904,7 @@ int createCfgDlg()
       DWORD dwExStyle;
     } ClassTable[] = {
       { "STATIC",       // FIELD_LABEL
-        DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_NOPREFIX,
+        DEFAULT_STYLES /*| WS_TABSTOP*/,
         WS_EX_TRANSPARENT },
       { "STATIC",       // FIELD_ICON
         DEFAULT_STYLES /*| WS_TABSTOP*/ | SS_ICON,
@@ -1260,6 +1258,12 @@ extern "C" void __declspec(dllexport) show(HWND hwndParent, int string_size,
   showCfgDlg();
 }
 
+#ifdef _DEBUG
+#ifndef DEBUG
+#define DEBUG
+#endif
+#endif
+
 #ifdef DEBUG
 extern "C" BOOL WINAPI DllMain(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
 #else
diff --git a/Contrib/InstallOptions/io.dsp b/Contrib/InstallOptions/io.dsp
index e749e077..4e033e85 100644
--- a/Contrib/InstallOptions/io.dsp
+++ b/Contrib/InstallOptions/io.dsp
@@ -68,6 +68,7 @@ LINK32=link.exe
 # PROP Use_Debug_Libraries 1
 # PROP Output_Dir "Debug"
 # PROP Intermediate_Dir "Debug"
+# PROP Ignore_Export_Lib 0
 # PROP Target_Dir ""
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "INSTOPTDLL_EXPORTS" /YX /FD /GZ /c
 # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "INSTOPTDLL_EXPORTS" /YX /FD /GZ /c
@@ -80,7 +81,7 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /entry:"" /dll /debug /machine:I386 /out:"..\..\Plugins\InstallOptions.dll" /pdbtype:sept
 
 !ENDIF 
 
diff --git a/Plugins/InstallOptions.dll b/Plugins/InstallOptions.dll
index 600516f3ab0b4c4c9dca3ddc980eebdd2d7cb76b..b1f51a1a6bd44275a573d2f1a6fe67948529886b 100644
GIT binary patch
delta 954
zcmYk4eN0tl9LLXddAZo-<;1AC0wL~B5{Ep8bI<d3&Uv2JbR{}NsuA(hqT49F+MJMu
zEN($BE-~?G5jv&2hFLP1o@tr8rlA()3t+FC<x4H^COOhj)?6o`{^0l5=kxvRyYGIH
za3s8CsG$A(5~2Km7nSq^A4pb|+{u9d7doAPZtzSb$WD(gqo5Fk<RIt)yPW4d`%=IW
znd4gs-j-#)642!|`;q|YbRww_0iZgAX<jfps;*YlC+ljf+m2@qw6z3OrK!$s45Y-%
z<(2f}JC@&c-KwjB^7tZoZ-xzy$(oE3kSsT4#K0d;nVJj0kkfEy0Z3YT%XMFKIx@Eb
zaN4;qYe6D7As@{qpjmcge+#OddcO<6Vp*Tl4}3B+cc?gU#dTd{G_0s`|1^$GVfr-w
zHH8V&I5CA2G9zyu9sb>QqbZYh-Nxj^_`nQHjUSj{YW%|)mJ;ulYw|2m<Lt?+@a&%x
z@Fq+yDhmq>W?i1ID6mLTUUXIz{tAHN81v62PY#m=D?#fpyTORb%{6ADxx?IT?lnI%
zkD7^=-+ICdTd!MPR*%(Z?Xyl==dDZDn04ElZRgwEUS>aSZ?${vPwheb7kkvcZfEg)
zu5*h&z*q2UzMgmU_xUc~$M^F?{A)hUFY{}Bod3fUMXI<<<cNSM5~Zzz2_YU772<JG
zD?;LV(IhsASHzn_if+*(dPSf3M8w1wVnqBTeiLJ2eCkW)C`tq<iWjEAOqdPl!XgME
zhl}7+SOe?fvv3`Zz+Siq9)w5Warh1V4qk%e@HV_h%hv*$u9a)gXsfhlt+h>iPm5{?
zwa>L-?Po1kdZJY5kLY3j1-(UoRo|?4>8JD&{cl|fz7yOTJRLk23>mA9b;e7^VdI$b
zrE$(UZ;To@41l~SfEFN#EVKkYj2=VP=qc2I!l)5N&_=Wc?L{&41G<1l(RJj(UaVq2
zrmdLcCAbcUa2Pk?7W@Y8z!GoAAK;I0KR$p5@ELpok6{-lku>5b^T<LHB#hio%18yN
zB()?&R+6=3J!vPK$X2qAL`gq6M2?b^<P7<dTqIY?O#)~ty_*(On=YkQw1GC!jdU~Z
zp}Q$|=wUiQzoKVpoL-~1sKRD3l_6%a#cVmNWOZy6dzrPf4)!kF!9Hd&c8ZO#apx_4
Gt><5<f?nbP

delta 951
zcmYk&eN0t#9LMqVy<U*#rx0mgW_Ph}%5MCQhx2<n=lp)lHKhmhArqAa-6qRx*o3e$
zqkA3ZmX=(0&>E2?Wkourjv2!!3o_9rtf<X0t+nbBF^O2_3{OJ+!S}D%`}5~FS{<#9
z4fv1l2}<Sv`$5U@r$VBl_^uD)zp<m~kFB2Z8FrILv-d*)LUtd#3U4@J&$~%*+@6zq
z8$55{m0AqV&Qqxg0K1)NS}8!f)0aLIW>;1`&;jKQy}3ONPZwq>n=9P9!ld|p_HP-%
zl;wZ9?waAkW%0$fKhuI<yE3yFlI_OKZWwizWcdKTayDf9Az|ZX*WK>Ka#{dRJ4Lxg
zUN~i!<x{A)WBG%y%Bi~11z2cT%{c-Y_AK8(Fz~DEy87?cN><!A#nDM-PjP&biBtT0
zl2`4Vf?L?&FRr^kX`_<m)+Ku5C#O|fymMM*#ow7$N%2;@roe<s=WxLak25hhFmuNB
zf7*e7Kl$Q3MG4MVl+Diaz)t{CN1xZ92x(3NDuc)<*A2sX#HcY^j046&;{&7H05i`l
zGs9+s*=)9&?dD;#$2@0VFh|TQ=4{Jn8P=WFgI1%}X1#Bnw7#>3tV>q5@ChWCkm6pk
zTGWZX;uZ0_XctGsG4Z)LD=vy*F($4GkjXMf=1ac}$YMz%(v)||rSg8cR)%D?td&p7
zXXLXoCilu#*(TfNQQ0Lwmi_V@`J)_>V^X<EQKFzIUX+3|(JV9<1yB$f=yp_!)}TsM
zg*Ksj)P~+h4myrLL8s7{=mHu;S5U6%Q~fGZm#7b^>(wXJsJcgu>{A`}L-nlst=hHV
z(*>rsObcs|X<M|2wo7Z)`m}!SvNoYLmAqVXx@4dvq;JqS>5uE3`bT=NKA@k|hxAeX
zn(oDZd@BxOh8N*`@Cv*dSKxIxjB9W`-hp4h2XPl3#OLu4zJy)uCFvxOU}BI(5mHV<
zBur|_7P6h}Br)<5d5yeD4w3iB337&<CnMw^;-M)tkKRm+s7eX7=wiB*uB2;eh(1go
zrFC>0eU3KL7wJBFh#sTew1=LdU(@etoc>9#(PVZ5o6k5aWvkdaR?Bv<U96QIU>&TJ
zX(!lc><jiY8)oBdf+g~Fu5rc}^1Jy;Ue4F^t$Z8b$!*@k-{M`okN5L2r%|i%G$HT5
Dtc_uH