--- a/Win32OperatingSystem.st	Thu Jan 29 14:21:27 2004 +0100
+++ b/Win32OperatingSystem.st	Thu Jan 29 19:52:37 2004 +0100
@@ -215,6 +215,9 @@
 # ifdef __DEF_Point
 #  define Point __DEF_Point
 # endif
+# ifdef __DEF_Rectangle
+#  define Rectangle __DEF_Rectangle
+# endif
 # ifdef __DEF_Block
 #  define Block __DEF_Block
 # endif
@@ -5692,7 +5695,7 @@
 
     |sys node rel ver mach dom info arch
      physicalRam freeRam swapSize freeSwap
-     virtualRam freeVirtual memoryLoad|
+     virtualRam freeVirtual memoryLoad numberOfCPUs|
 
 %{  /* STACK: 4096 */
 
@@ -5825,6 +5828,8 @@
 	    break;
     }
     mach = __MKSTRING(s);
+
+    numberOfCPUs = __MKUINT(sysInfo.dwNumberOfProcessors);
 %}.
     sys isNil ifTrue:[
 	sys := self getSystemType.
@@ -5847,9 +5852,10 @@
     info at:#node put:node.
     rel notNil ifTrue:[info at:#release put:rel].
     ver notNil ifTrue:[info at:#version put:ver].
-    mach notNil ifTrue:[info at:#machine put:mach].
+    mach notNil ifTrue:[info at:#machine put:mach. info at:#cpuType put:mach].
     arch notNil ifTrue:[info at:#architecture put:arch].
     dom notNil ifTrue:[info at:#domain put:dom].
+    numberOfCPUs notNil ifTrue:[info at:#numberOfCPUs put:numberOfCPUs].
 
     info at:#memoryLoad put:memoryLoad.
     info at:#physicalRam put:physicalRam.
@@ -8969,7 +8975,7 @@
 !
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.145 2004-01-29 08:39:14 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.146 2004-01-29 18:52:37 ca Exp $'
 ! !
 
 !Win32OperatingSystem::Win32FILEHandle methodsFor:'release'!
@@ -8996,7 +9002,7 @@
 !
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.145 2004-01-29 08:39:14 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.146 2004-01-29 18:52:37 ca Exp $'
 ! !
 
 !Win32OperatingSystem::Win32Handle methodsFor:'io'!
@@ -9375,7 +9381,7 @@
 !Win32OperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.145 2004-01-29 08:39:14 ca Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Win32OperatingSystem.st,v 1.146 2004-01-29 18:52:37 ca Exp $'
 ! !
 
 Win32OperatingSystem initialize!