[popfile-commit] windows runpopfile.nsi,1.11.4.4,1.11.4.5

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

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

Modified Files:
      Tag: b0_22_2
	runpopfile.nsi 
Log Message:
Introduce a new command-line option (/msgcapture) which starts POPFile
via the Message Capture utility. This makes it much easier to use that
utility, especially on Windows 9x systems which previously may have
required some manual adjustment before the POPFILE_ROOT and POPFILE_USER
environment variables could be defined successfully.

Index: runpopfile.nsi
===================================================================
RCS file: /cvsroot/popfile/windows/runpopfile.nsi,v
retrieving revision 1.11.4.4
retrieving revision 1.11.4.5
diff -C2 -d -r1.11.4.4 -r1.11.4.5
*** runpopfile.nsi	29 Aug 2006 15:59:40 -0000	1.11.4.4
--- runpopfile.nsi	28 Sep 2006 18:28:06 -0000	1.11.4.5
***************
*** 64,68 ****
  # (or have not yet used) POPFile). The switch can be in uppercase or lowercase.
  #
! # This switch cannot be combined with the '/config' switch.
  #
  # ---------------------------------------------------------------------------------------
--- 64,68 ----
  # (or have not yet used) POPFile). The switch can be in uppercase or lowercase.
  #
! # This switch cannot be combined with the '/config' or '/msgcapture' switches.
  #
  # ---------------------------------------------------------------------------------------
***************
*** 86,90 ****
  # These temporary changes will override any existing values in these environment variables.
  #
! # This switch cannot be combined with the '/startup' switch.
  #
  #-------------------------------------------------------------------------------------------
--- 86,101 ----
  # These temporary changes will override any existing values in these environment variables.
  #
! # This switch cannot be combined with the '/startup' or '/msgcapture' switches.
! #
! # ---------------------------------------------------------------------------------------
! #
! # /msgcapture
! #
! # By default POPFile runs without showing the console window. This command-line switch forces
! # the utility to use the Message Capture utility in order to make it easy to see (and save)
! # POPFile's console messages which are normally hidden from view. This switch makes it much
! # easier for users (especially those using Windows 9x) to capture these console messages.
! #
! # This switch cannot be combined with the '/startup' or '/config=path' switches.
  #
  #-------------------------------------------------------------------------------------------
***************
*** 106,110 ****
    ;--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION   "0.2.0"
  
    !define C_OUTFILE       "runpopfile.exe"
--- 117,121 ----
    ;--------------------------------------------------------------------------
  
!   !define C_PFI_VERSION   "0.2.1"
  
    !define C_OUTFILE       "runpopfile.exe"
***************
*** 220,223 ****
--- 231,235 ----
    StrCmp ${L_PARAMS} "" use_reg_dirdata
    StrCmp ${L_PARAMS} "/startup" use_reg_dirdata
+   StrCmp ${L_PARAMS} "/msgcapture" use_reg_dirdata
    StrCpy ${L_TEMP} ${L_PARAMS} 8
    StrCmp ${L_TEMP} "/config=" extract_config_path
***************
*** 390,393 ****
--- 402,420 ----
  
  start_popfile:
+   StrCmp ${L_PARAMS} "/msgcapture" 0 look_for_pfimsgcapture
+   IfFileExists "${L_EXEFILE}\msgcapture.exe" run_capture_mode
+   IfFileExists "${L_EXEFILE}\pfimsgcapture.exe" run_debug_mode
+   MessageBox MB_OK|MB_ICONSTOP "Error: Unable to start Message Capture utility !\
+       ${MB_NL}${MB_NL}\
+       Cannot find\
+       ${MB_NL}\
+       ${L_EXEFILE}\msgcapture.exe\
+       ${MB_NL}\
+       or\
+       ${MB_NL}\
+       ${L_EXEFILE}\pfimsgcapture.exe"
+   Goto exit
+ 
+ look_for_pfimsgcapture:
    IfFileExists "${L_EXEFILE}\pfimsgcapture.exe" 0 run_normal_mode
    IfFileExists "${L_PFI_USER}\popfile.cfg" 0 run_normal_mode
***************
*** 428,431 ****
--- 455,462 ----
    Goto exit
  
+ run_capture_mode:
+   Exec '"${L_EXEFILE}\msgcapture.exe" /TIMEOUT=0'
+   Goto exit
+ 
  bad_root_error:
    IfFileExists "${L_EXEFILE}\adduser.exe" can_add_root