From 25f4e1e425dca9fa55e7ecff947c06ec020b9b3e Mon Sep 17 00:00:00 2001
From: erg <erg@trifocus.net>
Date: Tue, 1 Aug 2006 10:03:03 +0000
Subject: [PATCH] fix win32 native i/o, updated win32 bindings for f/char*
 change

---
 library/io/windows/io-last.factor   | 2 +-
 library/ui/windows/clipboard.factor | 2 +-
 library/ui/windows/kernel32.factor  | 6 ++++--
 library/ui/windows/types.factor     | 3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/library/io/windows/io-last.factor b/library/io/windows/io-last.factor
index 9cc1cedddd..1522d6cd5e 100644
--- a/library/io/windows/io-last.factor
+++ b/library/io/windows/io-last.factor
@@ -13,7 +13,7 @@ IN: io-internals
 : io-multiplex ( timeout -- )
     #! FIXME: needs to work given a timeout
     dup -1 = [ drop INFINITE ] when cancel-timedout wait-for-io 
-    swap [ schedule-thread ] [ drop ] if* ;
+    swap [ schedule-thread-with ] [ drop ] if* ;
 
 : init-io ( -- )
     win32-init-stdio ;
diff --git a/library/ui/windows/clipboard.factor b/library/ui/windows/clipboard.factor
index 5877aa7039..f334b61e45 100644
--- a/library/ui/windows/clipboard.factor
+++ b/library/ui/windows/clipboard.factor
@@ -7,7 +7,7 @@ IN: win32
 : crlf>lf CHAR: \r swap remove ;
 : lf>crlf [ [ dup CHAR: \n = [ CHAR: \r , ] when , ] each ] "" make ;
 
-: (enum-clipboard) ( n -- )
+: (enum-clipboard) ( n -- n )
     EnumClipboardFormats win32-error dup 0 > [ dup , (enum-clipboard) ] when ;
 
 : enum-clipboard ( -- seq )
diff --git a/library/ui/windows/kernel32.factor b/library/ui/windows/kernel32.factor
index 3353a0ec1f..523e184aec 100644
--- a/library/ui/windows/kernel32.factor
+++ b/library/ui/windows/kernel32.factor
@@ -25,9 +25,11 @@ LIBRARY: kernel32
 ! ) ;
 
 
+! FUNCTION: HMODULE GetModuleHandleA ( LPCTSTR lpModulename ) ;
+! FUNCTION: HMODULE GetModuleHandleW ( LPCWSTR lpModulename ) ;
 
-FUNCTION: HMODULE GetModuleHandleA ( char* lpModulename ) ;
-FUNCTION: HMODULE GetModuleHandleW ( char* lpModulename ) ;
+FUNCTION: HMODULE GetModuleHandleA ( void* lpModulename ) ;
+FUNCTION: HMODULE GetModuleHandleW ( void* lpModulename ) ;
 
 : GetModuleHandle \ GetModuleHandleW \ GetModuleHandleA unicode-exec ;
 
diff --git a/library/ui/windows/types.factor b/library/ui/windows/types.factor
index 5cc00bd1fd..9887481ff4 100644
--- a/library/ui/windows/types.factor
+++ b/library/ui/windows/types.factor
@@ -177,7 +177,8 @@ TYPEDEF: LONG_PTR            LPARAM
 TYPEDEF: BOOL*               LPBOOL
 TYPEDEF: BYTE*               LPBYTE
 TYPEDEF: DWORD*              LPCOLORREF
-TYPEDEF: CHAR*               LPCSTR
+! TYPEDEF: CHAR*               LPCSTR
+TYPEDEF: VOID*               LPCSTR
 TYPEDEF: WCHAR*              LPCWSTR
 TYPEDEF: WCHAR*              LPWSTR
 unicode? [