[popfile-commit] windows getssl.nsh,1.3,1.4

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

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

Modified Files:
	getssl.nsh 
Log Message:
Improved reporting of SSL download problems when running the main installer.

Library items now use the "PFI_" prefix to help identify them.

Index: getssl.nsh
===================================================================
RCS file: /cvsroot/popfile/windows/getssl.nsh,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** getssl.nsh	10 Feb 2005 23:03:41 -0000	1.3
--- getssl.nsh	2 Mar 2005 19:59:57 -0000	1.4
***************
*** 129,133 ****
    DetailPrint "InternetCheckConnection: cancelled by user"
    !ifdef INSTALLER
!       Goto exit
    !else
        Goto error_exit
--- 129,133 ----
    DetailPrint "InternetCheckConnection: cancelled by user"
    !ifdef INSTALLER
!       Goto installer_error_exit
    !else
        Goto error_exit
***************
*** 214,220 ****
  
    !ifdef INSTALLER
        Goto exit
    !else
!       Call GetDateTimeStamp
        Pop $G_PLS_FIELD_1
        DetailPrint "----------------------------------------------------"
--- 214,232 ----
  
    !ifdef INSTALLER
+     installer_error_exit:
+       Push $R1    ; No need to preserve $R0 here as it is known as ${L_RESULT} in this 'Section'
+ 
+       ; The first system call gets the full pathname (returned in $R0) and the second call
+       ; extracts the filename (and possibly the extension) part (returned in $R1)
+ 
+       System::Call 'kernel32::GetModuleFileNameA(i 0, t .R0, i 1024)'
+       System::Call 'comdlg32::GetFileTitleA(t R0, t .R1, i 1024)'
+       StrCpy $G_PLS_FIELD_1 $R1
+       MessageBox MB_OK|MB_ICONEXCLAMATION "$(PFI_LANG_MB_REPEATSSL)"
+ 
+       Pop $R1
        Goto exit
    !else
!       Call PFI_GetDateTimeStamp
        Pop $G_PLS_FIELD_1
        DetailPrint "----------------------------------------------------"
***************
*** 268,273 ****
    StrCpy $G_PLS_FIELD_1 $G_SSL_FILEURL
    Push $G_PLS_FIELD_1
!   Call StrBackSlash
!   Call GetParent
    Pop $G_PLS_FIELD_2
    StrLen $G_PLS_FIELD_2 $G_PLS_FIELD_2
--- 280,285 ----
    StrCpy $G_PLS_FIELD_1 $G_SSL_FILEURL
    Push $G_PLS_FIELD_1
!   Call PFI_StrBackSlash
!   Call PFI_GetParent
    Pop $G_PLS_FIELD_2
    StrLen $G_PLS_FIELD_2 $G_PLS_FIELD_2
***************
*** 288,292 ****
    DetailPrint ""
    !ifdef ADDSSL
!       Call GetDateTimeStamp
        Pop $G_PLS_FIELD_1
        DetailPrint "----------------------------------------------------"
--- 300,304 ----
    DetailPrint ""
    !ifdef ADDSSL
!       Call PFI_GetDateTimeStamp
        Pop $G_PLS_FIELD_1
        DetailPrint "----------------------------------------------------"