fix win32 native i/o, updated win32 bindings for f/char* change

erg 2006-08-01 10:03:03 +00:00
parent 6d453bf564
commit 25f4e1e425
4 changed files with 8 additions and 5 deletions

View File

@ -13,7 +13,7 @@ IN: io-internals
: io-multiplex ( timeout -- ) : io-multiplex ( timeout -- )
#! FIXME: needs to work given a timeout #! FIXME: needs to work given a timeout
dup -1 = [ drop INFINITE ] when cancel-timedout wait-for-io dup -1 = [ drop INFINITE ] when cancel-timedout wait-for-io
swap [ schedule-thread ] [ drop ] if* ; swap [ schedule-thread-with ] [ drop ] if* ;
: init-io ( -- ) : init-io ( -- )
win32-init-stdio ; win32-init-stdio ;

View File

@ -7,7 +7,7 @@ IN: win32
: crlf>lf CHAR: \r swap remove ; : crlf>lf CHAR: \r swap remove ;
: lf>crlf [ [ dup CHAR: \n = [ CHAR: \r , ] when , ] each ] "" make ; : 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 ; EnumClipboardFormats win32-error dup 0 > [ dup , (enum-clipboard) ] when ;
: enum-clipboard ( -- seq ) : enum-clipboard ( -- seq )

View File

@ -25,9 +25,11 @@ LIBRARY: kernel32
! ) ; ! ) ;
! FUNCTION: HMODULE GetModuleHandleA ( LPCTSTR lpModulename ) ;
! FUNCTION: HMODULE GetModuleHandleW ( LPCWSTR lpModulename ) ;
FUNCTION: HMODULE GetModuleHandleA ( char* lpModulename ) ; FUNCTION: HMODULE GetModuleHandleA ( void* lpModulename ) ;
FUNCTION: HMODULE GetModuleHandleW ( char* lpModulename ) ; FUNCTION: HMODULE GetModuleHandleW ( void* lpModulename ) ;
: GetModuleHandle \ GetModuleHandleW \ GetModuleHandleA unicode-exec ; : GetModuleHandle \ GetModuleHandleW \ GetModuleHandleA unicode-exec ;

View File

@ -177,7 +177,8 @@ TYPEDEF: LONG_PTR LPARAM
TYPEDEF: BOOL* LPBOOL TYPEDEF: BOOL* LPBOOL
TYPEDEF: BYTE* LPBYTE TYPEDEF: BYTE* LPBYTE
TYPEDEF: DWORD* LPCOLORREF TYPEDEF: DWORD* LPCOLORREF
TYPEDEF: CHAR* LPCSTR ! TYPEDEF: CHAR* LPCSTR
TYPEDEF: VOID* LPCSTR
TYPEDEF: WCHAR* LPCWSTR TYPEDEF: WCHAR* LPCWSTR
TYPEDEF: WCHAR* LPWSTR TYPEDEF: WCHAR* LPWSTR
unicode? [ unicode? [