From 2f868b38c2796031c9bb2794b4db519288ef100d Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sun, 22 Feb 2009 18:12:54 -0600 Subject: [PATCH] more CONSTANT: usage --- basis/windows/kernel32/kernel32.factor | 2 +- basis/windows/ole32/ole32.factor | 118 ++++++++++++------------- basis/windows/opengl32/opengl32.factor | 110 +++++++++++------------ basis/windows/shell32/shell32.factor | 6 +- basis/windows/types/types.factor | 6 +- basis/windows/windows.factor | 2 +- 6 files changed, 122 insertions(+), 122 deletions(-) diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor index 3494e83e83..8a271f7210 100755 --- a/basis/windows/kernel32/kernel32.factor +++ b/basis/windows/kernel32/kernel32.factor @@ -1226,7 +1226,7 @@ FUNCTION: BOOL GetExitCodeProcess ( HANDLE hProcess, LPDWORD lpExitCode ) ; FUNCTION: DWORD GetFileAttributesW ( LPCTSTR lpFileName ) ; ! FUNCTION: GetFileAttributesExA -: GetFileExInfoStandard 0 ; inline +CONSTANT: GetFileExInfoStandard 0 FUNCTION: BOOL GetFileAttributesExW ( LPCTSTR lpFileName, GET_FILEEX_INFO_LEVELS fInfoLevelId, LPVOID lpFileInformation ) ; diff --git a/basis/windows/ole32/ole32.factor b/basis/windows/ole32/ole32.factor index 3d080817bf..e69a9213b0 100755 --- a/basis/windows/ole32/ole32.factor +++ b/basis/windows/ole32/ole32.factor @@ -20,61 +20,61 @@ FUNCTION: BOOL IsEqualGUID ( REFGUID rguid1, REFGUID rguid2 ) ; FUNCTION: int StringFromGUID2 ( REFGUID rguid, LPOLESTR lpsz, int cchMax ) ; FUNCTION: HRESULT CLSIDFromString ( LPOLESTR lpsz, REFGUID out_rguid ) ; -: S_OK 0 ; inline -: S_FALSE 1 ; inline -: E_NOINTERFACE HEX: 80004002 ; inline -: E_FAIL HEX: 80004005 ; inline -: E_INVALIDARG HEX: 80070057 ; inline - -: MK_ALT HEX: 20 ; inline -: DROPEFFECT_NONE 0 ; inline -: DROPEFFECT_COPY 1 ; inline -: DROPEFFECT_MOVE 2 ; inline -: DROPEFFECT_LINK 4 ; inline -: DROPEFFECT_SCROLL HEX: 80000000 ; inline -: DD_DEFSCROLLINSET 11 ; inline -: DD_DEFSCROLLDELAY 50 ; inline -: DD_DEFSCROLLINTERVAL 50 ; inline -: DD_DEFDRAGDELAY 200 ; inline -: DD_DEFDRAGMINDIST 2 ; inline - -: CF_TEXT 1 ; inline -: CF_BITMAP 2 ; inline -: CF_METAFILEPICT 3 ; inline -: CF_SYLK 4 ; inline -: CF_DIF 5 ; inline -: CF_TIFF 6 ; inline -: CF_OEMTEXT 7 ; inline -: CF_DIB 8 ; inline -: CF_PALETTE 9 ; inline -: CF_PENDATA 10 ; inline -: CF_RIFF 11 ; inline -: CF_WAVE 12 ; inline -: CF_UNICODETEXT 13 ; inline -: CF_ENHMETAFILE 14 ; inline -: CF_HDROP 15 ; inline -: CF_LOCALE 16 ; inline -: CF_MAX 17 ; inline - -: CF_OWNERDISPLAY HEX: 0080 ; inline -: CF_DSPTEXT HEX: 0081 ; inline -: CF_DSPBITMAP HEX: 0082 ; inline -: CF_DSPMETAFILEPICT HEX: 0083 ; inline -: CF_DSPENHMETAFILE HEX: 008E ; inline - -: DVASPECT_CONTENT 1 ; inline -: DVASPECT_THUMBNAIL 2 ; inline -: DVASPECT_ICON 4 ; inline -: DVASPECT_DOCPRINT 8 ; inline - -: TYMED_HGLOBAL 1 ; inline -: TYMED_FILE 2 ; inline -: TYMED_ISTREAM 4 ; inline -: TYMED_ISTORAGE 8 ; inline -: TYMED_GDI 16 ; inline -: TYMED_MFPICT 32 ; inline -: TYMED_ENHMF 64 ; inline -: TYMED_NULL 0 ; inline +CONSTANT: S_OK 0 +CONSTANT: S_FALSE 1 +CONSTANT: E_NOINTERFACE HEX: 80004002 +CONSTANT: E_FAIL HEX: 80004005 +CONSTANT: E_INVALIDARG HEX: 80070057 + +CONSTANT: MK_ALT HEX: 20 +CONSTANT: DROPEFFECT_NONE 0 +CONSTANT: DROPEFFECT_COPY 1 +CONSTANT: DROPEFFECT_MOVE 2 +CONSTANT: DROPEFFECT_LINK 4 +CONSTANT: DROPEFFECT_SCROLL HEX: 80000000 +CONSTANT: DD_DEFSCROLLINSET 11 +CONSTANT: DD_DEFSCROLLDELAY 50 +CONSTANT: DD_DEFSCROLLINTERVAL 50 +CONSTANT: DD_DEFDRAGDELAY 200 +CONSTANT: DD_DEFDRAGMINDIST 2 + +CONSTANT: CF_TEXT 1 +CONSTANT: CF_BITMAP 2 +CONSTANT: CF_METAFILEPICT 3 +CONSTANT: CF_SYLK 4 +CONSTANT: CF_DIF 5 +CONSTANT: CF_TIFF 6 +CONSTANT: CF_OEMTEXT 7 +CONSTANT: CF_DIB 8 +CONSTANT: CF_PALETTE 9 +CONSTANT: CF_PENDATA 10 +CONSTANT: CF_RIFF 11 +CONSTANT: CF_WAVE 12 +CONSTANT: CF_UNICODETEXT 13 +CONSTANT: CF_ENHMETAFILE 14 +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: DVASPECT_CONTENT 1 +CONSTANT: DVASPECT_THUMBNAIL 2 +CONSTANT: DVASPECT_ICON 4 +CONSTANT: DVASPECT_DOCPRINT 8 + +CONSTANT: TYMED_HGLOBAL 1 +CONSTANT: TYMED_FILE 2 +CONSTANT: TYMED_ISTREAM 4 +CONSTANT: TYMED_ISTORAGE 8 +CONSTANT: TYMED_GDI 16 +CONSTANT: TYMED_MFPICT 32 +CONSTANT: TYMED_ENHMF 64 +CONSTANT: TYMED_NULL 0 C-STRUCT: DVTARGETDEVICE { "DWORD" "tdSize" } @@ -101,10 +101,10 @@ C-STRUCT: STGMEDIUM { "LPUNKNOWN" "punkForRelease" } ; TYPEDEF: STGMEDIUM* LPSTGMEDIUM -: COINIT_MULTITHREADED 0 ; inline -: COINIT_APARTMENTTHREADED 2 ; inline -: COINIT_DISABLE_OLE1DDE 4 ; inline -: COINIT_SPEED_OVER_MEMORY 8 ; inline +CONSTANT: COINIT_MULTITHREADED 0 +CONSTANT: COINIT_APARTMENTTHREADED 2 +CONSTANT: COINIT_DISABLE_OLE1DDE 4 +CONSTANT: COINIT_SPEED_OVER_MEMORY 8 FUNCTION: HRESULT OleInitialize ( void* reserved ) ; FUNCTION: HRESULT CoInitializeEx ( void* reserved, DWORD dwCoInit ) ; diff --git a/basis/windows/opengl32/opengl32.factor b/basis/windows/opengl32/opengl32.factor index 63384e8858..d0b396eba2 100755 --- a/basis/windows/opengl32/opengl32.factor +++ b/basis/windows/opengl32/opengl32.factor @@ -6,70 +6,70 @@ sequences libc ; IN: windows.opengl32 ! PIXELFORMATDESCRIPTOR flags -: PFD_DOUBLEBUFFER HEX: 00000001 ; inline -: PFD_STEREO HEX: 00000002 ; inline -: PFD_DRAW_TO_WINDOW HEX: 00000004 ; inline -: PFD_DRAW_TO_BITMAP HEX: 00000008 ; inline -: PFD_SUPPORT_GDI HEX: 00000010 ; inline -: PFD_SUPPORT_OPENGL HEX: 00000020 ; inline -: PFD_GENERIC_FORMAT HEX: 00000040 ; inline -: PFD_NEED_PALETTE HEX: 00000080 ; inline -: PFD_NEED_SYSTEM_PALETTE HEX: 00000100 ; inline -: PFD_SWAP_EXCHANGE HEX: 00000200 ; inline -: PFD_SWAP_COPY HEX: 00000400 ; inline -: PFD_SWAP_LAYER_BUFFERS HEX: 00000800 ; inline -: PFD_GENERIC_ACCELERATED HEX: 00001000 ; inline -: PFD_SUPPORT_DIRECTDRAW HEX: 00002000 ; inline +CONSTANT: PFD_DOUBLEBUFFER HEX: 00000001 +CONSTANT: PFD_STEREO HEX: 00000002 +CONSTANT: PFD_DRAW_TO_WINDOW HEX: 00000004 +CONSTANT: PFD_DRAW_TO_BITMAP HEX: 00000008 +CONSTANT: PFD_SUPPORT_GDI HEX: 00000010 +CONSTANT: PFD_SUPPORT_OPENGL HEX: 00000020 +CONSTANT: PFD_GENERIC_FORMAT HEX: 00000040 +CONSTANT: PFD_NEED_PALETTE HEX: 00000080 +CONSTANT: PFD_NEED_SYSTEM_PALETTE HEX: 00000100 +CONSTANT: PFD_SWAP_EXCHANGE HEX: 00000200 +CONSTANT: PFD_SWAP_COPY HEX: 00000400 +CONSTANT: PFD_SWAP_LAYER_BUFFERS HEX: 00000800 +CONSTANT: PFD_GENERIC_ACCELERATED HEX: 00001000 +CONSTANT: PFD_SUPPORT_DIRECTDRAW HEX: 00002000 ! PIXELFORMATDESCRIPTOR flags for use in ChoosePixelFormat only -: PFD_DEPTH_DONTCARE HEX: 20000000 ; inline -: PFD_DOUBLEBUFFER_DONTCARE HEX: 40000000 ; inline -: PFD_STEREO_DONTCARE HEX: 80000000 ; inline +CONSTANT: PFD_DEPTH_DONTCARE HEX: 20000000 +CONSTANT: PFD_DOUBLEBUFFER_DONTCARE HEX: 40000000 +CONSTANT: PFD_STEREO_DONTCARE HEX: 80000000 ! pixel types -: PFD_TYPE_RGBA 0 ; inline -: PFD_TYPE_COLORINDEX 1 ; inline +CONSTANT: PFD_TYPE_RGBA 0 +CONSTANT: PFD_TYPE_COLORINDEX 1 ! layer types -: PFD_MAIN_PLANE 0 ; inline -: PFD_OVERLAY_PLANE 1 ; inline -: PFD_UNDERLAY_PLANE -1 ; inline +CONSTANT: PFD_MAIN_PLANE 0 +CONSTANT: PFD_OVERLAY_PLANE 1 +CONSTANT: PFD_UNDERLAY_PLANE -1 -: LPD_TYPE_RGBA 0 ; inline -: LPD_TYPE_COLORINDEX 1 ; inline +CONSTANT: LPD_TYPE_RGBA 0 +CONSTANT: LPD_TYPE_COLORINDEX 1 ! wglSwapLayerBuffers flags -: WGL_SWAP_MAIN_PLANE HEX: 00000001 ; inline -: WGL_SWAP_OVERLAY1 HEX: 00000002 ; inline -: WGL_SWAP_OVERLAY2 HEX: 00000004 ; inline -: WGL_SWAP_OVERLAY3 HEX: 00000008 ; inline -: WGL_SWAP_OVERLAY4 HEX: 00000010 ; inline -: WGL_SWAP_OVERLAY5 HEX: 00000020 ; inline -: WGL_SWAP_OVERLAY6 HEX: 00000040 ; inline -: WGL_SWAP_OVERLAY7 HEX: 00000080 ; inline -: WGL_SWAP_OVERLAY8 HEX: 00000100 ; inline -: WGL_SWAP_OVERLAY9 HEX: 00000200 ; inline -: WGL_SWAP_OVERLAY10 HEX: 00000400 ; inline -: WGL_SWAP_OVERLAY11 HEX: 00000800 ; inline -: WGL_SWAP_OVERLAY12 HEX: 00001000 ; inline -: WGL_SWAP_OVERLAY13 HEX: 00002000 ; inline -: WGL_SWAP_OVERLAY14 HEX: 00004000 ; inline -: WGL_SWAP_OVERLAY15 HEX: 00008000 ; inline -: WGL_SWAP_UNDERLAY1 HEX: 00010000 ; inline -: WGL_SWAP_UNDERLAY2 HEX: 00020000 ; inline -: WGL_SWAP_UNDERLAY3 HEX: 00040000 ; inline -: WGL_SWAP_UNDERLAY4 HEX: 00080000 ; inline -: WGL_SWAP_UNDERLAY5 HEX: 00100000 ; inline -: WGL_SWAP_UNDERLAY6 HEX: 00200000 ; inline -: WGL_SWAP_UNDERLAY7 HEX: 00400000 ; inline -: WGL_SWAP_UNDERLAY8 HEX: 00800000 ; inline -: WGL_SWAP_UNDERLAY9 HEX: 01000000 ; inline -: WGL_SWAP_UNDERLAY10 HEX: 02000000 ; inline -: WGL_SWAP_UNDERLAY11 HEX: 04000000 ; inline -: WGL_SWAP_UNDERLAY12 HEX: 08000000 ; inline -: WGL_SWAP_UNDERLAY13 HEX: 10000000 ; inline -: WGL_SWAP_UNDERLAY14 HEX: 20000000 ; inline -: WGL_SWAP_UNDERLAY15 HEX: 40000000 ; inline +CONSTANT: WGL_SWAP_MAIN_PLANE HEX: 00000001 +CONSTANT: WGL_SWAP_OVERLAY1 HEX: 00000002 +CONSTANT: WGL_SWAP_OVERLAY2 HEX: 00000004 +CONSTANT: WGL_SWAP_OVERLAY3 HEX: 00000008 +CONSTANT: WGL_SWAP_OVERLAY4 HEX: 00000010 +CONSTANT: WGL_SWAP_OVERLAY5 HEX: 00000020 +CONSTANT: WGL_SWAP_OVERLAY6 HEX: 00000040 +CONSTANT: WGL_SWAP_OVERLAY7 HEX: 00000080 +CONSTANT: WGL_SWAP_OVERLAY8 HEX: 00000100 +CONSTANT: WGL_SWAP_OVERLAY9 HEX: 00000200 +CONSTANT: WGL_SWAP_OVERLAY10 HEX: 00000400 +CONSTANT: WGL_SWAP_OVERLAY11 HEX: 00000800 +CONSTANT: WGL_SWAP_OVERLAY12 HEX: 00001000 +CONSTANT: WGL_SWAP_OVERLAY13 HEX: 00002000 +CONSTANT: WGL_SWAP_OVERLAY14 HEX: 00004000 +CONSTANT: WGL_SWAP_OVERLAY15 HEX: 00008000 +CONSTANT: WGL_SWAP_UNDERLAY1 HEX: 00010000 +CONSTANT: WGL_SWAP_UNDERLAY2 HEX: 00020000 +CONSTANT: WGL_SWAP_UNDERLAY3 HEX: 00040000 +CONSTANT: WGL_SWAP_UNDERLAY4 HEX: 00080000 +CONSTANT: WGL_SWAP_UNDERLAY5 HEX: 00100000 +CONSTANT: WGL_SWAP_UNDERLAY6 HEX: 00200000 +CONSTANT: WGL_SWAP_UNDERLAY7 HEX: 00400000 +CONSTANT: WGL_SWAP_UNDERLAY8 HEX: 00800000 +CONSTANT: WGL_SWAP_UNDERLAY9 HEX: 01000000 +CONSTANT: WGL_SWAP_UNDERLAY10 HEX: 02000000 +CONSTANT: WGL_SWAP_UNDERLAY11 HEX: 04000000 +CONSTANT: WGL_SWAP_UNDERLAY12 HEX: 08000000 +CONSTANT: WGL_SWAP_UNDERLAY13 HEX: 10000000 +CONSTANT: WGL_SWAP_UNDERLAY14 HEX: 20000000 +CONSTANT: WGL_SWAP_UNDERLAY15 HEX: 40000000 : windowed-pfd-dwFlags ( -- n ) { PFD_DRAW_TO_WINDOW PFD_SUPPORT_OPENGL PFD_DOUBLEBUFFER } flags ; diff --git a/basis/windows/shell32/shell32.factor b/basis/windows/shell32/shell32.factor index c8dbe4b91c..7802ceb297 100644 --- a/basis/windows/shell32/shell32.factor +++ b/basis/windows/shell32/shell32.factor @@ -190,9 +190,9 @@ TYPEDEF: ITEMIDLIST ITEMID_CHILD TYPEDEF: ITEMID_CHILD* PITEMID_CHILD TYPEDEF: ITEMID_CHILD* PCUITEMID_CHILD -: STRRET_WSTR 0 ; inline -: STRRET_OFFSET 1 ; inline -: STRRET_CSTR 2 ; inline +CONSTANT: STRRET_WSTR 0 +CONSTANT: STRRET_OFFSET 1 +CONSTANT: STRRET_CSTR 2 C-UNION: STRRET-union "LPWSTR" "LPSTR" "UINT" "char[260]" ; C-STRUCT: STRRET diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor index 8cc18d4039..ee74e47fea 100755 --- a/basis/windows/types/types.factor +++ b/basis/windows/types/types.factor @@ -205,10 +205,10 @@ TYPEDEF: size_t socklen_t TYPEDEF: void* WNDPROC -: FALSE 0 ; inline -: TRUE 1 ; inline +CONSTANT: FALSE 0 +CONSTANT: TRUE 1 -: >BOOLEAN ( ? -- 1/0 ) 1 0 ? ; inline +: >BOOLEAN ( ? -- 1/0 ) TRUE FALSE ? ; inline ! typedef LRESULT (CALLBACK* WNDPROC)(HWND, UINT, WPARAM, LPARAM); diff --git a/basis/windows/windows.factor b/basis/windows/windows.factor index d2250d6f7e..44db355c99 100644 --- a/basis/windows/windows.factor +++ b/basis/windows/windows.factor @@ -8,7 +8,7 @@ IN: windows : lo-word ( wparam -- lo ) *short ; inline : hi-word ( wparam -- hi ) -16 shift lo-word ; inline -: MAX_UNICODE_PATH 32768 ; inline +CONSTANT: MAX_UNICODE_PATH 32768 ! You must LocalFree the return value! FUNCTION: void* error_message ( DWORD id ) ; -- 2.34.1