X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=blobdiff_plain;f=basis%2Fwindows%2Fwindows.factor;h=56c836a1852c8087c26ff018f2c500654f3bfaf4;hp=d2250d6f7e06024ad0135600fa08657565b4d597;hb=HEAD;hpb=eb79c6ab719e370ca2dd2acdf15efa6cbc1280a7

diff --git a/basis/windows/windows.factor b/basis/windows/windows.factor
index d2250d6f7e..c70ee9090f 100644
--- a/basis/windows/windows.factor
+++ b/basis/windows/windows.factor
@@ -1,61 +1,30 @@
 ! Copyright (C) 2005, 2006 Doug Coleman.
-! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.syntax alien.c-types alien.strings arrays
-combinators kernel math namespaces parser prettyprint sequences
-windows.errors windows.types windows.kernel32 words
-io.encodings.utf16n ;
+! See https://factorcode.org/license.txt for BSD license.
+USING: alien alien.libraries sequences ;
 IN: windows
 
-: lo-word ( wparam -- lo ) <short> *short ; inline
-: hi-word ( wparam -- hi ) -16 shift lo-word ; inline
-: MAX_UNICODE_PATH 32768 ; inline
-
-! You must LocalFree the return value!
-FUNCTION: void* error_message ( DWORD id ) ;
-
-: (win32-error-string) ( n -- string )
-    error_message
-    dup utf16n alien>string
-    swap LocalFree drop ;
-
-: win32-error-string ( -- str )
-    GetLastError (win32-error-string) ;
-
-: (win32-error) ( n -- )
-    dup zero? [
-        drop
-    ] [
-        win32-error-string throw
-    ] if ;
-
-: win32-error ( -- )
-    GetLastError (win32-error) ;
-
-: win32-error=0/f ( n -- ) { 0 f } member? [ win32-error ] when ;
-: win32-error>0 ( n -- ) 0 > [ win32-error ] when ;
-: win32-error<0 ( n -- ) 0 < [ win32-error ] when ;
-: win32-error<>0 ( n -- ) zero? [ win32-error ] unless ;
-
-: invalid-handle? ( handle -- )
-    INVALID_HANDLE_VALUE = [
-        win32-error-string throw
-    ] when ;
-
-: expected-io-errors ( -- seq )
-    ERROR_SUCCESS
-    ERROR_IO_INCOMPLETE
-    ERROR_IO_PENDING
-    WAIT_TIMEOUT 4array ; foldable
-
-: expected-io-error? ( error-code -- ? )
-    expected-io-errors member? ;
-
-: expected-io-error ( error-code -- )
-    dup expected-io-error? [
-        drop
-    ] [
-        (win32-error-string) throw
-    ] if ;
-
-: io-error ( return-value -- )
-    { 0 f } member? [ GetLastError expected-io-error ] when ;
+CONSTANT: MAX_UNICODE_PATH 32768
+
+{
+    { "advapi32"    "advapi32.dll"       stdcall }
+    { "gdi32"       "gdi32.dll"          stdcall }
+    { "user32"      "user32.dll"         stdcall }
+    { "kernel32"    "kernel32.dll"       stdcall }
+    { "winsock"     "ws2_32.dll"         stdcall }
+    { "mswsock"     "mswsock.dll"        stdcall }
+    { "shell32"     "shell32.dll"        stdcall }
+    { "iphlpapi"    "iphlpapi.dll"       stdcall }
+    { "libc"        "ucrtbase.dll"       cdecl   }
+    { "libm"        "ucrtbase.dll"       cdecl   }
+    { "gdiplus"     "gdiplus.dll"        stdcall }
+    { "gl"          "opengl32.dll"       stdcall }
+    { "glu"         "glu32.dll"          stdcall }
+    { "ole32"       "ole32.dll"          stdcall }
+    { "shcore"      "shcore.dll"         stdcall }
+    { "usp10"       "usp10.dll"          stdcall }
+    { "psapi"       "psapi.dll"          stdcall }
+    { "winmm"       "winmm.dll"          stdcall }
+    { "ntdll"       "ntdll.dll"          stdcall }
+    { "crypt32"     "crypt32.dll"        stdcall }
+    { "powrprof"    "powrprof.dll"       stdcall }
+} [ first3 add-library ] each