[Win32forth-cvs] win32forth/src Primutil.f, 1.47, 1.48 Utils.f, 1.27, 1.28

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

Update of /cvsroot/win32forth/win32forth/src
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv25727/src

Modified Files:
	Primutil.f Utils.f 
Log Message:
Win7 added

Index: Utils.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Utils.f,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** Utils.f	20 May 2009 10:18:10 -0000	1.27
--- Utils.f	7 Feb 2010 07:27:20 -0000	1.28
***************
*** 63,68 ****
                   WIN2K     of ." 2000" endof
                   WINXP     of ." XP" endof
!                  WIN2003   of ." 2003" endof
                   WINVISTA  of ." VISTA" endof
                  endcase ;
  
--- 63,71 ----
                   WIN2K     of ." 2000" endof
                   WINXP     of ." XP" endof
!                  WIN2003   of ." SERVER 2003 R2" endof
                   WINVISTA  of ." VISTA" endof
+                  WIN2008   of ." SERVER 2008" endof
+                  WIN2008R2 of ." SERVER 2008 R2" endof
+                  WIN7      of ." WIN7" endof
                  endcase ;
  

Index: Primutil.f
===================================================================
RCS file: /cvsroot/win32forth/win32forth/src/Primutil.f,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** Primutil.f	17 Jan 2010 10:54:50 -0000	1.47
--- Primutil.f	7 Feb 2010 07:27:20 -0000	1.48
***************
*** 696,708 ****
  1 PROC GetVersionEx
  
! 1 constant win95
! 2 constant win98
! 3 constant winme
! 4 constant winnt351
! 5 constant winnt4
! 6 constant win2k
! 7 constant winxp
! 8 constant win2003
! 9 constant winvista
  
  \ To check for a version, say Win2K or greater, try WINVER WIN2K >=
--- 696,711 ----
  1 PROC GetVersionEx
  
! 1  constant win95
! 2  constant win98
! 3  constant winme
! 4  constant winnt351
! 5  constant winnt4
! 6  constant win2k
! 7  constant winxp
! 8  constant win2003   \ Windows Server 2003 R2
! 9  constant winvista  \ Windows Vista
! 10 constant win2008   \ Windows Server 2008
! 11 constant win2008r2 \ Windows Server 2008 R2
! 12 constant win7      \ Windows 7
  
  \ To check for a version, say Win2K or greater, try WINVER WIN2K >=
***************
*** 711,715 ****
  
  : winver-init ( -- )                \ get windows version
!             148 dup _localalloc dup>r !   \ set length of structure
              r@ call GetVersionEx \ call os for version
              0= abort" call failed"
--- 714,718 ----
  
  : winver-init ( -- )                \ get windows version
!             156 dup _localalloc dup>r ! \ set length of OSVERSIONINFOEX structure
              r@ call GetVersionEx \ call os for version
              0= abort" call failed"
***************
*** 738,742 ****
                       endcase
                    endof
!                   6  of winvista endof
                  drop -1 dup   \ unknown windows version
                  endcase
--- 741,760 ----
                       endcase
                    endof
!                   6  of
!                     r@ 2 cells+ @  \ minor version
!                      case
!                        0 of r@ 154 + c@ \ Product Type
!                             VER_NT_WORKSTATION = if winvista  \ Windows Vista
!                                                  else win2008 \ Windows Server 2008
!                                                  then
!                        endof
!                        1 of r@ 154 + c@ \ Product Type
!                             VER_NT_WORKSTATION = if win7  \ Windows 7
!                                                  else win2008r2 \ Windows Server 2008 R2
!                                                  then
!                        endof
!                      endcase
! 
!                   endof
                  drop -1 dup   \ unknown windows version
                  endcase