From d9e615c040f4cb679536312333ba363382467948 Mon Sep 17 00:00:00 2001
From: "U-SLAVA-DFB8FF805\\Slava" <Slava@slava-dfb8ff805.(none)>
Date: Tue, 6 May 2008 09:16:48 -0500
Subject: [PATCH 1/2] More fixes

---
 extra/io/launcher/launcher.factor | 6 ++++++
 extra/ui/ui.factor                | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/extra/io/launcher/launcher.factor b/extra/io/launcher/launcher.factor
index 286febd589..a47e2d3367 100755
--- a/extra/io/launcher/launcher.factor
+++ b/extra/io/launcher/launcher.factor
@@ -225,3 +225,9 @@ M: duplex-stream underlying-handle
     [ in>> underlying-handle ]
     [ out>> underlying-handle ] bi
     [ = [ "Invalid duplex stream" throw ] when ] keep ;
+
+M: encoder underlying-handle
+    stream>> underlying-handle ;
+
+M: decoder underlying-handle
+    stream>> underlying-handle ;
diff --git a/extra/ui/ui.factor b/extra/ui/ui.factor
index 12565235ab..e7f412630c 100755
--- a/extra/ui/ui.factor
+++ b/extra/ui/ui.factor
@@ -29,8 +29,9 @@ SYMBOL: windows
     windows global [ [ first = not ] with filter ] change-at ;
 
 : raised-window ( world -- )
-    windows get-global [ second eq? ] with find drop
-    windows get-global [ length 1- ] keep exchange ;
+    windows get-global
+    [ [ second eq? ] with find drop ] keep
+    [ nth ] [ delete-nth ] [ nip ] 2tri push ;
 
 : focus-gestures ( new old -- )
     drop-prefix <reversed>

From ec31bfe25390505a0dcab97b704a0a739131e313 Mon Sep 17 00:00:00 2001
From: "U-SLAVA-DFB8FF805\\Slava" <Slava@slava-dfb8ff805.(none)>
Date: Fri, 9 May 2008 16:22:34 -0500
Subject: [PATCH 2/2] Get windows.com.wrapper to load

---
 extra/windows/com/wrapper/wrapper.factor | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 extra/windows/com/wrapper/wrapper.factor

diff --git a/extra/windows/com/wrapper/wrapper.factor b/extra/windows/com/wrapper/wrapper.factor
old mode 100644
new mode 100755
index 7f63f529a6..ae5f03a594
--- a/extra/windows/com/wrapper/wrapper.factor
+++ b/extra/windows/com/wrapper/wrapper.factor
@@ -29,7 +29,7 @@ unless
             >r find-com-interface-definition family-tree
             r> 1quotation [ >r iid>> r> 2array ] curry map
         ] map-index concat
-        [ f ] add ,
+        [ f ] prefix ,
         \ case ,
         "void*" heap-size
         [ * rot <displaced-alien> com-add-ref 0 rot set-void*-nth S_OK ]
@@ -99,7 +99,7 @@ unless
 PRIVATE>
 
 : <com-wrapper> ( implementations -- wrapper )
-    (make-vtbls) f com-wrapper construct-boa ;
+    (make-vtbls) f com-wrapper boa ;
 
 M: com-wrapper dispose
     t >>freed?