use radix literals

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

diff --git a/basis/windows/ole32/ole32.factor b/basis/windows/ole32/ole32.factor
old mode 100755 (executable)
new mode 100644 (file)
index 9e117c8..5603a1c
--- a/basis/windows/ole32/ole32.factor
+++ b/basis/windows/ole32/ole32.factor
@@ -1,5 +1,5 @@
-USING: alien alien.syntax alien.c-types alien.strings math
-kernel sequences windows.errors windows.types io accessors
+USING: alien alien.syntax alien.c-types alien.data alien.strings
+math kernel sequences windows.errors windows.types io accessors
 math.order namespaces make math.parser windows.kernel32
 combinators locals specialized-arrays literals splitting
 grouping classes.struct combinators.smart ;
@@ -10,8 +10,11 @@ LIBRARY: ole32
 
 TYPEDEF: GUID* REFGUID
 TYPEDEF: void* LPUNKNOWN
-TYPEDEF: wchar_t* LPOLESTR
-TYPEDEF: wchar_t* LPCOLESTR
+TYPEDEF: LPWSTR LPOLESTR
+TYPEDEF: LPWSTR LPCOLESTR
+
+TYPEDEF: GUID IID
+TYPEDEF: GUID CLSID
 
 TYPEDEF: REFGUID LPGUID
 TYPEDEF: REFGUID REFIID
@@ -24,16 +27,16 @@ FUNCTION: HRESULT CLSIDFromString ( LPOLESTR lpsz, REFGUID out_rguid ) ;
 
 CONSTANT: S_OK 0
 CONSTANT: S_FALSE 1
-CONSTANT: E_NOINTERFACE HEX: 80004002
-CONSTANT: E_FAIL HEX: 80004005
-CONSTANT: E_INVALIDARG HEX: 80070057
+CONSTANT: E_NOINTERFACE 0x80004002
+CONSTANT: E_FAIL 0x80004005
+CONSTANT: E_INVALIDARG 0x80070057
 
-CONSTANT: MK_ALT HEX: 20
+CONSTANT: MK_ALT 0x20
 CONSTANT: DROPEFFECT_NONE 0
 CONSTANT: DROPEFFECT_COPY 1
 CONSTANT: DROPEFFECT_MOVE 2
 CONSTANT: DROPEFFECT_LINK 4
-CONSTANT: DROPEFFECT_SCROLL HEX: 80000000
+CONSTANT: DROPEFFECT_SCROLL 0x80000000
 CONSTANT: DD_DEFSCROLLINSET 11
 CONSTANT: DD_DEFSCROLLDELAY 50
 CONSTANT: DD_DEFSCROLLINTERVAL 50
@@ -58,11 +61,11 @@ CONSTANT: CF_HDROP            15
 CONSTANT: CF_LOCALE           16
 CONSTANT: CF_MAX              17
 
-CONSTANT: CF_OWNERDISPLAY     HEX: 0080
-CONSTANT: CF_DSPTEXT          HEX: 0081
-CONSTANT: CF_DSPBITMAP        HEX: 0082
-CONSTANT: CF_DSPMETAFILEPICT  HEX: 0083
-CONSTANT: CF_DSPENHMETAFILE   HEX: 008E
+CONSTANT: CF_OWNERDISPLAY     0x0080
+CONSTANT: CF_DSPTEXT          0x0081
+CONSTANT: CF_DSPBITMAP        0x0082
+CONSTANT: CF_DSPMETAFILEPICT  0x0083
+CONSTANT: CF_DSPENHMETAFILE   0x008E
 
 CONSTANT: DVASPECT_CONTENT    1
 CONSTANT: DVASPECT_THUMBNAIL  2
@@ -78,29 +81,29 @@ CONSTANT: TYMED_MFPICT   32
 CONSTANT: TYMED_ENHMF    64
 CONSTANT: TYMED_NULL     0
 
-C-STRUCT: DVTARGETDEVICE
-    { "DWORD" "tdSize" }
-    { "WORD" "tdDriverNameOffset" }
-    { "WORD" "tdDeviceNameOffset" }
-    { "WORD" "tdPortNameOffset" }
-    { "WORD" "tdExtDevmodeOffset" }
-    { "BYTE[1]" "tdData" } ;
+STRUCT: DVTARGETDEVICE
+    { tdSize DWORD }
+    { tdDriverNameOffset WORD }
+    { tdDeviceNameOffset WORD }
+    { tdPortNameOffset WORD }
+    { tdExtDevmodeOffset WORD }
+    { tdData BYTE[1] } ;
 
 TYPEDEF: WORD CLIPFORMAT
 TYPEDEF: POINT POINTL
 
-C-STRUCT: FORMATETC
-    { "CLIPFORMAT" "cfFormat" }
-    { "DVTARGETDEVICE*" "ptd" }
-    { "DWORD" "dwAspect" }
-    { "LONG" "lindex" }
-    { "DWORD" "tymed" } ;
+STRUCT: FORMATETC
+    { cfFormat CLIPFORMAT }
+    { ptd DVTARGETDEVICE* }
+    { dwAspect DWORD }
+    { lindex LONG }
+    { tymed DWORD } ;
 TYPEDEF: FORMATETC* LPFORMATETC
 
-C-STRUCT: STGMEDIUM
-    { "DWORD" "tymed" }
-    { "void*" "data" }
-    { "LPUNKNOWN" "punkForRelease" } ;
+STRUCT: STGMEDIUM
+    { tymed DWORD }
+    { data void* }
+    { punkForRelease LPUNKNOWN } ;
 TYPEDEF: STGMEDIUM* LPSTGMEDIUM
 
 CONSTANT: COINIT_MULTITHREADED     0
@@ -111,12 +114,8 @@ CONSTANT: COINIT_SPEED_OVER_MEMORY 8
 FUNCTION: HRESULT OleInitialize ( void* reserved ) ;
 FUNCTION: HRESULT CoInitializeEx ( void* reserved, DWORD dwCoInit ) ;
 
-FUNCTION: HRESULT RegisterDragDrop ( HWND hWnd, IDropTarget* pDropTarget ) ;
-FUNCTION: HRESULT RevokeDragDrop ( HWND hWnd ) ;
-FUNCTION: void ReleaseStgMedium ( LPSTGMEDIUM pmedium ) ;
-
 : succeeded? ( hresult -- ? )
-    0 HEX: 7FFFFFFF between? ;
+    0 0x7FFFFFFF between? ;
 
 TUPLE: ole32-error code message ;