[Win32forth-cvs] win32forth/apps/Setup Setup_dtop_lnk.f,1.3,1.4

[Jos v.d.V. <jo...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Setup
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv6446

Modified Files:
	Setup_dtop_lnk.f 
Log Message:
Jos: Adapted for the new shortcut form of the installer.

Index: Setup_dtop_lnk.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Setup/Setup_dtop_lnk.f,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Setup_dtop_lnk.f	20 Mar 2013 23:51:20 -0000	1.3
--- Setup_dtop_lnk.f	11 Jan 2016 20:06:49 -0000	1.4
***************
*** 10,20 ****
  needs dtop_lnk.f
  
! : set-icon ( a1 n1 a2 n2 -- )
!         $concat set_icon_link ;
  
! : create_link_on_desktop { "FileName" "Description" "IconFileName" \ dir$ path$ lnk$ -- }
          1024 LocalAlloc: dir$
          1024 LocalAlloc: path$
-         1024 LocalAlloc: lnk$
  
          &FORTHDIR COUNT dir$ PLACE dir$ ?+\
--- 10,26 ----
  needs dtop_lnk.f
  
! : set-icon ( a1 n1 a2 n2 -- )  $concat set_icon_link ;
  
! string: link-location$
! 
! : save-link-in-location { "Description"  lnk$  -- }
!         link-location$ count  lnk$ PLACE
!         lnk$ ?+\ "Description" count lnk$ +PLACE s" .lnk" lnk$ +PLACE
!         lnk$ count save_link
!  ;
! 
! : prepare-link { "FileName" "Description" "IconFileName" lnk$  \ dir$ path$  -- }
          1024 LocalAlloc: dir$
          1024 LocalAlloc: path$
  
          &FORTHDIR COUNT dir$ PLACE dir$ ?+\
***************
*** 26,43 ****
          dir$ COUNT "IconFileName" COUNT set-icon
          dir$ COUNT set_dir_link
  
!         CSIDL_DESKTOPDIRECTORY GetSpecialFolderLocation lnk$ PLACE
!         lnk$ ?+\ "Description" count lnk$ +PLACE s" .lnk" lnk$ +PLACE
!         lnk$ count save_link
! ;
  
- : create_links_on_desktop       ( -- )
-         init_dtop_for_link
-         c" Win32for.exe"        c" Win32Forth"       c" src\res\Win32for.ico"   create_link_on_desktop
-         c" WinEd.exe"           c" WinEd"            c" src\res\WinEd.ico"      create_link_on_desktop
- \        c" Forthform.exe"       c" Forth Form"       c" src\res\ForthForm.ico"  create_link_on_desktop
-         c" Setup.exe"           c" Win32Forth Setup" c" src\res\Win32for.ico"   create_link_on_desktop
- \        c" Project.exe"         c" Forth Project"    c" src\res\Project.ico"    create_link_on_desktop
- \        c" SciEditMdi.exe"      c" SciEditMdi"       c" src\res\SciEditMdi.ico" create_link_on_desktop
-         c" Win32forthIDE.exe"   c" Win32forthIDE"    c" src\res\SciEditMdi.ico" create_link_on_desktop
- ;
--- 32,61 ----
          dir$ COUNT "IconFileName" COUNT set-icon
          dir$ COUNT set_dir_link
+  ;
  
! : create_link_in_location  ( "FileName" "Description" "IconFileName" lnk$ -- ) { lnk$ -- }
!         lnk$ 1024 LocalAlloc: lnk$  over >r lnk$ prepare-link
!         r> lnk$ save-link-in-location
!  ;
! 
! : create_links_in_location
!         c" Win32for.exe"        c" Win32Forth"       c" src\res\Win32for.ico"   create_link_in_location
!         c" WinEd.exe"           c" WinEd"            c" src\res\WinEd.ico"      create_link_in_location
! \       c" Forthform.exe"       c" Forth Form"       c" src\res\ForthForm.ico"  create_link_in_location
!         c" Setup.exe"           c" Win32Forth Setup" c" src\res\Win32for.ico"   create_link_in_location
! \       c" Project.exe"         c" Forth Project"    c" src\res\Project.ico"    create_link_in_location
! \       c" SciEditMdi.exe"      c" SciEditMdi"       c" src\res\SciEditMdi.ico" create_link_in_location
!         c" Win32forthIDE.exe"   c" Win32forthIDE"    c" src\res\SciEditMdi.ico" create_link_in_location
!  ;
! 
! : Set_desktop_location    ( -- )
!         CSIDL_DESKTOPDIRECTORY GetSpecialFolderLocation  link-location$ place
!  ;
! 
! : create_links_on_desktop ( -- )
!         init_dtop_for_link   Set_desktop_location
!         create_links_in_location CoUninitialize
!  ;
! 
! \s