[Win32forth-cvs] win32forth/apps/Setup Setup.f,1.25,1.26

[Dirk B. <db...@us...>]

Update of /cvsroot/win32forth/win32forth/apps/Setup
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv24834

Modified Files:
	Setup.f 
Log Message:
added the MS@ code directly into setup.f to make in compile again

Index: Setup.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/apps/Setup/Setup.f,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Setup.f	21 Dec 2008 10:55:24 -0000	1.25
--- Setup.f	31 Aug 2010 06:41:29 -0000	1.26
***************
*** 8,12 ****
--- 8,14 ----
  \ Setup for Win32Forth
  
+ \ ------------------------------------------------------------------------------
  \ This is all we need of win32forth to create a small Setup.exe
+ \ ------------------------------------------------------------------------------
      FLOAD ..\..\src\comment.f
      FLOAD ..\..\src\numconv.f
***************
*** 30,45 ****
  
      FLOAD ..\..\src\mapfile.f      \ Windows32 file into memory mapping words
      FLOAD ..\..\src\w32fmsglist.f  \ win32forth applications & messages IDs
-     FLOAD ..\..\src\w32fmsg.f      \ w32f application messaging
  
!     FLOAD ..\..\src\shell.f
  
  SYS-FLOAD ..\..\src\imageman.f
      FLOAD ..\..\src\Keyboard.f     \ function and special key constants
  
  \ the Setup starts here...
  
  : ?win-error ( f -- ) drop ;
  : seconds    ( n -- ) drop ;
  FLOAD sub_dirs.f
  FLOAD array.f            \ array words
--- 32,71 ----
  
      FLOAD ..\..\src\mapfile.f      \ Windows32 file into memory mapping words
+ 
      FLOAD ..\..\src\w32fmsglist.f  \ win32forth applications & messages IDs
  
! \ The current Version of the file w32fmsg.f needs the word MS@
! \ wich is defined in utils.f.
! \ Because including utils.f here doesn't work so I added copy of the MS@ code here.
! \ Not nice, but working...
! \ Montag, August 30 2010 - 19:17 dbu
! 16 constant TIME-LEN
! time-len newuser TIME-BUF
! 
! 1 proc GetLocalTime
! 
! : get-local-time ( -- )                 \ get the local computer date and time
! 	time-buf call GetLocalTime drop ;
  
+ : ms@	( -- ms )
+ 	get-local-time
+ 	time-buf
+ 	dup   8 + w@     60 *           \ hours
+ 	over 10 + w@ +   60 *           \ minutes
+ 	over 12 + w@ + 1000 *           \ seconds
+ 	swap 14 + w@ + ;                \ milli-seconds
+ 
+     FLOAD ..\..\src\w32fmsg.f      \ w32f application messaging
+     FLOAD ..\..\src\shell.f
  SYS-FLOAD ..\..\src\imageman.f
      FLOAD ..\..\src\Keyboard.f     \ function and special key constants
  
+ \ ------------------------------------------------------------------------------
  \ the Setup starts here...
+ \ ------------------------------------------------------------------------------
  
  : ?win-error ( f -- ) drop ;
  : seconds    ( n -- ) drop ;
+ 
  FLOAD sub_dirs.f
  FLOAD array.f            \ array words