From c998f64befe3a7a93c9f61749fc0186e6f01eb6b Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Sat, 4 Jun 2016 16:26:18 -0700 Subject: [PATCH] factor: C-TYPE: -> c-type: --- core/alien/c-types/c-types-tests.factor | 6 +-- ffi/clutter/cogl/ffi/ffi.factor | 4 +- .../dictionaries/dictionaries.factor | 4 +- .../file-descriptors/file-descriptors.factor | 2 +- ffi/curses/ffi/ffi.factor | 2 +- ffi/freetype/freetype.factor | 6 +-- ffi/gdbm/ffi/ffi.factor | 2 +- ffi/gdk/ffi/ffi.factor | 2 +- .../gobject-introspection.factor | 2 +- ffi/gstreamer/ffi/ffi.factor | 6 +-- ffi/libtls/ffi/ffi.factor | 4 +- ffi/libudev/libudev.factor | 12 ++--- ffi/libusb/libusb.factor | 8 +-- ffi/lua/lua.factor | 4 +- ffi/openal/openal.factor | 4 +- ffi/opencl/ffi/ffi.factor | 18 +++---- ffi/opengl/gl/gl.factor | 2 +- ffi/opengl/glu/glu.factor | 8 +-- ffi/openssl/libcrypto/libcrypto.factor | 4 +- ffi/openssl/libssl/libssl.factor | 14 ++--- ffi/python/ffi/ffi.factor | 4 +- ffi/unix/types/types.factor | 10 ++-- ffi/windows/com/com.factor | 6 +-- ffi/windows/ddk/hid/hid.factor | 2 +- ffi/windows/ddk/setupapi/setupapi.factor | 2 +- ffi/windows/directx/d2d1/d2d1.factor | 26 +++++----- ffi/windows/directx/d3d10/d3d10.factor | 2 +- .../d3d10_1shader/d3d10_1shader.factor | 2 +- .../directx/d3d10effect/d3d10effect.factor | 26 +++++----- .../directx/d3d10misc/d3d10misc.factor | 2 +- ffi/windows/directx/d3d11/d3d11.factor | 4 +- .../directx/d3d11shader/d3d11shader.factor | 4 +- ffi/windows/directx/d3d9/d3d9.factor | 44 ++++++++-------- .../directx/d3dcompiler/d3dcompiler.factor | 8 +-- .../directx/d3dx10async/d3dx10async.factor | 10 ++-- .../directx/d3dx10core/d3dx10core.factor | 8 +-- .../directx/d3dx9anim/d3dx9anim.factor | 16 +++--- .../directx/d3dx9core/d3dx9core.factor | 16 +++--- .../directx/d3dx9effect/d3dx9effect.factor | 10 ++-- .../directx/d3dx9math/d3dx9math.factor | 2 +- .../directx/d3dx9mesh/d3dx9mesh.factor | 30 +++++------ .../directx/d3dx9shader/d3dx9shader.factor | 6 +-- ffi/windows/directx/d3dx9xof/d3dx9xof.factor | 10 ++-- ffi/windows/directx/dwrite/dwrite.factor | 20 +++---- ffi/windows/directx/dxfile/dxfile.factor | 14 ++--- ffi/windows/directx/dxgi/dxgi.factor | 2 +- ffi/windows/directx/xact3/xact3.factor | 18 +++---- ffi/windows/directx/xaudio2/xaudio2.factor | 12 ++--- ffi/windows/gdiplus/gdiplus.factor | 52 +++++++++---------- ffi/windows/usp10/usp10.factor | 4 +- ffi/windows/winsock/winsock.factor | 2 +- ffi/x11/xlib/xlib.factor | 12 ++--- frameworks/db/postgresql/ffi/ffi.factor | 18 +++---- frameworks/db/sqlite/ffi/ffi.factor | 4 +- language/alien/parser/parser-tests.factor | 2 +- .../prettyprint/prettyprint-tests.factor | 4 +- language/alien/prettyprint/prettyprint.factor | 2 +- language/alien/syntax/syntax-docs.factor | 10 ++-- language/alien/syntax/syntax.factor | 2 + language/classes/struct/struct-tests.factor | 2 +- libs/chipmunk/ffi/ffi.factor | 18 +++---- libs/tokyo/alien/tchdb/tchdb.factor | 4 +- libs/tokyo/alien/tcrdb/tcrdb.factor | 4 +- libs/tokyo/alien/tctdb/tctdb.factor | 10 ++-- libs/tokyo/alien/tcutil/tcutil.factor | 2 +- libs/yaml/ffi/ffi.factor | 2 +- misc/fuel/strange-syntax.factor | 2 +- .../gstreamer/plugins/rtsp/ffi/ffi.factor | 2 +- unmaintained/llvm/clang/ffi/ffi.factor | 4 +- unmaintained/odbc/odbc.factor | 2 +- 70 files changed, 298 insertions(+), 296 deletions(-) diff --git a/core/alien/c-types/c-types-tests.factor b/core/alien/c-types/c-types-tests.factor index c0a8cc3933..c5d4bcb8c9 100644 --- a/core/alien/c-types/c-types-tests.factor +++ b/core/alien/c-types/c-types-tests.factor @@ -54,7 +54,7 @@ TYPEDEF: int* MyIntArray ; { 127 } [ 230 char c-type-clamp ] unit-test { t } [ pi dup float c-type-clamp = ] unit-test -C-TYPE: opaque +c-type: opaque { t } [ void* lookup-c-type pointer: opaque lookup-c-type = ] unit-test [ opaque lookup-c-type ] [ no-c-type? ] must-fail-with @@ -65,7 +65,7 @@ C-TYPE: opaque FUNCTION: opaque return_opaque ( ) ; " eval( -- ) ] [ no-c-type? ] must-fail-with -C-TYPE: forward +c-type: forward STRUCT: backward { x forward* } ; STRUCT: forward { x backward* } ; @@ -88,7 +88,7 @@ defer: struct-redefined USING: alien.syntax ; in: alien.c-types.tests - C-TYPE: struct-redefined + c-type: struct-redefined " eval( -- ) \ struct-redefined class? diff --git a/ffi/clutter/cogl/ffi/ffi.factor b/ffi/clutter/cogl/ffi/ffi.factor index 9ee90ae73d..f5173923b0 100644 --- a/ffi/clutter/cogl/ffi/ffi.factor +++ b/ffi/clutter/cogl/ffi/ffi.factor @@ -18,7 +18,7 @@ LIBRARY: clutter.cogl } cond >> -FOREIGN-ATOMIC-TYPE: GL.uint GLuint -FOREIGN-ATOMIC-TYPE: GL.enum GLenum +FOREIGN-ATOMIc-type: GL.uint GLuint +FOREIGN-ATOMIc-type: GL.enum GLenum GIR: Cogl-1.0.gir diff --git a/ffi/core-foundation/dictionaries/dictionaries.factor b/ffi/core-foundation/dictionaries/dictionaries.factor index 3dee4669f6..9c96109e37 100644 --- a/ffi/core-foundation/dictionaries/dictionaries.factor +++ b/ffi/core-foundation/dictionaries/dictionaries.factor @@ -8,8 +8,8 @@ specialized-array: void* TYPEDEF: void* CFDictionaryRef ; TYPEDEF: void* CFMutableDictionaryRef ; -C-TYPE: CFDictionaryKeyCallBacks -C-TYPE: CFDictionaryValueCallBacks +c-type: CFDictionaryKeyCallBacks +c-type: CFDictionaryValueCallBacks FUNCTION: CFDictionaryRef CFDictionaryCreate ( CFAllocatorRef allocator, diff --git a/ffi/core-foundation/file-descriptors/file-descriptors.factor b/ffi/core-foundation/file-descriptors/file-descriptors.factor index 758c072b06..bacc83303e 100644 --- a/ffi/core-foundation/file-descriptors/file-descriptors.factor +++ b/ffi/core-foundation/file-descriptors/file-descriptors.factor @@ -13,7 +13,7 @@ CALLBACK: void CFFileDescriptorCallBack ( void *info ) ; -C-TYPE: CFFileDescriptorContext +c-type: CFFileDescriptorContext FUNCTION: CFFileDescriptorRef CFFileDescriptorCreate ( CFAllocatorRef allocator, diff --git a/ffi/curses/ffi/ffi.factor b/ffi/curses/ffi/ffi.factor index 2e5b004e2e..0706c93d37 100644 --- a/ffi/curses/ffi/ffi.factor +++ b/ffi/curses/ffi/ffi.factor @@ -10,7 +10,7 @@ in: curses.ffi { [ os unix? ] [ "ncursesw" find-library ] } } cond cdecl add-library >> -C-TYPE: SCREEN +c-type: SCREEN TYPEDEF: void* va_list ; TYPEDEF: uint chtype ; diff --git a/ffi/freetype/freetype.factor b/ffi/freetype/freetype.factor index 47e26b271c..c966c4826a 100644 --- a/ffi/freetype/freetype.factor +++ b/ffi/freetype/freetype.factor @@ -38,8 +38,8 @@ TYPEDEF: long FT_F26Dot6 ; FUNCTION: FT_Error FT_Init_FreeType ( void* library ) ; ! circular reference between glyph and face -C-TYPE: face -C-TYPE: glyph +c-type: face +c-type: glyph STRUCT: glyph { library void* } @@ -166,7 +166,7 @@ STRUCT: FT_Bitmap { palette_mode char } { palette void* } ; -C-TYPE: FT_Face +c-type: FT_Face FUNCTION: FT_Error FT_New_Face ( void* library, FT_Char* font, FT_Long index, face* face ) ; diff --git a/ffi/gdbm/ffi/ffi.factor b/ffi/gdbm/ffi/ffi.factor index 8cef4d8534..297e8b0854 100755 --- a/ffi/gdbm/ffi/ffi.factor +++ b/ffi/gdbm/ffi/ffi.factor @@ -25,7 +25,7 @@ CONSTANT: GDBM_COALESCEBLKS 5 ; STRUCT: datum { dptr char* } { dsize int } ; -C-TYPE: _GDBM_FILE +c-type: _GDBM_FILE TYPEDEF: _GDBM_FILE* GDBM_FILE ; CALLBACK: void fatal_func_cb ( ) ; diff --git a/ffi/gdk/ffi/ffi.factor b/ffi/gdk/ffi/ffi.factor index c894c8eb9f..0545e2fff2 100644 --- a/ffi/gdk/ffi/ffi.factor +++ b/ffi/gdk/ffi/ffi.factor @@ -25,7 +25,7 @@ LIBRARY: gdk STRUCT: cairo_rectangle_int_t { x int } { y int } { width int } { height int } ; -C-TYPE: cairo_region_t +c-type: cairo_region_t ! workaround> FOREIGN-RECORD-TYPE: cairo.RectangleInt cairo_rectangle_int_t diff --git a/ffi/gobject-introspection/gobject-introspection.factor b/ffi/gobject-introspection/gobject-introspection.factor index 4d92d32c3e..0d6466ad9e 100755 --- a/ffi/gobject-introspection/gobject-introspection.factor +++ b/ffi/gobject-introspection/gobject-introspection.factor @@ -59,7 +59,7 @@ SYNTAX: IMPLEMENT-STRUCTS: ";" parse-tokens implement-structs [ swap append! ] change-global ; -SYNTAX: FOREIGN-ATOMIC-TYPE: +SYNTAX: FOREIGN-ATOMIc-type: scan-token scan-object swap register-atomic-type ; SYNTAX: FOREIGN-ENUM-TYPE: diff --git a/ffi/gstreamer/ffi/ffi.factor b/ffi/gstreamer/ffi/ffi.factor index 222eda69b5..bb73832383 100644 --- a/ffi/gstreamer/ffi/ffi.factor +++ b/ffi/gstreamer/ffi/ffi.factor @@ -28,9 +28,9 @@ TYPEDEF: void* xmlNodePtr ; TYPEDEF: void* xmlDocPtr ; TYPEDEF: void* xmlNsPtr ; -FOREIGN-ATOMIC-TYPE: libxml2.NodePtr xmlNodePtr -FOREIGN-ATOMIC-TYPE: libxml2.DocPtr xmlDocPtr -FOREIGN-ATOMIC-TYPE: libxml2.NsPtr xmlNsPtr +FOREIGN-ATOMIc-type: libxml2.NodePtr xmlNodePtr +FOREIGN-ATOMIc-type: libxml2.DocPtr xmlDocPtr +FOREIGN-ATOMIc-type: libxml2.NsPtr xmlNsPtr PRIVATE> diff --git a/ffi/libtls/ffi/ffi.factor b/ffi/libtls/ffi/ffi.factor index 5fbdbdd2b4..46cca37ad4 100644 --- a/ffi/libtls/ffi/ffi.factor +++ b/ffi/libtls/ffi/ffi.factor @@ -9,8 +9,8 @@ in: libtls.ffi { [ os unix? ] [ "libtls.so" ] } } cond cdecl add-library >> -C-TYPE: tls_config -C-TYPE: tls_ctx +c-type: tls_config +c-type: tls_ctx LIBRARY: libtls diff --git a/ffi/libudev/libudev.factor b/ffi/libudev/libudev.factor index 86237d86f1..4d5e5ae96f 100644 --- a/ffi/libudev/libudev.factor +++ b/ffi/libudev/libudev.factor @@ -8,7 +8,7 @@ in: libudev LIBRARY: libudev -C-TYPE: udev +c-type: udev FUNCTION: udev* udev_ref ( udev* udev ) @@ -70,7 +70,7 @@ FUNCTION: void udev_set_userdata ( -C-TYPE: udev_list_entry +c-type: udev_list_entry FUNCTION: udev_list_entry* udev_list_entry_get_next ( udev_list_entry* list_entry ) @@ -104,7 +104,7 @@ FUNCTION: c-string udev_list_entry_get_value ( -C-TYPE: udev_device +c-type: udev_device FUNCTION: udev_device* udev_device_ref ( udev_device* udev_device ) @@ -230,7 +230,7 @@ FUNCTION: c-string udev_device_get_sysattr_value ( -C-TYPE: udev_monitor +c-type: udev_monitor FUNCTION: udev_monitor* udev_monitor_ref ( udev_monitor* udev_monitor ) @@ -297,7 +297,7 @@ FUNCTION: int udev_monitor_filter_remove ( -C-TYPE: udev_enumerate +c-type: udev_enumerate FUNCTION: udev_enumerate* udev_enumerate_ref ( udev_enumerate* udev_enumerate ) @@ -379,7 +379,7 @@ FUNCTION: udev_list_entry* udev_enumerate_get_list_entry ( -C-TYPE: udev_queue +c-type: udev_queue FUNCTION: udev_queue* udev_queue_ref ( udev_queue* udev_queue ) diff --git a/ffi/libusb/libusb.factor b/ffi/libusb/libusb.factor index a561dfd459..2f2e749fc9 100644 --- a/ffi/libusb/libusb.factor +++ b/ffi/libusb/libusb.factor @@ -172,9 +172,9 @@ STRUCT: libusb_control_setup : LIBUSB_CONTROL_SETUP_SIZE ( -- x ) libusb_control_setup heap-size ; inline -C-TYPE: libusb_context -C-TYPE: libusb_device -C-TYPE: libusb_device_handle +c-type: libusb_context +c-type: libusb_device +c-type: libusb_device_handle ENUM: libusb_error { LIBUSB_SUCCESS 0 } @@ -212,7 +212,7 @@ STRUCT: libusb_iso_packet_descriptor { status libusb_transfer_status } ; specialized-array: libusb_iso_packet_descriptor -C-TYPE: libusb_transfer +c-type: libusb_transfer CALLBACK: void libusb_transfer_cb_fn ( libusb_transfer* transfer ) ; diff --git a/ffi/lua/lua.factor b/ffi/lua/lua.factor index c770145cf7..16131219ec 100644 --- a/ffi/lua/lua.factor +++ b/ffi/lua/lua.factor @@ -43,7 +43,7 @@ CONSTANT: LUA_ERRSYNTAX 3 ; CONSTANT: LUA_ERRMEM 4 ; CONSTANT: LUA_ERRERR 5 ; -C-TYPE: lua_State +c-type: lua_State CALLBACK: int lua_CFunction ( lua_State* L ) ; CALLBACK: char* lua_Reader ( lua_State* L, void* ud, size_t* sz ) ; @@ -175,7 +175,7 @@ CONSTANT: LUA_HOOKTAILRET 4 ; : LUA_MASKLINE ( n -- n ) LUA_HOOKLINE shift ; inline : LUA_MASKCOUNT ( n -- n ) LUA_HOOKCOUNT shift ; inline -C-TYPE: lua_Debug +c-type: lua_Debug CALLBACK: void lua_Hook ( lua_State* L, lua_Debug* ar ) ; FUNCTION: int lua_getstack ( lua_State* L, int level, lua_Debug* ar ) ; diff --git a/ffi/openal/openal.factor b/ffi/openal/openal.factor index 87549ff986..4276ae658a 100755 --- a/ffi/openal/openal.factor +++ b/ffi/openal/openal.factor @@ -178,8 +178,8 @@ FUNCTION: void alDopplerVelocity ( ALfloat value ) ; FUNCTION: void alSpeedOfSound ( ALfloat value ) ; FUNCTION: void alDistanceModel ( ALenum distanceModel ) ; -C-TYPE: ALCdevice -C-TYPE: ALCcontext +c-type: ALCdevice +c-type: ALCcontext TYPEDEF: char ALCboolean ; TYPEDEF: char ALCchar ; TYPEDEF: int ALCenum ; diff --git a/ffi/opencl/ffi/ffi.factor b/ffi/opencl/ffi/ffi.factor index afff0b5074..eaab251af3 100644 --- a/ffi/opencl/ffi/ffi.factor +++ b/ffi/opencl/ffi/ffi.factor @@ -74,15 +74,15 @@ TYPEDEF: int cl_GLint ; TYPEDEF: uint cl_GLenum ; ! cl.h -C-TYPE: _cl_platform_id -C-TYPE: _cl_device_id -C-TYPE: _cl_context -C-TYPE: _cl_command_queue -C-TYPE: _cl_mem -C-TYPE: _cl_program -C-TYPE: _cl_kernel -C-TYPE: _cl_event -C-TYPE: _cl_sampler +c-type: _cl_platform_id +c-type: _cl_device_id +c-type: _cl_context +c-type: _cl_command_queue +c-type: _cl_mem +c-type: _cl_program +c-type: _cl_kernel +c-type: _cl_event +c-type: _cl_sampler TYPEDEF: _cl_platform_id* cl_platform_id ; TYPEDEF: _cl_device_id* cl_device_id ; diff --git a/ffi/opengl/gl/gl.factor b/ffi/opengl/gl/gl.factor index a86fe0ecb2..4ce4d8ed76 100644 --- a/ffi/opengl/gl/gl.factor +++ b/ffi/opengl/gl/gl.factor @@ -24,7 +24,7 @@ TYPEDEF: double GLclampd ; TYPEDEF: longlong GLint64 ; TYPEDEF: ulonglong GLuint64 ; TYPEDEF: void* GLsync ; -C-TYPE: GLvoid +c-type: GLvoid TYPEDEF: c-string[ascii] GLstring ; diff --git a/ffi/opengl/glu/glu.factor b/ffi/opengl/glu/glu.factor index 095047cc58..aee88aa8d8 100644 --- a/ffi/opengl/glu/glu.factor +++ b/ffi/opengl/glu/glu.factor @@ -17,10 +17,10 @@ os { LIBRARY: glu ! These are defined as structs in glu.h, but we only ever use pointers to them -C-TYPE: GLUnurbs -C-TYPE: GLUquadric -C-TYPE: GLUtesselator -C-TYPE: GLubyte +c-type: GLUnurbs +c-type: GLUquadric +c-type: GLUtesselator +c-type: GLubyte TYPEDEF: void* GLUfuncptr ; ! StringName diff --git a/ffi/openssl/libcrypto/libcrypto.factor b/ffi/openssl/libcrypto/libcrypto.factor index 5885e1a51f..04ad47b00b 100644 --- a/ffi/openssl/libcrypto/libcrypto.factor +++ b/ffi/openssl/libcrypto/libcrypto.factor @@ -130,8 +130,8 @@ FUNCTION: void* BIO_f_buffer ( ) ; CONSTANT: EVP_MAX_MD_SIZE 64 ; -C-TYPE: EVP_MD -C-TYPE: ENGINE +c-type: EVP_MD +c-type: ENGINE STRUCT: EVP_MD_CTX { digest EVP_MD* } diff --git a/ffi/openssl/libssl/libssl.factor b/ffi/openssl/libssl/libssl.factor index a6534914e3..780235680e 100644 --- a/ffi/openssl/libssl/libssl.factor +++ b/ffi/openssl/libssl/libssl.factor @@ -180,8 +180,8 @@ CONSTANT: SSL_ERROR_WANT_ACCEPT 8 ; { 8 "SSL_ERROR_WANT_ACCEPT" } } ; -C-TYPE: SSL_CTX -C-TYPE: SSL_SESSION +c-type: SSL_CTX +c-type: SSL_SESSION LIBRARY: libssl @@ -201,12 +201,12 @@ TYPEDEF: stack_st _STACK ; ! asn1t.h ! =============================================== -C-TYPE: ASN1_ITEM +c-type: ASN1_ITEM ! =============================================== ! asn1.h ! =============================================== -C-TYPE: ASN1_VALUE +c-type: ASN1_VALUE TYPEDEF: ASN1_ITEM ASN1_ITEM_EXP ; STRUCT: ASN1_STRING @@ -233,8 +233,8 @@ STRUCT: X509_EXTENSION { critical void* } { value ASN1_OCTET_STRING* } ; -C-TYPE: X509_NAME -C-TYPE: X509 +c-type: X509_NAME +c-type: X509 ! =============================================== ! x509v3.h @@ -617,7 +617,7 @@ FUNCTION: X509_EXTENSION* X509_get_ext ( X509* a, int loc ) ; FUNCTION: void X509_free ( X509 *a ) ; destructor: X509_free -C-TYPE: X509_STORE +c-type: X509_STORE FUNCTION: X509_STORE* X509_STORE_new ( ) ; CONSTANT: X509_R_CERT_ALREADY_IN_HASH_TABLE 101 ; diff --git a/ffi/python/ffi/ffi.factor b/ffi/python/ffi/ffi.factor index d7c9aaaf75..9a3b13c654 100644 --- a/ffi/python/ffi/ffi.factor +++ b/ffi/python/ffi/ffi.factor @@ -13,7 +13,7 @@ cdecl add-library >> LIBRARY: python -C-TYPE: PyObject +c-type: PyObject ! Methods CONSTANT: METH_OLDARGS 0x0000 ; @@ -25,7 +25,7 @@ CONSTANT: METH_CLASS 0x0010 ; CONSTANT: METH_STATIC 0x0020 ; CONSTANT: METH_COEXIST 0x0040 ; -C-TYPE: PyCFunction +c-type: PyCFunction STRUCT: PyMethodDef { ml_name c-string } diff --git a/ffi/unix/types/types.factor b/ffi/unix/types/types.factor index b88b80ed13..31e84942e9 100644 --- a/ffi/unix/types/types.factor +++ b/ffi/unix/types/types.factor @@ -29,10 +29,10 @@ TYPEDEF: __uint64_t rlim_t ; TYPEDEF: uint32_t id_t ; TYPEDEF: long clockid_t ; -C-TYPE: DIR -C-TYPE: FILE -C-TYPE: rlimit -C-TYPE: rusage -C-TYPE: sockaddr +c-type: DIR +c-type: FILE +c-type: rlimit +c-type: rusage +c-type: sockaddr "unix.types." os name>> sequences:append require diff --git a/ffi/windows/com/com.factor b/ffi/windows/com/com.factor index 9f805bcbfd..513539cc22 100644 --- a/ffi/windows/com/com.factor +++ b/ffi/windows/com/com.factor @@ -10,9 +10,9 @@ COM-INTERFACE: IUnknown f {00000000-0000-0000-C000-000000000046} ULONG AddRef ( ) ULONG Release ( ) ; -C-TYPE: IAdviseSink -C-TYPE: IEnumFORMATETC -C-TYPE: IEnumSTATDATA +c-type: IAdviseSink +c-type: IEnumFORMATETC +c-type: IEnumSTATDATA COM-INTERFACE: IDataObject IUnknown {0000010E-0000-0000-C000-000000000046} HRESULT GetData ( FORMATETC* pFormatetc, STGMEDIUM* pmedium ) diff --git a/ffi/windows/ddk/hid/hid.factor b/ffi/windows/ddk/hid/hid.factor index ae1f1d9d88..00150b0cbb 100755 --- a/ffi/windows/ddk/hid/hid.factor +++ b/ffi/windows/ddk/hid/hid.factor @@ -320,7 +320,7 @@ STRUCT: HIDP_LINK_COLLECTION_NODE TYPEDEF: HIDP_LINK_COLLECTION_NODE* PHIDP_LINK_COLLECTION_NODE ; TYPEDEF: PUCHAR PHIDP_REPORT_DESCRIPTOR ; -C-TYPE: HIDP_PREPARSED_DATA +c-type: HIDP_PREPARSED_DATA TYPEDEF: HIDP_PREPARSED_DATA* PHIDP_PREPARSED_DATA ; STRUCT: HIDP_CAPS diff --git a/ffi/windows/ddk/setupapi/setupapi.factor b/ffi/windows/ddk/setupapi/setupapi.factor index 097d71aa02..dcf2c8e305 100755 --- a/ffi/windows/ddk/setupapi/setupapi.factor +++ b/ffi/windows/ddk/setupapi/setupapi.factor @@ -60,7 +60,7 @@ CONSTANT: TXTLOG_VENDOR 0x80000000 ; TYPEDEF: void* HPROPSHEETPAGE ; TYPEDEF: void* HIMAGELIST ; -C-TYPE: DEVPROPKEY +c-type: DEVPROPKEY TYPEDEF: ULONG DEVPROPTYPE ; TYPEDEF: DEVPROPTYPE* PDEVPROPTYPE ; TYPEDEF: void* LPPROPSHEETHEADERA ; diff --git a/ffi/windows/directx/d2d1/d2d1.factor b/ffi/windows/directx/d2d1/d2d1.factor index 7885c116fc..54949d58e3 100644 --- a/ffi/windows/directx/d2d1/d2d1.factor +++ b/ffi/windows/directx/d2d1/d2d1.factor @@ -217,9 +217,9 @@ CONSTANT: D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE 0x00000001 ; CONSTANT: D2D1_LAYER_OPTIONS_FORCE_DWORD 0xffffffff ; TYPEDEF: int D2D1_LAYER_OPTIONS ; -C-TYPE: ID2D1Geometry -C-TYPE: ID2D1Brush -C-TYPE: ID2D1RenderTarget +c-type: ID2D1Geometry +c-type: ID2D1Brush +c-type: ID2D1RenderTarget STRUCT: D2D1_LAYER_PARAMETERS { contentBounds D2D1_RECT_F } @@ -304,8 +304,8 @@ TYPEDEF: int D2D1_FACTORY_TYPE ; STRUCT: D2D1_FACTORY_OPTIONS { debugLevel D2D1_DEBUG_LEVEL } ; -C-TYPE: ID2D1Factory -C-TYPE: ID2D1BitmapRenderTarget +c-type: ID2D1Factory +c-type: ID2D1BitmapRenderTarget COM-INTERFACE: ID2D1Resource IUnknown {2cd90691-12e2-11dc-9fed-001143a055f9} void GetFactory ( ID2D1Factory** factory ) ; @@ -374,8 +374,8 @@ COM-INTERFACE: ID2D1StrokeStyle ID2D1Resource {2cd9069d-12e2-11dc-9fed-001143a05 UINT32 GetDashesCount ( ) void GetDashes ( FLOAT* dashes, UINT dashesCount ) ; -C-TYPE: ID2D1SimplifiedGeometrySink -C-TYPE: ID2D1TessellationSink +c-type: ID2D1SimplifiedGeometrySink +c-type: ID2D1TessellationSink COM-INTERFACE: ID2D1Geometry ID2D1Resource {2cd906a1-12e2-11dc-9fed-001143a055f9} HRESULT GetBounds ( D2D1_MATRIX_3X2_F* worldTransform, D2D1_RECT_F* bounds ) @@ -442,7 +442,7 @@ COM-INTERFACE: ID2D1Mesh ID2D1Resource {2cd906c2-12e2-11dc-9fed-001143a055f9} COM-INTERFACE: ID2D1Layer ID2D1Resource {2cd9069b-12e2-11dc-9fed-001143a055f9} D2D1_SIZE_F GetSize ( ) ; -C-TYPE: IDWriteRenderingParams +c-type: IDWriteRenderingParams COM-INTERFACE: ID2D1DrawingStateBlock ID2D1Resource {28506e39-ebf6-46a1-bb47-fd85565ab957} void GetDescription ( D2D1_DRAWING_STATE_DESCRIPTION* stateDescription ) @@ -450,11 +450,11 @@ COM-INTERFACE: ID2D1DrawingStateBlock ID2D1Resource {28506e39-ebf6-46a1-bb47-fd8 void SetTextRenderingParams ( IDWriteRenderingParams* textRenderingParams ) void GetTextRenderingParams ( IDWriteRenderingParams** textRenderingParams ) ; -C-TYPE: IWICBitmapSource -C-TYPE: IWICBitmap -C-TYPE: IDWriteTextFormat -C-TYPE: IDWriteTextLayout -C-TYPE: DWRITE_GLYPH_RUN +c-type: IWICBitmapSource +c-type: IWICBitmap +c-type: IDWriteTextFormat +c-type: IDWriteTextLayout +c-type: DWRITE_GLYPH_RUN COM-INTERFACE: ID2D1RenderTarget ID2D1Resource {2cd90694-12e2-11dc-9fed-001143a055f9} HRESULT CreateBitmap ( D2D1_SIZE_U size, void* srcData, UINT32 pitch, D2D1_BITMAP_PROPERTIES* bitmapProperties, ID2D1Bitmap** bitmap ) diff --git a/ffi/windows/directx/d3d10/d3d10.factor b/ffi/windows/directx/d3d10/d3d10.factor index 14ef045659..dbfe2eb27c 100644 --- a/ffi/windows/directx/d3d10/d3d10.factor +++ b/ffi/windows/directx/d3d10/d3d10.factor @@ -382,7 +382,7 @@ STRUCT: D3D10_BOX { bottom UINT } { back UINT } ; -C-TYPE: ID3D10Device +c-type: ID3D10Device COM-INTERFACE: ID3D10DeviceChild IUnknown {9B7E4C00-342C-4106-A19F-4F2704F689F0} void GetDevice ( ID3D10Device** ppDevice ) HRESULT GetPrivateData ( LPGUID guid, UINT* pDataSize, void* pData ) diff --git a/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor b/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor index 48e01388e7..85cfc560cb 100644 --- a/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor +++ b/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor @@ -140,7 +140,7 @@ STRUCT: D3D10_SHADER_DEBUG_INFO { UintOffset UINT } { StringOffset UINT } ; -C-TYPE: ID3D10ShaderReflection1 +c-type: ID3D10ShaderReflection1 TYPEDEF: ID3D10ShaderReflection1* LPD3D10SHADERREFLECTION1 ; COM-INTERFACE: ID3D10ShaderReflection1 IUnknown {C3457783-A846-47CE-9520-CEA6F66E7447} diff --git a/ffi/windows/directx/d3d10effect/d3d10effect.factor b/ffi/windows/directx/d3d10effect/d3d10effect.factor index 33d322c924..e465689890 100644 --- a/ffi/windows/directx/d3d10effect/d3d10effect.factor +++ b/ffi/windows/directx/d3d10effect/d3d10effect.factor @@ -113,19 +113,19 @@ STRUCT: D3D10_EFFECT_VARIABLE_DESC { BufferOffset UINT } { ExplicitBindPoint UINT } ; -C-TYPE: ID3D10EffectConstantBuffer -C-TYPE: ID3D10EffectScalarVariable -C-TYPE: ID3D10EffectVectorVariable -C-TYPE: ID3D10EffectMatrixVariable -C-TYPE: ID3D10EffectStringVariable -C-TYPE: ID3D10EffectShaderResourceVariable -C-TYPE: ID3D10EffectRenderTargetViewVariable -C-TYPE: ID3D10EffectDepthStencilViewVariable -C-TYPE: ID3D10EffectShaderVariable -C-TYPE: ID3D10EffectBlendVariable -C-TYPE: ID3D10EffectDepthStencilVariable -C-TYPE: ID3D10EffectRasterizerVariable -C-TYPE: ID3D10EffectSamplerVariable +c-type: ID3D10EffectConstantBuffer +c-type: ID3D10EffectScalarVariable +c-type: ID3D10EffectVectorVariable +c-type: ID3D10EffectMatrixVariable +c-type: ID3D10EffectStringVariable +c-type: ID3D10EffectShaderResourceVariable +c-type: ID3D10EffectRenderTargetViewVariable +c-type: ID3D10EffectDepthStencilViewVariable +c-type: ID3D10EffectShaderVariable +c-type: ID3D10EffectBlendVariable +c-type: ID3D10EffectDepthStencilVariable +c-type: ID3D10EffectRasterizerVariable +c-type: ID3D10EffectSamplerVariable COM-INTERFACE: ID3D10EffectVariable f {AE897105-00E6-45bf-BB8E-281DD6DB8E1B} BOOL IsValid ( ) diff --git a/ffi/windows/directx/d3d10misc/d3d10misc.factor b/ffi/windows/directx/d3d10misc/d3d10misc.factor index bd9972783f..16e46ef5c4 100644 --- a/ffi/windows/directx/d3d10misc/d3d10misc.factor +++ b/ffi/windows/directx/d3d10misc/d3d10misc.factor @@ -5,7 +5,7 @@ in: windows.directx.d3d10misc LIBRARY: d3d10 -C-TYPE: ID3D10Blob +c-type: ID3D10Blob TYPEDEF: ID3D10Blob* LPD3D10BLOB ; COM-INTERFACE: ID3D10Blob IUnknown {8BA5FB08-5195-40e2-AC58-0D989C3A0102} diff --git a/ffi/windows/directx/d3d11/d3d11.factor b/ffi/windows/directx/d3d11/d3d11.factor index 3ef293cc28..fc81e11e1d 100644 --- a/ffi/windows/directx/d3d11/d3d11.factor +++ b/ffi/windows/directx/d3d11/d3d11.factor @@ -635,8 +635,8 @@ STRUCT: D3D11_BOX { bottom UINT } { back UINT } ; -C-TYPE: ID3D11Device -C-TYPE: ID3D11ClassLinkage +c-type: ID3D11Device +c-type: ID3D11ClassLinkage COM-INTERFACE: ID3D11DeviceChild IUnknown {1841e5c8-16b0-489b-bcc8-44cfb0d5deae} void GetDevice ( ID3D11Device** ppDevice ) diff --git a/ffi/windows/directx/d3d11shader/d3d11shader.factor b/ffi/windows/directx/d3d11shader/d3d11shader.factor index 4c3dcbc437..1130a26c6b 100644 --- a/ffi/windows/directx/d3d11shader/d3d11shader.factor +++ b/ffi/windows/directx/d3d11shader/d3d11shader.factor @@ -152,8 +152,8 @@ COM-INTERFACE: ID3D11ShaderReflectionType f {6E6FFA6A-9BAE-4613-A51E-91652D508C2 HRESULT IsOfType ( ID3D11ShaderReflectionType* pType ) HRESULT ImplementsInterface ( ID3D11ShaderReflectionType* pBase ) ; -C-TYPE: ID3D11ShaderReflectionType -C-TYPE: ID3D11ShaderReflectionConstantBuffer +c-type: ID3D11ShaderReflectionType +c-type: ID3D11ShaderReflectionConstantBuffer COM-INTERFACE: ID3D11ShaderReflectionVariable f {51F23923-F3E5-4BD1-91CB-606177D8DB4C} HRESULT GetDesc ( D3D11_SHADER_VARIABLE_DESC* pDesc ) diff --git a/ffi/windows/directx/d3d9/d3d9.factor b/ffi/windows/directx/d3d9/d3d9.factor index e4cb626158..932c457f12 100644 --- a/ffi/windows/directx/d3d9/d3d9.factor +++ b/ffi/windows/directx/d3d9/d3d9.factor @@ -10,7 +10,7 @@ CONSTANT: DIRECT3D_VERSION 0x0900 ; CONSTANT: D3D_SDK_VERSION 32 ; CONSTANT: D3D9b_SDK_VERSION 31 ; -C-TYPE: IDirect3D9 +c-type: IDirect3D9 FUNCTION: IDirect3D9* Direct3DCreate9 ( UINT SDKVersion ) ; @@ -23,7 +23,7 @@ FUNCTION: BOOL D3DPERF_QueryRepeatFrame ( ) ; FUNCTION: void D3DPERF_SetOptions ( DWORD dwOptions ) ; FUNCTION: DWORD D3DPERF_GetStatus ( ) ; -C-TYPE: IDirect3DDevice9 +c-type: IDirect3DDevice9 COM-INTERFACE: IDirect3D9 IUnknown {81BDCBCA-64D4-426d-AE8D-AD0147F4275C} HRESULT RegisterSoftwareDevice ( void* pInitializeFunction ) @@ -44,26 +44,26 @@ COM-INTERFACE: IDirect3D9 IUnknown {81BDCBCA-64D4-426d-AE8D-AD0147F4275C} TYPEDEF: IDirect3D9* LPDIRECT3D9 ; TYPEDEF: IDirect3D9* PDIRECT3D9 ; -C-TYPE: IDirect3DSurface9 -C-TYPE: RGNDATA -C-TYPE: IDirect3DBaseTexture9 -C-TYPE: PALETTEENTRY -C-TYPE: IDirect3DVertexBuffer9 -C-TYPE: IDirect3DVertexDeclaration9 -C-TYPE: IDirect3DVertexShader9 -C-TYPE: IDirect3DIndexBuffer9 -C-TYPE: IDirect3DPixelShader9 -C-TYPE: IDirect3DSwapChain9 -C-TYPE: IDirect3DTexture9 -C-TYPE: IDirect3DVolumeTexture9 -C-TYPE: IDirect3DCubeTexture9 -C-TYPE: IDirect3DStateBlock9 -C-TYPE: IDirect3DQuery9 -C-TYPE: IDirect3DVolume9 -C-TYPE: IDirect3D9Ex -C-TYPE: IDirect3DDevice9Ex -C-TYPE: IDirect3DAuthenticatedChannel9 -C-TYPE: IDirect3DCryptoSession9 +c-type: IDirect3DSurface9 +c-type: RGNDATA +c-type: IDirect3DBaseTexture9 +c-type: PALETTEENTRY +c-type: IDirect3DVertexBuffer9 +c-type: IDirect3DVertexDeclaration9 +c-type: IDirect3DVertexShader9 +c-type: IDirect3DIndexBuffer9 +c-type: IDirect3DPixelShader9 +c-type: IDirect3DSwapChain9 +c-type: IDirect3DTexture9 +c-type: IDirect3DVolumeTexture9 +c-type: IDirect3DCubeTexture9 +c-type: IDirect3DStateBlock9 +c-type: IDirect3DQuery9 +c-type: IDirect3DVolume9 +c-type: IDirect3D9Ex +c-type: IDirect3DDevice9Ex +c-type: IDirect3DAuthenticatedChannel9 +c-type: IDirect3DCryptoSession9 COM-INTERFACE: IDirect3DDevice9 IUnknown {D0223B96-BF7A-43fd-92BD-A43B0D82B9EB} HRESULT TestCooperativeLevel ( ) diff --git a/ffi/windows/directx/d3dcompiler/d3dcompiler.factor b/ffi/windows/directx/d3dcompiler/d3dcompiler.factor index b167185d5a..6090153489 100644 --- a/ffi/windows/directx/d3dcompiler/d3dcompiler.factor +++ b/ffi/windows/directx/d3dcompiler/d3dcompiler.factor @@ -3,12 +3,12 @@ in: windows.directx.d3dcompiler LIBRARY: d3dcompiler -C-TYPE: D3D_SHADER_MACRO -C-TYPE: ID3DBlob +c-type: D3D_SHADER_MACRO +c-type: ID3DBlob TYPEDEF: ID3DBlob* LPD3DBLOB ; -C-TYPE: ID3DInclude +c-type: ID3DInclude TYPEDEF: ID3DInclude* LPD3DINCLUDE ; -C-TYPE: ID3D10Effect +c-type: ID3D10Effect FUNCTION: HRESULT D3DCompile ( LPCVOID pSrcData, diff --git a/ffi/windows/directx/d3dx10async/d3dx10async.factor b/ffi/windows/directx/d3dx10async/d3dx10async.factor index 531fde9362..b8fa64c3e6 100644 --- a/ffi/windows/directx/d3dx10async/d3dx10async.factor +++ b/ffi/windows/directx/d3dx10async/d3dx10async.factor @@ -5,11 +5,11 @@ in: windows.directx.d3dx10async LIBRARY: d3dx10 -C-TYPE: ID3DX10ThreadPump -C-TYPE: ID3D10EffectPool -C-TYPE: D3DX10_IMAGE_LOAD_INFO -C-TYPE: D3DX10_IMAGE_INFO -C-TYPE: ID3D10Effect +c-type: ID3DX10ThreadPump +c-type: ID3D10EffectPool +c-type: D3DX10_IMAGE_LOAD_INFO +c-type: D3DX10_IMAGE_INFO +c-type: ID3D10Effect FUNCTION: HRESULT D3DX10CompileFromFileA ( LPCSTR pSrcFile, D3D10_SHADER_MACRO* pDefines, LPD3D10INCLUDE pInclude, LPCSTR pFunctionName, LPCSTR pProfile, UINT Flags1, UINT Flags2, ID3DX10ThreadPump* pPump, ID3D10Blob** ppShader, ID3D10Blob** ppErrorMsgs, HRESULT* pHResult ) diff --git a/ffi/windows/directx/d3dx10core/d3dx10core.factor b/ffi/windows/directx/d3dx10core/d3dx10core.factor index cd5495e81e..e1b6f2a81a 100644 --- a/ffi/windows/directx/d3dx10core/d3dx10core.factor +++ b/ffi/windows/directx/d3dx10core/d3dx10core.factor @@ -24,7 +24,7 @@ FUNCTION: HRESULT D3DX10CreateDeviceAndSwapChain ( IDXGISwapChain** ppSwapChain, ID3D10Device** ppDevice ) -C-TYPE: ID3D10Device1 +c-type: ID3D10Device1 FUNCTION: HRESULT D3DX10GetFeatureLevel1 ( ID3D10Device* pDevice, ID3D10Device1** ppDevice1 ) ; @@ -45,7 +45,7 @@ STRUCT: D3DX10_SPRITE { pTexture ID3D10ShaderResourceView* } { TextureIndex UINT } ; -C-TYPE: ID3DX10Sprite +c-type: ID3DX10Sprite TYPEDEF: ID3DX10Sprite* LPD3DX10SPRITE ; COM-INTERFACE: ID3DX10Sprite IUnknown {BA0B762D-8D28-43ec-B9DC-2F84443B0614} @@ -115,8 +115,8 @@ TYPEDEF: D3DX10_FONT_DESCW* LPD3DX10_FONT_DESCW ; TYPEDEF: D3DX10_FONT_DESCW D3DX10_FONT_DESC ; TYPEDEF: LPD3DX10_FONT_DESCW LPD3DX10_FONT_DESC ; -C-TYPE: TEXTMETRICA -C-TYPE: TEXTMETRICW +c-type: TEXTMETRICA +c-type: TEXTMETRICW COM-INTERFACE: ID3DX10Font IUnknown {D79DBB70-5F21-4d36-BBC2-FF525C213CDC} HRESULT GetDevice ( ID3D10Device** ppDevice ) diff --git a/ffi/windows/directx/d3dx9anim/d3dx9anim.factor b/ffi/windows/directx/d3dx9anim/d3dx9anim.factor index c979b4204a..b1e4b8127f 100644 --- a/ffi/windows/directx/d3dx9anim/d3dx9anim.factor +++ b/ffi/windows/directx/d3dx9anim/d3dx9anim.factor @@ -37,7 +37,7 @@ STRUCT: D3DXFRAME { pFrameFirstChild D3DXFRAME* } ; TYPEDEF: D3DXFRAME* LPD3DXFRAME ; -C-TYPE: ID3DXAllocateHierarchy +c-type: ID3DXAllocateHierarchy TYPEDEF: ID3DXAllocateHierarchy* LPD3DXALLOCATEHIERARCHY ; COM-INTERFACE: ID3DXAllocateHierarchy f {00000000-0000-0000-0000-000000000000} @@ -54,7 +54,7 @@ COM-INTERFACE: ID3DXAllocateHierarchy f {00000000-0000-0000-0000-000000000000} HRESULT DestroyFrame ( LPD3DXFRAME pFrameToFree ) HRESULT DestroyMeshContainer ( LPD3DXMESHCONTAINER pMeshContainerToFree ) ; -C-TYPE: ID3DXLoadUserData +c-type: ID3DXLoadUserData TYPEDEF: ID3DXLoadUserData* LPD3DXLOADUSERDATA ; COM-INTERFACE: ID3DXLoadUserData f {00000000-0000-0000-0000-000000000000} @@ -64,7 +64,7 @@ COM-INTERFACE: ID3DXLoadUserData f {00000000-0000-0000-0000-000000000000} HRESULT LoadMeshChildData ( LPD3DXMESHCONTAINER pMeshContainer, LPD3DXFILEDATA pXofChildData ) ; -C-TYPE: ID3DXSaveUserData +c-type: ID3DXSaveUserData TYPEDEF: ID3DXSaveUserData* LPD3DXSAVEUSERDATA ; COM-INTERFACE: ID3DXSaveUserData f {00000000-0000-0000-0000-000000000000} @@ -87,7 +87,7 @@ CONSTANT: D3DXCALLBACK_SEARCH_EXCLUDING_INITIAL_POSITION 1 ; CONSTANT: D3DXCALLBACK_SEARCH_BEHIND_INITIAL_POSITION 2 ; CONSTANT: D3DXCALLBACK_SEARCH_FORCE_DWORD 0x7fffffff ; -C-TYPE: ID3DXAnimationSet +c-type: ID3DXAnimationSet TYPEDEF: ID3DXAnimationSet* LPD3DXANIMATIONSET ; COM-INTERFACE: ID3DXAnimationSet IUnknown {698CFB3F-9289-4d95-9A57-33A94B5A65F9} @@ -134,7 +134,7 @@ TYPEDEF: int D3DXCOMPRESSION_FLAGS ; CONSTANT: D3DXCOMPRESS_DEFAULT 0 ; CONSTANT: D3DXCOMPRESS_FORCE_DWORD 0x7fffffff ; -C-TYPE: ID3DXKeyframedAnimationSet +c-type: ID3DXKeyframedAnimationSet TYPEDEF: ID3DXKeyframedAnimationSet* LPD3DXKEYFRAMEDANIMATIONSET ; COM-INTERFACE: ID3DXKeyframedAnimationSet ID3DXAnimationSet {FA4E8E3A-9786-407d-8B4C-5995893764AF} @@ -175,7 +175,7 @@ COM-INTERFACE: ID3DXKeyframedAnimationSet ID3DXAnimationSet {FA4E8E3A-9786-407d- LPD3DXBUFFER* ppCompressedData ) HRESULT UnregisterAnimation ( UINT Index ) ; -C-TYPE: ID3DXCompressedAnimationSet +c-type: ID3DXCompressedAnimationSet TYPEDEF: ID3DXCompressedAnimationSet* LPD3DXCOMPRESSEDANIMATIONSET ; COM-INTERFACE: ID3DXCompressedAnimationSet ID3DXAnimationSet {6CC2480D-3808-4739-9F88-DE49FACD8D4C} @@ -228,13 +228,13 @@ TYPEDEF: D3DXEVENT_DESC* LPD3DXEVENT_DESC ; TYPEDEF: DWORD D3DXEVENTHANDLE ; TYPEDEF: D3DXEVENTHANDLE* LPD3DXEVENTHANDLE ; -C-TYPE: ID3DXAnimationCallbackHandler +c-type: ID3DXAnimationCallbackHandler TYPEDEF: ID3DXAnimationCallbackHandler* LPD3DXANIMATIONCALLBACKHANDLER ; COM-INTERFACE: ID3DXAnimationCallbackHandler f {00000000-0000-0000-0000-000000000000} HRESULT HandleCallback ( UINT Track, LPVOID pCallbackData ) ; -C-TYPE: ID3DXAnimationController +c-type: ID3DXAnimationController TYPEDEF: ID3DXAnimationController* LPD3DXANIMATIONCONTROLLER ; COM-INTERFACE: ID3DXAnimationController IUnknown {AC8948EC-F86D-43e2-96DE-31FC35F96D9E} diff --git a/ffi/windows/directx/d3dx9core/d3dx9core.factor b/ffi/windows/directx/d3dx9core/d3dx9core.factor index c5dc25dc23..21cf596f95 100644 --- a/ffi/windows/directx/d3dx9core/d3dx9core.factor +++ b/ffi/windows/directx/d3dx9core/d3dx9core.factor @@ -12,7 +12,7 @@ FUNCTION: BOOL D3DXCheckVersion ( UINT D3DSdkVersion, UINT D3DXSdkVersion ) ; FUNCTION: BOOL D3DXDebugMute ( BOOL Mute ) ; FUNCTION: UINT D3DXGetDriverLevel ( LPDIRECT3DDEVICE9 pDevice ) ; -C-TYPE: ID3DXBuffer +c-type: ID3DXBuffer TYPEDEF: ID3DXBuffer* LPD3DXBUFFER ; COM-INTERFACE: ID3DXBuffer IUnknown {8BA5FB08-5195-40e2-AC58-0D989C3A0102} @@ -29,7 +29,7 @@ CONSTANT: D3DXSPRITE_SORT_DEPTH_FRONTTOBACK 64 ; CONSTANT: D3DXSPRITE_SORT_DEPTH_BACKTOFRONT 128 ; CONSTANT: D3DXSPRITE_DO_NOT_ADDREF_TEXTURE 256 ; -C-TYPE: ID3DXSprite +c-type: ID3DXSprite TYPEDEF: ID3DXSprite* LPD3DXSPRITE ; COM-INTERFACE: ID3DXSprite IUnknown {BA0B762D-7D28-43ec-B9DC-2F84443B0614} @@ -79,10 +79,10 @@ TYPEDEF: D3DXFONT_DESCW* LPD3DXFONT_DESCW ; TYPEDEF: D3DXFONT_DESCW D3DXFONT_DESC ; TYPEDEF: LPD3DXFONT_DESCW LPD3DXFONT_DESC ; -C-TYPE: ID3DXFont +c-type: ID3DXFont TYPEDEF: ID3DXFont* LPD3DXFONT ; -C-TYPE: TEXTMETRICA -C-TYPE: TEXTMETRICW +c-type: TEXTMETRICA +c-type: TEXTMETRICW COM-INTERFACE: ID3DXFont IUnknown {D79DBB70-5F21-4d36-BBC2-FF525C213CDC} HRESULT GetDevice ( LPDIRECT3DDEVICE9* ppDevice ) @@ -155,7 +155,7 @@ STRUCT: D3DXRTS_DESC { DepthStencilFormat D3DFORMAT } ; TYPEDEF: D3DXRTS_DESC* LPD3DXRTS_DESC ; -C-TYPE: ID3DXRenderToSurface +c-type: ID3DXRenderToSurface TYPEDEF: ID3DXRenderToSurface* LPD3DXRENDERTOSURFACE ; COM-INTERFACE: ID3DXRenderToSurface IUnknown {6985F346-2C3D-43b3-BE8B-DAAE8A03D894} @@ -184,7 +184,7 @@ STRUCT: D3DXRTE_DESC { DepthStencilFormat D3DFORMAT } ; TYPEDEF: D3DXRTE_DESC* LPD3DXRTE_DESC ; -C-TYPE: ID3DXRenderToEnvMap +c-type: ID3DXRenderToEnvMap TYPEDEF: ID3DXRenderToEnvMap* LPD3DXRenderToEnvMap ; COM-INTERFACE: ID3DXRenderToEnvMap IUnknown {313F1B4B-C7B0-4fa2-9D9D-8D380B64385E} @@ -209,7 +209,7 @@ FUNCTION: HRESULT D3DFORMAT DepthStencilFormat, LPD3DXRenderToEnvMap* ppRenderToEnvMap ) -C-TYPE: ID3DXLine +c-type: ID3DXLine TYPEDEF: ID3DXLine* LPD3DXLINE ; COM-INTERFACE: ID3DXLine IUnknown {D379BA7F-9042-4ac4-9F5E-58192A4C6BD8} HRESULT GetDevice ( LPDIRECT3DDEVICE9* ppDevice ) diff --git a/ffi/windows/directx/d3dx9effect/d3dx9effect.factor b/ffi/windows/directx/d3dx9effect/d3dx9effect.factor index 9318c466b3..80dae03820 100644 --- a/ffi/windows/directx/d3dx9effect/d3dx9effect.factor +++ b/ffi/windows/directx/d3dx9effect/d3dx9effect.factor @@ -52,12 +52,12 @@ STRUCT: D3DXFUNCTION_DESC { Name LPCSTR } { Annotations UINT } ; -C-TYPE: ID3DXEffectPool +c-type: ID3DXEffectPool TYPEDEF: ID3DXEffectPool* LPD3DXEFFECTPOOL ; COM-INTERFACE: ID3DXEffectPool IUnknown {9537AB04-3250-412e-8213-FCD2F8677933} ; -C-TYPE: ID3DXBaseEffect +c-type: ID3DXBaseEffect TYPEDEF: ID3DXBaseEffect* LPD3DXBASEEFFECT ; COM-INTERFACE: ID3DXBaseEffect IUnknown {017C18AC-103F-4417-8C51-6BF6EF1E56BE} @@ -116,7 +116,7 @@ COM-INTERFACE: ID3DXBaseEffect IUnknown {017C18AC-103F-4417-8C51-6BF6EF1E56BE} HRESULT GetVertexShader ( D3DXHANDLE hParameter, LPDIRECT3DVERTEXSHADER9* ppVShader ) HRESULT SetArrayRange ( D3DXHANDLE hParameter, UINT uStart, UINT uEnd ) ; -C-TYPE: ID3DXEffectStateManager +c-type: ID3DXEffectStateManager TYPEDEF: ID3DXEffectStateManager* LPD3DXEFFECTSTATEMANAGER ; COM-INTERFACE: ID3DXEffectStateManager IUnknown {79AAB587-6DBC-4fa7-82DE-37FA1781C5CE} @@ -139,7 +139,7 @@ COM-INTERFACE: ID3DXEffectStateManager IUnknown {79AAB587-6DBC-4fa7-82DE-37FA178 HRESULT SetPixelShaderConstantI ( UINT RegisterIndex, INT* pConstantData, UINT RegisterCount ) HRESULT SetPixelShaderConstantB ( UINT RegisterIndex, BOOL* pConstantData, UINT RegisterCount ) ; -C-TYPE: ID3DXEffect +c-type: ID3DXEffect TYPEDEF: ID3DXEffect* LPD3DXEFFECT ; COM-INTERFACE: ID3DXEffect ID3DXBaseEffect {F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD5} @@ -166,7 +166,7 @@ COM-INTERFACE: ID3DXEffect ID3DXBaseEffect {F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD5 HRESULT CloneEffect ( LPDIRECT3DDEVICE9 pDevice, LPD3DXEFFECT* ppEffect ) HRESULT SetRawValue ( D3DXHANDLE hParameter, LPCVOID pData, UINT ByteOffset, UINT Bytes ) ; -C-TYPE: ID3DXEffectCompiler +c-type: ID3DXEffectCompiler TYPEDEF: ID3DXEffectCompiler* LPD3DXEFFECTCOMPILER ; COM-INTERFACE: ID3DXEffectCompiler ID3DXBaseEffect {51B8A949-1A31-47e6-BEA0-4B30DB53F1E0} diff --git a/ffi/windows/directx/d3dx9math/d3dx9math.factor b/ffi/windows/directx/d3dx9math/d3dx9math.factor index 1c594a0d63..a2a0a31bc9 100644 --- a/ffi/windows/directx/d3dx9math/d3dx9math.factor +++ b/ffi/windows/directx/d3dx9math/d3dx9math.factor @@ -85,7 +85,7 @@ STRUCT: D3DXCOLOR { a FLOAT } ; TYPEDEF: D3DXCOLOR* LPD3DXCOLOR ; -C-TYPE: ID3DXMatrixStack +c-type: ID3DXMatrixStack TYPEDEF: ID3DXMatrixStack* LPD3DXMATRIXSTACK ; COM-INTERFACE: ID3DXMatrixStack IUnknown {C7885BA7-F990-4fe7-922D-8515E477DD85} diff --git a/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor b/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor index 8fd695bd60..b19a1fa190 100644 --- a/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor +++ b/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor @@ -76,21 +76,21 @@ CONSTANT: D3DXUVATLAS_DEFAULT 0x00 ; CONSTANT: D3DXUVATLAS_GEODESIC_FAST 0x01 ; CONSTANT: D3DXUVATLAS_GEODESIC_QUALITY 0x02 ; -C-TYPE: ID3DXBaseMesh +c-type: ID3DXBaseMesh TYPEDEF: ID3DXBaseMesh* LPD3DXBASEMESH ; -C-TYPE: ID3DXMesh +c-type: ID3DXMesh TYPEDEF: ID3DXMesh* LPD3DXMESH ; -C-TYPE: ID3DXPMesh +c-type: ID3DXPMesh TYPEDEF: ID3DXPMesh* LPD3DXPMESH ; -C-TYPE: ID3DXSPMesh +c-type: ID3DXSPMesh TYPEDEF: ID3DXSPMesh* LPD3DXSPMESH ; -C-TYPE: ID3DXSkinInfo +c-type: ID3DXSkinInfo TYPEDEF: ID3DXSkinInfo* LPD3DXSKININFO ; -C-TYPE: ID3DXPatchMesh +c-type: ID3DXPatchMesh TYPEDEF: ID3DXPatchMesh* LPD3DXPATCHMESH ; -C-TYPE: ID3DXTextureGutterHelper +c-type: ID3DXTextureGutterHelper TYPEDEF: ID3DXTextureGutterHelper* LPD3DXTEXTUREGUTTERHELPER ; -C-TYPE: ID3DXPRTBuffer +c-type: ID3DXPRTBuffer TYPEDEF: ID3DXPRTBuffer* LPD3DXPRTBUFFER ; STRUCT: D3DXATTRIBUTERANGE @@ -177,7 +177,7 @@ COM-INTERFACE: ID3DXBaseMesh IUnknown {7ED943DD-52E8-40b5-A8D8-76685C406330} HRESULT GenerateAdjacency ( FLOAT Epsilon, DWORD* pAdjacency ) HRESULT UpdateSemantics ( D3DVERTEXELEMENT9* Declaration ) ; -C-TYPE: IStream +c-type: IStream COM-INTERFACE: ID3DXMesh ID3DXBaseMesh {4020E5C2-1403-4929-883F-E2E849FAC195} HRESULT LockAttributeBuffer ( DWORD Flags, DWORD** ppData ) @@ -761,7 +761,7 @@ FUNCTION: HRESULT D3DXComputeTangent ( DWORD Wrap, DWORD* pAdjacency ) -C-TYPE: D3DXUVATLASCB +c-type: D3DXUVATLASCB TYPEDEF: D3DXUVATLASCB* LPD3DXUVATLASCB ; FUNCTION: HRESULT D3DXUVAtlasCreate ( @@ -933,8 +933,8 @@ STRUCT: D3DXSHPRTSPLITMESHCLUSTERDATA TYPEDEF: void* LPD3DXSHPRTSIMCB ; -C-TYPE: ID3DXTextureGutterHelper -C-TYPE: ID3DXPRTBuffer +c-type: ID3DXTextureGutterHelper +c-type: ID3DXPRTBuffer COM-INTERFACE: ID3DXPRTBuffer IUnknown {F1827E47-00A8-49cd-908C-9D11955F8728} UINT GetNumSamples ( ) @@ -956,7 +956,7 @@ COM-INTERFACE: ID3DXPRTBuffer IUnknown {F1827E47-00A8-49cd-908C-9D11955F8728} HRESULT ExtractToMesh ( UINT NumCoefficients, D3DDECLUSAGE Usage, UINT UsageIndexStart, LPD3DXMESH pScene ) ; -C-TYPE: ID3DXPRTCompBuffer +c-type: ID3DXPRTCompBuffer TYPEDEF: ID3DXPRTCompBuffer* LPD3DXPRTCOMPBUFFER; ; COM-INTERFACE: ID3DXPRTCompBuffer IUnknown {A758D465-FE8D-45ad-9CF0-D01E56266A07} @@ -998,7 +998,7 @@ COM-INTERFACE: ID3DXTextureGutterHelper IUnknown {838F01EC-9729-4527-AADB-DF70AD HRESULT SetTexelMap ( D3DXVECTOR2* pTexelData ) HRESULT SetGutterMap ( BYTE* pGutterData ) ; -C-TYPE: ID3DXPRTEngine +c-type: ID3DXPRTEngine TYPEDEF: ID3DXPRTEngine* LPD3DXPRTENGINE ; COM-INTERFACE: ID3DXPRTEngine IUnknown {683A4278-CD5F-4d24-90AD-C4E1B6855D53} @@ -1126,7 +1126,7 @@ FUNCTION: HRESULT ALIAS: D3DXSavePRTBufferToFile D3DXSavePRTBufferToFileW ; -C-TYPE: D3DXPRTCOMPBUFFER +c-type: D3DXPRTCOMPBUFFER TYPEDEF: D3DXPRTCOMPBUFFER* LPD3DXPRTCOMPBUFFER ; FUNCTION: HRESULT diff --git a/ffi/windows/directx/d3dx9shader/d3dx9shader.factor b/ffi/windows/directx/d3dx9shader/d3dx9shader.factor index 871d4d65ac..c959b596a3 100644 --- a/ffi/windows/directx/d3dx9shader/d3dx9shader.factor +++ b/ffi/windows/directx/d3dx9shader/d3dx9shader.factor @@ -101,7 +101,7 @@ STRUCT: D3DXCONSTANT_DESC { DefaultValue LPCVOID } ; TYPEDEF: D3DXCONSTANT_DESC* LPD3DXCONSTANT_DESC ; -C-TYPE: ID3DXConstantTable +c-type: ID3DXConstantTable TYPEDEF: ID3DXConstantTable* LPD3DXCONSTANTTABLE ; COM-INTERFACE: ID3DXConstantTable IUnknown {AB3C758F-093E-4356-B762-4DB18F1B3A01} @@ -130,7 +130,7 @@ COM-INTERFACE: ID3DXConstantTable IUnknown {AB3C758F-093E-4356-B762-4DB18F1B3A01 HRESULT SetMatrixTransposeArray ( LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, D3DXMATRIX* pMatrix, UINT Count ) HRESULT SetMatrixTransposePointerArray ( LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, D3DXMATRIX** ppMatrix, UINT Count ) ; -C-TYPE: ID3DXTextureShader +c-type: ID3DXTextureShader TYPEDEF: ID3DXTextureShader* LPD3DXTEXTURESHADER ; COM-INTERFACE: ID3DXTextureShader IUnknown {3E3D67F8-AA7A-405d-A857-BA01D4758426} @@ -163,7 +163,7 @@ ENUM: D3DXINCLUDE_TYPE D3DXINC_SYSTEM ; TYPEDEF: D3DXINCLUDE_TYPE* LPD3DXINCLUDE_TYPE ; -C-TYPE: ID3DXInclude +c-type: ID3DXInclude TYPEDEF: ID3DXInclude* LPD3DXINCLUDE ; COM-INTERFACE: ID3DXInclude f {00000000-0000-0000-0000-000000000000} diff --git a/ffi/windows/directx/d3dx9xof/d3dx9xof.factor b/ffi/windows/directx/d3dx9xof/d3dx9xof.factor index ec3fd509df..b614aa5506 100644 --- a/ffi/windows/directx/d3dx9xof/d3dx9xof.factor +++ b/ffi/windows/directx/d3dx9xof/d3dx9xof.factor @@ -31,11 +31,11 @@ STRUCT: D3DXF_FILELOADMEMORY { lpMemory LPCVOID } { dSize SIZE_T } ; -C-TYPE: ID3DXFile -C-TYPE: ID3DXFileSaveObject -C-TYPE: ID3DXFileSaveData -C-TYPE: ID3DXFileEnumObject -C-TYPE: ID3DXFileData +c-type: ID3DXFile +c-type: ID3DXFileSaveObject +c-type: ID3DXFileSaveData +c-type: ID3DXFileEnumObject +c-type: ID3DXFileData TYPEDEF: ID3DXFile* LPD3DXFILE ; TYPEDEF: ID3DXFile** LPLPD3DXFILE ; diff --git a/ffi/windows/directx/dwrite/dwrite.factor b/ffi/windows/directx/dwrite/dwrite.factor index 66d4781205..a66879a296 100755 --- a/ffi/windows/directx/dwrite/dwrite.factor +++ b/ffi/windows/directx/dwrite/dwrite.factor @@ -112,7 +112,7 @@ ENUM: DWRITE_FACTORY_TYPE DWRITE_FACTORY_TYPE_SHARED DWRITE_FACTORY_TYPE_ISOLATED ; -C-TYPE: IDWriteFontFileStream +c-type: IDWriteFontFileStream COM-INTERFACE: IDWriteFontFileLoader IUnknown {727cad4e-d6af-4c9e-8a08-d695b11caa49} HRESULT CreateStreamFromKey ( void* fontFileReferenceKey, UINT32 fontFileReferenceKeySize, IDWriteFontFileStream** fontFileStream ) ; @@ -162,7 +162,7 @@ COM-INTERFACE: IDWriteRenderingParams IUnknown {2f0da53a-2add-47cd-82ee-d9ec3468 DWRITE_PIXEL_GEOMETRY GetPixelGeometry ( ) DWRITE_RENDERING_MODE GetRenderingMode ( ) ; -C-TYPE: ID2D1SimplifiedGeometrySink +c-type: ID2D1SimplifiedGeometrySink TYPEDEF: ID2D1SimplifiedGeometrySink IDWriteGeometrySink ; @@ -183,8 +183,8 @@ COM-INTERFACE: IDWriteFontFace IUnknown {5f49804d-7024-4d43-bfa9-d25984f53849} HRESULT GetGdiCompatibleMetrics ( FLOAT emSize, FLOAT pixelsPerDip, DWRITE_MATRIX* transform, DWRITE_FONT_METRICS* fontFaceMetrics ) HRESULT GetGdiCompatibleGlyphMetrics ( FLOAT emSize, FLOAT pixelsPerDip, DWRITE_MATRIX* transform, BOOL useGdiNatural, USHORT* glyphIndices, UINT32 glyphCount, DWRITE_GLYPH_METRICS* glyphMetrics, BOOL isSideways ) ; -C-TYPE: IDWriteFactory -C-TYPE: IDWriteFontFileEnumerator +c-type: IDWriteFactory +c-type: IDWriteFontFileEnumerator COM-INTERFACE: IDWriteFontCollectionLoader IUnknown {cca920e4-52f0-492b-bfa8-29c72ee0a468} HRESULT CreateEnumeratorFromKey ( IDWriteFactory* factory, void* collectionKey, UINT32 collectionKeySize, IDWriteFontFileEnumerator** fontFileEnumerator ) ; @@ -201,8 +201,8 @@ COM-INTERFACE: IDWriteLocalizedStrings IUnknown {08256209-099a-4b34-b86d-c22b110 HRESULT GetStringLength ( UINT32 index, UINT32* length ) HRESULT GetString ( UINT32 index, WCHAR* stringBuffer, UINT32 size ) ; -C-TYPE: IDWriteFontFamily -C-TYPE: IDWriteFont +c-type: IDWriteFontFamily +c-type: IDWriteFont COM-INTERFACE: IDWriteFontCollection IUnknown {a84cee02-3eea-4eee-a827-87c1a02a0fcc} UINT32 GetFontFamilyCount ( ) @@ -361,8 +361,8 @@ STRUCT: DWRITE_TRIMMING { delimiter UINT32 } { delimiterCount UINT32 } ; -C-TYPE: IDWriteTypography -C-TYPE: IDWriteInlineObject +c-type: IDWriteTypography +c-type: IDWriteInlineObject COM-INTERFACE: IDWriteTextFormat IUnknown {9c906818-31d7-4fd3-a151-7c5e225db55a} HRESULT SetTextAlignment ( DWRITE_TEXT_ALIGNMENT textAlignment ) @@ -533,7 +533,7 @@ STRUCT: DWRITE_HIT_TEST_METRICS { isText BOOL } { isTrimmed BOOL } ; -C-TYPE: IDWriteTextRenderer +c-type: IDWriteTextRenderer COM-INTERFACE: IDWriteInlineObject IUnknown {8339FDE3-106F-47ab-8373-1C6295EB10B3} HRESULT Draw ( void* clientDrawingContext, IDWriteTextRenderer* renderer, FLOAT originX, FLOAT originY, BOOL isSideways, BOOL isRightToLeft, IUnknown* clientDrawingEffect ) @@ -603,7 +603,7 @@ COM-INTERFACE: IDWriteBitmapRenderTarget IUnknown {5e5a32a3-8dff-4773-9ff6-0696e HRESULT GetSize ( SIZE* size ) HRESULT Resize ( UINT32 width, UINT32 height ) ; -C-TYPE: LOGFONTW +c-type: LOGFONTW COM-INTERFACE: IDWriteGdiInterop IUnknown {1edd9491-9853-4299-898f-6432983b6f3a} HRESULT CreateFontFromLOGFONT ( LOGFONTW* logFont, IDWriteFont** font ) diff --git a/ffi/windows/directx/dxfile/dxfile.factor b/ffi/windows/directx/dxfile/dxfile.factor index f675922ac8..f3d3006bcd 100755 --- a/ffi/windows/directx/dxfile/dxfile.factor +++ b/ffi/windows/directx/dxfile/dxfile.factor @@ -29,25 +29,25 @@ STRUCT: DXFILELOADMEMORY { dSize DWORD } ; TYPEDEF: DXFILELOADMEMORY* LPDXFILELOADMEMORY ; -C-TYPE: IDirectXFile +c-type: IDirectXFile TYPEDEF: IDirectXFile* LPDIRECTXFILE ; TYPEDEF: IDirectXFile** LPLPDIRECTXFILE ; -C-TYPE: IDirectXFileEnumObject +c-type: IDirectXFileEnumObject TYPEDEF: IDirectXFileEnumObject* LPDIRECTXFILEENUMOBJECT ; TYPEDEF: IDirectXFileEnumObject** LPLPDIRECTXFILEENUMOBJECT ; -C-TYPE: IDirectXFileSaveObject +c-type: IDirectXFileSaveObject TYPEDEF: IDirectXFileSaveObject* LPDIRECTXFILESAVEOBJECT ; TYPEDEF: IDirectXFileSaveObject** LPLPDIRECTXFILESAVEOBJECT ; -C-TYPE: IDirectXFileObject +c-type: IDirectXFileObject TYPEDEF: IDirectXFileObject* LPDIRECTXFILEOBJECT ; TYPEDEF: IDirectXFileObject** LPLPDIRECTXFILEOBJECT ; -C-TYPE: IDirectXFileData +c-type: IDirectXFileData TYPEDEF: IDirectXFileData* LPDIRECTXFILEDATA ; TYPEDEF: IDirectXFileData** LPLPDIRECTXFILEDATA ; -C-TYPE: IDirectXFileDataReference +c-type: IDirectXFileDataReference TYPEDEF: IDirectXFileDataReference* LPDIRECTXFILEDATAREFERENCE ; TYPEDEF: IDirectXFileDataReference** LPLPDIRECTXFILEDATAREFERENCE ; -C-TYPE: IDirectXFileBinary +c-type: IDirectXFileBinary TYPEDEF: IDirectXFileBinary* LPDIRECTXFILEBINARY ; TYPEDEF: IDirectXFileBinary** LPLPDIRECTXFILEBINARY ; diff --git a/ffi/windows/directx/dxgi/dxgi.factor b/ffi/windows/directx/dxgi/dxgi.factor index d8606188eb..1b3b7e1604 100644 --- a/ffi/windows/directx/dxgi/dxgi.factor +++ b/ffi/windows/directx/dxgi/dxgi.factor @@ -119,7 +119,7 @@ COM-INTERFACE: IDXGISurface1 IDXGISurface {4AE63092-6327-4c1b-80AE-BFE12EA32B86} HRESULT GetDC ( BOOL Discard, HDC* phdc ) HRESULT ReleaseDC ( RECT* pDirtyRect ) ; -C-TYPE: IDXGIOutput +c-type: IDXGIOutput COM-INTERFACE: IDXGIAdapter IDXGIObject {2411e7e1-12ac-4ccf-bd14-9798e8534dc0} HRESULT EnumOutputs ( UINT Output, IDXGIOutput** ppOutput ) HRESULT GetDesc ( DXGI_ADAPTER_DESC* pDesc ) diff --git a/ffi/windows/directx/xact3/xact3.factor b/ffi/windows/directx/xact3/xact3.factor index 1075ff926f..a547ed10ce 100644 --- a/ffi/windows/directx/xact3/xact3.factor +++ b/ffi/windows/directx/xact3/xact3.factor @@ -5,12 +5,12 @@ in: windows.directx.xact3 LIBRARY: xactengine -C-TYPE: IXACT3SoundBank -C-TYPE: IXACT3WaveBank -C-TYPE: IXACT3Cue -C-TYPE: IXACT3Wave -C-TYPE: IXACT3Engine -C-TYPE: XACT_NOTIFICATION +c-type: IXACT3SoundBank +c-type: IXACT3WaveBank +c-type: IXACT3Cue +c-type: IXACT3Wave +c-type: IXACT3Engine +c-type: XACT_NOTIFICATION TYPEDEF: WORD XACTINDEX ; TYPEDEF: BYTE XACTNOTIFICATIONTYPE ; @@ -104,8 +104,8 @@ CONSTANT: XACT_STATE_PAUSED 0x00000040 ; CONSTANT: XACT_STATE_INUSE 0x00000080 ; CONSTANT: XACT_STATE_PREPAREFAILED 0x80000000 ; -C-TYPE: XACT_READFILE_CB -C-TYPE: XACT_GETOVERLAPPEDRESULT_CB +c-type: XACT_READFILE_CB +c-type: XACT_GETOVERLAPPEDRESULT_CB : XACT_FLAG_GLOBAL_SETTINGS_MANAGEDATA ( -- z ) XACT_FLAG_MANAGEDATA ; inline @@ -115,7 +115,7 @@ STRUCT: XACT_FILEIO_CALLBACKS { getOverlappedResultCallback XACT_GETOVERLAPPEDRESULT_CB* } ; TYPEDEF: XACT_FILEIO_CALLBACKS* PXACT_FILEIO_CALLBACKS ; -C-TYPE: XACT_NOTIFICATION_CALLBACK +c-type: XACT_NOTIFICATION_CALLBACK CONSTANT: XACT_RENDERER_ID_LENGTH 0xff ; CONSTANT: XACT_RENDERER_NAME_LENGTH 0xff ; diff --git a/ffi/windows/directx/xaudio2/xaudio2.factor b/ffi/windows/directx/xaudio2/xaudio2.factor index 3d0d117984..fcb0f65817 100644 --- a/ffi/windows/directx/xaudio2/xaudio2.factor +++ b/ffi/windows/directx/xaudio2/xaudio2.factor @@ -114,7 +114,7 @@ STRUCT: XAUDIO2_VOICE_DETAILS { InputChannels UINT32 } { InputSampleRate UINT32 } ; -C-TYPE: IXAudio2Voice +c-type: IXAudio2Voice STRUCT: XAUDIO2_SEND_DESCRIPTOR { Flags UINT32 } @@ -200,11 +200,11 @@ CONSTANT: XAUDIO2_LOG_LOCKS 0x0080 ; CONSTANT: XAUDIO2_LOG_MEMORY 0x0100 ; CONSTANT: XAUDIO2_LOG_STREAMING 0x1000 ; -C-TYPE: IXAudio2EngineCallback -C-TYPE: IXAudio2VoiceCallback -C-TYPE: IXAudio2SourceVoice -C-TYPE: IXAudio2SubmixVoice -C-TYPE: IXAudio2MasteringVoice +c-type: IXAudio2EngineCallback +c-type: IXAudio2VoiceCallback +c-type: IXAudio2SourceVoice +c-type: IXAudio2SubmixVoice +c-type: IXAudio2MasteringVoice COM-INTERFACE: IXAudio2 IUnknown {8bcf1f58-9fe7-4583-8ac6-e2adc465c8bb} HRESULT GetDeviceCount ( UINT32* pCount ) diff --git a/ffi/windows/gdiplus/gdiplus.factor b/ffi/windows/gdiplus/gdiplus.factor index 76b80226f7..ba3b983046 100644 --- a/ffi/windows/gdiplus/gdiplus.factor +++ b/ffi/windows/gdiplus/gdiplus.factor @@ -915,34 +915,34 @@ STRUCT: ColorMap { oldColor GpColor } { newColor GpColor } ; -C-TYPE: GpGraphics -C-TYPE: GpPen -C-TYPE: GpBrush -C-TYPE: GpHatch -C-TYPE: GpSolidFill -C-TYPE: GpPath -C-TYPE: GpMatrix -C-TYPE: GpPathIterator -C-TYPE: GpCustomLineCap -C-TYPE: GpAdjustableArrowCap -C-TYPE: GpImage -C-TYPE: GpMetafile -C-TYPE: GpImageAttributes -C-TYPE: GpCachedBitmap -C-TYPE: GpBitmap -C-TYPE: GpPathGradient -C-TYPE: GpLineGradient -C-TYPE: GpTexture -C-TYPE: GpFont -C-TYPE: GpFontCollection -C-TYPE: GpFontFamily -C-TYPE: GpStringFormat -C-TYPE: GpRegion -C-TYPE: CGpEffect +c-type: GpGraphics +c-type: GpPen +c-type: GpBrush +c-type: GpHatch +c-type: GpSolidFill +c-type: GpPath +c-type: GpMatrix +c-type: GpPathIterator +c-type: GpCustomLineCap +c-type: GpAdjustableArrowCap +c-type: GpImage +c-type: GpMetafile +c-type: GpImageAttributes +c-type: GpCachedBitmap +c-type: GpBitmap +c-type: GpPathGradient +c-type: GpLineGradient +c-type: GpTexture +c-type: GpFont +c-type: GpFontCollection +c-type: GpFontFamily +c-type: GpStringFormat +c-type: GpRegion +c-type: CGpEffect ! dummy out other windows types we don't care to define yet -C-TYPE: LOGFONTA -C-TYPE: LOGFONTW +c-type: LOGFONTA +c-type: LOGFONTW FUNCTION: GpStatus GdipCreateAdjustableArrowCap ( REAL x, REAL x, BOOL x, GpAdjustableArrowCap** x ) ; FUNCTION: GpStatus GdipGetAdjustableArrowCapFillState ( GpAdjustableArrowCap* x, BOOL* x ) ; diff --git a/ffi/windows/usp10/usp10.factor b/ffi/windows/usp10/usp10.factor index 4905e79213..95813c1258 100644 --- a/ffi/windows/usp10/usp10.factor +++ b/ffi/windows/usp10/usp10.factor @@ -57,8 +57,8 @@ CONSTANT: SCRIPT_JUSTIFFY_RESERVED4 15 ; STRUCT: SCRIPT_VISATTR { flags WORD } ; -C-TYPE: SCRIPT_CACHE -C-TYPE: ABC +c-type: SCRIPT_CACHE +c-type: ABC FUNCTION: HRESULT ScriptShape ( HDC hdc, diff --git a/ffi/windows/winsock/winsock.factor b/ffi/windows/winsock/winsock.factor index 7040d2ba4c..d404f19b2a 100644 --- a/ffi/windows/winsock/winsock.factor +++ b/ffi/windows/winsock/winsock.factor @@ -116,7 +116,7 @@ CONSTANT: SD_BOTH 2 ; CONSTANT: SOL_SOCKET 0xffff ; -C-TYPE: sockaddr +c-type: sockaddr STRUCT: sockaddr-in { family short } diff --git a/ffi/x11/xlib/xlib.factor b/ffi/x11/xlib/xlib.factor index fd0a85f3e1..f0377bb980 100644 --- a/ffi/x11/xlib/xlib.factor +++ b/ffi/x11/xlib/xlib.factor @@ -32,12 +32,12 @@ TYPEDEF: XID KeySym ; TYPEDEF: ulong Atom ; TYPEDEF: c-string XPointer ; -C-TYPE: Screen +c-type: Screen TYPEDEF: void* GC ; -C-TYPE: Visual -C-TYPE: XExtData -C-TYPE: XFontProp -C-TYPE: XComposeStatus +c-type: Visual +c-type: XExtData +c-type: XFontProp +c-type: XComposeStatus TYPEDEF: void* XIM ; TYPEDEF: void* XIC ; @@ -281,7 +281,7 @@ X-FUNCTION: int XFreePixmap ( Display* display, Pixmap pixmap ) ; ! 5.2 - Creating, Recoloring, and Freeing Cursors -C-TYPE: XColor +c-type: XColor X-FUNCTION: Cursor XCreatePixmapCursor ( Display* display, Pixmap source, Pixmap mask, XColor* foreground_color, XColor* background_color, uint x, uint y ) ; X-FUNCTION: int XFreeCursor ( Display* display, Cursor cursor ) ; diff --git a/frameworks/db/postgresql/ffi/ffi.factor b/frameworks/db/postgresql/ffi/ffi.factor index 56cf356910..dabbf29661 100644 --- a/frameworks/db/postgresql/ffi/ffi.factor +++ b/frameworks/db/postgresql/ffi/ffi.factor @@ -59,17 +59,17 @@ TYPEDEF: int PostgresPollingStatusType ; TYPEDEF: int PGTransactionStatusType ; TYPEDEF: int PGVerbosity ; -C-TYPE: PGconn -C-TYPE: PGresult -C-TYPE: PGcancel +c-type: PGconn +c-type: PGresult +c-type: PGcancel TYPEDEF: uint Oid ; TYPEDEF: char pqbool ; -C-TYPE: PQconninfoOption -C-TYPE: PGnotify -C-TYPE: PQArgBlock -C-TYPE: PQprintOpt -C-TYPE: SSL -C-TYPE: FILE +c-type: PQconninfoOption +c-type: PGnotify +c-type: PQArgBlock +c-type: PQprintOpt +c-type: SSL +c-type: FILE LIBRARY: postgresql diff --git a/frameworks/db/sqlite/ffi/ffi.factor b/frameworks/db/sqlite/ffi/ffi.factor index c5277fd011..3b064c0cbc 100644 --- a/frameworks/db/sqlite/ffi/ffi.factor +++ b/frameworks/db/sqlite/ffi/ffi.factor @@ -99,8 +99,8 @@ CONSTANT: SQLITE_OPEN_TEMP_JOURNAL 0x00001000 ; CONSTANT: SQLITE_OPEN_SUBJOURNAL 0x00002000 ; CONSTANT: SQLITE_OPEN_MASTER_JOURNAL 0x00004000 ; -C-TYPE: sqlite3 -C-TYPE: sqlite3_stmt +c-type: sqlite3 +c-type: sqlite3_stmt TYPEDEF: longlong sqlite3_int64 ; TYPEDEF: ulonglong sqlite3_uint64 ; diff --git a/language/alien/parser/parser-tests.factor b/language/alien/parser/parser-tests.factor index 21e10dcfc2..f54fc4aa9a 100644 --- a/language/alien/parser/parser-tests.factor +++ b/language/alien/parser/parser-tests.factor @@ -117,5 +117,5 @@ TYPEDEF: int alien-parser-test-int ! reasonably unique name... ; ! Redefinitions { } [ - [ C-TYPE: hi TYPEDEF: void* hi ] with-compilation-unit + [ c-type: hi TYPEDEF: void* hi ] with-compilation-unit ] unit-test diff --git a/language/alien/prettyprint/prettyprint-tests.factor b/language/alien/prettyprint/prettyprint-tests.factor index a5484f2af7..a89e00ee5f 100644 --- a/language/alien/prettyprint/prettyprint-tests.factor +++ b/language/alien/prettyprint/prettyprint-tests.factor @@ -42,11 +42,11 @@ TYPEDEF: char[1][2][3] array-typedef ; [ \ array-typedef see ] with-string-writer ] unit-test -C-TYPE: opaque-c-type +c-type: opaque-c-type { "USING: alien.syntax ; in: alien.prettyprint.tests -C-TYPE: opaque-c-type +c-type: opaque-c-type " } [ [ \ opaque-c-type see ] with-string-writer ] unit-test diff --git a/language/alien/prettyprint/prettyprint.factor b/language/alien/prettyprint/prettyprint.factor index ba722ac417..bb05a59a44 100644 --- a/language/alien/prettyprint/prettyprint.factor +++ b/language/alien/prettyprint/prettyprint.factor @@ -16,7 +16,7 @@ M: alien pprint* M: dll pprint* dll-path dup "DLL\" " "\"" pprint-string ; -M: c-type-word definer drop \ C-TYPE: f ; +M: c-type-word definer drop \ c-type: f ; M: c-type-word definition drop f ; M: c-type-word declarations. drop ; diff --git a/language/alien/syntax/syntax-docs.factor b/language/alien/syntax/syntax-docs.factor index da5f16e45d..44c5233e35 100644 --- a/language/alien/syntax/syntax-docs.factor +++ b/language/alien/syntax/syntax-docs.factor @@ -81,15 +81,15 @@ HELP: ENUM: { $code "ENUM: tv_peripherals_4 < uint\n{ appletv 1 } { chromecast 2 } { roku 4 } ;" } } ; -HELP: C-TYPE: -{ $syntax "C-TYPE: type" } +HELP: c-type: +{ $syntax "c-type: type" } { $values { "type" "a new C type" } } { $description "Defines a new, opaque C type. Since it is opaque, " { $snippet "type" } " will not be directly usable as a parameter or return type of a " { $link postpone: FUNCTION: } " or as a slot of a " { $link postpone: STRUCT: } ". However, it can be used as the type of a " { $link pointer } "." $nl -{ $snippet "C-TYPE:" } " can also be used to forward declare C types, allowing circular dependencies to occur between types. For example:" -{ $code "C-TYPE: forward +{ $snippet "c-type:" } " can also be used to forward declare C types, allowing circular dependencies to occur between types. For example:" +{ $code "c-type: forward STRUCT: backward { x forward* } ; STRUCT: forward { x backward* } ;" } } -{ $notes "Primitive C types are displayed using " { $snippet "C-TYPE:" } " syntax when they are " { $link see } "n." } ; +{ $notes "Primitive C types are displayed using " { $snippet "c-type:" } " syntax when they are " { $link see } "n." } ; HELP: CALLBACK: { $syntax "CALLBACK: return type ( parameters )" } diff --git a/language/alien/syntax/syntax.factor b/language/alien/syntax/syntax.factor index 8c1358ee8f..2c9f79e4b3 100755 --- a/language/alien/syntax/syntax.factor +++ b/language/alien/syntax/syntax.factor @@ -32,6 +32,8 @@ SYNTAX: ENUM: SYNTAX: C-TYPE: void CREATE-C-TYPE typedef ; +SYNTAX: c-type: + void CREATE-C-TYPE typedef ; SYNTAX: &: scan-token current-library get '[ _ _ address-of ] append! ; diff --git a/language/classes/struct/struct-tests.factor b/language/classes/struct/struct-tests.factor index 2b08a35847..c0498cedb6 100644 --- a/language/classes/struct/struct-tests.factor +++ b/language/classes/struct/struct-tests.factor @@ -413,7 +413,7 @@ STRUCT: self-referent ] with-destructors ] unit-test -C-TYPE: forward-referent +c-type: forward-referent STRUCT: backward-referent { x forward-referent* } { y int } ; diff --git a/libs/chipmunk/ffi/ffi.factor b/libs/chipmunk/ffi/ffi.factor index 1bfcdac0bb..6f7bd33b35 100644 --- a/libs/chipmunk/ffi/ffi.factor +++ b/libs/chipmunk/ffi/ffi.factor @@ -192,7 +192,7 @@ FUNCTION: cpVect cpBBClampVect ( cpBB bb, cpVect v ) ; FUNCTION: cpVect cpBBWrapVect ( cpBB bb, cpVect v ) ; ! cpBody.h -C-TYPE: cpBody +c-type: cpBody CALLBACK: void cpBodyVelocityFunc ( cpBody* body, cpVect gravity, cpFloat damping, cpFloat dt ) ; CALLBACK: void cpBodyPositionFunc ( cpBody* body, cpFloat dt ) ; @@ -341,8 +341,8 @@ CALLBACK: cpFloat cpSpaceHashSegmentQueryFunc ( void* obj1, void* obj2, void* da FUNCTION: void cpSpaceHashSegmentQuery ( cpSpaceHash* hash, void* obj, cpVect a, cpVect b, cpFloat t_exit, cpSpaceHashSegmentQueryFunc func, void* data ) ; ! cpShape.h -C-TYPE: cpShape -C-TYPE: cpShapeClass +c-type: cpShape +c-type: cpShapeClass STRUCT: cpSegmentQueryInfo { shape cpShape* } @@ -461,9 +461,9 @@ TYPED: cpPolyShapeContainsVertPartial ( poly: cpPolyShape v: cpVect n: cpVect -- ] 2curry [ max ] reduce 0.0 <= ; inline ! cpArbiter.h -C-TYPE: cpArbiter -C-TYPE: cpSpace -C-TYPE: cpCollisionHandler +c-type: cpArbiter +c-type: cpSpace +c-type: cpCollisionHandler STRUCT: cpContact { p cpVect } @@ -544,8 +544,8 @@ FUNCTION: int cpCollideShapes ( cpShape* a, cpShape* b, cpContact** arr ) ; ! cpConstraint.h -C-TYPE: cpConstraintClass -C-TYPE: cpConstraint +c-type: cpConstraintClass +c-type: cpConstraint CALLBACK: void cpConstraintPreStepFunction ( cpConstraint* constraint, cpFloat dt, cpFloat dt_inv ) ; CALLBACK: void cpConstraintApplyImpulseFunction ( cpConstraint* constraint ) ; @@ -760,7 +760,7 @@ FUNCTION: cpSimpleMotor* cpSimpleMotorInit ( cpSimpleMotor* joint, cpBody* a, cp FUNCTION: cpConstraint* cpSimpleMotorNew ( cpBody* a, cpBody* b, cpFloat rate ) ; ! cpSpace.h -C-TYPE: cpSpace +c-type: cpSpace CALLBACK: int cpCollisionBeginFunc ( cpArbiter* arb, cpSpace* space, void* data ) ; CALLBACK: int cpCollisionPreSolveFunc ( cpArbiter* arb, cpSpace* space, void* data ) ; diff --git a/libs/tokyo/alien/tchdb/tchdb.factor b/libs/tokyo/alien/tchdb/tchdb.factor index 47fdf74080..e07eea084d 100644 --- a/libs/tokyo/alien/tchdb/tchdb.factor +++ b/libs/tokyo/alien/tchdb/tchdb.factor @@ -6,8 +6,8 @@ in: tokyo.alien.tchdb LIBRARY: tokyocabinet -C-TYPE: TCXSTR -C-TYPE: TCHDB +c-type: TCXSTR +c-type: TCHDB CONSTANT: HDBFOPEN 1 ; CONSTANT: HDBFFATAL 2 ; diff --git a/libs/tokyo/alien/tcrdb/tcrdb.factor b/libs/tokyo/alien/tcrdb/tcrdb.factor index 90a2b0014f..b77f7f0e3b 100644 --- a/libs/tokyo/alien/tcrdb/tcrdb.factor +++ b/libs/tokyo/alien/tcrdb/tcrdb.factor @@ -13,7 +13,7 @@ in: tokyo.alien.tcrdb LIBRARY: tokyotyrant -C-TYPE: TCRDB +c-type: TCRDB ! STRUCT: TCRDB ! { mmtx pthread_mutex_t } ! { eckey pthread_key_t } @@ -94,7 +94,7 @@ CONSTANT: RDBITOPT TDBITOPT ; CONSTANT: RDBITVOID TDBITVOID ; CONSTANT: RDBITKEEP TDBITKEEP ; -C-TYPE: RDBQRY +c-type: RDBQRY ! STRUCT: RDBQRY ! { rdb TCRDB* } ! { args TCLIST* } ; diff --git a/libs/tokyo/alien/tctdb/tctdb.factor b/libs/tokyo/alien/tctdb/tctdb.factor index 616cd36176..42576de0cd 100644 --- a/libs/tokyo/alien/tctdb/tctdb.factor +++ b/libs/tokyo/alien/tctdb/tctdb.factor @@ -6,9 +6,9 @@ in: tokyo.alien.tctdb LIBRARY: tokyocabinet -C-TYPE: TDBIDX -C-TYPE: TCTDB -C-TYPE: TCMAP +c-type: TDBIDX +c-type: TCTDB +c-type: TCMAP CONSTANT: TDBFOPEN HDBFOPEN ; CONSTANT: TDBFFATAL HDBFFATAL ; @@ -34,8 +34,8 @@ CONSTANT: TDBITOPT 9998 ; CONSTANT: TDBITVOID 9999 ; CONSTANT: TDBITKEEP 16777216 ; -C-TYPE: TDBCOND -C-TYPE: TDBQRY +c-type: TDBCOND +c-type: TDBQRY CONSTANT: TDBQCSTREQ 0 ; CONSTANT: TDBQCSTRINC 1 ; diff --git a/libs/tokyo/alien/tcutil/tcutil.factor b/libs/tokyo/alien/tcutil/tcutil.factor index 29f9b58b11..70ac214c27 100644 --- a/libs/tokyo/alien/tcutil/tcutil.factor +++ b/libs/tokyo/alien/tcutil/tcutil.factor @@ -20,7 +20,7 @@ CONSTANT: TCDBTTABLE 3 ; ! FIXME: on windows 64bits this isn't correct, because long is 32bits there, and time_t is int64 TYPEDEF: long tokyo_time_t ; -C-TYPE: TCLIST +c-type: TCLIST FUNCTION: TCLIST* tclistnew ( ) ; FUNCTION: TCLIST* tclistnew2 ( int anum ) ; diff --git a/libs/yaml/ffi/ffi.factor b/libs/yaml/ffi/ffi.factor index 0f06635254..2e72eee9b7 100644 --- a/libs/yaml/ffi/ffi.factor +++ b/libs/yaml/ffi/ffi.factor @@ -11,7 +11,7 @@ in: yaml.ffi "libyaml" { "yaml" "yaml-0" "libyaml-0-2" } find-library-from-list cdecl add-library >> -C-TYPE: FILE +c-type: FILE LIBRARY: libyaml diff --git a/misc/fuel/strange-syntax.factor b/misc/fuel/strange-syntax.factor index 8bc32c6d1c..28c2ae33de 100644 --- a/misc/fuel/strange-syntax.factor +++ b/misc/fuel/strange-syntax.factor @@ -26,7 +26,7 @@ TUPLE: a-tuple slot1 slot2 { slot3 integer } ; ! : do-"that" ( x -- y ) ; ! ! C-TYPE -C-TYPE: cairo_snurface_t +c-type: cairo_snurface_t ! ! CHAR : stuff-with-chars ( -- K \n ) diff --git a/unmaintained/gstreamer/plugins/rtsp/ffi/ffi.factor b/unmaintained/gstreamer/plugins/rtsp/ffi/ffi.factor index 7a8df31914..a984ba4c36 100644 --- a/unmaintained/gstreamer/plugins/rtsp/ffi/ffi.factor +++ b/unmaintained/gstreamer/plugins/rtsp/ffi/ffi.factor @@ -14,7 +14,7 @@ in: gstreamer.rtsp.ffi >> ! git error (there is _GstRTSPTransport only in .gir) -C-TYPE: GstRTSPTransport +c-type: GstRTSPTransport GIR: vocab:gstreamer/rtsp/GstRtsp-0.10.gir diff --git a/unmaintained/llvm/clang/ffi/ffi.factor b/unmaintained/llvm/clang/ffi/ffi.factor index 513db762cb..34f7d62902 100644 --- a/unmaintained/llvm/clang/ffi/ffi.factor +++ b/unmaintained/llvm/clang/ffi/ffi.factor @@ -11,7 +11,7 @@ in: llvm.clang.ffi >> LIBRARY: libclang -C-TYPE: CXTranslationUnitImpl +c-type: CXTranslationUnitImpl TYPEDEF: void* CXIndex ; TYPEDEF: CXTranslationUnitImpl* CXTranslationUnit ; @@ -314,7 +314,7 @@ FUNCTION: CXLinkageKind clang_getCursorLinkage ( CXCursor cursor ) ; FUNCTION: CXAvailabilityKind clang_getCursorAvailability ( CXCursor cursor ) ; FUNCTION: CXLanguageKind clang_getCursorLanguage ( CXCursor cursor ) ; -C-TYPE: CXCursorSetImpl +c-type: CXCursorSetImpl TYPEDEF: CXCursorSetImpl* CXCursorSet ; FUNCTION: CXCursorSet clang_createCXCursorSet ( ) ; diff --git a/unmaintained/odbc/odbc.factor b/unmaintained/odbc/odbc.factor index 767713cbde..8d6d0597c8 100644 --- a/unmaintained/odbc/odbc.factor +++ b/unmaintained/odbc/odbc.factor @@ -19,7 +19,7 @@ TYPEDEF: int SQLINTEGER ; TYPEDEF: char SQLCHAR ; TYPEDEF: char* SQLCHAR* ; TYPEDEF: void* SQLHANDLE ; -C-TYPE: SQLHANDLE +c-type: SQLHANDLE TYPEDEF: void* SQLHENV ; TYPEDEF: void* SQLHDBC ; TYPEDEF: void* SQLHSTMT ;