windows: Fix bootstrap.

diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor
index 92ac3bc152fdef85918d94ff19cdfcf18a042725..322b4f40b8c96c96943ecb7fe0eb47a1524401e8 100644 (file)
--- a/basis/windows/kernel32/kernel32.factor
+++ b/basis/windows/kernel32/kernel32.factor
@@ -1,9 +1,14 @@
 ! Copyright (C) 2005, 2006 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.syntax kernel windows.types
-math multiline classes.struct ;
+math multiline classes.struct alien.data arrays ;
+QUALIFIED-WITH: alien.c-types c
 IN: windows.kernel32
 
+: lo-word ( wparam -- lo ) c:short <ref> c:short deref ; inline
+: hi-word ( wparam -- hi ) -16 shift lo-word ; inline
+: >lo-hi ( WORD -- array ) [ lo-word ] [ hi-word ] bi 2array ; inline
+
 CONSTANT: MAX_PATH 260
 
 CONSTANT: GHND          0x40

diff --git a/basis/windows/shell32/shell32.factor b/basis/windows/shell32/shell32.factor
index 45789e9686d6baea89b2233fb2f03cd04ca67368..52e034ac8550d28f6214e515c50c55be84accce8 100644 (file)
--- a/basis/windows/shell32/shell32.factor
+++ b/basis/windows/shell32/shell32.factor
@@ -1,12 +1,11 @@
 ! Copyright (C) 2006, 2008 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
 USING: alien alien.c-types alien.data alien.strings
-alien.syntax classes.struct combinators io.backend io.files
-io.pathnames kernel math sequences specialized-arrays
-ui.backend.windows windows windows.com windows.com.syntax
-windows.errors windows.kernel32 windows.ole32 windows.types
-windows.user32 ;
-SPECIALIZED-ARRAY: ushort
+alien.syntax classes.struct io.backend kernel
+specialized-arrays
+specialized-arrays.instances.alien.c-types.ushort windows
+windows.com windows.com.syntax windows.kernel32 windows.ole32
+windows.types ;
 IN: windows.shell32
 
 CONSTANT: CSIDL_DESKTOP 0x00

diff --git a/basis/windows/windows.factor b/basis/windows/windows.factor
index 758238d70b20c12eb8b4caa35993da0ecc4d8667..83a5689cb35be98c2ddeebf5e026137a2e4c9f1a 100644 (file)
--- a/basis/windows/windows.factor
+++ b/basis/windows/windows.factor
@@ -1,8 +1,6 @@
 ! Copyright (C) 2005, 2006 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.data alien.libraries arrays kernel math
-sequences ;
-QUALIFIED-WITH: alien.c-types c
+USING: alien alien.libraries sequences ;
 IN: windows
 
 CONSTANT: MAX_UNICODE_PATH 32768
@@ -25,7 +23,3 @@ CONSTANT: MAX_UNICODE_PATH 32768
     { "usp10"       "usp10.dll"          stdcall }
     { "psapi"       "psapi.dll"          stdcall }
 } [ first3 add-library ] each
-
-: lo-word ( wparam -- lo ) c:short <ref> c:short deref ; inline
-: hi-word ( wparam -- hi ) -16 shift lo-word ; inline
-: >lo-hi ( WORD -- array ) [ lo-word ] [ hi-word ] bi 2array ; inline