Merge branch 'master' of git://factorcode.org/git/factor

[factor.git] / extra / windows / ole32 / ole32.factor

diff --git a/extra/windows/ole32/ole32.factor b/extra/windows/ole32/ole32.factor
index 3be442514c82927d529942e1502f39e6a59eb79b..ae3dafbc9f6b5b879489d587784ccec1ff05372d 100644 (file)
--- a/extra/windows/ole32/ole32.factor
+++ b/extra/windows/ole32/ole32.factor
@@ -1,13 +1,13 @@
-USING: alien alien.syntax alien.c-types math kernel sequences\r
-windows windows.kernel32 windows.types combinators.lib ;\r
+USING: alien alien.syntax alien.c-types alien.strings math\r
+kernel sequences windows windows.types combinators.lib ;\r
 IN: windows.ole32\r
 \r
 LIBRARY: ole32\r
 \r
 TYPEDEF: GUID* REFGUID\r
 TYPEDEF: void* LPUNKNOWN\r
-TYPEDEF: ushort* LPOLESTR\r
-TYPEDEF: ushort* LPCOLESTR\r
+TYPEDEF: wchar_t* LPOLESTR\r
+TYPEDEF: wchar_t* LPCOLESTR\r
 \r
 TYPEDEF: REFGUID REFIID\r
 TYPEDEF: REFGUID REFCLSID\r
@@ -128,8 +128,8 @@ FUNCTION: void ReleaseStgMedium ( LPSTGMEDIUM pmedium ) ;
     "{01234567-89ab-cdef-0123-456789abcdef}" length ; inline\r
 \r
 : string>guid ( string -- guid )\r
-    string>u16-alien "GUID" <c-object> [ CLSIDFromString ole32-error ] keep ;\r
+    utf16n string>alien "GUID" <c-object> [ CLSIDFromString ole32-error ] keep ;\r
 : guid>string ( guid -- string )\r
     GUID-STRING-LENGTH 1+ [ "ushort" <c-array> ] keep\r
-    [ StringFromGUID2 drop ] { 2 } multikeep alien>u16-string ;\r
+    [ StringFromGUID2 drop ] { 2 } multikeep utf16n alien>string ;\r
 \r