X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fwin32-os.c;h=baac264184965557a700c19266688ed069e20c3e;hb=1de12891f900d156ed035a097561ecd7755a256a;hp=f43af0d9f8cd924044a875dd1f9e32dc0ac7ef9d;hpb=0395b7894e8dbb056262ca59a816963733623c34;p=sbcl.git

diff --git a/src/runtime/win32-os.c b/src/runtime/win32-os.c
index f43af0d..baac264 100644
--- a/src/runtime/win32-os.c
+++ b/src/runtime/win32-os.c
@@ -26,6 +26,7 @@
  * yet.
  */
 
+#include <malloc.h>
 #include <stdio.h>
 #include <sys/param.h>
 #include <sys/file.h>
@@ -49,6 +50,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <shlobj.h>
+#include <math.h>
 
 #include <excpt.h>
 
@@ -56,7 +58,6 @@
 #include "thread.h"
 size_t os_vm_page_size;
 
-
 #include "gc.h"
 #include "gencgc-internal.h"
 
@@ -281,7 +282,7 @@ is_valid_lisp_addr(os_vm_address_t addr)
     struct thread *th;
     if(in_range_p(addr, READ_ONLY_SPACE_START, READ_ONLY_SPACE_SIZE) ||
        in_range_p(addr, STATIC_SPACE_START   , STATIC_SPACE_SIZE) ||
-       in_range_p(addr, DYNAMIC_SPACE_START  , DYNAMIC_SPACE_SIZE))
+       in_range_p(addr, DYNAMIC_SPACE_START  , dynamic_space_size))
         return 1;
     for_each_thread(th) {
         if(((os_vm_address_t)th->control_stack_start <= addr) && (addr < (os_vm_address_t)th->control_stack_end))
@@ -629,87 +630,62 @@ char *dirname(char *path)
 
 void scratch(void)
 {
-    strerror(42);
-    asin(0);
+    CloseHandle(0);
+    FlushConsoleInputBuffer(0);
+    FormatMessageA(0, 0, 0, 0, 0, 0, 0);
+    FreeLibrary(0);
+    GetACP();
+    GetConsoleCP();
+    GetConsoleOutputCP();
+    GetCurrentProcess();
+    GetExitCodeProcess(0, 0);
+    GetLastError();
+    GetOEMCP();
+    GetProcAddress(0, 0);
+    GetProcessTimes(0, 0, 0, 0, 0);
+    GetSystemTimeAsFileTime(0);
+    LoadLibrary(0);
+    LocalFree(0);
+    PeekConsoleInput(0, 0, 0, 0);
+    PeekNamedPipe(0, 0, 0, 0, 0, 0);
+    ReadFile(0, 0, 0, 0, 0);
+    Sleep(0);
+    WriteFile(0, 0, 0, 0, 0);
+    _get_osfhandle(0);
+    _pipe(0,0,0);
+    access(0,0);
     acos(0);
-    sinh(0);
+    asin(0);
+    close(0);
     cosh(0);
+    dup(0);
     hypot(0, 0);
+    isatty(0);
+    sinh(0);
+    strerror(42);
     write(0, 0, 0);
-    close(0);
-    #ifndef LISP_FEATURE_SB_UNICODE
-      MoveFileA(0,0);
-    #else
-      MoveFileW(0,0);
-    #endif
-    #ifndef LISP_FEATURE_SB_UNICODE
-      GetCurrentDirectoryA(0,0);
-    #else
-      GetCurrentDirectoryW(0,0);
-    #endif
-    dup(0);
-    LoadLibrary(0);
-    GetProcAddress(0, 0);
-    FreeLibrary(0);
     #ifndef LISP_FEATURE_SB_UNICODE
       CreateDirectoryA(0,0);
+      GetComputerNameA(0, 0);
+      GetCurrentDirectoryA(0,0);
+      GetEnvironmentVariableA(0, 0, 0);
+      GetVersionExA(0);
+      MoveFileA(0,0);
+      SHGetFolderPathA(0, 0, 0, 0, 0);
+      SetCurrentDirectoryA(0);
+      SetEnvironmentVariableA(0, 0);
     #else
       CreateDirectoryW(0,0);
-    #endif
-    _pipe(0,0,0);
-    isatty(0);
-    access(0,0);
-    GetLastError();
-    FormatMessageA(0, 0, 0, 0, 0, 0, 0);
-    #ifdef LISP_FEATURE_SB_UNICODE
       FormatMessageW(0, 0, 0, 0, 0, 0, 0);
-    #endif
-    _get_osfhandle(0);
-    ReadFile(0, 0, 0, 0, 0);
-    WriteFile(0, 0, 0, 0, 0);
-    PeekNamedPipe(0, 0, 0, 0, 0, 0);
-    FlushConsoleInputBuffer(0);
-    PeekConsoleInput(0, 0, 0, 0);
-    Sleep(0);
-    #ifndef LISP_FEATURE_SB_UNICODE
-      SHGetFolderPathA(0, 0, 0, 0, 0);
-    #else
-      SHGetFolderPathW(0, 0, 0, 0, 0);
-    #endif
-    GetACP();
-    GetOEMCP();
-    LocalFree(0);
-    #ifndef LISP_FEATURE_SB_UNICODE
-      GetEnvironmentVariableA(0, 0, 0);
-    #else
+      GetComputerNameW(0, 0);
+      GetCurrentDirectoryW(0,0);
       GetEnvironmentVariableW(0, 0, 0);
-    #endif
-    GetConsoleCP();
-    GetConsoleOutputCP();
-    GetExitCodeProcess(0, 0);
-    GetCurrentProcess();
-    GetProcessTimes(0, 0, 0, 0, 0);
-    #ifndef LISP_FEATURE_SB_UNICODE
-      SetEnvironmentVariableA(0, 0);
-    #else
-      SetEnvironmentVariableW(0, 0);
-    #endif
-    #ifndef LISP_FEATURE_SB_UNICODE
-      GetVersionExA(0);
-    #else
       GetVersionExW(0);
-    #endif
-    #ifndef LISP_FEATURE_SB_UNICODE
-      GetComputerNameA(0, 0);
-    #else
-      GetComputerNameW(0, 0);
-    #endif
-    #ifndef LISP_FEATURE_SB_UNICODE
-      SetCurrentDirectoryA(0);
-    #else
+      MoveFileW(0,0);
+      SHGetFolderPathW(0, 0, 0, 0, 0);
       SetCurrentDirectoryW(0);
+      SetEnvironmentVariableW(0, 0);
     #endif
-    CloseHandle(0);
 }
 
 char *