io.encodings.utf16: add a utf16n word for native utf16 type.

[factor.git] / basis / windows / types / types.factor

diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor
index e765e4264e2fc29599e8c263f635654614bc492f..af25decc5e2c6f31362814ae66948a0db23b63f8 100644 (file)
--- a/basis/windows/types/types.factor
+++ b/basis/windows/types/types.factor
@@ -1,8 +1,8 @@
 ! Copyright (C) 2005, 2006 Doug Coleman.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: alien alien.c-types alien.syntax namespaces kernel words
-sequences math math.bitwise math.vectors colors
-io.encodings.utf16n classes.struct accessors ;
+USING: alien.c-types alien.syntax classes.struct colors
+io.encodings.utf16 io.encodings.utf8 kernel math math.bitwise
+math.vectors sequences ;
 FROM: alien.c-types => float short ;
 IN: windows.types
 
@@ -128,6 +128,7 @@ TYPEDEF: DWORD               LGRPID
 TYPEDEF: LONG_PTR            LPARAM
 TYPEDEF: BOOL*               LPBOOL
 TYPEDEF: BYTE*               LPBYTE
+
 TYPEDEF: { c-string utf16n } LPCWSTR
 ! TYPEDEF: WCHAR*              LPWSTR
 
@@ -192,6 +193,8 @@ TYPEDEF: LPVOID              SC_LOCK
 TYPEDEF: HANDLE              SERVICE_STATUS_HANDLE
 TYPEDEF: LONGLONG            USN
 TYPEDEF: UINT_PTR            WPARAM
+TYPEDEF: DWORD               ACCESS_MASK
+TYPEDEF: ACCESS_MASK*        PACCESS_MASK
 
 TYPEDEF: size_t socklen_t
 
@@ -273,6 +276,7 @@ TYPEDEF: void* PAINTSTRUCT
 STRUCT: POINT
     { x LONG }
     { y LONG } ;
+TYPEDEF: POINT* LPPOINT
 
 STRUCT: SIZE
     { cx LONG }
@@ -403,3 +407,6 @@ STRUCT: TEXTMETRICW
 TYPEDEF: TEXTMETRICW* LPTEXTMETRIC
 
 TYPEDEF: ULONG PROPID
+
+CALLBACK: BOOL WNDENUMPROC ( HWND hWnd, LPARAM lParam )
+CALLBACK: LRESULT HOOKPROC ( int nCode, WPARAM wParam, LPARAM lParam )