0.9.16.35:

        Merge sbcl-devel "some reconstruction of win32 and others", 2006-09-10
        by Yaroslav Kavenchuk.

        * Replace manual external-format conversions in various SB-WIN32
          internals with alien external-formats.
        * Implement MACHINE-INSTANCE and SOFTWARE-VERSION.

NEWS

@@ -33,13 +33,15 @@ changes in sbcl-0.9.17 (0.9.99?) relative to sbcl-0.9.16:
     non-ASCII characters in their names (thanks to Yaroslav Kavenchuk)
   * bug fix: The :PTY argument for RUN-PROGRAM will now work on 
     systems with Unix98 pty semantics.
-  * bug fix: arguments to RUN-PROGRAM are escaped correctly on win32
-    (thanks to Yaroslav Kavenchuk)
   * bug fix: ASDF-INSTALL will now work with bsd tar.
   * bug fix: ASDF-INSTALL uses GNU tar on Solaris (thanks to Josip
     Gracin).
   * bug fix: timers expiring in dead threads no longer cause a
     type-error (reported by Paul "Nonny Mouse"). 
+  * improvements to the win32 port (thanks to Yaroslav Kavenchuk):
+    * bug fix: arguments to RUN-PROGRAM are escaped correctly
+    * replace dummy implementations of CL:MACHINE-INSTANCE and 
+      CL:SOFTWARE-VERSION with proper version
 
 changes in sbcl-0.9.16 relative to sbcl-0.9.15:
   * feature: implemented the READER-METHOD-CLASS and

package-data-list.lisp-expr

@@ -2380,4 +2380,4 @@ SBCL itself"
                "INVALID-HANDLE" "MILLISLEEP" "PEEK-CONSOLE-INPUT"
                "PEEK-NAMED-PIPE" "READ-FILE" "WRITE-FILE"
 
-               "GET-PROCESS-TIMES")))
+               "GET-PROCESS-TIMES" "GET-VERSION-EX")))

src/code/target-misc.lisp

@@ -138,7 +138,7 @@
 (defun machine-instance ()
   #!+sb-doc
   "Return a string giving the name of the local machine."
-  #!+win32 "some-random-windows-box"
+  #!+win32 (sb!win32::get-computer-name)
   #!-win32 (sb!unix:unix-gethostname))
 
 (defvar *machine-version*)

src/code/win32-os.lisp

@@ -24,8 +24,13 @@
   #!+sb-doc
   "Return a string describing version of the supporting software, or NIL
   if not available."
-  ;; FIXME: Implement.
-  nil)
+  (or *software-version*
+      (setf *software-version*
+	    (multiple-value-bind (MajorVersion MinorVersion BuildNumber PlatformId CSDVersion)
+		(sb!win32:get-version-ex)
+	      (declare (ignore PlatformId))
+	      (format nil (if (zerop (length CSDVersion)) "~A.~A.~A" "~A.~A.~A (~A)")
+		      MajorVersion MinorVersion BuildNumber CSDVersion)))))
 
 ;;; Return user time, system time, and number of page faults.
 (defun get-system-info ()