[popfile-commit] windows adduser-Uninstall.nsh, 1.2.2.5, 1.2.2.6 adduser-Version.nsh, 1.6.2.14, 1.6.2.15 adduser.nsi, 1.59.4.15, 1.59.4.16

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

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

Modified Files:
      Tag: b0_22_2
	adduser-Uninstall.nsh adduser-Version.nsh adduser.nsi 
Log Message:
Updated to work with the updated library function which uses the
LockedList plugin instead of instead of code which assumes the user
has administrator rights.

Index: adduser-Uninstall.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Uninstall.nsh,v
retrieving revision 1.2.2.5
retrieving revision 1.2.2.6
diff -C2 -d -r1.2.2.5 -r1.2.2.6
*** adduser-Uninstall.nsh	28 Sep 2006 18:30:06 -0000	1.2.2.5
--- adduser-Uninstall.nsh	21 Sep 2007 01:22:09 -0000	1.2.2.6
***************
*** 4,8 ****
  #                           script (adduser.nsi) used to build the 'Add POPFile User' wizard.
  #
! # Copyright (c) 2005-2006 John Graham-Cumming
  #
  #   This file is part of POPFile
--- 4,8 ----
  #                           script (adduser.nsi) used to build the 'Add POPFile User' wizard.
  #
! # Copyright (c) 2005-2007 John Graham-Cumming
  #
  #   This file is part of POPFile
***************
*** 220,223 ****
--- 220,224 ----
    Push ${L_EXE}
    Call un.PFI_WaitUntilUnlocked
+   Push "${C_EXE_END_MARKER}"
    Push ${L_EXE}
    Call un.PFI_CheckIfLocked

Index: adduser-Version.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/adduser-Version.nsh,v
retrieving revision 1.6.2.14
retrieving revision 1.6.2.15
diff -C2 -d -r1.6.2.14 -r1.6.2.15
*** adduser-Version.nsh	29 Jul 2007 17:13:19 -0000	1.6.2.14
--- adduser-Version.nsh	21 Sep 2007 01:22:09 -0000	1.6.2.15
***************
*** 7,11 ****
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.3.10"
  
  #--------------------------------------------------------------------------
--- 7,11 ----
  #--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION  "0.3.12"
  
  #--------------------------------------------------------------------------

Index: adduser.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/adduser.nsi,v
retrieving revision 1.59.4.15
retrieving revision 1.59.4.16
diff -C2 -d -r1.59.4.15 -r1.59.4.16
*** adduser.nsi	29 Jul 2007 17:13:19 -0000	1.59.4.15
--- adduser.nsi	21 Sep 2007 01:22:09 -0000	1.59.4.16
***************
*** 723,726 ****
--- 723,727 ----
    !insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
    ReserveFile "${NSISDIR}\Plugins\Banner.dll"
+   ReserveFile "${NSISDIR}\Plugins\LockedList.dll"
    ReserveFile "${NSISDIR}\Plugins\nsExec.dll"
    ReserveFile "${NSISDIR}\Plugins\NSISdl.dll"