Fix windows bootstrap

diff --git a/basis/io/sockets/windows/nt/nt.factor b/basis/io/sockets/windows/nt/nt.factor
old mode 100644 (file)
new mode 100755 (executable)
index 49a1b2a..6d082f9
--- a/basis/io/sockets/windows/nt/nt.factor
+++ b/basis/io/sockets/windows/nt/nt.factor
@@ -1,6 +1,6 @@
 USING: alien alien.accessors alien.c-types byte-arrays
 continuations destructors io.ports io.timeouts io.sockets
-io.sockets io namespaces io.streams.duplex io.backend.windows
+io namespaces io.streams.duplex io.backend.windows
 io.sockets.windows io.backend.windows.nt windows.winsock kernel
 libc math sequences threads system combinators accessors ;
 IN: io.sockets.windows.nt

diff --git a/basis/ui/backend/windows/windows.factor b/basis/ui/backend/windows/windows.factor
index 1ca3e85232540039ab4da4a24655859b10e8f8c7..e28776a51cec81326efb9559048831406e8c1bf1 100755 (executable)
--- a/basis/ui/backend/windows/windows.factor
+++ b/basis/ui/backend/windows/windows.factor
@@ -8,8 +8,8 @@ math.vectors namespaces make sequences strings vectors words
 windows.kernel32 windows.gdi32 windows.user32 windows.opengl32
 windows.messages windows.types windows.offscreen windows.nt
 threads libc combinators fry combinators.short-circuit continuations
-command-line shuffle opengl ui.render ascii math.bitwise locals
-accessors math.rectangles math.order ascii calendar
+command-line shuffle opengl ui.render math.bitwise locals
+accessors math.rectangles math.order calendar ascii
 io.encodings.utf16n windows.errors literals ui.pixel-formats 
 ui.pixel-formats.private memoize classes struct-arrays ;
 IN: ui.backend.windows

diff --git a/basis/windows/gdi32/gdi32.factor b/basis/windows/gdi32/gdi32.factor
index 0699c92be336e8998af9e591fc85080eea3ef2b2..5187c3f6609398c332b65aa753b725f767436b05 100755 (executable)
--- a/basis/windows/gdi32/gdi32.factor
+++ b/basis/windows/gdi32/gdi32.factor
@@ -233,6 +233,7 @@ CONSTANT: PFD_DRAW_TO_WINDOW 4
 CONSTANT: PFD_DRAW_TO_BITMAP 8
 CONSTANT: PFD_SUPPORT_GDI 16
 CONSTANT: PFD_SUPPORT_OPENGL 32
+CONSTANT: PFD_SUPPORT_DIRECTDRAW 8192
 CONSTANT: PFD_GENERIC_FORMAT 64
 CONSTANT: PFD_NEED_PALETTE 128
 CONSTANT: PFD_NEED_SYSTEM_PALETTE HEX: 00000100

diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor
index e654b68bdc034f33a3cd9dfe3795c27324e9cad7..38c63abc725d03d2651dfe978231c68931bb4a06 100755 (executable)
--- a/basis/windows/kernel32/kernel32.factor
+++ b/basis/windows/kernel32/kernel32.factor
@@ -180,8 +180,6 @@ CONSTANT: SEC_COMMIT HEX: 08000000
 CONSTANT: SEC_NOCACHE HEX: 10000000
 ALIAS: MEM_IMAGE SEC_IMAGE
 
-CONSTANT: ERROR_ALREADY_EXISTS 183
-
 CONSTANT: FILE_MAP_ALL_ACCESS HEX: f001f
 CONSTANT: FILE_MAP_READ   4
 CONSTANT: FILE_MAP_WRITE  2

diff --git a/basis/windows/opengl32/opengl32.factor b/basis/windows/opengl32/opengl32.factor
index 4173332dc32749e5b6484878900c0b98325de374..63f705263cef449b91f0d0e6cee0fb7c5a12e1f5 100755 (executable)
--- a/basis/windows/opengl32/opengl32.factor
+++ b/basis/windows/opengl32/opengl32.factor
@@ -5,36 +5,6 @@ math math.bitwise windows.types init assocs splitting
 sequences libc opengl.gl opengl.gl.extensions opengl.gl.windows ;
 IN: windows.opengl32
 
-! PIXELFORMATDESCRIPTOR flags
-CONSTANT: PFD_DOUBLEBUFFER            HEX: 00000001
-CONSTANT: PFD_STEREO                  HEX: 00000002
-CONSTANT: PFD_DRAW_TO_WINDOW          HEX: 00000004
-CONSTANT: PFD_DRAW_TO_BITMAP          HEX: 00000008
-CONSTANT: PFD_SUPPORT_GDI             HEX: 00000010
-CONSTANT: PFD_SUPPORT_OPENGL          HEX: 00000020
-CONSTANT: PFD_GENERIC_FORMAT          HEX: 00000040
-CONSTANT: PFD_NEED_PALETTE            HEX: 00000080
-CONSTANT: PFD_NEED_SYSTEM_PALETTE     HEX: 00000100
-CONSTANT: PFD_SWAP_EXCHANGE           HEX: 00000200
-CONSTANT: PFD_SWAP_COPY               HEX: 00000400
-CONSTANT: PFD_SWAP_LAYER_BUFFERS      HEX: 00000800
-CONSTANT: PFD_GENERIC_ACCELERATED     HEX: 00001000
-CONSTANT: PFD_SUPPORT_DIRECTDRAW      HEX: 00002000
-
-! PIXELFORMATDESCRIPTOR flags for use in ChoosePixelFormat only
-CONSTANT: PFD_DEPTH_DONTCARE          HEX: 20000000
-CONSTANT: PFD_DOUBLEBUFFER_DONTCARE   HEX: 40000000
-CONSTANT: PFD_STEREO_DONTCARE         HEX: 80000000
-
-! pixel types
-CONSTANT: PFD_TYPE_RGBA        0
-CONSTANT: PFD_TYPE_COLORINDEX  1
- 
-! layer types
-CONSTANT: PFD_MAIN_PLANE       0
-CONSTANT: PFD_OVERLAY_PLANE    1
-CONSTANT: PFD_UNDERLAY_PLANE   -1
-
 CONSTANT: LPD_TYPE_RGBA        0
 CONSTANT: LPD_TYPE_COLORINDEX  1