[popfile-commit] windows adduser-Version.nsh,1.2,1.3 adduser.nsi,1.74,1.75

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

Update of /cvsroot/popfile/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5357

Modified Files:
	adduser-Version.nsh adduser.nsi 
Log Message:
Fix the bug that made an upgrade installation fail to use the new dynamic
"SFN Support" detection function.

Index: adduser-Version.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** adduser-Version.nsh	4 Mar 2005 02:00:30 -0000	1.2
--- adduser-Version.nsh	5 Mar 2005 14:48:24 -0000	1.3
***************
*** 7,11 ****
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.70"
  
  #--------------------------------------------------------------------------
--- 7,11 ----
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.2.71"
  
  #--------------------------------------------------------------------------

Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** adduser.nsi	4 Mar 2005 02:00:31 -0000	1.74
--- adduser.nsi	5 Mar 2005 14:48:25 -0000	1.75
***************
*** 1930,1933 ****
--- 1930,1962 ----
        $(PFI_LANG_DIRSELECT_MBWARN_2)" IDNO offer_default
    StrCpy $G_USERDIR $INSTDIR
+ 
+   ; Assume SFN support is enabled (the default setting for Windows)
+ 
+   StrCpy $G_SFN_DISABLED "0"
+ 
+   Push ${L_RESULT}
+ 
+   Push $G_USERDIR
+   Call PFI_GetSFNStatus
+   Pop ${L_RESULT}
+   StrCmp ${L_RESULT} "1" check_config_data
+   StrCpy $G_SFN_DISABLED "1"
+ 
+   ; Short file names are not supported here, so we cannot accept any path containing spaces.
+ 
+   Push $G_USERDIR
+   Push ' '
+   Call PFI_StrStr
+   Pop ${L_RESULT}
+   StrCmp ${L_RESULT} "" check_config_data
+   Push $G_USERDIR
+   Call PFI_GetRoot
+   Pop $G_PLS_FIELD_1
+   MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_DIRSELECT_MBNOSFN)"
+   Pop ${L_RESULT}
+   Goto offer_default
+ 
+ check_config_data:
+   Pop ${L_RESULT}
    Call CheckExistingConfigData
    Abort