Fix Windows bootstrap

diff --git a/basis/io/windows/nt/monitors/monitors.factor b/basis/io/windows/nt/monitors/monitors.factor
old mode 100644 (file)
new mode 100755 (executable)
index 3db726e..30345c8
--- a/basis/io/windows/nt/monitors/monitors.factor
+++ b/basis/io/windows/nt/monitors/monitors.factor
@@ -1,11 +1,12 @@
 ! Copyright (C) 2008 Doug Coleman, Slava Pestov.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types libc destructors locals kernel math
-assocs namespaces make continuations sequences hashtables
-sorting arrays combinators math.bitwise strings system accessors
-threads splitting io.backend io.windows io.windows.nt.backend
-io.windows.nt.files io.monitors io.ports io.buffers io.files
-io.timeouts io windows windows.kernel32 windows.types ;
+USING: alien alien.c-types alien.strings libc destructors locals
+kernel math assocs namespaces make continuations sequences
+hashtables sorting arrays combinators math.bitwise strings
+system accessors threads splitting io.backend io.windows
+io.windows.nt.backend io.windows.nt.files io.monitors io.ports
+io.buffers io.files io.timeouts io.encodings.string io
+windows windows.kernel32 windows.types ;
 IN: io.windows.nt.monitors
 
 : open-directory ( path -- handle )

diff --git a/basis/windows/com/syntax/syntax.factor b/basis/windows/com/syntax/syntax.factor
old mode 100644 (file)
new mode 100755 (executable)
index c56293b..620b608
--- a/basis/windows/com/syntax/syntax.factor
+++ b/basis/windows/com/syntax/syntax.factor
@@ -1,7 +1,7 @@
-USING: alien alien.c-types effects kernel windows.ole32
-parser lexer splitting grouping sequences namespaces
-assocs quotations generalizations accessors words macros alien.syntax
-fry arrays ;
+USING: alien alien.c-types alien.accessors effects kernel
+windows.ole32 parser lexer splitting grouping sequences
+namespaces assocs quotations generalizations accessors words
+macros alien.syntax fry arrays layouts math ;
 IN: windows.com.syntax
 
 <PRIVATE
@@ -10,9 +10,9 @@ C-STRUCT: com-interface
     { "void*" "vtbl" } ;
 
 MACRO: com-invoke ( n return parameters -- )
-    dup length -roll
+    [ 2nip length ] 3keep
     '[
-        _ npick com-interface-vtbl _ swap void*-nth _ _
+        _ npick com-interface-vtbl _ cell * alien-cell _ _
         "stdcall" alien-indirect
     ] ;
 

diff --git a/basis/windows/ole32/ole32.factor b/basis/windows/ole32/ole32.factor
index 05bc140bd7d2926eeea0c066a1dc775fddbf192d..6d4e60ab22ff80d69a1ba0acd5603fc6a9250fce 100755 (executable)
--- a/basis/windows/ole32/ole32.factor
+++ b/basis/windows/ole32/ole32.factor
@@ -1,7 +1,7 @@
 USING: alien alien.syntax alien.c-types alien.strings math
 kernel sequences windows windows.types debugger io accessors
 math.order namespaces make math.parser windows.kernel32
-combinators locals specialized-arrays.uchar ;
+combinators locals specialized-arrays.direct.uchar ;
 IN: windows.ole32
 
 LIBRARY: ole32
@@ -137,8 +137,8 @@ M: ole32-error error.
 :: (guid-section>guid) ( string guid start end quot -- )
     start end string subseq hex> guid quot call ; inline
 
-: (guid-byte>guid) ( string guid start end byte -- )
-    start end string subseq hex> guid byte set-nth ; inline
+:: (guid-byte>guid) ( string guid start end byte -- )
+    start end string subseq hex> byte guid set-nth ; inline
 
 : string>guid ( string -- guid )
     "GUID" <c-object> [