[popfile-commit] windows installer.nsi,1.106,1.107

[<xue...@us...>]

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1:/tmp/cvs-serv26185

Modified Files:
	installer.nsi 
Log Message:
POP3 and GUI port selection validation now handles leading zeroes and spaces properly.

Index: installer.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/installer.nsi,v
retrieving revision 1.106
retrieving revision 1.107
diff -C2 -d -r1.106 -r1.107
*** installer.nsi	12 Aug 2003 13:52:31 -0000	1.106
--- installer.nsi	13 Aug 2003 16:36:57 -0000	1.107
***************
*** 1318,1321 ****
--- 1318,1326 ----
  
    !insertmacro MUI_INSTALLOPTIONS_DISPLAY "ioA.ini"
+   
+   ; Store validated data (for use when the "POPFile" section is processed)
+   
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 2" "State" $G_POP3
+   !insertmacro MUI_INSTALLOPTIONS_WRITE "ioA.ini" "Field 4" "State" $G_GUI
  
    Pop ${L_RESULT}
***************
*** 1344,1347 ****
--- 1349,1361 ----
    !insertmacro MUI_INSTALLOPTIONS_READ $G_GUI "ioA.ini" "Field 4" "State"
  
+   ; strip leading zeroes and spaces from user input
+   
+   Push $G_POP3
+   Call StrStripLZS
+   Pop $G_POP3
+   Push $G_GUI
+   Call StrStripLZS
+   Pop $G_GUI
+   
    StrCmp $G_POP3 $G_GUI ports_must_differ
    Push $G_POP3