From fd475c83207f0da7a23963b2e1a8d8d2f2cb61cd Mon Sep 17 00:00:00 2001 From: Doug Coleman Date: Tue, 28 Jun 2016 00:43:14 -0700 Subject: [PATCH] modern: even more arity stuff. --- .../io/files/acls/macosx/ffi/ffi.factor | 28 +- .../io/files/trash/macosx/macosx.factor | 4 +- .../io/files/trash/windows/windows.factor | 2 +- collections/io/serial/linux/ffi/ffi.factor | 6 +- collections/memory/pools/pools.factor | 2 +- core/alien/c-types/c-types-tests.factor | 10 +- core/modern/out/out.factor | 10 +- .../arithmetic-evaluation.factor | 2 +- demos/smalltalk/parser/parser.factor | 2 +- ffi/cairo/ffi/ffi.factor | 14 +- ffi/clutter/cogl/ffi/ffi.factor | 4 +- ffi/clutter/ffi/ffi.factor | 2 +- ffi/cocoa/runtime/runtime.factor | 10 +- ffi/cocoa/types/types.factor | 24 +- ffi/core-foundation/arrays/arrays.factor | 2 +- .../attributed-strings.factor | 2 +- ffi/core-foundation/bundles/bundles.factor | 2 +- ffi/core-foundation/core-foundation.factor | 36 +- ffi/core-foundation/data/data.factor | 6 +- .../dictionaries/dictionaries.factor | 4 +- .../file-descriptors/file-descriptors.factor | 4 +- ffi/core-foundation/fsevents/fsevents.factor | 10 +- .../launch-services/launch-services.factor | 136 +++---- ffi/core-foundation/numbers/numbers.factor | 4 +- ffi/core-foundation/run-loop/run-loop.factor | 6 +- ffi/core-foundation/strings/strings.factor | 6 +- ffi/core-foundation/time/time.factor | 4 +- ffi/core-foundation/timers/timers.factor | 4 +- ffi/core-foundation/urls/urls.factor | 2 +- ffi/core-graphics/core-graphics.factor | 2 +- ffi/core-graphics/types/types.factor | 24 +- ffi/core-text/core-text.factor | 18 +- ffi/core-text/fonts/fonts.factor | 46 +-- ffi/cuda/demos/hello-world/hello-world.factor | 2 +- ffi/cuda/demos/prefix-sum/prefix-sum.factor | 2 +- ffi/cuda/ffi/ffi.factor | 20 +- ffi/cuda/syntax/syntax.factor | 4 +- ffi/curl/ffi/ffi.factor | 6 +- ffi/curses/ffi/ffi.factor | 18 +- ffi/fftw/ffi/ffi.factor | 4 +- ffi/forestdb/ffi/ffi.factor | 18 +- ffi/freetype/freetype.factor | 44 +- ffi/gdbm/ffi/ffi.factor | 6 +- ffi/gdk/ffi/ffi.factor | 14 +- .../gobject-introspection.factor | 6 +- .../standard-types/standard-types.factor | 48 +-- ffi/gstreamer/ffi/ffi.factor | 12 +- ffi/iokit/hid/hid.factor | 30 +- ffi/lua/lua.factor | 12 +- ffi/macho/macho.factor | 10 +- ffi/ogg/theora/theora.factor | 16 +- ffi/openal/openal.factor | 36 +- ffi/opencl/ffi/ffi.factor | 130 +++--- ffi/opengl/gl/gl.factor | 42 +- ffi/opengl/glu/glu.factor | 2 +- ffi/openssl/libcrypto/libcrypto.factor | 6 +- ffi/openssl/libssl/libssl.factor | 10 +- ffi/pango/cairo/ffi/ffi.factor | 8 +- ffi/qtkit/qtkit.factor | 16 +- ffi/readline/ffi/ffi.factor | 196 ++++----- ffi/system-info/macosx/macosx.factor | 4 +- ffi/unix/ffi/ffi.factor | 2 +- ffi/unix/stat/stat.factor | 4 +- ffi/unix/types/linux/linux.factor | 56 +-- ffi/unix/types/macosx/macosx.factor | 56 +-- ffi/unix/types/types.factor | 44 +- ffi/windows/advapi32/advapi32.factor | 46 +-- ffi/windows/crypt32/crypt32.factor | 44 +- ffi/windows/ddk/hid/hid.factor | 32 +- ffi/windows/ddk/setupapi/setupapi.factor | 296 +++++++------- ffi/windows/ddk/winusb/winusb.factor | 10 +- .../directx/audiodefs/audiodefs.factor | 30 +- ffi/windows/directx/d2d1/d2d1.factor | 78 ++-- .../directx/d2dbasetypes/d2dbasetypes.factor | 2 +- ffi/windows/directx/d3d10/d3d10.factor | 72 ++-- ffi/windows/directx/d3d10_1/d3d10_1.factor | 6 +- .../d3d10_1shader/d3d10_1shader.factor | 8 +- .../directx/d3d10effect/d3d10effect.factor | 42 +- .../directx/d3d10misc/d3d10misc.factor | 4 +- .../directx/d3d10shader/d3d10shader.factor | 42 +- ffi/windows/directx/d3d11/d3d11.factor | 86 ++-- .../directx/d3d11shader/d3d11shader.factor | 12 +- ffi/windows/directx/d3d9/d3d9.factor | 88 ++-- .../directx/d3d9types/d3d9types.factor | 114 +++--- .../directx/d3dcommon/d3dcommon.factor | 4 +- .../directx/d3dcompiler/d3dcompiler.factor | 6 +- ffi/windows/directx/d3dcsx/d3dcsx.factor | 10 +- .../directx/d3dx10core/d3dx10core.factor | 6 +- .../directx/d3dx10math/d3dx10math.factor | 4 +- .../directx/d3dx10mesh/d3dx10mesh.factor | 12 +- .../directx/d3dx10tex/d3dx10tex.factor | 10 +- .../directx/d3dx11tex/d3dx11tex.factor | 10 +- .../directx/d3dx9anim/d3dx9anim.factor | 50 +-- .../directx/d3dx9core/d3dx9core.factor | 24 +- .../directx/d3dx9effect/d3dx9effect.factor | 10 +- .../directx/d3dx9math/d3dx9math.factor | 32 +- .../directx/d3dx9mesh/d3dx9mesh.factor | 68 ++-- .../directx/d3dx9shader/d3dx9shader.factor | 34 +- .../directx/d3dx9shape/d3dx9shape.factor | 2 +- ffi/windows/directx/d3dx9tex/d3dx9tex.factor | 6 +- ffi/windows/directx/d3dx9xof/d3dx9xof.factor | 26 +- ffi/windows/directx/dinput/dinput.factor | 110 ++--- ffi/windows/directx/dwrite/dwrite.factor | 4 +- ffi/windows/directx/dxfile/dxfile.factor | 36 +- ffi/windows/directx/dxgi/dxgi.factor | 10 +- .../directx/dxgiformat/dxgiformat.factor | 2 +- ffi/windows/directx/x3daudio/x3daudio.factor | 18 +- ffi/windows/directx/xact3/xact3.factor | 88 ++-- ffi/windows/directx/xaudio2/xaudio2.factor | 6 +- ffi/windows/directx/xinput/xinput.factor | 10 +- ffi/windows/gdiplus/gdiplus.factor | 14 +- ffi/windows/iphlpapi/iphlpapi.factor | 52 +-- ffi/windows/kernel32/kernel32.factor | 64 +-- ffi/windows/ntdll/ntdll.factor | 26 +- ffi/windows/ole32/ole32.factor | 26 +- ffi/windows/privileges/privileges.factor | 2 +- ffi/windows/shell32/shell32.factor | 26 +- ffi/windows/types/types.factor | 378 +++++++++--------- ffi/windows/user32/user32.factor | 50 +-- ffi/windows/usp10/usp10.factor | 2 +- ffi/windows/winmm/winmm.factor | 2 +- ffi/windows/winsock/winsock.factor | 56 +-- ffi/x11/constants/constants.factor | 4 +- ffi/x11/glx/glx.factor | 16 +- ffi/x11/xinput2/ffi/ffi.factor | 8 +- ffi/x11/xlib/xlib.factor | 54 +-- frameworks/db/postgresql/errors/errors.factor | 2 +- frameworks/db/postgresql/ffi/ffi.factor | 14 +- frameworks/db/sqlite/errors/errors.factor | 2 +- frameworks/db/sqlite/ffi/ffi.factor | 4 +- frameworks/gpu/shaders/shaders.factor | 4 +- games/jamshred/log/log.factor | 2 +- language/alien/parser/parser-tests.factor | 4 +- .../prettyprint/prettyprint-tests.factor | 6 +- language/alien/syntax/syntax.factor | 4 +- language/compiler/cfg/gvn/avail/avail.factor | 2 +- .../linear-scan/assignment/assignment.factor | 2 +- .../cfg/renaming/functor/functor.factor | 2 +- .../compiler/cfg/renaming/renaming.factor | 2 +- .../representations/rewrite/rewrite.factor | 2 +- .../cfg/ssa/construction/construction.factor | 2 +- language/compiler/codegen/codegen.factor | 332 +++++++-------- .../compiler/tests/peg-regression-2.factor | 2 +- language/compiler/tests/redefine24.factor | 6 +- language/definitions/icons/icons.factor | 28 +- language/funktors/funktors-tests.factor | 2 +- language/funktors/funktors.factor | 2 +- language/io/encodings/euc/euc.factor | 4 +- language/io/files/temp/macosx/macosx.factor | 4 +- language/multi-methods/multi-methods.factor | 2 +- language/peg/ebnf/ebnf.factor | 2 +- language/variables/variables.factor | 4 +- language/vm/vm.factor | 2 +- libs/brainfuck/brainfuck.factor | 2 +- libs/calendar/holidays/canada/canada.factor | 4 +- libs/calendar/holidays/holidays.factor | 3 +- libs/calendar/holidays/us/us.factor | 26 +- libs/chipmunk/ffi/ffi.factor | 12 +- libs/compression/zlib/ffi/ffi.factor | 14 +- libs/elf/elf.factor | 22 +- libs/formatting/formatting.factor | 2 +- libs/globs/globs.factor | 2 +- libs/gml/parser/parser.factor | 2 +- .../html/templates/chloe/syntax/syntax.factor | 2 +- libs/http/server/server.factor | 8 +- libs/infix/parser/parser.factor | 2 +- libs/infix/tokenizer/tokenizer.factor | 2 +- libs/logging/logging.factor | 2 +- libs/magic/ffi/ffi.factor | 2 +- libs/peg/expr/expr.factor | 2 +- libs/peg/javascript/parser/parser.factor | 2 +- .../peg/javascript/tokenizer/tokenizer.factor | 2 +- libs/peg/pl0/pl0.factor | 2 +- libs/regexp/parser/parser.factor | 2 +- libs/roman/roman.factor | 12 +- libs/shell/parser/parser.factor | 2 +- libs/simple-tokenizer/simple-tokenizer.factor | 2 +- libs/smtp/smtp.factor | 4 +- libs/svg/svg.factor | 12 +- libs/tokyo/alien/tcadb/tcadb.factor | 6 +- libs/tokyo/alien/tcbdb/tcbdb.factor | 4 +- libs/tokyo/alien/tcfdb/tcfdb.factor | 2 +- libs/tokyo/alien/tctdb/tctdb.factor | 2 +- libs/tokyo/alien/tcutil/tcutil.factor | 10 +- libs/urls/urls.factor | 2 +- libs/xml-rpc/xml-rpc.factor | 2 +- libs/xml/syntax/syntax-tests.factor | 4 +- libs/xml/syntax/syntax.factor | 4 +- libs/xmode/catalog/catalog.factor | 2 +- libs/xmode/loader/loader.factor | 2 +- libs/xmode/loader/syntax/syntax.factor | 2 +- libs/yaml/ffi/ffi.factor | 4 +- tools/file-picker/windows/windows.factor | 6 +- tools/tools/disassembler/udis/udis.factor | 2 +- .../gc-info/gc-info-tests.factor | 4 +- tools/tools/ps/macosx/macosx.factor | 8 +- tools/vocabs/git/git.factor | 2 +- 197 files changed, 2189 insertions(+), 2184 deletions(-) diff --git a/collections/io/files/acls/macosx/ffi/ffi.factor b/collections/io/files/acls/macosx/ffi/ffi.factor index dbdfe165b2..b8f8c35d79 100644 --- a/collections/io/files/acls/macosx/ffi/ffi.factor +++ b/collections/io/files/acls/macosx/ffi/ffi.factor @@ -4,12 +4,12 @@ USING: alien.c-types alien.syntax classes.struct kernel literals math.order sequences unix.types ; IN: io.files.acls.macosx.ffi -TYPEDEF: uint acl_type_t ; -TYPEDEF: uint acl_perm_t ; -TYPEDEF: void* acl_t ; -TYPEDEF: void* acl_entry_t ; -TYPEDEF: void* acl_permset_t ; -TYPEDEF: void* acl_flagset_t ; +TYPEDEF: uint acl_type_t +TYPEDEF: uint acl_perm_t +TYPEDEF: void* acl_t +TYPEDEF: void* acl_entry_t +TYPEDEF: void* acl_permset_t +TYPEDEF: void* acl_flagset_t CONSTANT: KAUTH_GUID_SIZE 16 @@ -69,7 +69,7 @@ CONSTANT: acl-file-perm { t f t f t f t t f f t t t t t t t } CONSTANT: acl-dir-perm { f t f t f t t f t t t t t t t t t } ! acl_tag_t -TYPEDEF: uint acl_tag_t ; +TYPEDEF: uint acl_tag_t CONSTANT: ACL_UNDEFINED_TAG 0 CONSTANT: ACL_EXTENDED_ALLOW 1 CONSTANT: ACL_EXTENDED_DENY 2 @@ -81,7 +81,7 @@ ERROR: bad-acl-tag-t n ; { "undefined" "allow" "deny" } nth ; ! acl_flag_t -TYPEDEF: int acl_flag_t ; +TYPEDEF: int acl_flag_t CONSTANT: ACL_FLAG_DEFER_INHERIT 1 CONSTANT: ACL_ENTRY_INHERITED 16 CONSTANT: ACL_ENTRY_FILE_INHERIT 32 @@ -106,24 +106,24 @@ CONSTANT: acl-flag-names { STRUCT: guid_t { g_guid { uchar KAUTH_GUID_SIZE } } ; -TYPEDEF: uint kauth_ace_rights_t ; +TYPEDEF: uint kauth_ace_rights_t STRUCT: kauth_ace { ace_applicable guid_t } { ace_flags uint } { ace_rights kauth_ace_rights_t } ; -TYPEDEF: kauth_ace* kauth_ace_t ; +TYPEDEF: kauth_ace* kauth_ace_t STRUCT: kauth_acl { acl_entrycount uint } { acl_flags uint } { acl_ace { kauth_ace 1 } } ; -TYPEDEF: kauth_acl* kauth_acl_t ; +TYPEDEF: kauth_acl* kauth_acl_t STRUCT: kauth_filesec { fsec_magic uint } { fsec_owner guid_t } { fsec_group guid_t } ; -TYPEDEF: kauth_filesec* kauth_filesec_t ; +TYPEDEF: kauth_filesec* kauth_filesec_t FUNCTION: int acl_dup ( acl_t acl ) ; FUNCTION: int acl_free ( void* obj_p ) ; @@ -156,7 +156,7 @@ FUNCTION: int acl_get_flagset_np ( void *obj, acl_flagset_t* flagset_p ) ; FUNCTION: int acl_get_flag_np ( acl_flagset_t flagset_d, acl_flag_t flag ) ; FUNCTION: int acl_get_tag_type ( acl_entry_t entry_d, acl_tag_t *tag_type_p ) ; -TYPEDEF: uchar[16] uuid_t ; +TYPEDEF: uchar[16] uuid_t CONSTANT: ID_TYPE_UID 0 CONSTANT: ID_TYPE_GID 1 @@ -182,6 +182,6 @@ FUNCTION: int mbr_uuid_to_id ( uuid_t uu, uid_t *id, int *id_type ) ; FUNCTION: int mbr_sid_to_uuid ( nt_sid_t *sid, uuid_t uu ) ; FUNCTION: int mbr_uuid_to_sid ( uuid_t uu, nt_sid_t *sid ) ; -TYPEDEF: char[37] uuid_string_t ; +TYPEDEF: char[37] uuid_string_t FUNCTION: int mbr_uuid_to_string ( uuid_t uu, char* string ) ; diff --git a/collections/io/files/trash/macosx/macosx.factor b/collections/io/files/trash/macosx/macosx.factor index 531a430ace..171b3274d5 100644 --- a/collections/io/files/trash/macosx/macosx.factor +++ b/collections/io/files/trash/macosx/macosx.factor @@ -11,9 +11,9 @@ PRIVATE< STRUCT: FSRef { hidden UInt8[80] } ; -TYPEDEF: SInt32 OSStatus ; +TYPEDEF: SInt32 OSStatus -TYPEDEF: UInt32 OptionBits ; +TYPEDEF: UInt32 OptionBits CONSTANT: noErr 0 diff --git a/collections/io/files/trash/windows/windows.factor b/collections/io/files/trash/windows/windows.factor index 8c7ac93342..13972290c8 100644 --- a/collections/io/files/trash/windows/windows.factor +++ b/collections/io/files/trash/windows/windows.factor @@ -12,7 +12,7 @@ PRIVATE< LIBRARY: shell32 -TYPEDEF: WORD FILEOP_FLAGS ; +TYPEDEF: WORD FILEOP_FLAGS PACKED-STRUCT: SHFILEOPSTRUCTW { hwnd HWND } diff --git a/collections/io/serial/linux/ffi/ffi.factor b/collections/io/serial/linux/ffi/ffi.factor index 3673f0d504..cea6a0e24b 100644 --- a/collections/io/serial/linux/ffi/ffi.factor +++ b/collections/io/serial/linux/ffi/ffi.factor @@ -6,9 +6,9 @@ IN: io.serial.linux.ffi CONSTANT: NCCS 32 -TYPEDEF: uchar cc_t ; -TYPEDEF: uint speed_t ; -TYPEDEF: uint tcflag_t ; +TYPEDEF: uchar cc_t +TYPEDEF: uint speed_t +TYPEDEF: uint tcflag_t STRUCT: termios { iflag tcflag_t } diff --git a/collections/memory/pools/pools.factor b/collections/memory/pools/pools.factor index 615f1c471e..07063b7f8a 100644 --- a/collections/memory/pools/pools.factor +++ b/collections/memory/pools/pools.factor @@ -50,4 +50,4 @@ PRIVATE> dup class-of class-pool pool-free ; SYNTAX: \ POOL: - scan-word scan-word ";" expect $[ _ swap ] [ swap set-class-pool ] bi ; + scan-word scan-word $[ _ swap ] [ swap set-class-pool ] bi ; diff --git a/core/alien/c-types/c-types-tests.factor b/core/alien/c-types/c-types-tests.factor index 932f2dca3f..56f6e1ba9b 100644 --- a/core/alien/c-types/c-types-tests.factor +++ b/core/alien/c-types/c-types-tests.factor @@ -22,7 +22,7 @@ UNION-STRUCT: foo { t } [ foo heap-size int heap-size = ] unit-test -TYPEDEF: int MyInt ; +TYPEDEF: int MyInt { t } [ int lookup-c-type MyInt lookup-c-type = ] unit-test { t } [ void* lookup-c-type pointer: MyInt lookup-c-type = ] unit-test @@ -31,20 +31,20 @@ TYPEDEF: int MyInt ; { } [ pointer: { int 8 } heap-size pointer: void heap-size assert= ] unit-test -TYPEDEF: char MyChar ; +TYPEDEF: char MyChar { t } [ pointer: void lookup-c-type pointer: MyChar lookup-c-type = ] unit-test -TYPEDEF: { c-string ascii } MyFunkyString ; +TYPEDEF: { c-string ascii } MyFunkyString { { c-string ascii } } [ MyFunkyString lookup-c-type ] unit-test -TYPEDEF: c-string MyString ; +TYPEDEF: c-string MyString { t } [ c-string lookup-c-type MyString lookup-c-type = ] unit-test { t } [ void* lookup-c-type pointer: MyString lookup-c-type = ] unit-test -TYPEDEF: int* MyIntArray ; +TYPEDEF: int* MyIntArray { t } [ void* lookup-c-type MyIntArray lookup-c-type = ] unit-test diff --git a/core/modern/out/out.factor b/core/modern/out/out.factor index da8c81490e..30412b6552 100644 --- a/core/modern/out/out.factor +++ b/core/modern/out/out.factor @@ -32,13 +32,19 @@ CONSTANT: janky-arities H{ `SPECIALIZED-ARRAY 1 -- `SPECIALIZED-VECTOR 1 -- `8-BIT 1 -- `TUPLE-ARRAY 1 -- `C-TYPE 1 -- `LIBRARY 1 -- `DESTRUCTOR 1 -- `COMPONENT 1 -- `FRAMEWORK 1 -- `REGISTER 1 -- `FORWARD-ANALYSIS 1 -- `BACKWARD-ANALYSIS 1 -- `VECTORED-STRUCT 1 -- - `IMPORT 1 -- `GIR 1 -- `TEST 1 -- `SELECTOR 1 -- `SIMD-128 1 -- `QUALIFIED 1 -- + `IMPORT 1 -- `GIR 1 -- `TEST 1 -- `SELECTOR 1 -- `SIMD-128 1 -- `QUALIFIED 1 -- `& 1 -- + `TYPED-GLOBAL 1 -- `ALIAS 2 -- `ARITY 2 -- `C 2 -- `CONSTANT 2 -- `INSTANCE 2 -- `GENERIC 2 -- `PRIMITIVE 2 -- `MATH 2 -- `QUALIFIED-WITH 2 -- `SIMD-128-CORD 2 -- `HELP-ARRAY 2 -- `HELP-STRING 2 -- `HELP-BACKTICK 2 -- `HELP-2BACKTICKS 2 -- `HELP-3BACKTICKS 2 -- `HELP-BACKSLASH 2 -- + `FOREIGN-ATOMIC-TYPE 2 -- `FOREIGN-ENUM-TYPE 2 -- `FOREIGN-RECORD-TYPE 2 -- `TYPEDEF 2 -- + `POOL 2 -- `CFSTRING 2 -- `C-GLOBAL 2 -- `ROMAN-OP 2 -- `TAGS 2 -- `XML-NS 2 -- `ICON 2 -- + `CODEGEN 2 -- `POOL 2 -- `TYPED-VAR 2 -- `TYPED-GLOBAL 2 -- `LOG 2 -- `USE-REV 2 -- + `EBNF 2 -- `EUC 2 -- `CONDITIONAL 2 -- - `GENERIC# 3 -- `PIXEL-FORMAT-ATTRIBUTE-TABLE 3 -- `HOOK 3 + `GENERIC# 3 -- `PIXEL-FORMAT-ATTRIBUTE-TABLE 3 -- `HOOK 3 -- `CUDA-LIBRARY 3 -- `FUNKTOR 3 -- + `HOLIDAY-NAME 3 -- `RENAMING 3 -- `GLSL-SHADER 3 -- `GLSL-SHADER-FILE 3 } GENERIC: write-literal ( obj -- ) diff --git a/demos/rosetta-code/arithmetic-evaluation/arithmetic-evaluation.factor b/demos/rosetta-code/arithmetic-evaluation/arithmetic-evaluation.factor index ba5f2fa7e4..91e4ecad11 100644 --- a/demos/rosetta-code/arithmetic-evaluation/arithmetic-evaluation.factor +++ b/demos/rosetta-code/arithmetic-evaluation/arithmetic-evaluation.factor @@ -51,7 +51,7 @@ exp = exp:a spaces "+" fac:b => [[ a b ]] | fac main = exp:e spaces !(.) => [[ e ]] -]=] ; +]=] GENERIC: eval-ast ( ast -- result ) diff --git a/demos/smalltalk/parser/parser.factor b/demos/smalltalk/parser/parser.factor index 57163b7b28..d4f7e368d3 100644 --- a/demos/smalltalk/parser/parser.factor +++ b/demos/smalltalk/parser/parser.factor @@ -225,4 +225,4 @@ End = !(.) Program = TopLevelForm End -]=] ; +]=] diff --git a/ffi/cairo/ffi/ffi.factor b/ffi/cairo/ffi/ffi.factor index e94a86482d..fed76b7933 100644 --- a/ffi/cairo/ffi/ffi.factor +++ b/ffi/cairo/ffi/ffi.factor @@ -19,11 +19,11 @@ LIBRARY: cairo FUNCTION: int cairo_version ( ) ; FUNCTION: c-string cairo_version_string ( ) ; -TYPEDEF: int cairo_bool_t ; +TYPEDEF: int cairo_bool_t ! I am leaving these and other void* types as opaque structures -TYPEDEF: void* cairo_t ; -TYPEDEF: void* cairo_surface_t ; +TYPEDEF: void* cairo_t +TYPEDEF: void* cairo_surface_t STRUCT: cairo_matrix_t { xx double } @@ -33,7 +33,7 @@ STRUCT: cairo_matrix_t { x0 double } { y0 double } ; -TYPEDEF: void* cairo_pattern_t ; +TYPEDEF: void* cairo_pattern_t CALLBACK: void cairo_destroy_func_t ( void* data ) ; @@ -289,9 +289,9 @@ FUNCTION: void cairo_rectangle_list_destroy ( cairo_rectangle_list_t* rectangle_ ! Font/Text functions -TYPEDEF: void* cairo_scaled_font_t ; +TYPEDEF: void* cairo_scaled_font_t -TYPEDEF: void* cairo_font_face_t ; +TYPEDEF: void* cairo_font_face_t STRUCT: cairo_glyph_t { index ulong } @@ -356,7 +356,7 @@ ENUM: cairo_hint_metrics_t CAIRO_HINT_METRICS_OFF CAIRO_HINT_METRICS_ON ; -TYPEDEF: void* cairo_font_options_t ; +TYPEDEF: void* cairo_font_options_t FUNCTION: cairo_font_options_t* cairo_font_options_create ( ) ; diff --git a/ffi/clutter/cogl/ffi/ffi.factor b/ffi/clutter/cogl/ffi/ffi.factor index 2cb7550a50..7904480a9a 100644 --- a/ffi/clutter/cogl/ffi/ffi.factor +++ b/ffi/clutter/cogl/ffi/ffi.factor @@ -18,7 +18,7 @@ COMPILE< } cond COMPILE> -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/clutter/ffi/ffi.factor b/ffi/clutter/ffi/ffi.factor index be5c39ae40..a5c0099553 100644 --- a/ffi/clutter/ffi/ffi.factor +++ b/ffi/clutter/ffi/ffi.factor @@ -22,6 +22,6 @@ COMPILE< } cond COMPILE> -FOREIGN-RECORD-TYPE: cairo.Path cairo_path_t ; +FOREIGN-RECORD-TYPE: cairo.Path cairo_path_t GIR: Clutter-1.0.gir diff --git a/ffi/cocoa/runtime/runtime.factor b/ffi/cocoa/runtime/runtime.factor index 671d05698d..b0e149e0c1 100644 --- a/ffi/cocoa/runtime/runtime.factor +++ b/ffi/cocoa/runtime/runtime.factor @@ -3,9 +3,9 @@ USING: alien.c-types alien.syntax classes.struct ; IN: cocoa.runtime -TYPEDEF: void* SEL ; +TYPEDEF: void* SEL -TYPEDEF: void* id ; +TYPEDEF: void* id FUNCTION: c-string sel_getName ( SEL aSelector ) ; @@ -13,9 +13,9 @@ FUNCTION: char sel_isMapped ( SEL aSelector ) ; FUNCTION: SEL sel_registerName ( c-string str ) ; -TYPEDEF: void* Class ; -TYPEDEF: void* Method ; -TYPEDEF: void* Protocol ; +TYPEDEF: void* Class +TYPEDEF: void* Method +TYPEDEF: void* Protocol STRUCT: objc-super { receiver id } diff --git a/ffi/cocoa/types/types.factor b/ffi/cocoa/types/types.factor index 17ca0c2877..87533c4fbc 100644 --- a/ffi/cocoa/types/types.factor +++ b/ffi/cocoa/types/types.factor @@ -4,28 +4,28 @@ USING: alien.c-types alien.syntax classes.struct cocoa.runtime core-graphics.types ; IN: cocoa.types -TYPEDEF: long NSInteger ; -TYPEDEF: ulong NSUInteger ; +TYPEDEF: long NSInteger +TYPEDEF: ulong NSUInteger -TYPEDEF: CGPoint NSPoint ; -TYPEDEF: NSPoint _NSPoint ; +TYPEDEF: CGPoint NSPoint +TYPEDEF: NSPoint _NSPoint -TYPEDEF: CGSize NSSize ; -TYPEDEF: NSSize _NSSize ; +TYPEDEF: CGSize NSSize +TYPEDEF: NSSize _NSSize -TYPEDEF: CGRect NSRect ; -TYPEDEF: NSRect _NSRect ; +TYPEDEF: CGRect NSRect +TYPEDEF: NSRect _NSRect STRUCT: NSRange { location NSUInteger } { length NSUInteger } ; -TYPEDEF: NSRange _NSRange ; +TYPEDEF: NSRange _NSRange ! The "lL" type encodings refer to 32-bit values even in 64-bit mode -TYPEDEF: int long32 ; -TYPEDEF: uint ulong32 ; -TYPEDEF: void* unknown_type ; +TYPEDEF: int long32 +TYPEDEF: uint ulong32 +TYPEDEF: void* unknown_type : ( location length -- size ) NSRange ; diff --git a/ffi/core-foundation/arrays/arrays.factor b/ffi/core-foundation/arrays/arrays.factor index 289094cb67..0e733b79ef 100644 --- a/ffi/core-foundation/arrays/arrays.factor +++ b/ffi/core-foundation/arrays/arrays.factor @@ -4,7 +4,7 @@ USING: alien.c-types alien.syntax core-foundation fry kernel sequences ; IN: core-foundation.arrays -TYPEDEF: void* CFArrayRef ; +TYPEDEF: void* CFArrayRef FUNCTION: CFArrayRef CFArrayCreateMutable ( CFAllocatorRef allocator, CFIndex capacity, void* callbacks ) ; diff --git a/ffi/core-foundation/attributed-strings/attributed-strings.factor b/ffi/core-foundation/attributed-strings/attributed-strings.factor index 13f0f19798..77997e9dd1 100644 --- a/ffi/core-foundation/attributed-strings/attributed-strings.factor +++ b/ffi/core-foundation/attributed-strings/attributed-strings.factor @@ -5,7 +5,7 @@ core-foundation.dictionaries core-foundation.strings core-foundation.utilities destructors kernel ; IN: core-foundation.attributed-strings -TYPEDEF: void* CFAttributedStringRef ; +TYPEDEF: void* CFAttributedStringRef FUNCTION: CFAttributedStringRef CFAttributedStringCreate ( CFAllocatorRef alloc, diff --git a/ffi/core-foundation/bundles/bundles.factor b/ffi/core-foundation/bundles/bundles.factor index 19788e6168..9ce8ed84c5 100644 --- a/ffi/core-foundation/bundles/bundles.factor +++ b/ffi/core-foundation/bundles/bundles.factor @@ -4,7 +4,7 @@ USING: alien.c-types alien.syntax core-foundation core-foundation.urls kernel sequences ; IN: core-foundation.bundles -TYPEDEF: void* CFBundleRef ; +TYPEDEF: void* CFBundleRef FUNCTION: CFBundleRef CFBundleCreate ( CFAllocatorRef allocator, CFURLRef bundleURL ) ; diff --git a/ffi/core-foundation/core-foundation.factor b/ffi/core-foundation/core-foundation.factor index 813b41a911..801c5d5413 100644 --- a/ffi/core-foundation/core-foundation.factor +++ b/ffi/core-foundation/core-foundation.factor @@ -4,27 +4,27 @@ USING: alien.c-types alien.destructors alien.syntax classes.struct ; IN: core-foundation -TYPEDEF: void* CFTypeRef ; +TYPEDEF: void* CFTypeRef -TYPEDEF: void* CFAllocatorRef ; +TYPEDEF: void* CFAllocatorRef CONSTANT: kCFAllocatorDefault f -TYPEDEF: bool Boolean ; -TYPEDEF: long CFIndex ; -TYPEDEF: uchar UInt8 ; -TYPEDEF: ushort UInt16 ; -TYPEDEF: uint UInt32 ; -TYPEDEF: ulonglong UInt64 ; -TYPEDEF: char SInt8 ; -TYPEDEF: short SInt16 ; -TYPEDEF: int SInt32 ; -TYPEDEF: longlong SInt64 ; -TYPEDEF: ulong CFTypeID ; -TYPEDEF: UInt32 CFOptionFlags ; -TYPEDEF: void* CFUUIDRef ; -TYPEDEF: SInt32 OSStatus ; -TYPEDEF: uchar[4] FourCharCode ; -TYPEDEF: FourCharCode OSType ; +TYPEDEF: bool Boolean +TYPEDEF: long CFIndex +TYPEDEF: uchar UInt8 +TYPEDEF: ushort UInt16 +TYPEDEF: uint UInt32 +TYPEDEF: ulonglong UInt64 +TYPEDEF: char SInt8 +TYPEDEF: short SInt16 +TYPEDEF: int SInt32 +TYPEDEF: longlong SInt64 +TYPEDEF: ulong CFTypeID +TYPEDEF: UInt32 CFOptionFlags +TYPEDEF: void* CFUUIDRef +TYPEDEF: SInt32 OSStatus +TYPEDEF: uchar[4] FourCharCode +TYPEDEF: FourCharCode OSType STRUCT: FSRef { opaque uchar[80] } ; diff --git a/ffi/core-foundation/data/data.factor b/ffi/core-foundation/data/data.factor index 8e3df7c56f..2b73982b78 100644 --- a/ffi/core-foundation/data/data.factor +++ b/ffi/core-foundation/data/data.factor @@ -4,10 +4,10 @@ USING: alien.c-types alien.syntax core-foundation kernel sequences ; IN: core-foundation.data -TYPEDEF: void* CFDataRef ; -TYPEDEF: void* CFSetRef ; +TYPEDEF: void* CFDataRef +TYPEDEF: void* CFSetRef -TYPEDEF: int CFPropertyListMutabilityOptions ; +TYPEDEF: int CFPropertyListMutabilityOptions CONSTANT: kCFPropertyListImmutable 0 CONSTANT: kCFPropertyListMutableContainers 1 CONSTANT: kCFPropertyListMutableContainersAndLeaves 2 diff --git a/ffi/core-foundation/dictionaries/dictionaries.factor b/ffi/core-foundation/dictionaries/dictionaries.factor index 0d514ab233..227081e9ab 100644 --- a/ffi/core-foundation/dictionaries/dictionaries.factor +++ b/ffi/core-foundation/dictionaries/dictionaries.factor @@ -6,8 +6,8 @@ IN: core-foundation.dictionaries SPECIALIZED-ARRAY: void* -TYPEDEF: void* CFDictionaryRef ; -TYPEDEF: void* CFMutableDictionaryRef ; +TYPEDEF: void* CFDictionaryRef +TYPEDEF: void* CFMutableDictionaryRef C-TYPE: CFDictionaryKeyCallBacks C-TYPE: CFDictionaryValueCallBacks diff --git a/ffi/core-foundation/file-descriptors/file-descriptors.factor b/ffi/core-foundation/file-descriptors/file-descriptors.factor index be0d34740b..78565318af 100644 --- a/ffi/core-foundation/file-descriptors/file-descriptors.factor +++ b/ffi/core-foundation/file-descriptors/file-descriptors.factor @@ -4,8 +4,8 @@ USING: alien.c-types alien.syntax core-foundation kernel literals ; IN: core-foundation.file-descriptors -TYPEDEF: void* CFFileDescriptorRef ; -TYPEDEF: int CFFileDescriptorNativeDescriptor ; +TYPEDEF: void* CFFileDescriptorRef +TYPEDEF: int CFFileDescriptorNativeDescriptor CALLBACK: void CFFileDescriptorCallBack ( CFFileDescriptorRef f, diff --git a/ffi/core-foundation/fsevents/fsevents.factor b/ffi/core-foundation/fsevents/fsevents.factor index 2485908e99..b6911f97fb 100644 --- a/ffi/core-foundation/fsevents/fsevents.factor +++ b/ffi/core-foundation/fsevents/fsevents.factor @@ -40,10 +40,10 @@ CONSTANT: kFSEventStreamEventFlagItemIsFile 0x00010000 CONSTANT: kFSEventStreamEventFlagItemIsDir 0x00020000 CONSTANT: kFSEventStreamEventFlagItemIsSymlink 0x00040000 -TYPEDEF: uint FSEventStreamCreateFlags ; -TYPEDEF: uint FSEventStreamEventFlags ; -TYPEDEF: ulonglong FSEventStreamEventId ; -TYPEDEF: void* FSEventStreamRef ; +TYPEDEF: uint FSEventStreamCreateFlags +TYPEDEF: uint FSEventStreamEventFlags +TYPEDEF: ulonglong FSEventStreamEventId +TYPEDEF: void* FSEventStreamRef STRUCT: FSEventStreamContext { version CFIndex } @@ -135,7 +135,7 @@ FUNCTION: CFStringRef FSEventStreamCopyDescription ( FSEventStreamRef streamRef flags FSEventStreamCreate ; -C-GLOBAL: void* kCFRunLoopCommonModes ; +C-GLOBAL: void* kCFRunLoopCommonModes : schedule-event-stream ( event-stream -- ) CFRunLoopGetMain diff --git a/ffi/core-foundation/launch-services/launch-services.factor b/ffi/core-foundation/launch-services/launch-services.factor index e32c81a5a1..7d2150421f 100644 --- a/ffi/core-foundation/launch-services/launch-services.factor +++ b/ffi/core-foundation/launch-services/launch-services.factor @@ -22,92 +22,92 @@ FUNCTION: OSStatus FSRefMakePath ( ) ; ! Abstract base types -CFSTRING: kUTTypeItem "public.item" ; -CFSTRING: kUTTypeContent "public.content" ; -CFSTRING: kUTTypeCompositeContent "public.composite-content" ; -CFSTRING: kUTTypeApplication "com.apple.application" ; -CFSTRING: kUTTypeMessage "public.message" ; -CFSTRING: kUTTypeContact "public.contact" ; -CFSTRING: kUTTypeArchive "public.archive" ; -CFSTRING: kUTTypeDiskImage "public.disk-image" ; +CFSTRING: kUTTypeItem "public.item" +CFSTRING: kUTTypeContent "public.content" +CFSTRING: kUTTypeCompositeContent "public.composite-content" +CFSTRING: kUTTypeApplication "com.apple.application" +CFSTRING: kUTTypeMessage "public.message" +CFSTRING: kUTTypeContact "public.contact" +CFSTRING: kUTTypeArchive "public.archive" +CFSTRING: kUTTypeDiskImage "public.disk-image" ! Concrete base types -CFSTRING: kUTTypeData "public.data" ; -CFSTRING: kUTTypeDirectory "public.directory" ; -CFSTRING: kUTTypeResolvable "com.apple.resolvable" ; -CFSTRING: kUTTypeSymLink "public.symlink" ; -CFSTRING: kUTTypeMountPoint "com.apple.mount-point" ; -CFSTRING: kUTTypeAliasFile "com.apple.alias-file" ; -CFSTRING: kUTTypeAliasRecord "com.apple.alias-record" ; -CFSTRING: kUTTypeURL "public.url" ; -CFSTRING: kUTTypeFileURL "public.file-url" ; +CFSTRING: kUTTypeData "public.data" +CFSTRING: kUTTypeDirectory "public.directory" +CFSTRING: kUTTypeResolvable "com.apple.resolvable" +CFSTRING: kUTTypeSymLink "public.symlink" +CFSTRING: kUTTypeMountPoint "com.apple.mount-point" +CFSTRING: kUTTypeAliasFile "com.apple.alias-file" +CFSTRING: kUTTypeAliasRecord "com.apple.alias-record" +CFSTRING: kUTTypeURL "public.url" +CFSTRING: kUTTypeFileURL "public.file-url" ! Text types -CFSTRING: kUTTypeText "public.text" ; -CFSTRING: kUTTypePlainText "public.plain-text" ; -CFSTRING: kUTTypeUTF8PlainText "public.utf8-plain-text" ; -CFSTRING: kUTTypeUTF16ExternalPlainText "public.utf16-external-plain-text" ; -CFSTRING: kUTTypeUTF16PlainText "public.utf16-plain-text" ; -CFSTRING: kUTTypeRTF "public.rtf" ; -CFSTRING: kUTTypeHTML "public.html" ; -CFSTRING: kUTTypeXML "public.xml" ; -CFSTRING: kUTTypeSourceCode "public.source-code" ; -CFSTRING: kUTTypeCSource "public.c-source" ; -CFSTRING: kUTTypeObjectiveCSource "public.objective-c-source" ; -CFSTRING: kUTTypeCPlusPlusSource "public.c-plus-plus-source" ; -CFSTRING: kUTTypeObjectiveCPlusPlusSource "public.objective-c-plus-plus-source" ; -CFSTRING: kUTTypeCHeader "public.c-header" ; -CFSTRING: kUTTypeCPlusPlusHeader "public.c-plus-plus-header" ; -CFSTRING: kUTTypeJavaSource "com.sun.java-source" ; +CFSTRING: kUTTypeText "public.text" +CFSTRING: kUTTypePlainText "public.plain-text" +CFSTRING: kUTTypeUTF8PlainText "public.utf8-plain-text" +CFSTRING: kUTTypeUTF16ExternalPlainText "public.utf16-external-plain-text" +CFSTRING: kUTTypeUTF16PlainText "public.utf16-plain-text" +CFSTRING: kUTTypeRTF "public.rtf" +CFSTRING: kUTTypeHTML "public.html" +CFSTRING: kUTTypeXML "public.xml" +CFSTRING: kUTTypeSourceCode "public.source-code" +CFSTRING: kUTTypeCSource "public.c-source" +CFSTRING: kUTTypeObjectiveCSource "public.objective-c-source" +CFSTRING: kUTTypeCPlusPlusSource "public.c-plus-plus-source" +CFSTRING: kUTTypeObjectiveCPlusPlusSource "public.objective-c-plus-plus-source" +CFSTRING: kUTTypeCHeader "public.c-header" +CFSTRING: kUTTypeCPlusPlusHeader "public.c-plus-plus-header" +CFSTRING: kUTTypeJavaSource "com.sun.java-source" ! Composite content types -CFSTRING: kUTTypePDF "com.adobe.pdf" ; -CFSTRING: kUTTypeRTFD "com.apple.rtfd" ; -CFSTRING: kUTTypeFlatRTFD "com.apple.flat-rtfd" ; -CFSTRING: kUTTypeTXNTextAndMultimediaData "com.apple.txn.text-multimedia-data" ; -CFSTRING: kUTTypeWebArchive "com.apple.webarchive" ; +CFSTRING: kUTTypePDF "com.adobe.pdf" +CFSTRING: kUTTypeRTFD "com.apple.rtfd" +CFSTRING: kUTTypeFlatRTFD "com.apple.flat-rtfd" +CFSTRING: kUTTypeTXNTextAndMultimediaData "com.apple.txn.text-multimedia-data" +CFSTRING: kUTTypeWebArchive "com.apple.webarchive" ! Image content types -CFSTRING: kUTTypeImage "public.image" ; -CFSTRING: kUTTypeJPEG "public.jpeg" ; -CFSTRING: kUTTypeJPEG2000 "public.jpeg-2000" ; -CFSTRING: kUTTypeTIFF "public.tiff" ; -CFSTRING: kUTTypePICT "com.apple.pict" ; -CFSTRING: kUTTypeGIF "com.compuserve.gif" ; -CFSTRING: kUTTypePNG "public.png" ; -CFSTRING: kUTTypeQuickTimeImage "com.apple.quicktime-image" ; -CFSTRING: kUTTypeAppleICNS "com.apple.icns" ; -CFSTRING: kUTTypeBMP "com.microsoft.bmp" ; -CFSTRING: kUTTypeICO "com.microsoft.ico" ; +CFSTRING: kUTTypeImage "public.image" +CFSTRING: kUTTypeJPEG "public.jpeg" +CFSTRING: kUTTypeJPEG2000 "public.jpeg-2000" +CFSTRING: kUTTypeTIFF "public.tiff" +CFSTRING: kUTTypePICT "com.apple.pict" +CFSTRING: kUTTypeGIF "com.compuserve.gif" +CFSTRING: kUTTypePNG "public.png" +CFSTRING: kUTTypeQuickTimeImage "com.apple.quicktime-image" +CFSTRING: kUTTypeAppleICNS "com.apple.icns" +CFSTRING: kUTTypeBMP "com.microsoft.bmp" +CFSTRING: kUTTypeICO "com.microsoft.ico" ! Audiovisual content types -CFSTRING: kUTTypeAudiovisualContent "public.audiovisual-content" ; -CFSTRING: kUTTypeMovie "public.movie" ; -CFSTRING: kUTTypeVideo "public.video" ; -CFSTRING: kUTTypeAudio "public.audio" ; -CFSTRING: kUTTypeQuickTimeMovie "com.apple.quicktime-movie" ; -CFSTRING: kUTTypeMPEG "public.mpeg" ; -CFSTRING: kUTTypeMPEG4 "public.mpeg-4" ; -CFSTRING: kUTTypeMP3 "public.mp3" ; -CFSTRING: kUTTypeMPEG4Audio "public.mpeg-4-audio" ; -CFSTRING: kUTTypeAppleProtectedMPEG4Audio "com.apple.protected-mpeg-4-audio" ; +CFSTRING: kUTTypeAudiovisualContent "public.audiovisual-content" +CFSTRING: kUTTypeMovie "public.movie" +CFSTRING: kUTTypeVideo "public.video" +CFSTRING: kUTTypeAudio "public.audio" +CFSTRING: kUTTypeQuickTimeMovie "com.apple.quicktime-movie" +CFSTRING: kUTTypeMPEG "public.mpeg" +CFSTRING: kUTTypeMPEG4 "public.mpeg-4" +CFSTRING: kUTTypeMP3 "public.mp3" +CFSTRING: kUTTypeMPEG4Audio "public.mpeg-4-audio" +CFSTRING: kUTTypeAppleProtectedMPEG4Audio "com.apple.protected-mpeg-4-audio" ! Directory types -CFSTRING: kUTTypeFolder "public.folder" ; -CFSTRING: kUTTypeVolume "public.volume" ; -CFSTRING: kUTTypePackage "com.apple.package" ; -CFSTRING: kUTTypeBundle "com.apple.bundle" ; -CFSTRING: kUTTypeFramework "com.apple.framework" ; +CFSTRING: kUTTypeFolder "public.folder" +CFSTRING: kUTTypeVolume "public.volume" +CFSTRING: kUTTypePackage "com.apple.package" +CFSTRING: kUTTypeBundle "com.apple.bundle" +CFSTRING: kUTTypeFramework "com.apple.framework" ! Application types -CFSTRING: kUTTypeApplicationBundle "com.apple.application-bundle" ; -CFSTRING: kUTTypeApplicationFile "com.apple.application-file" ; +CFSTRING: kUTTypeApplicationBundle "com.apple.application-bundle" +CFSTRING: kUTTypeApplicationFile "com.apple.application-file" ! Contact types -CFSTRING: kUTTypeVCard "public.vcard" ; +CFSTRING: kUTTypeVCard "public.vcard" ! Misc. types -CFSTRING: kUTTypeInkText "com.apple.ink.inktext" ; +CFSTRING: kUTTypeInkText "com.apple.ink.inktext" CONSTANT: kLSUnknownCreator f diff --git a/ffi/core-foundation/numbers/numbers.factor b/ffi/core-foundation/numbers/numbers.factor index 5f1961e50e..d3447d8450 100644 --- a/ffi/core-foundation/numbers/numbers.factor +++ b/ffi/core-foundation/numbers/numbers.factor @@ -6,9 +6,9 @@ QUALIFIED-WITH: alien.c-types c FROM: math => float ; IN: core-foundation.numbers -TYPEDEF: void* CFNumberRef ; +TYPEDEF: void* CFNumberRef -TYPEDEF: int CFNumberType ; +TYPEDEF: int CFNumberType CONSTANT: kCFNumberSInt8Type 1 CONSTANT: kCFNumberSInt16Type 2 CONSTANT: kCFNumberSInt32Type 3 diff --git a/ffi/core-foundation/run-loop/run-loop.factor b/ffi/core-foundation/run-loop/run-loop.factor index 6e439917e8..541b8e011f 100644 --- a/ffi/core-foundation/run-loop/run-loop.factor +++ b/ffi/core-foundation/run-loop/run-loop.factor @@ -13,8 +13,8 @@ CONSTANT: kCFRunLoopRunStopped 2 CONSTANT: kCFRunLoopRunTimedOut 3 CONSTANT: kCFRunLoopRunHandledSource 4 -TYPEDEF: void* CFRunLoopRef ; -TYPEDEF: void* CFRunLoopSourceRef ; +TYPEDEF: void* CFRunLoopRef +TYPEDEF: void* CFRunLoopSourceRef FUNCTION: CFRunLoopRef CFRunLoopGetMain ( ) ; FUNCTION: CFRunLoopRef CFRunLoopGetCurrent ( ) ; @@ -55,7 +55,7 @@ FUNCTION: void CFRunLoopRemoveTimer ( CFStringRef mode ) ; -CFSTRING: CFRunLoopDefaultMode "kCFRunLoopDefaultMode" ; +CFSTRING: CFRunLoopDefaultMode "kCFRunLoopDefaultMode" TUPLE: run-loop-state fds sources timers ; diff --git a/ffi/core-foundation/strings/strings.factor b/ffi/core-foundation/strings/strings.factor index 0dffea0c9b..0d91923acb 100644 --- a/ffi/core-foundation/strings/strings.factor +++ b/ffi/core-foundation/strings/strings.factor @@ -7,9 +7,9 @@ io.encodings.string io.encodings.utf8 kernel math math.order parser sequences words lexer ; IN: core-foundation.strings -TYPEDEF: void* CFStringRef ; +TYPEDEF: void* CFStringRef -TYPEDEF: int CFStringEncoding ; +TYPEDEF: int CFStringEncoding CONSTANT: kCFStringEncodingMacRoman 0x0 CONSTANT: kCFStringEncodingWindowsLatin1 0x0500 CONSTANT: kCFStringEncodingISOLatin1 0x0201 @@ -97,6 +97,6 @@ FUNCTION: CFStringRef CFCopyTypeIDDescription ( CFTypeID type_id ) ; CFGetTypeID [ CFCopyTypeIDDescription &CFRelease CF>string ] with-destructors ; SYNTAX: \ CFSTRING: - scan-new-word scan-object ";" expect + scan-new-word scan-object [ drop ] [ $[ _ [ _ ] initialize-alien ] ] 2bi ( -- alien ) define-declared ; diff --git a/ffi/core-foundation/time/time.factor b/ffi/core-foundation/time/time.factor index 76637083b3..8139f425f6 100644 --- a/ffi/core-foundation/time/time.factor +++ b/ffi/core-foundation/time/time.factor @@ -3,8 +3,8 @@ USING: alien.c-types alien.syntax calendar literals math ; IN: core-foundation.time -TYPEDEF: double CFTimeInterval ; -TYPEDEF: double CFAbsoluteTime ; +TYPEDEF: double CFTimeInterval +TYPEDEF: double CFAbsoluteTime ALIAS: >CFTimeInterval duration>seconds diff --git a/ffi/core-foundation/timers/timers.factor b/ffi/core-foundation/timers/timers.factor index e993111105..e20590e8f4 100644 --- a/ffi/core-foundation/timers/timers.factor +++ b/ffi/core-foundation/timers/timers.factor @@ -4,14 +4,14 @@ USING: alien.c-types alien.syntax calendar.unix core-foundation core-foundation.time locals ; IN: core-foundation.timers -TYPEDEF: void* CFRunLoopTimerRef ; +TYPEDEF: void* CFRunLoopTimerRef CALLBACK: void CFRunLoopTimerCallBack ( CFRunLoopTimerRef timer, void *info ) ; -TYPEDEF: void* CFRunLoopTimerContext ; +TYPEDEF: void* CFRunLoopTimerContext FUNCTION: CFRunLoopTimerRef CFRunLoopTimerCreate ( CFAllocatorRef allocator, diff --git a/ffi/core-foundation/urls/urls.factor b/ffi/core-foundation/urls/urls.factor index 5a1d78b22c..2f0ba745d3 100644 --- a/ffi/core-foundation/urls/urls.factor +++ b/ffi/core-foundation/urls/urls.factor @@ -6,7 +6,7 @@ IN: core-foundation.urls CONSTANT: kCFURLPOSIXPathStyle 0 -TYPEDEF: void* CFURLRef ; +TYPEDEF: void* CFURLRef FUNCTION: CFURLRef CFURLCreateWithFileSystemPath ( CFAllocatorRef allocator, CFStringRef filePath, int pathStyle, Boolean isDirectory ) ; diff --git a/ffi/core-graphics/core-graphics.factor b/ffi/core-graphics/core-graphics.factor index f7c64dc9d1..1a7f1db272 100644 --- a/ffi/core-graphics/core-graphics.factor +++ b/ffi/core-graphics/core-graphics.factor @@ -10,7 +10,7 @@ libc math opengl.gl sequences ; IN: core-graphics -TYPEDEF: int CGImageAlphaInfo ; +TYPEDEF: int CGImageAlphaInfo CONSTANT: kCGImageAlphaNone 0 CONSTANT: kCGImageAlphaPremultipliedLast 1 CONSTANT: kCGImageAlphaPremultipliedFirst 2 diff --git a/ffi/core-graphics/types/types.factor b/ffi/core-graphics/types/types.factor index 3fdcc8dc9f..59fb1cfd92 100644 --- a/ffi/core-graphics/types/types.factor +++ b/ffi/core-graphics/types/types.factor @@ -73,17 +73,17 @@ STRUCT: CGAffineTransform { tx CGFloat } { ty CGFloat } ; -TYPEDEF: void* CGColorRef ; -TYPEDEF: void* CGColorSpaceRef ; -TYPEDEF: void* CGContextRef ; -TYPEDEF: void* CGImageRef ; -TYPEDEF: void* CGImageDestinationRef ; +TYPEDEF: void* CGColorRef +TYPEDEF: void* CGColorSpaceRef +TYPEDEF: void* CGContextRef +TYPEDEF: void* CGImageRef +TYPEDEF: void* CGImageDestinationRef -TYPEDEF: uint CGBitmapInfo ; +TYPEDEF: uint CGBitmapInfo -TYPEDEF: int CGLError ; -TYPEDEF: int CGError ; -TYPEDEF: uint CGDirectDisplayID ; -TYPEDEF: int boolean_t ; -TYPEDEF: void* CGLContextObj ; -TYPEDEF: int CGLContextParameter ; +TYPEDEF: int CGLError +TYPEDEF: int CGError +TYPEDEF: uint CGDirectDisplayID +TYPEDEF: int boolean_t +TYPEDEF: void* CGLContextObj +TYPEDEF: int CGLContextParameter diff --git a/ffi/core-text/core-text.factor b/ffi/core-text/core-text.factor index 36b2b5aad4..f14ac3f2fa 100644 --- a/ffi/core-text/core-text.factor +++ b/ffi/core-text/core-text.factor @@ -8,16 +8,16 @@ fonts init kernel locals make math math.functions math.order math.vectors memoize namespaces sequences strings ; IN: core-text -TYPEDEF: void* CTLineRef ; +TYPEDEF: void* CTLineRef -C-GLOBAL: CFStringRef kCTFontAttributeName ; -C-GLOBAL: CFStringRef kCTKernAttributeName ; -C-GLOBAL: CFStringRef kCTLigatureAttributeName ; -C-GLOBAL: CFStringRef kCTForegroundColorAttributeName ; -C-GLOBAL: CFStringRef kCTParagraphStyleAttributeName ; -C-GLOBAL: CFStringRef kCTUnderlineStyleAttributeName ; -C-GLOBAL: CFStringRef kCTVerticalFormsAttributeName ; -C-GLOBAL: CFStringRef kCTGlyphInfoAttributeName ; +C-GLOBAL: CFStringRef kCTFontAttributeName +C-GLOBAL: CFStringRef kCTKernAttributeName +C-GLOBAL: CFStringRef kCTLigatureAttributeName +C-GLOBAL: CFStringRef kCTForegroundColorAttributeName +C-GLOBAL: CFStringRef kCTParagraphStyleAttributeName +C-GLOBAL: CFStringRef kCTUnderlineStyleAttributeName +C-GLOBAL: CFStringRef kCTVerticalFormsAttributeName +C-GLOBAL: CFStringRef kCTGlyphInfoAttributeName FUNCTION: CTLineRef CTLineCreateWithAttributedString ( CFAttributedStringRef string ) ; diff --git a/ffi/core-text/fonts/fonts.factor b/ffi/core-text/fonts/fonts.factor index 294caded2c..3b3b540004 100644 --- a/ffi/core-text/fonts/fonts.factor +++ b/ffi/core-text/fonts/fonts.factor @@ -6,8 +6,8 @@ core-foundation.strings core-graphics.types destructors fonts init kernel locals math memoize unix.types ; IN: core-text.fonts -TYPEDEF: void* CTFontRef ; -TYPEDEF: void* CTFontDescriptorRef ; +TYPEDEF: void* CTFontRef +TYPEDEF: void* CTFontDescriptorRef ! CTFontSymbolicTraits : kCTFontItalicTrait ( -- n ) 0 2^ ; inline @@ -18,28 +18,28 @@ TYPEDEF: void* CTFontDescriptorRef ; : kCTFontVerticalTrait ( -- n ) 11 2^ ; inline : kCTFontUIOptimizedTrait ( -- n ) 12 2^ ; inline -C-GLOBAL: CFStringRef kCTFontSymbolicTrait ; -C-GLOBAL: CFStringRef kCTFontWeightTrait ; -C-GLOBAL: CFStringRef kCTFontWidthTrait ; -C-GLOBAL: CFStringRef kCTFontSlantTrait ; +C-GLOBAL: CFStringRef kCTFontSymbolicTrait +C-GLOBAL: CFStringRef kCTFontWeightTrait +C-GLOBAL: CFStringRef kCTFontWidthTrait +C-GLOBAL: CFStringRef kCTFontSlantTrait -C-GLOBAL: CFStringRef kCTFontNameAttribute ; -C-GLOBAL: CFStringRef kCTFontDisplayNameAttribute ; -C-GLOBAL: CFStringRef kCTFontFamilyNameAttribute ; -C-GLOBAL: CFStringRef kCTFontStyleNameAttribute ; -C-GLOBAL: CFStringRef kCTFontTraitsAttribute ; -C-GLOBAL: CFStringRef kCTFontVariationAttribute ; -C-GLOBAL: CFStringRef kCTFontSizeAttribute ; -C-GLOBAL: CFStringRef kCTFontMatrixAttribute ; -C-GLOBAL: CFStringRef kCTFontCascadeListAttribute ; -C-GLOBAL: CFStringRef kCTFontCharacterSetAttribute ; -C-GLOBAL: CFStringRef kCTFontLanguagesAttribute ; -C-GLOBAL: CFStringRef kCTFontBaselineAdjustAttribute ; -C-GLOBAL: CFStringRef kCTFontMacintoshEncodingsAttribute ; -C-GLOBAL: CFStringRef kCTFontFeaturesAttribute ; -C-GLOBAL: CFStringRef kCTFontFeatureSettingsAttribute ; -C-GLOBAL: CFStringRef kCTFontFixedAdvanceAttribute ; -C-GLOBAL: CFStringRef kCTFontOrientationAttribute ; +C-GLOBAL: CFStringRef kCTFontNameAttribute +C-GLOBAL: CFStringRef kCTFontDisplayNameAttribute +C-GLOBAL: CFStringRef kCTFontFamilyNameAttribute +C-GLOBAL: CFStringRef kCTFontStyleNameAttribute +C-GLOBAL: CFStringRef kCTFontTraitsAttribute +C-GLOBAL: CFStringRef kCTFontVariationAttribute +C-GLOBAL: CFStringRef kCTFontSizeAttribute +C-GLOBAL: CFStringRef kCTFontMatrixAttribute +C-GLOBAL: CFStringRef kCTFontCascadeListAttribute +C-GLOBAL: CFStringRef kCTFontCharacterSetAttribute +C-GLOBAL: CFStringRef kCTFontLanguagesAttribute +C-GLOBAL: CFStringRef kCTFontBaselineAdjustAttribute +C-GLOBAL: CFStringRef kCTFontMacintoshEncodingsAttribute +C-GLOBAL: CFStringRef kCTFontFeaturesAttribute +C-GLOBAL: CFStringRef kCTFontFeatureSettingsAttribute +C-GLOBAL: CFStringRef kCTFontFixedAdvanceAttribute +C-GLOBAL: CFStringRef kCTFontOrientationAttribute FUNCTION: CTFontDescriptorRef CTFontDescriptorCreateWithAttributes ( CFDictionaryRef attributes diff --git a/ffi/cuda/demos/hello-world/hello-world.factor b/ffi/cuda/demos/hello-world/hello-world.factor index cca80c118a..2fb1e07183 100644 --- a/ffi/cuda/demos/hello-world/hello-world.factor +++ b/ffi/cuda/demos/hello-world/hello-world.factor @@ -6,7 +6,7 @@ destructors io io.encodings.string io.encodings.utf8 kernel locals math math.parser namespaces sequences strings ; IN: cuda.demos.hello-world -CUDA-LIBRARY: hello cuda32 "vocab:cuda/demos/hello-world/hello.ptx" ; +CUDA-LIBRARY: hello cuda32 "vocab:cuda/demos/hello-world/hello.ptx" CUDA-FUNCTION: helloWorld ( char* string-ptr ) ; diff --git a/ffi/cuda/demos/prefix-sum/prefix-sum.factor b/ffi/cuda/demos/prefix-sum/prefix-sum.factor index dcdbb3b236..4670eff313 100644 --- a/ffi/cuda/demos/prefix-sum/prefix-sum.factor +++ b/ffi/cuda/demos/prefix-sum/prefix-sum.factor @@ -3,7 +3,7 @@ USING: alien.c-types cuda cuda.contexts cuda.libraries cuda.syntax locals ; IN: cuda.demos.prefix-sum -CUDA-LIBRARY: prefix-sum cuda32 "vocab:cuda/demos/prefix-sum/prefix-sum.ptx" ; +CUDA-LIBRARY: prefix-sum cuda32 "vocab:cuda/demos/prefix-sum/prefix-sum.ptx" CUDA-FUNCTION: prefix_sum_block ( uint* in, uint* out, uint n ) ; diff --git a/ffi/cuda/ffi/ffi.factor b/ffi/cuda/ffi/ffi.factor index 208a01c234..8a3fd47e78 100644 --- a/ffi/cuda/ffi/ffi.factor +++ b/ffi/cuda/ffi/ffi.factor @@ -13,16 +13,16 @@ COMPILE> LIBRARY: cuda -TYPEDEF: uint CUdeviceptr ; -TYPEDEF: int CUdevice ; -TYPEDEF: void* CUcontext ; -TYPEDEF: void* CUmodule ; -TYPEDEF: void* CUfunction ; -TYPEDEF: void* CUarray ; -TYPEDEF: void* CUtexref ; -TYPEDEF: void* CUevent ; -TYPEDEF: void* CUstream ; -TYPEDEF: void* CUgraphicsResource ; +TYPEDEF: uint CUdeviceptr +TYPEDEF: int CUdevice +TYPEDEF: void* CUcontext +TYPEDEF: void* CUmodule +TYPEDEF: void* CUfunction +TYPEDEF: void* CUarray +TYPEDEF: void* CUtexref +TYPEDEF: void* CUevent +TYPEDEF: void* CUstream +TYPEDEF: void* CUgraphicsResource ! versions of double and longlong that always 8-byte align diff --git a/ffi/cuda/syntax/syntax.factor b/ffi/cuda/syntax/syntax.factor index 4a6dcb8b6f..4d39000ecc 100644 --- a/ffi/cuda/syntax/syntax.factor +++ b/ffi/cuda/syntax/syntax.factor @@ -5,13 +5,13 @@ parser ; IN: cuda.syntax SYNTAX: \ CUDA-LIBRARY: - scan-token scan-word scan-object ";" expect + scan-token scan-word scan-object $[ _ _ add-cuda-library ] [ current-cuda-library set-global ] bi ; SYNTAX: \ CUDA-FUNCTION: scan-token [ create-word-in current-cuda-library get ] keep - scan-c-args ";" expect define-cuda-function ; + scan-c-args define-cuda-function ; SYNTAX: \ CUDA-GLOBAL: scan-token [ create-word-in current-cuda-library get ] keep diff --git a/ffi/curl/ffi/ffi.factor b/ffi/curl/ffi/ffi.factor index 8ed1ce5f06..f7fa5f09f6 100644 --- a/ffi/curl/ffi/ffi.factor +++ b/ffi/curl/ffi/ffi.factor @@ -333,8 +333,8 @@ ALIAS: CURLOPT_RTSPHEADER CURLOPT_HTTPHEADER ! easy.h -TYPEDEF: void CURL ; -TYPEDEF: int64_t curl_off_t ; +TYPEDEF: void CURL +TYPEDEF: int64_t curl_off_t FUNCTION: CURL* curl_easy_init ( ) ; @@ -384,7 +384,7 @@ CONSTANT: CURL_SOCKOPT_OK 0 CONSTANT: CURL_SOCKOPT_ERROR 1 CONSTANT: CURL_SOCKOPT_ALREADY_CONNECTED 2 -TYPEDEF: int curl_socket_t ; +TYPEDEF: int curl_socket_t CALLBACK: int sockopt_callback ( void* clientp, curl_socket_t curlfd, curlsocktype purpose ) ; diff --git a/ffi/curses/ffi/ffi.factor b/ffi/curses/ffi/ffi.factor index 296a7d346a..12d6fcab08 100644 --- a/ffi/curses/ffi/ffi.factor +++ b/ffi/curses/ffi/ffi.factor @@ -11,13 +11,13 @@ COMPILE< "curses" { } cond cdecl add-library COMPILE> C-TYPE: SCREEN -TYPEDEF: void* va_list ; +TYPEDEF: void* va_list -TYPEDEF: uint chtype ; -TYPEDEF: chtype attr_t ; -TYPEDEF: short NCURSES_SIZE_T ; -TYPEDEF: ushort wchar_t ; -TYPEDEF: ulong mmask_t ; +TYPEDEF: uint chtype +TYPEDEF: chtype attr_t +TYPEDEF: short NCURSES_SIZE_T +TYPEDEF: ushort wchar_t +TYPEDEF: ulong mmask_t CONSTANT: CCHARW_MAX 5 @@ -83,7 +83,7 @@ STRUCT: MEVENT LIBRARY: curses -C-GLOBAL: void* stdscr ; +C-GLOBAL: void* stdscr FUNCTION: WINDOW* initscr ( ) ; FUNCTION: int endwin ( ) ; @@ -248,8 +248,8 @@ FUNCTION: bool can_change_color ( ) ; FUNCTION: int color_content ( short color, short* r, short* g, short* b ) ; FUNCTION: int pair_content ( short pair, short* f, short* b ) ; -C-GLOBAL: int COLORS ; -C-GLOBAL: int COLOR_PAIRS ; +C-GLOBAL: int COLORS +C-GLOBAL: int COLOR_PAIRS : COLOR_PAIR ( n -- n' ) 8 shift ; inline foldable diff --git a/ffi/fftw/ffi/ffi.factor b/ffi/fftw/ffi/ffi.factor index b63bfd3c4b..aad6874a1b 100644 --- a/ffi/fftw/ffi/ffi.factor +++ b/ffi/fftw/ffi/ffi.factor @@ -14,9 +14,9 @@ COMPILE< "fftw3" { { [ os unix? ] [ "libfftw3.so" ] } } cond cdecl add-library COMPILE> -TYPEDEF: double[2] fftw_complex ; +TYPEDEF: double[2] fftw_complex -TYPEDEF: void* fftw_plan ; +TYPEDEF: void* fftw_plan CONSTANT: FFTW_FORWARD -1 CONSTANT: FFTW_BACKWARD 1 diff --git a/ffi/forestdb/ffi/ffi.factor b/ffi/forestdb/ffi/ffi.factor index 43954a30e3..25a9526908 100644 --- a/ffi/forestdb/ffi/ffi.factor +++ b/ffi/forestdb/ffi/ffi.factor @@ -17,15 +17,15 @@ CONSTANT: FDB_MAX_METALEN 65512 CONSTANT: FDB_MAX_BODYLEN 4294967295 CONSTANT: FDB_SNAPSHOT_INMEM -1 -TYPEDEF: uint64_t fdb_seqnum_t ; -TYPEDEF: int64_t cs_off_t ; +TYPEDEF: uint64_t fdb_seqnum_t +TYPEDEF: int64_t cs_off_t -TYPEDEF: void* fdb_custom_cmp_fixed ; -TYPEDEF: void* fdb_custom_cmp_variable ; -TYPEDEF: void* fdb_file_handle ; -TYPEDEF: void* fdb_kvs_handle ; -TYPEDEF: void* fdb_iterator ; -TYPEDEF: void* fdb_changes_callback_fn ; +TYPEDEF: void* fdb_custom_cmp_fixed +TYPEDEF: void* fdb_custom_cmp_variable +TYPEDEF: void* fdb_file_handle +TYPEDEF: void* fdb_kvs_handle +TYPEDEF: void* fdb_iterator +TYPEDEF: void* fdb_changes_callback_fn ENUM: fdb_open_flags < uint32_t { FDB_OPEN_FLAG_CREATE 1 } @@ -222,7 +222,7 @@ STRUCT: fdb_kvs_commit_marker_t { kv_store_name char* } { seqnum fdb_seqnum_t } ; -TYPEDEF: uint64_t fdb_snapshot_marker_t ; +TYPEDEF: uint64_t fdb_snapshot_marker_t STRUCT: fdb_snapshot_info_t { marker fdb_snapshot_marker_t } diff --git a/ffi/freetype/freetype.factor b/ffi/freetype/freetype.factor index b89eca6c5a..5056c03373 100644 --- a/ffi/freetype/freetype.factor +++ b/ffi/freetype/freetype.factor @@ -12,28 +12,28 @@ COMPILE< "freetype" { LIBRARY: freetype -TYPEDEF: uchar FT_Byte ; -TYPEDEF: void* FT_Bytes ; -TYPEDEF: char FT_Char ; -TYPEDEF: int FT_Int ; -TYPEDEF: int FT_Int32 ; -TYPEDEF: uint FT_UInt ; -TYPEDEF: short FT_Short ; -TYPEDEF: ushort FT_UShort ; -TYPEDEF: long FT_Long ; -TYPEDEF: ulong FT_ULong ; -TYPEDEF: uchar FT_Bool ; -TYPEDEF: ulong FT_Offset ; -TYPEDEF: int FT_PtrDist ; -TYPEDEF: char FT_String ; -TYPEDEF: int FT_Tag ; -TYPEDEF: int FT_Error ; -TYPEDEF: long FT_Fixed ; -TYPEDEF: void* FT_Pointer ; -TYPEDEF: long FT_Pos ; -TYPEDEF: ushort FT_UFWord ; -TYPEDEF: short FT_F2Dot14 ; -TYPEDEF: long FT_F26Dot6 ; +TYPEDEF: uchar FT_Byte +TYPEDEF: void* FT_Bytes +TYPEDEF: char FT_Char +TYPEDEF: int FT_Int +TYPEDEF: int FT_Int32 +TYPEDEF: uint FT_UInt +TYPEDEF: short FT_Short +TYPEDEF: ushort FT_UShort +TYPEDEF: long FT_Long +TYPEDEF: ulong FT_ULong +TYPEDEF: uchar FT_Bool +TYPEDEF: ulong FT_Offset +TYPEDEF: int FT_PtrDist +TYPEDEF: char FT_String +TYPEDEF: int FT_Tag +TYPEDEF: int FT_Error +TYPEDEF: long FT_Fixed +TYPEDEF: void* FT_Pointer +TYPEDEF: long FT_Pos +TYPEDEF: ushort FT_UFWord +TYPEDEF: short FT_F2Dot14 +TYPEDEF: long FT_F26Dot6 FUNCTION: FT_Error FT_Init_FreeType ( void* library ) ; diff --git a/ffi/gdbm/ffi/ffi.factor b/ffi/gdbm/ffi/ffi.factor index 1ca3f36595..8962a5e990 100755 --- a/ffi/gdbm/ffi/ffi.factor +++ b/ffi/gdbm/ffi/ffi.factor @@ -10,7 +10,7 @@ cdecl add-library COMPILE> LIBRARY: libgdbm -C-GLOBAL: c-string gdbm_version ; +C-GLOBAL: c-string gdbm_version CONSTANT: GDBM_SYNC 0x20 CONSTANT: GDBM_NOLOCK 0x40 @@ -26,7 +26,7 @@ CONSTANT: GDBM_COALESCEBLKS 5 STRUCT: datum { dptr char* } { dsize int } ; C-TYPE: _GDBM_FILE -TYPEDEF: _GDBM_FILE* GDBM_FILE ; +TYPEDEF: _GDBM_FILE* GDBM_FILE CALLBACK: void fatal_func_cb ( ) ; FUNCTION: GDBM_FILE gdbm_open ( c-string name, int block_size, int read_write, int mode, fatal_func_cb fatal_func ) ; @@ -42,6 +42,6 @@ FUNCTION: int gdbm_exists ( GDBM_FILE dbf, datum key ) ; FUNCTION: int gdbm_setopt ( GDBM_FILE dbf, int option, int* value, int size ) ; FUNCTION: int gdbm_fdesc ( GDBM_FILE dbf ) ; -C-GLOBAL: int gdbm_errno ; +C-GLOBAL: int gdbm_errno FUNCTION: c-string gdbm_strerror ( int errno ) ; diff --git a/ffi/gdk/ffi/ffi.factor b/ffi/gdk/ffi/ffi.factor index 51bc23cd95..852a0811d8 100644 --- a/ffi/gdk/ffi/ffi.factor +++ b/ffi/gdk/ffi/ffi.factor @@ -28,13 +28,13 @@ STRUCT: cairo_rectangle_int_t C-TYPE: cairo_region_t ! workaround> -FOREIGN-RECORD-TYPE: cairo.RectangleInt cairo_rectangle_int_t ; -FOREIGN-RECORD-TYPE: cairo.Region cairo_region_t ; -FOREIGN-RECORD-TYPE: cairo.FontOptions cairo_font_options_t ; -FOREIGN-RECORD-TYPE: cairo.Surface cairo_surface_t ; -FOREIGN-RECORD-TYPE: cairo.Pattern cairo_pattern_t ; -FOREIGN-RECORD-TYPE: cairo.Context cairo_t ; -FOREIGN-ENUM-TYPE: cairo.Content cairo_content_t ; +FOREIGN-RECORD-TYPE: cairo.RectangleInt cairo_rectangle_int_t +FOREIGN-RECORD-TYPE: cairo.Region cairo_region_t +FOREIGN-RECORD-TYPE: cairo.FontOptions cairo_font_options_t +FOREIGN-RECORD-TYPE: cairo.Surface cairo_surface_t +FOREIGN-RECORD-TYPE: cairo.Pattern cairo_pattern_t +FOREIGN-RECORD-TYPE: cairo.Context cairo_t +FOREIGN-ENUM-TYPE: cairo.Content cairo_content_t GIR: vocab:gdk/Gdk-3.0.gir diff --git a/ffi/gobject-introspection/gobject-introspection.factor b/ffi/gobject-introspection/gobject-introspection.factor index 2ebea5b512..ed4a56abd1 100755 --- a/ffi/gobject-introspection/gobject-introspection.factor +++ b/ffi/gobject-introspection/gobject-introspection.factor @@ -60,10 +60,10 @@ SYNTAX: \ IMPLEMENT-STRUCTS: implement-structs [ swap append! ] change-global ; SYNTAX: \ FOREIGN-ATOMIC-TYPE: - scan-token scan-object ";" expect swap register-atomic-type ; + scan-token scan-object swap register-atomic-type ; SYNTAX: \ FOREIGN-ENUM-TYPE: - scan-token scan-object ";" expect swap register-enum-type ; + scan-token scan-object swap register-enum-type ; SYNTAX: \ FOREIGN-RECORD-TYPE: - scan-token scan-object ";" expect swap register-record-type ; + scan-token scan-object swap register-record-type ; diff --git a/ffi/gobject-introspection/standard-types/standard-types.factor b/ffi/gobject-introspection/standard-types/standard-types.factor index 2e6c296176..816f16962c 100644 --- a/ffi/gobject-introspection/standard-types/standard-types.factor +++ b/ffi/gobject-introspection/standard-types/standard-types.factor @@ -5,34 +5,34 @@ classes.struct gobject-introspection.types kernel parser ; IN: gobject-introspection.standard-types COMPILE< -TYPEDEF: char gchar ; -TYPEDEF: uchar guchar ; -TYPEDEF: short gshort ; -TYPEDEF: ushort gushort ; -TYPEDEF: long glong ; -TYPEDEF: ulong gulong ; -TYPEDEF: int gint ; -TYPEDEF: uint guint ; +TYPEDEF: char gchar +TYPEDEF: uchar guchar +TYPEDEF: short gshort +TYPEDEF: ushort gushort +TYPEDEF: long glong +TYPEDEF: ulong gulong +TYPEDEF: int gint +TYPEDEF: uint guint -TYPEDEF: char gint8 ; -TYPEDEF: uchar guint8 ; -TYPEDEF: short gint16 ; -TYPEDEF: ushort guint16 ; -TYPEDEF: int gint32 ; -TYPEDEF: uint guint32 ; -TYPEDEF: longlong gint64 ; -TYPEDEF: ulonglong guint64 ; +TYPEDEF: char gint8 +TYPEDEF: uchar guint8 +TYPEDEF: short gint16 +TYPEDEF: ushort guint16 +TYPEDEF: int gint32 +TYPEDEF: uint guint32 +TYPEDEF: longlong gint64 +TYPEDEF: ulonglong guint64 -TYPEDEF: float gfloat ; -TYPEDEF: double gdouble ; +TYPEDEF: float gfloat +TYPEDEF: double gdouble -TYPEDEF: size_t gsize ; -TYPEDEF: long gssize ; +TYPEDEF: size_t gsize +TYPEDEF: long gssize -TYPEDEF: gulong GType ; -TYPEDEF: void* gpointer ; -TYPEDEF: guint32 gunichar ; -TYPEDEF: void* va_list ; +TYPEDEF: gulong GType +TYPEDEF: void* gpointer +TYPEDEF: guint32 gunichar +TYPEDEF: void* va_list int lookup-c-type clone [ >c-bool ] >>unboxer-quot diff --git a/ffi/gstreamer/ffi/ffi.factor b/ffi/gstreamer/ffi/ffi.factor index dc2b746045..59edfb035d 100644 --- a/ffi/gstreamer/ffi/ffi.factor +++ b/ffi/gstreamer/ffi/ffi.factor @@ -24,13 +24,13 @@ PRIVATE< ! types from libxml2 -TYPEDEF: void* xmlNodePtr ; -TYPEDEF: void* xmlDocPtr ; -TYPEDEF: void* xmlNsPtr ; +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/iokit/hid/hid.factor b/ffi/iokit/hid/hid.factor index c1e3ed5552..a9a7ceea7c 100644 --- a/ffi/iokit/hid/hid.factor +++ b/ffi/iokit/hid/hid.factor @@ -116,21 +116,21 @@ CONSTANT: kIOHIDTransactionDirectionTypeOutput 1 CONSTANT: kIOHIDTransactionOptionDefaultOutputValue 1 -TYPEDEF: ptrdiff_t IOHIDElementCookie ; -TYPEDEF: int IOHIDElementType ; -TYPEDEF: int IOHIDElementCollectionType ; -TYPEDEF: int IOHIDReportType ; -TYPEDEF: uint IOHIDOptionsType ; -TYPEDEF: uint IOHIDQueueOptionsType ; -TYPEDEF: uint IOHIDElementFlags ; -TYPEDEF: void* IOHIDDeviceRef ; -TYPEDEF: void* IOHIDElementRef ; -TYPEDEF: void* IOHIDQueueRef ; -TYPEDEF: void* IOHIDValueRef ; -TYPEDEF: void* IOHIDManagerRef ; -TYPEDEF: void* IOHIDTransactionRef ; -TYPEDEF: UInt32 IOHIDValueScaleType ; -TYPEDEF: UInt32 IOHIDTransactionDirectionType ; +TYPEDEF: ptrdiff_t IOHIDElementCookie +TYPEDEF: int IOHIDElementType +TYPEDEF: int IOHIDElementCollectionType +TYPEDEF: int IOHIDReportType +TYPEDEF: uint IOHIDOptionsType +TYPEDEF: uint IOHIDQueueOptionsType +TYPEDEF: uint IOHIDElementFlags +TYPEDEF: void* IOHIDDeviceRef +TYPEDEF: void* IOHIDElementRef +TYPEDEF: void* IOHIDQueueRef +TYPEDEF: void* IOHIDValueRef +TYPEDEF: void* IOHIDManagerRef +TYPEDEF: void* IOHIDTransactionRef +TYPEDEF: UInt32 IOHIDValueScaleType +TYPEDEF: UInt32 IOHIDTransactionDirectionType CALLBACK: void IOHIDCallback ( void* context, IOReturn result, void* sender ) ; CALLBACK: void IOHIDReportCallback ( void* context, IOReturn result, void* sender, IOHIDReportType type, UInt32 reportID, uchar* report, CFIndex reportLength ) ; diff --git a/ffi/lua/lua.factor b/ffi/lua/lua.factor index 58d55f8e4b..79b3d196d5 100644 --- a/ffi/lua/lua.factor +++ b/ffi/lua/lua.factor @@ -14,8 +14,8 @@ COMPILE< "liblua5.1" { LIBRARY: liblua5.1 ! luaconf.h -TYPEDEF: double LUA_NUMBER ; -TYPEDEF: ptrdiff_t LUA_INTEGER ; +TYPEDEF: double LUA_NUMBER +TYPEDEF: ptrdiff_t LUA_INTEGER CONSTANT: LUA_IDSIZE 60 @@ -63,8 +63,8 @@ CONSTANT: LUA_TTHREAD 8 CONSTANT: LUA_MINSTACK 20 -TYPEDEF: LUA_NUMBER lua_Number ; -TYPEDEF: LUA_INTEGER lua_Integer ; +TYPEDEF: LUA_NUMBER lua_Number +TYPEDEF: LUA_INTEGER lua_Integer FUNCTION: lua_State* lua_newstate ( lua_Alloc f, void* ud ) ; FUNCTION: void lua_close ( lua_State* L ) ; @@ -159,8 +159,8 @@ FUNCTION: void lua_concat ( lua_State* L, int n ) ; FUNCTION: lua_Alloc lua_getallocf ( lua_State* L, void* *ud ) ; FUNCTION: void lua_setallocf ( lua_State* L, lua_Alloc f, void* ud ) ; -TYPEDEF: lua_Reader lua_Chunkreader ; -TYPEDEF: lua_Writer lua_Chunkwriter ; +TYPEDEF: lua_Reader lua_Chunkreader +TYPEDEF: lua_Writer lua_Chunkwriter FUNCTION: void lua_setlevel ( lua_State* from, lua_State* to ) ; diff --git a/ffi/macho/macho.factor b/ffi/macho/macho.factor index 18a739ac20..bb3e30caaa 100644 --- a/ffi/macho/macho.factor +++ b/ffi/macho/macho.factor @@ -9,11 +9,11 @@ FROM: alien.c-types => short ; IN: macho ! FFI data -TYPEDEF: int integer_t ; -TYPEDEF: int vm_prot_t ; -TYPEDEF: integer_t cpu_type_t ; -TYPEDEF: integer_t cpu_subtype_t ; -TYPEDEF: integer_t cpu_threadtype_t ; +TYPEDEF: int integer_t +TYPEDEF: int vm_prot_t +TYPEDEF: integer_t cpu_type_t +TYPEDEF: integer_t cpu_subtype_t +TYPEDEF: integer_t cpu_threadtype_t CONSTANT: VM_PROT_NONE 0x00 CONSTANT: VM_PROT_READ 0x01 diff --git a/ffi/ogg/theora/theora.factor b/ffi/ogg/theora/theora.factor index d7270edda3..19b2c445c5 100644 --- a/ffi/ogg/theora/theora.factor +++ b/ffi/ogg/theora/theora.factor @@ -37,13 +37,13 @@ CONSTANT: TH-EIMPL -23 CONSTANT: TH-EBADPACKET -24 CONSTANT: TH-DUPFRAME 1 -TYPEDEF: int th-colorspace ; +TYPEDEF: int th-colorspace CONSTANT: TH-CS-UNSPECIFIED 0 CONSTANT: TH-CS-ITU-REC-470M 1 CONSTANT: TH-CS-ITU-REC-470BG 2 CONSTANT: TH-CS-NSPACES 3 -TYPEDEF: int th-pixelformat ; +TYPEDEF: int th-pixelformat CONSTANT: TH-PF-RSVD 0 CONSTANT: TH-PF-422 1 CONSTANT: TH-PF-444 2 @@ -56,7 +56,7 @@ STRUCT: th-img-plane { data uchar* } ; -TYPEDEF: th-img-plane[3] th-ycbcr-buffer ; +TYPEDEF: th-img-plane[3] th-ycbcr-buffer STRUCT: th-info { version-major uchar } @@ -86,7 +86,7 @@ STRUCT: th-comment { vendor c-string } ; -TYPEDEF: uchar[64] th-quant-base ; +TYPEDEF: uchar[64] th-quant-base STRUCT: th-quant-ranges { nranges int } @@ -142,7 +142,7 @@ CONSTANT: TH-RATECTL-DROP-FRAMES 1 CONSTANT: TH-RATECTL-CAP-OVERFLOW 2 CONSTANT: TH-RATECTL-CAP-UNDERFOW 4 -TYPEDEF: void* th-enc-ctx ; +TYPEDEF: void* th-enc-ctx LIBRARY: theoraenc FUNCTION: th-enc-ctx* th_encode_alloc ( th-info* info ) ; @@ -161,15 +161,15 @@ CONSTANT: TH-DECCTL-SET-TELEMETRY-MV 11 CONSTANT: TH-DECCTL-SET-TELEMETRY-QI 13 CONSTANT: TH-DECCTL-SET-TELEMETRY-BITS 15 -TYPEDEF: void* th-stripe-decoded-func ; +TYPEDEF: void* th-stripe-decoded-func STRUCT: th-stripe-callback { ctx void* } { stripe-decoded th-stripe-decoded-func } ; -TYPEDEF: void* th-dec-ctx ; -TYPEDEF: void* th-setup-info ; +TYPEDEF: void* th-dec-ctx +TYPEDEF: void* th-setup-info LIBRARY: theoradec FUNCTION: int th_decode_headerin ( th-info* info, th-comment* tc, th-setup-info** setup, ogg-packet* op ) ; diff --git a/ffi/openal/openal.factor b/ffi/openal/openal.factor index 1f61411431..d110f60231 100755 --- a/ffi/openal/openal.factor +++ b/ffi/openal/openal.factor @@ -21,18 +21,18 @@ COMPILE< os unix? [ "openal" deploy-library ] unless COMPILE> LIBRARY: openal -TYPEDEF: char ALboolean ; -TYPEDEF: char ALchar ; -TYPEDEF: char ALbyte ; -TYPEDEF: uchar ALubyte ; -TYPEDEF: short ALshort ; -TYPEDEF: ushort ALushort ; -TYPEDEF: int ALint ; -TYPEDEF: uint ALuint ; -TYPEDEF: int ALsizei ; -TYPEDEF: int ALenum ; -TYPEDEF: float ALfloat ; -TYPEDEF: double ALdouble ; +TYPEDEF: char ALboolean +TYPEDEF: char ALchar +TYPEDEF: char ALbyte +TYPEDEF: uchar ALubyte +TYPEDEF: short ALshort +TYPEDEF: ushort ALushort +TYPEDEF: int ALint +TYPEDEF: uint ALuint +TYPEDEF: int ALsizei +TYPEDEF: int ALenum +TYPEDEF: float ALfloat +TYPEDEF: double ALdouble CONSTANT: AL_INVALID -1 CONSTANT: AL_NONE 0 @@ -180,12 +180,12 @@ FUNCTION: void alDistanceModel ( ALenum distanceModel ) ; C-TYPE: ALCdevice C-TYPE: ALCcontext -TYPEDEF: char ALCboolean ; -TYPEDEF: char ALCchar ; -TYPEDEF: int ALCenum ; -TYPEDEF: int ALCint ; -TYPEDEF: int ALCsizei ; -TYPEDEF: uint ALCuint ; +TYPEDEF: char ALCboolean +TYPEDEF: char ALCchar +TYPEDEF: int ALCenum +TYPEDEF: int ALCint +TYPEDEF: int ALCsizei +TYPEDEF: uint ALCuint CONSTANT: ALC_FALSE 0 CONSTANT: ALC_TRUE 1 diff --git a/ffi/opencl/ffi/ffi.factor b/ffi/opencl/ffi/ffi.factor index 0e6fad0610..25059a7467 100644 --- a/ffi/opencl/ffi/ffi.factor +++ b/ffi/opencl/ffi/ffi.factor @@ -13,17 +13,17 @@ COMPILE< "opencl" { LIBRARY: opencl ! cl_platform.h -TYPEDEF: char cl_char ; -TYPEDEF: uchar cl_uchar ; -TYPEDEF: short cl_short ; -TYPEDEF: ushort cl_ushort ; -TYPEDEF: int cl_int ; -TYPEDEF: uint cl_uint ; -TYPEDEF: longlong cl_long ; -TYPEDEF: ulonglong cl_ulong ; -TYPEDEF: ushort cl_half ; -TYPEDEF: float cl_float ; -TYPEDEF: double cl_double ; +TYPEDEF: char cl_char +TYPEDEF: uchar cl_uchar +TYPEDEF: short cl_short +TYPEDEF: ushort cl_ushort +TYPEDEF: int cl_int +TYPEDEF: uint cl_uint +TYPEDEF: longlong cl_long +TYPEDEF: ulonglong cl_ulong +TYPEDEF: ushort cl_half +TYPEDEF: float cl_float +TYPEDEF: double cl_double CONSTANT: CL_CHAR_BIT 8 CONSTANT: CL_SCHAR_MAX 127 @@ -69,9 +69,9 @@ CONSTANT: CL_HUGE_VAL 1.0e500 CONSTANT: CL_MAXFLOAT 340282346638528859811704183484516925440.0 CONSTANT: CL_INFINITY 1.0e50 -TYPEDEF: uint cl_GLuint ; -TYPEDEF: int cl_GLint ; -TYPEDEF: uint cl_GLenum ; +TYPEDEF: uint cl_GLuint +TYPEDEF: int cl_GLint +TYPEDEF: uint cl_GLenum ! cl.h C-TYPE: _cl_platform_id @@ -84,49 +84,49 @@ 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 ; -TYPEDEF: _cl_context* cl_context ; -TYPEDEF: _cl_command_queue* cl_command_queue ; -TYPEDEF: _cl_mem* cl_mem ; -TYPEDEF: _cl_program* cl_program ; -TYPEDEF: _cl_kernel* cl_kernel ; -TYPEDEF: _cl_event* cl_event ; -TYPEDEF: _cl_sampler* cl_sampler ; +TYPEDEF: _cl_platform_id* cl_platform_id +TYPEDEF: _cl_device_id* cl_device_id +TYPEDEF: _cl_context* cl_context +TYPEDEF: _cl_command_queue* cl_command_queue +TYPEDEF: _cl_mem* cl_mem +TYPEDEF: _cl_program* cl_program +TYPEDEF: _cl_kernel* cl_kernel +TYPEDEF: _cl_event* cl_event +TYPEDEF: _cl_sampler* cl_sampler -TYPEDEF: cl_uint cl_bool ; -TYPEDEF: cl_ulong cl_bitfield ; -TYPEDEF: cl_bitfield cl_device_type ; -TYPEDEF: cl_uint cl_platform_info ; -TYPEDEF: cl_uint cl_device_info ; -TYPEDEF: cl_bitfield cl_device_address_info ; -TYPEDEF: cl_bitfield cl_device_fp_config ; -TYPEDEF: cl_uint cl_device_mem_cache_type ; -TYPEDEF: cl_uint cl_device_local_mem_type ; -TYPEDEF: cl_bitfield cl_device_exec_capabilities ; -TYPEDEF: cl_bitfield cl_command_queue_properties ; +TYPEDEF: cl_uint cl_bool +TYPEDEF: cl_ulong cl_bitfield +TYPEDEF: cl_bitfield cl_device_type +TYPEDEF: cl_uint cl_platform_info +TYPEDEF: cl_uint cl_device_info +TYPEDEF: cl_bitfield cl_device_address_info +TYPEDEF: cl_bitfield cl_device_fp_config +TYPEDEF: cl_uint cl_device_mem_cache_type +TYPEDEF: cl_uint cl_device_local_mem_type +TYPEDEF: cl_bitfield cl_device_exec_capabilities +TYPEDEF: cl_bitfield cl_command_queue_properties -TYPEDEF: intptr_t cl_context_properties ; -TYPEDEF: cl_uint cl_context_info ; -TYPEDEF: cl_uint cl_command_queue_info ; -TYPEDEF: cl_uint cl_channel_order ; -TYPEDEF: cl_uint cl_channel_type ; -TYPEDEF: cl_bitfield cl_mem_flags ; -TYPEDEF: cl_uint cl_mem_object_type ; -TYPEDEF: cl_uint cl_mem_info ; -TYPEDEF: cl_uint cl_image_info ; -TYPEDEF: cl_uint cl_addressing_mode ; -TYPEDEF: cl_uint cl_filter_mode ; -TYPEDEF: cl_uint cl_sampler_info ; -TYPEDEF: cl_bitfield cl_map_flags ; -TYPEDEF: cl_uint cl_program_info ; -TYPEDEF: cl_uint cl_program_build_info ; -TYPEDEF: cl_int cl_build_status ; -TYPEDEF: cl_uint cl_kernel_info ; -TYPEDEF: cl_uint cl_kernel_work_group_info ; -TYPEDEF: cl_uint cl_event_info ; -TYPEDEF: cl_uint cl_command_type ; -TYPEDEF: cl_uint cl_profiling_info ; +TYPEDEF: intptr_t cl_context_properties +TYPEDEF: cl_uint cl_context_info +TYPEDEF: cl_uint cl_command_queue_info +TYPEDEF: cl_uint cl_channel_order +TYPEDEF: cl_uint cl_channel_type +TYPEDEF: cl_bitfield cl_mem_flags +TYPEDEF: cl_uint cl_mem_object_type +TYPEDEF: cl_uint cl_mem_info +TYPEDEF: cl_uint cl_image_info +TYPEDEF: cl_uint cl_addressing_mode +TYPEDEF: cl_uint cl_filter_mode +TYPEDEF: cl_uint cl_sampler_info +TYPEDEF: cl_bitfield cl_map_flags +TYPEDEF: cl_uint cl_program_info +TYPEDEF: cl_uint cl_program_build_info +TYPEDEF: cl_int cl_build_status +TYPEDEF: cl_uint cl_kernel_info +TYPEDEF: cl_uint cl_kernel_work_group_info +TYPEDEF: cl_uint cl_event_info +TYPEDEF: cl_uint cl_command_type +TYPEDEF: cl_uint cl_profiling_info STRUCT: cl_image_format { image_channel_order cl_channel_order } @@ -492,9 +492,9 @@ CONSTANT: CL_PLATFORM_NOT_FOUND_KHR -1001 FUNCTION: cl_int clIcdGetPlatformIDsKHR ( cl_uint num_entries, cl_platform_id* platforms, cl_uint* num_platforms ) ; ! cl_gl.h -TYPEDEF: cl_uint cl_gl_object_type ; -TYPEDEF: cl_uint cl_gl_texture_info ; -TYPEDEF: cl_uint cl_gl_platform_info ; +TYPEDEF: cl_uint cl_gl_object_type +TYPEDEF: cl_uint cl_gl_texture_info +TYPEDEF: cl_uint cl_gl_platform_info CONSTANT: CL_GL_OBJECT_BUFFER 0x2000 CONSTANT: CL_GL_OBJECT_TEXTURE2D 0x2001 @@ -513,7 +513,7 @@ FUNCTION: cl_int clEnqueueAcquireGLObjects ( cl_command_queue command_queue, cl_ FUNCTION: cl_int clEnqueueReleaseGLObjects ( cl_command_queue command_queue, cl_uint num_objects, cl_mem* mem_objects, cl_uint num_events_in_wait_list, cl_event* event_wait_list, cl_event* event ) ; ! cl_khr_gl_sharing.txt -TYPEDEF: cl_uint cl_gl_context_info ; +TYPEDEF: cl_uint cl_gl_context_info CONSTANT: CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR -1000 CONSTANT: CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR 0x2006 @@ -542,8 +542,8 @@ CONSTANT: CL_INVALID_D3D9_RESOURCE_NV -1011 CONSTANT: CL_D3D9_RESOURCE_ALREADY_ACQUIRED_NV -1012 CONSTANT: CL_D3D9_RESOURCE_NOT_ACQUIRED_NV -1013 -TYPEDEF: void* cl_d3d9_device_source_nv ; -TYPEDEF: void* cl_d3d9_device_set_nv ; +TYPEDEF: void* cl_d3d9_device_source_nv +TYPEDEF: void* cl_d3d9_device_set_nv FUNCTION: cl_int clGetDeviceIDsFromD3D9NV ( cl_platform_id platform, cl_d3d9_device_source_nv d3d_device_source, void* d3d_object, cl_d3d9_device_set_nv d3d_device_set, cl_uint num_entries, cl_device_id* devices, cl_uint* num_devices ) ; FUNCTION: cl_mem clCreateFromD3D9VertexBufferNV ( cl_context context, cl_mem_flags flags, void* id3dvb9_resource, cl_int* errcode_ret ) ; @@ -570,8 +570,8 @@ CONSTANT: CL_INVALID_D3D10_RESOURCE_NV -1003 CONSTANT: CL_D3D10_RESOURCE_ALREADY_ACQUIRED_NV -1004 CONSTANT: CL_D3D10_RESOURCE_NOT_ACQUIRED_NV -1005 -TYPEDEF: void* cl_d3d10_device_source_nv ; -TYPEDEF: void* cl_d3d10_device_set_nv ; +TYPEDEF: void* cl_d3d10_device_source_nv +TYPEDEF: void* cl_d3d10_device_set_nv FUNCTION: cl_int clGetDeviceIDsFromD3D10NV ( cl_platform_id platform, cl_d3d10_device_source_nv d3d_device_source, void* d3d_object, cl_d3d10_device_set_nv d3d_device_set, cl_uint num_entries, cl_device_id* devices, cl_uint* num_devices ) ; FUNCTION: cl_mem clCreateFromD3D10BufferNV ( cl_context context, cl_mem_flags flags, void* id3d10buffer_resource, cl_int* errcode_ret ) ; @@ -595,8 +595,8 @@ CONSTANT: CL_INVALID_D3D11_RESOURCE_NV -1007 CONSTANT: CL_D3D11_RESOURCE_ALREADY_ACQUIRED_NV -1008 CONSTANT: CL_D3D11_RESOURCE_NOT_ACQUIRED_NV -1009 -TYPEDEF: void* cl_d3d11_device_source_nv ; -TYPEDEF: void* cl_d3d11_device_set_nv ; +TYPEDEF: void* cl_d3d11_device_source_nv +TYPEDEF: void* cl_d3d11_device_set_nv FUNCTION: cl_int clGetDeviceIDsFromD3D11NV ( cl_platform_id platform, cl_d3d11_device_source_nv d3d_device_source, void* d3d_object, cl_d3d11_device_set_nv d3d_device_set, cl_uint num_entries, cl_device_id* devices, cl_uint* num_devices ) ; FUNCTION: cl_mem clCreateFromD3D11BufferNV ( cl_context context, cl_mem_flags flags, void* id3d11buffer_resource, cl_int* errcode_ret ) ; diff --git a/ffi/opengl/gl/gl.factor b/ffi/opengl/gl/gl.factor index cb6140dbc0..7195146610 100644 --- a/ffi/opengl/gl/gl.factor +++ b/ffi/opengl/gl/gl.factor @@ -7,26 +7,26 @@ io.encodings.ascii kernel opengl.gl.extensions system ; FROM: alien.c-types => short ; IN: opengl.gl -TYPEDEF: uint GLenum ; -TYPEDEF: uchar GLboolean ; -TYPEDEF: uint GLbitfield ; -TYPEDEF: char GLbyte ; -TYPEDEF: short GLshort ; -TYPEDEF: int GLint ; -TYPEDEF: int GLsizei ; -TYPEDEF: uchar GLubyte ; -TYPEDEF: ushort GLushort ; -TYPEDEF: uint GLuint ; -TYPEDEF: float GLfloat ; -TYPEDEF: float GLclampf ; -TYPEDEF: double GLdouble ; -TYPEDEF: double GLclampd ; -TYPEDEF: longlong GLint64 ; -TYPEDEF: ulonglong GLuint64 ; -TYPEDEF: void* GLsync ; +TYPEDEF: uint GLenum +TYPEDEF: uchar GLboolean +TYPEDEF: uint GLbitfield +TYPEDEF: char GLbyte +TYPEDEF: short GLshort +TYPEDEF: int GLint +TYPEDEF: int GLsizei +TYPEDEF: uchar GLubyte +TYPEDEF: ushort GLushort +TYPEDEF: uint GLuint +TYPEDEF: float GLfloat +TYPEDEF: float GLclampf +TYPEDEF: double GLdouble +TYPEDEF: double GLclampd +TYPEDEF: longlong GLint64 +TYPEDEF: ulonglong GLuint64 +TYPEDEF: void* GLsync C-TYPE: GLvoid -TYPEDEF: c-string[ascii] GLstring ; +TYPEDEF: c-string[ascii] GLstring ! Constants @@ -1485,8 +1485,8 @@ ALIAS: GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING ALIAS: GL_SRC2_ALPHA GL_SOURCE2_ALPHA ALIAS: GL_SRC2_RGB GL_SOURCE2_RGB -TYPEDEF: ptrdiff_t GLsizeiptr ; -TYPEDEF: ptrdiff_t GLintptr ; +TYPEDEF: ptrdiff_t GLsizeiptr +TYPEDEF: ptrdiff_t GLintptr GL-FUNCTION: void glBeginQuery { glBeginQueryARB } ( GLenum target, GLuint id ) ; GL-FUNCTION: void glBindBuffer { glBindBufferARB } ( GLenum target, GLuint buffer ) ; @@ -1730,7 +1730,7 @@ GL-FUNCTION: void glUniformMatrix4x3fv { } ( GLint location, GLsizei count, GLbo ! OpenGL 3.0 -TYPEDEF: ushort GLhalf ; +TYPEDEF: ushort GLhalf CONSTANT: GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD CONSTANT: GL_SAMPLER_CUBE_SHADOW 0x8DC5 diff --git a/ffi/opengl/glu/glu.factor b/ffi/opengl/glu/glu.factor index 24b7b217d2..f67af08c0e 100644 --- a/ffi/opengl/glu/glu.factor +++ b/ffi/opengl/glu/glu.factor @@ -21,7 +21,7 @@ C-TYPE: GLUnurbs C-TYPE: GLUquadric C-TYPE: GLUtesselator C-TYPE: GLubyte -TYPEDEF: void* GLUfuncptr ; +TYPEDEF: void* GLUfuncptr ! StringName CONSTANT: GLU_VERSION 100800 diff --git a/ffi/openssl/libcrypto/libcrypto.factor b/ffi/openssl/libcrypto/libcrypto.factor index 2875da5da8..3c992d1364 100644 --- a/ffi/openssl/libcrypto/libcrypto.factor +++ b/ffi/openssl/libcrypto/libcrypto.factor @@ -54,7 +54,7 @@ LIBRARY: libcrypto STRUCT: crypto_ex_data_st { sk void* } { dummy int } ; -TYPEDEF: crypto_ex_data_st CRYPTO_EX_DATA ; +TYPEDEF: crypto_ex_data_st CRYPTO_EX_DATA ! =============================================== ! bio.h @@ -70,7 +70,7 @@ STRUCT: bio_method_st { create void* } { destroy void* } { callback_ctrl void* } ; -TYPEDEF: bio_method_st BIO_METHOD ; +TYPEDEF: bio_method_st BIO_METHOD STRUCT: bio_st { method BIO_METHOD* } @@ -88,7 +88,7 @@ STRUCT: bio_st { num-read ulong } { num-write ulong } { ex-data CRYPTO_EX_DATA } ; -TYPEDEF: bio_st BIO ; +TYPEDEF: bio_st BIO FUNCTION: BIO* BIO_new_file ( c-string filename, c-string mode ) ; diff --git a/ffi/openssl/libssl/libssl.factor b/ffi/openssl/libssl/libssl.factor index 85955d6585..98eb20e7c4 100644 --- a/ffi/openssl/libssl/libssl.factor +++ b/ffi/openssl/libssl/libssl.factor @@ -195,7 +195,7 @@ STRUCT: stack_st { sorted int } { num_alloc int } { comp void* } ; -TYPEDEF: stack_st _STACK ; +TYPEDEF: stack_st _STACK ! =============================================== ! asn1t.h @@ -207,7 +207,7 @@ C-TYPE: ASN1_ITEM ! asn1.h ! =============================================== C-TYPE: ASN1_VALUE -TYPEDEF: ASN1_ITEM ASN1_ITEM_EXP ; +TYPEDEF: ASN1_ITEM ASN1_ITEM_EXP STRUCT: ASN1_STRING { length int } @@ -222,7 +222,7 @@ FUNCTION: ASN1_VALUE* ASN1_item_d2i ( ASN1_VALUE** val, uchar **in, long len, AS ! =============================================== ! ossl_typ.h ! =============================================== -TYPEDEF: ASN1_STRING ASN1_OCTET_STRING ; +TYPEDEF: ASN1_STRING ASN1_OCTET_STRING ! =============================================== ! x509.h @@ -300,7 +300,7 @@ STRUCT: ssl_method_st { ssl_version void* } { ssl_callback_ctrl void* } { ssl_ctx_callback_ctrl void* } ; -TYPEDEF: ssl_method_st* ssl-method ; +TYPEDEF: ssl_method_st* ssl-method STRUCT: ssl_st { version int } @@ -355,7 +355,7 @@ STRUCT: ssl_st { psk_client_callback void* } { psk_server_callback void* } { ctx SSL_CTX* } ; -TYPEDEF: ssl_st SSL ; +TYPEDEF: ssl_st SSL FUNCTION: c-string SSL_get_version ( SSL* ssl ) ; diff --git a/ffi/pango/cairo/ffi/ffi.factor b/ffi/pango/cairo/ffi/ffi.factor index dc89fc081e..0829a73ef3 100644 --- a/ffi/pango/cairo/ffi/ffi.factor +++ b/ffi/pango/cairo/ffi/ffi.factor @@ -14,9 +14,9 @@ COMPILE< "pango.cairo" { { [ os unix? ] [ "libpangocairo-1.0.so" ] } } cond cdecl add-library COMPILE> -FOREIGN-RECORD-TYPE: cairo.Context cairo_t ; -FOREIGN-RECORD-TYPE: cairo.ScaledFont cairo_scaled_font_t ; -FOREIGN-ENUM-TYPE: cairo.FontType cairo_font_type_t ; -FOREIGN-RECORD-TYPE: cairo.FontOptions cairo_font_options_t ; +FOREIGN-RECORD-TYPE: cairo.Context cairo_t +FOREIGN-RECORD-TYPE: cairo.ScaledFont cairo_scaled_font_t +FOREIGN-ENUM-TYPE: cairo.FontType cairo_font_type_t +FOREIGN-RECORD-TYPE: cairo.FontOptions cairo_font_options_t GIR: vocab:pango/cairo/PangoCairo-1.0.gir diff --git a/ffi/qtkit/qtkit.factor b/ffi/qtkit/qtkit.factor index b89a25f17d..919e0d2d29 100644 --- a/ffi/qtkit/qtkit.factor +++ b/ffi/qtkit/qtkit.factor @@ -23,14 +23,14 @@ STRUCT: SMPTETime { mSeconds SInt16 } { mFrames SInt16 } ; -CFSTRING: QTKitErrorDomain "QTKitErrorDomain" ; -CFSTRING: QTErrorCaptureInputKey "QTErrorCaptureInputKey" ; -CFSTRING: QTErrorCaptureOutputKey "QTErrorCaptureOutputKey" ; -CFSTRING: QTErrorDeviceKey "QTErrorDeviceKey" ; -CFSTRING: QTErrorExcludingDeviceKey "QTErrorExcludingDeviceKey" ; -CFSTRING: QTErrorTimeKey "QTErrorTimeKey" ; -CFSTRING: QTErrorFileSizeKey "QTErrorFileSizeKey" ; -CFSTRING: QTErrorRecordingSuccesfullyFinishedKey "QTErrorRecordingSuccesfullyFinishedKey" ; +CFSTRING: QTKitErrorDomain "QTKitErrorDomain" +CFSTRING: QTErrorCaptureInputKey "QTErrorCaptureInputKey" +CFSTRING: QTErrorCaptureOutputKey "QTErrorCaptureOutputKey" +CFSTRING: QTErrorDeviceKey "QTErrorDeviceKey" +CFSTRING: QTErrorExcludingDeviceKey "QTErrorExcludingDeviceKey" +CFSTRING: QTErrorTimeKey "QTErrorTimeKey" +CFSTRING: QTErrorFileSizeKey "QTErrorFileSizeKey" +CFSTRING: QTErrorRecordingSuccesfullyFinishedKey "QTErrorRecordingSuccesfullyFinishedKey" CONSTANT: QTErrorUnknown -1 CONSTANT: QTErrorIncompatibleInput 1002 diff --git a/ffi/readline/ffi/ffi.factor b/ffi/readline/ffi/ffi.factor index 56fbbbb024..0fc26fb14c 100644 --- a/ffi/readline/ffi/ffi.factor +++ b/ffi/readline/ffi/ffi.factor @@ -13,7 +13,7 @@ COMPILE< "readline" { LIBRARY: readline -TYPEDEF: void* histdata_t ; +TYPEDEF: void* histdata_t STRUCT: HIST_ENTRY { line c-string } @@ -93,18 +93,18 @@ STRUCT: KEYMAP_ENTRY CONSTANT: KEYMAP_SIZE 257 CONSTANT: ANYOTHERKEY 256 -TYPEDEF: KEYMAP_ENTRY[257] KEYMAP_ENTRY_ARRAY ; -TYPEDEF: KEYMAP_ENTRY* Keymap ; +TYPEDEF: KEYMAP_ENTRY[257] KEYMAP_ENTRY_ARRAY +TYPEDEF: KEYMAP_ENTRY* Keymap CONSTANT: ISFUNC 0 CONSTANT: ISKMAP 1 CONSTANT: ISMACR 2 -C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_standard_keymap ; -C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_meta_keymap ; -C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_ctlx_keymap ; -C-GLOBAL: KEYMAP_ENTRY_ARRAY vi_insertion_keymap ; -C-GLOBAL: KEYMAP_ENTRY_ARRAY vi_movement_keymap ; +C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_standard_keymap +C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_meta_keymap +C-GLOBAL: KEYMAP_ENTRY_ARRAY emacs_ctlx_keymap +C-GLOBAL: KEYMAP_ENTRY_ARRAY vi_insertion_keymap +C-GLOBAL: KEYMAP_ENTRY_ARRAY vi_movement_keymap FUNCTION: Keymap rl_copy_keymap ( Keymap k ) ; FUNCTION: Keymap rl_make_keymap ( ) ; @@ -112,29 +112,29 @@ FUNCTION: void rl_discard_keymap ( Keymap k ) ; CALLBACK: c-string tilde_hook_func_t ( c-string s ) ; -C-GLOBAL: tilde_hook_func_t* tilde_expansion_preexpansion_hook ; -C-GLOBAL: tilde_hook_func_t* tilde_expansion_failure_hook ; -C-GLOBAL: char** tilde_additional_prefixes ; -C-GLOBAL: char** tilde_additional_suffixes ; +C-GLOBAL: tilde_hook_func_t* tilde_expansion_preexpansion_hook +C-GLOBAL: tilde_hook_func_t* tilde_expansion_failure_hook +C-GLOBAL: char** tilde_additional_prefixes +C-GLOBAL: char** tilde_additional_suffixes FUNCTION: c-string tilde_expand ( c-string s ) ; FUNCTION: c-string tilde_expand_word ( c-string s ) ; FUNCTION: c-string tilde_find_word ( c-string arg1, int arg2, int* arg3 ) ; -C-GLOBAL: int history_base ; -C-GLOBAL: int history_length ; -C-GLOBAL: int history_max_entries ; -C-GLOBAL: char history_expansion_char ; -C-GLOBAL: char history_subst_char ; -C-GLOBAL: c-string history_word_delimiters ; -C-GLOBAL: char history_comment_char ; -C-GLOBAL: c-string history_no_expand_chars ; -C-GLOBAL: c-string history_search_delimiter_chars ; -C-GLOBAL: int history_quotes_inhibit_expansion ; -C-GLOBAL: int history_write_timestamps ; -C-GLOBAL: int max_input_history ; -C-GLOBAL: rl_linebuf_func_t* history_inhibit_expansion_function ; +C-GLOBAL: int history_base +C-GLOBAL: int history_length +C-GLOBAL: int history_max_entries +C-GLOBAL: char history_expansion_char +C-GLOBAL: char history_subst_char +C-GLOBAL: c-string history_word_delimiters +C-GLOBAL: char history_comment_char +C-GLOBAL: c-string history_no_expand_chars +C-GLOBAL: c-string history_search_delimiter_chars +C-GLOBAL: int history_quotes_inhibit_expansion +C-GLOBAL: int history_write_timestamps +C-GLOBAL: int max_input_history +C-GLOBAL: rl_linebuf_func_t* history_inhibit_expansion_function CALLBACK: int rl_intfunc_t ( int i ) ; CALLBACK: int rl_icpfunc_t ( c-string s ) ; @@ -159,13 +159,13 @@ STRUCT: UNDO_LIST { text char* } { what undo_code } ; -C-GLOBAL: UNDO_LIST* rl_undo_list ; +C-GLOBAL: UNDO_LIST* rl_undo_list STRUCT: FUNMAP { name c-string } { function rl_command_func_t* } ; -C-GLOBAL: FUNMAP** funmap ; +C-GLOBAL: FUNMAP** funmap FUNCTION: int rl_digit_argument ( int arg1, int arg2 ) ; FUNCTION: int rl_universal_argument ( int arg, int arg ) ; @@ -501,87 +501,87 @@ FUNCTION: c-string rl_filename_completion_function ( c-string FUNCTION: int rl_completion_mode ( rl_command_func_t* p ) ; -C-GLOBAL: c-string rl_library_version ; -C-GLOBAL: int rl_readline_version ; -C-GLOBAL: int rl_gnu_readline_p ; -C-GLOBAL: int rl_readline_state ; -C-GLOBAL: int rl_editing_mode ; -C-GLOBAL: int rl_insert_mode ; -C-GLOBAL: c-string rl_readline_name ; -C-GLOBAL: c-string rl_prompt ; -C-GLOBAL: c-string rl_display_prompt ; -C-GLOBAL: c-string rl_line_buffer ; -C-GLOBAL: int rl_point ; -C-GLOBAL: int rl_end ; -C-GLOBAL: int rl_mark ; -C-GLOBAL: int rl_done ; -C-GLOBAL: int rl_pending_input ; -C-GLOBAL: int rl_dispatching ; -C-GLOBAL: int rl_explicit_arg ; -C-GLOBAL: int rl_numeric_arg ; -C-GLOBAL: rl_command_func_t* rl_last_func ; -C-GLOBAL: c-string rl_terminal_name ; +C-GLOBAL: c-string rl_library_version +C-GLOBAL: int rl_readline_version +C-GLOBAL: int rl_gnu_readline_p +C-GLOBAL: int rl_readline_state +C-GLOBAL: int rl_editing_mode +C-GLOBAL: int rl_insert_mode +C-GLOBAL: c-string rl_readline_name +C-GLOBAL: c-string rl_prompt +C-GLOBAL: c-string rl_display_prompt +C-GLOBAL: c-string rl_line_buffer +C-GLOBAL: int rl_point +C-GLOBAL: int rl_end +C-GLOBAL: int rl_mark +C-GLOBAL: int rl_done +C-GLOBAL: int rl_pending_input +C-GLOBAL: int rl_dispatching +C-GLOBAL: int rl_explicit_arg +C-GLOBAL: int rl_numeric_arg +C-GLOBAL: rl_command_func_t* rl_last_func +C-GLOBAL: c-string rl_terminal_name -C-GLOBAL: FILE* rl_instream ; -C-GLOBAL: FILE* rl_outstream ; +C-GLOBAL: FILE* rl_instream +C-GLOBAL: FILE* rl_outstream -C-GLOBAL: int rl_prefer_env_winsize ; +C-GLOBAL: int rl_prefer_env_winsize -C-GLOBAL: rl_hook_func_t* rl_startup_hook ; -C-GLOBAL: rl_hook_func_t* rl_pre_input_hook ; -C-GLOBAL: rl_hook_func_t* rl_event_hook ; +C-GLOBAL: rl_hook_func_t* rl_startup_hook +C-GLOBAL: rl_hook_func_t* rl_pre_input_hook +C-GLOBAL: rl_hook_func_t* rl_event_hook -C-GLOBAL: rl_getc_func_t* rl_getc_function ; -C-GLOBAL: rl_voidfunc_t* rl_redisplay_function ; -C-GLOBAL: rl_vintfunc_t* rl_prep_term_function ; -C-GLOBAL: rl_voidfunc_t* rl_deprep_term_function ; +C-GLOBAL: rl_getc_func_t* rl_getc_function +C-GLOBAL: rl_voidfunc_t* rl_redisplay_function +C-GLOBAL: rl_vintfunc_t* rl_prep_term_function +C-GLOBAL: rl_voidfunc_t* rl_deprep_term_function -C-GLOBAL: Keymap rl_executing_keymap ; -C-GLOBAL: Keymap rl_binding_keymap ; +C-GLOBAL: Keymap rl_executing_keymap +C-GLOBAL: Keymap rl_binding_keymap -C-GLOBAL: int rl_erase_empty_line ; -C-GLOBAL: int rl_already_prompted ; -C-GLOBAL: int rl_num_chars_to_read ; -C-GLOBAL: c-string rl_executing_macro ; +C-GLOBAL: int rl_erase_empty_line +C-GLOBAL: int rl_already_prompted +C-GLOBAL: int rl_num_chars_to_read +C-GLOBAL: c-string rl_executing_macro -C-GLOBAL: int rl_catch_signals ; -C-GLOBAL: int rl_catch_sigwinch ; -C-GLOBAL: rl_compentry_func_t* rl_completion_entry_function ; -C-GLOBAL: rl_compentry_func_t* rl_menu_completion_entry_function ; -C-GLOBAL: rl_compignore_func_t* rl_ignore_some_completions_function ; -C-GLOBAL: rl_completion_func_t* rl_attempted_completion_function ; -C-GLOBAL: c-string rl_basic_word_break_characters ; -C-GLOBAL: c-string rl_completer_word_break_characters ; -C-GLOBAL: rl_cpvfunc_t* rl_completion_word_break_hook ; +C-GLOBAL: int rl_catch_signals +C-GLOBAL: int rl_catch_sigwinch +C-GLOBAL: rl_compentry_func_t* rl_completion_entry_function +C-GLOBAL: rl_compentry_func_t* rl_menu_completion_entry_function +C-GLOBAL: rl_compignore_func_t* rl_ignore_some_completions_function +C-GLOBAL: rl_completion_func_t* rl_attempted_completion_function +C-GLOBAL: c-string rl_basic_word_break_characters +C-GLOBAL: c-string rl_completer_word_break_characters +C-GLOBAL: rl_cpvfunc_t* rl_completion_word_break_hook -C-GLOBAL: c-string rl_completer_quote_characters ; -C-GLOBAL: c-string rl_basic_quote_characters ; -C-GLOBAL: c-string rl_filename_quote_characters ; -C-GLOBAL: c-string rl_special_prefixes ; -C-GLOBAL: rl_icppfunc_t* rl_directory_completion_hook ; +C-GLOBAL: c-string rl_completer_quote_characters +C-GLOBAL: c-string rl_basic_quote_characters +C-GLOBAL: c-string rl_filename_quote_characters +C-GLOBAL: c-string rl_special_prefixes +C-GLOBAL: rl_icppfunc_t* rl_directory_completion_hook -C-GLOBAL: rl_icppfunc_t* rl_directory_rewrite_hook ; -C-GLOBAL: rl_dequote_func_t* rl_filename_rewrite_hook ; -C-GLOBAL: rl_compdisp_func_t* rl_completion_display_matches_hook ; -C-GLOBAL: int rl_filename_completion_desired ; -C-GLOBAL: int rl_filename_quoting_desired ; -C-GLOBAL: rl_quote_func_t* rl_filename_quoting_function ; -C-GLOBAL: rl_dequote_func_t* rl_filename_dequoting_function ; -C-GLOBAL: rl_linebuf_func_t* rl_char_is_quoted_p ; -C-GLOBAL: int rl_attempted_completion_over ; -C-GLOBAL: int rl_completion_type ; -C-GLOBAL: int rl_completion_invoking_key ; -C-GLOBAL: int rl_completion_query_items ; -C-GLOBAL: int rl_completion_append_character ; -C-GLOBAL: int rl_completion_suppress_append ; -C-GLOBAL: int rl_completion_quote_character ; -C-GLOBAL: int rl_completion_found_quote ; -C-GLOBAL: int rl_completion_suppress_quote ; -C-GLOBAL: int rl_sort_completion_matches ; -C-GLOBAL: int rl_completion_mark_symlink_dirs ; +C-GLOBAL: rl_icppfunc_t* rl_directory_rewrite_hook +C-GLOBAL: rl_dequote_func_t* rl_filename_rewrite_hook +C-GLOBAL: rl_compdisp_func_t* rl_completion_display_matches_hook +C-GLOBAL: int rl_filename_completion_desired +C-GLOBAL: int rl_filename_quoting_desired +C-GLOBAL: rl_quote_func_t* rl_filename_quoting_function +C-GLOBAL: rl_dequote_func_t* rl_filename_dequoting_function +C-GLOBAL: rl_linebuf_func_t* rl_char_is_quoted_p +C-GLOBAL: int rl_attempted_completion_over +C-GLOBAL: int rl_completion_type +C-GLOBAL: int rl_completion_invoking_key +C-GLOBAL: int rl_completion_query_items +C-GLOBAL: int rl_completion_append_character +C-GLOBAL: int rl_completion_suppress_append +C-GLOBAL: int rl_completion_quote_character +C-GLOBAL: int rl_completion_found_quote +C-GLOBAL: int rl_completion_suppress_quote +C-GLOBAL: int rl_sort_completion_matches +C-GLOBAL: int rl_completion_mark_symlink_dirs -C-GLOBAL: int rl_ignore_completion_duplicates ; -C-GLOBAL: int rl_inhibit_completion ; +C-GLOBAL: int rl_ignore_completion_duplicates +C-GLOBAL: int rl_inhibit_completion CONSTANT: READERR -2 diff --git a/ffi/system-info/macosx/macosx.factor b/ffi/system-info/macosx/macosx.factor index 6084b90087..4a6169b6bc 100644 --- a/ffi/system-info/macosx/macosx.factor +++ b/ffi/system-info/macosx/macosx.factor @@ -11,8 +11,8 @@ IN: system-info.macosx PRIVATE< -TYPEDEF: SInt16 OSErr ; -TYPEDEF: UInt32 OSType ; +TYPEDEF: SInt16 OSErr +TYPEDEF: UInt32 OSType FUNCTION: OSErr Gestalt ( OSType selector, SInt32* response ) ; : gestalt ( selector -- response ) diff --git a/ffi/unix/ffi/ffi.factor b/ffi/unix/ffi/ffi.factor index 382fac7cea..31b658b870 100644 --- a/ffi/unix/ffi/ffi.factor +++ b/ffi/unix/ffi/ffi.factor @@ -198,7 +198,7 @@ FUNCTION: int unlink ( c-string path ) ; FUNCTION: int utimes ( c-string path, timeval[2] times ) ; FUNCTION: ssize_t write ( int fd, void* buf, size_t nbytes ) ; FUNCTION: ssize_t writev ( int fds, iovec* iov, int iovcnt ) ; -TYPEDEF: void* sighandler_t ; +TYPEDEF: void* sighandler_t FUNCTION: sighandler_t signal ( int signum, sighandler_t handler ) ; "librt" "librt.so" cdecl add-library diff --git a/ffi/unix/stat/stat.factor b/ffi/unix/stat/stat.factor index fd4d1430fc..4b436f6c79 100644 --- a/ffi/unix/stat/stat.factor +++ b/ffi/unix/stat/stat.factor @@ -18,8 +18,8 @@ CONSTANT: S_IFWHT 0o160000 ! Whiteout. STRUCT: fsid { __val int[2] } ; -TYPEDEF: fsid __fsid_t ; -TYPEDEF: fsid fsid_t ; +TYPEDEF: fsid __fsid_t +TYPEDEF: fsid fsid_t COMPILE< "unix.stat." os name>> append require COMPILE> diff --git a/ffi/unix/types/linux/linux.factor b/ffi/unix/types/linux/linux.factor index 07dbe8c70b..9380e50d84 100644 --- a/ffi/unix/types/linux/linux.factor +++ b/ffi/unix/types/linux/linux.factor @@ -1,33 +1,33 @@ USING: alien.syntax alien.c-types ; IN: unix.types -TYPEDEF: ulonglong __uquad_type ; -TYPEDEF: ulong __ulongword_type ; -TYPEDEF: long __sword_type ; -TYPEDEF: ulong __uword_type ; -TYPEDEF: long __slongword_type ; -TYPEDEF: uint __u32_type ; -TYPEDEF: int __s32_type ; +TYPEDEF: ulonglong __uquad_type +TYPEDEF: ulong __ulongword_type +TYPEDEF: long __sword_type +TYPEDEF: ulong __uword_type +TYPEDEF: long __slongword_type +TYPEDEF: uint __u32_type +TYPEDEF: int __s32_type -TYPEDEF: __uquad_type dev_t ; -TYPEDEF: __ulongword_type ino_t ; -TYPEDEF: ino_t __ino_t ; -TYPEDEF: __u32_type mode_t ; -TYPEDEF: __uword_type nlink_t ; -TYPEDEF: __u32_type uid_t ; -TYPEDEF: __u32_type gid_t ; -TYPEDEF: __slongword_type off_t ; -TYPEDEF: off_t __off_t ; -TYPEDEF: __slongword_type blksize_t ; -TYPEDEF: __slongword_type blkcnt_t ; -TYPEDEF: __sword_type ssize_t ; -TYPEDEF: __s32_type pid_t ; -TYPEDEF: __slongword_type time_t ; -TYPEDEF: __slongword_type __time_t ; +TYPEDEF: __uquad_type dev_t +TYPEDEF: __ulongword_type ino_t +TYPEDEF: ino_t __ino_t +TYPEDEF: __u32_type mode_t +TYPEDEF: __uword_type nlink_t +TYPEDEF: __u32_type uid_t +TYPEDEF: __u32_type gid_t +TYPEDEF: __slongword_type off_t +TYPEDEF: off_t __off_t +TYPEDEF: __slongword_type blksize_t +TYPEDEF: __slongword_type blkcnt_t +TYPEDEF: __sword_type ssize_t +TYPEDEF: __s32_type pid_t +TYPEDEF: __slongword_type time_t +TYPEDEF: __slongword_type __time_t -TYPEDEF: ssize_t __SWORD_TYPE ; -TYPEDEF: ulonglong blkcnt64_t ; -TYPEDEF: ulonglong __fsblkcnt64_t ; -TYPEDEF: ulonglong __fsfilcnt64_t ; -TYPEDEF: ulonglong ino64_t ; -TYPEDEF: ulonglong off64_t ; +TYPEDEF: ssize_t __SWORD_TYPE +TYPEDEF: ulonglong blkcnt64_t +TYPEDEF: ulonglong __fsblkcnt64_t +TYPEDEF: ulonglong __fsfilcnt64_t +TYPEDEF: ulonglong ino64_t +TYPEDEF: ulonglong off64_t diff --git a/ffi/unix/types/macosx/macosx.factor b/ffi/unix/types/macosx/macosx.factor index c8800a3664..fc435cd9fb 100644 --- a/ffi/unix/types/macosx/macosx.factor +++ b/ffi/unix/types/macosx/macosx.factor @@ -3,33 +3,33 @@ IN: unix.types ! Darwin 9.1.0 -TYPEDEF: ushort __uint16_t ; -TYPEDEF: uint __uint32_t ; -TYPEDEF: int __int32_t ; -TYPEDEF: longlong __int64_t ; +TYPEDEF: ushort __uint16_t +TYPEDEF: uint __uint32_t +TYPEDEF: int __int32_t +TYPEDEF: longlong __int64_t -TYPEDEF: __int32_t dev_t ; -TYPEDEF: __uint32_t ino_t ; -TYPEDEF: __uint16_t mode_t ; -TYPEDEF: __uint16_t nlink_t ; -TYPEDEF: __uint32_t uid_t ; -TYPEDEF: __uint32_t gid_t ; -TYPEDEF: __int64_t off_t ; -TYPEDEF: __int64_t blkcnt_t ; -TYPEDEF: __int64_t ino64_t ; -TYPEDEF: __int32_t blksize_t ; -TYPEDEF: long ssize_t ; -TYPEDEF: __int32_t pid_t ; -TYPEDEF: long time_t ; -TYPEDEF: uint mach_port_t ; -TYPEDEF: int kern_return_t ; -TYPEDEF: int boolean_t ; -TYPEDEF: mach_port_t io_object_t ; -TYPEDEF: io_object_t io_iterator_t ; -TYPEDEF: io_object_t io_registry_entry_t ; -TYPEDEF: io_object_t io_service_t ; -TYPEDEF: char[128] io_name_t ; -TYPEDEF: char[512] io_string_t ; -TYPEDEF: kern_return_t IOReturn ; +TYPEDEF: __int32_t dev_t +TYPEDEF: __uint32_t ino_t +TYPEDEF: __uint16_t mode_t +TYPEDEF: __uint16_t nlink_t +TYPEDEF: __uint32_t uid_t +TYPEDEF: __uint32_t gid_t +TYPEDEF: __int64_t off_t +TYPEDEF: __int64_t blkcnt_t +TYPEDEF: __int64_t ino64_t +TYPEDEF: __int32_t blksize_t +TYPEDEF: long ssize_t +TYPEDEF: __int32_t pid_t +TYPEDEF: long time_t +TYPEDEF: uint mach_port_t +TYPEDEF: int kern_return_t +TYPEDEF: int boolean_t +TYPEDEF: mach_port_t io_object_t +TYPEDEF: io_object_t io_iterator_t +TYPEDEF: io_object_t io_registry_entry_t +TYPEDEF: io_object_t io_service_t +TYPEDEF: char[128] io_name_t +TYPEDEF: char[512] io_string_t +TYPEDEF: kern_return_t IOReturn -TYPEDEF: uint IOOptionBits ; +TYPEDEF: uint IOOptionBits diff --git a/ffi/unix/types/types.factor b/ffi/unix/types/types.factor index 050a89623d..c0bc34e9f1 100644 --- a/ffi/unix/types/types.factor +++ b/ffi/unix/types/types.factor @@ -2,32 +2,32 @@ USING: accessors alien.c-types alien.syntax system vocabs ; QUALIFIED: sequences IN: unix.types -TYPEDEF: uchar u_int8_t ; -TYPEDEF: ushort u_int16_t ; -TYPEDEF: uint u_int32_t ; -TYPEDEF: ulonglong u_int64_t ; +TYPEDEF: uchar u_int8_t +TYPEDEF: ushort u_int16_t +TYPEDEF: uint u_int32_t +TYPEDEF: ulonglong u_int64_t -TYPEDEF: char __int8_t ; -TYPEDEF: short __int16_t ; -TYPEDEF: int __int32_t ; -TYPEDEF: longlong __int64_t ; +TYPEDEF: char __int8_t +TYPEDEF: short __int16_t +TYPEDEF: int __int32_t +TYPEDEF: longlong __int64_t -TYPEDEF: uchar __uint8_t ; -TYPEDEF: ushort __uint16_t ; -TYPEDEF: uint __uint32_t ; -TYPEDEF: ulonglong __uint64_t ; +TYPEDEF: uchar __uint8_t +TYPEDEF: ushort __uint16_t +TYPEDEF: uint __uint32_t +TYPEDEF: ulonglong __uint64_t -TYPEDEF: void* caddr_t ; -TYPEDEF: uint in_addr_t ; -TYPEDEF: uint socklen_t ; +TYPEDEF: void* caddr_t +TYPEDEF: uint in_addr_t +TYPEDEF: uint socklen_t -TYPEDEF: __uint64_t fsblkcnt_t ; -TYPEDEF: fsblkcnt_t __fsblkcnt_t ; -TYPEDEF: __uint64_t fsfilcnt_t ; -TYPEDEF: fsfilcnt_t __fsfilcnt_t ; -TYPEDEF: __uint64_t rlim_t ; -TYPEDEF: uint32_t id_t ; -TYPEDEF: long clockid_t ; +TYPEDEF: __uint64_t fsblkcnt_t +TYPEDEF: fsblkcnt_t __fsblkcnt_t +TYPEDEF: __uint64_t fsfilcnt_t +TYPEDEF: fsfilcnt_t __fsfilcnt_t +TYPEDEF: __uint64_t rlim_t +TYPEDEF: uint32_t id_t +TYPEDEF: long clockid_t C-TYPE: DIR C-TYPE: FILE diff --git a/ffi/windows/advapi32/advapi32.factor b/ffi/windows/advapi32/advapi32.factor index 55ce8a9927..23c4e8f617 100755 --- a/ffi/windows/advapi32/advapi32.factor +++ b/ffi/windows/advapi32/advapi32.factor @@ -44,7 +44,7 @@ STRUCT: ACL { AceCount WORD } { Sbz2 WORD } ; -TYPEDEF: ACL* PACL ; +TYPEDEF: ACL* PACL CONSTANT: ACCESS_ALLOWED_ACE_TYPE 0 CONSTANT: ACCESS_DENIED_ACE_TYPE 1 @@ -62,20 +62,20 @@ STRUCT: ACE_HEADER { AceFlags BYTE } { AceSize WORD } ; -TYPEDEF: ACE_HEADER* PACE_HEADER ; +TYPEDEF: ACE_HEADER* PACE_HEADER STRUCT: ACCESS_ALLOWED_ACE { Header ACE_HEADER } { Mask DWORD } { SidStart DWORD } ; -TYPEDEF: ACCESS_ALLOWED_ACE* PACCESS_ALLOWED_ACE ; +TYPEDEF: ACCESS_ALLOWED_ACE* PACCESS_ALLOWED_ACE STRUCT: ACCESS_DENIED_ACE { Header ACE_HEADER } { Mask DWORD } { SidStart DWORD } ; -TYPEDEF: ACCESS_DENIED_ACE* PACCESS_DENIED_ACE ; +TYPEDEF: ACCESS_DENIED_ACE* PACCESS_DENIED_ACE STRUCT: SYSTEM_AUDIT_ACE @@ -83,21 +83,21 @@ STRUCT: SYSTEM_AUDIT_ACE { Mask DWORD } { SidStart DWORD } ; -TYPEDEF: SYSTEM_AUDIT_ACE* PSYSTEM_AUDIT_ACE ; +TYPEDEF: SYSTEM_AUDIT_ACE* PSYSTEM_AUDIT_ACE STRUCT: SYSTEM_ALARM_ACE { Header ACE_HEADER } { Mask DWORD } { SidStart DWORD } ; -TYPEDEF: SYSTEM_ALARM_ACE* PSYSTEM_ALARM_ACE ; +TYPEDEF: SYSTEM_ALARM_ACE* PSYSTEM_ALARM_ACE STRUCT: ACCESS_ALLOWED_CALLBACK_ACE { Header ACE_HEADER } { Mask DWORD } { SidStart DWORD } ; -TYPEDEF: ACCESS_ALLOWED_CALLBACK_ACE* PACCESS_ALLOWED_CALLBACK_ACE ; +TYPEDEF: ACCESS_ALLOWED_CALLBACK_ACE* PACCESS_ALLOWED_CALLBACK_ACE STRUCT: SECURITY_DESCRIPTOR { Revision UCHAR } @@ -108,7 +108,7 @@ STRUCT: SECURITY_DESCRIPTOR { Sacl PACL } { Dacl PACL } ; -TYPEDEF: SECURITY_DESCRIPTOR* PSECURITY_DESCRIPTOR ; +TYPEDEF: SECURITY_DESCRIPTOR* PSECURITY_DESCRIPTOR CONSTANT: SE_OWNER_DEFAULTED 1 CONSTANT: SE_GROUP_DEFAULTED 2 @@ -124,8 +124,8 @@ CONSTANT: SE_DACL_PROTECTED 4096 CONSTANT: SE_SACL_PROTECTED 8192 CONSTANT: SE_SELF_RELATIVE 32768 -TYPEDEF: DWORD SECURITY_DESCRIPTOR_CONTROL ; -TYPEDEF: SECURITY_DESCRIPTOR_CONTROL* PSECURITY_DESCRIPTOR_CONTROL ; +TYPEDEF: DWORD SECURITY_DESCRIPTOR_CONTROL +TYPEDEF: SECURITY_DESCRIPTOR_CONTROL* PSECURITY_DESCRIPTOR_CONTROL ENUM: ACCESS_MODE NOT_USED_ACCESS @@ -180,7 +180,7 @@ STRUCT: TRUSTEE { TrusteeType TRUSTEE_TYPE } { ptstrName LPTSTR } ; -TYPEDEF: TRUSTEE* PTRUSTEE ; +TYPEDEF: TRUSTEE* PTRUSTEE STRUCT: EXPLICIT_ACCESS { grfAccessPermissions DWORD } @@ -191,7 +191,7 @@ STRUCT: EXPLICIT_ACCESS STRUCT: SID_IDENTIFIER_AUTHORITY { Value { BYTE 6 } } ; -TYPEDEF: SID_IDENTIFIER_AUTHORITY* PSID_IDENTIFIER_AUTHORITY ; +TYPEDEF: SID_IDENTIFIER_AUTHORITY* PSID_IDENTIFIER_AUTHORITY CONSTANT: SECURITY_NULL_SID_AUTHORITY 0 CONSTANT: SECURITY_WORLD_SID_AUTHORITY 1 @@ -278,12 +278,12 @@ CONSTANT: NTE_FAIL 0x80090020 CONSTANT: NTE_SYS_ERR 0x80090021 ! SID is a variable length structure -TYPEDEF: void* PSID ; +TYPEDEF: void* PSID -TYPEDEF: EXPLICIT_ACCESS* PEXPLICIT_ACCESS ; +TYPEDEF: EXPLICIT_ACCESS* PEXPLICIT_ACCESS -TYPEDEF: DWORD SECURITY_INFORMATION ; -TYPEDEF: SECURITY_INFORMATION* PSECURITY_INFORMATION ; +TYPEDEF: DWORD SECURITY_INFORMATION +TYPEDEF: SECURITY_INFORMATION* PSECURITY_INFORMATION CONSTANT: OWNER_SECURITY_INFORMATION 1 CONSTANT: GROUP_SECURITY_INFORMATION 2 @@ -665,7 +665,7 @@ CONSTANT: PUBLICKEYBLOBEX 0xA CONSTANT: SIMPLEBLOB 0x1 CONSTANT: SYMMETRICWRAPKEYBLOB 0xB -TYPEDEF: void* SID ; +TYPEDEF: void* SID CONSTANT: SECURITY_MAX_SID_SIZE 68 @@ -781,9 +781,9 @@ ENUM: TOKEN_INFORMATION_CLASS TokenLogonSid MaxTokenInfoClass ; -TYPEDEF: TOKEN_INFORMATION_CLASS* PTOKEN_INFORMATION_CLASS ; +TYPEDEF: TOKEN_INFORMATION_CLASS* PTOKEN_INFORMATION_CLASS -TYPEDEF: uint ALG_ID ; +TYPEDEF: uint ALG_ID STRUCT: PUBLICKEYSTRUC { bType BYTE } @@ -791,10 +791,10 @@ STRUCT: PUBLICKEYSTRUC { reserved WORD } { aiKeyAlg ALG_ID } ; -TYPEDEF: PUBLICKEYSTRUC BLOBHEADER ; -TYPEDEF: LONG HCRYPTHASH ; -TYPEDEF: LONG HCRYPTKEY ; -TYPEDEF: DWORD REGSAM ; +TYPEDEF: PUBLICKEYSTRUC BLOBHEADER +TYPEDEF: LONG HCRYPTHASH +TYPEDEF: LONG HCRYPTKEY +TYPEDEF: DWORD REGSAM ! : I_ScGetCurrentGroupStateW ; ! : A_SHAFinal ; diff --git a/ffi/windows/crypt32/crypt32.factor b/ffi/windows/crypt32/crypt32.factor index bb7fbcde9b..f0415915dc 100644 --- a/ffi/windows/crypt32/crypt32.factor +++ b/ffi/windows/crypt32/crypt32.factor @@ -6,49 +6,49 @@ IN: windows.crypt32 LIBRARY: crypt32 -TYPEDEF: HANDLE HCERTSTORE ; -TYPEDEF: ULONG_PTR HCRYPTPROV ; -TYPEDEF: HANDLE HCRYPTPROV_LEGACY ; +TYPEDEF: HANDLE HCERTSTORE +TYPEDEF: ULONG_PTR HCRYPTPROV +TYPEDEF: HANDLE HCRYPTPROV_LEGACY STRUCT: CRYPT_BIT_BLOB { cbData DWORD } { pbData BYTE* } { cUnusedBits DWORD } ; -TYPEDEF: CRYPT_BIT_BLOB* PCRYPT_BIT_BLOB ; +TYPEDEF: CRYPT_BIT_BLOB* PCRYPT_BIT_BLOB STRUCT: CRYPTOAPI_BLOB { cbData DWORD } { pbData BYTE* } ; -TYPEDEF: CRYPTOAPI_BLOB CRYPT_INTEGER_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CRYPT_UINT_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CRYPT_OBJID_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CERT_NAME_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CERT_RDN_VALUE_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CERT_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CRL_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB DATA_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CRYPT_DATA_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CRYPT_HASH_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CRYPT_DIGEST_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CRYPT_DER_BLOB ; -TYPEDEF: CRYPTOAPI_BLOB CRYPT_ATTR_BLOB ; +TYPEDEF: CRYPTOAPI_BLOB CRYPT_INTEGER_BLOB +TYPEDEF: CRYPTOAPI_BLOB CRYPT_UINT_BLOB +TYPEDEF: CRYPTOAPI_BLOB CRYPT_OBJID_BLOB +TYPEDEF: CRYPTOAPI_BLOB CERT_NAME_BLOB +TYPEDEF: CRYPTOAPI_BLOB CERT_RDN_VALUE_BLOB +TYPEDEF: CRYPTOAPI_BLOB CERT_BLOB +TYPEDEF: CRYPTOAPI_BLOB CRL_BLOB +TYPEDEF: CRYPTOAPI_BLOB DATA_BLOB +TYPEDEF: CRYPTOAPI_BLOB CRYPT_DATA_BLOB +TYPEDEF: CRYPTOAPI_BLOB CRYPT_HASH_BLOB +TYPEDEF: CRYPTOAPI_BLOB CRYPT_DIGEST_BLOB +TYPEDEF: CRYPTOAPI_BLOB CRYPT_DER_BLOB +TYPEDEF: CRYPTOAPI_BLOB CRYPT_ATTR_BLOB STRUCT: CRYPT_ALGORITHM_IDENTIFIER { pszObjId LPSTR } { Parameters CRYPT_OBJID_BLOB } ; -TYPEDEF: CRYPT_ALGORITHM_IDENTIFIER* PCRYPT_ALGORITHM_IDENTIFIER ; +TYPEDEF: CRYPT_ALGORITHM_IDENTIFIER* PCRYPT_ALGORITHM_IDENTIFIER STRUCT: CERT_PUBLIC_KEY_INFO { Algorithm CRYPT_ALGORITHM_IDENTIFIER } { PublicKey CRYPT_BIT_BLOB } ; -TYPEDEF: CERT_PUBLIC_KEY_INFO* PCERT_PUBLIC_KEY_INFO ; +TYPEDEF: CERT_PUBLIC_KEY_INFO* PCERT_PUBLIC_KEY_INFO STRUCT: CERT_EXTENSION { pszObjId LPSTR } { fCritical BOOL } { Value CRYPT_OBJID_BLOB } ; -TYPEDEF: CERT_EXTENSION* PCERT_EXTENSION ; +TYPEDEF: CERT_EXTENSION* PCERT_EXTENSION STRUCT: CERT_INFO { dwVersion DWORD } @@ -63,7 +63,7 @@ STRUCT: CERT_INFO { SubjectUniqueId CRYPT_BIT_BLOB } { cExtension DWORD } { rgExtension PCERT_EXTENSION } ; -TYPEDEF: CERT_INFO* PCERT_INFO ; +TYPEDEF: CERT_INFO* PCERT_INFO STRUCT: CERT_CONTEXT { dwCertEncodingType DWORD } @@ -71,7 +71,7 @@ STRUCT: CERT_CONTEXT { cbCertEncoded DWORD } { pCertInfo PCERT_INFO } { hCertStore HCERTSTORE } ; -TYPEDEF: CERT_CONTEXT* PCCERT_CONTEXT ; +TYPEDEF: CERT_CONTEXT* PCCERT_CONTEXT ! CryptObjectLocatorFree diff --git a/ffi/windows/ddk/hid/hid.factor b/ffi/windows/ddk/hid/hid.factor index 34e7d10ac5..35803915d0 100755 --- a/ffi/windows/ddk/hid/hid.factor +++ b/ffi/windows/ddk/hid/hid.factor @@ -7,9 +7,9 @@ IN: windows.ddk.hid COMPILE< "hid" "hid.dll" stdcall add-library COMPILE> LIBRARY: hid -TYPEDEF: LONG NTSTATUS ; -TYPEDEF: USHORT USAGE ; -TYPEDEF: USAGE* PUSAGE ; +TYPEDEF: LONG NTSTATUS +TYPEDEF: USHORT USAGE +TYPEDEF: USAGE* PUSAGE CONSTANT: HID_USAGE_PAGE_UNDEFINED 0x00 CONSTANT: HID_USAGE_PAGE_GENERIC 0x01 @@ -214,7 +214,7 @@ ENUM: HIDP_REPORT_TYPE STRUCT: USAGE_AND_PAGE { Usage USAGE } { UsagePage USAGE } ; -TYPEDEF: USAGE_AND_PAGE* PUSAGE_AND_PAGE ; +TYPEDEF: USAGE_AND_PAGE* PUSAGE_AND_PAGE : HidP_IsSameUsageAndPage ( u1 u2 -- ? ) = ; inline @@ -256,7 +256,7 @@ STRUCT: HIDP_BUTTON_CAPS { IsAbsolute BOOLEAN } { Reserved ULONG[10] } { Union HIDP_BUTTONS_CAPS_union } ; -TYPEDEF: HIDP_BUTTON_CAPS* PHIDP_BUTTON_CAPS ; +TYPEDEF: HIDP_BUTTON_CAPS* PHIDP_BUTTON_CAPS STRUCT: HIDP_VALUE_CAPS_range { UsageMin USAGE } @@ -306,7 +306,7 @@ STRUCT: HIDP_VALUE_CAPS { PhysicalMin LONG } { PhysicalMax LONG } { Union HIDP_VALUE_CAPS_union } ; -TYPEDEF: HIDP_VALUE_CAPS* PHIDP_VALUE_CAPS ; +TYPEDEF: HIDP_VALUE_CAPS* PHIDP_VALUE_CAPS STRUCT: HIDP_LINK_COLLECTION_NODE { LinkUsage USAGE } @@ -317,11 +317,11 @@ STRUCT: HIDP_LINK_COLLECTION_NODE { FirstChild USHORT } { CollectionTypeIsAliasBitfield ULONG } { UserContext PVOID } ; -TYPEDEF: HIDP_LINK_COLLECTION_NODE* PHIDP_LINK_COLLECTION_NODE ; +TYPEDEF: HIDP_LINK_COLLECTION_NODE* PHIDP_LINK_COLLECTION_NODE -TYPEDEF: PUCHAR PHIDP_REPORT_DESCRIPTOR ; +TYPEDEF: PUCHAR PHIDP_REPORT_DESCRIPTOR C-TYPE: HIDP_PREPARSED_DATA -TYPEDEF: HIDP_PREPARSED_DATA* PHIDP_PREPARSED_DATA ; +TYPEDEF: HIDP_PREPARSED_DATA* PHIDP_PREPARSED_DATA STRUCT: HIDP_CAPS { Usage USAGE } @@ -340,26 +340,26 @@ STRUCT: HIDP_CAPS { NumberFeatureButtonCaps USHORT } { NumberFeatureValueCaps USHORT } { NumberFeatureDataIndices USHORT } ; -TYPEDEF: HIDP_CAPS* PHIDP_CAPS ; +TYPEDEF: HIDP_CAPS* PHIDP_CAPS STRUCT: HIDP_DATA { DataIndex USHORT } { Reserved USHORT } { RawValue ULONG } ; -TYPEDEF: HIDP_DATA* PHIDP_DATA ; +TYPEDEF: HIDP_DATA* PHIDP_DATA STRUCT: HIDP_UNKNOWN_TOKEN { Token UCHAR } { Reserved UCHAR[3] } { BitField ULONG } ; -TYPEDEF: HIDP_UNKNOWN_TOKEN* PHIDP_UNKNOWN_TOKEN ; +TYPEDEF: HIDP_UNKNOWN_TOKEN* PHIDP_UNKNOWN_TOKEN STRUCT: HIDP_EXTENDED_ATTRIBUTES { NumGlobalUnknowns UCHAR } { Reserved UCHAR[3] } { GlobalUnknowns PHIDP_UNKNOWN_TOKEN } { Data ULONG[1] } ; -TYPEDEF: HIDP_EXTENDED_ATTRIBUTES* PHIDP_EXTENDED_ATTRIBUTES ; +TYPEDEF: HIDP_EXTENDED_ATTRIBUTES* PHIDP_EXTENDED_ATTRIBUTES FUNCTION: NTSTATUS HidP_GetCaps ( @@ -613,7 +613,7 @@ ENUM: HIDP_KEYBOARD_DIRECTION STRUCT: HIDP_KEYBOARD_MODIFIER_STATE { ul ULONG } ; -TYPEDEF: HIDP_KEYBOARD_MODIFIER_STATE* PHIDP_KEYBOARD_MODIFIER_STATE ; +TYPEDEF: HIDP_KEYBOARD_MODIFIER_STATE* PHIDP_KEYBOARD_MODIFIER_STATE CALLBACK: BOOLEAN PHIDP_INSERT_SCANCODES ( PVOID Context, @@ -669,14 +669,14 @@ STRUCT: HIDD_CONFIGURATION { cookie PVOID } { size ULONG } { RingBufferSize ULONG } ; -TYPEDEF: HIDD_CONFIGURATION* PHIDD_CONFIGURATION ; +TYPEDEF: HIDD_CONFIGURATION* PHIDD_CONFIGURATION STRUCT: HIDD_ATTRIBUTES { Size ULONG } { VendorID USHORT } { ProductID USHORT } { VersionNumber USHORT } ; -TYPEDEF: HIDD_ATTRIBUTES* PHIDD_ATTRIBUTES ; +TYPEDEF: HIDD_ATTRIBUTES* PHIDD_ATTRIBUTES FUNCTION: BOOLEAN HidD_GetAttributes ( diff --git a/ffi/windows/ddk/setupapi/setupapi.factor b/ffi/windows/ddk/setupapi/setupapi.factor index 73759ca56e..f8906dea14 100755 --- a/ffi/windows/ddk/setupapi/setupapi.factor +++ b/ffi/windows/ddk/setupapi/setupapi.factor @@ -8,8 +8,8 @@ IN: windows.ddk.setupapi COMPILE< "setupapi" "setupapi.dll" stdcall add-library COMPILE> LIBRARY: setupapi -TYPEDEF: DWORDLONG SP_LOG_TOKEN ; -TYPEDEF: DWORDLONG* PSP_LOG_TOKEN ; +TYPEDEF: DWORDLONG SP_LOG_TOKEN +TYPEDEF: DWORDLONG* PSP_LOG_TOKEN CONSTANT: LOGTOKEN_TYPE_MASK 3 CONSTANT: LOGTOKEN_UNSPECIFIED 0 @@ -58,13 +58,13 @@ CONSTANT: TXTLOG_DEVMGR 0x20000000 CONSTANT: TXTLOG_INSTALLER 0x40000000 CONSTANT: TXTLOG_VENDOR 0x80000000 -TYPEDEF: void* HPROPSHEETPAGE ; -TYPEDEF: void* HIMAGELIST ; +TYPEDEF: void* HPROPSHEETPAGE +TYPEDEF: void* HIMAGELIST C-TYPE: DEVPROPKEY -TYPEDEF: ULONG DEVPROPTYPE ; -TYPEDEF: DEVPROPTYPE* PDEVPROPTYPE ; -TYPEDEF: void* LPPROPSHEETHEADERA ; -TYPEDEF: void* LPPROPSHEETHEADERW ; +TYPEDEF: ULONG DEVPROPTYPE +TYPEDEF: DEVPROPTYPE* PDEVPROPTYPE +TYPEDEF: void* LPPROPSHEETHEADERA +TYPEDEF: void* LPPROPSHEETHEADERW CONSTANT: LINE_LEN 256 CONSTANT: LINE_LEN*2 512 @@ -77,20 +77,20 @@ CONSTANT: MAX_SERVICE_NAME_LEN 256 CONSTANT: MAX_SUBTITLE_LEN 256 CONSTANT: SP_MAX_MACHINENAME_LENGTH $$[ MAX_PATH 3 + ] -TYPEDEF: PVOID HINF ; +TYPEDEF: PVOID HINF STRUCT: INFCONTEXT { Inf PVOID } { CurrentInf PVOID } { Section UINT } { Line UINT } ; -TYPEDEF: INFCONTEXT* PINFCONTEXT ; +TYPEDEF: INFCONTEXT* PINFCONTEXT STRUCT: SP_INF_INFORMATION { InfStyle DWORD } { InfCount DWORD } { VersionDat BYTE[ANYSIZE_ARRAY] } ; -TYPEDEF: SP_INF_INFORMATION* PSP_INF_INFORMATION ; +TYPEDEF: SP_INF_INFORMATION* PSP_INF_INFORMATION STRUCT: SP_ALTPLATFORM_INFO_V2 { cbSize DWORD } @@ -101,7 +101,7 @@ STRUCT: SP_ALTPLATFORM_INFO_V2 { Flags WORD } { FirstValidatedMajorVersion DWORD } { FirstValidatedMinorVersion DWORD } ; -TYPEDEF: SP_ALTPLATFORM_INFO_V2* PSP_ALTPLATFORM_INFO_V2 ; +TYPEDEF: SP_ALTPLATFORM_INFO_V2* PSP_ALTPLATFORM_INFO_V2 STRUCT: SP_ALTPLATFORM_INFO_V1 { cbSize DWORD } @@ -110,9 +110,9 @@ STRUCT: SP_ALTPLATFORM_INFO_V1 { MinorVersion DWORD } { ProcessorArchitecture WORD } { Reserved WORD } ; -TYPEDEF: SP_ALTPLATFORM_INFO_V1* PSP_ALTPLATFORM_INFO_V1 ; -TYPEDEF: SP_ALTPLATFORM_INFO_V2 SP_ALTPLATFORM_INFO ; -TYPEDEF: PSP_ALTPLATFORM_INFO_V2 PSP_ALTPLATFORM_INFO ; +TYPEDEF: SP_ALTPLATFORM_INFO_V1* PSP_ALTPLATFORM_INFO_V1 +TYPEDEF: SP_ALTPLATFORM_INFO_V2 SP_ALTPLATFORM_INFO +TYPEDEF: PSP_ALTPLATFORM_INFO_V2 PSP_ALTPLATFORM_INFO CONSTANT: SP_ALTPLATFORM_FLAGS_VERSION_RANGE 1 @@ -120,14 +120,14 @@ STRUCT: SP_ORIGINAL_FILE_INFO_A { cbSize DWORD } { OriginalInfName CHAR[MAX_PATH] } { OriginalCatalogName CHAR[MAX_PATH] } ; -TYPEDEF: SP_ORIGINAL_FILE_INFO_A* PSP_ORIGINAL_FILE_INFO_A ; +TYPEDEF: SP_ORIGINAL_FILE_INFO_A* PSP_ORIGINAL_FILE_INFO_A STRUCT: SP_ORIGINAL_FILE_INFO_W { cbSize DWORD } { OriginalInfName WCHAR[MAX_PATH] } { OriginalCatalogName WCHAR[MAX_PATH] } ; -TYPEDEF: SP_ORIGINAL_FILE_INFO_W* PSP_ORIGINAL_FILE_INFO_W ; -TYPEDEF: SP_ORIGINAL_FILE_INFO_W SP_ORIGINAL_FILE_INFO ; -TYPEDEF: PSP_ORIGINAL_FILE_INFO_W PSP_ORIGINAL_FILE_INFO ; +TYPEDEF: SP_ORIGINAL_FILE_INFO_W* PSP_ORIGINAL_FILE_INFO_W +TYPEDEF: SP_ORIGINAL_FILE_INFO_W SP_ORIGINAL_FILE_INFO +TYPEDEF: PSP_ORIGINAL_FILE_INFO_W PSP_ORIGINAL_FILE_INFO CONSTANT: INF_STYLE_NONE 0x00000000 CONSTANT: INF_STYLE_OLDNT 0x00000001 @@ -174,7 +174,7 @@ CONSTANT: DIRID_COMMON_DOCUMENTS 16430 CONSTANT: DIRID_USER 0x8000 CALLBACK: UINT PSP_FILE_CALLBACK_A ( PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2 ) ; CALLBACK: UINT PSP_FILE_CALLBACK_W ( PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2 ) ; -TYPEDEF: PSP_FILE_CALLBACK_W PSP_FILE_CALLBACK ; +TYPEDEF: PSP_FILE_CALLBACK_W PSP_FILE_CALLBACK CONSTANT: SPFILENOTIFY_STARTQUEUE 0x00000001 CONSTANT: SPFILENOTIFY_ENDQUEUE 0x00000002 CONSTANT: SPFILENOTIFY_STARTSUBQUEUE 0x00000003 @@ -234,15 +234,15 @@ STRUCT: FILEPATHS_A { Source PCSTR } { Win32Error UINT } { Flags DWORD } ; -TYPEDEF: FILEPATHS_A* PFILEPATHS_A ; +TYPEDEF: FILEPATHS_A* PFILEPATHS_A STRUCT: FILEPATHS_W { Target PCWSTR } { Source PCWSTR } { Win32Error UINT } { Flags DWORD } ; -TYPEDEF: FILEPATHS_W* PFILEPATHS_W ; -TYPEDEF: FILEPATHS_W FILEPATHS ; -TYPEDEF: PFILEPATHS_W PFILEPATHS ; +TYPEDEF: FILEPATHS_W* PFILEPATHS_W +TYPEDEF: FILEPATHS_W FILEPATHS +TYPEDEF: PFILEPATHS_W PFILEPATHS STRUCT: FILEPATHS_SIGNERINFO_A { Target PCSTR } { Source PCSTR } @@ -251,7 +251,7 @@ STRUCT: FILEPATHS_SIGNERINFO_A { DigitalSigner PCSTR } { Version PCSTR } { CatalogFile PCSTR } ; -TYPEDEF: FILEPATHS_SIGNERINFO_A* PFILEPATHS_SIGNERINFO_A ; +TYPEDEF: FILEPATHS_SIGNERINFO_A* PFILEPATHS_SIGNERINFO_A STRUCT: FILEPATHS_SIGNERINFO_W { Target PCWSTR } { Source PCWSTR } @@ -260,9 +260,9 @@ STRUCT: FILEPATHS_SIGNERINFO_W { DigitalSigner PCWSTR } { Version PCWSTR } { CatalogFile PCWSTR } ; -TYPEDEF: FILEPATHS_SIGNERINFO_W* PFILEPATHS_SIGNERINFO_W ; -TYPEDEF: FILEPATHS_SIGNERINFO_W FILEPATHS_SIGNERINFO ; -TYPEDEF: PFILEPATHS_SIGNERINFO_W PFILEPATHS_SIGNERINFO ; +TYPEDEF: FILEPATHS_SIGNERINFO_W* PFILEPATHS_SIGNERINFO_W +TYPEDEF: FILEPATHS_SIGNERINFO_W FILEPATHS_SIGNERINFO +TYPEDEF: PFILEPATHS_SIGNERINFO_W PFILEPATHS_SIGNERINFO STRUCT: SOURCE_MEDIA_A { Reserved PCSTR } @@ -271,7 +271,7 @@ STRUCT: SOURCE_MEDIA_A { SourcePath PCSTR } { SourceFile PCSTR } { Flags DWORD } ; -TYPEDEF: SOURCE_MEDIA_A* PSOURCE_MEDIA_A ; +TYPEDEF: SOURCE_MEDIA_A* PSOURCE_MEDIA_A STRUCT: SOURCE_MEDIA_W { Reserved PCWSTR } { Tagfile PCWSTR } @@ -279,9 +279,9 @@ STRUCT: SOURCE_MEDIA_W { SourcePath PCWSTR } { SourceFile PCWSTR } { Flags DWORD } ; -TYPEDEF: SOURCE_MEDIA_W* PSOURCE_MEDIA_W ; -TYPEDEF: SOURCE_MEDIA_W SOURCE_MEDIA ; -TYPEDEF: PSOURCE_MEDIA_W PSOURCE_MEDIA ; +TYPEDEF: SOURCE_MEDIA_W* PSOURCE_MEDIA_W +TYPEDEF: SOURCE_MEDIA_W SOURCE_MEDIA +TYPEDEF: PSOURCE_MEDIA_W PSOURCE_MEDIA STRUCT: CABINET_INFO_A { CabinetPath PCSTR } @@ -289,16 +289,16 @@ STRUCT: CABINET_INFO_A { DiskName PCSTR } { SetId USHORT } { CabinetNumber USHORT } ; -TYPEDEF: CABINET_INFO_A* PCABINET_INFO_A ; +TYPEDEF: CABINET_INFO_A* PCABINET_INFO_A STRUCT: CABINET_INFO_W { CabinetPath PCWSTR } { CabinetFile PCWSTR } { DiskName PCWSTR } { SetId USHORT } { CabinetNumber USHORT } ; -TYPEDEF: CABINET_INFO_W* PCABINET_INFO_W ; -TYPEDEF: CABINET_INFO_W CABINET_INFO ; -TYPEDEF: PCABINET_INFO_W PCABINET_INFO ; +TYPEDEF: CABINET_INFO_W* PCABINET_INFO_W +TYPEDEF: CABINET_INFO_W CABINET_INFO +TYPEDEF: PCABINET_INFO_W PCABINET_INFO STRUCT: FILE_IN_CABINET_INFO_A { NameInCabinet PCSTR } @@ -308,7 +308,7 @@ STRUCT: FILE_IN_CABINET_INFO_A { DosTime WORD } { DosAttribs WORD } { FullTargetName CHAR[MAX_PATH] } ; -TYPEDEF: FILE_IN_CABINET_INFO_A* PFILE_IN_CABINET_INFO_A ; +TYPEDEF: FILE_IN_CABINET_INFO_A* PFILE_IN_CABINET_INFO_A STRUCT: FILE_IN_CABINET_INFO_W { NameInCabinet PCWSTR } { FileSize DWORD } @@ -317,25 +317,25 @@ STRUCT: FILE_IN_CABINET_INFO_W { DosTime WORD } { DosAttribs WORD } { FullTargetName WCHAR[MAX_PATH] } ; -TYPEDEF: FILE_IN_CABINET_INFO_W* PFILE_IN_CABINET_INFO_W ; -TYPEDEF: FILE_IN_CABINET_INFO_W FILE_IN_CABINET_INFO ; -TYPEDEF: PFILE_IN_CABINET_INFO_W PFILE_IN_CABINET_INFO ; +TYPEDEF: FILE_IN_CABINET_INFO_W* PFILE_IN_CABINET_INFO_W +TYPEDEF: FILE_IN_CABINET_INFO_W FILE_IN_CABINET_INFO +TYPEDEF: PFILE_IN_CABINET_INFO_W PFILE_IN_CABINET_INFO STRUCT: SP_REGISTER_CONTROL_STATUSA { cbSize DWORD } { FileName PCSTR } { Win32Error DWORD } { FailureCode DWORD } ; -TYPEDEF: SP_REGISTER_CONTROL_STATUSA* PSP_REGISTER_CONTROL_STATUSA ; +TYPEDEF: SP_REGISTER_CONTROL_STATUSA* PSP_REGISTER_CONTROL_STATUSA STRUCT: SP_REGISTER_CONTROL_STATUSW { cbSize DWORD } { FileName PCWSTR } { Win32Error DWORD } { FailureCode DWORD } ; -TYPEDEF: SP_REGISTER_CONTROL_STATUSW* PSP_REGISTER_CONTROL_STATUSW ; +TYPEDEF: SP_REGISTER_CONTROL_STATUSW* PSP_REGISTER_CONTROL_STATUSW -TYPEDEF: SP_REGISTER_CONTROL_STATUSW SP_REGISTER_CONTROL_STATUS ; -TYPEDEF: PSP_REGISTER_CONTROL_STATUSW PSP_REGISTER_CONTROL_STATUS ; +TYPEDEF: SP_REGISTER_CONTROL_STATUSW SP_REGISTER_CONTROL_STATUS +TYPEDEF: PSP_REGISTER_CONTROL_STATUSW PSP_REGISTER_CONTROL_STATUS CONSTANT: SPREG_SUCCESS 0x00000000 CONSTANT: SPREG_LOADLIBRARY 0x00000001 @@ -345,7 +345,7 @@ CONSTANT: SPREG_DLLINSTALL 0x00000004 CONSTANT: SPREG_TIMEOUT 0x00000005 CONSTANT: SPREG_UNKNOWN 0xFFFFFFFF -TYPEDEF: PVOID HSPFILEQ ; +TYPEDEF: PVOID HSPFILEQ STRUCT: SP_FILE_COPY_PARAMS_A { cbSize DWORD } @@ -360,7 +360,7 @@ STRUCT: SP_FILE_COPY_PARAMS_A { CopyStyle DWORD } { LayoutInf HINF } { SecurityDescriptor PCSTR } ; -TYPEDEF: SP_FILE_COPY_PARAMS_A* PSP_FILE_COPY_PARAMS_A ; +TYPEDEF: SP_FILE_COPY_PARAMS_A* PSP_FILE_COPY_PARAMS_A STRUCT: SP_FILE_COPY_PARAMS_W { cbSize DWORD } { QueueHandle HSPFILEQ } @@ -374,32 +374,32 @@ STRUCT: SP_FILE_COPY_PARAMS_W { CopyStyle DWORD } { LayoutInf HINF } { SecurityDescriptor PCWSTR } ; -TYPEDEF: SP_FILE_COPY_PARAMS_W* PSP_FILE_COPY_PARAMS_W ; +TYPEDEF: SP_FILE_COPY_PARAMS_W* PSP_FILE_COPY_PARAMS_W -TYPEDEF: SP_FILE_COPY_PARAMS_W SP_FILE_COPY_PARAMS ; -TYPEDEF: PSP_FILE_COPY_PARAMS_W PSP_FILE_COPY_PARAMS ; +TYPEDEF: SP_FILE_COPY_PARAMS_W SP_FILE_COPY_PARAMS +TYPEDEF: PSP_FILE_COPY_PARAMS_W PSP_FILE_COPY_PARAMS -TYPEDEF: PVOID HDSKSPC ; -TYPEDEF: PVOID HDEVINFO ; +TYPEDEF: PVOID HDSKSPC +TYPEDEF: PVOID HDEVINFO STRUCT: SP_DEVINFO_DATA { cbSize DWORD } { ClassGuid GUID } { DevInst DWORD } { Reserved ULONG_PTR } ; -TYPEDEF: SP_DEVINFO_DATA* PSP_DEVINFO_DATA ; +TYPEDEF: SP_DEVINFO_DATA* PSP_DEVINFO_DATA STRUCT: SP_DEVICE_INTERFACE_DATA { cbSize DWORD } { InterfaceClassGuid GUID } { Flags DWORD } { Reserved ULONG_PTR } ; -TYPEDEF: SP_DEVICE_INTERFACE_DATA* PSP_DEVICE_INTERFACE_DATA ; +TYPEDEF: SP_DEVICE_INTERFACE_DATA* PSP_DEVICE_INTERFACE_DATA CONSTANT: SPINT_ACTIVE 0x00000001 CONSTANT: SPINT_DEFAULT 0x00000002 CONSTANT: SPINT_REMOVED 0x00000004 -TYPEDEF: SP_DEVICE_INTERFACE_DATA SP_INTERFACE_DEVICE_DATA ; -TYPEDEF: PSP_DEVICE_INTERFACE_DATA PSP_INTERFACE_DEVICE_DAT ; +TYPEDEF: SP_DEVICE_INTERFACE_DATA SP_INTERFACE_DEVICE_DATA +TYPEDEF: PSP_DEVICE_INTERFACE_DATA PSP_INTERFACE_DEVICE_DAT CONSTANT: SPID_ACTIVE $\ SPINT_ACTIVE CONSTANT: SPID_DEFAULT $\ SPINT_DEFAULT CONSTANT: SPID_REMOVED $\ SPINT_REMOVED @@ -407,36 +407,36 @@ CONSTANT: SPID_REMOVED $\ SPINT_REMOVED PACKED-STRUCT: SP_DEVICE_INTERFACE_DETAIL_DATA_A { cbSize DWORD } { DevicePath CHAR[ANYSIZE_ARRAY] } ; -TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_A* PSP_DEVICE_INTERFACE_DETAIL_DATA_A ; +TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_A* PSP_DEVICE_INTERFACE_DETAIL_DATA_A PACKED-STRUCT: SP_DEVICE_INTERFACE_DETAIL_DATA_W { cbSize DWORD } { DevicePath WCHAR[ANYSIZE_ARRAY] } ; -TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_W* PSP_DEVICE_INTERFACE_DETAIL_DATA_W ; -TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_W SP_DEVICE_INTERFACE_DETAIL_DATA ; -TYPEDEF: PSP_DEVICE_INTERFACE_DETAIL_DATA_W PSP_DEVICE_INTERFACE_DETAIL_DATA ; -TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_W SP_INTERFACE_DEVICE_DETAIL_DATA_W ; -TYPEDEF: PSP_DEVICE_INTERFACE_DETAIL_DATA_W PSP_INTERFACE_DEVICE_DETAIL_DATA_W ; -TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_A SP_INTERFACE_DEVICE_DETAIL_DATA_A ; -TYPEDEF: PSP_DEVICE_INTERFACE_DETAIL_DATA_A PSP_INTERFACE_DEVICE_DETAIL_DATA_A ; +TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_W* PSP_DEVICE_INTERFACE_DETAIL_DATA_W +TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_W SP_DEVICE_INTERFACE_DETAIL_DATA +TYPEDEF: PSP_DEVICE_INTERFACE_DETAIL_DATA_W PSP_DEVICE_INTERFACE_DETAIL_DATA +TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_W SP_INTERFACE_DEVICE_DETAIL_DATA_W +TYPEDEF: PSP_DEVICE_INTERFACE_DETAIL_DATA_W PSP_INTERFACE_DEVICE_DETAIL_DATA_W +TYPEDEF: SP_DEVICE_INTERFACE_DETAIL_DATA_A SP_INTERFACE_DEVICE_DETAIL_DATA_A +TYPEDEF: PSP_DEVICE_INTERFACE_DETAIL_DATA_A PSP_INTERFACE_DEVICE_DETAIL_DATA_A -TYPEDEF: SP_INTERFACE_DEVICE_DETAIL_DATA_W SP_INTERFACE_DEVICE_DETAIL_DATA ; -TYPEDEF: PSP_INTERFACE_DEVICE_DETAIL_DATA_W PSP_INTERFACE_DEVICE_DETAIL_DATA ; +TYPEDEF: SP_INTERFACE_DEVICE_DETAIL_DATA_W SP_INTERFACE_DEVICE_DETAIL_DATA +TYPEDEF: PSP_INTERFACE_DEVICE_DETAIL_DATA_W PSP_INTERFACE_DEVICE_DETAIL_DATA STRUCT: SP_DEVINFO_LIST_DETAIL_DATA_A { cbSize DWORD } { ClassGuid GUID } { RemoteMachineHandle HANDLE } { RemoteMachineName CHAR[SP_MAX_MACHINENAME_LENGTH] } ; -TYPEDEF: SP_DEVINFO_LIST_DETAIL_DATA_A* PSP_DEVINFO_LIST_DETAIL_DATA_A ; +TYPEDEF: SP_DEVINFO_LIST_DETAIL_DATA_A* PSP_DEVINFO_LIST_DETAIL_DATA_A STRUCT: SP_DEVINFO_LIST_DETAIL_DATA_W { cbSize DWORD } { ClassGuid GUID } { RemoteMachineHandle HANDLE } { RemoteMachineName WCHAR[SP_MAX_MACHINENAME_LENGTH] } ; -TYPEDEF: SP_DEVINFO_LIST_DETAIL_DATA_W* PSP_DEVINFO_LIST_DETAIL_DATA_W ; +TYPEDEF: SP_DEVINFO_LIST_DETAIL_DATA_W* PSP_DEVINFO_LIST_DETAIL_DATA_W -TYPEDEF: SP_DEVINFO_LIST_DETAIL_DATA_W SP_DEVINFO_LIST_DETAIL_DATA ; -TYPEDEF: PSP_DEVINFO_LIST_DETAIL_DATA_W PSP_DEVINFO_LIST_DETAIL_DATA ; +TYPEDEF: SP_DEVINFO_LIST_DETAIL_DATA_W SP_DEVINFO_LIST_DETAIL_DATA +TYPEDEF: PSP_DEVINFO_LIST_DETAIL_DATA_W PSP_DEVINFO_LIST_DETAIL_DATA CONSTANT: DIF_SELECTDEVICE 0x00000001 CONSTANT: DIF_INSTALLDEVICE 0x00000002 @@ -481,7 +481,7 @@ CONSTANT: DIF_UPDATEDRIVER_UI 0x00000029 CONSTANT: DIF_FINISHINSTALL_ACTION 0x0000002A CONSTANT: DIF_RESERVED2 0x00000030 CONSTANT: DIF_MOVEDEVICE 0x0000000E -TYPEDEF: UINT DI_FUNCTION ; +TYPEDEF: UINT DI_FUNCTION STRUCT: SP_DEVINSTALL_PARAMS_A { cbSize DWORD } @@ -494,7 +494,7 @@ STRUCT: SP_DEVINSTALL_PARAMS_A { ClassInstallReserved ULONG_PTR } { Reserved DWORD } { DriverPath CHAR[MAX_PATH] } ; -TYPEDEF: SP_DEVINSTALL_PARAMS_A* PSP_DEVINSTALL_PARAMS_A ; +TYPEDEF: SP_DEVINSTALL_PARAMS_A* PSP_DEVINSTALL_PARAMS_A STRUCT: SP_DEVINSTALL_PARAMS_W { cbSize DWORD } { Flags DWORD } @@ -506,9 +506,9 @@ STRUCT: SP_DEVINSTALL_PARAMS_W { ClassInstallReserved ULONG_PTR } { Reserved DWORD } { DriverPath WCHAR[MAX_PATH] } ; -TYPEDEF: SP_DEVINSTALL_PARAMS_W* PSP_DEVINSTALL_PARAMS_W ; -TYPEDEF: SP_DEVINSTALL_PARAMS_W SP_DEVINSTALL_PARAMS ; -TYPEDEF: PSP_DEVINSTALL_PARAMS_W PSP_DEVINSTALL_PARAMS ; +TYPEDEF: SP_DEVINSTALL_PARAMS_W* PSP_DEVINSTALL_PARAMS_W +TYPEDEF: SP_DEVINSTALL_PARAMS_W SP_DEVINSTALL_PARAMS +TYPEDEF: PSP_DEVINSTALL_PARAMS_W PSP_DEVINSTALL_PARAMS CONSTANT: DI_SHOWOEM 0x00000001 CONSTANT: DI_SHOWCOMPAT 0x00000002 @@ -578,13 +578,13 @@ CONSTANT: DI_FLAGSEX_SEARCH_PUBLISHED_INFS 0x80000000 STRUCT: SP_CLASSINSTALL_HEADER { cbSize DWORD } { InstallFunction DI_FUNCTION } ; -TYPEDEF: SP_CLASSINSTALL_HEADER* PSP_CLASSINSTALL_HEADER ; +TYPEDEF: SP_CLASSINSTALL_HEADER* PSP_CLASSINSTALL_HEADER STRUCT: SP_ENABLECLASS_PARAMS { ClassInstallHeader SP_CLASSINSTALL_HEADER } { ClassGuid GUID } { EnableMessage DWORD } ; -TYPEDEF: SP_ENABLECLASS_PARAMS* PSP_ENABLECLASS_PARAMS ; +TYPEDEF: SP_ENABLECLASS_PARAMS* PSP_ENABLECLASS_PARAMS CONSTANT: ENABLECLASS_QUERY 0 CONSTANT: ENABLECLASS_SUCCESS 1 @@ -603,13 +603,13 @@ STRUCT: SP_PROPCHANGE_PARAMS { StateChange DWORD } { Scope DWORD } { HwProfile DWORD } ; -TYPEDEF: SP_PROPCHANGE_PARAMS* PSP_PROPCHANGE_PARAMS ; +TYPEDEF: SP_PROPCHANGE_PARAMS* PSP_PROPCHANGE_PARAMS STRUCT: SP_REMOVEDEVICE_PARAMS { ClassInstallHeader SP_CLASSINSTALL_HEADER } { Scope DWORD } { HwProfile DWORD } ; -TYPEDEF: SP_REMOVEDEVICE_PARAMS* PSP_REMOVEDEVICE_PARAMS ; +TYPEDEF: SP_REMOVEDEVICE_PARAMS* PSP_REMOVEDEVICE_PARAMS CONSTANT: DI_REMOVEDEVICE_GLOBAL 0x00000001 CONSTANT: DI_REMOVEDEVICE_CONFIGSPECIFIC 0x00000002 @@ -618,7 +618,7 @@ STRUCT: SP_UNREMOVEDEVICE_PARAMS { ClassInstallHeader SP_CLASSINSTALL_HEADER } { Scope DWORD } { HwProfile DWORD } ; -TYPEDEF: SP_UNREMOVEDEVICE_PARAMS* PSP_UNREMOVEDEVICE_PARAMS ; +TYPEDEF: SP_UNREMOVEDEVICE_PARAMS* PSP_UNREMOVEDEVICE_PARAMS CONSTANT: DI_UNREMOVEDEVICE_CONFIGSPECIFIC 0x00000002 @@ -629,16 +629,16 @@ STRUCT: SP_SELECTDEVICE_PARAMS_A { ListLabel CHAR[MAX_LABEL_LEN] } { SubTitle CHAR[MAX_SUBTITLE_LEN] } { Reserved BYTE[2] } ; -TYPEDEF: SP_SELECTDEVICE_PARAMS_A* PSP_SELECTDEVICE_PARAMS_A ; +TYPEDEF: SP_SELECTDEVICE_PARAMS_A* PSP_SELECTDEVICE_PARAMS_A STRUCT: SP_SELECTDEVICE_PARAMS_W { ClassInstallHeader SP_CLASSINSTALL_HEADER } { Title WCHAR[MAX_TITLE_LEN] } { Instructions WCHAR[MAX_INSTRUCTION_LEN] } { ListLabel WCHAR[MAX_LABEL_LEN] } { SubTitle WCHAR[MAX_SUBTITLE_LEN] } ; -TYPEDEF: SP_SELECTDEVICE_PARAMS_W* PSP_SELECTDEVICE_PARAMS_W ; -TYPEDEF: SP_SELECTDEVICE_PARAMS_W SP_SELECTDEVICE_PARAMS ; -TYPEDEF: PSP_SELECTDEVICE_PARAMS_W PSP_SELECTDEVICE_PARAMS ; +TYPEDEF: SP_SELECTDEVICE_PARAMS_W* PSP_SELECTDEVICE_PARAMS_W +TYPEDEF: SP_SELECTDEVICE_PARAMS_W SP_SELECTDEVICE_PARAMS +TYPEDEF: PSP_SELECTDEVICE_PARAMS_W PSP_SELECTDEVICE_PARAMS CALLBACK: BOOL PDETECT_PROGRESS_NOTIFY ( PVOID ProgressNotifyParam, DWORD DetectComplete ) ; @@ -646,7 +646,7 @@ STRUCT: SP_DETECTDEVICE_PARAMS { ClassInstallHeader SP_CLASSINSTALL_HEADER } { DetectProgressNotify PDETECT_PROGRESS_NOTIFY } { ProgressNotifyParam PVOID } ; -TYPEDEF: SP_DETECTDEVICE_PARAMS* PSP_DETECTDEVICE_PARAMS ; +TYPEDEF: SP_DETECTDEVICE_PARAMS* PSP_DETECTDEVICE_PARAMS CONSTANT: MAX_INSTALLWIZARD_DYNAPAGES 20 @@ -659,7 +659,7 @@ STRUCT: SP_INSTALLWIZARD_DATA { PrivateFlags DWORD } { PrivateData LPARAM } { hwndWizardDlg HWND } ; -TYPEDEF: SP_INSTALLWIZARD_DATA* PSP_INSTALLWIZARD_DATA ; +TYPEDEF: SP_INSTALLWIZARD_DATA* PSP_INSTALLWIZARD_DATA CONSTANT: NDW_INSTALLFLAG_DIDFACTDEFS 0x00000001 CONSTANT: NDW_INSTALLFLAG_HARDWAREALLREADYIN 0x00000002 @@ -701,33 +701,33 @@ STRUCT: SP_NEWDEVICEWIZARD_DATA { DynamicPages HPROPSHEETPAGE[MAX_INSTALLWIZARD_DYNAPAGES] } { NumDynamicPages DWORD } { hwndWizardDlg HWND } ; -TYPEDEF: SP_NEWDEVICEWIZARD_DATA* PSP_NEWDEVICEWIZARD_DATA ; -TYPEDEF: SP_NEWDEVICEWIZARD_DATA SP_ADDPROPERTYPAGE_DATA ; -TYPEDEF: PSP_NEWDEVICEWIZARD_DATA PSP_ADDPROPERTYPAGE_DATA ; +TYPEDEF: SP_NEWDEVICEWIZARD_DATA* PSP_NEWDEVICEWIZARD_DATA +TYPEDEF: SP_NEWDEVICEWIZARD_DATA SP_ADDPROPERTYPAGE_DATA +TYPEDEF: PSP_NEWDEVICEWIZARD_DATA PSP_ADDPROPERTYPAGE_DATA STRUCT: SP_TROUBLESHOOTER_PARAMS_A { ClassInstallHeader SP_CLASSINSTALL_HEADER } { ChmFile CHAR[MAX_PATH] } { HtmlTroubleShooter CHAR[MAX_PATH] } ; -TYPEDEF: SP_TROUBLESHOOTER_PARAMS_A* PSP_TROUBLESHOOTER_PARAMS_A ; +TYPEDEF: SP_TROUBLESHOOTER_PARAMS_A* PSP_TROUBLESHOOTER_PARAMS_A STRUCT: SP_TROUBLESHOOTER_PARAMS_W { ClassInstallHeader SP_CLASSINSTALL_HEADER } { ChmFile WCHAR[MAX_PATH] } { HtmlTroubleShooter WCHAR[MAX_PATH] } ; -TYPEDEF: SP_TROUBLESHOOTER_PARAMS_W* PSP_TROUBLESHOOTER_PARAMS_W ; -TYPEDEF: SP_TROUBLESHOOTER_PARAMS_W SP_TROUBLESHOOTER_PARAMS ; -TYPEDEF: PSP_TROUBLESHOOTER_PARAMS_W PSP_TROUBLESHOOTER_PARAMS ; +TYPEDEF: SP_TROUBLESHOOTER_PARAMS_W* PSP_TROUBLESHOOTER_PARAMS_W +TYPEDEF: SP_TROUBLESHOOTER_PARAMS_W SP_TROUBLESHOOTER_PARAMS +TYPEDEF: PSP_TROUBLESHOOTER_PARAMS_W PSP_TROUBLESHOOTER_PARAMS STRUCT: SP_POWERMESSAGEWAKE_PARAMS_A { ClassInstallHeader SP_CLASSINSTALL_HEADER } { PowerMessageWake CHAR[LINE_LEN*2] } ; -TYPEDEF: SP_POWERMESSAGEWAKE_PARAMS_A* PSP_POWERMESSAGEWAKE_PARAMS_A ; +TYPEDEF: SP_POWERMESSAGEWAKE_PARAMS_A* PSP_POWERMESSAGEWAKE_PARAMS_A STRUCT: SP_POWERMESSAGEWAKE_PARAMS_W { ClassInstallHeader SP_CLASSINSTALL_HEADER } { PowerMessageWake WCHAR[LINE_LEN*2] } ; -TYPEDEF: SP_POWERMESSAGEWAKE_PARAMS_W* PSP_POWERMESSAGEWAKE_PARAMS_W ; -TYPEDEF: SP_POWERMESSAGEWAKE_PARAMS_W SP_POWERMESSAGEWAKE_PARAMS ; -TYPEDEF: PSP_POWERMESSAGEWAKE_PARAMS_W PSP_POWERMESSAGEWAKE_PARAMS ; +TYPEDEF: SP_POWERMESSAGEWAKE_PARAMS_W* PSP_POWERMESSAGEWAKE_PARAMS_W +TYPEDEF: SP_POWERMESSAGEWAKE_PARAMS_W SP_POWERMESSAGEWAKE_PARAMS +TYPEDEF: PSP_POWERMESSAGEWAKE_PARAMS_W PSP_POWERMESSAGEWAKE_PARAMS STRUCT: SP_DRVINFO_DATA_V2_A { cbSize DWORD } @@ -738,7 +738,7 @@ STRUCT: SP_DRVINFO_DATA_V2_A { ProviderName CHAR[LINE_LEN] } { DriverDate FILETIME } { DriverVersion DWORDLONG } ; -TYPEDEF: SP_DRVINFO_DATA_V2_A* PSP_DRVINFO_DATA_V2_A ; +TYPEDEF: SP_DRVINFO_DATA_V2_A* PSP_DRVINFO_DATA_V2_A STRUCT: SP_DRVINFO_DATA_V2_W { cbSize DWORD } { DriverType DWORD } @@ -748,7 +748,7 @@ STRUCT: SP_DRVINFO_DATA_V2_W { ProviderName WCHAR[LINE_LEN] } { DriverDate FILETIME } { DriverVersion DWORDLONG } ; -TYPEDEF: SP_DRVINFO_DATA_V2_W* PSP_DRVINFO_DATA_V2_W ; +TYPEDEF: SP_DRVINFO_DATA_V2_W* PSP_DRVINFO_DATA_V2_W STRUCT: SP_DRVINFO_DATA_V1_A { cbSize DWORD } { DriverType DWORD } @@ -756,7 +756,7 @@ STRUCT: SP_DRVINFO_DATA_V1_A { Description CHAR[LINE_LEN] } { MfgName CHAR[LINE_LEN] } { ProviderName CHAR[LINE_LEN] } ; -TYPEDEF: SP_DRVINFO_DATA_V1_A* PSP_DRVINFO_DATA_V1_A ; +TYPEDEF: SP_DRVINFO_DATA_V1_A* PSP_DRVINFO_DATA_V1_A STRUCT: SP_DRVINFO_DATA_V1_W { cbSize DWORD } { DriverType DWORD } @@ -764,17 +764,17 @@ STRUCT: SP_DRVINFO_DATA_V1_W { Description WCHAR[LINE_LEN] } { MfgName WCHAR[LINE_LEN] } { ProviderName WCHAR[LINE_LEN] } ; -TYPEDEF: SP_DRVINFO_DATA_V1_W* PSP_DRVINFO_DATA_V1_W ; -TYPEDEF: SP_DRVINFO_DATA_V1_W SP_DRVINFO_DATA_V1 ; -TYPEDEF: PSP_DRVINFO_DATA_V1_W PSP_DRVINFO_DATA_V1 ; -TYPEDEF: SP_DRVINFO_DATA_V2_W SP_DRVINFO_DATA_V2 ; -TYPEDEF: PSP_DRVINFO_DATA_V2_W PSP_DRVINFO_DATA_V2 ; -TYPEDEF: SP_DRVINFO_DATA_V2_A SP_DRVINFO_DATA_A ; -TYPEDEF: PSP_DRVINFO_DATA_V2_A PSP_DRVINFO_DATA_A ; -TYPEDEF: SP_DRVINFO_DATA_V2_W SP_DRVINFO_DATA_W ; -TYPEDEF: PSP_DRVINFO_DATA_V2_W PSP_DRVINFO_DATA_W ; -TYPEDEF: SP_DRVINFO_DATA_V2 SP_DRVINFO_DATA ; -TYPEDEF: PSP_DRVINFO_DATA_V2 PSP_DRVINFO_DATA ; +TYPEDEF: SP_DRVINFO_DATA_V1_W* PSP_DRVINFO_DATA_V1_W +TYPEDEF: SP_DRVINFO_DATA_V1_W SP_DRVINFO_DATA_V1 +TYPEDEF: PSP_DRVINFO_DATA_V1_W PSP_DRVINFO_DATA_V1 +TYPEDEF: SP_DRVINFO_DATA_V2_W SP_DRVINFO_DATA_V2 +TYPEDEF: PSP_DRVINFO_DATA_V2_W PSP_DRVINFO_DATA_V2 +TYPEDEF: SP_DRVINFO_DATA_V2_A SP_DRVINFO_DATA_A +TYPEDEF: PSP_DRVINFO_DATA_V2_A PSP_DRVINFO_DATA_A +TYPEDEF: SP_DRVINFO_DATA_V2_W SP_DRVINFO_DATA_W +TYPEDEF: PSP_DRVINFO_DATA_V2_W PSP_DRVINFO_DATA_W +TYPEDEF: SP_DRVINFO_DATA_V2 SP_DRVINFO_DATA +TYPEDEF: PSP_DRVINFO_DATA_V2 PSP_DRVINFO_DATA STRUCT: SP_DRVINFO_DETAIL_DATA_A { cbSize DWORD } @@ -786,7 +786,7 @@ STRUCT: SP_DRVINFO_DETAIL_DATA_A { InfFileName CHAR[MAX_PATH] } { DrvDescription CHAR[LINE_LEN] } { HardwareID CHAR[ANYSIZE_ARRAY] } ; -TYPEDEF: SP_DRVINFO_DETAIL_DATA_A* PSP_DRVINFO_DETAIL_DATA_A ; +TYPEDEF: SP_DRVINFO_DETAIL_DATA_A* PSP_DRVINFO_DETAIL_DATA_A STRUCT: SP_DRVINFO_DETAIL_DATA_W { cbSize DWORD } { InfDate FILETIME } @@ -797,10 +797,10 @@ STRUCT: SP_DRVINFO_DETAIL_DATA_W { InfFileName WCHAR[MAX_PATH] } { DrvDescription WCHAR[LINE_LEN] } { HardwareID WCHAR[ANYSIZE_ARRAY] } ; -TYPEDEF: SP_DRVINFO_DETAIL_DATA_W* PSP_DRVINFO_DETAIL_DATA_W ; +TYPEDEF: SP_DRVINFO_DETAIL_DATA_W* PSP_DRVINFO_DETAIL_DATA_W -TYPEDEF: SP_DRVINFO_DETAIL_DATA_W SP_DRVINFO_DETAIL_DATA ; -TYPEDEF: PSP_DRVINFO_DETAIL_DATA_W PSP_DRVINFO_DETAIL_DATA ; +TYPEDEF: SP_DRVINFO_DETAIL_DATA_W SP_DRVINFO_DETAIL_DATA +TYPEDEF: PSP_DRVINFO_DETAIL_DATA_W PSP_DRVINFO_DETAIL_DATA STRUCT: SP_DRVINSTALL_PARAMS { cbSize DWORD } @@ -808,7 +808,7 @@ STRUCT: SP_DRVINSTALL_PARAMS { Flags DWORD } { PrivateData DWORD_PTR } { Reserved DWORD } ; -TYPEDEF: SP_DRVINSTALL_PARAMS* PSP_DRVINSTALL_PARAMS ; +TYPEDEF: SP_DRVINSTALL_PARAMS* PSP_DRVINSTALL_PARAMS CONSTANT: DNF_DUPDESC 0x00000001 CONSTANT: DNF_OLDDRIVER 0x00000002 @@ -853,20 +853,20 @@ STRUCT: COINSTALLER_CONTEXT_DATA { PostProcessing BOOL } { InstallResult DWORD } { PrivateData PVOID } ; -TYPEDEF: COINSTALLER_CONTEXT_DATA* PCOINSTALLER_CONTEXT_DATA ; +TYPEDEF: COINSTALLER_CONTEXT_DATA* PCOINSTALLER_CONTEXT_DATA STRUCT: SP_CLASSIMAGELIST_DATA { cbSize DWORD } { ImageList HIMAGELIST } { Reserved ULONG_PTR } ; -TYPEDEF: SP_CLASSIMAGELIST_DATA* PSP_CLASSIMAGELIST_DATA ; +TYPEDEF: SP_CLASSIMAGELIST_DATA* PSP_CLASSIMAGELIST_DATA STRUCT: SP_PROPSHEETPAGE_REQUEST { cbSize DWORD } { PageRequested DWORD } { DeviceInfoSet HDEVINFO } { DeviceInfoData PSP_DEVINFO_DATA } ; -TYPEDEF: SP_PROPSHEETPAGE_REQUEST* PSP_PROPSHEETPAGE_REQUEST ; +TYPEDEF: SP_PROPSHEETPAGE_REQUEST* PSP_PROPSHEETPAGE_REQUEST CONSTANT: SPPSR_SELECT_DEVICE_RESOURCES 1 CONSTANT: SPPSR_ENUM_BASIC_DEVICE_PROPERTIES 2 @@ -877,37 +877,37 @@ STRUCT: SP_BACKUP_QUEUE_PARAMS_V2_A { FullInfPath CHAR[MAX_PATH] } { FilenameOffset INT } { ReinstallInstance CHAR[MAX_PATH] } ; -TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_A* PSP_BACKUP_QUEUE_PARAMS_V2_A ; +TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_A* PSP_BACKUP_QUEUE_PARAMS_V2_A STRUCT: SP_BACKUP_QUEUE_PARAMS_V2_W { cbSize DWORD } { FullInfPath WCHAR[MAX_PATH] } { FilenameOffset INT } { ReinstallInstance WCHAR[MAX_PATH] } ; -TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_W* PSP_BACKUP_QUEUE_PARAMS_V2_W ; +TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_W* PSP_BACKUP_QUEUE_PARAMS_V2_W STRUCT: SP_BACKUP_QUEUE_PARAMS_V1_A { cbSize DWORD } { FullInfPath CHAR[MAX_PATH] } { FilenameOffset INT } ; -TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V1_A* PSP_BACKUP_QUEUE_PARAMS_V1_A ; +TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V1_A* PSP_BACKUP_QUEUE_PARAMS_V1_A STRUCT: SP_BACKUP_QUEUE_PARAMS_V1_W { cbSize DWORD } { FullInfPath WCHAR[MAX_PATH] } { FilenameOffset INT } ; -TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V1_W* PSP_BACKUP_QUEUE_PARAMS_V1_W ; +TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V1_W* PSP_BACKUP_QUEUE_PARAMS_V1_W -TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V1_W SP_BACKUP_QUEUE_PARAMS_V1 ; -TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V1_W PSP_BACKUP_QUEUE_PARAMS_V1 ; -TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_W SP_BACKUP_QUEUE_PARAMS_V2 ; -TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2_W PSP_BACKUP_QUEUE_PARAMS_V2 ; -TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_A SP_BACKUP_QUEUE_PARAMS_A ; -TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2_A PSP_BACKUP_QUEUE_PARAMS_A ; -TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_W SP_BACKUP_QUEUE_PARAMS_W ; -TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2_W PSP_BACKUP_QUEUE_PARAMS_W ; -TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2 SP_BACKUP_QUEUE_PARAMS ; -TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2 PSP_BACKUP_QUEUE_PARAMS ; +TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V1_W SP_BACKUP_QUEUE_PARAMS_V1 +TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V1_W PSP_BACKUP_QUEUE_PARAMS_V1 +TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_W SP_BACKUP_QUEUE_PARAMS_V2 +TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2_W PSP_BACKUP_QUEUE_PARAMS_V2 +TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_A SP_BACKUP_QUEUE_PARAMS_A +TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2_A PSP_BACKUP_QUEUE_PARAMS_A +TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2_W SP_BACKUP_QUEUE_PARAMS_W +TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2_W PSP_BACKUP_QUEUE_PARAMS_W +TYPEDEF: SP_BACKUP_QUEUE_PARAMS_V2 SP_BACKUP_QUEUE_PARAMS +TYPEDEF: PSP_BACKUP_QUEUE_PARAMS_V2 PSP_BACKUP_QUEUE_PARAMS CONSTANT: ERROR_EXPECTED_SECTION_NAME $$[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0 bitor bitor ] CONSTANT: ERROR_BAD_SECTION_NAME_LINE $$[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 1 bitor bitor ] @@ -1496,7 +1496,7 @@ FUNCTION: void InstallHinfSectionA ( HWND Window, HINSTANCE ModuleHandle, PCSTR FUNCTION: void InstallHinfSectionW ( HWND Window, HINSTANCE ModuleHandle, PCWSTR CommandLine, INT ShowCommand ) ; ALIAS: InstallHinfSection InstallHinfSectionW -TYPEDEF: PVOID HSPFILELOG ; +TYPEDEF: PVOID HSPFILELOG FUNCTION: HSPFILELOG SetupInitializeFileLogA ( PCSTR LogFileName, DWORD Flags ) ; FUNCTION: HSPFILELOG SetupInitializeFileLogW ( PCWSTR LogFileName, DWORD Flags ) ; @@ -1528,7 +1528,7 @@ FUNCTION: BOOL SetupQueryFileLogA ( HSPFILELOG FileLogHandle, PCSTR LogSectionNa FUNCTION: BOOL SetupQueryFileLogW ( HSPFILELOG FileLogHandle, PCWSTR LogSectionName, PCWSTR TargetFilename, SetupFileLogInfo DesiredInfo, PWSTR DataOut, DWORD ReturnBufferSize, PDWORD RequiredSize ) ; ALIAS: SetupQueryFileLog SetupQueryFileLogW -TYPEDEF: DWORD LogSeverity ; +TYPEDEF: DWORD LogSeverity CONSTANT: LogSevInformation 0x00000000 CONSTANT: LogSevWarning 0x00000001 CONSTANT: LogSevError 0x00000002 @@ -1970,15 +1970,15 @@ STRUCT: SP_INF_SIGNER_INFO_V1_A { CatalogFile CHAR[MAX_PATH] } { DigitalSigner CHAR[MAX_PATH] } { DigitalSignerVersion CHAR[MAX_PATH] } ; -TYPEDEF: SP_INF_SIGNER_INFO_V1_A* PSP_INF_SIGNER_INFO_V1_A ; +TYPEDEF: SP_INF_SIGNER_INFO_V1_A* PSP_INF_SIGNER_INFO_V1_A STRUCT: SP_INF_SIGNER_INFO_V1_W { cbSize DWORD } { CatalogFile WCHAR[MAX_PATH] } { DigitalSigner WCHAR[MAX_PATH] } { DigitalSignerVersion WCHAR[MAX_PATH] } ; -TYPEDEF: SP_INF_SIGNER_INFO_V1_W* PSP_INF_SIGNER_INFO_V1_W ; -TYPEDEF: SP_INF_SIGNER_INFO_V1_W SP_INF_SIGNER_INFO_V1 ; -TYPEDEF: PSP_INF_SIGNER_INFO_V1_W PSP_INF_SIGNER_INFO_V1 ; +TYPEDEF: SP_INF_SIGNER_INFO_V1_W* PSP_INF_SIGNER_INFO_V1_W +TYPEDEF: SP_INF_SIGNER_INFO_V1_W SP_INF_SIGNER_INFO_V1 +TYPEDEF: PSP_INF_SIGNER_INFO_V1_W PSP_INF_SIGNER_INFO_V1 STRUCT: SP_INF_SIGNER_INFO_V2_A { cbSize DWORD } @@ -1986,17 +1986,17 @@ STRUCT: SP_INF_SIGNER_INFO_V2_A { DigitalSigner CHAR[MAX_PATH] } { DigitalSignerVersion CHAR[MAX_PATH] } { SignerScore DWORD } ; -TYPEDEF: SP_INF_SIGNER_INFO_V2_A* PSP_INF_SIGNER_INFO_V2_A ; +TYPEDEF: SP_INF_SIGNER_INFO_V2_A* PSP_INF_SIGNER_INFO_V2_A STRUCT: SP_INF_SIGNER_INFO_V2_W { cbSize DWORD } { CatalogFile WCHAR[MAX_PATH] } { DigitalSigner WCHAR[MAX_PATH] } { DigitalSignerVersion WCHAR[MAX_PATH] } { SignerScore DWORD } ; -TYPEDEF: SP_INF_SIGNER_INFO_V2_W* PSP_INF_SIGNER_INFO_V2_W ; +TYPEDEF: SP_INF_SIGNER_INFO_V2_W* PSP_INF_SIGNER_INFO_V2_W -TYPEDEF: SP_INF_SIGNER_INFO_V2_W SP_INF_SIGNER_INFO_V2 ; -TYPEDEF: PSP_INF_SIGNER_INFO_V2_W PSP_INF_SIGNER_INFO_V2 ; +TYPEDEF: SP_INF_SIGNER_INFO_V2_W SP_INF_SIGNER_INFO_V2 +TYPEDEF: PSP_INF_SIGNER_INFO_V2_W PSP_INF_SIGNER_INFO_V2 CONSTANT: SIGNERSCORE_UNKNOWN 0xFF000000 CONSTANT: SIGNERSCORE_W9X_SUSPECT 0xC0000000 @@ -2010,12 +2010,12 @@ CONSTANT: SIGNERSCORE_LOGO_PREMIUM 0x0D000001 CONSTANT: SIGNERSCORE_MASK 0xFF000000 CONSTANT: SIGNERSCORE_SIGNED_MASK 0xF0000000 -TYPEDEF: SP_INF_SIGNER_INFO_V2_A SP_INF_SIGNER_INFO_A ; -TYPEDEF: PSP_INF_SIGNER_INFO_V2_A PSP_INF_SIGNER_INFO_A ; -TYPEDEF: SP_INF_SIGNER_INFO_V2_W SP_INF_SIGNER_INFO_W ; -TYPEDEF: PSP_INF_SIGNER_INFO_V2_W PSP_INF_SIGNER_INFO_W ; -TYPEDEF: SP_INF_SIGNER_INFO_V2 SP_INF_SIGNER_INFO ; -TYPEDEF: PSP_INF_SIGNER_INFO_V2 PSP_INF_SIGNER_INFO ; +TYPEDEF: SP_INF_SIGNER_INFO_V2_A SP_INF_SIGNER_INFO_A +TYPEDEF: PSP_INF_SIGNER_INFO_V2_A PSP_INF_SIGNER_INFO_A +TYPEDEF: SP_INF_SIGNER_INFO_V2_W SP_INF_SIGNER_INFO_W +TYPEDEF: PSP_INF_SIGNER_INFO_V2_W PSP_INF_SIGNER_INFO_W +TYPEDEF: SP_INF_SIGNER_INFO_V2 SP_INF_SIGNER_INFO +TYPEDEF: PSP_INF_SIGNER_INFO_V2 PSP_INF_SIGNER_INFO FUNCTION: BOOL SetupVerifyInfFileA ( PCSTR InfName, PSP_ALTPLATFORM_INFO AltPlatformInfo, PSP_INF_SIGNER_INFO_A InfSignerInfo ) ; FUNCTION: BOOL SetupVerifyInfFileW ( PCWSTR InfName, PSP_ALTPLATFORM_INFO AltPlatformInfo, PSP_INF_SIGNER_INFO_W InfSignerInfo ) ; diff --git a/ffi/windows/ddk/winusb/winusb.factor b/ffi/windows/ddk/winusb/winusb.factor index e5078a16c2..595eecfa0e 100755 --- a/ffi/windows/ddk/winusb/winusb.factor +++ b/ffi/windows/ddk/winusb/winusb.factor @@ -7,8 +7,8 @@ IN: windows.ddk.winusb COMPILE< "winusb" "winusb.dll" stdcall add-library COMPILE> LIBRARY: winusb -TYPEDEF: PVOID WINUSB_INTERFACE_HANDLE ; -TYPEDEF: WINUSB_INTERFACE_HANDLE* PWINUSB_INTERFACE_HANDLE ; +TYPEDEF: PVOID WINUSB_INTERFACE_HANDLE +TYPEDEF: WINUSB_INTERFACE_HANDLE* PWINUSB_INTERFACE_HANDLE STRUCT: USB_INTERFACE_DESCRIPTOR { bLength UCHAR } @@ -20,7 +20,7 @@ STRUCT: USB_INTERFACE_DESCRIPTOR { bInterfaceSubClass UCHAR } { bInterfaceProtocol UCHAR } { iInterface UCHAR } ; -TYPEDEF: USB_INTERFACE_DESCRIPTOR* PUSB_INTERFACE_DESCRIPTOR ; +TYPEDEF: USB_INTERFACE_DESCRIPTOR* PUSB_INTERFACE_DESCRIPTOR ENUM: USBD_PIPE_TYPE UsbdPipeTypeControl @@ -33,7 +33,7 @@ STRUCT: WINUSB_PIPE_INFORMATION { PipeId UCHAR } { MaximumPacketSize USHORT } { Interval UCHAR } ; -TYPEDEF: WINUSB_PIPE_INFORMATION* PWINUSB_PIPE_INFORMATION ; +TYPEDEF: WINUSB_PIPE_INFORMATION* PWINUSB_PIPE_INFORMATION STRUCT: WINUSB_SETUP_PACKET { RequestType UCHAR } @@ -41,7 +41,7 @@ STRUCT: WINUSB_SETUP_PACKET { Value USHORT } { Index USHORT } { Length USHORT } ; -TYPEDEF: WINUSB_SETUP_PACKET* PWINUSB_SETUP_PACKET ; +TYPEDEF: WINUSB_SETUP_PACKET* PWINUSB_SETUP_PACKET FUNCTION: BOOL WinUsb_AbortPipe ( WINUSB_INTERFACE_HANDLE InterfaceHandle, UCHAR PipeID ) ; FUNCTION: BOOL WinUsb_FlushPipe ( WINUSB_INTERFACE_HANDLE InterfaceHandle, UCHAR PipeID ) ; diff --git a/ffi/windows/directx/audiodefs/audiodefs.factor b/ffi/windows/directx/audiodefs/audiodefs.factor index 8d490409f9..f45b687934 100644 --- a/ffi/windows/directx/audiodefs/audiodefs.factor +++ b/ffi/windows/directx/audiodefs/audiodefs.factor @@ -11,11 +11,11 @@ STRUCT: WAVEFORMATEX { wBitsPerSample WORD } { cbSize WORD } ; -TYPEDEF: WAVEFORMATEX* PWAVEFORMATEX ; -TYPEDEF: WAVEFORMATEX* NPWAVEFORMATEX ; -TYPEDEF: WAVEFORMATEX* LPWAVEFORMATEX ; -TYPEDEF: WAVEFORMATEX* PCWAVEFORMATEX ; -TYPEDEF: WAVEFORMATEX* LPCWAVEFORMATEX ; +TYPEDEF: WAVEFORMATEX* PWAVEFORMATEX +TYPEDEF: WAVEFORMATEX* NPWAVEFORMATEX +TYPEDEF: WAVEFORMATEX* LPWAVEFORMATEX +TYPEDEF: WAVEFORMATEX* PCWAVEFORMATEX +TYPEDEF: WAVEFORMATEX* LPCWAVEFORMATEX UNION-STRUCT: WAVEFORMATEXTENSIBLE_UNION { wValidBitsPerSample WORD } @@ -28,10 +28,10 @@ STRUCT: WAVEFORMATEXTENSIBLE { dwChannelMask DWORD } { SubFormat GUID } ; -TYPEDEF: WAVEFORMATEXTENSIBLE* PWAVEFORMATEXTENSIBLE ; -TYPEDEF: WAVEFORMATEXTENSIBLE* LPWAVEFORMATEXTENSIBLE ; -TYPEDEF: WAVEFORMATEXTENSIBLE* PCWAVEFORMATEXTENSIBLE ; -TYPEDEF: WAVEFORMATEXTENSIBLE* LPCWAVEFORMATEXTENSIBLE ; +TYPEDEF: WAVEFORMATEXTENSIBLE* PWAVEFORMATEXTENSIBLE +TYPEDEF: WAVEFORMATEXTENSIBLE* LPWAVEFORMATEXTENSIBLE +TYPEDEF: WAVEFORMATEXTENSIBLE* PCWAVEFORMATEXTENSIBLE +TYPEDEF: WAVEFORMATEXTENSIBLE* LPCWAVEFORMATEXTENSIBLE STRUCT: WAVEFORMAT { wFormatTag WORD } @@ -39,16 +39,16 @@ STRUCT: WAVEFORMAT { nSamplesPerSec DWORD } { nAvgBytesPerSec DWORD } { nBlockAlign WORD } ; -TYPEDEF: WAVEFORMAT* PWAVEFORMAT ; -TYPEDEF: WAVEFORMAT* NPWAVEFORMAT ; -TYPEDEF: WAVEFORMAT* LPWAVEFORMAT ; +TYPEDEF: WAVEFORMAT* PWAVEFORMAT +TYPEDEF: WAVEFORMAT* NPWAVEFORMAT +TYPEDEF: WAVEFORMAT* LPWAVEFORMAT STRUCT: PCMWAVEFORMAT { wf WAVEFORMAT } { wBitsPerSample WORD } ; -TYPEDEF: PCMWAVEFORMAT* PPCMWAVEFORMAT ; -TYPEDEF: PCMWAVEFORMAT* NPPCMWAVEFORMAT ; -TYPEDEF: PCMWAVEFORMAT* LPPCMWAVEFORMAT ; +TYPEDEF: PCMWAVEFORMAT* PPCMWAVEFORMAT +TYPEDEF: PCMWAVEFORMAT* NPPCMWAVEFORMAT +TYPEDEF: PCMWAVEFORMAT* LPPCMWAVEFORMAT CONSTANT: WAVE_FORMAT_PCM 1 diff --git a/ffi/windows/directx/d2d1/d2d1.factor b/ffi/windows/directx/d2d1/d2d1.factor index f92e0091a5..fc0c709ed8 100644 --- a/ffi/windows/directx/d2d1/d2d1.factor +++ b/ffi/windows/directx/d2d1/d2d1.factor @@ -14,61 +14,61 @@ CONSTANT: D2D1_ALPHA_MODE_PREMULTIPLIED 1 CONSTANT: D2D1_ALPHA_MODE_STRAIGHT 2 CONSTANT: D2D1_ALPHA_MODE_IGNORE 3 CONSTANT: D2D1_ALPHA_MODE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_ALPHA_MODE ; +TYPEDEF: int D2D1_ALPHA_MODE CONSTANT: D2D1_GAMMA_2_2 0 CONSTANT: D2D1_GAMMA_1_0 1 CONSTANT: D2D1_GAMMA_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_GAMMA ; +TYPEDEF: int D2D1_GAMMA CONSTANT: D2D1_OPACITY_MASK_CONTENT_GRAPHICS 0 CONSTANT: D2D1_OPACITY_MASK_CONTENT_TEXT_NATURAL 1 CONSTANT: D2D1_OPACITY_MASK_CONTENT_TEXT_GDI_COMPATIBLE 2 CONSTANT: D2D1_OPACITY_MASK_CONTENT_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_OPACITY_MASK_CONTENT ; +TYPEDEF: int D2D1_OPACITY_MASK_CONTENT CONSTANT: D2D1_EXTEND_MODE_CLAMP 0 CONSTANT: D2D1_EXTEND_MODE_WRAP 1 CONSTANT: D2D1_EXTEND_MODE_MIRROR 2 CONSTANT: D2D1_EXTEND_MODE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_EXTEND_MODE ; +TYPEDEF: int D2D1_EXTEND_MODE CONSTANT: D2D1_ANTIALIAS_MODE_PER_PRIMITIVE 0 CONSTANT: D2D1_ANTIALIAS_MODE_ALIASED 1 CONSTANT: D2D1_ANTIALIAS_MODE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_ANTIALIAS_MODE ; +TYPEDEF: int D2D1_ANTIALIAS_MODE CONSTANT: D2D1_TEXT_ANTIALIAS_MODE_DEFAULT 0 CONSTANT: D2D1_TEXT_ANTIALIAS_MODE_CLEARTYPE 1 CONSTANT: D2D1_TEXT_ANTIALIAS_MODE_GRAYSCALE 2 CONSTANT: D2D1_TEXT_ANTIALIAS_MODE_ALIASED 3 CONSTANT: D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_TEXT_ANTIALIAS_MODE ; +TYPEDEF: int D2D1_TEXT_ANTIALIAS_MODE CONSTANT: D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR 0 CONSTANT: D2D1_BITMAP_INTERPOLATION_MODE_LINEAR 1 CONSTANT: D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_BITMAP_INTERPOLATION_MODE ; +TYPEDEF: int D2D1_BITMAP_INTERPOLATION_MODE CONSTANT: D2D1_DRAW_TEXT_OPTIONS_NO_SNAP 0x00000001 CONSTANT: D2D1_DRAW_TEXT_OPTIONS_CLIP 0x00000002 CONSTANT: D2D1_DRAW_TEXT_OPTIONS_NONE 0x00000000 CONSTANT: D2D1_DRAW_TEXT_OPTIONS_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_DRAW_TEXT_OPTIONS ; +TYPEDEF: int D2D1_DRAW_TEXT_OPTIONS STRUCT: D2D1_PIXEL_FORMAT { format DXGI_FORMAT } { alphaMode D2D1_ALPHA_MODE } ; -TYPEDEF: D2D_POINT_2U D2D1_POINT_2U ; -TYPEDEF: D2D_POINT_2F D2D1_POINT_2F ; -TYPEDEF: D2D_RECT_F D2D1_RECT_F ; -TYPEDEF: D2D_RECT_U D2D1_RECT_U ; -TYPEDEF: D2D_SIZE_F D2D1_SIZE_F ; -TYPEDEF: D2D_SIZE_U D2D1_SIZE_U ; -TYPEDEF: D2D_COLOR_F D2D1_COLOR_F ; -TYPEDEF: D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F ; -TYPEDEF: UINT64 D2D1_TAG ; +TYPEDEF: D2D_POINT_2U D2D1_POINT_2U +TYPEDEF: D2D_POINT_2F D2D1_POINT_2F +TYPEDEF: D2D_RECT_F D2D1_RECT_F +TYPEDEF: D2D_RECT_U D2D1_RECT_U +TYPEDEF: D2D_SIZE_F D2D1_SIZE_F +TYPEDEF: D2D_SIZE_U D2D1_SIZE_U +TYPEDEF: D2D_COLOR_F D2D1_COLOR_F +TYPEDEF: D2D_MATRIX_3X2_F D2D1_MATRIX_3X2_F +TYPEDEF: UINT64 D2D1_TAG STRUCT: D2D1_BITMAP_PROPERTIES { pixelFormat D2D1_PIXEL_FORMAT } @@ -101,14 +101,14 @@ STRUCT: D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES CONSTANT: D2D1_ARC_SIZE_SMALL 0 CONSTANT: D2D1_ARC_SIZE_LARGE 1 CONSTANT: D2D1_ARC_SIZE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_ARC_SIZE ; +TYPEDEF: int D2D1_ARC_SIZE CONSTANT: D2D1_CAP_STYLE_FLAT 0 CONSTANT: D2D1_CAP_STYLE_SQUARE 1 CONSTANT: D2D1_CAP_STYLE_ROUND 2 CONSTANT: D2D1_CAP_STYLE_TRIANGLE 3 CONSTANT: D2D1_CAP_STYLE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_CAP_STYLE ; +TYPEDEF: int D2D1_CAP_STYLE CONSTANT: D2D1_DASH_STYLE_SOLID 0 CONSTANT: D2D1_DASH_STYLE_DASH 1 @@ -117,21 +117,21 @@ CONSTANT: D2D1_DASH_STYLE_DASH_DOT 3 CONSTANT: D2D1_DASH_STYLE_DASH_DOT_DOT 4 CONSTANT: D2D1_DASH_STYLE_CUSTOM 5 CONSTANT: D2D1_DASH_STYLE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_DASH_STYLE ; +TYPEDEF: int D2D1_DASH_STYLE CONSTANT: D2D1_LINE_JOIN_MITER 0 CONSTANT: D2D1_LINE_JOIN_BEVEL 1 CONSTANT: D2D1_LINE_JOIN_ROUND 2 CONSTANT: D2D1_LINE_JOIN_MITER_OR_BEVEL 3 CONSTANT: D2D1_LINE_JOIN_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_LINE_JOIN ; +TYPEDEF: int D2D1_LINE_JOIN CONSTANT: D2D1_COMBINE_MODE_UNION 0 CONSTANT: D2D1_COMBINE_MODE_INTERSECT 1 CONSTANT: D2D1_COMBINE_MODE_XOR 2 CONSTANT: D2D1_COMBINE_MODE_EXCLUDE 3 CONSTANT: D2D1_COMBINE_MODE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_COMBINE_MODE ; +TYPEDEF: int D2D1_COMBINE_MODE CONSTANT: D2D1_GEOMETRY_RELATION_UNKNOWN 0 CONSTANT: D2D1_GEOMETRY_RELATION_DISJOINT 1 @@ -139,22 +139,22 @@ CONSTANT: D2D1_GEOMETRY_RELATION_IS_CONTAINED 2 CONSTANT: D2D1_GEOMETRY_RELATION_CONTAINS 3 CONSTANT: D2D1_GEOMETRY_RELATION_OVERLAP 4 CONSTANT: D2D1_GEOMETRY_RELATION_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_GEOMETRY_RELATION ; +TYPEDEF: int D2D1_GEOMETRY_RELATION CONSTANT: D2D1_GEOMETRY_SIMPLIFICATION_OPTION_CUBICS_AND_LINES 0 CONSTANT: D2D1_GEOMETRY_SIMPLIFICATION_OPTION_LINES 1 CONSTANT: D2D1_GEOMETRY_SIMPLIFICATION_OPTION_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_GEOMETRY_SIMPLIFICATION_OPTION ; +TYPEDEF: int D2D1_GEOMETRY_SIMPLIFICATION_OPTION CONSTANT: D2D1_FIGURE_BEGIN_FILLED 0 CONSTANT: D2D1_FIGURE_BEGIN_HOLLOW 1 CONSTANT: D2D1_FIGURE_BEGIN_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_FIGURE_BEGIN ; +TYPEDEF: int D2D1_FIGURE_BEGIN CONSTANT: D2D1_FIGURE_END_OPEN 0 CONSTANT: D2D1_FIGURE_END_CLOSED 1 CONSTANT: D2D1_FIGURE_END_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_FIGURE_END ; +TYPEDEF: int D2D1_FIGURE_END STRUCT: D2D1_BEZIER_SEGMENT { point1 D2D1_POINT_2F } @@ -170,17 +170,17 @@ CONSTANT: D2D1_PATH_SEGMENT_NONE 0x00000000 CONSTANT: D2D1_PATH_SEGMENT_FORCE_UNSTROKED 0x00000001 CONSTANT: D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN 0x00000002 CONSTANT: D2D1_PATH_SEGMENT_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_PATH_SEGMENT ; +TYPEDEF: int D2D1_PATH_SEGMENT CONSTANT: D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE 0 CONSTANT: D2D1_SWEEP_DIRECTION_CLOCKWISE 1 CONSTANT: D2D1_SWEEP_DIRECTION_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_SWEEP_DIRECTION ; +TYPEDEF: int D2D1_SWEEP_DIRECTION CONSTANT: D2D1_FILL_MODE_ALTERNATE 0 CONSTANT: D2D1_FILL_MODE_WINDING 1 CONSTANT: D2D1_FILL_MODE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_FILL_MODE ; +TYPEDEF: int D2D1_FILL_MODE STRUCT: D2D1_ARC_SEGMENT { point D2D1_POINT_2F } @@ -215,7 +215,7 @@ STRUCT: D2D1_STROKE_STYLE_PROPERTIES CONSTANT: D2D1_LAYER_OPTIONS_NONE 0x00000000 CONSTANT: D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE 0x00000001 CONSTANT: D2D1_LAYER_OPTIONS_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_LAYER_OPTIONS ; +TYPEDEF: int D2D1_LAYER_OPTIONS C-TYPE: ID2D1Geometry C-TYPE: ID2D1Brush @@ -233,31 +233,31 @@ STRUCT: D2D1_LAYER_PARAMETERS CONSTANT: D2D1_WINDOW_STATE_NONE 0x00000000 CONSTANT: D2D1_WINDOW_STATE_OCCLUDED 0x00000001 CONSTANT: D2D1_WINDOW_STATE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_WINDOW_STATE ; +TYPEDEF: int D2D1_WINDOW_STATE CONSTANT: D2D1_RENDER_TARGET_TYPE_DEFAULT 0 CONSTANT: D2D1_RENDER_TARGET_TYPE_SOFTWARE 1 CONSTANT: D2D1_RENDER_TARGET_TYPE_HARDWARE 2 CONSTANT: D2D1_RENDER_TARGET_TYPE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_RENDER_TARGET_TYPE ; +TYPEDEF: int D2D1_RENDER_TARGET_TYPE CONSTANT: D2D1_FEATURE_LEVEL_DEFAULT 0 CONSTANT: D2D1_FEATURE_LEVEL_9 0x9100 CONSTANT: D2D1_FEATURE_LEVEL_10 0xa000 CONSTANT: D2D1_FEATURE_LEVEL_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_FEATURE_LEVEL ; +TYPEDEF: int D2D1_FEATURE_LEVEL CONSTANT: D2D1_RENDER_TARGET_USAGE_NONE 0x00000000 CONSTANT: D2D1_RENDER_TARGET_USAGE_FORCE_BITMAP_REMOTING 0x00000001 CONSTANT: D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE 0x00000002 CONSTANT: D2D1_RENDER_TARGET_USAGE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_RENDER_TARGET_USAGE ; +TYPEDEF: int D2D1_RENDER_TARGET_USAGE CONSTANT: D2D1_PRESENT_OPTIONS_NONE 0x00000000 CONSTANT: D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS 0x00000001 CONSTANT: D2D1_PRESENT_OPTIONS_IMMEDIATELY 0x00000002 CONSTANT: D2D1_PRESENT_OPTIONS_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_PRESENT_OPTIONS ; +TYPEDEF: int D2D1_PRESENT_OPTIONS STRUCT: D2D1_RENDER_TARGET_PROPERTIES { type D2D1_RENDER_TARGET_TYPE } @@ -275,7 +275,7 @@ STRUCT: D2D1_HWND_RENDER_TARGET_PROPERTIES CONSTANT: D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE 0x00000000 CONSTANT: D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE 0x00000001 CONSTANT: D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS ; +TYPEDEF: int D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS STRUCT: D2D1_DRAWING_STATE_DESCRIPTION { antialiasMode D2D1_ANTIALIAS_MODE } @@ -287,19 +287,19 @@ STRUCT: D2D1_DRAWING_STATE_DESCRIPTION CONSTANT: D2D1_DC_INITIALIZE_MODE_COPY 0 CONSTANT: D2D1_DC_INITIALIZE_MODE_CLEAR 1 CONSTANT: D2D1_DC_INITIALIZE_MODE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_DC_INITIALIZE_MODE ; +TYPEDEF: int D2D1_DC_INITIALIZE_MODE CONSTANT: D2D1_DEBUG_LEVEL_NONE 0 CONSTANT: D2D1_DEBUG_LEVEL_ERROR 1 CONSTANT: D2D1_DEBUG_LEVEL_WARNING 2 CONSTANT: D2D1_DEBUG_LEVEL_INFORMATION 3 CONSTANT: D2D1_DEBUG_LEVEL_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_DEBUG_LEVEL ; +TYPEDEF: int D2D1_DEBUG_LEVEL CONSTANT: D2D1_FACTORY_TYPE_SINGLE_THREADED 0 CONSTANT: D2D1_FACTORY_TYPE_MULTI_THREADED 1 CONSTANT: D2D1_FACTORY_TYPE_FORCE_DWORD 0xffffffff -TYPEDEF: int D2D1_FACTORY_TYPE ; +TYPEDEF: int D2D1_FACTORY_TYPE STRUCT: D2D1_FACTORY_OPTIONS { debugLevel D2D1_DEBUG_LEVEL } ; diff --git a/ffi/windows/directx/d2dbasetypes/d2dbasetypes.factor b/ffi/windows/directx/d2dbasetypes/d2dbasetypes.factor index 7791388f37..668ef822dc 100644 --- a/ffi/windows/directx/d2dbasetypes/d2dbasetypes.factor +++ b/ffi/windows/directx/d2dbasetypes/d2dbasetypes.factor @@ -35,7 +35,7 @@ STRUCT: D2D_SIZE_U { width UINT32 } { height UINT32 } ; -TYPEDEF: D3DCOLORVALUE D2D_COLOR_F ; +TYPEDEF: D3DCOLORVALUE D2D_COLOR_F STRUCT: D2D_MATRIX_3X2_F { _11 FLOAT } diff --git a/ffi/windows/directx/d3d10/d3d10.factor b/ffi/windows/directx/d3d10/d3d10.factor index cd80a25a2f..bc3c7cff55 100644 --- a/ffi/windows/directx/d3d10/d3d10.factor +++ b/ffi/windows/directx/d3d10/d3d10.factor @@ -233,7 +233,7 @@ CONSTANT: D3D10_ERROR_FILE_NOT_FOUND 0x88790002 CONSTANT: D3D10_INPUT_PER_VERTEX_DATA 0 CONSTANT: D3D10_INPUT_PER_INSTANCE_DATA 1 -TYPEDEF: int D3D10_INPUT_CLASSIFICATION ; +TYPEDEF: int D3D10_INPUT_CLASSIFICATION CONSTANT: D3D10_APPEND_ALIGNED_ELEMENT 0xffffffff @@ -248,7 +248,7 @@ STRUCT: D3D10_INPUT_ELEMENT_DESC CONSTANT: D3D10_FILL_WIREFRAME 2 CONSTANT: D3D10_FILL_SOLID 3 -TYPEDEF: int D3D10_FILL_MODE ; +TYPEDEF: int D3D10_FILL_MODE CONSTANT: D3D10_PRIMITIVE_TOPOLOGY_UNDEFINED 0 CONSTANT: D3D10_PRIMITIVE_TOPOLOGY_POINTLIST 1 @@ -260,7 +260,7 @@ CONSTANT: D3D10_PRIMITIVE_TOPOLOGY_LINELIST_ADJ 10 CONSTANT: D3D10_PRIMITIVE_TOPOLOGY_LINESTRIP_ADJ 11 CONSTANT: D3D10_PRIMITIVE_TOPOLOGY_TRIANGLELIST_ADJ 12 CONSTANT: D3D10_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP_ADJ 13 -TYPEDEF: int D3D10_PRIMITIVE_TOPOLOGY ; +TYPEDEF: int D3D10_PRIMITIVE_TOPOLOGY CONSTANT: D3D10_PRIMITIVE_UNDEFINED 0 CONSTANT: D3D10_PRIMITIVE_POINT 1 @@ -268,12 +268,12 @@ CONSTANT: D3D10_PRIMITIVE_LINE 2 CONSTANT: D3D10_PRIMITIVE_TRIANGLE 3 CONSTANT: D3D10_PRIMITIVE_LINE_ADJ 6 CONSTANT: D3D10_PRIMITIVE_TRIANGLE_ADJ 7 -TYPEDEF: int D3D10_PRIMITIVE ; +TYPEDEF: int D3D10_PRIMITIVE CONSTANT: D3D10_CULL_NONE 1 CONSTANT: D3D10_CULL_FRONT 2 CONSTANT: D3D10_CULL_BACK 3 -TYPEDEF: int D3D10_CULL_MODE ; +TYPEDEF: int D3D10_CULL_MODE STRUCT: D3D10_SO_DECLARATION_ENTRY { SemanticName LPCSTR } @@ -295,7 +295,7 @@ CONSTANT: D3D10_RESOURCE_DIMENSION_BUFFER 1 CONSTANT: D3D10_RESOURCE_DIMENSION_TEXTURE1D 2 CONSTANT: D3D10_RESOURCE_DIMENSION_TEXTURE2D 3 CONSTANT: D3D10_RESOURCE_DIMENSION_TEXTURE3D 4 -TYPEDEF: int D3D10_RESOURCE_DIMENSION ; +TYPEDEF: int D3D10_RESOURCE_DIMENSION CONSTANT: D3D10_SRV_DIMENSION_UNKNOWN 0 CONSTANT: D3D10_SRV_DIMENSION_BUFFER 1 @@ -307,7 +307,7 @@ CONSTANT: D3D10_SRV_DIMENSION_TEXTURE2DMS 6 CONSTANT: D3D10_SRV_DIMENSION_TEXTURE2DMSARRAY 7 CONSTANT: D3D10_SRV_DIMENSION_TEXTURE3D 8 CONSTANT: D3D10_SRV_DIMENSION_TEXTURECUBE 9 -TYPEDEF: int D3D10_SRV_DIMENSION ; +TYPEDEF: int D3D10_SRV_DIMENSION CONSTANT: D3D10_DSV_DIMENSION_UNKNOWN 0 CONSTANT: D3D10_DSV_DIMENSION_TEXTURE1D 1 @@ -316,7 +316,7 @@ CONSTANT: D3D10_DSV_DIMENSION_TEXTURE2D 3 CONSTANT: D3D10_DSV_DIMENSION_TEXTURE2DARRAY 4 CONSTANT: D3D10_DSV_DIMENSION_TEXTURE2DMS 5 CONSTANT: D3D10_DSV_DIMENSION_TEXTURE2DMSARRAY 6 -TYPEDEF: int D3D10_DSV_DIMENSION ; +TYPEDEF: int D3D10_DSV_DIMENSION CONSTANT: D3D10_RTV_DIMENSION_UNKNOWN 0 CONSTANT: D3D10_RTV_DIMENSION_BUFFER 1 @@ -327,13 +327,13 @@ CONSTANT: D3D10_RTV_DIMENSION_TEXTURE2DARRAY 5 CONSTANT: D3D10_RTV_DIMENSION_TEXTURE2DMS 6 CONSTANT: D3D10_RTV_DIMENSION_TEXTURE2DMSARRAY 7 CONSTANT: D3D10_RTV_DIMENSION_TEXTURE3D 8 -TYPEDEF: int D3D10_RTV_DIMENSION ; +TYPEDEF: int D3D10_RTV_DIMENSION CONSTANT: D3D10_USAGE_DEFAULT 0 CONSTANT: D3D10_USAGE_IMMUTABLE 1 CONSTANT: D3D10_USAGE_DYNAMIC 2 CONSTANT: D3D10_USAGE_STAGING 3 -TYPEDEF: int D3D10_USAGE ; +TYPEDEF: int D3D10_USAGE CONSTANT: D3D10_BIND_VERTEX_BUFFER 0x1 CONSTANT: D3D10_BIND_INDEX_BUFFER 0x2 @@ -342,37 +342,37 @@ CONSTANT: D3D10_BIND_SHADER_RESOURCE 0x8 CONSTANT: D3D10_BIND_STREAM_OUTPUT 0x10 CONSTANT: D3D10_BIND_RENDER_TARGET 0x20 CONSTANT: D3D10_BIND_DEPTH_STENCIL 0x40 -TYPEDEF: int D3D10_BIND_FLAG ; +TYPEDEF: int D3D10_BIND_FLAG CONSTANT: D3D10_CPU_ACCESS_WRITE 0x10000 CONSTANT: D3D10_CPU_ACCESS_READ 0x20000 -TYPEDEF: int D3D10_CPU_ACCESS_FLAG ; +TYPEDEF: int D3D10_CPU_ACCESS_FLAG CONSTANT: D3D10_RESOURCE_MISC_GENERATE_MIPS 0x1 CONSTANT: D3D10_RESOURCE_MISC_SHARED 0x2 CONSTANT: D3D10_RESOURCE_MISC_TEXTURECUBE 0x4 CONSTANT: D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX 0x10 CONSTANT: D3D10_RESOURCE_MISC_GDI_COMPATIBLE 0x20 -TYPEDEF: int D3D10_RESOURCE_MISC_FLAG ; +TYPEDEF: int D3D10_RESOURCE_MISC_FLAG CONSTANT: D3D10_MAP_READ 1 CONSTANT: D3D10_MAP_WRITE 2 CONSTANT: D3D10_MAP_READ_WRITE 3 CONSTANT: D3D10_MAP_WRITE_DISCARD 4 CONSTANT: D3D10_MAP_WRITE_NO_OVERWRITE 5 -TYPEDEF: int D3D10_MAP ; +TYPEDEF: int D3D10_MAP CONSTANT: D3D10_MAP_FLAG_DO_NOT_WAIT 0x100000 -TYPEDEF: int D3D10_MAP_FLAG ; +TYPEDEF: int D3D10_MAP_FLAG CONSTANT: D3D10_RAISE_FLAG_DRIVER_INTERNAL_ERROR 0x1 -TYPEDEF: int D3D10_RAISE_FLAG ; +TYPEDEF: int D3D10_RAISE_FLAG CONSTANT: D3D10_CLEAR_DEPTH 0x1 CONSTANT: D3D10_CLEAR_STENCIL 0x2 -TYPEDEF: int D3D10_CLEAR_FLAG ; +TYPEDEF: int D3D10_CLEAR_FLAG -TYPEDEF: RECT D3D10_RECT ; +TYPEDEF: RECT D3D10_RECT STRUCT: D3D10_BOX { left UINT } @@ -397,11 +397,11 @@ CONSTANT: D3D10_COMPARISON_GREATER 5 CONSTANT: D3D10_COMPARISON_NOT_EQUAL 6 CONSTANT: D3D10_COMPARISON_GREATER_EQUAL 7 CONSTANT: D3D10_COMPARISON_ALWAYS 8 -TYPEDEF: int D3D10_COMPARISON_FUNC ; +TYPEDEF: int D3D10_COMPARISON_FUNC CONSTANT: D3D10_DEPTH_WRITE_MASK_ZERO 0 CONSTANT: D3D10_DEPTH_WRITE_MASK_ALL 1 -TYPEDEF: int D3D10_DEPTH_WRITE_MASK ; +TYPEDEF: int D3D10_DEPTH_WRITE_MASK CONSTANT: D3D10_STENCIL_OP_KEEP 1 CONSTANT: D3D10_STENCIL_OP_ZERO 2 @@ -411,7 +411,7 @@ CONSTANT: D3D10_STENCIL_OP_DECR_SAT 5 CONSTANT: D3D10_STENCIL_OP_INVERT 6 CONSTANT: D3D10_STENCIL_OP_INCR 7 CONSTANT: D3D10_STENCIL_OP_DECR 8 -TYPEDEF: int D3D10_STENCIL_OP ; +TYPEDEF: int D3D10_STENCIL_OP STRUCT: D3D10_DEPTH_STENCILOP_DESC { StencilFailOp D3D10_STENCIL_OP } @@ -449,21 +449,21 @@ CONSTANT: D3D10_BLEND_SRC1_COLOR 16 CONSTANT: D3D10_BLEND_INV_SRC1_COLOR 17 CONSTANT: D3D10_BLEND_SRC1_ALPHA 18 CONSTANT: D3D10_BLEND_INV_SRC1_ALPHA 19 -TYPEDEF: int D3D10_BLEND ; +TYPEDEF: int D3D10_BLEND CONSTANT: D3D10_BLEND_OP_ADD 1 CONSTANT: D3D10_BLEND_OP_SUBTRACT 2 CONSTANT: D3D10_BLEND_OP_REV_SUBTRACT 3 CONSTANT: D3D10_BLEND_OP_MIN 4 CONSTANT: D3D10_BLEND_OP_MAX 5 -TYPEDEF: int D3D10_BLEND_OP ; +TYPEDEF: int D3D10_BLEND_OP CONSTANT: D3D10_COLOR_WRITE_ENABLE_RED 1 CONSTANT: D3D10_COLOR_WRITE_ENABLE_GREEN 2 CONSTANT: D3D10_COLOR_WRITE_ENABLE_BLUE 4 CONSTANT: D3D10_COLOR_WRITE_ENABLE_ALPHA 8 CONSTANT: D3D10_COLOR_WRITE_ENABLE_ALL 15 -TYPEDEF: int D3D10_COLOR_WRITE_ENABLE ; +TYPEDEF: int D3D10_COLOR_WRITE_ENABLE STRUCT: D3D10_BLEND_DESC { AlphaToCoverageEnable BOOL } @@ -580,7 +580,7 @@ CONSTANT: D3D10_TEXTURECUBE_FACE_POSITIVE_Y 2 CONSTANT: D3D10_TEXTURECUBE_FACE_NEGATIVE_Y 3 CONSTANT: D3D10_TEXTURECUBE_FACE_POSITIVE_Z 4 CONSTANT: D3D10_TEXTURECUBE_FACE_NEGATIVE_Z 5 -TYPEDEF: int D3D10_TEXTURECUBE_FACE ; +TYPEDEF: int D3D10_TEXTURECUBE_FACE COM-INTERFACE: ID3D10View ID3D10DeviceChild "{C902B03F-60A7-49BA-9936-2A3AB37A7E33}" void GetResource ( ID3D10Resource** ppResource ) ; @@ -775,11 +775,11 @@ CONSTANT: D3D10_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT 0x94 CONSTANT: D3D10_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR 0x95 CONSTANT: D3D10_FILTER_COMPARISON_ANISOTROPIC 0xd5 CONSTANT: D3D10_FILTER_TEXT_1BIT 0x80000000 -TYPEDEF: int D3D10_FILTER ; +TYPEDEF: int D3D10_FILTER CONSTANT: D3D10_FILTER_TYPE_POINT 0 CONSTANT: D3D10_FILTER_TYPE_LINEAR 1 -TYPEDEF: int D3D10_FILTER_TYPE ; +TYPEDEF: int D3D10_FILTER_TYPE CONSTANT: D3D10_FILTER_TYPE_MASK 0x3 CONSTANT: D3D10_MIN_FILTER_SHIFT 4 @@ -794,7 +794,7 @@ CONSTANT: D3D10_TEXTURE_ADDRESS_MIRROR 2 CONSTANT: D3D10_TEXTURE_ADDRESS_CLAMP 3 CONSTANT: D3D10_TEXTURE_ADDRESS_BORDER 4 CONSTANT: D3D10_TEXTURE_ADDRESS_MIRROR_ONCE 5 -TYPEDEF: int D3D10_TEXTURE_ADDRESS_MODE ; +TYPEDEF: int D3D10_TEXTURE_ADDRESS_MODE STRUCT: D3D10_SAMPLER_DESC { Filter D3D10_FILTER } @@ -807,7 +807,7 @@ STRUCT: D3D10_SAMPLER_DESC { BorderColor FLOAT[4] } { MinLOD FLOAT } { MaxLOD FLOAT } ; -TYPEDEF: D3D10_SAMPLER_DESC D3D10SAMPLER_DESC ; +TYPEDEF: D3D10_SAMPLER_DESC D3D10SAMPLER_DESC COM-INTERFACE: ID3D10SamplerState ID3D10DeviceChild "{9B7E4C0C-342C-4106-A19F-4F2704F689F0}" void GetDesc ( D3D10SAMPLER_DESC* pDesc ) ; @@ -837,7 +837,7 @@ CONSTANT: D3D10_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET 0x200000 CONSTANT: D3D10_FORMAT_SUPPORT_MULTISAMPLE_LOAD 0x400000 CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_GATHER 0x800000 CONSTANT: D3D10_FORMAT_SUPPORT_BACK_BUFFER_CAST 0x100000 -TYPEDEF: int D3D10_FORMAT_SUPPORT ; +TYPEDEF: int D3D10_FORMAT_SUPPORT COM-INTERFACE: ID3D10Asynchronous ID3D10DeviceChild "{9B7E4C0D-342C-4106-A19F-4F2704F689F0}" void Begin ( ) @@ -846,7 +846,7 @@ COM-INTERFACE: ID3D10Asynchronous ID3D10DeviceChild "{9B7E4C0D-342C-4106-A19F-4F UINT GetDataSize ( ) ; CONSTANT: D3D10_ASYNC_GETDATA_DONOTFLUSH 1 -TYPEDEF: int D3D10_ASYNC_GETDATA_FLAG ; +TYPEDEF: int D3D10_ASYNC_GETDATA_FLAG CONSTANT: D3D10_QUERY_EVENT 0 CONSTANT: D3D10_QUERY_OCCLUSION 1 @@ -856,10 +856,10 @@ CONSTANT: D3D10_QUERY_PIPELINE_STATISTICS 4 CONSTANT: D3D10_QUERY_OCCLUSION_PREDICATE 5 CONSTANT: D3D10_QUERY_SO_STATISTICS 6 CONSTANT: D3D10_QUERY_SO_OVERFLOW_PREDICATE 7 -TYPEDEF: int D3D10_QUERY ; +TYPEDEF: int D3D10_QUERY CONSTANT: D3D10_QUERY_MISC_PREDICATEHINT 1 -TYPEDEF: int D3D10_QUERY_MISC_FLAG ; +TYPEDEF: int D3D10_QUERY_MISC_FLAG STRUCT: D3D10_QUERY_DESC { Query D3D10_QUERY } @@ -907,13 +907,13 @@ CONSTANT: D3D10_COUNTER_PS_COMPUTATION_LIMITED 15 CONSTANT: D3D10_COUNTER_POST_TRANSFORM_CACHE_HIT_RATE 16 CONSTANT: D3D10_COUNTER_TEXTURE_CACHE_HIT_RATE 17 CONSTANT: D3D10_COUNTER_DEVICE_DEPENDENT_0 0x40000000 -TYPEDEF: int D3D10_COUNTER ; +TYPEDEF: int D3D10_COUNTER CONSTANT: D3D10_COUNTER_TYPE_FLOAT32 0 CONSTANT: D3D10_COUNTER_TYPE_UINT16 1 CONSTANT: D3D10_COUNTER_TYPE_UINT32 2 CONSTANT: D3D10_COUNTER_TYPE_UINT64 3 -TYPEDEF: int D3D10_COUNTER_TYPE ; +TYPEDEF: int D3D10_COUNTER_TYPE STRUCT: D3D10_COUNTER_DESC { Counter D3D10_COUNTER } @@ -1037,7 +1037,7 @@ CONSTANT: D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS 0x8 CONSTANT: D3D10_CREATE_DEVICE_ALLOW_NULL_FROM_MAP 0x10 CONSTANT: D3D10_CREATE_DEVICE_BGRA_SUPPORT 0x20 CONSTANT: D3D10_CREATE_DEVICE_STRICT_VALIDATION 0x200 -TYPEDEF: int D3D10_CREATE_DEVICE_FLAG ; +TYPEDEF: int D3D10_CREATE_DEVICE_FLAG CONSTANT: D3D10_SDK_VERSION 29 diff --git a/ffi/windows/directx/d3d10_1/d3d10_1.factor b/ffi/windows/directx/d3d10_1/d3d10_1.factor index e914eccbcc..d7471dd82e 100644 --- a/ffi/windows/directx/d3d10_1/d3d10_1.factor +++ b/ffi/windows/directx/d3d10_1/d3d10_1.factor @@ -33,7 +33,7 @@ CONSTANT: D3D10_FEATURE_LEVEL_10_1 0xa100 CONSTANT: D3D10_FEATURE_LEVEL_9_1 0x9100 CONSTANT: D3D10_FEATURE_LEVEL_9_2 0x9200 CONSTANT: D3D10_FEATURE_LEVEL_9_3 0x9300 -TYPEDEF: int D3D10_FEATURE_LEVEL1 ; +TYPEDEF: int D3D10_FEATURE_LEVEL1 STRUCT: D3D10_RENDER_TARGET_BLEND_DESC1 { BlendEnable BOOL } @@ -70,7 +70,7 @@ CONSTANT: D3D10_1_SRV_DIMENSION_TEXTURE2DMSARRAY 7 CONSTANT: D3D10_1_SRV_DIMENSION_TEXTURE3D 8 CONSTANT: D3D10_1_SRV_DIMENSION_TEXTURECUBE 9 CONSTANT: D3D10_1_SRV_DIMENSION_TEXTURECUBEARRAY 10 -TYPEDEF: int D3D10_SRV_DIMENSION1 ; +TYPEDEF: int D3D10_SRV_DIMENSION1 UNION-STRUCT: D3D10_SHADER_RESOURCE_VIEW_DESC1_UNION { Buffer D3D10_BUFFER_SRV } @@ -93,7 +93,7 @@ COM-INTERFACE: ID3D10ShaderResourceView1 ID3D10ShaderResourceView "{9B7E4C87-342 CONSTANT: D3D10_STANDARD_MULTISAMPLE_PATTERN 0xffffffff CONSTANT: D3D10_CENTER_MULTISAMPLE_PATTERN 0xfffffffe -TYPEDEF: int D3D10_STANDARD_MULTISAMPLE_QUALITY_LEVELS ; +TYPEDEF: int D3D10_STANDARD_MULTISAMPLE_QUALITY_LEVELS COM-INTERFACE: ID3D10Device1 ID3D10Device "{9B7E4C8F-342C-4106-A19F-4F2704F689F0}" HRESULT CreateShaderResourceView1 ( diff --git a/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor b/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor index cad62ad251..0c315f0594 100644 --- a/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor +++ b/ffi/windows/directx/d3d10_1shader/d3d10_1shader.factor @@ -18,7 +18,7 @@ CONSTANT: D3D10_SHADER_DEBUG_REG_LITERAL 9 CONSTANT: D3D10_SHADER_DEBUG_REG_UNUSED 10 CONSTANT: D3D11_SHADER_DEBUG_REG_INTERFACE_POINTERS 11 CONSTANT: D3D10_SHADER_DEBUG_REG_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3D10_SHADER_DEBUG_REGTYPE ; +TYPEDEF: int D3D10_SHADER_DEBUG_REGTYPE CONSTANT: D3D10_SHADER_DEBUG_SCOPE_GLOBAL 0 CONSTANT: D3D10_SHADER_DEBUG_SCOPE_BLOCK 1 @@ -29,12 +29,12 @@ CONSTANT: D3D10_SHADER_DEBUG_SCOPE_STATEBLOCK 5 CONSTANT: D3D10_SHADER_DEBUG_SCOPE_NAMESPACE 6 CONSTANT: D3D10_SHADER_DEBUG_SCOPE_ANNOTATION 7 CONSTANT: D3D10_SHADER_DEBUG_SCOPE_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3D10_SHADER_DEBUG_SCOPETYPE ; +TYPEDEF: int D3D10_SHADER_DEBUG_SCOPETYPE CONSTANT: D3D10_SHADER_DEBUG_VAR_VARIABLE 0 CONSTANT: D3D10_SHADER_DEBUG_VAR_FUNCTION 1 CONSTANT: D3D10_SHADER_DEBUG_VAR_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3D10_SHADER_DEBUG_VARTYPE ; +TYPEDEF: int D3D10_SHADER_DEBUG_VARTYPE STRUCT: D3D10_SHADER_DEBUG_TOKEN_INFO { File UINT } @@ -141,7 +141,7 @@ STRUCT: D3D10_SHADER_DEBUG_INFO { StringOffset UINT } ; C-TYPE: ID3D10ShaderReflection1 -TYPEDEF: ID3D10ShaderReflection1* LPD3D10SHADERREFLECTION1 ; +TYPEDEF: ID3D10ShaderReflection1* LPD3D10SHADERREFLECTION1 COM-INTERFACE: ID3D10ShaderReflection1 IUnknown "{C3457783-A846-47CE-9520-CEA6F66E7447}" HRESULT GetDesc ( D3D10_SHADER_DESC* pDesc ) diff --git a/ffi/windows/directx/d3d10effect/d3d10effect.factor b/ffi/windows/directx/d3d10effect/d3d10effect.factor index 3372ba64cc..c855c60eaf 100644 --- a/ffi/windows/directx/d3d10effect/d3d10effect.factor +++ b/ffi/windows/directx/d3d10effect/d3d10effect.factor @@ -29,7 +29,7 @@ CONSTANT: D3D10_DST_RS_VIEWPORTS 21 CONSTANT: D3D10_DST_RS_SCISSOR_RECTS 22 CONSTANT: D3D10_DST_RS_RASTERIZER_STATE 23 CONSTANT: D3D10_DST_PREDICATION 24 -TYPEDEF: int D3D10_DEVICE_STATE_TYPES ; +TYPEDEF: int D3D10_DEVICE_STATE_TYPES STRUCT: D3D10_STATE_BLOCK_MASK { VS BYTE } @@ -62,7 +62,7 @@ COM-INTERFACE: ID3D10StateBlock IUnknown "{0803425A-57F5-4dd6-9465-A87570834A08} HRESULT Apply ( ) HRESULT ReleaseAllDeviceObjects ( ) HRESULT GetDevice ( ID3D10Device** ppDevice ) ; -TYPEDEF: ID3D10StateBlock* LPD3D10STATEBLOCK ; +TYPEDEF: ID3D10StateBlock* LPD3D10STATEBLOCK FUNCTION: HRESULT D3D10StateBlockMaskUnion ( D3D10_STATE_BLOCK_MASK* pA, D3D10_STATE_BLOCK_MASK* pB, D3D10_STATE_BLOCK_MASK* pResult ) ; FUNCTION: HRESULT D3D10StateBlockMaskIntersect ( D3D10_STATE_BLOCK_MASK* pA, D3D10_STATE_BLOCK_MASK* pB, D3D10_STATE_BLOCK_MASK* pResult ) ; @@ -103,7 +103,7 @@ COM-INTERFACE: ID3D10EffectType f "{4E9E1DDC-CD9D-4772-A837-00180B9B88FD}" ID3D10EffectType* GetMemberTypeBySemantic ( LPCSTR Semantic ) LPCSTR GetMemberName ( UINT Index ) LPCSTR GetMemberSemantic ( UINT Index ) ; -TYPEDEF: ID3D10EffectType* LPD3D10EFFECTTYPE ; +TYPEDEF: ID3D10EffectType* LPD3D10EFFECTTYPE STRUCT: D3D10_EFFECT_VARIABLE_DESC { Name LPCSTR } @@ -153,7 +153,7 @@ COM-INTERFACE: ID3D10EffectVariable f "{AE897105-00E6-45bf-BB8E-281DD6DB8E1B}" ID3D10EffectSamplerVariable* AsSampler ( ) HRESULT SetRawValue ( void* pData, UINT Offset, UINT Count ) HRESULT GetRawValue ( void* pData, UINT Offset, UINT Count ) ; -TYPEDEF: ID3D10EffectVariable* LPD3D10EFFECTVARIABLE ; +TYPEDEF: ID3D10EffectVariable* LPD3D10EFFECTVARIABLE COM-INTERFACE: ID3D10EffectScalarVariable ID3D10EffectVariable "{00E48F7B-D2C8-49e8-A86C-022DEE53431F}" HRESULT SetFloat ( float Value ) @@ -168,7 +168,7 @@ COM-INTERFACE: ID3D10EffectScalarVariable ID3D10EffectVariable "{00E48F7B-D2C8-4 HRESULT GetBool ( BOOL* pValue ) HRESULT SetBoolArray ( BOOL* pData, UINT Offset, UINT Count ) HRESULT GetBoolArray ( BOOL* pData, UINT Offset, UINT Count ) ; -TYPEDEF: ID3D10EffectScalarVariable* LPD3D10EFFECTSCALARVARIABLE ; +TYPEDEF: ID3D10EffectScalarVariable* LPD3D10EFFECTSCALARVARIABLE COM-INTERFACE: ID3D10EffectVectorVariable ID3D10EffectVariable "{62B98C44-1F82-4c67-BCD0-72CF8F217E81}" HRESULT SetBoolVector ( BOOL* pData ) @@ -183,7 +183,7 @@ COM-INTERFACE: ID3D10EffectVectorVariable ID3D10EffectVariable "{62B98C44-1F82-4 HRESULT GetBoolVectorArray ( BOOL* pData, UINT Offset, UINT Count ) HRESULT GetIntVectorArray ( int* pData, UINT Offset, UINT Count ) HRESULT GetFloatVectorArray ( float* pData, UINT Offset, UINT Count ) ; -TYPEDEF: ID3D10EffectVectorVariable* LPD3D10EFFECTVECTORVARIABLE ; +TYPEDEF: ID3D10EffectVectorVariable* LPD3D10EFFECTVECTORVARIABLE COM-INTERFACE: ID3D10EffectMatrixVariable ID3D10EffectVariable "{50666C24-B82F-4eed-A172-5B6E7E8522E0}" HRESULT SetMatrix ( float* pData ) @@ -194,41 +194,41 @@ COM-INTERFACE: ID3D10EffectMatrixVariable ID3D10EffectVariable "{50666C24-B82F-4 HRESULT GetMatrixTranspose ( float* pData ) HRESULT SetMatrixTransposeArray ( float* pData, UINT Offset, UINT Count ) HRESULT GetMatrixTransposeArray ( float* pData, UINT Offset, UINT Count ) ; -TYPEDEF: ID3D10EffectMatrixVariable* LPD3D10EFFECTMATRIXVARIABLE ; +TYPEDEF: ID3D10EffectMatrixVariable* LPD3D10EFFECTMATRIXVARIABLE COM-INTERFACE: ID3D10EffectStringVariable ID3D10EffectVariable "{71417501-8DF9-4e0a-A78A-255F9756BAFF}" HRESULT GetString ( LPCSTR* ppString ) HRESULT GetStringArray ( LPCSTR* ppStrings, UINT Offset, UINT Count ) ; -TYPEDEF: ID3D10EffectStringVariable* LPD3D10EFFECTSTRINGVARIABLE ; +TYPEDEF: ID3D10EffectStringVariable* LPD3D10EFFECTSTRINGVARIABLE COM-INTERFACE: ID3D10EffectShaderResourceVariable ID3D10EffectVariable "{C0A7157B-D872-4b1d-8073-EFC2ACD4B1FC}" HRESULT SetResource ( ID3D10ShaderResourceView* pResource ) HRESULT GetResource ( ID3D10ShaderResourceView** ppResource ) HRESULT SetResourceArray ( ID3D10ShaderResourceView** ppResources, UINT Offset, UINT Count ) HRESULT GetResourceArray ( ID3D10ShaderResourceView** ppResources, UINT Offset, UINT Count ) ; -TYPEDEF: ID3D10EffectShaderResourceVariable* LPD3D10EFFECTSHADERRESOURCEVARIABLE ; +TYPEDEF: ID3D10EffectShaderResourceVariable* LPD3D10EFFECTSHADERRESOURCEVARIABLE COM-INTERFACE: ID3D10EffectRenderTargetViewVariable ID3D10EffectVariable "{28CA0CC3-C2C9-40bb-B57F-67B737122B17}" HRESULT SetRenderTarget ( ID3D10RenderTargetView* pResource ) HRESULT GetRenderTarget ( ID3D10RenderTargetView** ppResource ) HRESULT SetRenderTargetArray ( ID3D10RenderTargetView** ppResources, UINT Offset, UINT Count ) HRESULT GetRenderTargetArray ( ID3D10RenderTargetView** ppResources, UINT Offset, UINT Count ) ; -TYPEDEF: ID3D10EffectRenderTargetViewVariable* LPD3D10EFFECTRENDERTARGETVIEWVARIABLE ; +TYPEDEF: ID3D10EffectRenderTargetViewVariable* LPD3D10EFFECTRENDERTARGETVIEWVARIABLE COM-INTERFACE: ID3D10EffectDepthStencilViewVariable ID3D10EffectVariable "{3E02C918-CC79-4985-B622-2D92AD701623}" HRESULT SetDepthStencil ( ID3D10DepthStencilView* pResource ) HRESULT GetDepthStencil ( ID3D10DepthStencilView** ppResource ) HRESULT SetDepthStencilArray ( ID3D10DepthStencilView** ppResources, UINT Offset, UINT Count ) HRESULT GetDepthStencilArray ( ID3D10DepthStencilView** ppResources, UINT Offset, UINT Count ) ; -TYPEDEF: ID3D10EffectDepthStencilViewVariable* LPD3D10EFFECTDEPTHSTENCILVIEWVARIABLE ; +TYPEDEF: ID3D10EffectDepthStencilViewVariable* LPD3D10EFFECTDEPTHSTENCILVIEWVARIABLE COM-INTERFACE: ID3D10EffectConstantBuffer ID3D10EffectVariable "{56648F4D-CC8B-4444-A5AD-B5A3D76E91B3}" HRESULT SetConstantBuffer ( ID3D10Buffer* pConstantBuffer ) HRESULT GetConstantBuffer ( ID3D10Buffer** ppConstantBuffer ) HRESULT SetTextureBuffer ( ID3D10ShaderResourceView* pTextureBuffer ) HRESULT GetTextureBuffer ( ID3D10ShaderResourceView** ppTextureBuffer ) ; -TYPEDEF: ID3D10EffectConstantBuffer* LPD3D10EFFECTCONSTANTBUFFER ; +TYPEDEF: ID3D10EffectConstantBuffer* LPD3D10EFFECTCONSTANTBUFFER STRUCT: D3D10_EFFECT_SHADER_DESC { pInputSignature BYTE* } @@ -246,27 +246,27 @@ COM-INTERFACE: ID3D10EffectShaderVariable ID3D10EffectVariable "{80849279-C799-4 HRESULT GetPixelShader ( UINT ShaderIndex, ID3D10PixelShader** ppPS ) HRESULT GetInputSignatureElementDesc ( UINT ShaderIndex, UINT Element, D3D10_SIGNATURE_PARAMETER_DESC* pDesc ) HRESULT GetOutputSignatureElementDesc ( UINT ShaderIndex, UINT Element, D3D10_SIGNATURE_PARAMETER_DESC* pDesc ) ; -TYPEDEF: ID3D10EffectShaderVariable* LPD3D10EFFECTSHADERVARIABLE ; +TYPEDEF: ID3D10EffectShaderVariable* LPD3D10EFFECTSHADERVARIABLE COM-INTERFACE: ID3D10EffectBlendVariable ID3D10EffectVariable "{1FCD2294-DF6D-4eae-86B3-0E9160CFB07B}" HRESULT GetBlendState ( UINT Index, ID3D10BlendState** ppBlendState ) HRESULT GetBackingStore ( UINT Index, D3D10_BLEND_DESC* pBlendDesc ) ; -TYPEDEF: ID3D10EffectBlendVariable* LPD3D10EFFECTBLENDVARIABLE ; +TYPEDEF: ID3D10EffectBlendVariable* LPD3D10EFFECTBLENDVARIABLE COM-INTERFACE: ID3D10EffectDepthStencilVariable ID3D10EffectVariable "{AF482368-330A-46a5-9A5C-01C71AF24C8D}" HRESULT GetDepthStencilState ( UINT Index, ID3D10DepthStencilState** ppDepthStencilState ) HRESULT GetBackingStore ( UINT Index, D3D10_DEPTH_STENCIL_DESC* pDepthStencilDesc ) ; -TYPEDEF: ID3D10EffectDepthStencilVariable* LPD3D10EFFECTDEPTHSTENCILVARIABLE ; +TYPEDEF: ID3D10EffectDepthStencilVariable* LPD3D10EFFECTDEPTHSTENCILVARIABLE COM-INTERFACE: ID3D10EffectRasterizerVariable ID3D10EffectVariable "{21AF9F0E-4D94-4ea9-9785-2CB76B8C0B34}" HRESULT GetRasterizerState ( UINT Index, ID3D10RasterizerState** ppRasterizerState ) HRESULT GetBackingStore ( UINT Index, D3D10_RASTERIZER_DESC* pRasterizerDesc ) ; -TYPEDEF: ID3D10EffectRasterizerVariable* LPD3D10EFFECTRASTERIZERVARIABLE ; +TYPEDEF: ID3D10EffectRasterizerVariable* LPD3D10EFFECTRASTERIZERVARIABLE COM-INTERFACE: ID3D10EffectSamplerVariable ID3D10EffectVariable "{6530D5C7-07E9-4271-A418-E7CE4BD1E480}" HRESULT GetSampler ( UINT Index, ID3D10SamplerState** ppSampler ) HRESULT GetBackingStore ( UINT Index, D3D10_SAMPLER_DESC* pSamplerDesc ) ; -TYPEDEF: ID3D10EffectSamplerVariable* LPD3D10EFFECTSAMPLERVARIABLE ; +TYPEDEF: ID3D10EffectSamplerVariable* LPD3D10EFFECTSAMPLERVARIABLE STRUCT: D3D10_PASS_DESC { Name LPCSTR } @@ -291,7 +291,7 @@ COM-INTERFACE: ID3D10EffectPass f "{5CFBEB89-1A06-46e0-B282-E3F9BFA36A54}" ID3D10EffectVariable* GetAnnotationByName ( LPCSTR Name ) HRESULT Apply ( UINT Flags ) HRESULT ComputeStateBlockMask ( D3D10_STATE_BLOCK_MASK* pStateBlockMask ) ; -TYPEDEF: ID3D10EffectPass* LPD3D10EFFECTPASS ; +TYPEDEF: ID3D10EffectPass* LPD3D10EFFECTPASS STRUCT: D3D10_TECHNIQUE_DESC { Name LPCSTR } @@ -306,7 +306,7 @@ COM-INTERFACE: ID3D10EffectTechnique f "{DB122CE8-D1C9-4292-B237-24ED3DE8B175}" ID3D10EffectPass* GetPassByIndex ( UINT Index ) ID3D10EffectPass* GetPassByName ( LPCSTR Name ) HRESULT ComputeStateBlockMask ( D3D10_STATE_BLOCK_MASK* pStateBlockMask ) ; -TYPEDEF: ID3D10EffectTechnique* LPD3D10EFFECTTECHNIQUE ; +TYPEDEF: ID3D10EffectTechnique* LPD3D10EFFECTTECHNIQUE STRUCT: D3D10_EFFECT_DESC { IsChildEffect BOOL } @@ -330,11 +330,11 @@ COM-INTERFACE: ID3D10Effect IUnknown "{51B0CA8B-EC0B-4519-870D-8EE1CB5017C7}" ID3D10EffectTechnique* GetTechniqueByName ( LPCSTR Name ) HRESULT Optimize ( ) BOOL IsOptimized ( ) ; -TYPEDEF: ID3D10Effect* LPD3D10EFFECT ; +TYPEDEF: ID3D10Effect* LPD3D10EFFECT COM-INTERFACE: ID3D10EffectPool IUnknown "{9537AB04-3250-412e-8213-FCD2F8677933}" ID3D10Effect* AsEffect ( ) ; -TYPEDEF: ID3D10EffectPool* LPD3D10EFFECTPOOL ; +TYPEDEF: ID3D10EffectPool* LPD3D10EFFECTPOOL FUNCTION: HRESULT D3D10CompileEffectFromMemory ( void* pData, SIZE_T DataLength, LPCSTR pSrcFileName, D3D10_SHADER_MACRO* pDefines, ID3D10Include* pInclude, UINT HLSLFlags, UINT FXFlags, diff --git a/ffi/windows/directx/d3d10misc/d3d10misc.factor b/ffi/windows/directx/d3d10misc/d3d10misc.factor index 94632eafb3..7a13739d89 100644 --- a/ffi/windows/directx/d3d10misc/d3d10misc.factor +++ b/ffi/windows/directx/d3d10misc/d3d10misc.factor @@ -6,7 +6,7 @@ IN: windows.directx.d3d10misc LIBRARY: d3d10 C-TYPE: ID3D10Blob -TYPEDEF: ID3D10Blob* LPD3D10BLOB ; +TYPEDEF: ID3D10Blob* LPD3D10BLOB COM-INTERFACE: ID3D10Blob IUnknown "{8BA5FB08-5195-40e2-AC58-0D989C3A0102}" LPVOID GetBufferPointer ( ) @@ -17,7 +17,7 @@ CONSTANT: D3D10_DRIVER_TYPE_REFERENCE 1 CONSTANT: D3D10_DRIVER_TYPE_NULL 2 CONSTANT: D3D10_DRIVER_TYPE_SOFTWARE 3 CONSTANT: D3D10_DRIVER_TYPE_WARP 5 -TYPEDEF: int D3D10_DRIVER_TYPE ; +TYPEDEF: int D3D10_DRIVER_TYPE FUNCTION: HRESULT D3D10CreateDevice ( IDXGIAdapter* pAdapter, diff --git a/ffi/windows/directx/d3d10shader/d3d10shader.factor b/ffi/windows/directx/d3d10shader/d3d10shader.factor index 65fcec4f53..0c7a7de95b 100644 --- a/ffi/windows/directx/d3d10shader/d3d10shader.factor +++ b/ffi/windows/directx/d3d10shader/d3d10shader.factor @@ -29,7 +29,7 @@ CONSTANT: D3D10_SHADER_OPTIMIZATION_LEVEL3 32768 STRUCT: D3D10_SHADER_MACRO { Name LPCSTR } { Definition LPCSTR } ; -TYPEDEF: D3D10_SHADER_MACRO* LPD3D10_SHADER_MACRO ; +TYPEDEF: D3D10_SHADER_MACRO* LPD3D10_SHADER_MACRO CONSTANT: D3D10_SVC_SCALAR 0 CONSTANT: D3D10_SVC_VECTOR 1 @@ -40,15 +40,15 @@ CONSTANT: D3D10_SVC_STRUCT 5 CONSTANT: D3D11_SVC_INTERFACE_CLASS 6 CONSTANT: D3D11_SVC_INTERFACE_POINTER 7 CONSTANT: D3D10_SVC_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3D10_SHADER_VARIABLE_CLASS ; -TYPEDEF: D3D10_SHADER_VARIABLE_CLASS* LPD3D10_SHADER_VARIABLE_CLASS ; +TYPEDEF: int D3D10_SHADER_VARIABLE_CLASS +TYPEDEF: D3D10_SHADER_VARIABLE_CLASS* LPD3D10_SHADER_VARIABLE_CLASS CONSTANT: D3D10_SVF_USERPACKED 1 CONSTANT: D3D10_SVF_USED 2 CONSTANT: D3D11_SVF_INTERFACE_POINTER 4 CONSTANT: D3D10_SVF_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3D10_SHADER_VARIABLE_FLAGS ; -TYPEDEF: D3D10_SHADER_VARIABLE_FLAGS* LPD3D10_SHADER_VARIABLE_FLAGS ; +TYPEDEF: int D3D10_SHADER_VARIABLE_FLAGS +TYPEDEF: D3D10_SHADER_VARIABLE_FLAGS* LPD3D10_SHADER_VARIABLE_FLAGS CONSTANT: D3D10_SVT_VOID 0 CONSTANT: D3D10_SVT_BOOL 1 @@ -85,8 +85,8 @@ CONSTANT: D3D11_SVT_INTERFACE_POINTER 37 CONSTANT: D3D11_SVT_COMPUTESHADER 38 CONSTANT: D3D11_SVT_DOUBLE 39 CONSTANT: D3D10_SVT_FORCE_DWORD 0x7ffffff -TYPEDEF: int D3D10_SHADER_VARIABLE_TYPE ; -TYPEDEF: D3D10_SHADER_VARIABLE_TYPE* LPD3D10_SHADER_VARIABLE_TYPE ; +TYPEDEF: int D3D10_SHADER_VARIABLE_TYPE +TYPEDEF: D3D10_SHADER_VARIABLE_TYPE* LPD3D10_SHADER_VARIABLE_TYPE CONSTANT: D3D10_SIF_USERPACKED 1 CONSTANT: D3D10_SIF_COMPARISON_SAMPLER 2 @@ -94,8 +94,8 @@ CONSTANT: D3D10_SIF_TEXTURE_COMPONENT_0 4 CONSTANT: D3D10_SIF_TEXTURE_COMPONENT_1 8 CONSTANT: D3D10_SIF_TEXTURE_COMPONENTS 12 CONSTANT: D3D10_SIF_FORCE_DWORD 0x7ffffff -TYPEDEF: int D3D10_SHADER_INPUT_FLAGS ; -TYPEDEF: D3D10_SHADER_INPUT_FLAGS* LPD3D10_SHADER_INPUT_FLAGS ; +TYPEDEF: int D3D10_SHADER_INPUT_FLAGS +TYPEDEF: D3D10_SHADER_INPUT_FLAGS* LPD3D10_SHADER_INPUT_FLAGS CONSTANT: D3D10_SIT_CBUFFER 0 CONSTANT: D3D10_SIT_TBUFFER 1 @@ -109,18 +109,18 @@ CONSTANT: D3D11_SIT_UAV_RWBYTEADDRESS 8 CONSTANT: D3D11_SIT_UAV_APPEND_STRUCTURED 9 CONSTANT: D3D11_SIT_UAV_CONSUME_STRUCTURED 10 CONSTANT: D3D11_SIT_UAV_RWSTRUCTURED_WITH_COUNTER 11 -TYPEDEF: int D3D10_SHADER_INPUT_TYPE ; -TYPEDEF: D3D10_SHADER_INPUT_TYPE* LPD3D10_SHADER_INPUT_TYPE ; +TYPEDEF: int D3D10_SHADER_INPUT_TYPE +TYPEDEF: D3D10_SHADER_INPUT_TYPE* LPD3D10_SHADER_INPUT_TYPE CONSTANT: D3D10_CBF_USERPACKED 1 CONSTANT: D3D10_CBF_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3D10_SHADER_CBUFFER_FLAGS ; -TYPEDEF: D3D10_SHADER_CBUFFER_FLAGS* LPD3D10_SHADER_CBUFFER_FLAGS ; +TYPEDEF: int D3D10_SHADER_CBUFFER_FLAGS +TYPEDEF: D3D10_SHADER_CBUFFER_FLAGS* LPD3D10_SHADER_CBUFFER_FLAGS CONSTANT: D3D10_CT_CBUFFER 0 CONSTANT: D3D10_CT_TBUFFER 1 -TYPEDEF: int D3D10_CBUFFER_TYPE ; -TYPEDEF: D3D10_CBUFFER_TYPE* LPD3D10_CBUFFER_TYPE ; +TYPEDEF: int D3D10_CBUFFER_TYPE +TYPEDEF: D3D10_CBUFFER_TYPE* LPD3D10_CBUFFER_TYPE CONSTANT: D3D10_NAME_UNDEFINED 0 CONSTANT: D3D10_NAME_POSITION 1 @@ -144,7 +144,7 @@ CONSTANT: D3D10_NAME_DEPTH 65 CONSTANT: D3D10_NAME_COVERAGE 66 CONSTANT: D3D11_NAME_DEPTH_GREATER_EQUAL 67 CONSTANT: D3D11_NAME_DEPTH_LESS_EQUAL 68 -TYPEDEF: int D3D10_NAME ; +TYPEDEF: int D3D10_NAME CONSTANT: D3D10_RETURN_TYPE_UNORM 1 CONSTANT: D3D10_RETURN_TYPE_SNORM 2 @@ -152,24 +152,24 @@ CONSTANT: D3D10_RETURN_TYPE_SINT 3 CONSTANT: D3D10_RETURN_TYPE_UINT 4 CONSTANT: D3D10_RETURN_TYPE_FLOAT 5 CONSTANT: D3D10_RETURN_TYPE_MIXED 6 -TYPEDEF: int D3D10_RESOURCE_RETURN_TYPE ; +TYPEDEF: int D3D10_RESOURCE_RETURN_TYPE CONSTANT: D3D10_REGISTER_COMPONENT_UNKNOWN 0 CONSTANT: D3D10_REGISTER_COMPONENT_UINT32 1 CONSTANT: D3D10_REGISTER_COMPONENT_SINT32 2 CONSTANT: D3D10_REGISTER_COMPONENT_FLOAT32 3 -TYPEDEF: int D3D10_REGISTER_COMPONENT_TYPE ; +TYPEDEF: int D3D10_REGISTER_COMPONENT_TYPE CONSTANT: D3D10_INCLUDE_LOCAL 0 CONSTANT: D3D10_INCLUDE_SYSTEM 1 CONSTANT: D3D10_INCLUDE_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3D10_INCLUDE_TYPE ; -TYPEDEF: D3D10_INCLUDE_TYPE* LPD3D10_INCLUDE_TYPE ; +TYPEDEF: int D3D10_INCLUDE_TYPE +TYPEDEF: D3D10_INCLUDE_TYPE* LPD3D10_INCLUDE_TYPE COM-INTERFACE: ID3D10Include f "{C530AD7D-9B16-4395-A979-BA2ECFF83ADD}" HRESULT Open ( D3D10_INCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData, LPCVOID* ppData, UINT* pBytes ) HRESULT Close ( LPCVOID pData ) ; -TYPEDEF: ID3D10Include* LPD3D10INCLUDE ; +TYPEDEF: ID3D10Include* LPD3D10INCLUDE STRUCT: D3D10_SHADER_DESC { Version UINT } diff --git a/ffi/windows/directx/d3d11/d3d11.factor b/ffi/windows/directx/d3d11/d3d11.factor index 131f203285..6eb0f99ffd 100644 --- a/ffi/windows/directx/d3d11/d3d11.factor +++ b/ffi/windows/directx/d3d11/d3d11.factor @@ -405,7 +405,7 @@ CONSTANT: D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD 0x887c004 CONSTANT: D3D11_INPUT_PER_VERTEX_DATA 0 CONSTANT: D3D11_INPUT_PER_INSTANCE_DATA 1 -TYPEDEF: int D3D11_INPUT_CLASSIFICATION ; +TYPEDEF: int D3D11_INPUT_CLASSIFICATION CONSTANT: D3D11_APPEND_ALIGNED_ELEMENT 0xffffffff @@ -420,7 +420,7 @@ STRUCT: D3D11_INPUT_ELEMENT_DESC CONSTANT: D3D11_FILL_WIREFRAME 2 CONSTANT: D3D11_FILL_SOLID 3 -TYPEDEF: int D3D11_FILL_MODE ; +TYPEDEF: int D3D11_FILL_MODE CONSTANT: D3D11_PRIMITIVE_TOPOLOGY_UNDEFINED 0 CONSTANT: D3D11_PRIMITIVE_TOPOLOGY_POINTLIST 1 @@ -464,7 +464,7 @@ CONSTANT: D3D11_PRIMITIVE_TOPOLOGY_29_CONTROL_POINT_PATCHLIST 61 CONSTANT: D3D11_PRIMITIVE_TOPOLOGY_30_CONTROL_POINT_PATCHLIST 62 CONSTANT: D3D11_PRIMITIVE_TOPOLOGY_31_CONTROL_POINT_PATCHLIST 63 CONSTANT: D3D11_PRIMITIVE_TOPOLOGY_32_CONTROL_POINT_PATCHLIST 64 -TYPEDEF: int D3D11_PRIMITIVE_TOPOLOGY ; +TYPEDEF: int D3D11_PRIMITIVE_TOPOLOGY CONSTANT: D3D11_PRIMITIVE_UNDEFINED 0 CONSTANT: D3D11_PRIMITIVE_POINT 1 @@ -504,12 +504,12 @@ CONSTANT: D3D11_PRIMITIVE_29_CONTROL_POINT_PATCH 36 CONSTANT: D3D11_PRIMITIVE_30_CONTROL_POINT_PATCH 37 CONSTANT: D3D11_PRIMITIVE_31_CONTROL_POINT_PATCH 38 CONSTANT: D3D11_PRIMITIVE_32_CONTROL_POINT_PATCH 39 -TYPEDEF: int D3D11_PRIMITIVE ; +TYPEDEF: int D3D11_PRIMITIVE CONSTANT: D3D11_CULL_NONE 1 CONSTANT: D3D11_CULL_FRONT 2 CONSTANT: D3D11_CULL_BACK 3 -TYPEDEF: int D3D11_CULL_MODE ; +TYPEDEF: int D3D11_CULL_MODE STRUCT: D3D11_SO_DECLARATION_ENTRY { Stream UINT } @@ -532,7 +532,7 @@ CONSTANT: D3D11_RESOURCE_DIMENSION_BUFFER 1 CONSTANT: D3D11_RESOURCE_DIMENSION_TEXTURE1D 2 CONSTANT: D3D11_RESOURCE_DIMENSION_TEXTURE2D 3 CONSTANT: D3D11_RESOURCE_DIMENSION_TEXTURE3D 4 -TYPEDEF: int D3D11_RESOURCE_DIMENSION ; +TYPEDEF: int D3D11_RESOURCE_DIMENSION CONSTANT: D3D11_SRV_DIMENSION_UNKNOWN 0 CONSTANT: D3D11_SRV_DIMENSION_BUFFER 1 @@ -546,7 +546,7 @@ CONSTANT: D3D11_SRV_DIMENSION_TEXTURE3D 8 CONSTANT: D3D11_SRV_DIMENSION_TEXTURECUBE 9 CONSTANT: D3D11_SRV_DIMENSION_TEXTURECUBEARRAY 10 CONSTANT: D3D11_SRV_DIMENSION_BUFFEREX 11 -TYPEDEF: int D3D11_SRV_DIMENSION ; +TYPEDEF: int D3D11_SRV_DIMENSION CONSTANT: D3D11_DSV_DIMENSION_UNKNOWN 0 CONSTANT: D3D11_DSV_DIMENSION_TEXTURE1D 1 @@ -555,7 +555,7 @@ CONSTANT: D3D11_DSV_DIMENSION_TEXTURE2D 3 CONSTANT: D3D11_DSV_DIMENSION_TEXTURE2DARRAY 4 CONSTANT: D3D11_DSV_DIMENSION_TEXTURE2DMS 5 CONSTANT: D3D11_DSV_DIMENSION_TEXTURE2DMSARRAY 6 -TYPEDEF: int D3D11_DSV_DIMENSION ; +TYPEDEF: int D3D11_DSV_DIMENSION CONSTANT: D3D11_RTV_DIMENSION_UNKNOWN 0 CONSTANT: D3D11_RTV_DIMENSION_BUFFER 1 @@ -566,7 +566,7 @@ CONSTANT: D3D11_RTV_DIMENSION_TEXTURE2DARRAY 5 CONSTANT: D3D11_RTV_DIMENSION_TEXTURE2DMS 6 CONSTANT: D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY 7 CONSTANT: D3D11_RTV_DIMENSION_TEXTURE3D 8 -TYPEDEF: int D3D11_RTV_DIMENSION ; +TYPEDEF: int D3D11_RTV_DIMENSION CONSTANT: D3D11_UAV_DIMENSION_UNKNOWN 0 CONSTANT: D3D11_UAV_DIMENSION_BUFFER 1 @@ -575,13 +575,13 @@ CONSTANT: D3D11_UAV_DIMENSION_TEXTURE1DARRAY 3 CONSTANT: D3D11_UAV_DIMENSION_TEXTURE2D 4 CONSTANT: D3D11_UAV_DIMENSION_TEXTURE2DARRAY 5 CONSTANT: D3D11_UAV_DIMENSION_TEXTURE3D 8 -TYPEDEF: int D3D11_UAV_DIMENSION ; +TYPEDEF: int D3D11_UAV_DIMENSION CONSTANT: D3D11_USAGE_DEFAULT 0 CONSTANT: D3D11_USAGE_IMMUTABLE 1 CONSTANT: D3D11_USAGE_DYNAMIC 2 CONSTANT: D3D11_USAGE_STAGING 3 -TYPEDEF: int D3D11_USAGE ; +TYPEDEF: int D3D11_USAGE CONSTANT: D3D11_BIND_VERTEX_BUFFER 1 CONSTANT: D3D11_BIND_INDEX_BUFFER 2 @@ -591,11 +591,11 @@ CONSTANT: D3D11_BIND_STREAM_OUTPUT 16 CONSTANT: D3D11_BIND_RENDER_TARGET 32 CONSTANT: D3D11_BIND_DEPTH_STENCIL 64 CONSTANT: D3D11_BIND_UNORDERED_ACCESS 128 -TYPEDEF: int D3D11_BIND_FLAG ; +TYPEDEF: int D3D11_BIND_FLAG CONSTANT: D3D11_CPU_ACCESS_WRITE 0x10000 CONSTANT: D3D11_CPU_ACCESS_READ 0x20000 -TYPEDEF: int D3D11_CPU_ACCESS_FLAG ; +TYPEDEF: int D3D11_CPU_ACCESS_FLAG CONSTANT: D3D11_RESOURCE_MISC_GENERATE_MIPS 1 CONSTANT: D3D11_RESOURCE_MISC_SHARED 2 @@ -606,26 +606,26 @@ CONSTANT: D3D11_RESOURCE_MISC_BUFFER_STRUCTURED 64 CONSTANT: D3D11_RESOURCE_MISC_RESOURCE_CLAMP 128 CONSTANT: D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX 256 CONSTANT: D3D11_RESOURCE_MISC_GDI_COMPATIBLE 512 -TYPEDEF: int D3D11_RESOURCE_MISC_FLAG ; +TYPEDEF: int D3D11_RESOURCE_MISC_FLAG CONSTANT: D3D11_MAP_READ 1 CONSTANT: D3D11_MAP_WRITE 2 CONSTANT: D3D11_MAP_READ_WRITE 3 CONSTANT: D3D11_MAP_WRITE_DISCARD 4 CONSTANT: D3D11_MAP_WRITE_NO_OVERWRITE 5 -TYPEDEF: int D3D11_MAP ; +TYPEDEF: int D3D11_MAP CONSTANT: D3D11_MAP_FLAG_DO_NOT_WAIT 0x100000 -TYPEDEF: int D3D11_MAP_FLAG ; +TYPEDEF: int D3D11_MAP_FLAG CONSTANT: D3D11_RAISE_FLAG_DRIVER_INTERNAL_ERROR 1 -TYPEDEF: int D3D11_RAISE_FLAG ; +TYPEDEF: int D3D11_RAISE_FLAG CONSTANT: D3D11_CLEAR_DEPTH 1 CONSTANT: D3D11_CLEAR_STENCIL 2 -TYPEDEF: int D3D11_CLEAR_FLAG ; +TYPEDEF: int D3D11_CLEAR_FLAG -TYPEDEF: RECT D3D11_RECT ; +TYPEDEF: RECT D3D11_RECT STRUCT: D3D11_BOX { left UINT } @@ -652,11 +652,11 @@ CONSTANT: D3D11_COMPARISON_GREATER 5 CONSTANT: D3D11_COMPARISON_NOT_EQUAL 6 CONSTANT: D3D11_COMPARISON_GREATER_EQUAL 7 CONSTANT: D3D11_COMPARISON_ALWAYS 8 -TYPEDEF: int D3D11_COMPARISON_FUNC ; +TYPEDEF: int D3D11_COMPARISON_FUNC CONSTANT: D3D11_DEPTH_WRITE_MASK_ZERO 0 CONSTANT: D3D11_DEPTH_WRITE_MASK_ALL 1 -TYPEDEF: int D3D11_DEPTH_WRITE_MASK ; +TYPEDEF: int D3D11_DEPTH_WRITE_MASK CONSTANT: D3D11_STENCIL_OP_KEEP 1 CONSTANT: D3D11_STENCIL_OP_ZERO 2 @@ -666,7 +666,7 @@ CONSTANT: D3D11_STENCIL_OP_DECR_SAT 5 CONSTANT: D3D11_STENCIL_OP_INVERT 6 CONSTANT: D3D11_STENCIL_OP_INCR 7 CONSTANT: D3D11_STENCIL_OP_DECR 8 -TYPEDEF: int D3D11_STENCIL_OP ; +TYPEDEF: int D3D11_STENCIL_OP STRUCT: D3D11_DEPTH_STENCILOP_DESC { StencilFailOp D3D11_STENCIL_OP } @@ -704,21 +704,21 @@ CONSTANT: D3D11_BLEND_SRC1_COLOR 16 CONSTANT: D3D11_BLEND_INV_SRC1_COLOR 17 CONSTANT: D3D11_BLEND_SRC1_ALPHA 18 CONSTANT: D3D11_BLEND_INV_SRC1_ALPHA 19 -TYPEDEF: int D3D11_BLEND ; +TYPEDEF: int D3D11_BLEND CONSTANT: D3D11_BLEND_OP_ADD 1 CONSTANT: D3D11_BLEND_OP_SUBTRACT 2 CONSTANT: D3D11_BLEND_OP_REV_SUBTRACT 3 CONSTANT: D3D11_BLEND_OP_MIN 4 CONSTANT: D3D11_BLEND_OP_MAX 5 -TYPEDEF: int D3D11_BLEND_OP ; +TYPEDEF: int D3D11_BLEND_OP CONSTANT: D3D11_COLOR_WRITE_ENABLE_RED 1 CONSTANT: D3D11_COLOR_WRITE_ENABLE_GREEN 2 CONSTANT: D3D11_COLOR_WRITE_ENABLE_BLUE 4 CONSTANT: D3D11_COLOR_WRITE_ENABLE_ALPHA 8 CONSTANT: D3D11_COLOR_WRITE_ENABLE_ALL 15 -TYPEDEF: int D3D11_COLOR_WRITE_ENABLE ; +TYPEDEF: int D3D11_COLOR_WRITE_ENABLE STRUCT: D3D11_RENDER_TARGET_BLEND_DESC { BlendEnable BOOL } @@ -827,7 +827,7 @@ CONSTANT: D3D11_TEXTURECUBE_FACE_POSITIVE_Y 2 CONSTANT: D3D11_TEXTURECUBE_FACE_NEGATIVE_Y 3 CONSTANT: D3D11_TEXTURECUBE_FACE_POSITIVE_Z 4 CONSTANT: D3D11_TEXTURECUBE_FACE_NEGATIVE_Z 5 -TYPEDEF: int D3D11_TEXTURECUBE_FACE ; +TYPEDEF: int D3D11_TEXTURECUBE_FACE COM-INTERFACE: ID3D11View ID3D11DeviceChild "{839d1216-bb2e-412b-b7f4-a9dbebe08ed1}" void GetResource ( ID3D11Resource** ppResource ) ; @@ -845,7 +845,7 @@ STRUCT: D3D11_BUFFER_SRV { Second D3D11_BUFFER_SRV_UNION2 } ; CONSTANT: D3D11_BUFFEREX_SRV_FLAG_RAW 1 -TYPEDEF: int D3D11_BUFFEREX_SRV_FLAG ; +TYPEDEF: int D3D11_BUFFEREX_SRV_FLAG STRUCT: D3D11_BUFFEREX_SRV { FirstElement UINT } @@ -997,7 +997,7 @@ STRUCT: D3D11_TEX2DMS_ARRAY_DSV CONSTANT: D3D11_DSV_READ_ONLY_DEPTH 1 CONSTANT: D3D11_DSV_READ_ONLY_STENCIL 2 -TYPEDEF: int D3D11_DSV_FLAG ; +TYPEDEF: int D3D11_DSV_FLAG UNION-STRUCT: D3D11_DEPTH_STENCIL_VIEW_DESC_UNION { Texture1D D3D11_TEX1D_DSV } @@ -1019,7 +1019,7 @@ COM-INTERFACE: ID3D11DepthStencilView ID3D11View "{9fdac92a-1876-48c3-afad-25b94 CONSTANT: D3D11_BUFFER_UAV_FLAG_RAW 1 CONSTANT: D3D11_BUFFER_UAV_FLAG_APPEND 2 CONSTANT: D3D11_BUFFER_UAV_FLAG_COUNTER 4 -TYPEDEF: int D3D11_BUFFER_UAV_FLAG ; +TYPEDEF: int D3D11_BUFFER_UAV_FLAG STRUCT: D3D11_BUFFER_UAV { FirstElement UINT } @@ -1096,11 +1096,11 @@ CONSTANT: D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR 0x91 CONSTANT: D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT 0x94 CONSTANT: D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR 0x95 CONSTANT: D3D11_FILTER_COMPARISON_ANISOTROPIC 0xd5 -TYPEDEF: int D3D11_FILTER ; +TYPEDEF: int D3D11_FILTER CONSTANT: D3D11_FILTER_TYPE_POINT 0 CONSTANT: D3D11_FILTER_TYPE_LINEAR 1 -TYPEDEF: int D3D11_FILTER_TYPE ; +TYPEDEF: int D3D11_FILTER_TYPE CONSTANT: D3D11_FILTER_TYPE_MASK 3 CONSTANT: D3D11_MIN_FILTER_SHIFT 4 @@ -1114,7 +1114,7 @@ CONSTANT: D3D11_TEXTURE_ADDRESS_MIRROR 2 CONSTANT: D3D11_TEXTURE_ADDRESS_CLAMP 3 CONSTANT: D3D11_TEXTURE_ADDRESS_BORDER 4 CONSTANT: D3D11_TEXTURE_ADDRESS_MIRROR_ONCE 5 -TYPEDEF: int D3D11_TEXTURE_ADDRESS_MODE ; +TYPEDEF: int D3D11_TEXTURE_ADDRESS_MODE STRUCT: D3D11_SAMPLER_DESC { Filter D3D11_FILTER } @@ -1158,7 +1158,7 @@ CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_GATHER 0x800000 CONSTANT: D3D11_FORMAT_SUPPORT_BACK_BUFFER_CAST 0x1000000 CONSTANT: D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW 0x2000000 CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON 0x4000000 -TYPEDEF: int D3D11_FORMAT_SUPPORT ; +TYPEDEF: int D3D11_FORMAT_SUPPORT CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD 0x1 CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS 0x2 @@ -1168,13 +1168,13 @@ CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX 0x CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX 0x20 CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_TYPED_LOAD 0x40 CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_TYPED_STORE 0x80 -TYPEDEF: int D3D11_FORMAT_SUPPORT2 ; +TYPEDEF: int D3D11_FORMAT_SUPPORT2 COM-INTERFACE: ID3D11Asynchronous ID3D11DeviceChild "{4b35d0cd-1e15-4258-9c98-1b1333f6dd3b}" UINT GetDataSize ( ) ; CONSTANT: D3D11_ASYNC_GETDATA_DONOTFLUSH 1 -TYPEDEF: int D3D11_ASYNC_GETDATA_FLAG ; +TYPEDEF: int D3D11_ASYNC_GETDATA_FLAG CONSTANT: D3D11_QUERY_EVENT 0 CONSTANT: D3D11_QUERY_OCCLUSION 1 @@ -1192,10 +1192,10 @@ CONSTANT: D3D11_QUERY_SO_STATISTICS_STREAM2 12 CONSTANT: D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM2 13 CONSTANT: D3D11_QUERY_SO_STATISTICS_STREAM3 14 CONSTANT: D3D11_QUERY_SO_OVERFLOW_PREDICATE_STREAM3 15 -TYPEDEF: int D3D11_QUERY ; +TYPEDEF: int D3D11_QUERY CONSTANT: D3D11_QUERY_MISC_PREDICATEHINT 1 -TYPEDEF: int D3D11_QUERY_MISC_FLAG ; +TYPEDEF: int D3D11_QUERY_MISC_FLAG STRUCT: D3D11_QUERY_DESC { Query D3D11_QUERY } @@ -1228,13 +1228,13 @@ STRUCT: D3D11_QUERY_DATA_SO_STATISTICS { PrimitivesStorageNeeded UINT64 } ; CONSTANT: D3D11_COUNTER_DEVICE_DEPENDENT_0 0x40000000 -TYPEDEF: int D3D11_COUNTER ; +TYPEDEF: int D3D11_COUNTER CONSTANT: D3D11_COUNTER_TYPE_FLOAT32 0 CONSTANT: D3D11_COUNTER_TYPE_UINT16 1 CONSTANT: D3D11_COUNTER_TYPE_UINT32 2 CONSTANT: D3D11_COUNTER_TYPE_UINT64 3 -TYPEDEF: int D3D11_COUNTER_TYPE ; +TYPEDEF: int D3D11_COUNTER_TYPE STRUCT: D3D11_COUNTER_DESC { Counter D3D11_COUNTER } @@ -1250,11 +1250,11 @@ COM-INTERFACE: ID3D11Counter ID3D11Asynchronous "{6e8c49fb-a371-4770-b440-290860 CONSTANT: D3D11_STANDARD_MULTISAMPLE_PATTERN 0xffffffff CONSTANT: D3D11_CENTER_MULTISAMPLE_PATTERN 0xfffffffe -TYPEDEF: int D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS ; +TYPEDEF: int D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS CONSTANT: D3D11_DEVICE_CONTEXT_IMMEDIATE 0 CONSTANT: D3D11_DEVICE_CONTEXT_DEFERRED 1 -TYPEDEF: int D3D11_DEVICE_CONTEXT_TYPE ; +TYPEDEF: int D3D11_DEVICE_CONTEXT_TYPE STRUCT: D3D11_CLASS_INSTANCE_DESC { InstanceId UINT } @@ -1284,7 +1284,7 @@ CONSTANT: D3D11_FEATURE_DOUBLES 1 CONSTANT: D3D11_FEATURE_FORMAT_SUPPORT 2 CONSTANT: D3D11_FEATURE_FORMAT_SUPPORT2 3 CONSTANT: D3D11_FEATURE_D3D10_X_HARDWARE_OPTIONS 4 -TYPEDEF: int D3D11_FEATURE ; +TYPEDEF: int D3D11_FEATURE STRUCT: D3D11_FEATURE_DATA_THREADING { DriverConcurrentCreates BOOL } @@ -1461,7 +1461,7 @@ CONSTANT: D3D11_CREATE_DEVICE_DEBUG 2 CONSTANT: D3D11_CREATE_DEVICE_SWITCH_TO_REF 4 CONSTANT: D3D11_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS 8 CONSTANT: D3D11_CREATE_DEVICE_BGRA_SUPPORT 32 -TYPEDEF: int D3D11_CREATE_DEVICE_FLAG ; +TYPEDEF: int D3D11_CREATE_DEVICE_FLAG CONSTANT: D3D11_SDK_VERSION 7 diff --git a/ffi/windows/directx/d3d11shader/d3d11shader.factor b/ffi/windows/directx/d3d11shader/d3d11shader.factor index 104ed5aa2f..92127c598f 100644 --- a/ffi/windows/directx/d3d11shader/d3d11shader.factor +++ b/ffi/windows/directx/d3d11shader/d3d11shader.factor @@ -12,7 +12,7 @@ CONSTANT: D3D11_SHVER_GEOMETRY_SHADER 2 CONSTANT: D3D11_SHVER_HULL_SHADER 3 CONSTANT: D3D11_SHVER_DOMAIN_SHADER 4 CONSTANT: D3D11_SHVER_COMPUTE_SHADER 5 -TYPEDEF: int D3D11_SHADER_VERSION_TYPE ; +TYPEDEF: int D3D11_SHADER_VERSION_TYPE CONSTANT: D3D11_RETURN_TYPE_UNORM 1 CONSTANT: D3D11_RETURN_TYPE_SNORM 2 @@ -22,14 +22,14 @@ CONSTANT: D3D11_RETURN_TYPE_FLOAT 5 CONSTANT: D3D11_RETURN_TYPE_MIXED 6 CONSTANT: D3D11_RETURN_TYPE_DOUBLE 7 CONSTANT: D3D11_RETURN_TYPE_CONTINUED 8 -TYPEDEF: int D3D11_RESOURCE_RETURN_TYPE ; +TYPEDEF: int D3D11_RESOURCE_RETURN_TYPE ENUM: D3D11_CBUFFER_TYPE D3D11_CT_CBUFFER D3D11_CT_TBUFFER D3D11_CT_INTERFACE_POINTERS D3D11_CT_RESOURCE_BIND_INFO ; -TYPEDEF: D3D11_CBUFFER_TYPE* LPD3D11_CBUFFER_TYPE ; +TYPEDEF: D3D11_CBUFFER_TYPE* LPD3D11_CBUFFER_TYPE STRUCT: D3D11_SIGNATURE_PARAMETER_DESC { SemanticName LPCSTR } @@ -73,21 +73,21 @@ CONSTANT: D3D11_TESSELLATOR_DOMAIN_UNDEFINED 0 CONSTANT: D3D11_TESSELLATOR_DOMAIN_ISOLINE 1 CONSTANT: D3D11_TESSELLATOR_DOMAIN_TRI 2 CONSTANT: D3D11_TESSELLATOR_DOMAIN_QUAD 3 -TYPEDEF: int D3D11_TESSELLATOR_DOMAIN ; +TYPEDEF: int D3D11_TESSELLATOR_DOMAIN CONSTANT: D3D11_TESSELLATOR_PARTITIONING_UNDEFINED 0 CONSTANT: D3D11_TESSELLATOR_PARTITIONING_INTEGER 1 CONSTANT: D3D11_TESSELLATOR_PARTITIONING_POW2 2 CONSTANT: D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_ODD 3 CONSTANT: D3D11_TESSELLATOR_PARTITIONING_FRACTIONAL_EVEN 4 -TYPEDEF: int D3D11_TESSELLATOR_PARTITIONING ; +TYPEDEF: int D3D11_TESSELLATOR_PARTITIONING CONSTANT: D3D11_TESSELLATOR_OUTPUT_UNDEFINED 0 CONSTANT: D3D11_TESSELLATOR_OUTPUT_POINT 1 CONSTANT: D3D11_TESSELLATOR_OUTPUT_LINE 2 CONSTANT: D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CW 3 CONSTANT: D3D11_TESSELLATOR_OUTPUT_TRIANGLE_CCW 4 -TYPEDEF: int D3D11_TESSELLATOR_OUTPUT_PRIMITIVE ; +TYPEDEF: int D3D11_TESSELLATOR_OUTPUT_PRIMITIVE STRUCT: D3D11_SHADER_DESC { Version UINT } diff --git a/ffi/windows/directx/d3d9/d3d9.factor b/ffi/windows/directx/d3d9/d3d9.factor index 41eaeef6a1..92c32c7494 100644 --- a/ffi/windows/directx/d3d9/d3d9.factor +++ b/ffi/windows/directx/d3d9/d3d9.factor @@ -183,8 +183,8 @@ COM-INTERFACE: IDirect3DDevice9 IUnknown "{D0223B96-BF7A-43fd-92BD-A43B0D82B9EB} HRESULT DeletePatch ( UINT Handle ) HRESULT CreateQuery ( D3DQUERYTYPE Type, IDirect3DQuery9** ppQuery ) ; -TYPEDEF: IDirect3DDevice9* LPDIRECT3DDEVICE9 ; -TYPEDEF: IDirect3DDevice9* PDIRECT3DDEVICE9 ; +TYPEDEF: IDirect3DDevice9* LPDIRECT3DDEVICE9 +TYPEDEF: IDirect3DDevice9* PDIRECT3DDEVICE9 COM-INTERFACE: IDirect3DStateBlock9 IUnknown "{B07C4FE5-310D-4ba8-A23C-4F0F206F218B}"" HRESULT GetDevice ( IDirect3DDevice9** ppDevice ) @@ -200,8 +200,8 @@ COM-INTERFACE: IDirect3DSwapChain9 IUnknown "{794950F2-ADFC-458a-905E-10A10B0B50 HRESULT GetDevice ( IDirect3DDevice9** ppDevice ) HRESULT GetPresentParameters ( D3DPRESENT_PARAMETERS* pPresentationParameters ) ; -TYPEDEF: IDirect3DSwapChain9* LPDIRECT3DSWAPCHAIN9 ; -TYPEDEF: IDirect3DSwapChain9* PDIRECT3DSWAPCHAIN9 ; +TYPEDEF: IDirect3DSwapChain9* LPDIRECT3DSWAPCHAIN9 +TYPEDEF: IDirect3DSwapChain9* PDIRECT3DSWAPCHAIN9 COM-INTERFACE: IDirect3DResource9 IUnknown "{05EEC05D-8F7D-4362-B999-D1BAF357C704}" HRESULT GetDevice ( IDirect3DDevice9** ppDevice ) @@ -213,29 +213,29 @@ COM-INTERFACE: IDirect3DResource9 IUnknown "{05EEC05D-8F7D-4362-B999-D1BAF357C70 void PreLoad ( ) D3DRESOURCETYPE GetType ( ) ; -TYPEDEF: IDirect3DResource9* LPDIRECT3DRESOURCE9 ; -TYPEDEF: IDirect3DResource9* PDIRECT3DRESOURCE9 ; +TYPEDEF: IDirect3DResource9* LPDIRECT3DRESOURCE9 +TYPEDEF: IDirect3DResource9* PDIRECT3DRESOURCE9 COM-INTERFACE: IDirect3DVertexDeclaration9 IUnknown "{DD13C59C-36FA-4098-A8FB-C7ED39DC8546}" HRESULT GetDevice ( IDirect3DDevice9** ppDevice ) HRESULT GetDeclaration ( D3DVERTEXELEMENT9* pElement, UINT* pNumElements ) ; -TYPEDEF: IDirect3DVertexDeclaration9* LPDIRECT3DVERTEXDECLARATION9 ; -TYPEDEF: IDirect3DVertexDeclaration9* PDIRECT3DVERTEXDECLARATION9 ; +TYPEDEF: IDirect3DVertexDeclaration9* LPDIRECT3DVERTEXDECLARATION9 +TYPEDEF: IDirect3DVertexDeclaration9* PDIRECT3DVERTEXDECLARATION9 COM-INTERFACE: IDirect3DVertexShader9 IUnknown "{EFC5557E-6265-4613-8A94-43857889EB36}" HRESULT GetDevice ( IDirect3DDevice9** ppDevice ) HRESULT GetFunction ( void* x, UINT* pSizeOfData ) ; -TYPEDEF: IDirect3DVertexShader9* LPDIRECT3DVERTEXSHADER9 ; -TYPEDEF: IDirect3DVertexShader9* PDIRECT3DVERTEXSHADER9 ; +TYPEDEF: IDirect3DVertexShader9* LPDIRECT3DVERTEXSHADER9 +TYPEDEF: IDirect3DVertexShader9* PDIRECT3DVERTEXSHADER9 COM-INTERFACE: IDirect3DPixelShader9 IUnknown "{6D3BDBDC-5B02-4415-B852-CE5E8BCCB289}" HRESULT GetDevice ( IDirect3DDevice9** ppDevice ) HRESULT GetFunction ( void* x, UINT* pSizeOfData ) ; -TYPEDEF: IDirect3DPixelShader9* LPDIRECT3DPIXELSHADER9 ; -TYPEDEF: IDirect3DPixelShader9* PDIRECT3DPIXELSHADER9 ; +TYPEDEF: IDirect3DPixelShader9* LPDIRECT3DPIXELSHADER9 +TYPEDEF: IDirect3DPixelShader9* PDIRECT3DPIXELSHADER9 COM-INTERFACE: IDirect3DBaseTexture9 IDirect3DResource9 "{580CA87E-1D3C-4d54-991D-B7D3E3C298CE}" DWORD SetLOD ( DWORD LODNew ) @@ -245,8 +245,8 @@ COM-INTERFACE: IDirect3DBaseTexture9 IDirect3DResource9 "{580CA87E-1D3C-4d54-991 D3DTEXTUREFILTERTYPE GetAutoGenFilterType ( ) void GenerateMipSubLevels ( ) ; -TYPEDEF: IDirect3DBaseTexture9* LPDIRECT3DBASETEXTURE9 ; -TYPEDEF: IDirect3DBaseTexture9* PDIRECT3DBASETEXTURE9 ; +TYPEDEF: IDirect3DBaseTexture9* LPDIRECT3DBASETEXTURE9 +TYPEDEF: IDirect3DBaseTexture9* PDIRECT3DBASETEXTURE9 COM-INTERFACE: IDirect3DTexture9 IDirect3DBaseTexture9 "{85C31227-3DE5-4f00-9B3A-F11AC38C18B5}" HRESULT GetLevelDesc ( UINT Level, D3DSURFACE_DESC* pDesc ) @@ -254,8 +254,8 @@ COM-INTERFACE: IDirect3DTexture9 IDirect3DBaseTexture9 "{85C31227-3DE5-4f00-9B3A HRESULT LockRect ( UINT Level, D3DLOCKED_RECT* pLockedRect, RECT* pRect, DWORD Flags ) HRESULT UnlockRect ( UINT Level ) ; -TYPEDEF: IDirect3DTexture9* LPDIRECT3DTEXTURE9 ; -TYPEDEF: IDirect3DTexture9* PDIRECT3DTEXTURE9 ; +TYPEDEF: IDirect3DTexture9* LPDIRECT3DTEXTURE9 +TYPEDEF: IDirect3DTexture9* PDIRECT3DTEXTURE9 COM-INTERFACE: IDirect3DVolumeTexture9 IDirect3DBaseTexture9 "{2518526C-E789-4111-A7B9-47EF328D13E6}" HRESULT GetLevelDesc ( UINT Level, D3DVOLUME_DESC* pDesc ) @@ -264,8 +264,8 @@ COM-INTERFACE: IDirect3DVolumeTexture9 IDirect3DBaseTexture9 "{2518526C-E789-411 HRESULT UnlockBox ( UINT Level ) HRESULT AddDirtyBox ( D3DBOX* pDirtyBox ) ; -TYPEDEF: IDirect3DVolumeTexture9* LPDIRECT3DVOLUMETEXTURE9 ; -TYPEDEF: IDirect3DVolumeTexture9* PDIRECT3DVOLUMETEXTURE9 ; +TYPEDEF: IDirect3DVolumeTexture9* LPDIRECT3DVOLUMETEXTURE9 +TYPEDEF: IDirect3DVolumeTexture9* PDIRECT3DVOLUMETEXTURE9 COM-INTERFACE: IDirect3DCubeTexture9 IDirect3DBaseTexture9 "{FFF32F81-D953-473a-9223-93D652ABA93F}" HRESULT GetLevelDesc ( UINT Level, D3DSURFACE_DESC* pDesc ) @@ -274,24 +274,24 @@ COM-INTERFACE: IDirect3DCubeTexture9 IDirect3DBaseTexture9 "{FFF32F81-D953-473a- HRESULT UnlockRect ( D3DCUBEMAP_FACES FaceType, UINT Level ) HRESULT AddDirtyRect ( D3DCUBEMAP_FACES FaceType, RECT* pDirtyRect ) ; -TYPEDEF: IDirect3DCubeTexture9* LPDIRECT3DCUBETEXTURE9 ; -TYPEDEF: IDirect3DCubeTexture9* PDIRECT3DCUBETEXTURE9 ; +TYPEDEF: IDirect3DCubeTexture9* LPDIRECT3DCUBETEXTURE9 +TYPEDEF: IDirect3DCubeTexture9* PDIRECT3DCUBETEXTURE9 COM-INTERFACE: IDirect3DVertexBuffer9 IDirect3DResource9 "{B64BB1B5-FD70-4df6-BF91-19D0A12455E3}" HRESULT Lock ( UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags ) HRESULT Unlock ( ) HRESULT GetDesc ( D3DVERTEXBUFFER_DESC* pDesc ) ; -TYPEDEF: IDirect3DVertexBuffer9* LPDIRECT3DVERTEXBUFFER9 ; -TYPEDEF: IDirect3DVertexBuffer9* PDIRECT3DVERTEXBUFFER9 ; +TYPEDEF: IDirect3DVertexBuffer9* LPDIRECT3DVERTEXBUFFER9 +TYPEDEF: IDirect3DVertexBuffer9* PDIRECT3DVERTEXBUFFER9 COM-INTERFACE: IDirect3DIndexBuffer9 IDirect3DResource9 "{7C9DD65E-D3F7-4529-ACEE-785830ACDE35}" HRESULT Lock ( UINT OffsetToLock, UINT SizeToLock, void** ppbData, DWORD Flags ) HRESULT Unlock ( ) HRESULT GetDesc ( D3DINDEXBUFFER_DESC* pDesc ) ; -TYPEDEF: IDirect3DIndexBuffer9* LPDIRECT3DINDEXBUFFER9 ; -TYPEDEF: IDirect3DIndexBuffer9* PDIRECT3DINDEXBUFFER9 ; +TYPEDEF: IDirect3DIndexBuffer9* LPDIRECT3DINDEXBUFFER9 +TYPEDEF: IDirect3DIndexBuffer9* PDIRECT3DINDEXBUFFER9 COM-INTERFACE: IDirect3DSurface9 IDirect3DResource9 "{0CFBAF3A-9FF6-429a-99B3-A2796AF8B89B}" HRESULT GetContainer ( REFIID riid, void** ppContainer ) @@ -301,8 +301,8 @@ COM-INTERFACE: IDirect3DSurface9 IDirect3DResource9 "{0CFBAF3A-9FF6-429a-99B3-A2 HRESULT GetDC ( HDC* phdc ) HRESULT ReleaseDC ( HDC hdc ) ; -TYPEDEF: IDirect3DSurface9* LPDIRECT3DSURFACE9 ; -TYPEDEF: IDirect3DSurface9* PDIRECT3DSURFACE9 ; +TYPEDEF: IDirect3DSurface9* LPDIRECT3DSURFACE9 +TYPEDEF: IDirect3DSurface9* PDIRECT3DSURFACE9 COM-INTERFACE: IDirect3DVolume9 IUnknown "{24F416E6-1F67-4aa7-B88E-D33F6F3128A1}" HRESULT GetDevice ( IDirect3DDevice9** ppDevice ) @@ -314,8 +314,8 @@ COM-INTERFACE: IDirect3DVolume9 IUnknown "{24F416E6-1F67-4aa7-B88E-D33F6F3128A1} HRESULT LockBox ( D3DLOCKED_BOX* pLockedVolume, D3DBOX* pBox, DWORD Flags ) HRESULT UnlockBox ( ) ; -TYPEDEF: IDirect3DVolume9* LPDIRECT3DVOLUME9 ; -TYPEDEF: IDirect3DVolume9* PDIRECT3DVOLUME9 ; +TYPEDEF: IDirect3DVolume9* LPDIRECT3DVOLUME9 +TYPEDEF: IDirect3DVolume9* PDIRECT3DVOLUME9 COM-INTERFACE: IDirect3DQuery9 IUnknown "{d9771460-a695-4f26-bbd3-27b840b541cc}" HRESULT GetDevice ( IDirect3DDevice9** ppDevice ) @@ -324,8 +324,8 @@ COM-INTERFACE: IDirect3DQuery9 IUnknown "{d9771460-a695-4f26-bbd3-27b840b541cc}" HRESULT Issue ( DWORD dwIssueFlags ) HRESULT GetData ( void* pData, DWORD dwSize, DWORD dwGetDataFlags ) ; -TYPEDEF: IDirect3DQuery9* LPDIRECT3DQUERY9 ; -TYPEDEF: IDirect3DQuery9* PDIRECT3DQUERY9 ; +TYPEDEF: IDirect3DQuery9* LPDIRECT3DQUERY9 +TYPEDEF: IDirect3DQuery9* PDIRECT3DQUERY9 CONSTANT: D3DSPD_IUNKNOWN 0x00000001 @@ -416,8 +416,8 @@ COM-INTERFACE: IDirect3D9Ex IDirect3D9 "{02177241-69FC-400C-8FF1-93A44DF6861D}" HRESULT CreateDeviceEx ( UINT Adapter, D3DDEVTYPE DeviceType, HWND hFocusWindow, DWORD BehaviorFlags, D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX* pFullscreenDisplayMode, IDirect3DDevice9Ex** ppReturnedDeviceInterface ) HRESULT GetAdapterLUID ( UINT Adapter, LUID* pLUID ) ; -TYPEDEF: IDirect3D9Ex* LPDIRECT3D9EX ; -TYPEDEF: IDirect3D9Ex* PDIRECT3D9EX ; +TYPEDEF: IDirect3D9Ex* LPDIRECT3D9EX +TYPEDEF: IDirect3D9Ex* PDIRECT3D9EX COM-INTERFACE: IDirect3DDevice9Ex IDirect3DDevice9 "{B18B10CE-2649-405a-870F-95F777D4313A}" HRESULT SetConvolutionMonoKernel ( UINT width, UINT height, float* rows, float* columns ) @@ -436,30 +436,30 @@ COM-INTERFACE: IDirect3DDevice9Ex IDirect3DDevice9 "{B18B10CE-2649-405a-870F-95F HRESULT ResetEx ( D3DPRESENT_PARAMETERS* pPresentationParameters, D3DDISPLAYMODEEX *pFullscreenDisplayMode ) HRESULT GetDisplayModeEx ( UINT iSwapChain, D3DDISPLAYMODEEX* pMode, D3DDISPLAYROTATION* pRotation ) ; -TYPEDEF: IDirect3DDevice9Ex* LPDIRECT3DDEVICE9EX ; -TYPEDEF: IDirect3DDevice9Ex* PDIRECT3DDEVICE9EX ; +TYPEDEF: IDirect3DDevice9Ex* LPDIRECT3DDEVICE9EX +TYPEDEF: IDirect3DDevice9Ex* PDIRECT3DDEVICE9EX COM-INTERFACE: IDirect3DSwapChain9Ex IDirect3DSwapChain9 "{91886CAF-1C3D-4d2e-A0AB-3E4C7D8D3303}" HRESULT GetLastPresentCount ( UINT* pLastPresentCount ) HRESULT GetPresentStats ( D3DPRESENTSTATS* pPresentationStatistics ) HRESULT GetDisplayModeEx ( D3DDISPLAYMODEEX* pMode, D3DDISPLAYROTATION* pRotation ) ; -TYPEDEF: IDirect3DSwapChain9Ex* LPDIRECT3DSWAPCHAIN9EX ; -TYPEDEF: IDirect3DSwapChain9Ex* PDIRECT3DSWAPCHAIN9EX ; +TYPEDEF: IDirect3DSwapChain9Ex* LPDIRECT3DSWAPCHAIN9EX +TYPEDEF: IDirect3DSwapChain9Ex* PDIRECT3DSWAPCHAIN9EX COM-INTERFACE: IDirect3D9ExOverlayExtension IUnknown "{187aeb13-aaf5-4c59-876d-e059088c0df8}" HRESULT CheckDeviceOverlayType ( UINT Adapter, D3DDEVTYPE DevType, UINT OverlayWidth, UINT OverlayHeight, D3DFORMAT OverlayFormat, D3DDISPLAYMODEEX* pDisplayMode, D3DDISPLAYROTATION DisplayRotation, D3DOVERLAYCAPS* pOverlayCaps ) ; -TYPEDEF: IDirect3D9ExOverlayExtension* LPDIRECT3D9EXOVERLAYEXTENSION ; -TYPEDEF: IDirect3D9ExOverlayExtension* PDIRECT3D9EXOVERLAYEXTENSION ; +TYPEDEF: IDirect3D9ExOverlayExtension* LPDIRECT3D9EXOVERLAYEXTENSION +TYPEDEF: IDirect3D9ExOverlayExtension* PDIRECT3D9EXOVERLAYEXTENSION COM-INTERFACE: IDirect3DDevice9Video IUnknown "{26DC4561-A1EE-4ae7-96DA-118A36C0EC95}" HRESULT GetContentProtectionCaps ( GUID* pCryptoType, GUID* pDecodeProfile, D3DCONTENTPROTECTIONCAPS* pCaps ) HRESULT CreateAuthenticatedChannel ( D3DAUTHENTICATEDCHANNELTYPE ChannelType, IDirect3DAuthenticatedChannel9** ppAuthenticatedChannel, HANDLE* pChannelHandle ) HRESULT CreateCryptoSession ( GUID* pCryptoType, GUID* pDecodeProfile, IDirect3DCryptoSession9** ppCryptoSession, HANDLE* pCryptoHandle ) ; -TYPEDEF: IDirect3DDevice9Video* LPDIRECT3DDEVICE9VIDEO ; -TYPEDEF: IDirect3DDevice9Video* PDIRECT3DDEVICE9VIDEO ; +TYPEDEF: IDirect3DDevice9Video* LPDIRECT3DDEVICE9VIDEO +TYPEDEF: IDirect3DDevice9Video* PDIRECT3DDEVICE9VIDEO COM-INTERFACE: IDirect3DAuthenticatedChannel9 IUnknown "{FF24BEEE-DA21-4beb-98B5-D2F899F98AF9}" HRESULT GetCertificateSize ( UINT* pCertificateSize ) @@ -468,8 +468,8 @@ COM-INTERFACE: IDirect3DAuthenticatedChannel9 IUnknown "{FF24BEEE-DA21-4beb-98B5 HRESULT Query ( UINT InputSize, VOID* pInput, UINT OutputSize, VOID* pOutput ) HRESULT Configure ( UINT InputSize, VOID* pInput, D3DAUTHENTICATEDCHANNEL_CONFIGURE_OUTPUT* pOutput ) ; -TYPEDEF: IDirect3DAuthenticatedChannel9* LPDIRECT3DAUTHENTICATEDCHANNEL9 ; -TYPEDEF: IDirect3DAuthenticatedChannel9* PDIRECT3DAUTHENTICATEDCHANNEL9 ; +TYPEDEF: IDirect3DAuthenticatedChannel9* LPDIRECT3DAUTHENTICATEDCHANNEL9 +TYPEDEF: IDirect3DAuthenticatedChannel9* PDIRECT3DAUTHENTICATEDCHANNEL9 COM-INTERFACE: IDirect3DCryptoSession9 IUnknown "{FA0AB799-7A9C-48ca-8C5B-237E71A54434}" HRESULT GetCertificateSize ( UINT* pCertificateSize ) @@ -482,5 +482,5 @@ COM-INTERFACE: IDirect3DCryptoSession9 IUnknown "{FA0AB799-7A9C-48ca-8C5B-237E71 HRESULT FinishSessionKeyRefresh ( ) HRESULT GetEncryptionBltKey ( VOID* pReadbackKey, UINT KeySize ) ; -TYPEDEF: IDirect3DCryptoSession9* LPDIRECT3DCRYPTOSESSION9 ; -TYPEDEF: IDirect3DCryptoSession9* PDIRECT3DCRYPTOSESSION9 ; +TYPEDEF: IDirect3DCryptoSession9* LPDIRECT3DCRYPTOSESSION9 +TYPEDEF: IDirect3DCryptoSession9* PDIRECT3DCRYPTOSESSION9 diff --git a/ffi/windows/directx/d3d9types/d3d9types.factor b/ffi/windows/directx/d3d9types/d3d9types.factor index 0bf4ed0716..052de04154 100644 --- a/ffi/windows/directx/d3d9types/d3d9types.factor +++ b/ffi/windows/directx/d3d9types/d3d9types.factor @@ -2,7 +2,7 @@ USING: alien.syntax windows.types classes.struct math alien.c-types math.bitwise kernel locals windows.kernel32 literals ; IN: windows.directx.d3d9types -TYPEDEF: DWORD D3DCOLOR ; +TYPEDEF: DWORD D3DCOLOR STRUCT: D3DVECTOR { x FLOAT } @@ -81,7 +81,7 @@ STRUCT: D3DMATERIAL9 { Emissive D3DCOLORVALUE } { Power FLOAT } ; -TYPEDEF: int D3DLIGHTTYPE ; +TYPEDEF: int D3DLIGHTTYPE CONSTANT: D3DLIGHT_POINT 1 CONSTANT: D3DLIGHT_SPOT 2 CONSTANT: D3DLIGHT_DIRECTIONAL 3 @@ -106,19 +106,19 @@ CONSTANT: D3DCLEAR_TARGET 0x00000001 CONSTANT: D3DCLEAR_ZBUFFER 0x00000002 CONSTANT: D3DCLEAR_STENCIL 0x00000004 -TYPEDEF: int D3DSHADEMODE ; +TYPEDEF: int D3DSHADEMODE CONSTANT: D3DSHADE_FLAT 1 CONSTANT: D3DSHADE_GOURAUD 2 CONSTANT: D3DSHADE_PHONG 3 CONSTANT: D3DSHADE_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DFILLMODE ; +TYPEDEF: int D3DFILLMODE CONSTANT: D3DFILL_POINT 1 CONSTANT: D3DFILL_WIREFRAME 2 CONSTANT: D3DFILL_SOLID 3 CONSTANT: D3DFILL_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DBLEND ; +TYPEDEF: int D3DBLEND CONSTANT: D3DBLEND_ZERO 1 CONSTANT: D3DBLEND_ONE 2 CONSTANT: D3DBLEND_SRCCOLOR 3 @@ -138,7 +138,7 @@ CONSTANT: D3DBLEND_SRCCOLOR2 16 CONSTANT: D3DBLEND_INVSRCCOLOR2 17 CONSTANT: D3DBLEND_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DBLENDOP ; +TYPEDEF: int D3DBLENDOP CONSTANT: D3DBLENDOP_ADD 1 CONSTANT: D3DBLENDOP_SUBTRACT 2 CONSTANT: D3DBLENDOP_REVSUBTRACT 3 @@ -146,7 +146,7 @@ CONSTANT: D3DBLENDOP_MIN 4 CONSTANT: D3DBLENDOP_MAX 5 CONSTANT: D3DBLENDOP_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DTEXTUREADDRESS ; +TYPEDEF: int D3DTEXTUREADDRESS CONSTANT: D3DTADDRESS_WRAP 1 CONSTANT: D3DTADDRESS_MIRROR 2 CONSTANT: D3DTADDRESS_CLAMP 3 @@ -154,13 +154,13 @@ CONSTANT: D3DTADDRESS_BORDER 4 CONSTANT: D3DTADDRESS_MIRRORONCE 5 CONSTANT: D3DTADDRESS_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DCULL ; +TYPEDEF: int D3DCULL CONSTANT: D3DCULL_NONE 1 CONSTANT: D3DCULL_CW 2 CONSTANT: D3DCULL_CCW 3 CONSTANT: D3DCULL_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DCMPFUNC ; +TYPEDEF: int D3DCMPFUNC CONSTANT: D3DCMP_NEVER 1 CONSTANT: D3DCMP_LESS 2 CONSTANT: D3DCMP_EQUAL 3 @@ -171,7 +171,7 @@ CONSTANT: D3DCMP_GREATEREQUAL 7 CONSTANT: D3DCMP_ALWAYS 8 CONSTANT: D3DCMP_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DSTENCILOP ; +TYPEDEF: int D3DSTENCILOP CONSTANT: D3DSTENCILOP_KEEP 1 CONSTANT: D3DSTENCILOP_ZERO 2 CONSTANT: D3DSTENCILOP_REPLACE 3 @@ -182,20 +182,20 @@ CONSTANT: D3DSTENCILOP_INCR 7 CONSTANT: D3DSTENCILOP_DECR 8 CONSTANT: D3DSTENCILOP_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DFOGMODE ; +TYPEDEF: int D3DFOGMODE CONSTANT: D3DFOG_NONE 0 CONSTANT: D3DFOG_EXP 1 CONSTANT: D3DFOG_EXP2 2 CONSTANT: D3DFOG_LINEAR 3 CONSTANT: D3DFOG_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DZBUFFERTYPE ; +TYPEDEF: int D3DZBUFFERTYPE CONSTANT: D3DZB_FALSE 0 CONSTANT: D3DZB_TRUE 1 CONSTANT: D3DZB_USEW 2 CONSTANT: D3DZB_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DPRIMITIVETYPE ; +TYPEDEF: int D3DPRIMITIVETYPE CONSTANT: D3DPT_POINTLIST 1 CONSTANT: D3DPT_LINELIST 2 CONSTANT: D3DPT_LINESTRIP 3 @@ -204,7 +204,7 @@ CONSTANT: D3DPT_TRIANGLESTRIP 5 CONSTANT: D3DPT_TRIANGLEFAN 6 CONSTANT: D3DPT_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DTRANSFORMSTATETYPE ; +TYPEDEF: int D3DTRANSFORMSTATETYPE CONSTANT: D3DTS_VIEW 2 CONSTANT: D3DTS_PROJECTION 3 CONSTANT: D3DTS_TEXTURE0 16 @@ -217,7 +217,7 @@ CONSTANT: D3DTS_TEXTURE6 22 CONSTANT: D3DTS_TEXTURE7 23 CONSTANT: D3DTS_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DRENDERSTATETYPE ; +TYPEDEF: int D3DRENDERSTATETYPE CONSTANT: D3DRS_ZENABLE 7 CONSTANT: D3DRS_FILLMODE 8 CONSTANT: D3DRS_SHADEMODE 9 @@ -325,7 +325,7 @@ CONSTANT: D3DRS_FORCE_DWORD 0x7fffffff CONSTANT: D3D_MAX_SIMULTANEOUS_RENDERTARGETS 4 -TYPEDEF: int D3DMATERIALCOLORSOURCE ; +TYPEDEF: int D3DMATERIALCOLORSOURCE CONSTANT: D3DMCS_MATERIAL 0 CONSTANT: D3DMCS_COLOR1 1 CONSTANT: D3DMCS_COLOR2 2 @@ -347,7 +347,7 @@ CONSTANT: D3DCOLORWRITEENABLE_GREEN 2 CONSTANT: D3DCOLORWRITEENABLE_BLUE 4 CONSTANT: D3DCOLORWRITEENABLE_ALPHA 8 -TYPEDEF: int D3DTEXTURESTAGESTATETYPE ; +TYPEDEF: int D3DTEXTURESTAGESTATETYPE CONSTANT: D3DTSS_COLOROP 1 CONSTANT: D3DTSS_COLORARG1 2 CONSTANT: D3DTSS_COLORARG2 3 @@ -368,7 +368,7 @@ CONSTANT: D3DTSS_RESULTARG 28 CONSTANT: D3DTSS_CONSTANT 32 CONSTANT: D3DTSS_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DSAMPLERSTATETYPE ; +TYPEDEF: int D3DSAMPLERSTATETYPE CONSTANT: D3DSAMP_ADDRESSU 1 CONSTANT: D3DSAMP_ADDRESSV 2 CONSTANT: D3DSAMP_ADDRESSW 3 @@ -397,7 +397,7 @@ CONSTANT: D3DTSS_TCI_CAMERASPACEPOSITION 0x00020000 CONSTANT: D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR 0x00030000 CONSTANT: D3DTSS_TCI_SPHEREMAP 0x00040000 -TYPEDEF: int D3DTEXTUREOP ; +TYPEDEF: int D3DTEXTUREOP CONSTANT: D3DTOP_DISABLE 1 CONSTANT: D3DTOP_SELECTARG1 2 CONSTANT: D3DTOP_SELECTARG2 3 @@ -437,7 +437,7 @@ CONSTANT: D3DTA_CONSTANT 0x00000006 CONSTANT: D3DTA_COMPLEMENT 0x00000010 CONSTANT: D3DTA_ALPHAREPLICATE 0x00000020 -TYPEDEF: int D3DTEXTUREFILTERTYPE ; +TYPEDEF: int D3DTEXTUREFILTERTYPE CONSTANT: D3DTEXF_NONE 0 CONSTANT: D3DTEXF_POINT 1 CONSTANT: D3DTEXF_LINEAR 2 @@ -482,7 +482,7 @@ CONSTANT: D3DFVF_LASTBETA_D3DCOLOR 0x8000 CONSTANT: D3DFVF_RESERVED2 0x6000 -TYPEDEF: int D3DDECLUSAGE ; +TYPEDEF: int D3DDECLUSAGE CONSTANT: D3DDECLUSAGE_POSITION 0 CONSTANT: D3DDECLUSAGE_BLENDWEIGHT 1 CONSTANT: D3DDECLUSAGE_BLENDINDICES 2 @@ -513,7 +513,7 @@ ENUM: D3DDECLMETHOD : MAXD3DDECLMETHOD ( -- n ) D3DDECLMETHOD_LOOKUPPRESAMPLED ; inline -TYPEDEF: int D3DDECLTYPE ; +TYPEDEF: int D3DDECLTYPE CONSTANT: D3DDECLTYPE_FLOAT1 0 CONSTANT: D3DDECLTYPE_FLOAT2 1 CONSTANT: D3DDECLTYPE_FLOAT3 2 @@ -542,7 +542,7 @@ STRUCT: D3DVERTEXELEMENT9 { Method BYTE } { Usage BYTE } { UsageIndex BYTE } ; -TYPEDEF: D3DVERTEXELEMENT9* LPD3DVERTEXELEMENT9 ; +TYPEDEF: D3DVERTEXELEMENT9* LPD3DVERTEXELEMENT9 CONSTANT: D3DDP_MAXTEXCOORD 8 @@ -553,7 +553,7 @@ CONSTANT: D3DSI_OPCODE_MASK 0x0000FFFF CONSTANT: D3DSI_INSTLENGTH_MASK 0x0F000000 CONSTANT: D3DSI_INSTLENGTH_SHIFT 24 -TYPEDEF: int D3DSHADER_INSTRUCTION_OPCODE_TYPE ; +TYPEDEF: int D3DSHADER_INSTRUCTION_OPCODE_TYPE CONSTANT: D3DSIO_NOP 0 CONSTANT: D3DSIO_MOV 1 CONSTANT: D3DSIO_ADD 2 @@ -649,7 +649,7 @@ CONSTANT: D3DSP_OPCODESPECIFICCONTROL_SHIFT 16 : D3DSI_TEXLD_PROJECT ( -- n ) 1 D3DSP_OPCODESPECIFICCONTROL_SHIFT shift ; inline : D3DSI_TEXLD_BIAS ( -- n ) 2 D3DSP_OPCODESPECIFICCONTROL_SHIFT shift ; inline -TYPEDEF: int D3DSHADER_COMPARISON ; +TYPEDEF: int D3DSHADER_COMPARISON CONSTANT: D3DSPC_RESERVED0 0 CONSTANT: D3DSPC_GT 1 CONSTANT: D3DSPC_EQ 2 @@ -673,7 +673,7 @@ CONSTANT: D3DSP_DCL_USAGEINDEX_MASK 0x000f0000 CONSTANT: D3DSP_TEXTURETYPE_SHIFT 27 CONSTANT: D3DSP_TEXTURETYPE_MASK 0x78000000 -TYPEDEF: int D3DSAMPLER_TEXTURE_TYPE ; +TYPEDEF: int D3DSAMPLER_TEXTURE_TYPE : D3DSTT_UNKNOWN ( -- n ) 0 D3DSP_TEXTURETYPE_SHIFT shift ; inline : D3DSTT_2D ( -- n ) 2 D3DSP_TEXTURETYPE_SHIFT shift ; inline : D3DSTT_CUBE ( -- n ) 3 D3DSP_TEXTURETYPE_SHIFT shift ; inline @@ -704,7 +704,7 @@ CONSTANT: D3DSP_REGTYPE_SHIFT2 8 CONSTANT: D3DSP_REGTYPE_MASK 0x70000000 CONSTANT: D3DSP_REGTYPE_MASK2 0x00001800 -TYPEDEF: int D3DSHADER_PARAM_REGISTER_TYPE ; +TYPEDEF: int D3DSHADER_PARAM_REGISTER_TYPE CONSTANT: D3DSPR_TEMP 0 CONSTANT: D3DSPR_INPUT 1 CONSTANT: D3DSPR_CONST 2 @@ -729,11 +729,11 @@ CONSTANT: D3DSPR_LABEL 18 CONSTANT: D3DSPR_PREDICATE 19 CONSTANT: D3DSPR_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DSHADER_MISCTYPE_OFFSETS ; +TYPEDEF: int D3DSHADER_MISCTYPE_OFFSETS CONSTANT: D3DSMO_POSITION 0 CONSTANT: D3DSMO_FACE 1 -TYPEDEF: int D3DVS_RASTOUT_OFFSETS ; +TYPEDEF: int D3DVS_RASTOUT_OFFSETS CONSTANT: D3DSRO_POSITION 0 CONSTANT: D3DSRO_FOG 1 CONSTANT: D3DSRO_POINT_SIZE 2 @@ -742,7 +742,7 @@ CONSTANT: D3DSRO_FORCE_DWORD 0x7fffffff CONSTANT: D3DVS_ADDRESSMODE_SHIFT 13 : D3DVS_ADDRESSMODE_MASK ( -- n ) 1 D3DVS_ADDRESSMODE_SHIFT shift ; inline -TYPEDEF: int D3DVS_ADDRESSMODE_TYPE ; +TYPEDEF: int D3DVS_ADDRESSMODE_TYPE : D3DVS_ADDRMODE_ABSOLUTE ( -- n ) 0 D3DVS_ADDRESSMODE_SHIFT shift ; inline : D3DVS_ADDRMODE_RELATIVE ( -- n ) 1 D3DVS_ADDRESSMODE_SHIFT shift ; inline CONSTANT: D3DVS_ADDRMODE_FORCE_DWORD 0x7fffffff @@ -750,7 +750,7 @@ CONSTANT: D3DVS_ADDRMODE_FORCE_DWORD 0x7fffffff CONSTANT: D3DSHADER_ADDRESSMODE_SHIFT 13 : D3DSHADER_ADDRESSMODE_MASK ( -- n ) 1 D3DSHADER_ADDRESSMODE_SHIFT shift ; inline -TYPEDEF: int D3DSHADER_ADDRESSMODE_TYPE ; +TYPEDEF: int D3DSHADER_ADDRESSMODE_TYPE : D3DSHADER_ADDRMODE_ABSOLUTE ( -- n ) 0 D3DSHADER_ADDRESSMODE_SHIFT shift ; inline : D3DSHADER_ADDRMODE_RELATIVE ( -- n ) 1 D3DSHADER_ADDRESSMODE_SHIFT shift ; inline CONSTANT: D3DSHADER_ADDRMODE_FORCE_DWORD 0x7fffffff @@ -785,7 +785,7 @@ CONSTANT: D3DSP_SWIZZLE_MASK 0x00FF0000 CONSTANT: D3DSP_SRCMOD_SHIFT 24 CONSTANT: D3DSP_SRCMOD_MASK 0x0F000000 -TYPEDEF: int D3DSHADER_PARAM_SRCMOD_TYPE ; +TYPEDEF: int D3DSHADER_PARAM_SRCMOD_TYPE CONSTANT: D3DSPSM_NONE $$[ 0 24 shift ] CONSTANT: D3DSPSM_NEG $$[ 1 24 shift ] CONSTANT: D3DSPSM_BIAS $$[ 2 24 shift ] @@ -818,31 +818,31 @@ CONSTANT: D3DSI_COMMENTSIZE_MASK 0x7FFF0000 CONSTANT: D3DPS_END() 0x0000FFFF CONSTANT: D3DVS_END() 0x0000FFFF -TYPEDEF: int D3DBASISTYPE ; +TYPEDEF: int D3DBASISTYPE CONSTANT: D3DBASIS_BEZIER 0 CONSTANT: D3DBASIS_BSPLINE 1 CONSTANT: D3DBASIS_CATMULL_ROM 2 CONSTANT: D3DBASIS_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DDEGREETYPE ; +TYPEDEF: int D3DDEGREETYPE CONSTANT: D3DDEGREE_LINEAR 1 CONSTANT: D3DDEGREE_QUADRATIC 2 CONSTANT: D3DDEGREE_CUBIC 3 CONSTANT: D3DDEGREE_QUINTIC 5 CONSTANT: D3DDEGREE_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DPATCHEDGESTYLE ; +TYPEDEF: int D3DPATCHEDGESTYLE CONSTANT: D3DPATCHEDGE_DISCRETE 0 CONSTANT: D3DPATCHEDGE_CONTINUOUS 1 CONSTANT: D3DPATCHEDGE_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DSTATEBLOCKTYPE ; +TYPEDEF: int D3DSTATEBLOCKTYPE CONSTANT: D3DSBT_ALL 1 CONSTANT: D3DSBT_PIXELSTATE 2 CONSTANT: D3DSBT_VERTEXSTATE 3 CONSTANT: D3DSBT_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DVERTEXBLENDFLAGS ; +TYPEDEF: int D3DVERTEXBLENDFLAGS CONSTANT: D3DVBF_DISABLE 0 CONSTANT: D3DVBF_1WEIGHTS 1 CONSTANT: D3DVBF_2WEIGHTS 2 @@ -851,7 +851,7 @@ CONSTANT: D3DVBF_TWEENING 255 CONSTANT: D3DVBF_0WEIGHTS 256 CONSTANT: D3DVBF_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DTEXTURETRANSFORMFLAGS ; +TYPEDEF: int D3DTEXTURETRANSFORMFLAGS CONSTANT: D3DTTFF_DISABLE 0 CONSTANT: D3DTTFF_COUNT1 1 CONSTANT: D3DTTFF_COUNT2 2 @@ -874,14 +874,14 @@ CONSTANT: D3DFVF_TEXTUREFORMAT4 2 : D3DFVF_TEXCOORDSIZE1 ( CoordIndex -- n ) 2 * 16 + D3DFVF_TEXTUREFORMAT1 swap shift ; inline -TYPEDEF: int D3DDEVTYPE ; +TYPEDEF: int D3DDEVTYPE CONSTANT: D3DDEVTYPE_HAL 1 CONSTANT: D3DDEVTYPE_REF 2 CONSTANT: D3DDEVTYPE_SW 3 CONSTANT: D3DDEVTYPE_NULLREF 4 CONSTANT: D3DDEVTYPE_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DMULTISAMPLE_TYPE ; +TYPEDEF: int D3DMULTISAMPLE_TYPE CONSTANT: D3DMULTISAMPLE_NONE 0 CONSTANT: D3DMULTISAMPLE_NONMASKABLE 1 CONSTANT: D3DMULTISAMPLE_2_SAMPLES 2 @@ -901,7 +901,7 @@ CONSTANT: D3DMULTISAMPLE_15_SAMPLES 15 CONSTANT: D3DMULTISAMPLE_16_SAMPLES 16 CONSTANT: D3DMULTISAMPLE_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DFORMAT ; +TYPEDEF: int D3DFORMAT CONSTANT: D3DFMT_UNKNOWN 0 CONSTANT: D3DFMT_R8G8B8 20 CONSTANT: D3DFMT_A8R8G8B8 21 @@ -981,7 +981,7 @@ STRUCT: D3DDEVICE_CREATION_PARAMETERS { hFocusWindow HWND } { BehaviorFlags DWORD } ; -TYPEDEF: int D3DSWAPEFFECT ; +TYPEDEF: int D3DSWAPEFFECT CONSTANT: D3DSWAPEFFECT_DISCARD 1 CONSTANT: D3DSWAPEFFECT_FLIP 2 CONSTANT: D3DSWAPEFFECT_COPY 3 @@ -989,7 +989,7 @@ CONSTANT: D3DSWAPEFFECT_OVERLAY 4 CONSTANT: D3DSWAPEFFECT_FLIPEX 5 CONSTANT: D3DSWAPEFFECT_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DPOOL ; +TYPEDEF: int D3DPOOL CONSTANT: D3DPOOL_DEFAULT 0 CONSTANT: D3DPOOL_MANAGED 1 CONSTANT: D3DPOOL_SYSTEMMEM 2 @@ -1032,13 +1032,13 @@ STRUCT: D3DGAMMARAMP { green WORD[256] } { blue WORD[256] } ; -TYPEDEF: int D3DBACKBUFFER_TYPE ; +TYPEDEF: int D3DBACKBUFFER_TYPE CONSTANT: D3DBACKBUFFER_TYPE_MONO 0 CONSTANT: D3DBACKBUFFER_TYPE_LEFT 1 CONSTANT: D3DBACKBUFFER_TYPE_RIGHT 2 CONSTANT: D3DBACKBUFFER_TYPE_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DRESOURCETYPE ; +TYPEDEF: int D3DRESOURCETYPE CONSTANT: D3DRTYPE_SURFACE 1 CONSTANT: D3DRTYPE_VOLUME 2 CONSTANT: D3DRTYPE_TEXTURE 3 @@ -1077,7 +1077,7 @@ CONSTANT: D3DUSAGE_RESTRICTED_CONTENT 0x00000800 CONSTANT: D3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 CONSTANT: D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER 0x00001000 -TYPEDEF: int D3DCUBEMAP_FACES ; +TYPEDEF: int D3DCUBEMAP_FACES CONSTANT: D3DCUBEMAP_FACE_POSITIVE_X 0 CONSTANT: D3DCUBEMAP_FACE_NEGATIVE_X 1 CONSTANT: D3DCUBEMAP_FACE_POSITIVE_Y 2 @@ -1183,12 +1183,12 @@ STRUCT: D3DRASTER_STATUS { InVBlank BOOL } { ScanLine UINT } ; -TYPEDEF: int D3DDEBUGMONITORTOKENS ; +TYPEDEF: int D3DDEBUGMONITORTOKENS CONSTANT: D3DDMT_ENABLE 0 CONSTANT: D3DDMT_DISABLE 1 CONSTANT: D3DDMT_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DQUERYTYPE ; +TYPEDEF: int D3DQUERYTYPE CONSTANT: D3DQUERYTYPE_VCACHE 4 CONSTANT: D3DQUERYTYPE_RESOURCEMANAGER 5 CONSTANT: D3DQUERYTYPE_VERTEXSTATS 6 @@ -1227,19 +1227,19 @@ CONSTANT: D3DRTYPECOUNT 8 STRUCT: D3DDEVINFO_RESOURCEMANAGER { stats D3DRESOURCESTATS[8] } ; -TYPEDEF: D3DDEVINFO_RESOURCEMANAGER* LPD3DDEVINFO_RESOURCEMANAGER ; +TYPEDEF: D3DDEVINFO_RESOURCEMANAGER* LPD3DDEVINFO_RESOURCEMANAGER STRUCT: D3DDEVINFO_D3DVERTEXSTATS { NumRenderedTriangles DWORD } { NumExtraClippingTriangles DWORD } ; -TYPEDEF: D3DDEVINFO_D3DVERTEXSTATS* LPD3DDEVINFO_D3DVERTEXSTATS ; +TYPEDEF: D3DDEVINFO_D3DVERTEXSTATS* LPD3DDEVINFO_D3DVERTEXSTATS STRUCT: D3DDEVINFO_VCACHE { Pattern DWORD } { OptMethod DWORD } { CacheSize DWORD } { MagicNumber DWORD } ; -TYPEDEF: D3DDEVINFO_VCACHE* LPD3DDEVINFO_VCACHE ; +TYPEDEF: D3DDEVINFO_VCACHE* LPD3DDEVINFO_VCACHE STRUCT: D3DDEVINFO_D3D9PIPELINETIMINGS { VertexProcessingTimePercent FLOAT } @@ -1274,7 +1274,7 @@ STRUCT: D3DMEMORYPRESSURE { SizeOfInefficientAllocation UINT64 } { LevelOfEfficiency DWORD } ; -TYPEDEF: int D3DCOMPOSERECTSOP ; +TYPEDEF: int D3DCOMPOSERECTSOP CONSTANT: D3DCOMPOSERECTS_COPY 1 CONSTANT: D3DCOMPOSERECTS_OR 2 CONSTANT: D3DCOMPOSERECTS_AND 3 @@ -1306,7 +1306,7 @@ STRUCT: D3DPRESENTSTATS { SyncQPCTime LARGE_INTEGER } { SyncGPUTime LARGE_INTEGER } ; -TYPEDEF: int D3DSCANLINEORDERING ; +TYPEDEF: int D3DSCANLINEORDERING CONSTANT: D3DSCANLINEORDERING_UNKNOWN 0 CONSTANT: D3DSCANLINEORDERING_PROGRESSIVE 1 CONSTANT: D3DSCANLINEORDERING_INTERLACED 2 @@ -1324,7 +1324,7 @@ STRUCT: D3DDISPLAYMODEFILTER { Format D3DFORMAT } { ScanLineOrdering D3DSCANLINEORDERING } ; -TYPEDEF: int D3DDISPLAYROTATION ; +TYPEDEF: int D3DDISPLAYROTATION CONSTANT: D3DDISPLAYROTATION_IDENTITY 1 CONSTANT: D3DDISPLAYROTATION_90 2 CONSTANT: D3DDISPLAYROTATION_180 3 @@ -1341,7 +1341,7 @@ CONSTANT: D3D_OMAC_SIZE 16 STRUCT: D3D_OMAC { Omac BYTE[D3D_OMAC_SIZE] } ; -TYPEDEF: int D3DAUTHENTICATEDCHANNELTYPE ; +TYPEDEF: int D3DAUTHENTICATEDCHANNELTYPE CONSTANT: D3DAUTHENTICATEDCHANNEL_D3D9 1 CONSTANT: D3DAUTHENTICATEDCHANNEL_DRIVER_SOFTWARE 2 CONSTANT: D3DAUTHENTICATEDCHANNEL_DRIVER_HARDWARE 3 @@ -1391,7 +1391,7 @@ STRUCT: D3DAUTHENTICATEDCHANNEL_QUERYRESTRICTEDSHAREDRESOURCEPROCESS_INPUT { Input D3DAUTHENTICATEDCHANNEL_QUERY_INPUT } { ProcessIndex UINT } ; -TYPEDEF: int D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE ; +TYPEDEF: int D3DAUTHENTICATEDCHANNEL_PROCESSIDENTIFIERTYPE CONSTANT: PROCESSIDTYPE_UNKNOWN 0 CONSTANT: PROCESSIDTYPE_DWM 1 CONSTANT: PROCESSIDTYPE_HANDLE 2 @@ -1430,7 +1430,7 @@ STRUCT: D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_OUTPUT { OutputIDIndex UINT } { OutputID UINT64 } ; -TYPEDEF: int D3DBUSTYPE ; +TYPEDEF: int D3DBUSTYPE CONSTANT: D3DBUSTYPE_OTHER 0x00000000 CONSTANT: D3DBUSTYPE_PCI 0x00000001 CONSTANT: D3DBUSTYPE_PCIX 0x00000002 diff --git a/ffi/windows/directx/d3dcommon/d3dcommon.factor b/ffi/windows/directx/d3dcommon/d3dcommon.factor index a60d65939f..1acdf21ee5 100644 --- a/ffi/windows/directx/d3dcommon/d3dcommon.factor +++ b/ffi/windows/directx/d3dcommon/d3dcommon.factor @@ -7,7 +7,7 @@ CONSTANT: D3D_DRIVER_TYPE_REFERENCE 2 CONSTANT: D3D_DRIVER_TYPE_NULL 3 CONSTANT: D3D_DRIVER_TYPE_SOFTWARE 4 CONSTANT: D3D_DRIVER_TYPE_WARP 5 -TYPEDEF: int D3D_DRIVER_TYPE ; +TYPEDEF: int D3D_DRIVER_TYPE CONSTANT: D3D_FEATURE_LEVEL_9_1 0x9100 CONSTANT: D3D_FEATURE_LEVEL_9_2 0x9200 @@ -15,4 +15,4 @@ CONSTANT: D3D_FEATURE_LEVEL_9_3 0x9300 CONSTANT: D3D_FEATURE_LEVEL_10_0 0xa000 CONSTANT: D3D_FEATURE_LEVEL_10_1 0xa100 CONSTANT: D3D_FEATURE_LEVEL_11_0 0xb000 -TYPEDEF: int D3D_FEATURE_LEVEL ; +TYPEDEF: int D3D_FEATURE_LEVEL diff --git a/ffi/windows/directx/d3dcompiler/d3dcompiler.factor b/ffi/windows/directx/d3dcompiler/d3dcompiler.factor index 56dfaa7e87..9ef94a4832 100644 --- a/ffi/windows/directx/d3dcompiler/d3dcompiler.factor +++ b/ffi/windows/directx/d3dcompiler/d3dcompiler.factor @@ -5,9 +5,9 @@ LIBRARY: d3dcompiler C-TYPE: D3D_SHADER_MACRO C-TYPE: ID3DBlob -TYPEDEF: ID3DBlob* LPD3DBLOB ; +TYPEDEF: ID3DBlob* LPD3DBLOB C-TYPE: ID3DInclude -TYPEDEF: ID3DInclude* LPD3DINCLUDE ; +TYPEDEF: ID3DInclude* LPD3DINCLUDE C-TYPE: ID3D10Effect FUNCTION: HRESULT D3DCompile ( @@ -79,7 +79,7 @@ CONSTANT: D3DCOMPILER_STRIP_REFLECTION_DATA 1 CONSTANT: D3DCOMPILER_STRIP_DEBUG_INFO 2 CONSTANT: D3DCOMPILER_STRIP_TEST_BLOBS 4 CONSTANT: D3DCOMPILER_STRIP_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DCOMPILER_STRIP_FLAGS ; +TYPEDEF: int D3DCOMPILER_STRIP_FLAGS FUNCTION: HRESULT D3DStripShader ( LPCVOID pShaderBytecode, diff --git a/ffi/windows/directx/d3dcsx/d3dcsx.factor b/ffi/windows/directx/d3dcsx/d3dcsx.factor index 4b725c5106..218010c49a 100644 --- a/ffi/windows/directx/d3dcsx/d3dcsx.factor +++ b/ffi/windows/directx/d3dcsx/d3dcsx.factor @@ -7,7 +7,7 @@ LIBRARY: d3dcsx CONSTANT: D3DX11_SCAN_DATA_TYPE_FLOAT 1 CONSTANT: D3DX11_SCAN_DATA_TYPE_INT 2 CONSTANT: D3DX11_SCAN_DATA_TYPE_UINT 3 -TYPEDEF: int D3DX11_SCAN_DATA_TYPE ; +TYPEDEF: int D3DX11_SCAN_DATA_TYPE CONSTANT: D3DX11_SCAN_OPCODE_ADD 1 CONSTANT: D3DX11_SCAN_OPCODE_MIN 2 @@ -16,11 +16,11 @@ CONSTANT: D3DX11_SCAN_OPCODE_MUL 4 CONSTANT: D3DX11_SCAN_OPCODE_AND 5 CONSTANT: D3DX11_SCAN_OPCODE_OR 6 CONSTANT: D3DX11_SCAN_OPCODE_XOR 7 -TYPEDEF: int D3DX11_SCAN_OPCODE ; +TYPEDEF: int D3DX11_SCAN_OPCODE CONSTANT: D3DX11_SCAN_DIRECTION_FORWARD 1 CONSTANT: D3DX11_SCAN_DIRECTION_BACKWARD 2 -TYPEDEF: int D3DX11_SCAN_DIRECTION ; +TYPEDEF: int D3DX11_SCAN_DIRECTION COM-INTERFACE: ID3DX11Scan IUnknown "{5089b68f-e71d-4d38-be8e-f363b95a9405}" HRESULT SetScanDirection ( D3DX11_SCAN_DIRECTION Direction ) @@ -55,7 +55,7 @@ ENUM: D3DX11_FFT_DATA_TYPE CONSTANT: D3DX11_FFT_DIM_MASK_1D 1 CONSTANT: D3DX11_FFT_DIM_MASK_2D 3 CONSTANT: D3DX11_FFT_DIM_MASK_3D 7 -TYPEDEF: int D3DX11_FFT_DIM_MASK ; +TYPEDEF: int D3DX11_FFT_DIM_MASK STRUCT: D3DX11_FFT_DESC { NumDimensions UINT } @@ -70,7 +70,7 @@ STRUCT: D3DX11_FFT_BUFFER_INFO { PrecomputeBufferFloatSizes UINT[D3DX11_FFT_MAX_PRECOMPUTE_BUFFERS] } ; CONSTANT: D3DX11_FFT_CREATE_FLAG_NO_PRECOMPUTE_BUFFERS 1 -TYPEDEF: int D3DX11_FFT_CREATE_FLAG ; +TYPEDEF: int D3DX11_FFT_CREATE_FLAG FUNCTION: HRESULT D3DX11CreateFFT ( ID3D11DeviceContext* pDeviceContext, D3DX11_FFT_DESC* pDesc, UINT Flags, D3DX11_FFT_BUFFER_INFO* pBufferInfo, ID3DX11FFT** ppFFT ) ; FUNCTION: HRESULT D3DX11CreateFFT1DReal ( ID3D11DeviceContext* pDeviceContext, UINT X, UINT Flags, D3DX11_FFT_BUFFER_INFO* pBufferInfo, ID3DX11FFT** ppFFT ) ; diff --git a/ffi/windows/directx/d3dx10core/d3dx10core.factor b/ffi/windows/directx/d3dx10core/d3dx10core.factor index 1a6b10ec4b..d597d7ac50 100644 --- a/ffi/windows/directx/d3dx10core/d3dx10core.factor +++ b/ffi/windows/directx/d3dx10core/d3dx10core.factor @@ -35,7 +35,7 @@ CONSTANT: D3DX10_SPRITE_SORT_DEPTH_BACK_TO_FRONT 0x02 CONSTANT: D3DX10_SPRITE_SORT_DEPTH_FRONT_TO_BACK 0x04 CONSTANT: D3DX10_SPRITE_SAVE_STATE 0x08 CONSTANT: D3DX10_SPRITE_ADDREF_TEXTURES 0x10 -TYPEDEF: int D3DX10_SPRITE_FLAG ; +TYPEDEF: int D3DX10_SPRITE_FLAG STRUCT: D3DX10_SPRITE { matWorld D3DXMATRIX } @@ -46,7 +46,7 @@ STRUCT: D3DX10_SPRITE { TextureIndex UINT } ; C-TYPE: ID3DX10Sprite -TYPEDEF: ID3DX10Sprite* LPD3DX10SPRITE ; +TYPEDEF: ID3DX10Sprite* LPD3DX10SPRITE COM-INTERFACE: ID3DX10Sprite IUnknown "{BA0B762D-8D28-43ec-B9DC-2F84443B0614}" HRESULT Begin ( UINT flags ) @@ -132,7 +132,7 @@ COM-INTERFACE: ID3DX10Font IUnknown "{D79DBB70-5F21-4d36-BBC2-FF525C213CDC}"" HRESULT PreloadTextW ( LPCWSTR pString, INT Count ) INT DrawTextA ( LPD3DX10SPRITE pSprite, LPCSTR pString, INT Count, LPRECT pRect, UINT Format, D3DXCOLOR Color ) INT DrawTextW ( LPD3DX10SPRITE pSprite, LPCWSTR pString, INT Count, LPRECT pRect, UINT Format, D3DXCOLOR Color ) ; -TYPEDEF: ID3DX10Font* LPD3DX10FONT ; +TYPEDEF: ID3DX10Font* LPD3DX10FONT FUNCTION: HRESULT D3DX10CreateFontA ( diff --git a/ffi/windows/directx/d3dx10math/d3dx10math.factor b/ffi/windows/directx/d3dx10math/d3dx10math.factor index e816f3c3c1..9a244d941f 100644 --- a/ffi/windows/directx/d3dx10math/d3dx10math.factor +++ b/ffi/windows/directx/d3dx10math/d3dx10math.factor @@ -12,7 +12,7 @@ STRUCT: D3DMATRIX STRUCT: D3DXFLOAT16 { value WORD } ; -TYPEDEF: D3DMATRIX D3DXMATRIX ; +TYPEDEF: D3DMATRIX D3DXMATRIX STRUCT: D3DXVECTOR2 { x FLOAT } @@ -22,7 +22,7 @@ STRUCT: D3DXVECTOR2_16F { x D3DXFLOAT16 } { y D3DXFLOAT16 } ; -TYPEDEF: D3DVECTOR D3DXVECTOR3 ; +TYPEDEF: D3DVECTOR D3DXVECTOR3 STRUCT: D3DXVECTOR3_16F { x D3DXFLOAT16 } diff --git a/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor b/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor index 858e7250cf..4d6806fe48 100644 --- a/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor +++ b/ffi/windows/directx/d3dx10mesh/d3dx10mesh.factor @@ -8,7 +8,7 @@ LIBRARY: d3dx10 CONSTANT: D3DX10_MESH_32_BIT 1 CONSTANT: D3DX10_MESH_GS_ADJACENCY 4 -TYPEDEF: int D3DX10_MESH ; +TYPEDEF: int D3DX10_MESH STRUCT: D3DX10_ATTRIBUTE_RANGE { AttribId UINT } @@ -17,14 +17,14 @@ STRUCT: D3DX10_ATTRIBUTE_RANGE { VertexStart UINT } { VertexCount UINT } ; -TYPEDEF: D3DX10_ATTRIBUTE_RANGE* LPD3DX10_ATTRIBUTE_RANGE ; +TYPEDEF: D3DX10_ATTRIBUTE_RANGE* LPD3DX10_ATTRIBUTE_RANGE CONSTANT: D3DX10_MESH_DISCARD_ATTRIBUTE_BUFFER 0x01 CONSTANT: D3DX10_MESH_DISCARD_ATTRIBUTE_TABLE 0x02 CONSTANT: D3DX10_MESH_DISCARD_POINTREPS 0x04 CONSTANT: D3DX10_MESH_DISCARD_ADJACENCY 0x08 CONSTANT: D3DX10_MESH_DISCARD_DEVICE_BUFFERS 0x10 -TYPEDEF: int D3DX10_MESH_DISCARD_FLAGS ; +TYPEDEF: int D3DX10_MESH_DISCARD_FLAGS STRUCT: D3DX10_WELD_EPSILONS { Position FLOAT } @@ -38,14 +38,14 @@ STRUCT: D3DX10_WELD_EPSILONS { Binormal FLOAT } { TessFactor FLOAT } ; -TYPEDEF: D3DX10_WELD_EPSILONS* LPD3DX10_WELD_EPSILONS ; +TYPEDEF: D3DX10_WELD_EPSILONS* LPD3DX10_WELD_EPSILONS STRUCT: D3DX10_INTERSECT_INFO { FaceIndex UINT } { U FLOAT } { V FLOAT } { Dist FLOAT } ; -TYPEDEF: D3DX10_INTERSECT_INFO* LPD3DX10_INTERSECT_INFO ; +TYPEDEF: D3DX10_INTERSECT_INFO* LPD3DX10_INTERSECT_INFO COM-INTERFACE: ID3DX10MeshBuffer IUnknown "{04B0D117-1041-46b1-AA8A-3952848BA22E}" HRESULT Map ( void** ppData, SIZE_T* pSize ) @@ -133,7 +133,7 @@ COM-INTERFACE: ID3DX10SkinInfo IUnknown "{420BD604-1C76-4a34-A466-E45D0658A32C}" HRESULT Compact ( UINT MaxPerVertexInfluences, UINT ScaleMode, float MinWeight ) HRESULT DoSoftwareSkinning ( UINT StartVertex, UINT VertexCount, void* pSrcVertices, UINT SrcStride, void* pDestVertices, UINT DestStride, D3DXMATRIX* pBoneMatrices, D3DXMATRIX* pInverseTransposeBoneMatrices, D3DX10_SKINNING_CHANNEL* pChannelDescs, UINT NumChannels ) ; -TYPEDEF: ID3DX10SkinInfo* LPD3DX10SKININFO ; +TYPEDEF: ID3DX10SkinInfo* LPD3DX10SKININFO FUNCTION: HRESULT D3DX10CreateSkinInfo ( LPD3DX10SKININFO* ppSkinInfo ) ; diff --git a/ffi/windows/directx/d3dx10tex/d3dx10tex.factor b/ffi/windows/directx/d3dx10tex/d3dx10tex.factor index ed062dcefd..fc748f3ec6 100644 --- a/ffi/windows/directx/d3dx10tex/d3dx10tex.factor +++ b/ffi/windows/directx/d3dx10tex/d3dx10tex.factor @@ -23,21 +23,21 @@ CONSTANT: D3DX10_FILTER_DITHER_DIFFUSION 0x00100000 CONSTANT: D3DX10_FILTER_SRGB_IN 0x00200000 CONSTANT: D3DX10_FILTER_SRGB_OUT 0x00400000 CONSTANT: D3DX10_FILTER_SRGB 0x00600000 -TYPEDEF: int D3DX10_FILTER_FLAG ; +TYPEDEF: int D3DX10_FILTER_FLAG CONSTANT: D3DX10_NORMALMAP_MIRROR_U 0x00010000 CONSTANT: D3DX10_NORMALMAP_MIRROR_V 0x00020000 CONSTANT: D3DX10_NORMALMAP_MIRROR 0x00030000 CONSTANT: D3DX10_NORMALMAP_INVERTSIGN 0x00080000 CONSTANT: D3DX10_NORMALMAP_COMPUTE_OCCLUSION 0x00100000 -TYPEDEF: int D3DX10_NORMALMAP_FLAG ; +TYPEDEF: int D3DX10_NORMALMAP_FLAG CONSTANT: D3DX10_CHANNEL_RED 1 CONSTANT: D3DX10_CHANNEL_BLUE 2 CONSTANT: D3DX10_CHANNEL_GREEN 4 CONSTANT: D3DX10_CHANNEL_ALPHA 8 CONSTANT: D3DX10_CHANNEL_LUMINANCE 16 -TYPEDEF: int D3DX10_CHANNEL_FLAG ; +TYPEDEF: int D3DX10_CHANNEL_FLAG CONSTANT: D3DX10_IFF_BMP 0 CONSTANT: D3DX10_IFF_JPG 1 @@ -47,10 +47,10 @@ CONSTANT: D3DX10_IFF_TIFF 10 CONSTANT: D3DX10_IFF_GIF 11 CONSTANT: D3DX10_IFF_WMP 12 CONSTANT: D3DX10_IFF_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DX10_IMAGE_FILE_FORMAT ; +TYPEDEF: int D3DX10_IMAGE_FILE_FORMAT CONSTANT: D3DX10_STF_USEINPUTBLOB 1 -TYPEDEF: int D3DX10_SAVE_TEXTURE_FLAG ; +TYPEDEF: int D3DX10_SAVE_TEXTURE_FLAG STRUCT: D3DX10_IMAGE_INFO { Width UINT } diff --git a/ffi/windows/directx/d3dx11tex/d3dx11tex.factor b/ffi/windows/directx/d3dx11tex/d3dx11tex.factor index 1e686fa2cd..43f77e368b 100644 --- a/ffi/windows/directx/d3dx11tex/d3dx11tex.factor +++ b/ffi/windows/directx/d3dx11tex/d3dx11tex.factor @@ -22,21 +22,21 @@ CONSTANT: D3DX11_FILTER_DITHER_DIFFUSION 0x00100000 CONSTANT: D3DX11_FILTER_SRGB_IN 0x00200000 CONSTANT: D3DX11_FILTER_SRGB_OUT 0x00400000 CONSTANT: D3DX11_FILTER_SRGB 0x00600000 -TYPEDEF: int D3DX11_FILTER_FLAG ; +TYPEDEF: int D3DX11_FILTER_FLAG CONSTANT: D3DX11_NORMALMAP_MIRROR_U 0x00010000 CONSTANT: D3DX11_NORMALMAP_MIRROR_V 0x00020000 CONSTANT: D3DX11_NORMALMAP_MIRROR 0x00030000 CONSTANT: D3DX11_NORMALMAP_INVERTSIGN 0x00080000 CONSTANT: D3DX11_NORMALMAP_COMPUTE_OCCLUSION 0x00100000 -TYPEDEF: int D3DX11_NORMALMAP_FLAG ; +TYPEDEF: int D3DX11_NORMALMAP_FLAG CONSTANT: D3DX11_CHANNEL_RED 1 CONSTANT: D3DX11_CHANNEL_BLUE 2 CONSTANT: D3DX11_CHANNEL_GREEN 4 CONSTANT: D3DX11_CHANNEL_ALPHA 8 CONSTANT: D3DX11_CHANNEL_LUMINANCE 16 -TYPEDEF: int D3DX11_CHANNEL_FLAG ; +TYPEDEF: int D3DX11_CHANNEL_FLAG CONSTANT: D3DX11_IFF_BMP 0 CONSTANT: D3DX11_IFF_JPG 1 @@ -46,10 +46,10 @@ CONSTANT: D3DX11_IFF_TIFF 10 CONSTANT: D3DX11_IFF_GIF 11 CONSTANT: D3DX11_IFF_WMP 12 CONSTANT: D3DX11_IFF_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DX11_IMAGE_FILE_FORMAT ; +TYPEDEF: int D3DX11_IMAGE_FILE_FORMAT CONSTANT: D3DX11_STF_USEINPUTBLOB 1 -TYPEDEF: int D3DX11_SAVE_TEXTURE_FLAG ; +TYPEDEF: int D3DX11_SAVE_TEXTURE_FLAG STRUCT: D3DX11_IMAGE_INFO { Width UINT } diff --git a/ffi/windows/directx/d3dx9anim/d3dx9anim.factor b/ffi/windows/directx/d3dx9anim/d3dx9anim.factor index 4ebc79de13..9db8a1ae37 100644 --- a/ffi/windows/directx/d3dx9anim/d3dx9anim.factor +++ b/ffi/windows/directx/d3dx9anim/d3dx9anim.factor @@ -7,7 +7,7 @@ IN: windows.directx.d3dx9anim LIBRARY: d3dx9 -TYPEDEF: int D3DXMESHDATATYPE ; +TYPEDEF: int D3DXMESHDATATYPE CONSTANT: D3DXMESHTYPE_MESH 1 CONSTANT: D3DXMESHTYPE_PMESH 2 CONSTANT: D3DXMESHTYPE_PATCHMESH 3 @@ -16,7 +16,7 @@ CONSTANT: D3DXMESHTYPE_FORCE_DWORD 0x7fffffff STRUCT: D3DXMESHDATA { Type D3DXMESHDATATYPE } { Mesh void* } ; -TYPEDEF: D3DXMESHDATA* LPD3DXMESHDATA ; +TYPEDEF: D3DXMESHDATA* LPD3DXMESHDATA STRUCT: D3DXMESHCONTAINER { Name LPSTR } @@ -27,7 +27,7 @@ STRUCT: D3DXMESHCONTAINER { pAdjacency DWORD* } { pSkinInfo LPD3DXSKININFO } { pNextMeshContainer D3DXMESHCONTAINER* } ; -TYPEDEF: D3DXMESHCONTAINER* LPD3DXMESHCONTAINER ; +TYPEDEF: D3DXMESHCONTAINER* LPD3DXMESHCONTAINER STRUCT: D3DXFRAME { Name LPSTR } @@ -35,10 +35,10 @@ STRUCT: D3DXFRAME { pMeshContainer LPD3DXMESHCONTAINER } { pFrameSibling D3DXFRAME* } { pFrameFirstChild D3DXFRAME* } ; -TYPEDEF: D3DXFRAME* LPD3DXFRAME ; +TYPEDEF: D3DXFRAME* LPD3DXFRAME C-TYPE: ID3DXAllocateHierarchy -TYPEDEF: ID3DXAllocateHierarchy* LPD3DXALLOCATEHIERARCHY ; +TYPEDEF: ID3DXAllocateHierarchy* LPD3DXALLOCATEHIERARCHY COM-INTERFACE: ID3DXAllocateHierarchy f "{00000000-0000-0000-0000-000000000000}" HRESULT CreateFrame ( LPCSTR Name, LPD3DXFRAME* ppNewFrame ) @@ -55,7 +55,7 @@ COM-INTERFACE: ID3DXAllocateHierarchy f "{00000000-0000-0000-0000-000000000000}" HRESULT DestroyMeshContainer ( LPD3DXMESHCONTAINER pMeshContainerToFree ) ; C-TYPE: ID3DXLoadUserData -TYPEDEF: ID3DXLoadUserData* LPD3DXLOADUSERDATA ; +TYPEDEF: ID3DXLoadUserData* LPD3DXLOADUSERDATA COM-INTERFACE: ID3DXLoadUserData f "{00000000-0000-0000-0000-000000000000}" HRESULT LoadTopLevelData ( LPD3DXFILEDATA pXofChildData ) @@ -65,7 +65,7 @@ COM-INTERFACE: ID3DXLoadUserData f "{00000000-0000-0000-0000-000000000000}" LPD3DXFILEDATA pXofChildData ) ; C-TYPE: ID3DXSaveUserData -TYPEDEF: ID3DXSaveUserData* LPD3DXSAVEUSERDATA ; +TYPEDEF: ID3DXSaveUserData* LPD3DXSAVEUSERDATA COM-INTERFACE: ID3DXSaveUserData f "{00000000-0000-0000-0000-000000000000}" HRESULT AddFrameChildData ( @@ -82,13 +82,13 @@ COM-INTERFACE: ID3DXSaveUserData f "{00000000-0000-0000-0000-000000000000}" HRESULT RegisterTemplates ( LPD3DXFILE pXFileApi ) HRESULT SaveTemplates ( LPD3DXFILESAVEOBJECT pXofSave ) ; -TYPEDEF: int D3DXCALLBACK_SEARCH_FLAGS ; +TYPEDEF: int D3DXCALLBACK_SEARCH_FLAGS CONSTANT: D3DXCALLBACK_SEARCH_EXCLUDING_INITIAL_POSITION 1 CONSTANT: D3DXCALLBACK_SEARCH_BEHIND_INITIAL_POSITION 2 CONSTANT: D3DXCALLBACK_SEARCH_FORCE_DWORD 0x7fffffff C-TYPE: ID3DXAnimationSet -TYPEDEF: ID3DXAnimationSet* LPD3DXANIMATIONSET ; +TYPEDEF: ID3DXAnimationSet* LPD3DXANIMATIONSET COM-INTERFACE: ID3DXAnimationSet IUnknown "{698CFB3F-9289-4d95-9A57-33A94B5A65F9}" LPCSTR GetName ( ) @@ -109,7 +109,7 @@ COM-INTERFACE: ID3DXAnimationSet IUnknown "{698CFB3F-9289-4d95-9A57-33A94B5A65F9 double* pCallbackPosition, LPVOID* ppCallbackData ) ; -TYPEDEF: int D3DXPLAYBACK_TYPE ; +TYPEDEF: int D3DXPLAYBACK_TYPE CONSTANT: D3DXPLAY_LOOP 0 CONSTANT: D3DXPLAY_ONCE 1 CONSTANT: D3DXPLAY_PINGPONG 2 @@ -118,24 +118,24 @@ CONSTANT: D3DXPLAY_FORCE_DWORD 0x7fffffff STRUCT: D3DXKEY_VECTOR3 { Time FLOAT } { Value D3DXVECTOR3 } ; -TYPEDEF: D3DXKEY_VECTOR3* LPD3DXKEY_VECTOR3 ; +TYPEDEF: D3DXKEY_VECTOR3* LPD3DXKEY_VECTOR3 STRUCT: D3DXKEY_QUATERNION { Time FLOAT } { Value D3DXQUATERNION } ; -TYPEDEF: D3DXKEY_QUATERNION* LPD3DXKEY_QUATERNION ; +TYPEDEF: D3DXKEY_QUATERNION* LPD3DXKEY_QUATERNION STRUCT: D3DXKEY_CALLBACK { Time FLOAT } { pCallbackData LPVOID } ; -TYPEDEF: D3DXKEY_CALLBACK* LPD3DXKEY_CALLBACK ; +TYPEDEF: D3DXKEY_CALLBACK* LPD3DXKEY_CALLBACK -TYPEDEF: int D3DXCOMPRESSION_FLAGS ; +TYPEDEF: int D3DXCOMPRESSION_FLAGS CONSTANT: D3DXCOMPRESS_DEFAULT 0 CONSTANT: D3DXCOMPRESS_FORCE_DWORD 0x7fffffff C-TYPE: ID3DXKeyframedAnimationSet -TYPEDEF: ID3DXKeyframedAnimationSet* LPD3DXKEYFRAMEDANIMATIONSET ; +TYPEDEF: ID3DXKeyframedAnimationSet* LPD3DXKEYFRAMEDANIMATIONSET COM-INTERFACE: ID3DXKeyframedAnimationSet ID3DXAnimationSet "{FA4E8E3A-9786-407d-8B4C-5995893764AF}" D3DXPLAYBACK_TYPE GetPlaybackType ( ) @@ -176,7 +176,7 @@ COM-INTERFACE: ID3DXKeyframedAnimationSet ID3DXAnimationSet "{FA4E8E3A-9786-407d HRESULT UnregisterAnimation ( UINT Index ) ; C-TYPE: ID3DXCompressedAnimationSet -TYPEDEF: ID3DXCompressedAnimationSet* LPD3DXCOMPRESSEDANIMATIONSET ; +TYPEDEF: ID3DXCompressedAnimationSet* LPD3DXCOMPRESSEDANIMATIONSET COM-INTERFACE: ID3DXCompressedAnimationSet ID3DXAnimationSet "{6CC2480D-3808-4739-9F88-DE49FACD8D4C}" D3DXPLAYBACK_TYPE GetPlaybackType ( ) @@ -185,7 +185,7 @@ COM-INTERFACE: ID3DXCompressedAnimationSet ID3DXAnimationSet "{6CC2480D-3808-473 UINT GetNumCallbackKeys ( ) HRESULT GetCallbackKeys ( LPD3DXKEY_CALLBACK pCallbackKeys ) ; -TYPEDEF: int D3DXPRIORITY_TYPE ; +TYPEDEF: int D3DXPRIORITY_TYPE CONSTANT: D3DXPRIORITY_LOW 0 CONSTANT: D3DXPRIORITY_HIGH 1 CONSTANT: D3DXPRIORITY_FORCE_DWORD 0x7fffffff @@ -196,9 +196,9 @@ STRUCT: D3DXTRACK_DESC { Speed FLOAT } { Position double } { Enable BOOL } ; -TYPEDEF: D3DXTRACK_DESC* LPD3DXTRACK_DESC ; +TYPEDEF: D3DXTRACK_DESC* LPD3DXTRACK_DESC -TYPEDEF: int D3DXEVENT_TYPE ; +TYPEDEF: int D3DXEVENT_TYPE CONSTANT: D3DXEVENT_TRACKSPEED 0 CONSTANT: D3DXEVENT_TRACKWEIGHT 1 CONSTANT: D3DXEVENT_TRACKPOSITION 2 @@ -206,7 +206,7 @@ CONSTANT: D3DXEVENT_TRACKENABLE 3 CONSTANT: D3DXEVENT_PRIORITYBLEND 4 CONSTANT: D3DXEVENT_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DXTRANSITION_TYPE ; +TYPEDEF: int D3DXTRANSITION_TYPE CONSTANT: D3DXTRANSITION_LINEAR 0 CONSTANT: D3DXTRANSITION_EASEINEASEOUT 1 CONSTANT: D3DXTRANSITION_FORCE_DWORD 0x7fffffff @@ -223,19 +223,19 @@ STRUCT: D3DXEVENT_DESC { Duration double } { Transition D3DXTRANSITION_TYPE } { Union D3DXEVENT_DESC_UNION } ; -TYPEDEF: D3DXEVENT_DESC* LPD3DXEVENT_DESC ; +TYPEDEF: D3DXEVENT_DESC* LPD3DXEVENT_DESC -TYPEDEF: DWORD D3DXEVENTHANDLE ; -TYPEDEF: D3DXEVENTHANDLE* LPD3DXEVENTHANDLE ; +TYPEDEF: DWORD D3DXEVENTHANDLE +TYPEDEF: D3DXEVENTHANDLE* LPD3DXEVENTHANDLE C-TYPE: ID3DXAnimationCallbackHandler -TYPEDEF: ID3DXAnimationCallbackHandler* LPD3DXANIMATIONCALLBACKHANDLER ; +TYPEDEF: ID3DXAnimationCallbackHandler* LPD3DXANIMATIONCALLBACKHANDLER COM-INTERFACE: ID3DXAnimationCallbackHandler f "{00000000-0000-0000-0000-000000000000}" HRESULT HandleCallback ( UINT Track, LPVOID pCallbackData ) ; C-TYPE: ID3DXAnimationController -TYPEDEF: ID3DXAnimationController* LPD3DXANIMATIONCONTROLLER ; +TYPEDEF: ID3DXAnimationController* LPD3DXANIMATIONCONTROLLER COM-INTERFACE: ID3DXAnimationController IUnknown "{AC8948EC-F86D-43e2-96DE-31FC35F96D9E}" UINT GetMaxNumAnimationOutputs ( ) diff --git a/ffi/windows/directx/d3dx9core/d3dx9core.factor b/ffi/windows/directx/d3dx9core/d3dx9core.factor index 364072ea84..1757410c8c 100644 --- a/ffi/windows/directx/d3dx9core/d3dx9core.factor +++ b/ffi/windows/directx/d3dx9core/d3dx9core.factor @@ -13,7 +13,7 @@ FUNCTION: BOOL D3DXDebugMute ( BOOL Mute ) ; FUNCTION: UINT D3DXGetDriverLevel ( LPDIRECT3DDEVICE9 pDevice ) ; C-TYPE: ID3DXBuffer -TYPEDEF: ID3DXBuffer* LPD3DXBUFFER ; +TYPEDEF: ID3DXBuffer* LPD3DXBUFFER COM-INTERFACE: ID3DXBuffer IUnknown "{8BA5FB08-5195-40e2-AC58-0D989C3A0102}" LPVOID GetBufferPointer ( ) @@ -30,7 +30,7 @@ CONSTANT: D3DXSPRITE_SORT_DEPTH_BACKTOFRONT 128 CONSTANT: D3DXSPRITE_DO_NOT_ADDREF_TEXTURE 256 C-TYPE: ID3DXSprite -TYPEDEF: ID3DXSprite* LPD3DXSPRITE ; +TYPEDEF: ID3DXSprite* LPD3DXSPRITE COM-INTERFACE: ID3DXSprite IUnknown "{BA0B762D-7D28-43ec-B9DC-2F84443B0614}" HRESULT GetDevice ( LPDIRECT3DDEVICE9* ppDevice ) @@ -61,7 +61,7 @@ STRUCT: D3DXFONT_DESCA { Quality BYTE } { PitchAndFamily BYTE } { FaceName CHAR[LF_FACESIZE] } ; -TYPEDEF: D3DXFONT_DESCA* LPD3DXFONT_DESCA ; +TYPEDEF: D3DXFONT_DESCA* LPD3DXFONT_DESCA STRUCT: D3DXFONT_DESCW { Height INT } @@ -74,13 +74,13 @@ STRUCT: D3DXFONT_DESCW { Quality BYTE } { PitchAndFamily BYTE } { FaceName WCHAR[LF_FACESIZE] } ; -TYPEDEF: D3DXFONT_DESCW* LPD3DXFONT_DESCW ; +TYPEDEF: D3DXFONT_DESCW* LPD3DXFONT_DESCW -TYPEDEF: D3DXFONT_DESCW D3DXFONT_DESC ; -TYPEDEF: LPD3DXFONT_DESCW LPD3DXFONT_DESC ; +TYPEDEF: D3DXFONT_DESCW D3DXFONT_DESC +TYPEDEF: LPD3DXFONT_DESCW LPD3DXFONT_DESC C-TYPE: ID3DXFont -TYPEDEF: ID3DXFont* LPD3DXFONT ; +TYPEDEF: ID3DXFont* LPD3DXFONT C-TYPE: TEXTMETRICA C-TYPE: TEXTMETRICW @@ -153,10 +153,10 @@ STRUCT: D3DXRTS_DESC { Format D3DFORMAT } { DepthStencil BOOL } { DepthStencilFormat D3DFORMAT } ; -TYPEDEF: D3DXRTS_DESC* LPD3DXRTS_DESC ; +TYPEDEF: D3DXRTS_DESC* LPD3DXRTS_DESC C-TYPE: ID3DXRenderToSurface -TYPEDEF: ID3DXRenderToSurface* LPD3DXRENDERTOSURFACE ; +TYPEDEF: ID3DXRenderToSurface* LPD3DXRENDERTOSURFACE COM-INTERFACE: ID3DXRenderToSurface IUnknown "{6985F346-2C3D-43b3-BE8B-DAAE8A03D894}" HRESULT GetDevice ( LPDIRECT3DDEVICE9* ppDevice ) @@ -182,10 +182,10 @@ STRUCT: D3DXRTE_DESC { Format D3DFORMAT } { DepthStencil BOOL } { DepthStencilFormat D3DFORMAT } ; -TYPEDEF: D3DXRTE_DESC* LPD3DXRTE_DESC ; +TYPEDEF: D3DXRTE_DESC* LPD3DXRTE_DESC C-TYPE: ID3DXRenderToEnvMap -TYPEDEF: ID3DXRenderToEnvMap* LPD3DXRenderToEnvMap ; +TYPEDEF: ID3DXRenderToEnvMap* LPD3DXRenderToEnvMap COM-INTERFACE: ID3DXRenderToEnvMap IUnknown "{313F1B4B-C7B0-4fa2-9D9D-8D380B64385E}" HRESULT GetDevice ( LPDIRECT3DDEVICE9* ppDevice ) @@ -210,7 +210,7 @@ FUNCTION: HRESULT LPD3DXRenderToEnvMap* ppRenderToEnvMap ) ; C-TYPE: ID3DXLine -TYPEDEF: ID3DXLine* LPD3DXLINE ; +TYPEDEF: ID3DXLine* LPD3DXLINE COM-INTERFACE: ID3DXLine IUnknown "{D379BA7F-9042-4ac4-9F5E-58192A4C6BD8}" HRESULT GetDevice ( LPDIRECT3DDEVICE9* ppDevice ) HRESULT Begin ( ) diff --git a/ffi/windows/directx/d3dx9effect/d3dx9effect.factor b/ffi/windows/directx/d3dx9effect/d3dx9effect.factor index 80fd41777f..d47572858f 100644 --- a/ffi/windows/directx/d3dx9effect/d3dx9effect.factor +++ b/ffi/windows/directx/d3dx9effect/d3dx9effect.factor @@ -53,12 +53,12 @@ STRUCT: D3DXFUNCTION_DESC { Annotations UINT } ; C-TYPE: ID3DXEffectPool -TYPEDEF: ID3DXEffectPool* LPD3DXEFFECTPOOL ; +TYPEDEF: ID3DXEffectPool* LPD3DXEFFECTPOOL COM-INTERFACE: ID3DXEffectPool IUnknown "{9537AB04-3250-412e-8213-FCD2F8677933}" ; C-TYPE: ID3DXBaseEffect -TYPEDEF: ID3DXBaseEffect* LPD3DXBASEEFFECT ; +TYPEDEF: ID3DXBaseEffect* LPD3DXBASEEFFECT COM-INTERFACE: ID3DXBaseEffect IUnknown "{017C18AC-103F-4417-8C51-6BF6EF1E56BE}" HRESULT GetDesc ( D3DXEFFECT_DESC* pDesc ) @@ -117,7 +117,7 @@ COM-INTERFACE: ID3DXBaseEffect IUnknown "{017C18AC-103F-4417-8C51-6BF6EF1E56BE}" HRESULT SetArrayRange ( D3DXHANDLE hParameter, UINT uStart, UINT uEnd ) ; C-TYPE: ID3DXEffectStateManager -TYPEDEF: ID3DXEffectStateManager* LPD3DXEFFECTSTATEMANAGER ; +TYPEDEF: ID3DXEffectStateManager* LPD3DXEFFECTSTATEMANAGER COM-INTERFACE: ID3DXEffectStateManager IUnknown "{79AAB587-6DBC-4fa7-82DE-37FA1781C5CE}" HRESULT SetTransform ( D3DTRANSFORMSTATETYPE State, D3DMATRIX* pMatrix ) @@ -140,7 +140,7 @@ COM-INTERFACE: ID3DXEffectStateManager IUnknown "{79AAB587-6DBC-4fa7-82DE-37FA17 HRESULT SetPixelShaderConstantB ( UINT RegisterIndex, BOOL* pConstantData, UINT RegisterCount ) ; C-TYPE: ID3DXEffect -TYPEDEF: ID3DXEffect* LPD3DXEFFECT ; +TYPEDEF: ID3DXEffect* LPD3DXEFFECT COM-INTERFACE: ID3DXEffect ID3DXBaseEffect "{F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD5}" HRESULT GetPool ( LPD3DXEFFECTPOOL* ppPool ) @@ -167,7 +167,7 @@ COM-INTERFACE: ID3DXEffect ID3DXBaseEffect "{F6CEB4B3-4E4C-40dd-B883-8D8DE5EA0CD HRESULT SetRawValue ( D3DXHANDLE hParameter, LPCVOID pData, UINT ByteOffset, UINT Bytes ) ; C-TYPE: ID3DXEffectCompiler -TYPEDEF: ID3DXEffectCompiler* LPD3DXEFFECTCOMPILER ; +TYPEDEF: ID3DXEffectCompiler* LPD3DXEFFECTCOMPILER COM-INTERFACE: ID3DXEffectCompiler ID3DXBaseEffect "{51B8A949-1A31-47e6-BEA0-4B30DB53F1E0}" HRESULT SetLiteral ( D3DXHANDLE hParameter, BOOL Literal ) diff --git a/ffi/windows/directx/d3dx9math/d3dx9math.factor b/ffi/windows/directx/d3dx9math/d3dx9math.factor index a90ff96efc..662f9c4a0b 100644 --- a/ffi/windows/directx/d3dx9math/d3dx9math.factor +++ b/ffi/windows/directx/d3dx9math/d3dx9math.factor @@ -24,69 +24,69 @@ CONSTANT: D3DX_16F_ROUNDS 1 STRUCT: D3DXFLOAT16 { value WORD } ; -TYPEDEF: D3DXFLOAT16* LPD3DXFLOAT16 ; +TYPEDEF: D3DXFLOAT16* LPD3DXFLOAT16 STRUCT: D3DXVECTOR2 { x FLOAT } { y FLOAT } ; -TYPEDEF: D3DXVECTOR2* LPD3DXVECTOR2 ; +TYPEDEF: D3DXVECTOR2* LPD3DXVECTOR2 STRUCT: D3DXVECTOR2_16F { x D3DXFLOAT16 } { y D3DXFLOAT16 } ; -TYPEDEF: D3DXVECTOR2_16F* LPD3DXVECTOR2_16F ; +TYPEDEF: D3DXVECTOR2_16F* LPD3DXVECTOR2_16F -TYPEDEF: D3DVECTOR D3DXVECTOR3 ; -TYPEDEF: D3DXVECTOR3* LPD3DXVECTOR3 ; +TYPEDEF: D3DVECTOR D3DXVECTOR3 +TYPEDEF: D3DXVECTOR3* LPD3DXVECTOR3 STRUCT: D3DXVECTOR3_16F { x D3DXFLOAT16 } { y D3DXFLOAT16 } { z D3DXFLOAT16 } ; -TYPEDEF: D3DXVECTOR3_16F* LPD3DXVECTOR3_16F ; +TYPEDEF: D3DXVECTOR3_16F* LPD3DXVECTOR3_16F STRUCT: D3DXVECTOR4 { x FLOAT } { y FLOAT } { z FLOAT } { w FLOAT } ; -TYPEDEF: D3DXVECTOR4* LPD3DXVECTOR4 ; +TYPEDEF: D3DXVECTOR4* LPD3DXVECTOR4 STRUCT: D3DXVECTOR4_16F { x D3DXFLOAT16 } { y D3DXFLOAT16 } { z D3DXFLOAT16 } { w D3DXFLOAT16 } ; -TYPEDEF: D3DXVECTOR4_16F* LPD3DXVECTOR4_16F ; +TYPEDEF: D3DXVECTOR4_16F* LPD3DXVECTOR4_16F -TYPEDEF: D3DMATRIX D3DXMATRIX ; -TYPEDEF: D3DXMATRIX* LPD3DXMATRIX ; -TYPEDEF: D3DXMATRIX D3DXMATRIXA16 ; -TYPEDEF: D3DXMATRIXA16* LPD3DXMATRIXA16 ; +TYPEDEF: D3DMATRIX D3DXMATRIX +TYPEDEF: D3DXMATRIX* LPD3DXMATRIX +TYPEDEF: D3DXMATRIX D3DXMATRIXA16 +TYPEDEF: D3DXMATRIXA16* LPD3DXMATRIXA16 STRUCT: D3DXQUATERNION { x FLOAT } { y FLOAT } { z FLOAT } { w FLOAT } ; -TYPEDEF: D3DXQUATERNION* LPD3DXQUATERNION ; +TYPEDEF: D3DXQUATERNION* LPD3DXQUATERNION STRUCT: D3DXPLANE { a FLOAT } { b FLOAT } { c FLOAT } { d FLOAT } ; -TYPEDEF: D3DXPLANE* LPD3DXPLANE ; +TYPEDEF: D3DXPLANE* LPD3DXPLANE STRUCT: D3DXCOLOR { r FLOAT } { g FLOAT } { b FLOAT } { a FLOAT } ; -TYPEDEF: D3DXCOLOR* LPD3DXCOLOR ; +TYPEDEF: D3DXCOLOR* LPD3DXCOLOR C-TYPE: ID3DXMatrixStack -TYPEDEF: ID3DXMatrixStack* LPD3DXMATRIXSTACK ; +TYPEDEF: ID3DXMatrixStack* LPD3DXMATRIXSTACK COM-INTERFACE: ID3DXMatrixStack IUnknown "{C7885BA7-F990-4fe7-922D-8515E477DD85}" HRESULT Pop ( ) diff --git a/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor b/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor index a57fc53a9c..b72504e72f 100644 --- a/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor +++ b/ffi/windows/directx/d3dx9mesh/d3dx9mesh.factor @@ -6,13 +6,13 @@ IN: windows.directx.d3dx9mesh LIBRARY: d3dx9 -TYPEDEF: int D3DXPATCHMESHTYPE ; +TYPEDEF: int D3DXPATCHMESHTYPE CONSTANT: D3DXPATCHMESH_RECT 1 CONSTANT: D3DXPATCHMESH_TRI 2 CONSTANT: D3DXPATCHMESH_NPATCH 3 CONSTANT: D3DXPATCHMESH_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DXMESH ; +TYPEDEF: int D3DXMESH CONSTANT: D3DXMESH_32BIT 0x001 CONSTANT: D3DXMESH_DONOTCLIP 0x002 CONSTANT: D3DXMESH_POINTS 0x004 @@ -36,14 +36,14 @@ CONSTANT: D3DXMESH_WRITEONLY 0x440 CONSTANT: D3DXMESH_DYNAMIC 0x880 CONSTANT: D3DXMESH_SOFTWAREPROCESSING 0x18000 -TYPEDEF: int D3DXPATCHMESH ; +TYPEDEF: int D3DXPATCHMESH CONSTANT: D3DXPATCHMESH_DEFAULT 0 -TYPEDEF: int D3DXMESHSIMP ; +TYPEDEF: int D3DXMESHSIMP CONSTANT: D3DXMESHSIMP_VERTEX 1 CONSTANT: D3DXMESHSIMP_FACE 2 -TYPEDEF: int D3DXCLEANTYPE ; +TYPEDEF: int D3DXCLEANTYPE CONSTANT: D3DXCLEAN_BACKFACING 1 CONSTANT: D3DXCLEAN_BOWTIES 2 CONSTANT: D3DXCLEAN_SKINNING 1 @@ -52,7 +52,7 @@ CONSTANT: D3DXCLEAN_SIMPLIFICATION 3 : MAX_FVF_DECL_SIZE ( -- n ) MAXD3DDECLLENGTH 1 + ; inline -TYPEDEF: int D3DXTANGENT ; +TYPEDEF: int D3DXTANGENT CONSTANT: D3DXTANGENT_WRAP_U 0x01 CONSTANT: D3DXTANGENT_WRAP_V 0x02 CONSTANT: D3DXTANGENT_WRAP_UV 0x03 @@ -66,32 +66,32 @@ CONSTANT: D3DXTANGENT_WIND_CW 0x0100 CONSTANT: D3DXTANGENT_CALCULATE_NORMALS 0x0200 CONSTANT: D3DXTANGENT_GENERATE_IN_PLACE 0x0400 -TYPEDEF: int D3DXIMT ; +TYPEDEF: int D3DXIMT CONSTANT: D3DXIMT_WRAP_U 0x01 CONSTANT: D3DXIMT_WRAP_V 0x02 CONSTANT: D3DXIMT_WRAP_UV 0x03 -TYPEDEF: int D3DXUVATLAS ; +TYPEDEF: int D3DXUVATLAS CONSTANT: D3DXUVATLAS_DEFAULT 0x00 CONSTANT: D3DXUVATLAS_GEODESIC_FAST 0x01 CONSTANT: D3DXUVATLAS_GEODESIC_QUALITY 0x02 C-TYPE: ID3DXBaseMesh -TYPEDEF: ID3DXBaseMesh* LPD3DXBASEMESH ; +TYPEDEF: ID3DXBaseMesh* LPD3DXBASEMESH C-TYPE: ID3DXMesh -TYPEDEF: ID3DXMesh* LPD3DXMESH ; +TYPEDEF: ID3DXMesh* LPD3DXMESH C-TYPE: ID3DXPMesh -TYPEDEF: ID3DXPMesh* LPD3DXPMESH ; +TYPEDEF: ID3DXPMesh* LPD3DXPMESH C-TYPE: ID3DXSPMesh -TYPEDEF: ID3DXSPMesh* LPD3DXSPMESH ; +TYPEDEF: ID3DXSPMesh* LPD3DXSPMESH C-TYPE: ID3DXSkinInfo -TYPEDEF: ID3DXSkinInfo* LPD3DXSKININFO ; +TYPEDEF: ID3DXSkinInfo* LPD3DXSKININFO C-TYPE: ID3DXPatchMesh -TYPEDEF: ID3DXPatchMesh* LPD3DXPATCHMESH ; +TYPEDEF: ID3DXPatchMesh* LPD3DXPATCHMESH C-TYPE: ID3DXTextureGutterHelper -TYPEDEF: ID3DXTextureGutterHelper* LPD3DXTEXTUREGUTTERHELPER ; +TYPEDEF: ID3DXTextureGutterHelper* LPD3DXTEXTUREGUTTERHELPER C-TYPE: ID3DXPRTBuffer -TYPEDEF: ID3DXPRTBuffer* LPD3DXPRTBUFFER ; +TYPEDEF: ID3DXPRTBuffer* LPD3DXPRTBUFFER STRUCT: D3DXATTRIBUTERANGE { AttribId DWORD } @@ -99,14 +99,14 @@ STRUCT: D3DXATTRIBUTERANGE { FaceCount DWORD } { VertexStart DWORD } { VertexCount DWORD } ; -TYPEDEF: D3DXATTRIBUTERANGE* LPD3DXATTRIBUTERANGE ; +TYPEDEF: D3DXATTRIBUTERANGE* LPD3DXATTRIBUTERANGE STRUCT: D3DXMATERIAL { MatD3D D3DMATERIAL9 } { pTextureFilename LPSTR } ; -TYPEDEF: D3DXMATERIAL* LPD3DXMATERIAL ; +TYPEDEF: D3DXMATERIAL* LPD3DXMATERIAL -TYPEDEF: int D3DXEFFECTDEFAULTTYPE ; +TYPEDEF: int D3DXEFFECTDEFAULTTYPE CONSTANT: D3DXEDT_STRING 0x1 CONSTANT: D3DXEDT_FLOATS 0x2 CONSTANT: D3DXEDT_DWORD 0x3 @@ -117,13 +117,13 @@ STRUCT: D3DXEFFECTDEFAULT { Type D3DXEFFECTDEFAULTTYPE } { NumBytes DWORD } { pValue LPVOID } ; -TYPEDEF: D3DXEFFECTDEFAULT* LPD3DXEFFECTDEFAULT ; +TYPEDEF: D3DXEFFECTDEFAULT* LPD3DXEFFECTDEFAULT STRUCT: D3DXEFFECTINSTANCE { pEffectFilename LPSTR } { NumDefaults DWORD } { pDefaults LPD3DXEFFECTDEFAULT } ; -TYPEDEF: D3DXEFFECTINSTANCE* LPD3DXEFFECTINSTANCE ; +TYPEDEF: D3DXEFFECTINSTANCE* LPD3DXEFFECTINSTANCE STRUCT: D3DXATTRIBUTEWEIGHTS { Position FLOAT } @@ -134,7 +134,7 @@ STRUCT: D3DXATTRIBUTEWEIGHTS { Texcoord FLOAT[8] } { Tangent FLOAT } { Binormal FLOAT } ; -TYPEDEF: D3DXATTRIBUTEWEIGHTS* LPD3DXATTRIBUTEWEIGHTS ; +TYPEDEF: D3DXATTRIBUTEWEIGHTS* LPD3DXATTRIBUTEWEIGHTS CONSTANT: D3DXWELDEPSILONS_WELDALL 0x1 CONSTANT: D3DXWELDEPSILONS_WELDPARTIALMATCHES 0x2 @@ -152,7 +152,7 @@ STRUCT: D3DXWELDEPSILONS { Tangent FLOAT } { Binormal FLOAT } { TessFactor FLOAT } ; -TYPEDEF: D3DXWELDEPSILONS* LPD3DXWELDEPSILONS ; +TYPEDEF: D3DXWELDEPSILONS* LPD3DXWELDEPSILONS COM-INTERFACE: ID3DXBaseMesh IUnknown "{7ED943DD-52E8-40b5-A8D8-76685C406330}" HRESULT DrawSubset ( DWORD AttribId ) @@ -247,13 +247,13 @@ STRUCT: D3DXBONECOMBINATION { VertexStart DWORD } { VertexCount DWORD } { BoneId DWORD* } ; -TYPEDEF: D3DXBONECOMBINATION* LPD3DXBONECOMBINATION ; +TYPEDEF: D3DXBONECOMBINATION* LPD3DXBONECOMBINATION STRUCT: D3DXPATCHINFO { PatchType D3DXPATCHMESHTYPE } { Degree D3DDEGREETYPE } { Basis D3DBASISTYPE } ; -TYPEDEF: D3DXPATCHINFO* LPD3DXPATCHINFO ; +TYPEDEF: D3DXPATCHINFO* LPD3DXPATCHINFO COM-INTERFACE: ID3DXPatchMesh IUnknown "{3CE6CC22-DBF2-44f4-894D-F9C34A337139}" DWORD GetNumPatches ( ) @@ -667,7 +667,7 @@ STRUCT: D3DXINTERSECTINFO { U FLOAT } { V FLOAT } { Dist FLOAT } ; -TYPEDEF: D3DXINTERSECTINFO* LPD3DXINTERSECTINFO ; +TYPEDEF: D3DXINTERSECTINFO* LPD3DXINTERSECTINFO FUNCTION: HRESULT D3DXIntersect ( @@ -762,7 +762,7 @@ FUNCTION: HRESULT D3DXComputeTangent ( DWORD* pAdjacency ) ; C-TYPE: D3DXUVATLASCB -TYPEDEF: D3DXUVATLASCB* LPD3DXUVATLASCB ; +TYPEDEF: D3DXUVATLASCB* LPD3DXUVATLASCB FUNCTION: HRESULT D3DXUVAtlasCreate ( LPD3DXMESH pMesh, @@ -817,7 +817,7 @@ FUNCTION: HRESULT D3DXUVAtlasPack ( DWORD dwOptions, LPD3DXBUFFER pFacePartitioning ) ; -TYPEDEF: void* LPD3DXIMTSIGNALCALLBACK ; +TYPEDEF: void* LPD3DXIMTSIGNALCALLBACK FUNCTION: HRESULT D3DXComputeIMTFromPerVertexSignal ( LPD3DXMESH pMesh, @@ -897,12 +897,12 @@ FUNCTION: HRESULT BOOL b32BitIndices, DWORD* pVertexRemap ) ; -TYPEDEF: int D3DXSHCOMPRESSQUALITYTYPE ; +TYPEDEF: int D3DXSHCOMPRESSQUALITYTYPE CONSTANT: D3DXSHCQUAL_FASTLOWQUALITY 1 CONSTANT: D3DXSHCQUAL_SLOWHIGHQUALITY 2 CONSTANT: D3DXSHCQUAL_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DXSHGPUSIMOPT ; +TYPEDEF: int D3DXSHGPUSIMOPT CONSTANT: D3DXSHGPUSIMOPT_SHADOWRES256 1 CONSTANT: D3DXSHGPUSIMOPT_SHADOWRES512 0 CONSTANT: D3DXSHGPUSIMOPT_SHADOWRES1024 2 @@ -931,7 +931,7 @@ STRUCT: D3DXSHPRTSPLITMESHCLUSTERDATA { uClusterStart UINT } { uClusterLength UINT } ; -TYPEDEF: void* LPD3DXSHPRTSIMCB ; +TYPEDEF: void* LPD3DXSHPRTSIMCB C-TYPE: ID3DXTextureGutterHelper C-TYPE: ID3DXPRTBuffer @@ -957,7 +957,7 @@ COM-INTERFACE: ID3DXPRTBuffer IUnknown "{F1827E47-00A8-49cd-908C-9D11955F8728}" LPD3DXMESH pScene ) ; C-TYPE: ID3DXPRTCompBuffer -TYPEDEF: ID3DXPRTCompBuffer* LPD3DXPRTCOMPBUFFER ; +TYPEDEF: ID3DXPRTCompBuffer* LPD3DXPRTCOMPBUFFER COM-INTERFACE: ID3DXPRTCompBuffer IUnknown "{A758D465-FE8D-45ad-9CF0-D01E56266A07}" UINT GetNumSamples ( ) @@ -999,7 +999,7 @@ COM-INTERFACE: ID3DXTextureGutterHelper IUnknown "{838F01EC-9729-4527-AADB-DF70A HRESULT SetGutterMap ( BYTE* pGutterData ) ; C-TYPE: ID3DXPRTEngine -TYPEDEF: ID3DXPRTEngine* LPD3DXPRTENGINE ; +TYPEDEF: ID3DXPRTEngine* LPD3DXPRTENGINE COM-INTERFACE: ID3DXPRTEngine IUnknown "{683A4278-CD5F-4d24-90AD-C4E1B6855D53}" HRESULT SetMeshMaterials ( D3DXSHMATERIAL** ppMaterials, UINT NumMeshes, @@ -1127,7 +1127,7 @@ FUNCTION: HRESULT ALIAS: D3DXSavePRTBufferToFile D3DXSavePRTBufferToFileW C-TYPE: D3DXPRTCOMPBUFFER -TYPEDEF: D3DXPRTCOMPBUFFER* LPD3DXPRTCOMPBUFFER ; +TYPEDEF: D3DXPRTCOMPBUFFER* LPD3DXPRTCOMPBUFFER FUNCTION: HRESULT D3DXLoadPRTCompBufferFromFileA ( diff --git a/ffi/windows/directx/d3dx9shader/d3dx9shader.factor b/ffi/windows/directx/d3dx9shader/d3dx9shader.factor index 39fd2e563f..be02aec532 100644 --- a/ffi/windows/directx/d3dx9shader/d3dx9shader.factor +++ b/ffi/windows/directx/d3dx9shader/d3dx9shader.factor @@ -28,25 +28,25 @@ LIBRARY: d3dx9 : D3DXCONSTTABLE_LARGEADDRESSAWARE ( -- n ) 1 17 shift ; inline -TYPEDEF: LPCSTR D3DXHANDLE ; -TYPEDEF: D3DXHANDLE* LPD3DXHANDLE ; +TYPEDEF: LPCSTR D3DXHANDLE +TYPEDEF: D3DXHANDLE* LPD3DXHANDLE STRUCT: D3DXMACRO { Name LPCSTR } { Definition LPCSTR } ; -TYPEDEF: D3DXMACRO* LPD3DXMACRO ; +TYPEDEF: D3DXMACRO* LPD3DXMACRO STRUCT: D3DXSEMANTIC { Usage UINT } { UsageIndex UINT } ; -TYPEDEF: D3DXSEMANTIC* LPD3DXSEMANTIC ; +TYPEDEF: D3DXSEMANTIC* LPD3DXSEMANTIC ENUM: D3DXREGISTER_SET D3DXRS_BOOL D3DXRS_INT4 D3DXRS_FLOAT4 D3DXRS_SAMPLER ; -TYPEDEF: D3DXREGISTER_SET* LPD3DXREGISTER_SET ; +TYPEDEF: D3DXREGISTER_SET* LPD3DXREGISTER_SET ENUM: D3DXPARAMETER_CLASS D3DXPC_SCALAR @@ -55,7 +55,7 @@ ENUM: D3DXPARAMETER_CLASS D3DXPC_MATRIX_COLUMNS D3DXPC_OBJECT D3DXPC_STRUCT ; -TYPEDEF: D3DXPARAMETER_CLASS* LPD3DXPARAMETER_CLASS ; +TYPEDEF: D3DXPARAMETER_CLASS* LPD3DXPARAMETER_CLASS ENUM: D3DXPARAMETER_TYPE D3DXPT_VOID @@ -78,13 +78,13 @@ ENUM: D3DXPARAMETER_TYPE D3DXPT_PIXELFRAGMENT D3DXPT_VERTEXFRAGMENT D3DXPT_UNSUPPORTED ; -TYPEDEF: D3DXPARAMETER_TYPE* LPD3DXPARAMETER_TYPE ; +TYPEDEF: D3DXPARAMETER_TYPE* LPD3DXPARAMETER_TYPE STRUCT: D3DXCONSTANTTABLE_DESC { Creator LPCSTR } { Version DWORD } { Constants UINT } ; -TYPEDEF: D3DXCONSTANTTABLE_DESC* LPD3DXCONSTANTTABLE_DESC ; +TYPEDEF: D3DXCONSTANTTABLE_DESC* LPD3DXCONSTANTTABLE_DESC STRUCT: D3DXCONSTANT_DESC { Name LPCSTR } @@ -99,10 +99,10 @@ STRUCT: D3DXCONSTANT_DESC { StructMembers UINT } { Bytes UINT } { DefaultValue LPCVOID } ; -TYPEDEF: D3DXCONSTANT_DESC* LPD3DXCONSTANT_DESC ; +TYPEDEF: D3DXCONSTANT_DESC* LPD3DXCONSTANT_DESC C-TYPE: ID3DXConstantTable -TYPEDEF: ID3DXConstantTable* LPD3DXCONSTANTTABLE ; +TYPEDEF: ID3DXConstantTable* LPD3DXCONSTANTTABLE COM-INTERFACE: ID3DXConstantTable IUnknown "{AB3C758F-093E-4356-B762-4DB18F1B3A01}" LPVOID GetBufferPointer ( ) @@ -131,7 +131,7 @@ COM-INTERFACE: ID3DXConstantTable IUnknown "{AB3C758F-093E-4356-B762-4DB18F1B3A0 HRESULT SetMatrixTransposePointerArray ( LPDIRECT3DDEVICE9 pDevice, D3DXHANDLE hConstant, D3DXMATRIX** ppMatrix, UINT Count ) ; C-TYPE: ID3DXTextureShader -TYPEDEF: ID3DXTextureShader* LPD3DXTEXTURESHADER ; +TYPEDEF: ID3DXTextureShader* LPD3DXTEXTURESHADER COM-INTERFACE: ID3DXTextureShader IUnknown "{3E3D67F8-AA7A-405d-A857-BA01D4758426}" HRESULT GetFunction ( LPD3DXBUFFER* ppFunction ) @@ -161,10 +161,10 @@ COM-INTERFACE: ID3DXTextureShader IUnknown "{3E3D67F8-AA7A-405d-A857-BA01D475842 ENUM: D3DXINCLUDE_TYPE D3DXINC_LOCAL D3DXINC_SYSTEM ; -TYPEDEF: D3DXINCLUDE_TYPE* LPD3DXINCLUDE_TYPE ; +TYPEDEF: D3DXINCLUDE_TYPE* LPD3DXINCLUDE_TYPE C-TYPE: ID3DXInclude -TYPEDEF: ID3DXInclude* LPD3DXINCLUDE ; +TYPEDEF: ID3DXInclude* LPD3DXINCLUDE COM-INTERFACE: ID3DXInclude f "{00000000-0000-0000-0000-000000000000}" HRESULT Open ( D3DXINCLUDE_TYPE IncludeType, LPCSTR pFileName, LPCVOID pParentData, LPCVOID* ppData, UINT* pBytes ) @@ -408,7 +408,7 @@ STRUCT: D3DXSHADER_CONSTANTTABLE { ConstantInfo DWORD } { Flags DWORD } { Target DWORD } ; -TYPEDEF: D3DXSHADER_CONSTANTTABLE* LPD3DXSHADER_CONSTANTTABLE ; +TYPEDEF: D3DXSHADER_CONSTANTTABLE* LPD3DXSHADER_CONSTANTTABLE STRUCT: D3DXSHADER_CONSTANTINFO { Name DWORD } @@ -418,7 +418,7 @@ STRUCT: D3DXSHADER_CONSTANTINFO { Reserved WORD } { TypeInfo DWORD } { DefaultValue DWORD } ; -TYPEDEF: D3DXSHADER_CONSTANTINFO* LPD3DXSHADER_CONSTANTINFO ; +TYPEDEF: D3DXSHADER_CONSTANTINFO* LPD3DXSHADER_CONSTANTINFO STRUCT: D3DXSHADER_TYPEINFO { Class WORD } @@ -428,9 +428,9 @@ STRUCT: D3DXSHADER_TYPEINFO { Elements WORD } { StructMembers WORD } { StructMemberInfo DWORD } ; -TYPEDEF: D3DXSHADER_TYPEINFO* LPD3DXSHADER_TYPEINFO ; +TYPEDEF: D3DXSHADER_TYPEINFO* LPD3DXSHADER_TYPEINFO STRUCT: D3DXSHADER_STRUCTMEMBERINFO { Name DWORD } { TypeInfo DWORD } ; -TYPEDEF: D3DXSHADER_STRUCTMEMBERINFO* LPD3DXSHADER_STRUCTMEMBERINFO ; +TYPEDEF: D3DXSHADER_STRUCTMEMBERINFO* LPD3DXSHADER_STRUCTMEMBERINFO diff --git a/ffi/windows/directx/d3dx9shape/d3dx9shape.factor b/ffi/windows/directx/d3dx9shape/d3dx9shape.factor index 8d74e123f4..8fc740b271 100644 --- a/ffi/windows/directx/d3dx9shape/d3dx9shape.factor +++ b/ffi/windows/directx/d3dx9shape/d3dx9shape.factor @@ -5,7 +5,7 @@ IN: windows.directx.d3dx9shape LIBRARY: d3dx9 -TYPEDEF: void* LPGLYPHMETRICSFLOAT ; +TYPEDEF: void* LPGLYPHMETRICSFLOAT FUNCTION: HRESULT D3DXCreatePolygon ( diff --git a/ffi/windows/directx/d3dx9tex/d3dx9tex.factor b/ffi/windows/directx/d3dx9tex/d3dx9tex.factor index 5c3fc9e69a..5acf2b5a2a 100644 --- a/ffi/windows/directx/d3dx9tex/d3dx9tex.factor +++ b/ffi/windows/directx/d3dx9tex/d3dx9tex.factor @@ -49,10 +49,10 @@ CONSTANT: D3DXIFF_DIB 6 CONSTANT: D3DXIFF_HDR 7 CONSTANT: D3DXIFF_PFM 8 CONSTANT: D3DXIFF_FORCE_DWORD 0x7fffffff -TYPEDEF: int D3DXIMAGE_FILEFORMAT ; +TYPEDEF: int D3DXIMAGE_FILEFORMAT -TYPEDEF: void* LPD3DXFILL2D ; -TYPEDEF: void* LPD3DXFILL3D ; +TYPEDEF: void* LPD3DXFILL2D +TYPEDEF: void* LPD3DXFILL3D STRUCT: D3DXIMAGE_INFO { Width UINT } diff --git a/ffi/windows/directx/d3dx9xof/d3dx9xof.factor b/ffi/windows/directx/d3dx9xof/d3dx9xof.factor index 1644705506..1460c8797a 100644 --- a/ffi/windows/directx/d3dx9xof/d3dx9xof.factor +++ b/ffi/windows/directx/d3dx9xof/d3dx9xof.factor @@ -4,18 +4,18 @@ IN: windows.directx.d3dx9xof LIBRARY: d3dx9 -TYPEDEF: DWORD D3DXF_FILEFORMAT ; +TYPEDEF: DWORD D3DXF_FILEFORMAT CONSTANT: D3DXF_FILEFORMAT_BINARY 0 CONSTANT: D3DXF_FILEFORMAT_TEXT 1 CONSTANT: D3DXF_FILEFORMAT_COMPRESSED 2 -TYPEDEF: DWORD D3DXF_FILESAVEOPTIONS ; +TYPEDEF: DWORD D3DXF_FILESAVEOPTIONS CONSTANT: D3DXF_FILESAVE_TOFILE 0 CONSTANT: D3DXF_FILESAVE_TOWFILE 1 -TYPEDEF: DWORD D3DXF_FILELOADOPTIONS ; +TYPEDEF: DWORD D3DXF_FILELOADOPTIONS CONSTANT: D3DXF_FILELOAD_FROMFILE 0 CONSTANT: D3DXF_FILELOAD_FROMWFILE 1 @@ -37,16 +37,16 @@ C-TYPE: ID3DXFileSaveData C-TYPE: ID3DXFileEnumObject C-TYPE: ID3DXFileData -TYPEDEF: ID3DXFile* LPD3DXFILE ; -TYPEDEF: ID3DXFile** LPLPD3DXFILE ; -TYPEDEF: ID3DXFileEnumObject* LPD3DXFILEENUMOBJECT ; -TYPEDEF: ID3DXFileEnumObject** LPLPD3DXFILEENUMOBJECT ; -TYPEDEF: ID3DXFileSaveObject* LPD3DXFILESAVEOBJECT ; -TYPEDEF: ID3DXFileSaveObject** LPLPD3DXFILESAVEOBJECT ; -TYPEDEF: ID3DXFileData* LPD3DXFILEDATA ; -TYPEDEF: ID3DXFileData** LPLPD3DXFILEDATA ; -TYPEDEF: ID3DXFileSaveData* LPD3DXFILESAVEDATA ; -TYPEDEF: ID3DXFileSaveData** LPLPD3DXFILESAVEDATA ; +TYPEDEF: ID3DXFile* LPD3DXFILE +TYPEDEF: ID3DXFile** LPLPD3DXFILE +TYPEDEF: ID3DXFileEnumObject* LPD3DXFILEENUMOBJECT +TYPEDEF: ID3DXFileEnumObject** LPLPD3DXFILEENUMOBJECT +TYPEDEF: ID3DXFileSaveObject* LPD3DXFILESAVEOBJECT +TYPEDEF: ID3DXFileSaveObject** LPLPD3DXFILESAVEOBJECT +TYPEDEF: ID3DXFileData* LPD3DXFILEDATA +TYPEDEF: ID3DXFileData** LPLPD3DXFILEDATA +TYPEDEF: ID3DXFileSaveData* LPD3DXFILESAVEDATA +TYPEDEF: ID3DXFileSaveData** LPLPD3DXFILESAVEDATA COM-INTERFACE: ID3DXFile IUnknown "{cef08cf9-7b4f-4429-9624-2a690a933201}" HRESULT CreateEnumObject ( LPCVOID x, D3DXF_FILELOADOPTIONS y, diff --git a/ffi/windows/directx/dinput/dinput.factor b/ffi/windows/directx/dinput/dinput.factor index a34901e2ec..f1ce4a0311 100644 --- a/ffi/windows/directx/dinput/dinput.factor +++ b/ffi/windows/directx/dinput/dinput.factor @@ -5,7 +5,7 @@ IN: windows.directx.dinput LIBRARY: dinput -TYPEDEF: DWORD D3DCOLOR ; +TYPEDEF: DWORD D3DCOLOR STRUCT: DIDEVICEINSTANCEW { dwSize DWORD } @@ -17,8 +17,8 @@ STRUCT: DIDEVICEINSTANCEW { guidFFDriver GUID } { wUsagePage WORD } { wUsage WORD } ; -TYPEDEF: DIDEVICEINSTANCEW* LPDIDEVICEINSTANCEW ; -TYPEDEF: DIDEVICEINSTANCEW* LPCDIDEVICEINSTANCEW ; +TYPEDEF: DIDEVICEINSTANCEW* LPDIDEVICEINSTANCEW +TYPEDEF: DIDEVICEINSTANCEW* LPCDIDEVICEINSTANCEW UNION-STRUCT: DIACTION-union { lptszActionName LPCWSTR } { uResIdString UINT } ; @@ -30,8 +30,8 @@ STRUCT: DIACTIONW { guidInstance GUID } { dwObjID DWORD } { dwHow DWORD } ; -TYPEDEF: DIACTIONW* LPDIACTIONW ; -TYPEDEF: DIACTIONW* LPCDIACTIONW ; +TYPEDEF: DIACTIONW* LPDIACTIONW +TYPEDEF: DIACTIONW* LPCDIACTIONW STRUCT: DIACTIONFORMATW { dwSize DWORD } { dwActionSize DWORD } @@ -47,8 +47,8 @@ STRUCT: DIACTIONFORMATW { ftTimeStamp FILETIME } { dwCRC DWORD } { tszActionMap WCHAR[260] } ; -TYPEDEF: DIACTIONFORMATW* LPDIACTIONFORMATW ; -TYPEDEF: DIACTIONFORMATW* LPCDIACTIONFORMATW ; +TYPEDEF: DIACTIONFORMATW* LPDIACTIONFORMATW +TYPEDEF: DIACTIONFORMATW* LPCDIACTIONFORMATW STRUCT: DICOLORSET { dwSize DWORD } { cTextFore D3DCOLOR } @@ -59,8 +59,8 @@ STRUCT: DICOLORSET { cControlFill D3DCOLOR } { cHighlightFill D3DCOLOR } { cAreaFill D3DCOLOR } ; -TYPEDEF: DICOLORSET* LPDICOLORSET ; -TYPEDEF: DICOLORSET* LPCDICOLORSET ; +TYPEDEF: DICOLORSET* LPDICOLORSET +TYPEDEF: DICOLORSET* LPCDICOLORSET STRUCT: DICONFIGUREDEVICESPARAMSW { dwSize DWORD } @@ -71,8 +71,8 @@ STRUCT: DICONFIGUREDEVICESPARAMSW { hwnd HWND } { dics DICOLORSET } { lpUnkDDSTarget IUnknown* } ; -TYPEDEF: DICONFIGUREDEVICESPARAMSW* LPDICONFIGUREDEVICESPARAMSW ; -TYPEDEF: DICONFIGUREDEVICESPARAMSW* LPCDICONFIGUREDEVICESPARAMSW ; +TYPEDEF: DICONFIGUREDEVICESPARAMSW* LPDICONFIGUREDEVICESPARAMSW +TYPEDEF: DICONFIGUREDEVICESPARAMSW* LPCDICONFIGUREDEVICESPARAMSW STRUCT: DIDEVCAPS { dwSize DWORD } @@ -86,8 +86,8 @@ STRUCT: DIDEVCAPS { dwFirmwareRevision DWORD } { dwHardwareRevision DWORD } { dwFFDriverVersion DWORD } ; -TYPEDEF: DIDEVCAPS* LPDIDEVCAPS ; -TYPEDEF: DIDEVCAPS* LPCDIDEVCAPS ; +TYPEDEF: DIDEVCAPS* LPDIDEVCAPS +TYPEDEF: DIDEVCAPS* LPCDIDEVCAPS STRUCT: DIDEVICEOBJECTINSTANCEW { dwSize DWORD } { guidType GUID } @@ -104,23 +104,23 @@ STRUCT: DIDEVICEOBJECTINSTANCEW { dwDimension DWORD } { wExponent WORD } { wReportId WORD } ; -TYPEDEF: DIDEVICEOBJECTINSTANCEW* LPDIDEVICEOBJECTINSTANCEW ; -TYPEDEF: DIDEVICEOBJECTINSTANCEW* LPCDIDEVICEOBJECTINSTANCEW ; +TYPEDEF: DIDEVICEOBJECTINSTANCEW* LPDIDEVICEOBJECTINSTANCEW +TYPEDEF: DIDEVICEOBJECTINSTANCEW* LPCDIDEVICEOBJECTINSTANCEW STRUCT: DIDEVICEOBJECTDATA { dwOfs DWORD } { dwData DWORD } { dwTimeStamp DWORD } { dwSequence DWORD } { uAppData UINT_PTR } ; -TYPEDEF: DIDEVICEOBJECTDATA* LPDIDEVICEOBJECTDATA ; -TYPEDEF: DIDEVICEOBJECTDATA* LPCDIDEVICEOBJECTDATA ; +TYPEDEF: DIDEVICEOBJECTDATA* LPDIDEVICEOBJECTDATA +TYPEDEF: DIDEVICEOBJECTDATA* LPCDIDEVICEOBJECTDATA STRUCT: DIOBJECTDATAFORMAT { pguid GUID* } { dwOfs DWORD } { dwType DWORD } { dwFlags DWORD } ; -TYPEDEF: DIOBJECTDATAFORMAT* LPDIOBJECTDATAFORMAT ; -TYPEDEF: DIOBJECTDATAFORMAT* LPCDIOBJECTDATAFORMAT ; +TYPEDEF: DIOBJECTDATAFORMAT* LPDIOBJECTDATAFORMAT +TYPEDEF: DIOBJECTDATAFORMAT* LPCDIOBJECTDATAFORMAT STRUCT: DIDATAFORMAT { dwSize DWORD } { dwObjSize DWORD } @@ -128,49 +128,49 @@ STRUCT: DIDATAFORMAT { dwDataSize DWORD } { dwNumObjs DWORD } { rgodf LPDIOBJECTDATAFORMAT } ; -TYPEDEF: DIDATAFORMAT* LPDIDATAFORMAT ; -TYPEDEF: DIDATAFORMAT* LPCDIDATAFORMAT ; +TYPEDEF: DIDATAFORMAT* LPDIDATAFORMAT +TYPEDEF: DIDATAFORMAT* LPCDIDATAFORMAT STRUCT: DIPROPHEADER { dwSize DWORD } { dwHeaderSize DWORD } { dwObj DWORD } { dwHow DWORD } ; -TYPEDEF: DIPROPHEADER* LPDIPROPHEADER ; -TYPEDEF: DIPROPHEADER* LPCDIPROPHEADER ; +TYPEDEF: DIPROPHEADER* LPDIPROPHEADER +TYPEDEF: DIPROPHEADER* LPCDIPROPHEADER STRUCT: DIPROPDWORD { diph DIPROPHEADER } { dwData DWORD } ; -TYPEDEF: DIPROPDWORD* LPDIPROPDWORD ; -TYPEDEF: DIPROPDWORD* LPCDIPROPDWORD ; +TYPEDEF: DIPROPDWORD* LPDIPROPDWORD +TYPEDEF: DIPROPDWORD* LPCDIPROPDWORD STRUCT: DIPROPPOINTER { diph DIPROPHEADER } { uData UINT_PTR } ; -TYPEDEF: DIPROPPOINTER* LPDIPROPPOINTER ; -TYPEDEF: DIPROPPOINTER* LPCDIPROPPOINTER ; +TYPEDEF: DIPROPPOINTER* LPDIPROPPOINTER +TYPEDEF: DIPROPPOINTER* LPCDIPROPPOINTER STRUCT: DIPROPRANGE { diph DIPROPHEADER } { lMin LONG } { lMax LONG } ; -TYPEDEF: DIPROPRANGE* LPDIPROPRANGE ; -TYPEDEF: DIPROPRANGE* LPCDIPROPRANGE ; +TYPEDEF: DIPROPRANGE* LPDIPROPRANGE +TYPEDEF: DIPROPRANGE* LPCDIPROPRANGE STRUCT: DIPROPCAL { diph DIPROPHEADER } { lMin LONG } { lCenter LONG } { lMax LONG } ; -TYPEDEF: DIPROPCAL* LPDIPROPCAL ; -TYPEDEF: DIPROPCAL* LPCDIPROPCAL ; +TYPEDEF: DIPROPCAL* LPDIPROPCAL +TYPEDEF: DIPROPCAL* LPCDIPROPCAL STRUCT: DIPROPGUIDANDPATH { diph DIPROPHEADER } { guidClass GUID } { wszPath WCHAR[260] } ; -TYPEDEF: DIPROPGUIDANDPATH* LPDIPROPGUIDANDPATH ; -TYPEDEF: DIPROPGUIDANDPATH* LPCDIPROPGUIDANDPATH ; +TYPEDEF: DIPROPGUIDANDPATH* LPDIPROPGUIDANDPATH +TYPEDEF: DIPROPGUIDANDPATH* LPCDIPROPGUIDANDPATH STRUCT: DIPROPSTRING { diph DIPROPHEADER } { wsz WCHAR[260] } ; -TYPEDEF: DIPROPSTRING* LPDIPROPSTRING ; -TYPEDEF: DIPROPSTRING* LPCDIPROPSTRING ; +TYPEDEF: DIPROPSTRING* LPDIPROPSTRING +TYPEDEF: DIPROPSTRING* LPCDIPROPSTRING STRUCT: CPOINT { lP LONG } { dwLog DWORD } ; @@ -178,16 +178,16 @@ STRUCT: DIPROPCPOINTS { diph DIPROPHEADER } { dwCPointsNum DWORD } { cp CPOINT[8] } ; -TYPEDEF: DIPROPCPOINTS* LPDIPROPCPOINTS ; -TYPEDEF: DIPROPCPOINTS* LPCDIPROPCPOINTS ; +TYPEDEF: DIPROPCPOINTS* LPDIPROPCPOINTS +TYPEDEF: DIPROPCPOINTS* LPCDIPROPCPOINTS STRUCT: DIENVELOPE { dwSize DWORD } { dwAttackLevel DWORD } { dwAttackTime DWORD } { dwFadeLevel DWORD } { dwFadeTime DWORD } ; -TYPEDEF: DIENVELOPE* LPDIENVELOPE ; -TYPEDEF: DIENVELOPE* LPCDIENVELOPE ; +TYPEDEF: DIENVELOPE* LPDIENVELOPE +TYPEDEF: DIENVELOPE* LPCDIENVELOPE STRUCT: DIEFFECT { dwSize DWORD } { dwFlags DWORD } @@ -203,8 +203,8 @@ STRUCT: DIEFFECT { cbTypeSpecificParams DWORD } { lpvTypeSpecificParams LPVOID } { dwStartDelay DWORD } ; -TYPEDEF: DIEFFECT* LPDIEFFECT ; -TYPEDEF: DIEFFECT* LPCDIEFFECT ; +TYPEDEF: DIEFFECT* LPDIEFFECT +TYPEDEF: DIEFFECT* LPCDIEFFECT STRUCT: DIEFFECTINFOW { dwSize DWORD } { guid GUID } @@ -212,8 +212,8 @@ STRUCT: DIEFFECTINFOW { dwStaticParams DWORD } { dwDynamicParams DWORD } { tszName WCHAR[260] } ; -TYPEDEF: DIEFFECTINFOW* LPDIEFFECTINFOW ; -TYPEDEF: DIEFFECTINFOW* LPCDIEFFECTINFOW ; +TYPEDEF: DIEFFECTINFOW* LPDIEFFECTINFOW +TYPEDEF: DIEFFECTINFOW* LPCDIEFFECTINFOW STRUCT: DIEFFESCAPE { dwSize DWORD } { dwCommand DWORD } @@ -221,15 +221,15 @@ STRUCT: DIEFFESCAPE { cbInBuffer DWORD } { lpvOutBuffer LPVOID } { cbOutBuffer DWORD } ; -TYPEDEF: DIEFFESCAPE* LPDIEFFESCAPE ; -TYPEDEF: DIEFFESCAPE* LPCDIEFFESCAPE ; +TYPEDEF: DIEFFESCAPE* LPDIEFFESCAPE +TYPEDEF: DIEFFESCAPE* LPCDIEFFESCAPE STRUCT: DIFILEEFFECT { dwSize DWORD } { GuidEffect GUID } { lpDiEffect LPCDIEFFECT } { szFriendlyName CHAR[260] } ; -TYPEDEF: DIFILEEFFECT* LPDIFILEEFFECT ; -TYPEDEF: DIFILEEFFECT* LPCDIFILEEFFECT ; +TYPEDEF: DIFILEEFFECT* LPDIFILEEFFECT +TYPEDEF: DIFILEEFFECT* LPCDIFILEEFFECT STRUCT: DIDEVICEIMAGEINFOW { tszImagePath WCHAR[260] } { dwFlags DWORD } @@ -240,8 +240,8 @@ STRUCT: DIDEVICEIMAGEINFOW { rgptCalloutLine POINT[5] } { rcCalloutRect RECT } { dwTextAlign DWORD } ; -TYPEDEF: DIDEVICEIMAGEINFOW* LPDIDEVICEIMAGEINFOW ; -TYPEDEF: DIDEVICEIMAGEINFOW* LPCDIDEVICEIMAGEINFOW ; +TYPEDEF: DIDEVICEIMAGEINFOW* LPDIDEVICEIMAGEINFOW +TYPEDEF: DIDEVICEIMAGEINFOW* LPCDIDEVICEIMAGEINFOW STRUCT: DIDEVICEIMAGEINFOHEADERW { dwSize DWORD } { dwSizeImageInfo DWORD } @@ -252,16 +252,16 @@ STRUCT: DIDEVICEIMAGEINFOHEADERW { dwBufferSize DWORD } { dwBufferUsed DWORD } { lprgImageInfoArray DIDEVICEIMAGEINFOW* } ; -TYPEDEF: DIDEVICEIMAGEINFOHEADERW* LPDIDEVICEIMAGEINFOHEADERW ; -TYPEDEF: DIDEVICEIMAGEINFOHEADERW* LPCDIDEVICEIMAGEINFOHEADERW ; +TYPEDEF: DIDEVICEIMAGEINFOHEADERW* LPDIDEVICEIMAGEINFOHEADERW +TYPEDEF: DIDEVICEIMAGEINFOHEADERW* LPCDIDEVICEIMAGEINFOHEADERW STRUCT: DIMOUSESTATE2 { lX LONG } { lY LONG } { lZ LONG } { rgbButtons BYTE[8] } ; -TYPEDEF: DIMOUSESTATE2* LPDIMOUSESTATE2 ; -TYPEDEF: DIMOUSESTATE2* LPCDIMOUSESTATE2 ; +TYPEDEF: DIMOUSESTATE2* LPDIMOUSESTATE2 +TYPEDEF: DIMOUSESTATE2* LPCDIMOUSESTATE2 STRUCT: DIJOYSTATE2 { lX LONG } @@ -294,8 +294,8 @@ STRUCT: DIJOYSTATE2 { lFRy LONG } { lFRz LONG } { rglFSlider LONG[2] } ; -TYPEDEF: DIJOYSTATE2* LPDIJOYSTATE2 ; -TYPEDEF: DIJOYSTATE2* LPCDIJOYSTATE2 ; +TYPEDEF: DIJOYSTATE2* LPDIJOYSTATE2 +TYPEDEF: DIJOYSTATE2* LPCDIJOYSTATE2 CALLBACK: BOOL LPDIENUMDEVICESCALLBACKW ( LPCDIDEVICEINSTANCEW lpddi, diff --git a/ffi/windows/directx/dwrite/dwrite.factor b/ffi/windows/directx/dwrite/dwrite.factor index 08598f690e..02db2c5bb9 100755 --- a/ffi/windows/directx/dwrite/dwrite.factor +++ b/ffi/windows/directx/dwrite/dwrite.factor @@ -164,7 +164,7 @@ COM-INTERFACE: IDWriteRenderingParams IUnknown "{2f0da53a-2add-47cd-82ee-d9ec346 C-TYPE: ID2D1SimplifiedGeometrySink -TYPEDEF: ID2D1SimplifiedGeometrySink IDWriteGeometrySink ; +TYPEDEF: ID2D1SimplifiedGeometrySink IDWriteGeometrySink COM-INTERFACE: IDWriteFontFace IUnknown "{5f49804d-7024-4d43-bfa9-d25984f53849}" DWRITE_FONT_FACE_TYPE GetType ( ) @@ -263,7 +263,7 @@ ENUM: DWRITE_TRIMMING_GRANULARITY DWRITE_TRIMMING_GRANULARITY_CHARACTER DWRITE_TRIMMING_GRANULARITY_WORD ; -TYPEDEF: int DWRITE_FONT_FEATURE_TAG ; +TYPEDEF: int DWRITE_FONT_FEATURE_TAG CONSTANT: DWRITE_FONT_FEATURE_TAG_ALTERNATIVE_FRACTIONS 0x63726661 CONSTANT: DWRITE_FONT_FEATURE_TAG_PETITE_CAPITALS_FROM_CAPITALS 0x63703263 CONSTANT: DWRITE_FONT_FEATURE_TAG_SMALL_CAPITALS_FROM_CAPITALS 0x63733263 diff --git a/ffi/windows/directx/dxfile/dxfile.factor b/ffi/windows/directx/dxfile/dxfile.factor index e974bfd090..bb7870fd70 100755 --- a/ffi/windows/directx/dxfile/dxfile.factor +++ b/ffi/windows/directx/dxfile/dxfile.factor @@ -4,13 +4,13 @@ IN: windows.directx.dxfile LIBRARY: d3dxof -TYPEDEF: DWORD DXFILEFORMAT ; +TYPEDEF: DWORD DXFILEFORMAT CONSTANT: DXFILEFORMAT_BINARY 0 CONSTANT: DXFILEFORMAT_TEXT 1 CONSTANT: DXFILEFORMAT_COMPRESSED 2 -TYPEDEF: DWORD DXFILELOADOPTIONS ; +TYPEDEF: DWORD DXFILELOADOPTIONS CONSTANT: DXFILELOAD_FROMFILE 0 CONSTANT: DXFILELOAD_FROMRESOURCE 1 @@ -22,34 +22,34 @@ STRUCT: DXFILELOADRESOURCE { hModule HMODULE } { lpName LPCTSTR } { lpType LPCTSTR } ; -TYPEDEF: DXFILELOADRESOURCE* LPDXFILELOADRESOURCE ; +TYPEDEF: DXFILELOADRESOURCE* LPDXFILELOADRESOURCE STRUCT: DXFILELOADMEMORY { lpMemory LPVOID } { dSize DWORD } ; -TYPEDEF: DXFILELOADMEMORY* LPDXFILELOADMEMORY ; +TYPEDEF: DXFILELOADMEMORY* LPDXFILELOADMEMORY C-TYPE: IDirectXFile -TYPEDEF: IDirectXFile* LPDIRECTXFILE ; -TYPEDEF: IDirectXFile** LPLPDIRECTXFILE ; +TYPEDEF: IDirectXFile* LPDIRECTXFILE +TYPEDEF: IDirectXFile** LPLPDIRECTXFILE C-TYPE: IDirectXFileEnumObject -TYPEDEF: IDirectXFileEnumObject* LPDIRECTXFILEENUMOBJECT ; -TYPEDEF: IDirectXFileEnumObject** LPLPDIRECTXFILEENUMOBJECT ; +TYPEDEF: IDirectXFileEnumObject* LPDIRECTXFILEENUMOBJECT +TYPEDEF: IDirectXFileEnumObject** LPLPDIRECTXFILEENUMOBJECT C-TYPE: IDirectXFileSaveObject -TYPEDEF: IDirectXFileSaveObject* LPDIRECTXFILESAVEOBJECT ; -TYPEDEF: IDirectXFileSaveObject** LPLPDIRECTXFILESAVEOBJECT ; +TYPEDEF: IDirectXFileSaveObject* LPDIRECTXFILESAVEOBJECT +TYPEDEF: IDirectXFileSaveObject** LPLPDIRECTXFILESAVEOBJECT C-TYPE: IDirectXFileObject -TYPEDEF: IDirectXFileObject* LPDIRECTXFILEOBJECT ; -TYPEDEF: IDirectXFileObject** LPLPDIRECTXFILEOBJECT ; +TYPEDEF: IDirectXFileObject* LPDIRECTXFILEOBJECT +TYPEDEF: IDirectXFileObject** LPLPDIRECTXFILEOBJECT C-TYPE: IDirectXFileData -TYPEDEF: IDirectXFileData* LPDIRECTXFILEDATA ; -TYPEDEF: IDirectXFileData** LPLPDIRECTXFILEDATA ; +TYPEDEF: IDirectXFileData* LPDIRECTXFILEDATA +TYPEDEF: IDirectXFileData** LPLPDIRECTXFILEDATA C-TYPE: IDirectXFileDataReference -TYPEDEF: IDirectXFileDataReference* LPDIRECTXFILEDATAREFERENCE ; -TYPEDEF: IDirectXFileDataReference** LPLPDIRECTXFILEDATAREFERENCE ; +TYPEDEF: IDirectXFileDataReference* LPDIRECTXFILEDATAREFERENCE +TYPEDEF: IDirectXFileDataReference** LPLPDIRECTXFILEDATAREFERENCE C-TYPE: IDirectXFileBinary -TYPEDEF: IDirectXFileBinary* LPDIRECTXFILEBINARY ; -TYPEDEF: IDirectXFileBinary** LPLPDIRECTXFILEBINARY ; +TYPEDEF: IDirectXFileBinary* LPDIRECTXFILEBINARY +TYPEDEF: IDirectXFileBinary** LPLPDIRECTXFILEBINARY FUNCTION: HRESULT DirectXFileCreate ( LPDIRECTXFILE* lplpDirectXFile ) ; diff --git a/ffi/windows/directx/dxgi/dxgi.factor b/ffi/windows/directx/dxgi/dxgi.factor index 64ea11051a..2079e6cab6 100644 --- a/ffi/windows/directx/dxgi/dxgi.factor +++ b/ffi/windows/directx/dxgi/dxgi.factor @@ -17,7 +17,7 @@ CONSTANT: DXGI_USAGE_SHARED 128 CONSTANT: DXGI_USAGE_READ_ONLY 256 CONSTANT: DXGI_USAGE_DISCARD_ON_PRESENT 512 CONSTANT: DXGI_USAGE_UNORDERED_ACCESS 1024 -TYPEDEF: UINT DXGI_USAGE ; +TYPEDEF: UINT DXGI_USAGE STRUCT: DXGI_FRAME_STATISTICS { PresentCount UINT } @@ -60,7 +60,7 @@ CONSTANT: DXGI_RESOURCE_PRIORITY_MAXIMUM 0xc8000000 CONSTANT: DXGI_RESIDENCY_FULLY_RESIDENT 1 CONSTANT: DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY 2 CONSTANT: DXGI_RESIDENCY_EVICTED_TO_DISK 3 -TYPEDEF: int DXGI_RESIDENCY ; +TYPEDEF: int DXGI_RESIDENCY STRUCT: DXGI_SURFACE_DESC { Width UINT } @@ -70,12 +70,12 @@ STRUCT: DXGI_SURFACE_DESC CONSTANT: DXGI_SWAP_EFFECT_DISCARD 0 CONSTANT: DXGI_SWAP_EFFECT_SEQUENTIAL 1 -TYPEDEF: int DXGI_SWAP_EFFECT ; +TYPEDEF: int DXGI_SWAP_EFFECT CONSTANT: DXGI_SWAP_CHAIN_FLAG_NONPREROTATED 1 CONSTANT: DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH 2 CONSTANT: DXGI_SWAP_CHAIN_FLAG_GDI_COMPATIBLE 4 -TYPEDEF: int DXGI_SWAP_CHAIN_FLAG ; +TYPEDEF: int DXGI_SWAP_CHAIN_FLAG STRUCT: DXGI_SWAP_CHAIN_DESC { BufferDesc DXGI_MODE_DESC } @@ -184,7 +184,7 @@ HRESULT GetGPUThreadPriority ( INT* pPriority ) ; CONSTANT: DXGI_ADAPTER_FLAG_NONE 0 CONSTANT: DXGI_ADAPTER_FLAG_REMOTE 1 CONSTANT: DXGI_ADAPTER_FLAG_FORCE_DWORD 0xffffffff -TYPEDEF: int DXGI_ADAPTER_FLAG ; +TYPEDEF: int DXGI_ADAPTER_FLAG STRUCT: DXGI_ADAPTER_DESC1 { Description WCHAR[128] } diff --git a/ffi/windows/directx/dxgiformat/dxgiformat.factor b/ffi/windows/directx/dxgiformat/dxgiformat.factor index 9f6956b306..8438de151c 100644 --- a/ffi/windows/directx/dxgiformat/dxgiformat.factor +++ b/ffi/windows/directx/dxgiformat/dxgiformat.factor @@ -102,4 +102,4 @@ CONSTANT: DXGI_FORMAT_BC7_TYPELESS 97 CONSTANT: DXGI_FORMAT_BC7_UNORM 98 CONSTANT: DXGI_FORMAT_BC7_UNORM_SRGB 99 CONSTANT: DXGI_FORMAT_FORCE_UINT 0xffffffff -TYPEDEF: int DXGI_FORMAT ; +TYPEDEF: int DXGI_FORMAT diff --git a/ffi/windows/directx/x3daudio/x3daudio.factor b/ffi/windows/directx/x3daudio/x3daudio.factor index 6020c9156c..06f8fedeea 100644 --- a/ffi/windows/directx/x3daudio/x3daudio.factor +++ b/ffi/windows/directx/x3daudio/x3daudio.factor @@ -21,20 +21,20 @@ CONSTANT: X3DAUDIO_CALCULATE_EMITTER_ANGLE 0x00000040 CONSTANT: X3DAUDIO_CALCULATE_ZEROCENTER 0x00010000 CONSTANT: X3DAUDIO_CALCULATE_REDIRECT_TO_LFE 0x00020000 -TYPEDEF: float FLOAT32 ; -TYPEDEF: D3DVECTOR X3DAUDIO_VECTOR ; +TYPEDEF: float FLOAT32 +TYPEDEF: D3DVECTOR X3DAUDIO_VECTOR -TYPEDEF: BYTE[20] X3DAUDIO_HANDLE ; +TYPEDEF: BYTE[20] X3DAUDIO_HANDLE STRUCT: X3DAUDIO_DISTANCE_CURVE_POINT { Distance FLOAT32 } { DSPSetting FLOAT32 } ; -TYPEDEF: X3DAUDIO_DISTANCE_CURVE_POINT* LPX3DAUDIO_DISTANCE_CURVE_POINT ; +TYPEDEF: X3DAUDIO_DISTANCE_CURVE_POINT* LPX3DAUDIO_DISTANCE_CURVE_POINT STRUCT: X3DAUDIO_DISTANCE_CURVE { pPoints X3DAUDIO_DISTANCE_CURVE_POINT* } { PointCount UINT32 } ; -TYPEDEF: X3DAUDIO_DISTANCE_CURVE* LPX3DAUDIO_DISTANCE_CURVE ; +TYPEDEF: X3DAUDIO_DISTANCE_CURVE* LPX3DAUDIO_DISTANCE_CURVE STRUCT: X3DAUDIO_CONE { InnerAngle FLOAT32 } @@ -45,7 +45,7 @@ STRUCT: X3DAUDIO_CONE { OuterLPF FLOAT32 } { InnerReverb FLOAT32 } { OuterReverb FLOAT32 } ; -TYPEDEF: X3DAUDIO_CONE* LPX3DAUDIO_CONE ; +TYPEDEF: X3DAUDIO_CONE* LPX3DAUDIO_CONE STRUCT: X3DAUDIO_LISTENER { OrientFront X3DAUDIO_VECTOR } @@ -53,7 +53,7 @@ STRUCT: X3DAUDIO_LISTENER { Position X3DAUDIO_VECTOR } { Velocity X3DAUDIO_VECTOR } { pCone X3DAUDIO_CONE* } ; -TYPEDEF: X3DAUDIO_LISTENER* LPX3DAUDIO_LISTENER ; +TYPEDEF: X3DAUDIO_LISTENER* LPX3DAUDIO_LISTENER STRUCT: X3DAUDIO_EMITTER { pCone X3DAUDIO_CONE* } @@ -73,7 +73,7 @@ STRUCT: X3DAUDIO_EMITTER { pReverbCurve X3DAUDIO_DISTANCE_CURVE* } { CurveDistanceScaler FLOAT32 } { DopplerScaler FLOAT32 } ; -TYPEDEF: X3DAUDIO_EMITTER* LPX3DAUDIO_EMITTER ; +TYPEDEF: X3DAUDIO_EMITTER* LPX3DAUDIO_EMITTER STRUCT: X3DAUDIO_DSP_SETTINGS { pMatrixCoefficients FLOAT32* } @@ -88,7 +88,7 @@ STRUCT: X3DAUDIO_DSP_SETTINGS { EmitterToListenerDistance FLOAT32 } { EmitterVelocityComponent FLOAT32 } { ListenerVelocityComponent FLOAT32 } ; -TYPEDEF: X3DAUDIO_DSP_SETTINGS* LPX3DAUDIO_DSP_SETTINGS ; +TYPEDEF: X3DAUDIO_DSP_SETTINGS* LPX3DAUDIO_DSP_SETTINGS FUNCTION: void X3DAudioInitialize ( UINT32 SpeakerChannelMask, FLOAT32 SpeedOfSound, X3DAUDIO_HANDLE Instance ) ; diff --git a/ffi/windows/directx/xact3/xact3.factor b/ffi/windows/directx/xact3/xact3.factor index 53d7dade3b..44a3f612c1 100644 --- a/ffi/windows/directx/xact3/xact3.factor +++ b/ffi/windows/directx/xact3/xact3.factor @@ -12,19 +12,19 @@ C-TYPE: IXACT3Wave C-TYPE: IXACT3Engine C-TYPE: XACT_NOTIFICATION -TYPEDEF: WORD XACTINDEX ; -TYPEDEF: BYTE XACTNOTIFICATIONTYPE ; -TYPEDEF: FLOAT XACTVARIABLEVALUE ; -TYPEDEF: WORD XACTVARIABLEINDEX ; -TYPEDEF: WORD XACTCATEGORY ; -TYPEDEF: BYTE XACTCHANNEL ; -TYPEDEF: FLOAT XACTVOLUME ; -TYPEDEF: LONG XACTTIME ; -TYPEDEF: SHORT XACTPITCH ; -TYPEDEF: BYTE XACTLOOPCOUNT ; -TYPEDEF: BYTE XACTVARIATIONWEIGHT ; -TYPEDEF: BYTE XACTPRIORITY ; -TYPEDEF: BYTE XACTINSTANCELIMIT ; +TYPEDEF: WORD XACTINDEX +TYPEDEF: BYTE XACTNOTIFICATIONTYPE +TYPEDEF: FLOAT XACTVARIABLEVALUE +TYPEDEF: WORD XACTVARIABLEINDEX +TYPEDEF: WORD XACTCATEGORY +TYPEDEF: BYTE XACTCHANNEL +TYPEDEF: FLOAT XACTVOLUME +TYPEDEF: LONG XACTTIME +TYPEDEF: SHORT XACTPITCH +TYPEDEF: BYTE XACTLOOPCOUNT +TYPEDEF: BYTE XACTVARIATIONWEIGHT +TYPEDEF: BYTE XACTPRIORITY +TYPEDEF: BYTE XACTINSTANCELIMIT CONSTANT: WAVE_FORMAT_IEEE_FLOAT 0x0003 CONSTANT: WAVE_FORMAT_EXTENSIBLE 0xFFFE @@ -37,9 +37,9 @@ STRUCT: WAVEFORMATEX { nBlockAlign WORD } { wBitsPerSample WORD } { cbSize WORD } ; -TYPEDEF: WAVEFORMATEX* PWAVEFORMATEX ; -TYPEDEF: WAVEFORMATEX* NPWAVEFORMATEX ; -TYPEDEF: WAVEFORMATEX* LPWAVEFORMATEX ; +TYPEDEF: WAVEFORMATEX* PWAVEFORMATEX +TYPEDEF: WAVEFORMATEX* NPWAVEFORMATEX +TYPEDEF: WAVEFORMATEX* LPWAVEFORMATEX UNION-STRUCT: WAVEFORMATEXTENSIBLE_UNION { wValidBitsPerSample WORD } @@ -50,7 +50,7 @@ STRUCT: WAVEFORMATEXTENSIBLE { Union WAVEFORMATEXTENSIBLE_UNION } { dwChannelMask DWORD } { SubFormat GUID } ; -TYPEDEF: WAVEFORMATEXTENSIBLE* PWAVEFORMATEXTENSIBLE ; +TYPEDEF: WAVEFORMATEXTENSIBLE* PWAVEFORMATEXTENSIBLE CONSTANT: XACTTIME_MIN 0x80000001 CONSTANT: XACTTIME_MAX 0x7fffffff @@ -113,7 +113,7 @@ C-TYPE: XACT_GETOVERLAPPEDRESULT_CB STRUCT: XACT_FILEIO_CALLBACKS { readFileCallback XACT_READFILE_CB* } { getOverlappedResultCallback XACT_GETOVERLAPPEDRESULT_CB* } ; -TYPEDEF: XACT_FILEIO_CALLBACKS* PXACT_FILEIO_CALLBACKS ; +TYPEDEF: XACT_FILEIO_CALLBACKS* PXACT_FILEIO_CALLBACKS C-TYPE: XACT_NOTIFICATION_CALLBACK @@ -124,7 +124,7 @@ STRUCT: XACT_RENDERER_DETAILS { rendererID WCHAR[255] } { displayName WCHAR[255] } { defaultDevice BOOL } ; -TYPEDEF: XACT_RENDERER_DETAILS* LPXACT_RENDERER_DETAILS ; +TYPEDEF: XACT_RENDERER_DETAILS* LPXACT_RENDERER_DETAILS CONSTANT: XACT_ENGINE_LOOKAHEAD_DEFAULT 250 @@ -139,16 +139,16 @@ STRUCT: XACT_RUNTIME_PARAMETERS { pRendererID PWSTR } { pXAudio2 IXAudio2* } { pMasteringVoice IXAudio2MasteringVoice* } ; -TYPEDEF: XACT_RUNTIME_PARAMETERS* LPXACT_RUNTIME_PARAMETERS ; +TYPEDEF: XACT_RUNTIME_PARAMETERS* LPXACT_RUNTIME_PARAMETERS STRUCT: XACT_STREAMING_PARAMETERS { file HANDLE } { offset DWORD } { flags DWORD } { packetSize WORD } ; -TYPEDEF: XACT_STREAMING_PARAMETERS XACT_WAVEBANK_STREAMING_PARAMETERS ; -TYPEDEF: XACT_WAVEBANK_STREAMING_PARAMETERS* LPXACT_WAVEBANK_STREAMING_PARAMETERS ; -TYPEDEF: XACT_STREAMING_PARAMETERS* LPXACT_STREAMING_PARAMETERS ; +TYPEDEF: XACT_STREAMING_PARAMETERS XACT_WAVEBANK_STREAMING_PARAMETERS +TYPEDEF: XACT_WAVEBANK_STREAMING_PARAMETERS* LPXACT_WAVEBANK_STREAMING_PARAMETERS +TYPEDEF: XACT_STREAMING_PARAMETERS* LPXACT_STREAMING_PARAMETERS STRUCT: XACT_CUE_PROPERTIES { friendlyName CHAR[255] } @@ -157,7 +157,7 @@ STRUCT: XACT_CUE_PROPERTIES { numVariations XACTINDEX } { maxInstances XACTINSTANCELIMIT } { currentInstances XACTINSTANCELIMIT } ; -TYPEDEF: XACT_CUE_PROPERTIES* LPXACT_CUE_PROPERTIES ; +TYPEDEF: XACT_CUE_PROPERTIES* LPXACT_CUE_PROPERTIES STRUCT: XACT_TRACK_PROPERTIES { duration XACTTIME } @@ -165,7 +165,7 @@ STRUCT: XACT_TRACK_PROPERTIES { numChannels XACTCHANNEL } { waveVariation XACTINDEX } { loopCount XACTLOOPCOUNT } ; -TYPEDEF: XACT_TRACK_PROPERTIES* LPXACT_TRACK_PROPERTIES ; +TYPEDEF: XACT_TRACK_PROPERTIES* LPXACT_TRACK_PROPERTIES STRUCT: XACT_VARIATION_PROPERTIES { index XACTINDEX } @@ -173,7 +173,7 @@ STRUCT: XACT_VARIATION_PROPERTIES { iaVariableMin XACTVARIABLEVALUE } { iaVariableMax XACTVARIABLEVALUE } { linger BOOL } ; -TYPEDEF: XACT_VARIATION_PROPERTIES* LPXACT_VARIATION_PROPERTIES ; +TYPEDEF: XACT_VARIATION_PROPERTIES* LPXACT_VARIATION_PROPERTIES STRUCT: XACT_SOUND_PROPERTIES { category XACTCATEGORY } @@ -182,18 +182,18 @@ STRUCT: XACT_SOUND_PROPERTIES { volume XACTVOLUME } { numTracks XACTINDEX } { arrTrackProperties XACT_TRACK_PROPERTIES } ; -TYPEDEF: XACT_SOUND_PROPERTIES* LPXACT_SOUND_PROPERTIES ; +TYPEDEF: XACT_SOUND_PROPERTIES* LPXACT_SOUND_PROPERTIES STRUCT: XACT_SOUND_VARIATION_PROPERTIES { variationProperties XACT_VARIATION_PROPERTIES } { soundProperties XACT_SOUND_PROPERTIES } ; -TYPEDEF: XACT_SOUND_VARIATION_PROPERTIES* LPXACT_SOUND_VARIATION_PROPERTIES ; +TYPEDEF: XACT_SOUND_VARIATION_PROPERTIES* LPXACT_SOUND_VARIATION_PROPERTIES STRUCT: XACT_CUE_INSTANCE_PROPERTIES { allocAttributes DWORD } { cueProperties XACT_CUE_PROPERTIES } { activeVariationProperties XACT_SOUND_VARIATION_PROPERTIES } ; -TYPEDEF: XACT_CUE_INSTANCE_PROPERTIES* LPXACT_CUE_INSTANCE_PROPERTIES ; +TYPEDEF: XACT_CUE_INSTANCE_PROPERTIES* LPXACT_CUE_INSTANCE_PROPERTIES STRUCT: WAVEBANKMINIWAVEFORMAT { dwValue DWORD } ; @@ -208,33 +208,33 @@ STRUCT: XACT_WAVE_PROPERTIES { durationInSamples DWORD } { loopRegion WAVEBANKSAMPLEREGION } { streaming BOOL } ; -TYPEDEF: XACT_WAVE_PROPERTIES* LPXACT_WAVE_PROPERTIES ; +TYPEDEF: XACT_WAVE_PROPERTIES* LPXACT_WAVE_PROPERTIES STRUCT: XACT_WAVE_INSTANCE_PROPERTIES { properties XACT_WAVE_PROPERTIES } { backgroundMusic BOOL } ; -TYPEDEF: XACT_WAVE_INSTANCE_PROPERTIES* LPXACT_WAVE_INSTANCE_PROPERTIES ; +TYPEDEF: XACT_WAVE_INSTANCE_PROPERTIES* LPXACT_WAVE_INSTANCE_PROPERTIES STRUCT: XACTCHANNELMAPENTRY { InputChannel XACTCHANNEL } { OutputChannel XACTCHANNEL } { Volume XACTVOLUME } ; -TYPEDEF: XACTCHANNELMAPENTRY* LPXACTCHANNELMAPENTRY ; +TYPEDEF: XACTCHANNELMAPENTRY* LPXACTCHANNELMAPENTRY STRUCT: XACTCHANNELMAP { EntryCount XACTCHANNEL } { paEntries XACTCHANNELMAPENTRY* } ; -TYPEDEF: XACTCHANNELMAP* LPXACTCHANNELMAP ; +TYPEDEF: XACTCHANNELMAP* LPXACTCHANNELMAP STRUCT: XACTCHANNELVOLUMEENTRY { EntryIndex XACTCHANNEL } { Volume XACTVOLUME } ; -TYPEDEF: XACTCHANNELVOLUMEENTRY* LPXACTCHANNELVOLUMEENTRY ; +TYPEDEF: XACTCHANNELVOLUMEENTRY* LPXACTCHANNELVOLUMEENTRY STRUCT: XACTCHANNELVOLUME { EntryCount XACTCHANNEL } { paEntries XACTCHANNELVOLUMEENTRY* } ; -TYPEDEF: XACTCHANNELVOLUME* LPXACTCHANNELVOLUME ; +TYPEDEF: XACTCHANNELVOLUME* LPXACTCHANNELVOLUME CONSTANT: XACTNOTIFICATIONTYPE_CUEPREPARED 1 CONSTANT: XACTNOTIFICATIONTYPE_CUEPLAY 2 @@ -267,28 +267,28 @@ STRUCT: XACT_NOTIFICATION_DESCRIPTION { cueIndex XACTINDEX } { waveIndex XACTINDEX } { pvContext PVOID } ; -TYPEDEF: XACT_NOTIFICATION_DESCRIPTION* LPXACT_NOTIFICATION_DESCRIPTION ; +TYPEDEF: XACT_NOTIFICATION_DESCRIPTION* LPXACT_NOTIFICATION_DESCRIPTION STRUCT: XACT_NOTIFICATION_CUE { cueIndex XACTINDEX } { pSoundBank IXACT3SoundBank* } { pCue IXACT3Cue* } ; -TYPEDEF: XACT_NOTIFICATION_CUE* LPXACT_NOTIFICATION_CUE ; +TYPEDEF: XACT_NOTIFICATION_CUE* LPXACT_NOTIFICATION_CUE STRUCT: XACT_NOTIFICATION_MARKER { cueIndex XACTINDEX } { pSoundBank IXACT3SoundBank* } { pCue IXACT3Cue* } { marker DWORD } ; -TYPEDEF: XACT_NOTIFICATION_MARKER* LPXACT_NOTIFICATION_MARKER ; +TYPEDEF: XACT_NOTIFICATION_MARKER* LPXACT_NOTIFICATION_MARKER STRUCT: XACT_NOTIFICATION_SOUNDBANK { pSoundBank IXACT3SoundBank* } ; -TYPEDEF: XACT_NOTIFICATION_SOUNDBANK* LPXACT_NOTIFICATION_SOUNDBANK ; +TYPEDEF: XACT_NOTIFICATION_SOUNDBANK* LPXACT_NOTIFICATION_SOUNDBANK STRUCT: XACT_NOTIFICATION_WAVEBANK { pWaveBank IXACT3WaveBank* } ; -TYPEDEF: XACT_NOTIFICATION_WAVEBANK* LPXACT_NOTIFICATION_WAVEBANK ; +TYPEDEF: XACT_NOTIFICATION_WAVEBANK* LPXACT_NOTIFICATION_WAVEBANK STRUCT: XACT_NOTIFICATION_VARIABLE { cueIndex XACTINDEX } @@ -297,11 +297,11 @@ STRUCT: XACT_NOTIFICATION_VARIABLE { variableIndex XACTVARIABLEINDEX } { variableValue XACTVARIABLEVALUE } { local BOOL } ; -TYPEDEF: XACT_NOTIFICATION_VARIABLE* LPXACT_NOTIFICATION_VARIABLE ; +TYPEDEF: XACT_NOTIFICATION_VARIABLE* LPXACT_NOTIFICATION_VARIABLE STRUCT: XACT_NOTIFICATION_GUI { reserved DWORD } ; -TYPEDEF: XACT_NOTIFICATION_GUI* LPXACT_NOTIFICATION_GUI ; +TYPEDEF: XACT_NOTIFICATION_GUI* LPXACT_NOTIFICATION_GUI STRUCT: XACT_NOTIFICATION_WAVE { pWaveBank IXACT3WaveBank* } @@ -310,7 +310,7 @@ STRUCT: XACT_NOTIFICATION_WAVE { pSoundBank IXACT3SoundBank* } { pCue IXACT3Cue* } { pWave IXACT3Wave* } ; -TYPEDEF: XACT_NOTIFICATION_WAVE* LPXACT_NOTIFICATION_WAVE ; +TYPEDEF: XACT_NOTIFICATION_WAVE* LPXACT_NOTIFICATION_WAVE UNION-STRUCT: XACT_NOTIFICATION_UNION { cue XACT_NOTIFICATION_CUE } @@ -325,7 +325,7 @@ STRUCT: XACT_NOTIFICATION { timeStamp LONG } { pvContext PVOID } { union XACT_NOTIFICATION_UNION } ; -TYPEDEF: XACT_NOTIFICATION* LPXACT_NOTIFICATION ; +TYPEDEF: XACT_NOTIFICATION* LPXACT_NOTIFICATION CONSTANT: XACT_FLAG_SOUNDBANK_STOP_IMMEDIATE 0x00000001 CONSTANT: XACT_SOUNDBANKSTATE_INUSE 0x00000080 diff --git a/ffi/windows/directx/xaudio2/xaudio2.factor b/ffi/windows/directx/xaudio2/xaudio2.factor index f0985b0499..d236374301 100644 --- a/ffi/windows/directx/xaudio2/xaudio2.factor +++ b/ffi/windows/directx/xaudio2/xaudio2.factor @@ -91,8 +91,8 @@ CONSTANT: Processor31 0x40000000 CONSTANT: Processor32 0x80000000 CONSTANT: XAUDIO2_ANY_PROCESSOR 0xffffffff CONSTANT: XAUDIO2_DEFAULT_PROCESSOR 0xffffffff -TYPEDEF: int XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER ; -TYPEDEF: int XAUDIO2_PROCESSOR ; +TYPEDEF: int XAUDIO2_WINDOWS_PROCESSOR_SPECIFIER +TYPEDEF: int XAUDIO2_PROCESSOR CONSTANT: NotDefaultDevice 0x0 CONSTANT: DefaultConsoleDevice 0x1 @@ -101,7 +101,7 @@ CONSTANT: DefaultCommunicationsDevice 0x4 CONSTANT: DefaultGameDevice 0x8 CONSTANT: GlobalDefaultDevice 0xf CONSTANT: InvalidDeviceRole 0x0 -TYPEDEF: int XAUDIO2_DEVICE_ROLE ; +TYPEDEF: int XAUDIO2_DEVICE_ROLE STRUCT: XAUDIO2_DEVICE_DETAILS { DeviceID WCHAR[256] } diff --git a/ffi/windows/directx/xinput/xinput.factor b/ffi/windows/directx/xinput/xinput.factor index 3cf5de16d3..28525aa5b4 100755 --- a/ffi/windows/directx/xinput/xinput.factor +++ b/ffi/windows/directx/xinput/xinput.factor @@ -88,12 +88,12 @@ STRUCT: XINPUT_GAMEPAD { sThumbLY SHORT } { sThumbRX SHORT } { sThumbRY SHORT } ; -TYPEDEF: XINPUT_GAMEPAD* PXINPUT_GAMEPAD ; +TYPEDEF: XINPUT_GAMEPAD* PXINPUT_GAMEPAD STRUCT: XINPUT_VIBRATION { wLeftMotorSpeed WORD } { wRightMotorSpeed WORD } ; -TYPEDEF: XINPUT_VIBRATION* PXINPUT_VIBRATION ; +TYPEDEF: XINPUT_VIBRATION* PXINPUT_VIBRATION STRUCT: XINPUT_CAPABILITIES { Type BYTE } @@ -101,7 +101,7 @@ STRUCT: XINPUT_CAPABILITIES { Flags WORD } { Gamepad XINPUT_GAMEPAD } { Vibration XINPUT_VIBRATION } ; -TYPEDEF: XINPUT_CAPABILITIES* PXINPUT_CAPABILITIES ; +TYPEDEF: XINPUT_CAPABILITIES* PXINPUT_CAPABILITIES STRUCT: XINPUT_KEYSTROKE { VirtualKey WORD } @@ -109,12 +109,12 @@ STRUCT: XINPUT_KEYSTROKE { Flags WORD } { UserIndex BYTE } { HidCode BYTE } ; -TYPEDEF: XINPUT_KEYSTROKE* PXINPUT_KEYSTROKE ; +TYPEDEF: XINPUT_KEYSTROKE* PXINPUT_KEYSTROKE STRUCT: XINPUT_STATE { dwPacketNumber DWORD } { Gamepad XINPUT_GAMEPAD } ; -TYPEDEF: XINPUT_STATE* PXINPUT_STATE ; +TYPEDEF: XINPUT_STATE* PXINPUT_STATE FUNCTION: DWORD XInputGetCapabilities ( DWORD dwUserIndex, DWORD dwFlags, XINPUT_CAPABILITIES* pCapabilities ) ; FUNCTION: DWORD XInputGetKeystroke ( DWORD dwUserIndex, DWORD dwReserved, PXINPUT_KEYSTROKE pKeystroke ) ; diff --git a/ffi/windows/gdiplus/gdiplus.factor b/ffi/windows/gdiplus/gdiplus.factor index f2e938553a..f5fda64463 100644 --- a/ffi/windows/gdiplus/gdiplus.factor +++ b/ffi/windows/gdiplus/gdiplus.factor @@ -12,7 +12,7 @@ FUNCTION: void GdipFree ( void* mem ) ; DESTRUCTOR: GdipFree -TYPEDEF: float REAL ; +TYPEDEF: float REAL ENUM: GpStatus { Ok 0 } @@ -39,8 +39,8 @@ ENUM: GpStatus { ProfileNotFound 21 } ; CALLBACK: BOOL ImageAbort ( void* data ) ; -TYPEDEF: ImageAbort DrawImageAbort ; -TYPEDEF: ImageAbort GetThumbnailImageAbort ; +TYPEDEF: ImageAbort DrawImageAbort +TYPEDEF: ImageAbort GetThumbnailImageAbort STRUCT: GpPoint { X INT } @@ -71,8 +71,8 @@ STRUCT: CharacterRange { First INT } { Length INT } ; -TYPEDEF: UINT GraphicsState ; -TYPEDEF: UINT GraphicsContainer ; +TYPEDEF: UINT GraphicsState +TYPEDEF: UINT GraphicsContainer ENUM: GpUnit { UnitWorld 0 } @@ -427,8 +427,8 @@ STRUCT: GdiplusStartupOutput FUNCTION: GpStatus GdiplusStartup ( ULONG_PTR* x, GdiplusStartupInput* in, GdiplusStartupOutput* out ) ; FUNCTION: void GdiplusShutdown ( ULONG_PTR x ) ; -TYPEDEF: DWORD ARGB ; -TYPEDEF: INT PixelFormat ; +TYPEDEF: DWORD ARGB +TYPEDEF: INT PixelFormat PRIVATE< : pixel-format-constant ( n m l -- format ) diff --git a/ffi/windows/iphlpapi/iphlpapi.factor b/ffi/windows/iphlpapi/iphlpapi.factor index d36feb7521..364b3afe83 100644 --- a/ffi/windows/iphlpapi/iphlpapi.factor +++ b/ffi/windows/iphlpapi/iphlpapi.factor @@ -49,9 +49,9 @@ CONSTANT: MAX_ADAPTER_NAME 128 STRUCT: IP_ADDRESS_STRING { String char[16] } ; -TYPEDEF: IP_ADDRESS_STRING* PIP_ADDRESS_STRING ; -TYPEDEF: IP_ADDRESS_STRING IP_MASK_STRING ; -TYPEDEF: IP_MASK_STRING* PIP_MASK_STRING ; +TYPEDEF: IP_ADDRESS_STRING* PIP_ADDRESS_STRING +TYPEDEF: IP_ADDRESS_STRING IP_MASK_STRING +TYPEDEF: IP_MASK_STRING* PIP_MASK_STRING STRUCT: IP_ADDR_STRING { Next IP_ADDR_STRING* } @@ -59,7 +59,7 @@ STRUCT: IP_ADDR_STRING { IpMask IP_MASK_STRING } { Context DWORD } ; -TYPEDEF: IP_ADDR_STRING* PIP_ADDR_STRING ; +TYPEDEF: IP_ADDR_STRING* PIP_ADDR_STRING STRUCT: FIXED_INFO { HostName char[MAX_HOSTNAME_LEN+4] } @@ -75,10 +75,10 @@ STRUCT: FIXED_INFO DEFER: IP_ADAPTER_INFO -TYPEDEF: ulong time_t ; -TYPEDEF: uchar UINT8 ; -TYPEDEF: uint NET_IF_COMPARTMENT_ID ; -TYPEDEF: GUID NET_IF_NETWORK_GUID ; +TYPEDEF: ulong time_t +TYPEDEF: uchar UINT8 +TYPEDEF: uint NET_IF_COMPARTMENT_ID +TYPEDEF: GUID NET_IF_NETWORK_GUID ENUM: IP_DAD_STATE IpDadStateInvalid @@ -144,7 +144,7 @@ ERROR: unknown-sockaddr-length sockaddr length ; [ unknown-sockaddr-length ] } case ; -TYPEDEF: SOCKET_ADDRESS* PSOCKET_ADDRESS ; +TYPEDEF: SOCKET_ADDRESS* PSOCKET_ADDRESS STRUCT: IP_ADAPTER_INFO { Next IP_ADAPTER_INFO* } @@ -166,13 +166,13 @@ STRUCT: IP_ADAPTER_INFO { LeaseObtained time_t } { LeaseExpires time_t } ; -TYPEDEF: IP_ADAPTER_INFO* PIP_ADAPTER_INFO ; +TYPEDEF: IP_ADAPTER_INFO* PIP_ADAPTER_INFO STRUCT: LengthIndex { Length ULONG } { IfIndex DWORD } ; -TYPEDEF: LengthIndex LengthFlags ; +TYPEDEF: LengthIndex LengthFlags UNION-STRUCT: AlignmentLenIndex { Alignment ULONGLONG } @@ -191,8 +191,8 @@ UNION-STRUCT: NET_LUID { Value ULONG64 } { Info ResNetIf } ; -TYPEDEF: NET_LUID* PNET_LUID ; -TYPEDEF: NET_LUID IF_LUID ; +TYPEDEF: NET_LUID* PNET_LUID +TYPEDEF: NET_LUID IF_LUID DEFER: IP_ADAPTER_ADDRESSES DEFER: IP_ADAPTER_UNICAST_ADDRESS @@ -208,7 +208,7 @@ STRUCT: IP_ADAPTER_UNICAST_ADDRESS { LeaseLifeTime ULONG } { OnLinkPrefixLength UINT8 } ; -TYPEDEF: IP_ADAPTER_UNICAST_ADDRESS* PIP_ADAPTER_UNICAST_ADDRESS ; +TYPEDEF: IP_ADAPTER_UNICAST_ADDRESS* PIP_ADAPTER_UNICAST_ADDRESS DEFER: IP_ADAPTER_ANYCAST_ADDRESS STRUCT: IP_ADAPTER_ANYCAST_ADDRESS @@ -216,7 +216,7 @@ STRUCT: IP_ADAPTER_ANYCAST_ADDRESS { Next IP_ADAPTER_ANYCAST_ADDRESS* } { Address SOCKET_ADDRESS } ; -TYPEDEF: IP_ADAPTER_ANYCAST_ADDRESS* PIP_ADAPTER_ANYCAST_ADDRESS ; +TYPEDEF: IP_ADAPTER_ANYCAST_ADDRESS* PIP_ADAPTER_ANYCAST_ADDRESS DEFER: IP_ADAPTER_MULTICAST_ADDRESS @@ -225,7 +225,7 @@ STRUCT: IP_ADAPTER_MULTICAST_ADDRESS { Next IP_ADAPTER_MULTICAST_ADDRESS* } { Address SOCKET_ADDRESS } ; -TYPEDEF: IP_ADAPTER_MULTICAST_ADDRESS* PIP_ADAPTER_MULTICAST_ADDRESS ; +TYPEDEF: IP_ADAPTER_MULTICAST_ADDRESS* PIP_ADAPTER_MULTICAST_ADDRESS DEFER: IP_ADAPTER_DNS_SERVER_ADDRESS @@ -234,7 +234,7 @@ STRUCT: IP_ADAPTER_DNS_SERVER_ADDRESS { Next IP_ADAPTER_DNS_SERVER_ADDRESS* } { Address SOCKET_ADDRESS } ; -TYPEDEF: IP_ADAPTER_DNS_SERVER_ADDRESS* PIP_ADAPTER_DNS_SERVER_ADDRESS ; +TYPEDEF: IP_ADAPTER_DNS_SERVER_ADDRESS* PIP_ADAPTER_DNS_SERVER_ADDRESS DEFER: IP_ADAPTER_WINS_SERVER_ADDRESS @@ -243,9 +243,9 @@ STRUCT: IP_ADAPTER_WINS_SERVER_ADDRESS { Next IP_ADAPTER_WINS_SERVER_ADDRESS* } { Address SOCKET_ADDRESS } ; -TYPEDEF: IP_ADAPTER_WINS_SERVER_ADDRESS* PIP_ADAPTER_WINS_SERVER_ADDRESS ; +TYPEDEF: IP_ADAPTER_WINS_SERVER_ADDRESS* PIP_ADAPTER_WINS_SERVER_ADDRESS -TYPEDEF: IP_ADAPTER_WINS_SERVER_ADDRESS* PIP_ADAPTER_WINS_SERVER_ADDRESS_LH ; +TYPEDEF: IP_ADAPTER_WINS_SERVER_ADDRESS* PIP_ADAPTER_WINS_SERVER_ADDRESS_LH @@ -255,9 +255,9 @@ STRUCT: IP_ADAPTER_GATEWAY_ADDRESS { Next IP_ADAPTER_GATEWAY_ADDRESS* } { Address SOCKET_ADDRESS } ; -TYPEDEF: IP_ADAPTER_GATEWAY_ADDRESS* PIP_ADAPTER_GATEWAY_ADDRESS ; +TYPEDEF: IP_ADAPTER_GATEWAY_ADDRESS* PIP_ADAPTER_GATEWAY_ADDRESS -TYPEDEF: IP_ADAPTER_GATEWAY_ADDRESS* PIP_ADAPTER_GATEWAY_ADDRESS_LH ; +TYPEDEF: IP_ADAPTER_GATEWAY_ADDRESS* PIP_ADAPTER_GATEWAY_ADDRESS_LH DEFER: IP_ADAPTER_PREFIX STRUCT: IP_ADAPTER_PREFIX @@ -266,7 +266,7 @@ STRUCT: IP_ADAPTER_PREFIX { Address SOCKET_ADDRESS } { PrefixLength ULONG } ; -TYPEDEF: IP_ADAPTER_PREFIX* PIP_ADAPTER_PREFIX ; +TYPEDEF: IP_ADAPTER_PREFIX* PIP_ADAPTER_PREFIX DEFER: IP_ADAPTER_DNS_SUFFIX @@ -274,7 +274,7 @@ STRUCT: IP_ADAPTER_DNS_SUFFIX { Next IP_ADAPTER_DNS_SUFFIX* } { String WCHAR[MAX_DNS_SUFFIX_STRING_LENGTH] } ; -TYPEDEF: IP_ADAPTER_DNS_SUFFIX* PIP_ADAPTER_DNS_SUFFIX ; +TYPEDEF: IP_ADAPTER_DNS_SUFFIX* PIP_ADAPTER_DNS_SUFFIX CONSTANT: GAA_FLAG_SKIP_UNICAST 0x0001 @@ -327,9 +327,9 @@ STRUCT: IP_ADAPTER_ADDRESSES { Dhcpv6Iaid ULONG } { FirstDnsSuffix PIP_ADAPTER_DNS_SUFFIX } ; -TYPEDEF: IP_ADAPTER_ADDRESSES* PIP_ADAPTER_ADDRESSES ; +TYPEDEF: IP_ADAPTER_ADDRESSES* PIP_ADAPTER_ADDRESSES -TYPEDEF: FIXED_INFO* PFIXED_INFO ; +TYPEDEF: FIXED_INFO* PFIXED_INFO STRUCT: S_un_b { s_b1 uchar } @@ -354,7 +354,7 @@ UNION-STRUCT: S_un STRUCT: IP_ADAPTER_INDEX_MAP { Index ULONG } { Name WCHAR[MAX_ADAPTER_NAME] } ; -TYPEDEF: IP_ADAPTER_INDEX_MAP* PIP_ADAPTER_INDEX_MAP ; +TYPEDEF: IP_ADAPTER_INDEX_MAP* PIP_ADAPTER_INDEX_MAP FUNCTION: DWORD IpReleaseAddress ( PIP_ADAPTER_INDEX_MAP AdapterInfo ) ; FUNCTION: DWORD IpRenewAddress ( PIP_ADAPTER_INDEX_MAP AdapterInfo ) ; diff --git a/ffi/windows/kernel32/kernel32.factor b/ffi/windows/kernel32/kernel32.factor index c9a1f8ba24..060a3f7134 100644 --- a/ffi/windows/kernel32/kernel32.factor +++ b/ffi/windows/kernel32/kernel32.factor @@ -111,7 +111,7 @@ STRUCT: FILE_NOTIFY_INFORMATION { FileNameLength DWORD } { FileName WCHAR[1] } ; -TYPEDEF: FILE_NOTIFY_INFORMATION* PFILE_NOTIFY_INFORMATION ; +TYPEDEF: FILE_NOTIFY_INFORMATION* PFILE_NOTIFY_INFORMATION CONSTANT: STD_INPUT_HANDLE -10 CONSTANT: STD_OUTPUT_HANDLE -11 @@ -273,7 +273,7 @@ STRUCT: STARTUPINFO { hStdOutput HANDLE } { hStdError HANDLE } ; -TYPEDEF: void* LPSTARTUPINFO ; +TYPEDEF: void* LPSTARTUPINFO STRUCT: PROCESS_INFORMATION { hProcess HANDLE } @@ -293,7 +293,7 @@ STRUCT: SYSTEM_INFO { wProcessorLevel WORD } { wProcessorRevision WORD } ; -TYPEDEF: void* LPSYSTEM_INFO ; +TYPEDEF: void* LPSYSTEM_INFO STRUCT: MEMORYSTATUS { dwLength DWORD } @@ -305,7 +305,7 @@ STRUCT: MEMORYSTATUS { dwTotalVirtual SIZE_T } { dwAvailVirtual SIZE_T } ; -TYPEDEF: void* LPMEMORYSTATUS ; +TYPEDEF: void* LPMEMORYSTATUS STRUCT: MEMORYSTATUSEX { dwLength DWORD } @@ -318,7 +318,7 @@ STRUCT: MEMORYSTATUSEX { ullAvailVirtual DWORDLONG } { ullAvailExtendedVirtual DWORDLONG } ; -TYPEDEF: void* LPMEMORYSTATUSEX ; +TYPEDEF: void* LPMEMORYSTATUSEX STRUCT: OSVERSIONINFO { dwOSVersionInfoSize DWORD } @@ -328,7 +328,7 @@ STRUCT: OSVERSIONINFO { dwPlatformId DWORD } { szCSDVersion WCHAR[128] } ; -TYPEDEF: void* LPOSVERSIONINFO ; +TYPEDEF: void* LPOSVERSIONINFO STRUCT: MEMORY_BASIC_INFORMATION { BaseAddress void* } @@ -553,8 +553,8 @@ STRUCT: DCB { EofChar char } { EvtChar char } { wReserved1 WORD } ; -TYPEDEF: DCB* PDCB ; -TYPEDEF: DCB* LPDCB ; +TYPEDEF: DCB* PDCB +TYPEDEF: DCB* LPDCB STRUCT: COMMCONFIG { dwSize DWORD } @@ -565,7 +565,7 @@ STRUCT: COMMCONFIG { dwProviderOffset DWORD } { dwProviderSize DWORD } { wcProviderData { WCHAR 1 } } ; -TYPEDEF: COMMCONFIG* LPCOMMCONFIG ; +TYPEDEF: COMMCONFIG* LPCOMMCONFIG STRUCT: COMMPROP { wPacketLength WORD } @@ -586,7 +586,7 @@ STRUCT: COMMPROP { dwProvSpec1 DWORD } { dwProvSpec2 DWORD } { wcProvChar { WCHAR 1 } } ; -TYPEDEF: COMMPROP* LPCOMMPROP ; +TYPEDEF: COMMPROP* LPCOMMPROP CONSTANT: SE_CREATE_TOKEN_NAME "SeCreateTokenPrivilege" @@ -661,17 +661,17 @@ CONSTANT: WAIT_FAILED 0xffffffff STRUCT: LUID { LowPart DWORD } { HighPart LONG } ; -TYPEDEF: LUID* PLUID ; +TYPEDEF: LUID* PLUID STRUCT: LUID_AND_ATTRIBUTES { Luid LUID } { Attributes DWORD } ; -TYPEDEF: LUID_AND_ATTRIBUTES* PLUID_AND_ATTRIBUTES ; +TYPEDEF: LUID_AND_ATTRIBUTES* PLUID_AND_ATTRIBUTES STRUCT: TOKEN_PRIVILEGES { PrivilegeCount DWORD } { Privileges LUID_AND_ATTRIBUTES* } ; -TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES ; +TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES STRUCT: WIN32_FILE_ATTRIBUTE_DATA { dwFileAttributes DWORD } @@ -680,7 +680,7 @@ STRUCT: WIN32_FILE_ATTRIBUTE_DATA { ftLastWriteTime FILETIME } { nFileSizeHigh DWORD } { nFileSizeLow DWORD } ; -TYPEDEF: WIN32_FILE_ATTRIBUTE_DATA* LPWIN32_FILE_ATTRIBUTE_DATA ; +TYPEDEF: WIN32_FILE_ATTRIBUTE_DATA* LPWIN32_FILE_ATTRIBUTE_DATA STRUCT: BY_HANDLE_FILE_INFORMATION { dwFileAttributes DWORD } @@ -693,7 +693,7 @@ STRUCT: BY_HANDLE_FILE_INFORMATION { nNumberOfLinks DWORD } { nFileIndexHigh DWORD } { nFileIndexLow DWORD } ; -TYPEDEF: BY_HANDLE_FILE_INFORMATION* LPBY_HANDLE_FILE_INFORMATION ; +TYPEDEF: BY_HANDLE_FILE_INFORMATION* LPBY_HANDLE_FILE_INFORMATION CONSTANT: OFS_MAXPATHNAME 128 @@ -706,7 +706,7 @@ STRUCT: OFSTRUCT { szPathName { CHAR 128 } } ; ! { szPathName { CHAR OFS_MAXPATHNAME } } ; -TYPEDEF: OFSTRUCT* LPOFSTRUCT ; +TYPEDEF: OFSTRUCT* LPOFSTRUCT STRUCT: WIN32_FIND_DATA { dwFileAttributes DWORD } @@ -720,23 +720,23 @@ STRUCT: WIN32_FIND_DATA { cFileName { TCHAR MAX_PATH } } { cAlternateFileName TCHAR[14] } ; -TYPEDEF: WIN32_FIND_DATA* PWIN32_FIND_DATA ; -TYPEDEF: WIN32_FIND_DATA* LPWIN32_FIND_DATA ; -TYPEDEF: void* POVERLAPPED ; -TYPEDEF: void* LPOVERLAPPED ; -TYPEDEF: void* LPSECURITY_ATTRIBUTES ; -TYPEDEF: void* LPPROCESS_INFORMATION ; +TYPEDEF: WIN32_FIND_DATA* PWIN32_FIND_DATA +TYPEDEF: WIN32_FIND_DATA* LPWIN32_FIND_DATA +TYPEDEF: void* POVERLAPPED +TYPEDEF: void* LPOVERLAPPED +TYPEDEF: void* LPSECURITY_ATTRIBUTES +TYPEDEF: void* LPPROCESS_INFORMATION -TYPEDEF: SYSTEMTIME* PSYSTEMTIME ; -TYPEDEF: PSYSTEMTIME LPSYSTEMTIME ; +TYPEDEF: SYSTEMTIME* PSYSTEMTIME +TYPEDEF: PSYSTEMTIME LPSYSTEMTIME -TYPEDEF: TIME_ZONE_INFORMATION* PTIME_ZONE_INFORMATION ; -TYPEDEF: PTIME_ZONE_INFORMATION LPTIME_ZONE_INFORMATION ; +TYPEDEF: TIME_ZONE_INFORMATION* PTIME_ZONE_INFORMATION +TYPEDEF: PTIME_ZONE_INFORMATION LPTIME_ZONE_INFORMATION -TYPEDEF: FILETIME* PFILETIME ; -TYPEDEF: PFILETIME LPFILETIME ; +TYPEDEF: FILETIME* PFILETIME +TYPEDEF: PFILETIME LPFILETIME -TYPEDEF: int GET_FILEEX_INFO_LEVELS ; +TYPEDEF: int GET_FILEEX_INFO_LEVELS STRUCT: SECURITY_ATTRIBUTES { nLength DWORD } @@ -829,8 +829,8 @@ STRUCT: PROCESSENTRY32 { dwFlags DWORD } { szExeFile TCHAR[MAX_PATH] } ; -TYPEDEF: PROCESSENTRY32* PPROCESSENTRY32 ; -TYPEDEF: PROCESSENTRY32* LPPROCESSENTRY32 ; +TYPEDEF: PROCESSENTRY32* PPROCESSENTRY32 +TYPEDEF: PROCESSENTRY32* LPPROCESSENTRY32 ! Resource IDs : MAKEINTRESOURCE ( int -- resource ) 0xffff bitand ; inline @@ -1170,7 +1170,7 @@ STRUCT: WIN32_FIND_STREAM_DATA { StreamSize LARGE_INTEGER } { cStreamName WCHAR[292] } ; -TYPEDEF: WIN32_FIND_STREAM_DATA* PWIN32_FIND_STREAM_DATA ; +TYPEDEF: WIN32_FIND_STREAM_DATA* PWIN32_FIND_STREAM_DATA FUNCTION: HANDLE FindFirstStreamW ( LPCWSTR lpFileName, diff --git a/ffi/windows/ntdll/ntdll.factor b/ffi/windows/ntdll/ntdll.factor index 0491ccd3fb..0dd203bbc5 100644 --- a/ffi/windows/ntdll/ntdll.factor +++ b/ffi/windows/ntdll/ntdll.factor @@ -5,23 +5,23 @@ IN: windows.ntdll LIBRARY: ntdll -TYPEDEF: uint NTSTATUS ; +TYPEDEF: uint NTSTATUS ! Buffer is a PWSTR STRUCT: LSA_UNICODE_STRING { Length USHORT } { MaximumLength USHORT } { Buffer void* } ; -TYPEDEF: LSA_UNICODE_STRING* PLSA_UNICODE_STRING ; -TYPEDEF: LSA_UNICODE_STRING UNICODE_STRING ; -TYPEDEF: LSA_UNICODE_STRING* PUNICODE_STRING ; +TYPEDEF: LSA_UNICODE_STRING* PLSA_UNICODE_STRING +TYPEDEF: LSA_UNICODE_STRING UNICODE_STRING +TYPEDEF: LSA_UNICODE_STRING* PUNICODE_STRING STRUCT: RTL_DRIVE_LETTER_CURDIR { Flags USHORT } { Length USHORT } { Timestamp ULONG } { DosPath UNICODE_STRING } ; -TYPEDEF: RTL_DRIVE_LETTER_CURDIR* PRTL_DRIVE_LETTER_CURDIR ; +TYPEDEF: RTL_DRIVE_LETTER_CURDIR* PRTL_DRIVE_LETTER_CURDIR STRUCT: RTL_USER_PROCESS_PARAMETERS { MaximumLength ULONG } @@ -53,12 +53,12 @@ STRUCT: RTL_USER_PROCESS_PARAMETERS { ShellInfo UNICODE_STRING } { RuntimeData UNICODE_STRING } { DLCurrentDirectory RTL_DRIVE_LETTER_CURDIR[0x20] } ; -TYPEDEF: RTL_USER_PROCESS_PARAMETERS* PRTL_USER_PROCESS_PARAMETERS ; +TYPEDEF: RTL_USER_PROCESS_PARAMETERS* PRTL_USER_PROCESS_PARAMETERS STRUCT: LIST_ENTRY { Flink LIST_ENTRY* } { Blink LIST_ENTRY* } ; -TYPEDEF: LIST_ENTRY* PLIST_ENTRY ; +TYPEDEF: LIST_ENTRY* PLIST_ENTRY STRUCT: PEB_LDR_DATA { Length ULONG } @@ -67,20 +67,20 @@ STRUCT: PEB_LDR_DATA { InLoadOrderModuleList LIST_ENTRY } { InMemoryOrderModuleList LIST_ENTRY } { InInitializationOrderModuleList LIST_ENTRY } ; -TYPEDEF: PEB_LDR_DATA* PPEB_LDR_DATA ; +TYPEDEF: PEB_LDR_DATA* PPEB_LDR_DATA -TYPEDEF: void* PPS_POST_PROCESS_INIT_ROUTINE ; +TYPEDEF: void* PPS_POST_PROCESS_INIT_ROUTINE STRUCT: PEB_FREE_BLOCK { Next PEB_FREE_BLOCK* } { Size ULONG } ; -TYPEDEF: PEB_FREE_BLOCK* PPEB_FREE_BLOCK ; +TYPEDEF: PEB_FREE_BLOCK* PPEB_FREE_BLOCK STRUCT: PEBLOCKROUTINE { PebLock PVOID } ; -TYPEDEF: PEBLOCKROUTINE* PPEBLOCKROUTINE ; +TYPEDEF: PEBLOCKROUTINE* PPEBLOCKROUTINE -TYPEDEF: PVOID* PPVOID ; +TYPEDEF: PVOID* PPVOID STRUCT: PEB { InheritedAddressSpace BOOLEAN } @@ -137,7 +137,7 @@ STRUCT: PEB { TlsExpansionBitmap ULONG } { TlsExpansionBitmapBits BYTE[0x80] } { SessionId ULONG } ; -TYPEDEF: PEB* PPEB ; +TYPEDEF: PEB* PPEB ! PebBaseAddress is PPEB STRUCT: PROCESS_BASIC_INFORMATION diff --git a/ffi/windows/ole32/ole32.factor b/ffi/windows/ole32/ole32.factor index 6cde970bdf..bda0ee484e 100644 --- a/ffi/windows/ole32/ole32.factor +++ b/ffi/windows/ole32/ole32.factor @@ -8,17 +8,17 @@ IN: windows.ole32 LIBRARY: ole32 -TYPEDEF: GUID* REFGUID ; -TYPEDEF: void* LPUNKNOWN ; -TYPEDEF: LPWSTR LPOLESTR ; -TYPEDEF: LPWSTR LPCOLESTR ; +TYPEDEF: GUID* REFGUID +TYPEDEF: void* LPUNKNOWN +TYPEDEF: LPWSTR LPOLESTR +TYPEDEF: LPWSTR LPCOLESTR -TYPEDEF: GUID IID ; -TYPEDEF: GUID CLSID ; +TYPEDEF: GUID IID +TYPEDEF: GUID CLSID -TYPEDEF: REFGUID LPGUID ; -TYPEDEF: REFGUID REFIID ; -TYPEDEF: REFGUID REFCLSID ; +TYPEDEF: REFGUID LPGUID +TYPEDEF: REFGUID REFIID +TYPEDEF: REFGUID REFCLSID FUNCTION: HRESULT CoCreateInstance ( REFGUID rclsid, LPUNKNOWN pUnkOuter, DWORD dwClsContext, REFGUID riid, LPUNKNOWN out_ppv ) ; FUNCTION: BOOL IsEqualGUID ( REFGUID rguid1, REFGUID rguid2 ) ; @@ -89,8 +89,8 @@ STRUCT: DVTARGETDEVICE { tdExtDevmodeOffset WORD } { tdData BYTE[1] } ; -TYPEDEF: WORD CLIPFORMAT ; -TYPEDEF: POINT POINTL ; +TYPEDEF: WORD CLIPFORMAT +TYPEDEF: POINT POINTL STRUCT: FORMATETC { cfFormat CLIPFORMAT } @@ -98,13 +98,13 @@ STRUCT: FORMATETC { dwAspect DWORD } { lindex LONG } { tymed DWORD } ; -TYPEDEF: FORMATETC* LPFORMATETC ; +TYPEDEF: FORMATETC* LPFORMATETC STRUCT: STGMEDIUM { tymed DWORD } { data void* } { punkForRelease LPUNKNOWN } ; -TYPEDEF: STGMEDIUM* LPSTGMEDIUM ; +TYPEDEF: STGMEDIUM* LPSTGMEDIUM CONSTANT: COINIT_MULTITHREADED 0 CONSTANT: COINIT_APARTMENTTHREADED 2 diff --git a/ffi/windows/privileges/privileges.factor b/ffi/windows/privileges/privileges.factor index 2ff8e3c67d..1f6893d841 100644 --- a/ffi/windows/privileges/privileges.factor +++ b/ffi/windows/privileges/privileges.factor @@ -6,7 +6,7 @@ windows.advapi32 windows.errors windows.kernel32 windows.types alien.c-types ; IN: windows.privileges -TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES ; +TYPEDEF: TOKEN_PRIVILEGES* PTOKEN_PRIVILEGES ! Security tokens ! http://msdn.microsoft.com/msdnmag/issues/05/03/TokenPrivileges/ diff --git a/ffi/windows/shell32/shell32.factor b/ffi/windows/shell32/shell32.factor index fc49a419e3..8755c86874 100644 --- a/ffi/windows/shell32/shell32.factor +++ b/ffi/windows/shell32/shell32.factor @@ -182,7 +182,7 @@ CONSTANT: SHCONTF_NETPRINTERSRCH 512 CONSTANT: SHCONTF_SHAREABLE 1024 CONSTANT: SHCONTF_STORAGE 2048 -TYPEDEF: DWORD SHCONTF ; +TYPEDEF: DWORD SHCONTF CONSTANT: SHGDN_NORMAL 0 CONSTANT: SHGDN_INFOLDER 1 @@ -191,7 +191,7 @@ CONSTANT: SHGDN_INCLUDE_NONFILESYS 0x2000 CONSTANT: SHGDN_FORADDRESSBAR 0x4000 CONSTANT: SHGDN_FORPARSING 0x8000 -TYPEDEF: DWORD SHGDNF ; +TYPEDEF: DWORD SHGDNF ALIAS: SFGAO_CANCOPY DROPEFFECT_COPY ALIAS: SFGAO_CANMOVE DROPEFFECT_MOVE @@ -219,30 +219,30 @@ CONSTANT: SFGAO_BROWSABLE 0x08000000 CONSTANT: SFGAO_NONENUMERATED 0x00100000 CONSTANT: SFGAO_NEWCONTENT 0x00200000 -TYPEDEF: ULONG SFGAOF ; +TYPEDEF: ULONG SFGAOF STRUCT: DROPFILES { pFiles DWORD } { pt POINT } { fNC BOOL } { fWide BOOL } ; -TYPEDEF: DROPFILES* LPDROPFILES ; -TYPEDEF: DROPFILES* LPCDROPFILES ; -TYPEDEF: HANDLE HDROP ; +TYPEDEF: DROPFILES* LPDROPFILES +TYPEDEF: DROPFILES* LPCDROPFILES +TYPEDEF: HANDLE HDROP STRUCT: SHITEMID { cb USHORT } { abID BYTE[1] } ; -TYPEDEF: SHITEMID* LPSHITEMID ; -TYPEDEF: SHITEMID* LPCSHITEMID ; +TYPEDEF: SHITEMID* LPSHITEMID +TYPEDEF: SHITEMID* LPCSHITEMID STRUCT: ITEMIDLIST { mkid SHITEMID } ; -TYPEDEF: ITEMIDLIST* LPITEMIDLIST ; -TYPEDEF: ITEMIDLIST* LPCITEMIDLIST ; -TYPEDEF: ITEMIDLIST ITEMID_CHILD ; -TYPEDEF: ITEMID_CHILD* PITEMID_CHILD ; -TYPEDEF: ITEMID_CHILD* PCUITEMID_CHILD ; +TYPEDEF: ITEMIDLIST* LPITEMIDLIST +TYPEDEF: ITEMIDLIST* LPCITEMIDLIST +TYPEDEF: ITEMIDLIST ITEMID_CHILD +TYPEDEF: ITEMID_CHILD* PITEMID_CHILD +TYPEDEF: ITEMID_CHILD* PCUITEMID_CHILD CONSTANT: STRRET_WSTR 0 CONSTANT: STRRET_OFFSET 1 diff --git a/ffi/windows/types/types.factor b/ffi/windows/types/types.factor index 54bef374c4..b02d3fe13b 100644 --- a/ffi/windows/types/types.factor +++ b/ffi/windows/types/types.factor @@ -6,196 +6,196 @@ math.vectors sequences ; FROM: alien.c-types => float short ; IN: windows.types -TYPEDEF: char CHAR ; -TYPEDEF: uchar UCHAR ; -TYPEDEF: uchar BYTE ; +TYPEDEF: char CHAR +TYPEDEF: uchar UCHAR +TYPEDEF: uchar BYTE -TYPEDEF: ushort wchar_t ; +TYPEDEF: ushort wchar_t -TYPEDEF: wchar_t WCHAR ; +TYPEDEF: wchar_t WCHAR -TYPEDEF: short SHORT ; -TYPEDEF: ushort USHORT ; -TYPEDEF: short INT16 ; -TYPEDEF: ushort UINT16 ; +TYPEDEF: short SHORT +TYPEDEF: ushort USHORT +TYPEDEF: short INT16 +TYPEDEF: ushort UINT16 -TYPEDEF: ushort WORD ; -TYPEDEF: ulong DWORD ; +TYPEDEF: ushort WORD +TYPEDEF: ulong DWORD -TYPEDEF: int INT ; -TYPEDEF: uint UINT ; +TYPEDEF: int INT +TYPEDEF: uint UINT -TYPEDEF: int BOOL ; +TYPEDEF: int BOOL -TYPEDEF: int* PINT ; -TYPEDEF: int* LPINT ; -TYPEDEF: int HFILE ; +TYPEDEF: int* PINT +TYPEDEF: int* LPINT +TYPEDEF: int HFILE -TYPEDEF: long LONG ; -TYPEDEF: long* LPLONG ; -TYPEDEF: intptr_t LONG_PTR ; +TYPEDEF: long LONG +TYPEDEF: long* LPLONG +TYPEDEF: intptr_t LONG_PTR -TYPEDEF: uint ULONG ; -TYPEDEF: uintptr_t ULONG_PTR ; +TYPEDEF: uint ULONG +TYPEDEF: uintptr_t ULONG_PTR -TYPEDEF: void VOID ; -TYPEDEF: void* PVOID ; -TYPEDEF: void* LPVOID ; -TYPEDEF: void* LPCVOID ; +TYPEDEF: void VOID +TYPEDEF: void* PVOID +TYPEDEF: void* LPVOID +TYPEDEF: void* LPCVOID -TYPEDEF: float FLOAT ; +TYPEDEF: float FLOAT -TYPEDEF: intptr_t HALF_PTR ; -TYPEDEF: intptr_t UHALF_PTR ; -TYPEDEF: intptr_t INT_PTR ; -TYPEDEF: intptr_t UINT_PTR ; +TYPEDEF: intptr_t HALF_PTR +TYPEDEF: intptr_t UHALF_PTR +TYPEDEF: intptr_t INT_PTR +TYPEDEF: intptr_t UINT_PTR -TYPEDEF: int INT32 ; -TYPEDEF: uint UINT32 ; -TYPEDEF: uint DWORD32 ; -TYPEDEF: long LONG32 ; -TYPEDEF: ulong ULONG32 ; -TYPEDEF: ulonglong ULONG64 ; -TYPEDEF: long* POINTER_32 ; -TYPEDEF: longlong* POINTER_64 ; -TYPEDEF: longlong INT64 ; -TYPEDEF: ulonglong UINT64 ; -TYPEDEF: longlong LONGLONG ; -TYPEDEF: ulonglong ULONGLONG ; -TYPEDEF: longlong LONG64 ; -TYPEDEF: ulonglong DWORD64 ; -TYPEDEF: longlong LARGE_INTEGER ; -TYPEDEF: ulonglong ULARGE_INTEGER ; -TYPEDEF: LARGE_INTEGER* PLARGE_INTEGER ; -TYPEDEF: ULARGE_INTEGER* PULARGE_INTEGER ; -TYPEDEF: size_t SIZE_T ; -TYPEDEF: ptrdiff_t SSIZE_T ; +TYPEDEF: int INT32 +TYPEDEF: uint UINT32 +TYPEDEF: uint DWORD32 +TYPEDEF: long LONG32 +TYPEDEF: ulong ULONG32 +TYPEDEF: ulonglong ULONG64 +TYPEDEF: long* POINTER_32 +TYPEDEF: longlong* POINTER_64 +TYPEDEF: longlong INT64 +TYPEDEF: ulonglong UINT64 +TYPEDEF: longlong LONGLONG +TYPEDEF: ulonglong ULONGLONG +TYPEDEF: longlong LONG64 +TYPEDEF: ulonglong DWORD64 +TYPEDEF: longlong LARGE_INTEGER +TYPEDEF: ulonglong ULARGE_INTEGER +TYPEDEF: LARGE_INTEGER* PLARGE_INTEGER +TYPEDEF: ULARGE_INTEGER* PULARGE_INTEGER +TYPEDEF: size_t SIZE_T +TYPEDEF: ptrdiff_t SSIZE_T -TYPEDEF: { c-string utf16n } LPCSTR ; -TYPEDEF: { c-string utf16n } LPTCSTR ; +TYPEDEF: { c-string utf16n } LPCSTR +TYPEDEF: { c-string utf16n } LPTCSTR -TYPEDEF: { c-string utf16n } LPWSTR ; -TYPEDEF: WCHAR TCHAR ; -TYPEDEF: LPWSTR LPTCH ; -TYPEDEF: LPWSTR PTCH ; -TYPEDEF: TCHAR TBYTE ; +TYPEDEF: { c-string utf16n } LPWSTR +TYPEDEF: WCHAR TCHAR +TYPEDEF: LPWSTR LPTCH +TYPEDEF: LPWSTR PTCH +TYPEDEF: TCHAR TBYTE -TYPEDEF: WORD ATOM ; -TYPEDEF: BYTE BOOLEAN ; -TYPEDEF: ULONGLONG DWORDLONG ; -TYPEDEF: ULONG_PTR DWORD_PTR ; -TYPEDEF: PVOID HANDLE ; -TYPEDEF: HANDLE HACCEL ; -TYPEDEF: HANDLE HBITMAP ; -TYPEDEF: HANDLE HBRUSH ; -TYPEDEF: HANDLE HCOLORSPACE ; -TYPEDEF: HANDLE HCONV ; -TYPEDEF: HANDLE HCONVLIST ; -TYPEDEF: HANDLE HICON ; -TYPEDEF: HICON HCURSOR ; -TYPEDEF: HANDLE HDC ; -TYPEDEF: HANDLE HDDEDATA ; -TYPEDEF: HANDLE HDESK ; -TYPEDEF: HANDLE HDROP ; -TYPEDEF: HANDLE HDWP ; -TYPEDEF: HANDLE HENHMETAFILE ; -TYPEDEF: HANDLE HFONT ; -TYPEDEF: HANDLE HGDIOBJ ; -TYPEDEF: HANDLE HGLOBAL ; -TYPEDEF: HANDLE HHOOK ; -TYPEDEF: HANDLE HINSTANCE ; -TYPEDEF: DWORD HKEY ; -TYPEDEF: HANDLE HKL ; -TYPEDEF: HANDLE HLOCAL ; -TYPEDEF: HANDLE HMENU ; -TYPEDEF: HANDLE HMETAFILE ; -TYPEDEF: HINSTANCE HMODULE ; -TYPEDEF: HANDLE HMONITOR ; -TYPEDEF: HANDLE HPALETTE ; -TYPEDEF: HANDLE HPEN ; -TYPEDEF: LONG HRESULT ; -TYPEDEF: HANDLE HRGN ; -TYPEDEF: HANDLE HRSRC ; -TYPEDEF: HANDLE HSZ ; -TYPEDEF: HANDLE WINSTA ; -TYPEDEF: HANDLE HWINSTA ; -TYPEDEF: HANDLE HWND ; -TYPEDEF: HANDLE HCRYPTPROV ; -TYPEDEF: WORD LANGID ; -TYPEDEF: DWORD LCID ; -TYPEDEF: DWORD LCTYPE ; -TYPEDEF: DWORD LGRPID ; -TYPEDEF: LONG_PTR LPARAM ; -TYPEDEF: BOOL* LPBOOL ; -TYPEDEF: BYTE* LPBYTE ; -TYPEDEF: { c-string utf16n } LPCWSTR ; +TYPEDEF: WORD ATOM +TYPEDEF: BYTE BOOLEAN +TYPEDEF: ULONGLONG DWORDLONG +TYPEDEF: ULONG_PTR DWORD_PTR +TYPEDEF: PVOID HANDLE +TYPEDEF: HANDLE HACCEL +TYPEDEF: HANDLE HBITMAP +TYPEDEF: HANDLE HBRUSH +TYPEDEF: HANDLE HCOLORSPACE +TYPEDEF: HANDLE HCONV +TYPEDEF: HANDLE HCONVLIST +TYPEDEF: HANDLE HICON +TYPEDEF: HICON HCURSOR +TYPEDEF: HANDLE HDC +TYPEDEF: HANDLE HDDEDATA +TYPEDEF: HANDLE HDESK +TYPEDEF: HANDLE HDROP +TYPEDEF: HANDLE HDWP +TYPEDEF: HANDLE HENHMETAFILE +TYPEDEF: HANDLE HFONT +TYPEDEF: HANDLE HGDIOBJ +TYPEDEF: HANDLE HGLOBAL +TYPEDEF: HANDLE HHOOK +TYPEDEF: HANDLE HINSTANCE +TYPEDEF: DWORD HKEY +TYPEDEF: HANDLE HKL +TYPEDEF: HANDLE HLOCAL +TYPEDEF: HANDLE HMENU +TYPEDEF: HANDLE HMETAFILE +TYPEDEF: HINSTANCE HMODULE +TYPEDEF: HANDLE HMONITOR +TYPEDEF: HANDLE HPALETTE +TYPEDEF: HANDLE HPEN +TYPEDEF: LONG HRESULT +TYPEDEF: HANDLE HRGN +TYPEDEF: HANDLE HRSRC +TYPEDEF: HANDLE HSZ +TYPEDEF: HANDLE WINSTA +TYPEDEF: HANDLE HWINSTA +TYPEDEF: HANDLE HWND +TYPEDEF: HANDLE HCRYPTPROV +TYPEDEF: WORD LANGID +TYPEDEF: DWORD LCID +TYPEDEF: DWORD LCTYPE +TYPEDEF: DWORD LGRPID +TYPEDEF: LONG_PTR LPARAM +TYPEDEF: BOOL* LPBOOL +TYPEDEF: BYTE* LPBYTE +TYPEDEF: { c-string utf16n } LPCWSTR ! TYPEDEF: WCHAR* LPWSTR -TYPEDEF: { c-string utf8 } LPSTR ; -TYPEDEF: { c-string utf16n } LPCTSTR ; -TYPEDEF: { c-string utf16n } LPWTSTR ; -TYPEDEF: { c-string utf16n } LPTSTR ; -TYPEDEF: LPCSTR PCTSTR ; -TYPEDEF: LPSTR PTSTR ; +TYPEDEF: { c-string utf8 } LPSTR +TYPEDEF: { c-string utf16n } LPCTSTR +TYPEDEF: { c-string utf16n } LPWTSTR +TYPEDEF: { c-string utf16n } LPTSTR +TYPEDEF: LPCSTR PCTSTR +TYPEDEF: LPSTR PTSTR -TYPEDEF: DWORD* LPDWORD ; -TYPEDEF: HANDLE* LPHANDLE ; -TYPEDEF: WORD* LPWORD ; -TYPEDEF: LONG_PTR LRESULT ; -TYPEDEF: BOOL* PBOOL ; -TYPEDEF: BOOLEAN* PBOOLEAN ; -TYPEDEF: BYTE* PBYTE ; -TYPEDEF: CHAR* PCHAR ; -TYPEDEF: CHAR* PCSTR ; -TYPEDEF: { c-string utf16n } PCWSTR ; -TYPEDEF: DWORD* PDWORD ; -TYPEDEF: DWORDLONG* PDWORDLONG ; -TYPEDEF: DWORD_PTR* PDWORD_PTR ; -TYPEDEF: DWORD32* PDWORD32 ; -TYPEDEF: DWORD64* PDWORD64 ; -TYPEDEF: FLOAT* PFLOAT ; -TYPEDEF: HALF_PTR* PHALF_PTR ; -TYPEDEF: HANDLE* PHANDLE ; -TYPEDEF: HKEY* PHKEY ; -TYPEDEF: INT_PTR* PINT_PTR ; -TYPEDEF: INT32* PINT32 ; -TYPEDEF: INT64* PINT64 ; -TYPEDEF: PDWORD PLCID ; -TYPEDEF: LONG* PLONG ; -TYPEDEF: LONGLONG* PLONGLONG ; -TYPEDEF: LONG_PTR* PLONG_PTR ; -TYPEDEF: LONG32* PLONG32 ; -TYPEDEF: LONG64* PLONG64 ; -TYPEDEF: SHORT* PSHORT ; -TYPEDEF: SIZE_T* PSIZE_T ; -TYPEDEF: SSIZE_T* PSSIZE_T ; -TYPEDEF: CHAR* PSTR ; -TYPEDEF: TBYTE* PTBYTE ; -TYPEDEF: TCHAR* PTCHAR ; -TYPEDEF: UCHAR* PUCHAR ; -TYPEDEF: UHALF_PTR* PUHALF_PTR ; -TYPEDEF: UINT* PUINT ; -TYPEDEF: UINT_PTR* PUINT_PTR ; -TYPEDEF: UINT32* PUINT32 ; -TYPEDEF: UINT64* PUINT64 ; -TYPEDEF: ULONG* PULONG ; -TYPEDEF: ULONGLONG* PULONGLONG ; -TYPEDEF: ULONG_PTR* PULONG_PTR ; -TYPEDEF: ULONG32* PULONG32 ; -TYPEDEF: ULONG64* PULONG64 ; -TYPEDEF: USHORT* PUSHORT ; -TYPEDEF: { c-string utf16n } PWCHAR ; -TYPEDEF: WORD* PWORD ; -TYPEDEF: { c-string utf16n } PWSTR ; -TYPEDEF: HANDLE SC_HANDLE ; -TYPEDEF: LPVOID SC_LOCK ; -TYPEDEF: HANDLE SERVICE_STATUS_HANDLE ; -TYPEDEF: LONGLONG USN ; -TYPEDEF: UINT_PTR WPARAM ; +TYPEDEF: DWORD* LPDWORD +TYPEDEF: HANDLE* LPHANDLE +TYPEDEF: WORD* LPWORD +TYPEDEF: LONG_PTR LRESULT +TYPEDEF: BOOL* PBOOL +TYPEDEF: BOOLEAN* PBOOLEAN +TYPEDEF: BYTE* PBYTE +TYPEDEF: CHAR* PCHAR +TYPEDEF: CHAR* PCSTR +TYPEDEF: { c-string utf16n } PCWSTR +TYPEDEF: DWORD* PDWORD +TYPEDEF: DWORDLONG* PDWORDLONG +TYPEDEF: DWORD_PTR* PDWORD_PTR +TYPEDEF: DWORD32* PDWORD32 +TYPEDEF: DWORD64* PDWORD64 +TYPEDEF: FLOAT* PFLOAT +TYPEDEF: HALF_PTR* PHALF_PTR +TYPEDEF: HANDLE* PHANDLE +TYPEDEF: HKEY* PHKEY +TYPEDEF: INT_PTR* PINT_PTR +TYPEDEF: INT32* PINT32 +TYPEDEF: INT64* PINT64 +TYPEDEF: PDWORD PLCID +TYPEDEF: LONG* PLONG +TYPEDEF: LONGLONG* PLONGLONG +TYPEDEF: LONG_PTR* PLONG_PTR +TYPEDEF: LONG32* PLONG32 +TYPEDEF: LONG64* PLONG64 +TYPEDEF: SHORT* PSHORT +TYPEDEF: SIZE_T* PSIZE_T +TYPEDEF: SSIZE_T* PSSIZE_T +TYPEDEF: CHAR* PSTR +TYPEDEF: TBYTE* PTBYTE +TYPEDEF: TCHAR* PTCHAR +TYPEDEF: UCHAR* PUCHAR +TYPEDEF: UHALF_PTR* PUHALF_PTR +TYPEDEF: UINT* PUINT +TYPEDEF: UINT_PTR* PUINT_PTR +TYPEDEF: UINT32* PUINT32 +TYPEDEF: UINT64* PUINT64 +TYPEDEF: ULONG* PULONG +TYPEDEF: ULONGLONG* PULONGLONG +TYPEDEF: ULONG_PTR* PULONG_PTR +TYPEDEF: ULONG32* PULONG32 +TYPEDEF: ULONG64* PULONG64 +TYPEDEF: USHORT* PUSHORT +TYPEDEF: { c-string utf16n } PWCHAR +TYPEDEF: WORD* PWORD +TYPEDEF: { c-string utf16n } PWSTR +TYPEDEF: HANDLE SC_HANDLE +TYPEDEF: LPVOID SC_LOCK +TYPEDEF: HANDLE SERVICE_STATUS_HANDLE +TYPEDEF: LONGLONG USN +TYPEDEF: UINT_PTR WPARAM -TYPEDEF: size_t socklen_t ; +TYPEDEF: size_t socklen_t -TYPEDEF: void* WNDPROC ; +TYPEDEF: void* WNDPROC CONSTANT: FALSE 0 CONSTANT: TRUE 1 @@ -267,8 +267,8 @@ STRUCT: BITMAPINFO { bmiHeader BITMAPINFOHEADER } { bimColors RGBQUAD[1] } ; -TYPEDEF: void* LPPAINTSTRUCT ; -TYPEDEF: void* PAINTSTRUCT ; +TYPEDEF: void* LPPAINTSTRUCT +TYPEDEF: void* PAINTSTRUCT STRUCT: POINT { x LONG } @@ -286,7 +286,7 @@ STRUCT: MSG { time DWORD } { pt POINT } ; -TYPEDEF: MSG* LPMSG ; +TYPEDEF: MSG* LPMSG STRUCT: PIXELFORMATDESCRIPTOR { nSize WORD } @@ -319,19 +319,19 @@ STRUCT: PIXELFORMATDESCRIPTOR : ( loc dim -- RECT ) dupd v+ [ first2 ] bi@ RECT ; -TYPEDEF: RECT* PRECT ; -TYPEDEF: RECT* LPRECT ; -TYPEDEF: PIXELFORMATDESCRIPTOR PFD ; -TYPEDEF: PFD* LPPFD ; -TYPEDEF: HANDLE HGLRC ; +TYPEDEF: RECT* PRECT +TYPEDEF: RECT* LPRECT +TYPEDEF: PIXELFORMATDESCRIPTOR PFD +TYPEDEF: PFD* LPPFD +TYPEDEF: HANDLE HGLRC -TYPEDEF: void* PWNDCLASS ; -TYPEDEF: void* PWNDCLASSEX ; -TYPEDEF: void* LPWNDCLASS ; -TYPEDEF: void* LPWNDCLASSEX ; -TYPEDEF: void* MSGBOXPARAMSA ; -TYPEDEF: void* MSGBOXPARAMSW ; -TYPEDEF: void* LPOVERLAPPED_COMPLETION_ROUTINE ; +TYPEDEF: void* PWNDCLASS +TYPEDEF: void* PWNDCLASSEX +TYPEDEF: void* LPWNDCLASS +TYPEDEF: void* LPWNDCLASSEX +TYPEDEF: void* MSGBOXPARAMSA +TYPEDEF: void* MSGBOXPARAMSW +TYPEDEF: void* LPOVERLAPPED_COMPLETION_ROUTINE STRUCT: LVITEM { mask uint } @@ -361,10 +361,10 @@ STRUCT: ACCEL { fVirt BYTE } { key WORD } { cmd WORD } ; -TYPEDEF: ACCEL* LPACCEL ; +TYPEDEF: ACCEL* LPACCEL -TYPEDEF: DWORD COLORREF ; -TYPEDEF: DWORD* LPCOLORREF ; +TYPEDEF: DWORD COLORREF +TYPEDEF: DWORD* LPCOLORREF : rgb ( r g b -- COLORREF ) { 16 8 0 } bitfield ; inline @@ -400,6 +400,6 @@ STRUCT: TEXTMETRICW { tmPitchAndFamily BYTE } { tmCharSet BYTE } ; -TYPEDEF: TEXTMETRICW* LPTEXTMETRIC ; +TYPEDEF: TEXTMETRICW* LPTEXTMETRIC -TYPEDEF: ULONG PROPID ; +TYPEDEF: ULONG PROPID diff --git a/ffi/windows/user32/user32.factor b/ffi/windows/user32/user32.factor index fbdc8d87bd..ad88524e06 100644 --- a/ffi/windows/user32/user32.factor +++ b/ffi/windows/user32/user32.factor @@ -528,7 +528,7 @@ STRUCT: TRACKMOUSEEVENT { dwFlags DWORD } { hwndTrack HWND } { dwHoverTime DWORD } ; -TYPEDEF: TRACKMOUSEEVENT* LPTRACKMOUSEEVENT ; +TYPEDEF: TRACKMOUSEEVENT* LPTRACKMOUSEEVENT CONSTANT: DBT_DEVICEARRIVAL 0x8000 CONSTANT: DBT_DEVICEREMOVECOMPLETE 0x8004 @@ -561,8 +561,8 @@ STRUCT: MONITORINFOEX { dwFlags DWORD } { szDevice { TCHAR CCHDEVICENAME } } ; -TYPEDEF: MONITORINFOEX* LPMONITORINFOEX ; -TYPEDEF: MONITORINFOEX* LPMONITORINFO ; +TYPEDEF: MONITORINFOEX* LPMONITORINFOEX +TYPEDEF: MONITORINFOEX* LPMONITORINFO CONSTANT: MONITOR_DEFAULTTONULL 0 CONSTANT: MONITOR_DEFAULTTOPRIMARY 1 @@ -751,7 +751,7 @@ CONSTANT: SPIF_SENDWININICHANGE 2 ALIAS: SPIF_SENDCHANGE SPIF_SENDWININICHANGE -TYPEDEF: HANDLE HRAWINPUT ; +TYPEDEF: HANDLE HRAWINPUT : GET_RAWINPUT_CODE_WPARAM ( wParam -- n ) 0xff bitand ; inline CONSTANT: RIM_INPUT 0 @@ -766,8 +766,8 @@ STRUCT: RAWINPUTHEADER { dwSize DWORD } { hDevice HANDLE } { wParam WPARAM } ; -TYPEDEF: RAWINPUTHEADER* PRAWINPUTHEADER ; -TYPEDEF: RAWINPUTHEADER* LPRAWINPUTHEADER ; +TYPEDEF: RAWINPUTHEADER* PRAWINPUTHEADER +TYPEDEF: RAWINPUTHEADER* LPRAWINPUTHEADER STRUCT: RAWMOUSE_BUTTONS_USBUTTONS { usButtonFlags USHORT } { usButtonData USHORT } ; @@ -782,8 +782,8 @@ STRUCT: RAWMOUSE { lLastX LONG } { lLastY LONG } { ulExtraInformation ULONG } ; -TYPEDEF: RAWMOUSE* PRAWMOUSE ; -TYPEDEF: RAWMOUSE* LPRAWMOUSE ; +TYPEDEF: RAWMOUSE* PRAWMOUSE +TYPEDEF: RAWMOUSE* LPRAWMOUSE CONSTANT: RI_MOUSE_LEFT_BUTTON_DOWN 0x0001 CONSTANT: RI_MOUSE_LEFT_BUTTON_UP 0x0002 @@ -818,8 +818,8 @@ STRUCT: RAWKEYBOARD { VKey USHORT } { Message UINT } { ExtraInformation ULONG } ; -TYPEDEF: RAWKEYBOARD* PRAWKEYBOARD ; -TYPEDEF: RAWKEYBOARD* LPRAWKEYBOARD ; +TYPEDEF: RAWKEYBOARD* PRAWKEYBOARD +TYPEDEF: RAWKEYBOARD* LPRAWKEYBOARD CONSTANT: KEYBOARD_OVERRUN_MAKE_CODE 0xFF @@ -834,8 +834,8 @@ STRUCT: RAWHID { dwSizeHid DWORD } { dwCount DWORD } { bRawData BYTE[1] } ; -TYPEDEF: RAWHID* PRAWHID ; -TYPEDEF: RAWHID* LPRAWHID ; +TYPEDEF: RAWHID* PRAWHID +TYPEDEF: RAWHID* LPRAWHID UNION-STRUCT: RAWINPUT_UNION { mouse RAWMOUSE } @@ -844,8 +844,8 @@ UNION-STRUCT: RAWINPUT_UNION STRUCT: RAWINPUT { header RAWINPUTHEADER } { data RAWINPUT_UNION } ; -TYPEDEF: RAWINPUT* PRAWINPUT ; -TYPEDEF: RAWINPUT* LPRAWINPUT ; +TYPEDEF: RAWINPUT* PRAWINPUT +TYPEDEF: RAWINPUT* LPRAWINPUT : RAWINPUT_ALIGN ( x -- y ) cpu x86.32 = [ 4 ] [ 8 ] if align ; inline @@ -863,7 +863,7 @@ STRUCT: RID_DEVICE_INFO_MOUSE { dwNumberOfButtons DWORD } { dwSampleRate DWORD } { fHasHorizontalWheel BOOL } ; -TYPEDEF: RID_DEVICE_INFO_MOUSE* PRID_DEVICE_INFO_MOUSE ; +TYPEDEF: RID_DEVICE_INFO_MOUSE* PRID_DEVICE_INFO_MOUSE STRUCT: RID_DEVICE_INFO_KEYBOARD { dwType DWORD } @@ -872,7 +872,7 @@ STRUCT: RID_DEVICE_INFO_KEYBOARD { dwNumberOfFunctionKeys DWORD } { dwNumberOfIndicators DWORD } { dwNumberOfKeysTotal DWORD } ; -TYPEDEF: RID_DEVICE_INFO_KEYBOARD* PRID_DEVICE_INFO_KEYBOARD ; +TYPEDEF: RID_DEVICE_INFO_KEYBOARD* PRID_DEVICE_INFO_KEYBOARD STRUCT: RID_DEVICE_INFO_HID { dwVendorId DWORD } @@ -880,7 +880,7 @@ STRUCT: RID_DEVICE_INFO_HID { dwVersionNumber DWORD } { usUsagePage USHORT } { usUsage USHORT } ; -TYPEDEF: RID_DEVICE_INFO_HID* PRID_DEVICE_INFO_HID ; +TYPEDEF: RID_DEVICE_INFO_HID* PRID_DEVICE_INFO_HID UNION-STRUCT: RID_DEVICE_INFO_UNION { mouse RID_DEVICE_INFO_MOUSE } @@ -890,17 +890,17 @@ STRUCT: RID_DEVICE_INFO { cbSize DWORD } { dwType DWORD } { data RID_DEVICE_INFO_UNION } ; -TYPEDEF: RID_DEVICE_INFO* PRID_DEVICE_INFO ; -TYPEDEF: RID_DEVICE_INFO* LPRID_DEVICE_INFO ; +TYPEDEF: RID_DEVICE_INFO* PRID_DEVICE_INFO +TYPEDEF: RID_DEVICE_INFO* LPRID_DEVICE_INFO STRUCT: RAWINPUTDEVICE { usUsagePage USHORT } { usUsage USHORT } { dwFlags DWORD } { hwndTarget HWND } ; -TYPEDEF: RAWINPUTDEVICE* PRAWINPUTDEVICE ; -TYPEDEF: RAWINPUTDEVICE* LPRAWINPUTDEVICE ; -TYPEDEF: RAWINPUTDEVICE* PCRAWINPUTDEVICE ; +TYPEDEF: RAWINPUTDEVICE* PRAWINPUTDEVICE +TYPEDEF: RAWINPUTDEVICE* LPRAWINPUTDEVICE +TYPEDEF: RAWINPUTDEVICE* PCRAWINPUTDEVICE CONSTANT: RIDEV_REMOVE 0x00000001 CONSTANT: RIDEV_EXCLUDE 0x00000010 @@ -924,7 +924,7 @@ CONSTANT: GIDC_REMOVAL 2 STRUCT: RAWINPUTDEVICELIST { hDevice HANDLE } { dwType DWORD } ; -TYPEDEF: RAWINPUTDEVICELIST* PRAWINPUTDEVICELIST ; +TYPEDEF: RAWINPUTDEVICELIST* PRAWINPUTDEVICELIST CONSTANT: CCHFORMNAME 32 @@ -1004,8 +1004,8 @@ STRUCT: DEVMODE ! } ; ! } ; -TYPEDEF: DEVMODE* PDEVMODE ; -TYPEDEF: DEVMODE* LPDEVMODE ; +TYPEDEF: DEVMODE* PDEVMODE +TYPEDEF: DEVMODE* LPDEVMODE LIBRARY: user32 diff --git a/ffi/windows/usp10/usp10.factor b/ffi/windows/usp10/usp10.factor index c1fb89f704..e77a8cdacf 100644 --- a/ffi/windows/usp10/usp10.factor +++ b/ffi/windows/usp10/usp10.factor @@ -244,7 +244,7 @@ STRUCT: SCRIPT_TABDEF { pTabStops int* } { iTabOrigin int } ; -TYPEDEF: void* SCRIPT_STRING_ANALYSIS ; +TYPEDEF: void* SCRIPT_STRING_ANALYSIS FUNCTION: HRESULT ScriptStringAnalyse ( HDC hdc, diff --git a/ffi/windows/winmm/winmm.factor b/ffi/windows/winmm/winmm.factor index 3b05e0e8b3..e1d0c49198 100644 --- a/ffi/windows/winmm/winmm.factor +++ b/ffi/windows/winmm/winmm.factor @@ -6,7 +6,7 @@ IN: windows.winmm LIBRARY: winmm -TYPEDEF: int MCIERROR ; +TYPEDEF: int MCIERROR FUNCTION: MCIERROR mciSendStringW ( LPCTSTR lpszCommand, diff --git a/ffi/windows/winsock/winsock.factor b/ffi/windows/winsock/winsock.factor index cfe00d9b00..f143a1782d 100644 --- a/ffi/windows/winsock/winsock.factor +++ b/ffi/windows/winsock/winsock.factor @@ -13,7 +13,7 @@ COMPILE< cpu x86.64? "windows.winsock.64" "windows.winsock.32" ? use-vocab COMPILE> -TYPEDEF: int* SOCKET ; +TYPEDEF: int* SOCKET : ( -- byte-array ) 0x190 ; @@ -205,15 +205,15 @@ FUNCTION: protoent* getprotobyname ( c-string name ) ; FUNCTION: servent* getservbyname ( c-string name, c-string prot ) ; FUNCTION: servent* getservbyport ( int port, c-string prot ) ; -TYPEDEF: uint SERVICETYPE ; -TYPEDEF: void* LPWSADATA ; -TYPEDEF: OVERLAPPED WSAOVERLAPPED ; -TYPEDEF: WSAOVERLAPPED* LPWSAOVERLAPPED ; -TYPEDEF: uint GROUP ; -TYPEDEF: void* LPCONDITIONPROC ; -TYPEDEF: HANDLE WSAEVENT ; -TYPEDEF: LPHANDLE LPWSAEVENT ; -TYPEDEF: sockaddr* LPSOCKADDR ; +TYPEDEF: uint SERVICETYPE +TYPEDEF: void* LPWSADATA +TYPEDEF: OVERLAPPED WSAOVERLAPPED +TYPEDEF: WSAOVERLAPPED* LPWSAOVERLAPPED +TYPEDEF: uint GROUP +TYPEDEF: void* LPCONDITIONPROC +TYPEDEF: HANDLE WSAEVENT +TYPEDEF: LPHANDLE LPWSAEVENT +TYPEDEF: sockaddr* LPSOCKADDR STRUCT: FLOWSPEC { TokenRate uint } @@ -224,19 +224,19 @@ STRUCT: FLOWSPEC { ServiceType SERVICETYPE } { MaxSduSize uint } { MinimumPolicedSize uint } ; -TYPEDEF: FLOWSPEC* PFLOWSPEC ; -TYPEDEF: FLOWSPEC* LPFLOWSPEC ; +TYPEDEF: FLOWSPEC* PFLOWSPEC +TYPEDEF: FLOWSPEC* LPFLOWSPEC STRUCT: WSABUF { len ulong } { buf void* } ; -TYPEDEF: WSABUF* LPWSABUF ; +TYPEDEF: WSABUF* LPWSABUF STRUCT: QOS { SendingFlowspec FLOWSPEC } { ReceivingFlowspec FLOWSPEC } { ProviderSpecific WSABUF } ; -TYPEDEF: QOS* LPQOS ; +TYPEDEF: QOS* LPQOS CONSTANT: MAX_PROTOCOL_CHAIN 7 @@ -244,7 +244,7 @@ STRUCT: WSAPROTOCOLCHAIN { ChainLen int } { ChainEntries { DWORD 7 } } ; ! { ChainEntries { DWORD MAX_PROTOCOL_CHAIN } } ; -TYPEDEF: WSAPROTOCOLCHAIN* LPWSAPROTOCOLCHAIN ; +TYPEDEF: WSAPROTOCOLCHAIN* LPWSAPROTOCOLCHAIN CONSTANT: WSAPROTOCOL_LEN 255 @@ -270,11 +270,11 @@ STRUCT: WSAPROTOCOL_INFOW { dwProviderReserved DWORD } { szProtocol { WCHAR 256 } } ; ! { szProtocol[WSAPROTOCOL_LEN+1] { WCHAR 256 } } ; -TYPEDEF: WSAPROTOCOL_INFOW* PWSAPROTOCOL_INFOW ; -TYPEDEF: WSAPROTOCOL_INFOW* LPWSAPROTOCOL_INFOW ; -TYPEDEF: WSAPROTOCOL_INFOW WSAPROTOCOL_INFO ; -TYPEDEF: WSAPROTOCOL_INFOW* PWSAPROTOCOL_INFO ; -TYPEDEF: WSAPROTOCOL_INFOW* LPWSAPROTOCOL_INFO ; +TYPEDEF: WSAPROTOCOL_INFOW* PWSAPROTOCOL_INFOW +TYPEDEF: WSAPROTOCOL_INFOW* LPWSAPROTOCOL_INFOW +TYPEDEF: WSAPROTOCOL_INFOW WSAPROTOCOL_INFO +TYPEDEF: WSAPROTOCOL_INFOW* PWSAPROTOCOL_INFO +TYPEDEF: WSAPROTOCOL_INFOW* LPWSAPROTOCOL_INFO STRUCT: WSANAMESPACE_INFOW @@ -283,19 +283,19 @@ STRUCT: WSANAMESPACE_INFOW { fActive BOOL } { dwVersion DWORD } { lpszIdentifier LPWSTR } ; -TYPEDEF: WSANAMESPACE_INFOW* PWSANAMESPACE_INFOW ; -TYPEDEF: WSANAMESPACE_INFOW* LPWSANAMESPACE_INFOW ; -TYPEDEF: WSANAMESPACE_INFOW WSANAMESPACE_INFO ; -TYPEDEF: WSANAMESPACE_INFO* PWSANAMESPACE_INFO ; -TYPEDEF: WSANAMESPACE_INFO* LPWSANAMESPACE_INFO ; +TYPEDEF: WSANAMESPACE_INFOW* PWSANAMESPACE_INFOW +TYPEDEF: WSANAMESPACE_INFOW* LPWSANAMESPACE_INFOW +TYPEDEF: WSANAMESPACE_INFOW WSANAMESPACE_INFO +TYPEDEF: WSANAMESPACE_INFO* PWSANAMESPACE_INFO +TYPEDEF: WSANAMESPACE_INFO* LPWSANAMESPACE_INFO CONSTANT: FD_MAX_EVENTS 10 STRUCT: WSANETWORKEVENTS { lNetworkEvents long } { iErrorCode { int FD_MAX_EVENTS } } ; -TYPEDEF: WSANETWORKEVENTS* PWSANETWORKEVENTS ; -TYPEDEF: WSANETWORKEVENTS* LPWSANETWORKEVENTS ; +TYPEDEF: WSANETWORKEVENTS* PWSANETWORKEVENTS +TYPEDEF: WSANETWORKEVENTS* LPWSANETWORKEVENTS ! STRUCT: WSAOVERLAPPED ! { Internal DWORD } @@ -341,7 +341,7 @@ FUNCTION: BOOL WSAGetOverlappedResult ( SOCKET s, BOOL fWait, LPDWORD lpdwFlags ) ; -TYPEDEF: void* LPWSAOVERLAPPED_COMPLETION_ROUTINE ; +TYPEDEF: void* LPWSAOVERLAPPED_COMPLETION_ROUTINE FUNCTION: int WSAIoctl ( SOCKET s, DWORD dwIoControlCode, LPVOID lpvInBuffer, diff --git a/ffi/x11/constants/constants.factor b/ffi/x11/constants/constants.factor index 3dc9cbffa8..efe7ebb9a9 100644 --- a/ffi/x11/constants/constants.factor +++ b/ffi/x11/constants/constants.factor @@ -6,9 +6,9 @@ USING: alien alien.c-types alien.syntax math x11.xlib ; IN: x11.constants -TYPEDEF: ulong Mask ; +TYPEDEF: ulong Mask -TYPEDEF: uchar KeyCode ; +TYPEDEF: uchar KeyCode ! Reserved Resource and Constant Definitions diff --git a/ffi/x11/glx/glx.factor b/ffi/x11/glx/glx.factor index 991183e416..3df9d39506 100644 --- a/ffi/x11/glx/glx.factor +++ b/ffi/x11/glx/glx.factor @@ -29,14 +29,14 @@ CONSTANT: GLX_ACCUM_GREEN_SIZE 15 ! number of green accum bits ; CONSTANT: GLX_ACCUM_BLUE_SIZE 16 ! number of blue accum bits ; CONSTANT: GLX_ACCUM_ALPHA_SIZE 17 ! number of alpha accum bits ; -TYPEDEF: XID GLXContextID ; -TYPEDEF: XID GLXPixmap ; -TYPEDEF: XID GLXDrawable ; -TYPEDEF: XID GLXPbuffer ; -TYPEDEF: XID GLXWindow ; -TYPEDEF: XID GLXFBConfigID ; -TYPEDEF: void* GLXContext ; ! typedef struct __GLXcontextRec *GLXContext; -TYPEDEF: void* GLXFBConfig ; ! typedef struct __GLXFBConfigRec *GLXFBConfig; +TYPEDEF: XID GLXContextID +TYPEDEF: XID GLXPixmap +TYPEDEF: XID GLXDrawable +TYPEDEF: XID GLXPbuffer +TYPEDEF: XID GLXWindow +TYPEDEF: XID GLXFBConfigID +TYPEDEF: void* GLXContext ! typedef struct __GLXcontextRec *GLXContext; +TYPEDEF: void* GLXFBConfig ! typedef struct __GLXFBConfigRec *GLXFBConfig; X-FUNCTION: XVisualInfo* glXChooseVisual ( Display* dpy, int screen, int* attribList ) ; X-FUNCTION: void glXCopyContext ( Display* dpy, GLXContext src, GLXContext dst, ulong mask ) ; diff --git a/ffi/x11/xinput2/ffi/ffi.factor b/ffi/x11/xinput2/ffi/ffi.factor index 85cae2925f..c5fe3ea17c 100644 --- a/ffi/x11/xinput2/ffi/ffi.factor +++ b/ffi/x11/xinput2/ffi/ffi.factor @@ -73,7 +73,7 @@ STRUCT: XIModifierState { locked int } { effective int } ; -TYPEDEF: XIModifierState XIGroupState ; +TYPEDEF: XIModifierState XIGroupState STRUCT: XIButtonState { mask_len int } @@ -244,9 +244,9 @@ STRUCT: XIEnterEvent { mods XIModifierState } { group XIGroupState } ; -TYPEDEF: XIEnterEvent XILeaveEvent ; -TYPEDEF: XIEnterEvent XIFocusInEvent ; -TYPEDEF: XIEnterEvent XIFocusOutEvent ; +TYPEDEF: XIEnterEvent XILeaveEvent +TYPEDEF: XIEnterEvent XIFocusInEvent +TYPEDEF: XIEnterEvent XIFocusOutEvent STRUCT: XIPropertyEvent { type int } diff --git a/ffi/x11/xlib/xlib.factor b/ffi/x11/xlib/xlib.factor index f9a87d3eea..3e8533c13d 100644 --- a/ffi/x11/xlib/xlib.factor +++ b/ffi/x11/xlib/xlib.factor @@ -19,34 +19,34 @@ IN: x11.xlib LIBRARY: xlib -TYPEDEF: ulong XID ; -TYPEDEF: XID Window ; -TYPEDEF: XID Drawable ; -TYPEDEF: XID Font ; -TYPEDEF: XID Pixmap ; -TYPEDEF: XID Cursor ; -TYPEDEF: XID Colormap ; -TYPEDEF: XID GContext ; -TYPEDEF: XID KeySym ; +TYPEDEF: ulong XID +TYPEDEF: XID Window +TYPEDEF: XID Drawable +TYPEDEF: XID Font +TYPEDEF: XID Pixmap +TYPEDEF: XID Cursor +TYPEDEF: XID Colormap +TYPEDEF: XID GContext +TYPEDEF: XID KeySym -TYPEDEF: ulong Atom ; +TYPEDEF: ulong Atom -TYPEDEF: c-string XPointer ; +TYPEDEF: c-string XPointer C-TYPE: Screen -TYPEDEF: void* GC ; +TYPEDEF: void* GC C-TYPE: Visual C-TYPE: XExtData C-TYPE: XFontProp C-TYPE: XComposeStatus -TYPEDEF: void* XIM ; -TYPEDEF: void* XIC ; +TYPEDEF: void* XIM +TYPEDEF: void* XIC -TYPEDEF: int Status ; +TYPEDEF: int Status -TYPEDEF: int Bool ; +TYPEDEF: int Bool -TYPEDEF: ulong VisualID ; -TYPEDEF: ulong Time ; +TYPEDEF: ulong VisualID +TYPEDEF: ulong Time : *XID ( bytes -- n ) ulong deref ; ALIAS: *Window *XID @@ -611,8 +611,8 @@ STRUCT: XButtonEvent { button uint } { same_screen Bool } ; -TYPEDEF: XButtonEvent XButtonPressedEvent ; -TYPEDEF: XButtonEvent XButtonReleasedEvent ; +TYPEDEF: XButtonEvent XButtonPressedEvent +TYPEDEF: XButtonEvent XButtonReleasedEvent ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -634,8 +634,8 @@ STRUCT: XKeyEvent { keycode uint } { same_screen Bool } ; -TYPEDEF: XKeyEvent XKeyPressedEvent ; -TYPEDEF: XKeyEvent XKeyReleasedEvent ; +TYPEDEF: XKeyEvent XKeyPressedEvent +TYPEDEF: XKeyEvent XKeyReleasedEvent ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -656,7 +656,7 @@ STRUCT: XMotionEvent { is_hint char } { same_screen Bool } ; -TYPEDEF: XMotionEvent XPointerMovedEvent ; +TYPEDEF: XMotionEvent XPointerMovedEvent ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -679,8 +679,8 @@ STRUCT: XCrossingEvent { focus Bool } { state uint } ; -TYPEDEF: XCrossingEvent XEnterWindowEvent ; -TYPEDEF: XCrossingEvent XLeaveWindowEvent ; +TYPEDEF: XCrossingEvent XEnterWindowEvent +TYPEDEF: XCrossingEvent XLeaveWindowEvent ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -693,8 +693,8 @@ STRUCT: XFocusChangeEvent { mode int } { detail int } ; -TYPEDEF: XFocusChangeEvent XFocusInEvent ; -TYPEDEF: XFocusChangeEvent XFocusOutEvent ; +TYPEDEF: XFocusChangeEvent XFocusInEvent +TYPEDEF: XFocusChangeEvent XFocusOutEvent ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/frameworks/db/postgresql/errors/errors.factor b/frameworks/db/postgresql/errors/errors.factor index 303e781ffc..3d8f1b1b0b 100644 --- a/frameworks/db/postgresql/errors/errors.factor +++ b/frameworks/db/postgresql/errors/errors.factor @@ -35,7 +35,7 @@ UnknownError = .* => [[ >string ]] PostgresqlSqlError = (TableError | DatabaseError | FunctionError | SyntaxError | UnknownError) -]=] ; +]=] TUPLE: parse-postgresql-location column line text ; diff --git a/frameworks/db/postgresql/ffi/ffi.factor b/frameworks/db/postgresql/ffi/ffi.factor index 4961230b59..8c4a5c5295 100644 --- a/frameworks/db/postgresql/ffi/ffi.factor +++ b/frameworks/db/postgresql/ffi/ffi.factor @@ -53,17 +53,17 @@ CONSTANT: PQERRORS_VERBOSE 0x2 CONSTANT: InvalidOid 0 -TYPEDEF: int ConnStatusType ; -TYPEDEF: int ExecStatusType ; -TYPEDEF: int PostgresPollingStatusType ; -TYPEDEF: int PGTransactionStatusType ; -TYPEDEF: int PGVerbosity ; +TYPEDEF: int ConnStatusType +TYPEDEF: int ExecStatusType +TYPEDEF: int PostgresPollingStatusType +TYPEDEF: int PGTransactionStatusType +TYPEDEF: int PGVerbosity C-TYPE: PGconn C-TYPE: PGresult C-TYPE: PGcancel -TYPEDEF: uint Oid ; -TYPEDEF: char pqbool ; +TYPEDEF: uint Oid +TYPEDEF: char pqbool C-TYPE: PQconninfoOption C-TYPE: PGnotify C-TYPE: PQArgBlock diff --git a/frameworks/db/sqlite/errors/errors.factor b/frameworks/db/sqlite/errors/errors.factor index f098b97a9f..1dcfab383c 100644 --- a/frameworks/db/sqlite/errors/errors.factor +++ b/frameworks/db/sqlite/errors/errors.factor @@ -25,4 +25,4 @@ SqliteError = => [[ table >string ]] | .*:error => [[ error >string ]] -]=] ; +]=] diff --git a/frameworks/db/sqlite/ffi/ffi.factor b/frameworks/db/sqlite/ffi/ffi.factor index ecc6729991..79c8326e30 100644 --- a/frameworks/db/sqlite/ffi/ffi.factor +++ b/frameworks/db/sqlite/ffi/ffi.factor @@ -101,8 +101,8 @@ CONSTANT: SQLITE_OPEN_MASTER_JOURNAL 0x00004000 C-TYPE: sqlite3 C-TYPE: sqlite3_stmt -TYPEDEF: longlong sqlite3_int64 ; -TYPEDEF: ulonglong sqlite3_uint64 ; +TYPEDEF: longlong sqlite3_int64 +TYPEDEF: ulonglong sqlite3_uint64 LIBRARY: sqlite FUNCTION: int sqlite3_open ( c-string filename, void* ppDb ) ; diff --git a/frameworks/gpu/shaders/shaders.factor b/frameworks/gpu/shaders/shaders.factor index 9347114404..9043b25960 100755 --- a/frameworks/gpu/shaders/shaders.factor +++ b/frameworks/gpu/shaders/shaders.factor @@ -591,7 +591,7 @@ SYNTAX: \ GLSL-SHADER: scan-word f lexer get line>> - scan-object ";" expect + scan-object ] dip shader boa over reset-generic @@ -601,7 +601,7 @@ SYNTAX: \ GLSL-SHADER-FILE: scan-new dup dup old-instances [ scan-word execute( -- kind ) - scan-object ";" expect in-word's-path + scan-object in-word's-path 0 over ascii file-contents ] dip diff --git a/games/jamshred/log/log.factor b/games/jamshred/log/log.factor index 5d51c63206..f2517d1ec3 100644 --- a/games/jamshred/log/log.factor +++ b/games/jamshred/log/log.factor @@ -1,7 +1,7 @@ USING: kernel logging ; IN: jamshred.log -LOG: (jamshred-log) DEBUG ; +LOG: (jamshred-log) DEBUG : with-jamshred-log ( quot -- ) "jamshred" swap with-logging ; inline diff --git a/language/alien/parser/parser-tests.factor b/language/alien/parser/parser-tests.factor index 3351afa9bc..4362811aa0 100644 --- a/language/alien/parser/parser-tests.factor +++ b/language/alien/parser/parser-tests.factor @@ -48,7 +48,7 @@ COMPILE< COMPILE> -TYPEDEF: char char2 ; +TYPEDEF: char char2 SYMBOL: not-c-type @@ -105,7 +105,7 @@ CALLBACK: void* alien-parser-callback-effect-test ( int *arg1 float arg2 ) ; { t } [ \ alien-parser-callback-effect-test inline? ] unit-test ! Reported by mnestic -TYPEDEF: int alien-parser-test-int ; ! reasonably unique name... +TYPEDEF: int alien-parser-test-int ! reasonably unique name... { "OK!" } [ [ diff --git a/language/alien/prettyprint/prettyprint-tests.factor b/language/alien/prettyprint/prettyprint-tests.factor index 8981548931..84f2cc7796 100644 --- a/language/alien/prettyprint/prettyprint-tests.factor +++ b/language/alien/prettyprint/prettyprint-tests.factor @@ -25,8 +25,8 @@ FUNCTION-ALIAS: function-test int function_test [ \ function-test see ] with-string-writer ] unit-test -TYPEDEF: c-string[ascii] string-typedef ; -TYPEDEF: char[1][2][3] array-typedef ; +TYPEDEF: c-string[ascii] string-typedef +TYPEDEF: char[1][2][3] array-typedef { "USING: alien.c-types alien.syntax ; IN: alien.prettyprint.tests @@ -51,7 +51,7 @@ C-TYPE: opaque-c-type [ \ opaque-c-type see ] with-string-writer ] unit-test -TYPEDEF: pointer: int pint ; +TYPEDEF: pointer: int pint { "USING: alien.c-types alien.syntax ; IN: alien.prettyprint.tests diff --git a/language/alien/syntax/syntax.factor b/language/alien/syntax/syntax.factor index 43ff00e73c..02456536e0 100755 --- a/language/alien/syntax/syntax.factor +++ b/language/alien/syntax/syntax.factor @@ -28,7 +28,7 @@ SYNTAX: \ CALLBACK: (CALLBACK:) define-inline ; SYNTAX: \ TYPEDEF: - scan-c-type CREATE-C-TYPE ";" expect dup save-location typedef ; + scan-c-type CREATE-C-TYPE dup save-location typedef ; ARITY: \ TYPEDEF: 2 SYNTAX: \ ENUM: @@ -41,7 +41,7 @@ ARITY: \ C-TYPE: 2 SYNTAX: \ &: scan-token current-library get $[ _ _ address-of ] append! ; -SYNTAX: \ C-GLOBAL: scan-c-type scan-new-word ";" expect define-global ; +SYNTAX: \ C-GLOBAL: scan-c-type scan-new-word define-global ; SYNTAX: \ pointer: scan-c-type suffix! ; diff --git a/language/compiler/cfg/gvn/avail/avail.factor b/language/compiler/cfg/gvn/avail/avail.factor index 8a02f2c50c..9d07225315 100644 --- a/language/compiler/cfg/gvn/avail/avail.factor +++ b/language/compiler/cfg/gvn/avail/avail.factor @@ -40,4 +40,4 @@ M: avail transfer-set drop defined assoc-union ; : make-available ( vreg -- ) basic-block get avail-ins get [ dupd clone ?set-at ] assocs:change-at ; -RENAMING: >avail [ ] [ dup >avail-vreg swap or ] [ ] ; +RENAMING: >avail [ ] [ dup >avail-vreg swap or ] [ ] diff --git a/language/compiler/cfg/linear-scan/assignment/assignment.factor b/language/compiler/cfg/linear-scan/assignment/assignment.factor index fbc06405dc..4a3cc8a490 100644 --- a/language/compiler/cfg/linear-scan/assignment/assignment.factor +++ b/language/compiler/cfg/linear-scan/assignment/assignment.factor @@ -88,7 +88,7 @@ SYMBOL: machine-live-outs [ pending-interval-heap get expire-old-intervals ] [ unhandled-intervals get activate-new-intervals ] bi ; -RENAMING: assign [ vreg>reg ] [ vreg>reg ] [ vreg>reg ] ; +RENAMING: assign [ vreg>reg ] [ vreg>reg ] [ vreg>reg ] : assign-all-registers ( insn -- ) [ assign-insn-defs ] [ assign-insn-uses ] [ assign-insn-temps ] tri ; diff --git a/language/compiler/cfg/renaming/functor/functor.factor b/language/compiler/cfg/renaming/functor/functor.factor index 40055afb48..e6f92afc07 100644 --- a/language/compiler/cfg/renaming/functor/functor.factor +++ b/language/compiler/cfg/renaming/functor/functor.factor @@ -85,4 +85,4 @@ insn-classes get [ insn-temp-slots empty? ] reject [ FUNCTOR> -SYNTAX: \ RENAMING: scan-token scan-object scan-object scan-object ";" expect define-renaming ; +SYNTAX: \ RENAMING: scan-token scan-object scan-object scan-object define-renaming ; diff --git a/language/compiler/cfg/renaming/renaming.factor b/language/compiler/cfg/renaming/renaming.factor index 0a835b0ad4..f28523c6b5 100644 --- a/language/compiler/cfg/renaming/renaming.factor +++ b/language/compiler/cfg/renaming/renaming.factor @@ -9,4 +9,4 @@ SYMBOL: renamings : rename-value ( vreg -- vreg' ) renamings get ?at drop ; -RENAMING: rename [ rename-value ] [ rename-value ] [ drop next-vreg ] ; +RENAMING: rename [ rename-value ] [ rename-value ] [ drop next-vreg ] diff --git a/language/compiler/cfg/representations/rewrite/rewrite.factor b/language/compiler/cfg/representations/rewrite/rewrite.factor index 8f60d8aac6..c3e2ad8b44 100644 --- a/language/compiler/cfg/representations/rewrite/rewrite.factor +++ b/language/compiler/cfg/representations/rewrite/rewrite.factor @@ -66,7 +66,7 @@ SYMBOLS: renaming-set needs-renaming? ; : converted-value ( vreg -- vreg' ) renaming-set get pop first2 [ assert= ] dip ; -RENAMING: convert [ converted-value ] [ converted-value ] [ ] ; +RENAMING: convert [ converted-value ] [ converted-value ] [ ] : perform-renaming ( insn -- ) needs-renaming? get [ diff --git a/language/compiler/cfg/ssa/construction/construction.factor b/language/compiler/cfg/ssa/construction/construction.factor index c419f74c57..f54d8ba6a4 100644 --- a/language/compiler/cfg/ssa/construction/construction.factor +++ b/language/compiler/cfg/ssa/construction/construction.factor @@ -73,7 +73,7 @@ SYMBOLS: stacks pushed ; (top-name) dup [ dup used-vregs get push-front ] when ; -RENAMING: ssa-rename [ gen-name ] [ top-name ] [ ] ; +RENAMING: ssa-rename [ gen-name ] [ top-name ] [ ] GENERIC: rename-insn ( insn -- ) diff --git a/language/compiler/codegen/codegen.factor b/language/compiler/codegen/codegen.factor index e2775743cb..29027f3e76 100755 --- a/language/compiler/codegen/codegen.factor +++ b/language/compiler/codegen/codegen.factor @@ -129,184 +129,184 @@ COMPILE< ] dip suffix ; SYNTAX: \ CODEGEN: - scan-word [ \ generate-insn create-method-in ] keep scan-word ";" expect + scan-word [ \ generate-insn create-method-in ] keep scan-word codegen-method-body define ; COMPILE> -CODEGEN: ##load-integer %load-immediate ; -CODEGEN: ##load-tagged %load-immediate ; -CODEGEN: ##load-reference %load-reference ; -CODEGEN: ##load-float %load-float ; -CODEGEN: ##load-double %load-double ; -CODEGEN: ##load-vector %load-vector ; -CODEGEN: ##peek %peek ; -CODEGEN: ##replace %replace ; -CODEGEN: ##replace-imm %replace-imm ; -CODEGEN: ##clear %clear ; -CODEGEN: ##inc %inc ; -CODEGEN: ##call %call ; -CODEGEN: ##jump %jump ; -CODEGEN: ##return %return ; -CODEGEN: ##safepoint %safepoint ; -CODEGEN: ##slot %slot ; -CODEGEN: ##slot-imm %slot-imm ; -CODEGEN: ##set-slot %set-slot ; -CODEGEN: ##set-slot-imm %set-slot-imm ; -CODEGEN: ##add %add ; -CODEGEN: ##add-imm %add-imm ; -CODEGEN: ##sub %sub ; -CODEGEN: ##sub-imm %sub-imm ; -CODEGEN: ##mul %mul ; -CODEGEN: ##mul-imm %mul-imm ; -CODEGEN: ##and %and ; -CODEGEN: ##and-imm %and-imm ; -CODEGEN: ##or %or ; -CODEGEN: ##or-imm %or-imm ; -CODEGEN: ##xor %xor ; -CODEGEN: ##xor-imm %xor-imm ; -CODEGEN: ##shl %shl ; -CODEGEN: ##shl-imm %shl-imm ; -CODEGEN: ##shr %shr ; -CODEGEN: ##shr-imm %shr-imm ; -CODEGEN: ##sar %sar ; -CODEGEN: ##sar-imm %sar-imm ; -CODEGEN: ##min %min ; -CODEGEN: ##max %max ; -CODEGEN: ##not %not ; -CODEGEN: ##neg %neg ; -CODEGEN: ##log2 %log2 ; -CODEGEN: ##bit-count %bit-count ; -CODEGEN: ##bit-test %bit-test ; -CODEGEN: ##copy %copy ; -CODEGEN: ##tagged>integer %tagged>integer ; -CODEGEN: ##add-float %add-float ; -CODEGEN: ##sub-float %sub-float ; -CODEGEN: ##mul-float %mul-float ; -CODEGEN: ##div-float %div-float ; -CODEGEN: ##min-float %min-float ; -CODEGEN: ##max-float %max-float ; -CODEGEN: ##sqrt %sqrt ; -CODEGEN: ##single>double-float %single>double-float ; -CODEGEN: ##double>single-float %double>single-float ; -CODEGEN: ##integer>float %integer>float ; -CODEGEN: ##float>integer %float>integer ; -CODEGEN: ##zero-vector %zero-vector ; -CODEGEN: ##fill-vector %fill-vector ; -CODEGEN: ##gather-vector-2 %gather-vector-2 ; -CODEGEN: ##gather-vector-4 %gather-vector-4 ; -CODEGEN: ##gather-int-vector-2 %gather-int-vector-2 ; -CODEGEN: ##gather-int-vector-4 %gather-int-vector-4 ; -CODEGEN: ##select-vector %select-vector ; -CODEGEN: ##shuffle-vector-imm %shuffle-vector-imm ; -CODEGEN: ##shuffle-vector-halves-imm %shuffle-vector-halves-imm ; -CODEGEN: ##shuffle-vector %shuffle-vector ; -CODEGEN: ##tail>head-vector %tail>head-vector ; -CODEGEN: ##merge-vector-head %merge-vector-head ; -CODEGEN: ##merge-vector-tail %merge-vector-tail ; -CODEGEN: ##float-pack-vector %float-pack-vector ; -CODEGEN: ##signed-pack-vector %signed-pack-vector ; -CODEGEN: ##unsigned-pack-vector %unsigned-pack-vector ; -CODEGEN: ##unpack-vector-head %unpack-vector-head ; -CODEGEN: ##unpack-vector-tail %unpack-vector-tail ; -CODEGEN: ##integer>float-vector %integer>float-vector ; -CODEGEN: ##float>integer-vector %float>integer-vector ; -CODEGEN: ##compare-vector %compare-vector ; -CODEGEN: ##move-vector-mask %move-vector-mask ; -CODEGEN: ##test-vector %test-vector ; -CODEGEN: ##add-vector %add-vector ; -CODEGEN: ##saturated-add-vector %saturated-add-vector ; -CODEGEN: ##add-sub-vector %add-sub-vector ; -CODEGEN: ##sub-vector %sub-vector ; -CODEGEN: ##saturated-sub-vector %saturated-sub-vector ; -CODEGEN: ##mul-vector %mul-vector ; -CODEGEN: ##mul-high-vector %mul-high-vector ; -CODEGEN: ##mul-horizontal-add-vector %mul-horizontal-add-vector ; -CODEGEN: ##saturated-mul-vector %saturated-mul-vector ; -CODEGEN: ##div-vector %div-vector ; -CODEGEN: ##min-vector %min-vector ; -CODEGEN: ##max-vector %max-vector ; -CODEGEN: ##avg-vector %avg-vector ; -CODEGEN: ##dot-vector %dot-vector ; -CODEGEN: ##sad-vector %sad-vector ; -CODEGEN: ##sqrt-vector %sqrt-vector ; -CODEGEN: ##horizontal-add-vector %horizontal-add-vector ; -CODEGEN: ##horizontal-sub-vector %horizontal-sub-vector ; -CODEGEN: ##horizontal-shl-vector-imm %horizontal-shl-vector-imm ; -CODEGEN: ##horizontal-shr-vector-imm %horizontal-shr-vector-imm ; -CODEGEN: ##abs-vector %abs-vector ; -CODEGEN: ##and-vector %and-vector ; -CODEGEN: ##andn-vector %andn-vector ; -CODEGEN: ##or-vector %or-vector ; -CODEGEN: ##xor-vector %xor-vector ; -CODEGEN: ##not-vector %not-vector ; -CODEGEN: ##shl-vector-imm %shl-vector-imm ; -CODEGEN: ##shr-vector-imm %shr-vector-imm ; -CODEGEN: ##shl-vector %shl-vector ; -CODEGEN: ##shr-vector %shr-vector ; -CODEGEN: ##integer>scalar %integer>scalar ; -CODEGEN: ##scalar>integer %scalar>integer ; -CODEGEN: ##vector>scalar %vector>scalar ; -CODEGEN: ##scalar>vector %scalar>vector ; -CODEGEN: ##box-alien %box-alien ; -CODEGEN: ##box-displaced-alien %box-displaced-alien ; -CODEGEN: ##unbox-alien %unbox-alien ; -CODEGEN: ##unbox-any-c-ptr %unbox-any-c-ptr ; -CODEGEN: ##convert-integer %convert-integer ; -CODEGEN: ##load-memory %load-memory ; -CODEGEN: ##load-memory-imm %load-memory-imm ; -CODEGEN: ##store-memory %store-memory ; -CODEGEN: ##store-memory-imm %store-memory-imm ; -CODEGEN: ##allot %allot ; -CODEGEN: ##write-barrier %write-barrier ; -CODEGEN: ##write-barrier-imm %write-barrier-imm ; -CODEGEN: ##compare %compare ; -CODEGEN: ##compare-imm %compare-imm ; -CODEGEN: ##test %test ; -CODEGEN: ##test-imm %test-imm ; -CODEGEN: ##compare-integer %compare ; -CODEGEN: ##compare-integer-imm %compare-integer-imm ; -CODEGEN: ##compare-float-ordered %compare-float-ordered ; -CODEGEN: ##compare-float-unordered %compare-float-unordered ; -CODEGEN: ##save-context %save-context ; -CODEGEN: ##vm-field %vm-field ; -CODEGEN: ##set-vm-field %set-vm-field ; -CODEGEN: ##alien-global %alien-global ; -CODEGEN: ##call-gc %call-gc ; -CODEGEN: ##spill %spill ; -CODEGEN: ##reload %reload ; +CODEGEN: ##load-integer %load-immediate +CODEGEN: ##load-tagged %load-immediate +CODEGEN: ##load-reference %load-reference +CODEGEN: ##load-float %load-float +CODEGEN: ##load-double %load-double +CODEGEN: ##load-vector %load-vector +CODEGEN: ##peek %peek +CODEGEN: ##replace %replace +CODEGEN: ##replace-imm %replace-imm +CODEGEN: ##clear %clear +CODEGEN: ##inc %inc +CODEGEN: ##call %call +CODEGEN: ##jump %jump +CODEGEN: ##return %return +CODEGEN: ##safepoint %safepoint +CODEGEN: ##slot %slot +CODEGEN: ##slot-imm %slot-imm +CODEGEN: ##set-slot %set-slot +CODEGEN: ##set-slot-imm %set-slot-imm +CODEGEN: ##add %add +CODEGEN: ##add-imm %add-imm +CODEGEN: ##sub %sub +CODEGEN: ##sub-imm %sub-imm +CODEGEN: ##mul %mul +CODEGEN: ##mul-imm %mul-imm +CODEGEN: ##and %and +CODEGEN: ##and-imm %and-imm +CODEGEN: ##or %or +CODEGEN: ##or-imm %or-imm +CODEGEN: ##xor %xor +CODEGEN: ##xor-imm %xor-imm +CODEGEN: ##shl %shl +CODEGEN: ##shl-imm %shl-imm +CODEGEN: ##shr %shr +CODEGEN: ##shr-imm %shr-imm +CODEGEN: ##sar %sar +CODEGEN: ##sar-imm %sar-imm +CODEGEN: ##min %min +CODEGEN: ##max %max +CODEGEN: ##not %not +CODEGEN: ##neg %neg +CODEGEN: ##log2 %log2 +CODEGEN: ##bit-count %bit-count +CODEGEN: ##bit-test %bit-test +CODEGEN: ##copy %copy +CODEGEN: ##tagged>integer %tagged>integer +CODEGEN: ##add-float %add-float +CODEGEN: ##sub-float %sub-float +CODEGEN: ##mul-float %mul-float +CODEGEN: ##div-float %div-float +CODEGEN: ##min-float %min-float +CODEGEN: ##max-float %max-float +CODEGEN: ##sqrt %sqrt +CODEGEN: ##single>double-float %single>double-float +CODEGEN: ##double>single-float %double>single-float +CODEGEN: ##integer>float %integer>float +CODEGEN: ##float>integer %float>integer +CODEGEN: ##zero-vector %zero-vector +CODEGEN: ##fill-vector %fill-vector +CODEGEN: ##gather-vector-2 %gather-vector-2 +CODEGEN: ##gather-vector-4 %gather-vector-4 +CODEGEN: ##gather-int-vector-2 %gather-int-vector-2 +CODEGEN: ##gather-int-vector-4 %gather-int-vector-4 +CODEGEN: ##select-vector %select-vector +CODEGEN: ##shuffle-vector-imm %shuffle-vector-imm +CODEGEN: ##shuffle-vector-halves-imm %shuffle-vector-halves-imm +CODEGEN: ##shuffle-vector %shuffle-vector +CODEGEN: ##tail>head-vector %tail>head-vector +CODEGEN: ##merge-vector-head %merge-vector-head +CODEGEN: ##merge-vector-tail %merge-vector-tail +CODEGEN: ##float-pack-vector %float-pack-vector +CODEGEN: ##signed-pack-vector %signed-pack-vector +CODEGEN: ##unsigned-pack-vector %unsigned-pack-vector +CODEGEN: ##unpack-vector-head %unpack-vector-head +CODEGEN: ##unpack-vector-tail %unpack-vector-tail +CODEGEN: ##integer>float-vector %integer>float-vector +CODEGEN: ##float>integer-vector %float>integer-vector +CODEGEN: ##compare-vector %compare-vector +CODEGEN: ##move-vector-mask %move-vector-mask +CODEGEN: ##test-vector %test-vector +CODEGEN: ##add-vector %add-vector +CODEGEN: ##saturated-add-vector %saturated-add-vector +CODEGEN: ##add-sub-vector %add-sub-vector +CODEGEN: ##sub-vector %sub-vector +CODEGEN: ##saturated-sub-vector %saturated-sub-vector +CODEGEN: ##mul-vector %mul-vector +CODEGEN: ##mul-high-vector %mul-high-vector +CODEGEN: ##mul-horizontal-add-vector %mul-horizontal-add-vector +CODEGEN: ##saturated-mul-vector %saturated-mul-vector +CODEGEN: ##div-vector %div-vector +CODEGEN: ##min-vector %min-vector +CODEGEN: ##max-vector %max-vector +CODEGEN: ##avg-vector %avg-vector +CODEGEN: ##dot-vector %dot-vector +CODEGEN: ##sad-vector %sad-vector +CODEGEN: ##sqrt-vector %sqrt-vector +CODEGEN: ##horizontal-add-vector %horizontal-add-vector +CODEGEN: ##horizontal-sub-vector %horizontal-sub-vector +CODEGEN: ##horizontal-shl-vector-imm %horizontal-shl-vector-imm +CODEGEN: ##horizontal-shr-vector-imm %horizontal-shr-vector-imm +CODEGEN: ##abs-vector %abs-vector +CODEGEN: ##and-vector %and-vector +CODEGEN: ##andn-vector %andn-vector +CODEGEN: ##or-vector %or-vector +CODEGEN: ##xor-vector %xor-vector +CODEGEN: ##not-vector %not-vector +CODEGEN: ##shl-vector-imm %shl-vector-imm +CODEGEN: ##shr-vector-imm %shr-vector-imm +CODEGEN: ##shl-vector %shl-vector +CODEGEN: ##shr-vector %shr-vector +CODEGEN: ##integer>scalar %integer>scalar +CODEGEN: ##scalar>integer %scalar>integer +CODEGEN: ##vector>scalar %vector>scalar +CODEGEN: ##scalar>vector %scalar>vector +CODEGEN: ##box-alien %box-alien +CODEGEN: ##box-displaced-alien %box-displaced-alien +CODEGEN: ##unbox-alien %unbox-alien +CODEGEN: ##unbox-any-c-ptr %unbox-any-c-ptr +CODEGEN: ##convert-integer %convert-integer +CODEGEN: ##load-memory %load-memory +CODEGEN: ##load-memory-imm %load-memory-imm +CODEGEN: ##store-memory %store-memory +CODEGEN: ##store-memory-imm %store-memory-imm +CODEGEN: ##allot %allot +CODEGEN: ##write-barrier %write-barrier +CODEGEN: ##write-barrier-imm %write-barrier-imm +CODEGEN: ##compare %compare +CODEGEN: ##compare-imm %compare-imm +CODEGEN: ##test %test +CODEGEN: ##test-imm %test-imm +CODEGEN: ##compare-integer %compare +CODEGEN: ##compare-integer-imm %compare-integer-imm +CODEGEN: ##compare-float-ordered %compare-float-ordered +CODEGEN: ##compare-float-unordered %compare-float-unordered +CODEGEN: ##save-context %save-context +CODEGEN: ##vm-field %vm-field +CODEGEN: ##set-vm-field %set-vm-field +CODEGEN: ##alien-global %alien-global +CODEGEN: ##call-gc %call-gc +CODEGEN: ##spill %spill +CODEGEN: ##reload %reload ! Conditional branches COMPILE< SYNTAX: \ CONDITIONAL: - scan-word [ \ generate-conditional-insn create-method-in ] keep scan-word ";" expect + scan-word [ \ generate-conditional-insn create-method-in ] keep scan-word codegen-method-body define ; COMPILE> -CONDITIONAL: ##compare-branch %compare-branch ; -CONDITIONAL: ##compare-imm-branch %compare-imm-branch ; -CONDITIONAL: ##compare-integer-branch %compare-branch ; -CONDITIONAL: ##compare-integer-imm-branch %compare-integer-imm-branch ; -CONDITIONAL: ##test-branch %test-branch ; -CONDITIONAL: ##test-imm-branch %test-imm-branch ; -CONDITIONAL: ##compare-float-ordered-branch %compare-float-ordered-branch ; -CONDITIONAL: ##compare-float-unordered-branch %compare-float-unordered-branch ; -CONDITIONAL: ##test-vector-branch %test-vector-branch ; -CONDITIONAL: ##check-nursery-branch %check-nursery-branch ; -CONDITIONAL: ##fixnum-add %fixnum-add ; -CONDITIONAL: ##fixnum-sub %fixnum-sub ; -CONDITIONAL: ##fixnum-mul %fixnum-mul ; +CONDITIONAL: ##compare-branch %compare-branch +CONDITIONAL: ##compare-imm-branch %compare-imm-branch +CONDITIONAL: ##compare-integer-branch %compare-branch +CONDITIONAL: ##compare-integer-imm-branch %compare-integer-imm-branch +CONDITIONAL: ##test-branch %test-branch +CONDITIONAL: ##test-imm-branch %test-imm-branch +CONDITIONAL: ##compare-float-ordered-branch %compare-float-ordered-branch +CONDITIONAL: ##compare-float-unordered-branch %compare-float-unordered-branch +CONDITIONAL: ##test-vector-branch %test-vector-branch +CONDITIONAL: ##check-nursery-branch %check-nursery-branch +CONDITIONAL: ##fixnum-add %fixnum-add +CONDITIONAL: ##fixnum-sub %fixnum-sub +CONDITIONAL: ##fixnum-mul %fixnum-mul ! FFI -CODEGEN: ##unbox %unbox ; -CODEGEN: ##unbox-long-long %unbox-long-long ; -CODEGEN: ##local-allot %local-allot ; -CODEGEN: ##box %box ; -CODEGEN: ##box-long-long %box-long-long ; -CODEGEN: ##alien-invoke %alien-invoke ; -CODEGEN: ##alien-indirect %alien-indirect ; -CODEGEN: ##alien-assembly %alien-assembly ; -CODEGEN: ##callback-inputs %callback-inputs ; -CODEGEN: ##callback-outputs %callback-outputs ; +CODEGEN: ##unbox %unbox +CODEGEN: ##unbox-long-long %unbox-long-long +CODEGEN: ##local-allot %local-allot +CODEGEN: ##box %box +CODEGEN: ##box-long-long %box-long-long +CODEGEN: ##alien-invoke %alien-invoke +CODEGEN: ##alien-indirect %alien-indirect +CODEGEN: ##alien-assembly %alien-assembly +CODEGEN: ##callback-inputs %callback-inputs +CODEGEN: ##callback-outputs %callback-outputs diff --git a/language/compiler/tests/peg-regression-2.factor b/language/compiler/tests/peg-regression-2.factor index 77ee9a4039..75cb5a73a4 100644 --- a/language/compiler/tests/peg-regression-2.factor +++ b/language/compiler/tests/peg-regression-2.factor @@ -10,6 +10,6 @@ Times = .* => [[ "foo" ]] Regexp = Times:t => [[ t ]] -]=] ; +]=] [ "foo" ] [ "a" parse-regexp ] unit-test diff --git a/language/compiler/tests/redefine24.factor b/language/compiler/tests/redefine24.factor index 0b373da02d..ed18b8df5a 100644 --- a/language/compiler/tests/redefine24.factor +++ b/language/compiler/tests/redefine24.factor @@ -2,14 +2,14 @@ USING: alien alien.syntax eval math tools.test ; QUALIFIED: alien.c-types IN: compiler.tests.redefine24 -TYPEDEF: alien.c-types:int type-1 ; +TYPEDEF: alien.c-types:int type-1 -TYPEDEF: alien.c-types:int type-3 ; +TYPEDEF: alien.c-types:int type-3 : callback ( -- ptr ) type-3 { type-1 type-1 } cdecl [ + >integer ] alien-callback ; -TYPEDEF: alien.c-types:float type-2 ; +TYPEDEF: alien.c-types:float type-2 : indirect ( x y ptr -- z ) type-3 { type-2 type-2 } cdecl alien-indirect ; diff --git a/language/definitions/icons/icons.factor b/language/definitions/icons/icons.factor index 9c22c4c976..0a62ccaff1 100644 --- a/language/definitions/icons/icons.factor +++ b/language/definitions/icons/icons.factor @@ -24,20 +24,20 @@ icons [ H{ } clone ] initialize define ] 2bi ; -SYNTAX: \ ICON: scan-word scan-token ";" expect define-icon ; +SYNTAX: \ ICON: scan-word scan-token define-icon ; COMPILE> -ICON: predicate-class class-predicate-word ; -ICON: generic generic-word ; -ICON: macro macro-word ; -ICON: parsing-word parsing-word ; -ICON: primitive primitive-word ; -ICON: symbol symbol-word ; -ICON: constant constant-word ; -ICON: word normal-word ; -ICON: word-link word-help-article ; -ICON: topic help-article ; -ICON: runnable-vocab runnable-vocab ; -ICON: vocab open-vocab ; -ICON: vocab-link unopen-vocab ; +ICON: predicate-class class-predicate-word +ICON: generic generic-word +ICON: macro macro-word +ICON: parsing-word parsing-word +ICON: primitive primitive-word +ICON: symbol symbol-word +ICON: constant constant-word +ICON: word normal-word +ICON: word-link word-help-article +ICON: topic help-article +ICON: runnable-vocab runnable-vocab +ICON: vocab open-vocab +ICON: vocab-link unopen-vocab diff --git a/language/funktors/funktors-tests.factor b/language/funktors/funktors-tests.factor index 7460c86b05..c1a712661c 100644 --- a/language/funktors/funktors-tests.factor +++ b/language/funktors/funktors-tests.factor @@ -16,4 +16,4 @@ COMPILE> { 1 0 } [ define-box ] must-infer-as -[ T{ float-box f 5.0 } ] [ 5.0 ] unit-test \ No newline at end of file +[ T{ float-box f 5.0 } ] [ 5.0 ] unit-test diff --git a/language/funktors/funktors.factor b/language/funktors/funktors.factor index 871eac94c6..071c0e997a 100644 --- a/language/funktors/funktors.factor +++ b/language/funktors/funktors.factor @@ -11,4 +11,4 @@ SYNTAX: \ FUNKTOR: drop [ name>> ] map reverse [ $[ _ namespaces:set ] ] map [ ] [ compose ] reduce scan-object interpolate-locals-quot compose $[ [ _ call ] with-string-writer eval-in-current( -- ) ] swap define-declared ; - ! $[ @ interpolate>string eval-in-current( -- ) ] swap define-declared ; \ No newline at end of file + ! $[ @ interpolate>string eval-in-current( -- ) ] swap define-declared ; diff --git a/language/io/encodings/euc/euc.factor b/language/io/encodings/euc/euc.factor index 0a6d1d9b7f..0c60affa4b 100644 --- a/language/io/encodings/euc/euc.factor +++ b/language/io/encodings/euc/euc.factor @@ -64,5 +64,5 @@ SYMBOL: euc-table PRIVATE> SYNTAX: \ EUC: - ! EUC: euc-kr "vocab:io/encodings/korean/cp949.txt" ; - scan-new-class scan-object ";" expect define-euc ; + ! EUC: euc-kr "vocab:io/encodings/korean/cp949.txt" + scan-new-class scan-object define-euc ; diff --git a/language/io/files/temp/macosx/macosx.factor b/language/io/files/temp/macosx/macosx.factor index 55f020ae8d..26cc1d6465 100644 --- a/language/io/files/temp/macosx/macosx.factor +++ b/language/io/files/temp/macosx/macosx.factor @@ -8,10 +8,10 @@ PRIVATE< FUNCTION: id NSTemporaryDirectory ( ) ; -TYPEDEF: NSUInteger NSSearchPathDirectory ; +TYPEDEF: NSUInteger NSSearchPathDirectory CONSTANT: NSCachesDirectory 13 -TYPEDEF: NSUInteger NSSearchPathDomainMask ; +TYPEDEF: NSUInteger NSSearchPathDomainMask CONSTANT: NSUserDomainMask 1 FUNCTION: id NSSearchPathForDirectoriesInDomains ( diff --git a/language/multi-methods/multi-methods.factor b/language/multi-methods/multi-methods.factor index 893d49347a..946b5aa93e 100644 --- a/language/multi-methods/multi-methods.factor +++ b/language/multi-methods/multi-methods.factor @@ -224,7 +224,7 @@ M: no-method error. ] if ; ! Syntax -SYNTAX: \ GENERIC: scan-new-word scan-effect ";" expect define-generic ; +SYNTAX: \ GENERIC: scan-new-word scan-effect define-generic ; : parse-method ( -- quot classes generic ) parse-definition [ 2 tail ] [ second ] [ first ] tri ; diff --git a/language/peg/ebnf/ebnf.factor b/language/peg/ebnf/ebnf.factor index 18e27b1404..426d1e38b6 100644 --- a/language/peg/ebnf/ebnf.factor +++ b/language/peg/ebnf/ebnf.factor @@ -558,7 +558,7 @@ SYNTAX: \ EBNF(( suffix! \ call suffix! reset-tokenizer ; SYNTAX: \ EBNF: - reset-tokenizer scan-new-word dup scan-object ";" expect + reset-tokenizer scan-new-word dup scan-object ebnf>quot swapd ( input -- ast ) define-declared "ebnf-parser" set-word-prop reset-tokenizer ; diff --git a/language/variables/variables.factor b/language/variables/variables.factor index 26e6aed2cc..82e84ee2d5 100644 --- a/language/variables/variables.factor +++ b/language/variables/variables.factor @@ -59,7 +59,7 @@ PREDICATE: typed-variable < variable } 2cleave (define-variable) ; SYNTAX: \ TYPED-VAR: - scan-new-word scan-object ";" expect define-typed-variable ; + scan-new-word scan-object define-typed-variable ; M: typed-variable definer drop \ TYPED-VAR: f ; M: typed-variable definition "variable-type" word-prop 1quotation ; @@ -92,6 +92,6 @@ INTERSECTION: typed-global-variable [ [ [global-setter] ] dip [typed-setter] ] 2bi (define-variable) ; SYNTAX: \ TYPED-GLOBAL: - scan-new-word scan-object ";" expect define-typed-global ; + scan-new-word scan-object define-typed-global ; M: typed-global-variable definer drop \ TYPED-GLOBAL: f ; diff --git a/language/vm/vm.factor b/language/vm/vm.factor index 218137766e..9bcda290fb 100644 --- a/language/vm/vm.factor +++ b/language/vm/vm.factor @@ -3,7 +3,7 @@ USING: classes.struct alien.c-types alien.syntax kernel.private ; IN: vm -TYPEDEF: uintptr_t cell_t ; +TYPEDEF: uintptr_t cell_t STRUCT: segment { start cell_t } diff --git a/libs/brainfuck/brainfuck.factor b/libs/brainfuck/brainfuck.factor index 45ee2878f2..5b723df70a 100644 --- a/libs/brainfuck/brainfuck.factor +++ b/libs/brainfuck/brainfuck.factor @@ -66,7 +66,7 @@ loop = "[" {loop|ops}+ "]" => [[ second compose-all $[ [ (?) ] _ while ] ]] code = (loop|ops|unknown)* => [[ compose-all ]] -]=] ; +]=] PRIVATE> diff --git a/libs/calendar/holidays/canada/canada.factor b/libs/calendar/holidays/canada/canada.factor index 09ed71c976..304388fe4b 100644 --- a/libs/calendar/holidays/canada/canada.factor +++ b/libs/calendar/holidays/canada/canada.factor @@ -6,6 +6,6 @@ IN: calendar.holidays.canada SINGLETONS: canada canadian-federal ; HOLIDAY: canadian-thanksgiving-day october 2 monday-of-month ; -HOLIDAY-NAME: canadian-thanksgiving-day canadian-federal "Thanksgiving Day" ; +HOLIDAY-NAME: canadian-thanksgiving-day canadian-federal "Thanksgiving Day" -HOLIDAY-NAME: armistice-day commonwealth-of-nations "Remembrance Day" ; +HOLIDAY-NAME: armistice-day commonwealth-of-nations "Remembrance Day" diff --git a/libs/calendar/holidays/holidays.factor b/libs/calendar/holidays/holidays.factor index 18749e0372..348ea32f38 100644 --- a/libs/calendar/holidays/holidays.factor +++ b/libs/calendar/holidays/holidays.factor @@ -16,7 +16,6 @@ SYNTAX: \ HOLIDAY: SYNTAX: \ HOLIDAY-NAME: let[ scan-word "holiday" word-prop set: holidays scan-word set: name scan-object set: value - ";" expect value name holidays set-at ] ; COMPILE> @@ -54,4 +53,4 @@ M: all holidays ] keep $[ _ swap "holiday" word-prop at ] map ; HOLIDAY: armistice-day november 11 >>day ; -HOLIDAY-NAME: armistice-day world "Armistice Day" ; +HOLIDAY-NAME: armistice-day world "Armistice Day" diff --git a/libs/calendar/holidays/us/us.factor b/libs/calendar/holidays/us/us.factor index 6133209263..0ecd83e199 100644 --- a/libs/calendar/holidays/us/us.factor +++ b/libs/calendar/holidays/us/us.factor @@ -27,38 +27,38 @@ M: us-federal holidays { [ sunday? not ] [ us-federal holiday? not ] } 1&& ; HOLIDAY: new-years-day january 1 >>day ; -HOLIDAY-NAME: new-years-day world "New Year's Day" ; -HOLIDAY-NAME: new-years-day us-federal "New Year's Day" ; +HOLIDAY-NAME: new-years-day world "New Year's Day" +HOLIDAY-NAME: new-years-day us-federal "New Year's Day" HOLIDAY: martin-luther-king-day january 3 monday-of-month ; -HOLIDAY-NAME: martin-luther-king-day us-federal "Martin Luther King Day" ; +HOLIDAY-NAME: martin-luther-king-day us-federal "Martin Luther King Day" HOLIDAY: inauguration-day january 20 >>day [ dup 4 neg rem + ] change-year ; -HOLIDAY-NAME: inauguration-day us "Inauguration Day" ; +HOLIDAY-NAME: inauguration-day us "Inauguration Day" HOLIDAY: washingtons-birthday february 3 monday-of-month ; -HOLIDAY-NAME: washingtons-birthday us-federal "Washington's Birthday" ; +HOLIDAY-NAME: washingtons-birthday us-federal "Washington's Birthday" HOLIDAY: memorial-day may last-monday-of-month ; -HOLIDAY-NAME: memorial-day us-federal "Memorial Day" ; +HOLIDAY-NAME: memorial-day us-federal "Memorial Day" HOLIDAY: independence-day july 4 >>day ; -HOLIDAY-NAME: independence-day us-federal "Independence Day" ; +HOLIDAY-NAME: independence-day us-federal "Independence Day" HOLIDAY: labor-day september 1 monday-of-month ; -HOLIDAY-NAME: labor-day us-federal "Labor Day" ; +HOLIDAY-NAME: labor-day us-federal "Labor Day" HOLIDAY: columbus-day october 2 monday-of-month ; -HOLIDAY-NAME: columbus-day us-federal "Columbus Day" ; +HOLIDAY-NAME: columbus-day us-federal "Columbus Day" -HOLIDAY-NAME: armistice-day us-federal "Veterans Day" ; +HOLIDAY-NAME: armistice-day us-federal "Veterans Day" HOLIDAY: thanksgiving-day november 4 thursday-of-month ; -HOLIDAY-NAME: thanksgiving-day us-federal "Thanksgiving Day" ; +HOLIDAY-NAME: thanksgiving-day us-federal "Thanksgiving Day" HOLIDAY: christmas-day december 25 >>day ; -HOLIDAY-NAME: christmas-day world "Christmas Day" ; -HOLIDAY-NAME: christmas-day us-federal "Christmas Day" ; +HOLIDAY-NAME: christmas-day world "Christmas Day" +HOLIDAY-NAME: christmas-day us-federal "Christmas Day" HOLIDAY: belly-laugh-day january 24 >>day ; diff --git a/libs/chipmunk/ffi/ffi.factor b/libs/chipmunk/ffi/ffi.factor index 591eb373b5..36ce5beacd 100644 --- a/libs/chipmunk/ffi/ffi.factor +++ b/libs/chipmunk/ffi/ffi.factor @@ -19,17 +19,17 @@ COMPILE> LIBRARY: chipmunk ! chipmunk_types.h -TYPEDEF: double cpFloat ; +TYPEDEF: double cpFloat STRUCT: cpVect { x cpFloat } { y cpFloat } ; SPECIALIZED-ARRAY: cpVect -TYPEDEF: uint cpHashValue ; -TYPEDEF: void* cpDataPointer ; -TYPEDEF: uint cpCollisionType ; -TYPEDEF: uint cpLayers ; -TYPEDEF: uint cpGroup ; +TYPEDEF: uint cpHashValue +TYPEDEF: void* cpDataPointer +TYPEDEF: uint cpCollisionType +TYPEDEF: uint cpLayers +TYPEDEF: uint cpGroup CONSTANT: CP_NO_GROUP 0 CONSTANT: CP_ALL_LAYERS 0xffffffff diff --git a/libs/compression/zlib/ffi/ffi.factor b/libs/compression/zlib/ffi/ffi.factor index 1fef2f7d04..3f5105c71b 100644 --- a/libs/compression/zlib/ffi/ffi.factor +++ b/libs/compression/zlib/ffi/ffi.factor @@ -12,10 +12,10 @@ COMPILE< "zlib" { LIBRARY: zlib -TYPEDEF: void Bytef ; -TYPEDEF: ulong uLongf ; -TYPEDEF: ulong uLong ; -TYPEDEF: uint uInt ; +TYPEDEF: void Bytef +TYPEDEF: ulong uLongf +TYPEDEF: ulong uLong +TYPEDEF: uint uInt STRUCT: z_stream { next_in uchar* } @@ -37,7 +37,7 @@ STRUCT: z_stream { adler ulong } { reserved ulong } ; -TYPEDEF: z_stream* z_streamp ; +TYPEDEF: z_stream* z_streamp STRUCT: gz_header { text int } @@ -54,7 +54,7 @@ STRUCT: gz_header { hcrc int } { done int } ; -TYPEDEF: gz_header* gz_headerp ; +TYPEDEF: gz_header* gz_headerp CONSTANT: Z_NO_FLUSH 0 CONSTANT: Z_PARTIAL_FLUSH 1 CONSTANT: Z_SYNC_FLUSH 2 @@ -126,7 +126,7 @@ FUNCTION: uLong compressBound ( uLong sourceLen ) ; FUNCTION: int uncompress ( Bytef* dest, uLongf* destLen, Bytef* source, uLong sourceLen ) ; -TYPEDEF: void* gzFile ; +TYPEDEF: void* gzFile FUNCTION: gzFile gzdopen ( int fd, c-string mode ) ; FUNCTION: int gzbuffer ( gzFile file, uint size ) ; diff --git a/libs/elf/elf.factor b/libs/elf/elf.factor index 468afa09f7..491ce85938 100644 --- a/libs/elf/elf.factor +++ b/libs/elf/elf.factor @@ -331,17 +331,17 @@ CONSTANT: DT_ARM_PREEMPTYMAP 0x70000002 CONSTANT: DT_ARM_RESERVED2 0x70000003 CONSTANT: DT_HIPROC 0x7fffffff -TYPEDEF: ushort Elf32_Half ; -TYPEDEF: uint Elf32_Word ; -TYPEDEF: int Elf32_Sword ; -TYPEDEF: uint Elf32_Off ; -TYPEDEF: uint Elf32_Addr ; -TYPEDEF: ushort Elf64_Half ; -TYPEDEF: uint Elf64_Word ; -TYPEDEF: ulonglong Elf64_Xword ; -TYPEDEF: longlong Elf64_Sxword ; -TYPEDEF: ulonglong Elf64_Off ; -TYPEDEF: ulonglong Elf64_Addr ; +TYPEDEF: ushort Elf32_Half +TYPEDEF: uint Elf32_Word +TYPEDEF: int Elf32_Sword +TYPEDEF: uint Elf32_Off +TYPEDEF: uint Elf32_Addr +TYPEDEF: ushort Elf64_Half +TYPEDEF: uint Elf64_Word +TYPEDEF: ulonglong Elf64_Xword +TYPEDEF: longlong Elf64_Sxword +TYPEDEF: ulonglong Elf64_Off +TYPEDEF: ulonglong Elf64_Addr STRUCT: Elf32_Ehdr { e_ident uchar[16] } diff --git a/libs/formatting/formatting.factor b/libs/formatting/formatting.factor index 1924a7fe92..d09eccc4f6 100644 --- a/libs/formatting/formatting.factor +++ b/libs/formatting/formatting.factor @@ -90,7 +90,7 @@ plain-text = (!("%").)+ => [[ >string ]] text = (formats|plain-text)* => [[ ]] -]=] ; +]=] : printf-quot ( format-string -- format-quot n ) parse-printf [ [ callable? ] count ] keep [ diff --git a/libs/globs/globs.factor b/libs/globs/globs.factor index b499764d0a..17bba76aa3 100644 --- a/libs/globs/globs.factor +++ b/libs/globs/globs.factor @@ -45,7 +45,7 @@ End = !(.) Main = Concatenation End -]=] ; +]=] : glob-matches? ( input glob -- ? ) [ >case-fold ] bi@ matches? ; diff --git a/libs/gml/parser/parser.factor b/libs/gml/parser/parser.factor index 69bb43ded1..df927d35cf 100644 --- a/libs/gml/parser/parser.factor +++ b/libs/gml/parser/parser.factor @@ -124,4 +124,4 @@ Tokens = Token* => [[ [ comment? ] reject ]] Program = Tokens Spaces !(.) => [[ parse-proc ]] -]=] ; +]=] diff --git a/libs/html/templates/chloe/syntax/syntax.factor b/libs/html/templates/chloe/syntax/syntax.factor index 4806199305..ecd9b84961 100644 --- a/libs/html/templates/chloe/syntax/syntax.factor +++ b/libs/html/templates/chloe/syntax/syntax.factor @@ -21,7 +21,7 @@ CONSTANT: chloe-ns "http://factorcode.org/chloe/1.0" : chloe-name? ( name -- ? ) url>> chloe-ns = ; -XML-NS: chloe-name http://factorcode.org/chloe/1.0 ; +XML-NS: chloe-name http://factorcode.org/chloe/1.0 : required-attr ( tag name -- value ) [ nip ] [ chloe-name attr ] 2bi diff --git a/libs/http/server/server.factor b/libs/http/server/server.factor index e7299e8674..2ae012d1a6 100644 --- a/libs/http/server/server.factor +++ b/libs/http/server/server.factor @@ -144,9 +144,9 @@ main-responder [ <404> ] initialize ] bi ] recover ; -LOG: httpd-hit NOTICE ; +LOG: httpd-hit NOTICE -LOG: httpd-header NOTICE ; +LOG: httpd-header NOTICE : log-header ( request name -- ) [ nip ] [ header ] 2bi 2array httpd-header ; @@ -209,7 +209,7 @@ SYMBOL: params : ?refresh-all ( -- ) development? get-global [ [ refresh-all ] with-global ] when ; -LOG: httpd-benchmark DEBUG ; +LOG: httpd-benchmark DEBUG : ?benchmark ( quot -- ) benchmark? get [ @@ -223,7 +223,7 @@ SYMBOL: request-limit request-limit [ 64 1024 * ] initialize -LOG: httpd-bad-request NOTICE ; +LOG: httpd-bad-request NOTICE : handle-client-error ( error -- ) dup request-error? [ diff --git a/libs/infix/parser/parser.factor b/libs/infix/parser/parser.factor index 42efbafd56..a63ab55470 100644 --- a/libs/infix/parser/parser.factor +++ b/libs/infix/parser/parser.factor @@ -29,7 +29,7 @@ Sum = Sum:s ("+"|"-"):op Product:p => [[ s p op ast-op boa ]] End = !(.) Expression = Sum End -]=] ; +]=] : build-infix-ast ( string -- ast ) tokenize-infix parse-infix ; diff --git a/libs/infix/tokenizer/tokenizer.factor b/libs/infix/tokenizer/tokenizer.factor index 22681c4daa..3f4409d3b6 100644 --- a/libs/infix/tokenizer/tokenizer.factor +++ b/libs/infix/tokenizer/tokenizer.factor @@ -21,4 +21,4 @@ Special = [+*/%(),] | "-" => [[ char: - ]] Tok = Spaces (Name | Number | Special ) End = !(.) Toks = Tok* Spaces End -]=] ; +]=] diff --git a/libs/logging/logging.factor b/libs/logging/logging.factor index 54b4b6f406..04b7f04bbe 100644 --- a/libs/logging/logging.factor +++ b/libs/logging/logging.factor @@ -139,7 +139,7 @@ PRIVATE> SYNTAX: \ LOG: ! Syntax: name level - scan-new-word dup scan-word ";" expect + scan-new-word dup scan-word $[ 1array stack>message _ _ log-message ] ( message -- ) define-declared ; diff --git a/libs/magic/ffi/ffi.factor b/libs/magic/ffi/ffi.factor index 95ef69ba68..280c5a6e2e 100644 --- a/libs/magic/ffi/ffi.factor +++ b/libs/magic/ffi/ffi.factor @@ -36,7 +36,7 @@ CONSTANT: MAGIC_NO_CHECK_TROFF 0x040000 CONSTANT: MAGIC_NO_CHECK_FORTRAN 0x080000 CONSTANT: MAGIC_NO_CHECK_TOKENS 0x100000 -TYPEDEF: void* magic_t ; +TYPEDEF: void* magic_t FUNCTION: magic_t magic_open ( int flags ) ; FUNCTION: void magic_close ( magic_t magic ) ; diff --git a/libs/peg/expr/expr.factor b/libs/peg/expr/expr.factor index f0ebe98a84..92eda49506 100644 --- a/libs/peg/expr/expr.factor +++ b/libs/peg/expr/expr.factor @@ -16,4 +16,4 @@ fac = fac "*" value => [[ first3 nip * ]] exp = exp "+" fac => [[ first3 nip + ]] | exp "-" fac => [[ first3 nip - ]] | fac -]=] ; +]=] diff --git a/libs/peg/javascript/parser/parser.factor b/libs/peg/javascript/parser/parser.factor index 4ec97827a3..299fb4eeb3 100644 --- a/libs/peg/javascript/parser/parser.factor +++ b/libs/peg/javascript/parser/parser.factor @@ -197,4 +197,4 @@ SrcElem = "function" Name:n FuncRest:f => [[ n f a | Stmt SrcElems = SrcElem* => [[ ast-begin boa ]] TopLevel = SrcElems Spaces -]=] ; +]=] diff --git a/libs/peg/javascript/tokenizer/tokenizer.factor b/libs/peg/javascript/tokenizer/tokenizer.factor index b755fdc92f..3bfd98d33e 100644 --- a/libs/peg/javascript/tokenizer/tokenizer.factor +++ b/libs/peg/javascript/tokenizer/tokenizer.factor @@ -87,4 +87,4 @@ Special = "(" | ")" | "{" | "}" | "[" | "]" | "," | | "^" Tok = Spaces (Name | Keyword | Number | Str | RegExp | Special ) Toks = Tok* Spaces -]=] ; +]=] diff --git a/libs/peg/pl0/pl0.factor b/libs/peg/pl0/pl0.factor index 681a2f7d8f..fd7e2a91ef 100644 --- a/libs/peg/pl0/pl0.factor +++ b/libs/peg/pl0/pl0.factor @@ -24,4 +24,4 @@ factor = ident | number | "(" expression ")" ident = (([a-zA-Z])+) => [[ >string ]] number = ([0-9])+ => [[ string>number ]] program = { block "." } -]=] ; +]=] diff --git a/libs/regexp/parser/parser.factor b/libs/regexp/parser/parser.factor index 22b325c4ff..30ef4d0ad4 100644 --- a/libs/regexp/parser/parser.factor +++ b/libs/regexp/parser/parser.factor @@ -217,4 +217,4 @@ Alternation = Concatenation:c ("|" Concatenation)*:a End = !(.) Main = Alternation End -]=] ; +]=] diff --git a/libs/roman/roman.factor b/libs/roman/roman.factor index 18db59e11e..528e17b210 100644 --- a/libs/roman/roman.factor +++ b/libs/roman/roman.factor @@ -59,14 +59,14 @@ COMPILE< SYNTAX: \ ROMAN-OP: scan-word [ name>> "roman" prepend create-word-in ] keep 1quotation $[ _ binary-roman-op ] - scan-effect ";" expect define-declared ; + scan-effect define-declared ; COMPILE> -ROMAN-OP: + ( x y -- z ) ; -ROMAN-OP: - ( x y -- z ) ; -ROMAN-OP: * ( x y -- z ) ; -ROMAN-OP: /i ( x y -- z ) ; -ROMAN-OP: /mod ( x y -- z w ) ; +ROMAN-OP: + ( x y -- z ) +ROMAN-OP: - ( x y -- z ) +ROMAN-OP: * ( x y -- z ) +ROMAN-OP: /i ( x y -- z ) +ROMAN-OP: /mod ( x y -- z w ) SYNTAX: \ roman: scan-token roman> suffix! ; diff --git a/libs/shell/parser/parser.factor b/libs/shell/parser/parser.factor index 5eed5b1e93..3fc71b204f 100644 --- a/libs/shell/parser/parser.factor +++ b/libs/shell/parser/parser.factor @@ -89,4 +89,4 @@ pipeline = _ command _ (in-file)? _ "|" _ (command _ "|" _)* command _ (to-file submission = (pipeline | basic) -]=] ; +]=] diff --git a/libs/simple-tokenizer/simple-tokenizer.factor b/libs/simple-tokenizer/simple-tokenizer.factor index ada53f6412..e672a63804 100644 --- a/libs/simple-tokenizer/simple-tokenizer.factor +++ b/libs/simple-tokenizer/simple-tokenizer.factor @@ -10,4 +10,4 @@ quoted = '"' (escaped-char | [^"])*:a '"' => [[ a ]] unquoted = (escaped-char | [^ \t\n\r"])+ argument = (quoted | unquoted) => [[ >string ]] command = space* (argument:a space* => [[ a ]])+:c !(.) => [[ c ]] -]=] ; +]=] diff --git a/libs/smtp/smtp.factor b/libs/smtp/smtp.factor index 9e181fc073..7227186adb 100644 --- a/libs/smtp/smtp.factor +++ b/libs/smtp/smtp.factor @@ -26,7 +26,7 @@ C: plain-auth 1 minutes >>read-timeout no-auth >>auth ; inline -LOG: log-smtp-connection NOTICE ; +LOG: log-smtp-connection NOTICE : with-smtp-connection ( quot -- ) smtp-config get server>> @@ -91,7 +91,7 @@ ERROR: bad-email-address email ; : quit ( -- ) "QUIT" command ; -LOG: smtp-response DEBUG ; +LOG: smtp-response DEBUG : multiline? ( response -- ? ) 3 swap ?nth char: - = ; diff --git a/libs/svg/svg.factor b/libs/svg/svg.factor index 5dfb481980..a08d8603c3 100644 --- a/libs/svg/svg.factor +++ b/libs/svg/svg.factor @@ -4,10 +4,10 @@ math.functions math.parser math.vectors memoize peg.ebnf sequences sequences.squ splitting strings xml.data xml.syntax ; IN: svg -XML-NS: svg-name http://www.w3.org/2000/svg ; -XML-NS: xlink-name http://www.w3.org/1999/xlink ; -XML-NS: sodipodi-name http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd ; -XML-NS: inkscape-name http://www.inkscape.org/namespaces/inkscape ; +XML-NS: svg-name http://www.w3.org/2000/svg +XML-NS: xlink-name http://www.w3.org/1999/xlink +XML-NS: sodipodi-name http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd +XML-NS: inkscape-name http://www.inkscape.org/namespaces/inkscape : svg-string>number ( string -- number ) H{ { char: E char: e } } substitute "e" split1 @@ -76,7 +76,7 @@ wsp = [ \t\r\n] transform-list = wsp* transforms?:t wsp* => [[ t [ identity-transform ] unless* ]] -]=] ; +]=] : tag-transform ( tag -- transform ) "transform" svg-name attr svg-transform>affine-transform ; @@ -218,7 +218,7 @@ wsp = [ \t\r\n] svg-path = wsp* moveto-drawto-command-groups?:x wsp* => [[ x ]] -]=] ; +]=] : tag-d ( tag -- d ) "d" svg-name attr svg-path>array ; diff --git a/libs/tokyo/alien/tcadb/tcadb.factor b/libs/tokyo/alien/tcadb/tcadb.factor index e81dc7df37..84163ce080 100644 --- a/libs/tokyo/alien/tcadb/tcadb.factor +++ b/libs/tokyo/alien/tcadb/tcadb.factor @@ -7,7 +7,7 @@ IN: tokyo.alien.tcadb LIBRARY: tokyocabinet -TYPEDEF: void* TCADB ; +TYPEDEF: void* TCADB CONSTANT: ADBOVOID 0 CONSTANT: ADBOMDB 1 @@ -55,9 +55,9 @@ FUNCTION: TCLIST* tcadbmisc ( TCADB* adb, c-string name, TCLIST* args ) ; ! ----- -TYPEDEF: void* ADBSKEL ; +TYPEDEF: void* ADBSKEL -TYPEDEF: void* ADBMAPPROC ; +TYPEDEF: void* ADBMAPPROC FUNCTION: bool tcadbsetskel ( TCADB* adb, ADBSKEL* skel ) ; FUNCTION: int tcadbomode ( TCADB* adb ) ; diff --git a/libs/tokyo/alien/tcbdb/tcbdb.factor b/libs/tokyo/alien/tcbdb/tcbdb.factor index e103fd321e..2233ceeb93 100644 --- a/libs/tokyo/alien/tcbdb/tcbdb.factor +++ b/libs/tokyo/alien/tcbdb/tcbdb.factor @@ -6,7 +6,7 @@ IN: tokyo.alien.tcbdb LIBRARY: tokyocabinet -TYPEDEF: void* TCBDB ; +TYPEDEF: void* TCBDB CONSTANT: BDBFOPEN HDBFOPEN CONSTANT: BDBFFATAL HDBFFATAL @@ -25,7 +25,7 @@ CONSTANT: BDBONOLCK 16 CONSTANT: BDBOLCKNB 32 CONSTANT: BDBOTSYNC 64 -TYPEDEF: void* BDBCUR ; +TYPEDEF: void* BDBCUR CONSTANT: BDBCPCURRENT 0 CONSTANT: BDBCPBEFORE 1 diff --git a/libs/tokyo/alien/tcfdb/tcfdb.factor b/libs/tokyo/alien/tcfdb/tcfdb.factor index e007257976..cde71f27a5 100644 --- a/libs/tokyo/alien/tcfdb/tcfdb.factor +++ b/libs/tokyo/alien/tcfdb/tcfdb.factor @@ -4,7 +4,7 @@ USING: alien alien.c-types alien.libraries alien.syntax combinators kernel tokyo.alien.tcutil ; IN: tokyo.alien.tcfdb -TYPEDEF: void* TCFDB ; +TYPEDEF: void* TCFDB CONSTANT: FDBFOPEN 1 CONSTANT: FDBFFATAL 2 diff --git a/libs/tokyo/alien/tctdb/tctdb.factor b/libs/tokyo/alien/tctdb/tctdb.factor index 3de0874abd..072f428d58 100644 --- a/libs/tokyo/alien/tctdb/tctdb.factor +++ b/libs/tokyo/alien/tctdb/tctdb.factor @@ -66,7 +66,7 @@ CONSTANT: TDBQPOUT 2 CONSTANT: TDBQPSTOP 16777216 ! int (*)(const void *pkbuf, int pksiz, TCMAP *cols, void *op); -TYPEDEF: void* TDBQRYPROC ; +TYPEDEF: void* TDBQRYPROC FUNCTION: c-string tctdberrmsg ( int ecode ) ; FUNCTION: TCTDB* tctdbnew ( ) ; diff --git a/libs/tokyo/alien/tcutil/tcutil.factor b/libs/tokyo/alien/tcutil/tcutil.factor index d325df3801..d2423783a2 100644 --- a/libs/tokyo/alien/tcutil/tcutil.factor +++ b/libs/tokyo/alien/tcutil/tcutil.factor @@ -18,7 +18,7 @@ CONSTANT: TCDBTFIXED 2 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 ; +TYPEDEF: long tokyo_time_t C-TYPE: TCLIST @@ -32,7 +32,7 @@ FUNCTION: void tclistpush ( TCLIST* list, void* ptr, int size ) ; FUNCTION: void tclistpush2 ( TCLIST* list, c-string str ) ; FUNCTION: void tcfree ( void* ptr ) ; -TYPEDEF: void* TCCMP ; -TYPEDEF: void* TCCODEC ; -TYPEDEF: void* TCPDPROC ; -TYPEDEF: void* TCITER ; +TYPEDEF: void* TCCMP +TYPEDEF: void* TCCODEC +TYPEDEF: void* TCPDPROC +TYPEDEF: void* TCITER diff --git a/libs/urls/urls.factor b/libs/urls/urls.factor index 79a0d81007..1dad9533cd 100644 --- a/libs/urls/urls.factor +++ b/libs/urls/urls.factor @@ -57,7 +57,7 @@ url = (((protocol "://") => [[ first ]] auth hostname) ("?" query => [[ second ]])? ("#" anchor => [[ second ]])? -]=] ; +]=] PRIVATE> diff --git a/libs/xml-rpc/xml-rpc.factor b/libs/xml-rpc/xml-rpc.factor index 4e94ca22fd..2b3e7fe80a 100644 --- a/libs/xml-rpc/xml-rpc.factor +++ b/libs/xml-rpc/xml-rpc.factor @@ -109,7 +109,7 @@ M: server-error error. "Description: " write dup message>> print "Tag: " write tag>> xml>string print ; -TAGS: xml>item ( tag -- object ) ; +TAGS: xml>item ( tag -- object ) TAG: string xml>item children>string ; diff --git a/libs/xml/syntax/syntax-tests.factor b/libs/xml/syntax/syntax-tests.factor index 526ffc1600..96f06c4eeb 100644 --- a/libs/xml/syntax/syntax-tests.factor +++ b/libs/xml/syntax/syntax-tests.factor @@ -8,7 +8,7 @@ IN: xml.syntax.tests ! TAGS test -TAGS: calculate ( tag -- n ) ; +TAGS: calculate ( tag -- n ) : calc-2children ( tag -- n n ) children-tags first2 [ calculate ] dip calculate ; @@ -34,7 +34,7 @@ TAG: neg calculate calc-arith ] unit-test -XML-NS: foo http://blah.com ; +XML-NS: foo http://blah.com { T{ name { main "bling" } { url "http://blah.com" } } } [ "bling" foo ] unit-test diff --git a/libs/xml/syntax/syntax.factor b/libs/xml/syntax/syntax.factor index b050c9b405..3147fae884 100644 --- a/libs/xml/syntax/syntax.factor +++ b/libs/xml/syntax/syntax.factor @@ -28,7 +28,7 @@ M: no-tag summary PRIVATE> SYNTAX: \ TAGS: - scan-new-word scan-effect ";" expect + scan-new-word scan-effect [ drop H{ } clone "xtable" set-word-prop ] [ define-tags ] 2bi ; @@ -37,7 +37,7 @@ SYNTAX: \ TAG: scan-token scan-word parse-definition define-tag ; SYNTAX: \ XML-NS: - scan-new-word scan-token ";" expect $[ f swap _ ] ( string -- name ) define-memoized ; + scan-new-word scan-token $[ f swap _ ] ( string -- name ) define-memoized ; PRIVATE< diff --git a/libs/xmode/catalog/catalog.factor b/libs/xmode/catalog/catalog.factor index 5c2fe733ab..89bc0a6e93 100644 --- a/libs/xmode/catalog/catalog.factor +++ b/libs/xmode/catalog/catalog.factor @@ -6,7 +6,7 @@ IN: xmode.catalog TUPLE: mode file file-name-glob first-line-glob ; -TAGS: parse-mode-tag ( modes tag -- ) ; +TAGS: parse-mode-tag ( modes tag -- ) TAG: MODE parse-mode-tag dup "NAME" attr [ diff --git a/libs/xmode/loader/loader.factor b/libs/xmode/loader/loader.factor index 611ea8b4e6..0d9cd03a01 100644 --- a/libs/xmode/loader/loader.factor +++ b/libs/xmode/loader/loader.factor @@ -6,7 +6,7 @@ IN: xmode.loader ! Based on org.gjt.sp.jedit.XModeHandler ! RULES and its children -TAGS: parse-rule-tag ( rule-set tag -- ) ; +TAGS: parse-rule-tag ( rule-set tag -- ) TAG: PROPS parse-rule-tag parse-props-tag >>props drop ; diff --git a/libs/xmode/loader/syntax/syntax.factor b/libs/xmode/loader/syntax/syntax.factor index 8cb00f29c7..6760551fcb 100644 --- a/libs/xmode/loader/syntax/syntax.factor +++ b/libs/xmode/loader/syntax/syntax.factor @@ -81,7 +81,7 @@ SYNTAX: \ RULE: [ parse-literal-matcher >>end drop ] , ; ! SPAN's children -TAGS: parse-begin/end-tag ( rule tag -- ) ; +TAGS: parse-begin/end-tag ( rule tag -- ) TAG: BEGIN parse-begin/end-tag ! XXX diff --git a/libs/yaml/ffi/ffi.factor b/libs/yaml/ffi/ffi.factor index bcb9b63fc1..f1f9d3e1ae 100644 --- a/libs/yaml/ffi/ffi.factor +++ b/libs/yaml/ffi/ffi.factor @@ -50,7 +50,7 @@ FUNCTION: void yaml_get_version ( int *major, int *minor, int *patch ) ; ! It copies it's input and we can use null-terminated string ! if we give a negative length. So we can use factor's c-string ! for input and output. -TYPEDEF: uchar yaml_char_t ; +TYPEDEF: uchar yaml_char_t ! /** The version directive data. */ STRUCT: yaml_version_directive_t @@ -565,7 +565,7 @@ ENUM: yaml_node_type_t ! typedef struct yaml_node_s yaml_node_t; ! /** An element of a sequence node. */ -TYPEDEF: int yaml_node_item_t ; +TYPEDEF: int yaml_node_item_t ! /** An element of a mapping node. */ STRUCT: yaml_node_pair_t diff --git a/tools/file-picker/windows/windows.factor b/tools/file-picker/windows/windows.factor index a3db97e3c2..d97e22eece 100644 --- a/tools/file-picker/windows/windows.factor +++ b/tools/file-picker/windows/windows.factor @@ -6,9 +6,9 @@ windows.user32 ; IN: file-picker.windows LIBRARY: shell32 -TYPEDEF: void* PIDLIST_ABSOLUTE ; -TYPEDEF: void* PCIDLIST_ABSOLUTE ; -TYPEDEF: void* BFFCALLBACK ; +TYPEDEF: void* PIDLIST_ABSOLUTE +TYPEDEF: void* PCIDLIST_ABSOLUTE +TYPEDEF: void* BFFCALLBACK FUNCTION: HRESULT SHGetFolderLocation ( HWND hwndOwner, diff --git a/tools/tools/disassembler/udis/udis.factor b/tools/tools/disassembler/udis/udis.factor index cd9c71a602..82f567e153 100644 --- a/tools/tools/disassembler/udis/udis.factor +++ b/tools/tools/disassembler/udis/udis.factor @@ -15,7 +15,7 @@ COMPILE< "libudis86" { LIBRARY: libudis86 -TYPEDEF: void ud ; +TYPEDEF: void ud FUNCTION: void ud_translate_intel ( ud* u ) ; FUNCTION: void ud_translate_att ( ud* u ) ; diff --git a/tools/tools/image-analyzer/gc-info/gc-info-tests.factor b/tools/tools/image-analyzer/gc-info/gc-info-tests.factor index ab4be77902..1a241f5c27 100644 --- a/tools/tools/image-analyzer/gc-info/gc-info-tests.factor +++ b/tools/tools/image-analyzer/gc-info/gc-info-tests.factor @@ -89,8 +89,8 @@ QUALIFIED: opencl ! Originally from llvm.types, but llvm moved to unmaintained -TYPEDEF: void* LLVMTypeRef ; -TYPEDEF: void* LLVMTypeHandleRef ; +TYPEDEF: void* LLVMTypeRef +TYPEDEF: void* LLVMTypeHandleRef FUNCTION: LLVMTypeRef LLVMResolveTypeHandle ( LLVMTypeHandleRef TypeHandle ) ; FUNCTION: LLVMTypeHandleRef LLVMCreateTypeHandle ( LLVMTypeRef PotentiallyAbstractTy ) ; FUNCTION: void LLVMRefineType ( LLVMTypeRef AbstractTy, LLVMTypeRef ConcreteTy ) ; diff --git a/tools/tools/ps/macosx/macosx.factor b/tools/tools/ps/macosx/macosx.factor index 1739669b55..e76f6b8c30 100644 --- a/tools/tools/ps/macosx/macosx.factor +++ b/tools/tools/ps/macosx/macosx.factor @@ -48,10 +48,10 @@ STRUCT: vmspace { dummy3 int32_t[5] } { dummy4 caddr_t[3] } ; -TYPEDEF: int32_t segsz_t ; -TYPEDEF: uint32_t fixpt_t ; -TYPEDEF: uint64_t u_quad_t ; -TYPEDEF: uint32_t sigset_t ; +TYPEDEF: int32_t segsz_t +TYPEDEF: uint32_t fixpt_t +TYPEDEF: uint64_t u_quad_t +TYPEDEF: uint32_t sigset_t STRUCT: itimerval { it_interval timeval } diff --git a/tools/vocabs/git/git.factor b/tools/vocabs/git/git.factor index 39d0b5da6a..5e53b50df7 100644 --- a/tools/vocabs/git/git.factor +++ b/tools/vocabs/git/git.factor @@ -25,4 +25,4 @@ ERROR: git-revision-not-found path ; [ [ input-stream get swap parse-stream call( -- ) ] with-git-object-stream ] [ git-revision-not-found ] if* ; -SYNTAX: \ USE-REV: scan-token scan-token ";" expect use-vocab-rev ; +SYNTAX: \ USE-REV: scan-token scan-token use-vocab-rev ;