From 943596575ad294c074dfa381b70af74dba5992b1 Mon Sep 17 00:00:00 2001 From: Joe Groff Date: Wed, 23 Nov 2011 18:49:33 -0800 Subject: [PATCH] use radix literals --- basis/alien/endian/endian-tests.factor | 92 +- basis/alien/endian/endian.factor | 2 +- basis/ascii/ascii.factor | 6 +- basis/base64/base64.factor | 2 +- basis/bit-arrays/bit-arrays-tests.factor | 8 +- basis/bitstreams/bitstreams-tests.factor | 24 +- basis/bootstrap/image/image.factor | 2 +- basis/cairo/ffi/ffi.factor | 8 +- basis/checksums/common/common.factor | 4 +- basis/checksums/fnv1/fnv1-tests.factor | 32 +- basis/checksums/fnv1/fnv1.factor | 26 +- basis/checksums/hmac/hmac-tests.factor | 10 +- basis/checksums/hmac/hmac.factor | 4 +- .../checksums/internet/internet-tests.factor | 8 +- basis/checksums/internet/internet.factor | 2 +- basis/checksums/md5/md5.factor | 2 +- basis/checksums/sha/sha.factor | 130 +- basis/classes/struct/struct-tests.factor | 4 +- basis/cocoa/application/application.factor | 2 +- basis/cocoa/runtime/runtime.factor | 18 +- basis/cocoa/windows/windows.factor | 4 +- .../compiler/cfg/intrinsics/simd/simd.factor | 20 +- .../value-numbering-tests.factor | 6 +- basis/compiler/constants/constants.factor | 2 +- basis/compiler/tests/codegen.factor | 2 +- basis/compiler/tests/intrinsics.factor | 32 +- .../tree/cleanup/cleanup-tests.factor | 4 +- .../compression/run-length/run-length.factor | 6 +- .../core-foundation/fsevents/fsevents.factor | 2 +- .../strings/strings-tests.factor | 2 +- basis/core-foundation/strings/strings.factor | 32 +- basis/core-graphics/core-graphics.factor | 6 +- basis/cpu/ppc/32/linux/bootstrap.factor | 4 +- basis/cpu/ppc/64/linux/bootstrap.factor | 8 +- basis/cpu/ppc/assembler/assembler.factor | 274 +- basis/cpu/ppc/ppc.factor | 16 +- basis/cpu/x86/32/32.factor | 4 +- basis/cpu/x86/32/bootstrap.factor | 2 +- basis/cpu/x86/64/bootstrap.factor | 2 +- .../cpu/x86/assembler/assembler-tests.factor | 356 +-- basis/cpu/x86/assembler/assembler.factor | 1070 +++---- basis/cpu/x86/bootstrap.factor | 6 +- basis/cpu/x86/sse/sse.factor | 10 +- basis/cpu/x86/x86.factor | 12 +- basis/db/postgresql/ffi/ffi.factor | 60 +- basis/db/sqlite/ffi/ffi.factor | 24 +- basis/debugger/windows/windows.factor | 6 +- basis/formatting/formatting-docs.factor | 2 +- basis/formatting/formatting-tests.factor | 12 +- basis/game/input/dinput/dinput.factor | 2 +- .../input/dinput/keys-array/keys-array.factor | 2 +- basis/game/input/iokit/iokit.factor | 36 +- basis/game/input/scancodes/scancodes.factor | 346 +-- basis/game/input/xinput/xinput.factor | 2 +- basis/glib/ffi/ffi.factor | 24 +- .../unix/multiplexers/select/select.factor | 2 +- basis/io/backend/unix/unix.factor | 2 +- basis/io/directories/unix/unix.factor | 4 +- basis/io/encodings/8-bit/8-bit-tests.factor | 2 +- basis/io/encodings/ascii/ascii-tests.factor | 2 +- basis/io/encodings/euc/euc-tests.factor | 26 +- basis/io/encodings/euc/euc.factor | 4 +- .../io/encodings/gb18030/gb18030-tests.factor | 34 +- basis/io/encodings/gb18030/gb18030.factor | 16 +- .../io/encodings/iso2022/iso2022-tests.factor | 22 +- basis/io/encodings/iso2022/iso2022.factor | 2 +- basis/io/encodings/johab/johab-tests.factor | 6 +- .../shift-jis/shift-jis-tests.factor | 8 +- basis/io/encodings/shift-jis/shift-jis.factor | 2 +- basis/io/encodings/strict/strict-tests.factor | 2 +- basis/io/encodings/utf32/utf32-tests.factor | 22 +- basis/io/encodings/utf32/utf32.factor | 4 +- basis/io/files/info/unix/unix-docs.factor | 2 +- basis/io/files/info/unix/unix.factor | 36 +- basis/io/files/unix/unix-tests.factor | 48 +- basis/io/launcher/windows/windows.factor | 2 +- basis/io/sockets/windows/windows.factor | 2 +- basis/iokit/hid/hid.factor | 40 +- basis/json/reader/reader-tests.factor | 2 +- basis/literals/literals-docs.factor | 4 +- basis/math/bits/bits-docs.factor | 2 +- basis/math/bits/bits-tests.factor | 12 +- basis/math/bitwise/bitwise-docs.factor | 50 +- basis/math/bitwise/bitwise-tests.factor | 30 +- basis/math/bitwise/bitwise.factor | 2 +- basis/math/constants/constants.factor | 8 +- basis/math/floats/env/env-tests.factor | 40 +- basis/math/floats/env/env.factor | 10 +- basis/math/floats/env/ppc/ppc.factor | 48 +- basis/math/floats/env/x86/x86.factor | 60 +- basis/math/floats/half/half-tests.factor | 44 +- basis/math/floats/half/half.factor | 10 +- basis/math/functions/functions-tests.factor | 6 +- basis/math/functions/functions.factor | 14 +- basis/math/vectors/simd/simd-tests.factor | 22 +- basis/math/vectors/vectors-docs.factor | 10 +- basis/nibble-arrays/nibble-arrays.factor | 2 +- basis/opengl/gl/gl.factor | 2730 ++++++++--------- basis/opengl/opengl.factor | 16 +- basis/openssl/libcrypto/libcrypto.factor | 8 +- basis/openssl/libssl/libssl.factor | 12 +- basis/prettyprint/prettyprint-tests.factor | 8 +- .../mersenne-twister/mersenne-twister.factor | 6 +- basis/random/sfmt/sfmt.factor | 4 +- basis/regexp/classes/classes.factor | 2 +- basis/regexp/parser/parser.factor | 6 +- basis/serialize/serialize.factor | 12 +- .../simple-flat-file-tests.factor | 8 +- .../specialized-arrays-tests.factor | 4 +- basis/system-info/macosx/macosx.factor | 18 +- basis/system-info/windows/windows.factor | 2 +- basis/tools/deploy/macosx/macosx.factor | 2 +- basis/tools/deploy/unix/unix.factor | 2 +- basis/ui/backend/cocoa/views/views.factor | 8 +- basis/ui/backend/x11/x11.factor | 54 +- basis/unicode/breaks/breaks.factor | 6 +- basis/unicode/case/case-tests.factor | 4 +- .../categories/categories-tests.factor | 8 +- basis/unicode/collation/collation.factor | 14 +- basis/unicode/data/data.factor | 6 +- basis/unicode/normalize/normalize.factor | 18 +- basis/unix/ffi/linux/linux.factor | 22 +- basis/unix/ffi/macosx/macosx.factor | 28 +- basis/unix/kqueue/kqueue.factor | 70 +- basis/unix/linux/epoll/epoll.factor | 22 +- basis/unix/linux/inotify/inotify.factor | 42 +- basis/unix/process/process.factor | 12 +- basis/unix/stat/stat.factor | 20 +- basis/unix/statfs/macosx/macosx.factor | 94 +- basis/unix/statvfs/macosx/macosx.factor | 4 +- basis/uuid/uuid.factor | 16 +- basis/windows/advapi32/advapi32.factor | 194 +- basis/windows/com/com.factor | 2 +- basis/windows/ddk/hid/hid.factor | 422 +-- basis/windows/ddk/setupapi/setupapi.factor | 1204 ++++---- .../directx/audiodefs/audiodefs.factor | 72 +- basis/windows/directx/d2d1/d2d1.factor | 102 +- basis/windows/directx/d2derr/d2derr.factor | 62 +- basis/windows/directx/d3d10/d3d10.factor | 196 +- basis/windows/directx/d3d10_1/d3d10_1.factor | 18 +- .../d3d10_1shader/d3d10_1shader.factor | 6 +- .../directx/d3d10shader/d3d10shader.factor | 12 +- basis/windows/directx/d3d11/d3d11.factor | 164 +- basis/windows/directx/d3d9/d3d9.factor | 124 +- .../windows/directx/d3d9caps/d3d9caps.factor | 512 ++-- .../directx/d3d9types/d3d9types.factor | 420 +-- .../directx/d3dcommon/d3dcommon.factor | 12 +- .../directx/d3dcompiler/d3dcompiler.factor | 2 +- basis/windows/directx/d3dx10/d3dx10.factor | 18 +- .../directx/d3dx10core/d3dx10core.factor | 14 +- .../directx/d3dx10mesh/d3dx10mesh.factor | 24 +- .../directx/d3dx10tex/d3dx10tex.factor | 46 +- basis/windows/directx/d3dx11/d3dx11.factor | 18 +- .../directx/d3dx11core/d3dx11core.factor | 4 +- .../directx/d3dx11tex/d3dx11tex.factor | 46 +- basis/windows/directx/d3dx9/d3dx9.factor | 18 +- .../directx/d3dx9anim/d3dx9anim.factor | 14 +- .../directx/d3dx9core/d3dx9core.factor | 2 +- .../directx/d3dx9mesh/d3dx9mesh.factor | 116 +- .../windows/directx/d3dx9tex/d3dx9tex.factor | 4 +- .../windows/directx/d3dx9xof/d3dx9xof.factor | 36 +- basis/windows/directx/dinput/dinput.factor | 412 +-- basis/windows/directx/dwrite/dwrite.factor | 172 +- basis/windows/directx/dxfile/dxfile.factor | 54 +- basis/windows/directx/dxgi/dxgi.factor | 12 +- .../directx/dxgiformat/dxgiformat.factor | 2 +- .../windows/directx/dxgitype/dxgitype.factor | 44 +- .../windows/directx/x3daudio/x3daudio.factor | 18 +- basis/windows/directx/xact3/xact3.factor | 178 +- basis/windows/directx/xapo/xapo.factor | 12 +- basis/windows/directx/xaudio2/xaudio2.factor | 132 +- basis/windows/directx/xinput/xinput.factor | 110 +- basis/windows/dwmapi/dwmapi.factor | 2 +- basis/windows/errors/errors.factor | 26 +- basis/windows/gdi32/gdi32.factor | 444 +-- basis/windows/gdiplus/gdiplus.factor | 542 ++-- basis/windows/kernel32/kernel32.factor | 596 ++-- basis/windows/messages/messages.factor | 822 ++--- basis/windows/ole32/ole32.factor | 22 +- basis/windows/opengl32/opengl32.factor | 172 +- basis/windows/shell32/shell32.factor | 180 +- basis/windows/types/types.factor | 6 +- basis/windows/user32/user32.factor | 668 ++-- basis/windows/usp10/usp10.factor | 42 +- basis/windows/winsock/winsock.factor | 42 +- basis/x11/glx/glx.factor | 4 +- basis/x11/xlib/xlib.factor | 72 +- basis/xml/autoencoding/autoencoding.factor | 6 +- basis/xml/char-classes/char-classes.factor | 14 +- core/alien/alien-tests.factor | 10 +- core/bootstrap/layouts/layouts.factor | 2 +- core/checksums/crc32/crc32-tests.factor | 2 +- core/checksums/crc32/crc32.factor | 4 +- core/hashtables/hashtables.factor | 2 +- core/io/binary/binary-docs.factor | 2 +- core/io/binary/binary-tests.factor | 30 +- core/io/binary/binary.factor | 10 +- core/io/encodings/encodings.factor | 2 +- core/io/encodings/utf16/utf16-tests.factor | 22 +- core/io/encodings/utf16/utf16.factor | 40 +- core/io/encodings/utf8/utf8-tests.factor | 34 +- core/io/encodings/utf8/utf8.factor | 32 +- .../byte-array/byte-array-tests.factor | 6 +- core/math/floats/floats-tests.factor | 4 +- core/math/floats/floats.factor | 2 +- core/math/integers/integers-tests.factor | 68 +- core/math/integers/integers.factor | 2 +- core/math/math-docs.factor | 16 +- core/math/math-tests.factor | 6 +- core/math/math.factor | 2 +- core/math/parser/parser-tests.factor | 10 +- core/strings/strings-tests.factor | 24 +- core/strings/strings.factor | 4 +- core/syntax/syntax-docs.factor | 16 +- extra/asn1/asn1.factor | 22 +- extra/balloon-bomber/balloon-bomber.factor | 10 +- extra/benchmark/mt/mt.factor | 2 +- extra/benchmark/sfmt/sfmt.factor | 2 +- extra/bson/constants/constants.factor | 58 +- extra/chipmunk/ffi/ffi.factor | 2 +- extra/cpu/8080/emulator/emulator-docs.factor | 2 +- extra/cpu/8080/emulator/emulator.factor | 102 +- extra/cpu/8080/test/test.factor | 12 +- .../cpu/arm/assembler/assembler-tests.factor | 78 +- extra/cpu/arm/assembler/assembler.factor | 90 +- extra/crypto/aes/aes-tests.factor | 644 ++-- extra/crypto/aes/aes.factor | 82 +- extra/crypto/barrett/barrett-tests.factor | 2 +- extra/ctags/etags/etags.factor | 4 +- extra/cuda/ffi/ffi.factor | 62 +- extra/curses/curses.factor | 198 +- extra/curses/ffi/ffi.factor | 12 +- extra/dns/dns.factor | 20 +- extra/dwarf/dwarf.factor | 1428 ++++----- extra/elf/elf.factor | 166 +- extra/gdbm/ffi/ffi.factor | 4 +- extra/gdbm/gdbm.factor | 2 +- extra/geo-ip/geo-ip.factor | 2 +- extra/gpu/state/state.factor | 6 +- extra/icfp/2006/2006.factor | 16 +- extra/id3/id3.factor | 4 +- extra/images/bitmap/bitmap.factor | 6 +- extra/images/gif/gif.factor | 18 +- extra/images/png/png.factor | 2 +- extra/ini-file/ini-file.factor | 16 +- extra/io/binary/fast/fast-tests.factor | 12 +- extra/io/files/trash/macosx/macosx.factor | 16 +- extra/io/files/trash/unix/unix.factor | 2 +- extra/io/files/trash/windows/windows.factor | 42 +- extra/io/serial/linux/ffi/ffi.factor | 202 +- extra/libusb/libusb.factor | 72 +- extra/llvm/clang/ffi/ffi.factor | 28 +- extra/llvm/core/core.factor | 22 +- extra/lunar-rescue/lunar-rescue.factor | 12 +- extra/macho/macho.factor | 412 +-- extra/memcached/memcached.factor | 74 +- extra/model-viewer/model-viewer.factor | 2 +- extra/ntp/ntp.factor | 16 +- extra/openal/alut/alut.factor | 50 +- extra/openal/openal.factor | 172 +- extra/opencl/ffi/ffi.factor | 452 +-- extra/poker/poker.factor | 10 +- extra/readline/ffi/ffi.factor | 52 +- extra/smalltalk/parser/parser-tests.factor | 2 +- extra/space-invaders/space-invaders.factor | 42 +- .../arm/architecture/architecture.factor | 2 +- unmaintained/cryptlib/libcl/libcl.factor | 78 +- unmaintained/dns/dns.factor | 20 +- .../dragdrop-listener.factor | 2 +- unmaintained/headers/headers.factor | 12 +- unmaintained/images/jpeg/jpeg.factor | 48 +- .../javascriptcore/ffi/hack/hack.factor | 12 +- unmaintained/jni/jni-internals.factor | 2 +- unmaintained/ldap/libldap/libldap.factor | 60 +- .../math/derivatives/derivatives.factor | 2 +- unmaintained/oracle/liboci/liboci.factor | 24 +- unmaintained/pdf/libhpdf/libhpdf.factor | 204 +- unmaintained/sniffer/io/bsd/bsd.factor | 10 +- .../sniffer/io/filter/backend/backend.factor | 4 +- 279 files changed, 10513 insertions(+), 10513 deletions(-) diff --git a/basis/alien/endian/endian-tests.factor b/basis/alien/endian/endian-tests.factor index 53901a3938..6c083df8e7 100644 --- a/basis/alien/endian/endian-tests.factor +++ b/basis/alien/endian/endian-tests.factor @@ -20,37 +20,37 @@ STRUCT: endian-struct { l be64 } ; CONSTANT: endian-bytes-0f B{ - HEX: 0 HEX: ff - HEX: 0 HEX: ff - HEX: 0 HEX: ff - HEX: 0 HEX: ff - - HEX: 0 HEX: 0 HEX: 0 HEX: ff - HEX: 0 HEX: 0 HEX: 0 HEX: ff - HEX: 0 HEX: 0 HEX: 0 HEX: ff - HEX: 0 HEX: 0 HEX: 0 HEX: ff - - HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: ff - HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: ff - HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: ff - HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: ff + 0x0 0xff + 0x0 0xff + 0x0 0xff + 0x0 0xff + + 0x0 0x0 0x0 0xff + 0x0 0x0 0x0 0xff + 0x0 0x0 0x0 0xff + 0x0 0x0 0x0 0xff + + 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0xff + 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0xff + 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0xff + 0x0 0x0 0x0 0x0 0x0 0x0 0x0 0xff } CONSTANT: endian-bytes-f0 B{ - HEX: ff HEX: 0 - HEX: ff HEX: 0 - HEX: ff HEX: 0 - HEX: ff HEX: 0 - - HEX: ff HEX: 0 HEX: 0 HEX: 0 - HEX: ff HEX: 0 HEX: 0 HEX: 0 - HEX: ff HEX: 0 HEX: 0 HEX: 0 - HEX: ff HEX: 0 HEX: 0 HEX: 0 - - HEX: ff HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 - HEX: ff HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 - HEX: ff HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 - HEX: ff HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 HEX: 0 + 0xff 0x0 + 0xff 0x0 + 0xff 0x0 + 0xff 0x0 + + 0xff 0x0 0x0 0x0 + 0xff 0x0 0x0 0x0 + 0xff 0x0 0x0 0x0 + 0xff 0x0 0x0 0x0 + + 0xff 0x0 0x0 0x0 0x0 0x0 0x0 0x0 + 0xff 0x0 0x0 0x0 0x0 0x0 0x0 0x0 + 0xff 0x0 0x0 0x0 0x0 0x0 0x0 0x0 + 0xff 0x0 0x0 0x0 0x0 0x0 0x0 0x0 } : endian-test-struct-0f ( -- obj ) @@ -59,36 +59,36 @@ CONSTANT: endian-bytes-f0 B{ : endian-test-struct-f0 ( -- obj ) endian-bytes-f0 endian-struct memory>struct ; -[ HEX: ff00 ] [ endian-test-struct-0f a>> ] unit-test +[ 0xff00 ] [ endian-test-struct-0f a>> ] unit-test [ -256 ] [ endian-test-struct-0f b>> ] unit-test -[ HEX: 00ff ] [ endian-test-struct-0f c>> ] unit-test -[ HEX: 00ff ] [ endian-test-struct-0f d>> ] unit-test +[ 0x00ff ] [ endian-test-struct-0f c>> ] unit-test +[ 0x00ff ] [ endian-test-struct-0f d>> ] unit-test -[ HEX: ff000000 ] [ endian-test-struct-0f e>> ] unit-test +[ 0xff000000 ] [ endian-test-struct-0f e>> ] unit-test [ -16777216 ] [ endian-test-struct-0f f>> ] unit-test -[ HEX: 000000ff ] [ endian-test-struct-0f g>> ] unit-test -[ HEX: 000000ff ] [ endian-test-struct-0f h>> ] unit-test +[ 0x000000ff ] [ endian-test-struct-0f g>> ] unit-test +[ 0x000000ff ] [ endian-test-struct-0f h>> ] unit-test -[ HEX: ff00000000000000 ] [ endian-test-struct-0f i>> ] unit-test +[ 0xff00000000000000 ] [ endian-test-struct-0f i>> ] unit-test [ -72057594037927936 ] [ endian-test-struct-0f j>> ] unit-test -[ HEX: 00000000000000ff ] [ endian-test-struct-0f k>> ] unit-test -[ HEX: 00000000000000ff ] [ endian-test-struct-0f l>> ] unit-test +[ 0x00000000000000ff ] [ endian-test-struct-0f k>> ] unit-test +[ 0x00000000000000ff ] [ endian-test-struct-0f l>> ] unit-test -[ HEX: ff00 ] [ endian-test-struct-f0 c>> ] unit-test +[ 0xff00 ] [ endian-test-struct-f0 c>> ] unit-test [ -256 ] [ endian-test-struct-f0 d>> ] unit-test -[ HEX: 00ff ] [ endian-test-struct-f0 a>> ] unit-test -[ HEX: 00ff ] [ endian-test-struct-f0 b>> ] unit-test +[ 0x00ff ] [ endian-test-struct-f0 a>> ] unit-test +[ 0x00ff ] [ endian-test-struct-f0 b>> ] unit-test -[ HEX: ff000000 ] [ endian-test-struct-f0 g>> ] unit-test +[ 0xff000000 ] [ endian-test-struct-f0 g>> ] unit-test [ -16777216 ] [ endian-test-struct-f0 h>> ] unit-test -[ HEX: 000000ff ] [ endian-test-struct-f0 e>> ] unit-test -[ HEX: 000000ff ] [ endian-test-struct-f0 f>> ] unit-test +[ 0x000000ff ] [ endian-test-struct-f0 e>> ] unit-test +[ 0x000000ff ] [ endian-test-struct-f0 f>> ] unit-test -[ HEX: ff00000000000000 ] [ endian-test-struct-f0 k>> ] unit-test +[ 0xff00000000000000 ] [ endian-test-struct-f0 k>> ] unit-test [ -72057594037927936 ] [ endian-test-struct-f0 l>> ] unit-test -[ HEX: 00000000000000ff ] [ endian-test-struct-f0 i>> ] unit-test -[ HEX: 00000000000000ff ] [ endian-test-struct-f0 j>> ] unit-test +[ 0x00000000000000ff ] [ endian-test-struct-f0 i>> ] unit-test +[ 0x00000000000000ff ] [ endian-test-struct-f0 j>> ] unit-test [ t ] [ endian-test-struct-0f binary [ write ] with-byte-writer endian-bytes-0f = ] unit-test diff --git a/basis/alien/endian/endian.factor b/basis/alien/endian/endian.factor index b72e0c634d..f7cc0b0f97 100644 --- a/basis/alien/endian/endian.factor +++ b/basis/alien/endian/endian.factor @@ -24,7 +24,7 @@ MACRO: byte-reverse ( n signed? -- quot ) [ dup iota [ [ 1 + - -8 * ] [ nip 8 * ] 2bi - '[ _ shift HEX: ff bitand _ shift ] + '[ _ shift 0xff bitand _ shift ] ] with map ] [ 1 - [ bitor ] n*quot ] bi ] [ diff --git a/basis/ascii/ascii.factor b/basis/ascii/ascii.factor index bd1b86b279..6f89dea6d9 100644 --- a/basis/ascii/ascii.factor +++ b/basis/ascii/ascii.factor @@ -10,13 +10,13 @@ IN: ascii : LETTER? ( ch -- ? ) CHAR: A CHAR: Z between? ; inline : digit? ( ch -- ? ) CHAR: 0 CHAR: 9 between? ; inline : printable? ( ch -- ? ) CHAR: \s CHAR: ~ between? ; inline -: control? ( ch -- ? ) { [ 0 HEX: 1F between? ] [ HEX: 7F = ] } 1|| ; inline +: control? ( ch -- ? ) { [ 0 0x1F between? ] [ 0x7F = ] } 1|| ; inline : quotable? ( ch -- ? ) { [ printable? ] [ "\"\\" member? not ] } 1&& ; inline : Letter? ( ch -- ? ) { [ letter? ] [ LETTER? ] } 1|| ; inline : alpha? ( ch -- ? ) { [ Letter? ] [ digit? ] } 1|| ; inline -: ch>lower ( ch -- lower ) dup LETTER? [ HEX: 20 + ] when ; inline +: ch>lower ( ch -- lower ) dup LETTER? [ 0x20 + ] when ; inline : >lower ( str -- lower ) [ ch>lower ] map ; -: ch>upper ( ch -- upper ) dup letter? [ HEX: 20 - ] when ; inline +: ch>upper ( ch -- upper ) dup letter? [ 0x20 - ] when ; inline : >upper ( str -- upper ) [ ch>upper ] map ; HINTS: >lower string ; diff --git a/basis/base64/base64.factor b/basis/base64/base64.factor index 9a57740936..dd1af56def 100644 --- a/basis/base64/base64.factor +++ b/basis/base64/base64.factor @@ -44,7 +44,7 @@ SYMBOL: column : encode3 ( seq -- ) be> 4 iota [ - -6 * shift HEX: 3f bitand ch>base64 write1-lines + -6 * shift 0x3f bitand ch>base64 write1-lines ] with each ; inline : encode-pad ( seq n -- ) diff --git a/basis/bit-arrays/bit-arrays-tests.factor b/basis/bit-arrays/bit-arrays-tests.factor index 3e9daa291d..79f4844f49 100644 --- a/basis/bit-arrays/bit-arrays-tests.factor +++ b/basis/bit-arrays/bit-arrays-tests.factor @@ -67,12 +67,12 @@ IN: bit-arrays.tests t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t } ] [ - HEX: ffffffffffffffffffffffffffffffff integer>bit-array + 0xffffffffffffffffffffffffffffffff integer>bit-array ] unit-test [ 14 ] [ ?{ f t t t } bit-array>integer ] unit-test [ 0 ] [ ?{ } bit-array>integer ] unit-test -[ HEX: ffffffffffffffffffffffffffffffff ] [ ?{ +[ 0xffffffffffffffffffffffffffffffff ] [ ?{ t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t t @@ -83,6 +83,6 @@ IN: bit-arrays.tests [ 1 ] [ ?{ f t f t } byte-length ] unit-test -[ HEX: a ] [ ?{ f t f t } bit-array>integer ] unit-test +[ 0xa ] [ ?{ f t f t } bit-array>integer ] unit-test -[ HEX: 100 ] [ ?{ f f f f f f f f t } bit-array>integer ] unit-test +[ 0x100 ] [ ?{ f f f f f f f f t } bit-array>integer ] unit-test diff --git a/basis/bitstreams/bitstreams-tests.factor b/basis/bitstreams/bitstreams-tests.factor index 794faa6055..19961825de 100644 --- a/basis/bitstreams/bitstreams-tests.factor +++ b/basis/bitstreams/bitstreams-tests.factor @@ -5,44 +5,44 @@ grouping compression.lzw multiline byte-arrays io.encodings.binary io.streams.byte-array ; IN: bitstreams.tests -[ BIN: 1111111111 ] +[ 0b1111111111 ] [ - B{ HEX: 0f HEX: ff HEX: ff HEX: ff } + B{ 0x0f 0xff 0xff 0xff } 2 >>byte-pos 6 >>bit-pos 10 swap peek ] unit-test -[ BIN: 111111111 ] +[ 0b111111111 ] [ - B{ HEX: 0f HEX: ff HEX: ff HEX: ff } + B{ 0x0f 0xff 0xff 0xff } 2 >>byte-pos 6 >>bit-pos 9 swap peek ] unit-test -[ BIN: 11111111 ] +[ 0b11111111 ] [ - B{ HEX: 0f HEX: ff HEX: ff HEX: ff } + B{ 0x0f 0xff 0xff 0xff } 2 >>byte-pos 6 >>bit-pos 8 swap peek ] unit-test -[ BIN: 1111111 ] +[ 0b1111111 ] [ - B{ HEX: 0f HEX: ff HEX: ff HEX: ff } + B{ 0x0f 0xff 0xff 0xff } 2 >>byte-pos 6 >>bit-pos 7 swap peek ] unit-test -[ BIN: 111111 ] +[ 0b111111 ] [ - B{ HEX: 0f HEX: ff HEX: ff HEX: ff } + B{ 0x0f 0xff 0xff 0xff } 2 >>byte-pos 6 >>bit-pos 6 swap peek ] unit-test -[ BIN: 11111 ] +[ 0b11111 ] [ - B{ HEX: 0f HEX: ff HEX: ff HEX: ff } + B{ 0x0f 0xff 0xff 0xff } 2 >>byte-pos 6 >>bit-pos 5 swap peek ] unit-test diff --git a/basis/bootstrap/image/image.factor b/basis/bootstrap/image/image.factor index 76ff136386..dc8343e6fa 100755 --- a/basis/bootstrap/image/image.factor +++ b/basis/bootstrap/image/image.factor @@ -87,7 +87,7 @@ SYMBOL: objects ! Constants -CONSTANT: image-magic HEX: 0f0e0d0c +CONSTANT: image-magic 0x0f0e0d0c CONSTANT: image-version 4 CONSTANT: data-base 1024 diff --git a/basis/cairo/ffi/ffi.factor b/basis/cairo/ffi/ffi.factor index ff8173b03e..df6d2cdbd6 100644 --- a/basis/cairo/ffi/ffi.factor +++ b/basis/cairo/ffi/ffi.factor @@ -77,9 +77,9 @@ ENUM: cairo_status_t CAIRO_STATUS_INVALID_WEIGHT ; ENUM: cairo_content_t - { CAIRO_CONTENT_COLOR HEX: 1000 } - { CAIRO_CONTENT_ALPHA HEX: 2000 } - { CAIRO_CONTENT_COLOR_ALPHA HEX: 3000 } ; + { CAIRO_CONTENT_COLOR 0x1000 } + { CAIRO_CONTENT_ALPHA 0x2000 } + { CAIRO_CONTENT_COLOR_ALPHA 0x3000 } ; CALLBACK: cairo_status_t cairo_write_func_t ( void* closure, uchar* data, uint length ) ; @@ -385,7 +385,7 @@ FUNCTION: void cairo_text_cluster_free ( cairo_text_cluster_t* clusters ) ; ENUM: cairo_text_cluster_flags_t - { CAIRO_TEXT_CLUSTER_FLAG_BACKWARD HEX: 00000001 } ; + { CAIRO_TEXT_CLUSTER_FLAG_BACKWARD 0x00000001 } ; STRUCT: cairo_text_extents_t { x_bearing double } diff --git a/basis/checksums/common/common.factor b/basis/checksums/common/common.factor index 76675f9413..f979a6e719 100644 --- a/basis/checksums/common/common.factor +++ b/basis/checksums/common/common.factor @@ -14,8 +14,8 @@ SYMBOL: bytes-read : pad-last-block ( str big-endian? length -- str ) [ - [ % ] 2dip HEX: 80 , - [ HEX: 3f bitand calculate-pad-length % ] + [ % ] 2dip 0x80 , + [ 0x3f bitand calculate-pad-length % ] [ 3 shift 8 rot [ >be ] [ >le ] if % ] bi ] B{ } make 64 group ; diff --git a/basis/checksums/fnv1/fnv1-tests.factor b/basis/checksums/fnv1/fnv1-tests.factor index de665a1547..27c3027769 100644 --- a/basis/checksums/fnv1/fnv1-tests.factor +++ b/basis/checksums/fnv1/fnv1-tests.factor @@ -3,25 +3,25 @@ IN: checksums.fnv1.tests ! A few test vectors taken from http://www.isthe.com/chongo/src/fnv/test_fnv.c -[ HEX: 811c9dc5 ] [ "" fnv1-32 checksum-bytes ] unit-test -[ HEX: 811c9dc5 ] [ "" fnv1a-32 checksum-bytes ] unit-test -[ HEX: cbf29ce484222325 ] [ "" fnv1-64 checksum-bytes ] unit-test -[ HEX: cbf29ce484222325 ] [ "" fnv1a-64 checksum-bytes ] unit-test +[ 0x811c9dc5 ] [ "" fnv1-32 checksum-bytes ] unit-test +[ 0x811c9dc5 ] [ "" fnv1a-32 checksum-bytes ] unit-test +[ 0xcbf29ce484222325 ] [ "" fnv1-64 checksum-bytes ] unit-test +[ 0xcbf29ce484222325 ] [ "" fnv1a-64 checksum-bytes ] unit-test -[ HEX: 050c5d7e ] [ "a" fnv1-32 checksum-bytes ] unit-test -[ HEX: e40c292c ] [ "a" fnv1a-32 checksum-bytes ] unit-test -[ HEX: af63bd4c8601b7be ] [ "a" fnv1-64 checksum-bytes ] unit-test -[ HEX: af63dc4c8601ec8c ] [ "a" fnv1a-64 checksum-bytes ] unit-test +[ 0x050c5d7e ] [ "a" fnv1-32 checksum-bytes ] unit-test +[ 0xe40c292c ] [ "a" fnv1a-32 checksum-bytes ] unit-test +[ 0xaf63bd4c8601b7be ] [ "a" fnv1-64 checksum-bytes ] unit-test +[ 0xaf63dc4c8601ec8c ] [ "a" fnv1a-64 checksum-bytes ] unit-test -[ HEX: 050c5d7d ] [ "b" fnv1-32 checksum-bytes ] unit-test -[ HEX: e70c2de5 ] [ "b" fnv1a-32 checksum-bytes ] unit-test -[ HEX: af63bd4c8601b7bd ] [ "b" fnv1-64 checksum-bytes ] unit-test -[ HEX: af63df4c8601f1a5 ] [ "b" fnv1a-64 checksum-bytes ] unit-test +[ 0x050c5d7d ] [ "b" fnv1-32 checksum-bytes ] unit-test +[ 0xe70c2de5 ] [ "b" fnv1a-32 checksum-bytes ] unit-test +[ 0xaf63bd4c8601b7bd ] [ "b" fnv1-64 checksum-bytes ] unit-test +[ 0xaf63df4c8601f1a5 ] [ "b" fnv1a-64 checksum-bytes ] unit-test -[ HEX: 31f0b262 ] [ "foobar" fnv1-32 checksum-bytes ] unit-test -[ HEX: bf9cf968 ] [ "foobar" fnv1a-32 checksum-bytes ] unit-test -[ HEX: 340d8765a4dda9c2 ] [ "foobar" fnv1-64 checksum-bytes ] unit-test -[ HEX: 85944171f73967e8 ] [ "foobar" fnv1a-64 checksum-bytes ] unit-test +[ 0x31f0b262 ] [ "foobar" fnv1-32 checksum-bytes ] unit-test +[ 0xbf9cf968 ] [ "foobar" fnv1a-32 checksum-bytes ] unit-test +[ 0x340d8765a4dda9c2 ] [ "foobar" fnv1-64 checksum-bytes ] unit-test +[ 0x85944171f73967e8 ] [ "foobar" fnv1a-64 checksum-bytes ] unit-test ! I couldn't find any test vectors for 128, 256, 512, or 1024 versions of FNV1 hashes. ! So, just to check that your maths works the same as my maths, here's a few samples computed on my laptop. diff --git a/basis/checksums/fnv1/fnv1.factor b/basis/checksums/fnv1/fnv1.factor index 5cc6b02425..053556537c 100644 --- a/basis/checksums/fnv1/fnv1.factor +++ b/basis/checksums/fnv1/fnv1.factor @@ -24,19 +24,19 @@ CONSTANT: fnv1-256-prime 374144419156711147060143317175368453031918731002211 CONSTANT: fnv1-512-prime 35835915874844867368919076489095108449946327955754392558399825615420669938882575126094039892345713852759 CONSTANT: fnv1-1024-prime 5016456510113118655434598811035278955030765345404790744303017523831112055108147451509157692220295382716162651878526895249385292291816524375083746691371804094271873160484737966720260389217684476157468082573 -CONSTANT: fnv1-32-mod HEX: ffffffff -CONSTANT: fnv1-64-mod HEX: ffffffffffffffff -CONSTANT: fnv1-128-mod HEX: ffffffffffffffffffffffffffffffff -CONSTANT: fnv1-256-mod HEX: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -CONSTANT: fnv1-512-mod HEX: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff -CONSTANT: fnv1-1024-mod HEX: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff - -CONSTANT: fnv1-32-basis HEX: 811c9dc5 -CONSTANT: fnv1-64-basis HEX: cbf29ce484222325 -CONSTANT: fnv1-128-basis HEX: 6c62272e07bb014262b821756295c58d -CONSTANT: fnv1-256-basis HEX: dd268dbcaac550362d98c384c4e576ccc8b1536847b6bbb31023b4c8caee0535 -CONSTANT: fnv1-512-basis HEX: b86db0b1171f4416dca1e50f309990acac87d059c90000000000000000000d21e948f68a34c192f62ea79bc942dbe7ce182036415f56e34bac982aac4afe9fd9 -CONSTANT: fnv1-1024-basis HEX: 5f7a76758ecc4d32e56d5a591028b74b29fc4223fdada16c3bf34eda3674da9a21d9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c6d7eb6e73802734510a555f256cc005ae556bde8cc9c6a93b21aff4b16c71ee90b3 +CONSTANT: fnv1-32-mod 0xffffffff +CONSTANT: fnv1-64-mod 0xffffffffffffffff +CONSTANT: fnv1-128-mod 0xffffffffffffffffffffffffffffffff +CONSTANT: fnv1-256-mod 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +CONSTANT: fnv1-512-mod 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff +CONSTANT: fnv1-1024-mod 0xffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + +CONSTANT: fnv1-32-basis 0x811c9dc5 +CONSTANT: fnv1-64-basis 0xcbf29ce484222325 +CONSTANT: fnv1-128-basis 0x6c62272e07bb014262b821756295c58d +CONSTANT: fnv1-256-basis 0xdd268dbcaac550362d98c384c4e576ccc8b1536847b6bbb31023b4c8caee0535 +CONSTANT: fnv1-512-basis 0xb86db0b1171f4416dca1e50f309990acac87d059c90000000000000000000d21e948f68a34c192f62ea79bc942dbe7ce182036415f56e34bac982aac4afe9fd9 +CONSTANT: fnv1-1024-basis 0x5f7a76758ecc4d32e56d5a591028b74b29fc4223fdada16c3bf34eda3674da9a21d9000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c6d7eb6e73802734510a555f256cc005ae556bde8cc9c6a93b21aff4b16c71ee90b3 M: fnv1-32 checksum-bytes ( bytes checksum -- value ) drop diff --git a/basis/checksums/hmac/hmac-tests.factor b/basis/checksums/hmac/hmac-tests.factor index 70451252f7..3054a91c80 100644 --- a/basis/checksums/hmac/hmac-tests.factor +++ b/basis/checksums/hmac/hmac-tests.factor @@ -15,8 +15,8 @@ IN: checksums.hmac.tests "V\u0000be4R\u00001d\u000014L\u000088\u0000db\u0000b8\u0000c73\u0000f0\u0000e8\u0000b3\u0000f6" ] [ - 50 HEX: dd - 16 HEX: aa md5 hmac-bytes >string + 50 0xdd + 16 0xaa md5 hmac-bytes >string ] unit-test [ @@ -34,12 +34,12 @@ IN: checksums.hmac.tests [ "\u0000d70YM\u000016~5\u0000d5\u000095o\u0000d8\0=\r\u0000b3\u0000d3\u0000f4m\u0000c7\u0000bb" ] [ - 50 HEX: dd - 16 HEX: aa sha1 hmac-bytes >string + 50 0xdd + 16 0xaa sha1 hmac-bytes >string ] unit-test [ "b0344c61d8db38535ca8afceaf0bf12b881dc200c9833da726e9376c2e32cff7" ] -[ "Hi There" 20 HEX: b sha-256 hmac-bytes hex-string ] unit-test +[ "Hi There" 20 0xb sha-256 hmac-bytes hex-string ] unit-test [ "167f928588c5cc2eef8e3093caa0e87c9ff566a14794aa61648d81621a2a40c6" ] [ diff --git a/basis/checksums/hmac/hmac.factor b/basis/checksums/hmac/hmac.factor index cb536cd75e..d6fc24d4b0 100644 --- a/basis/checksums/hmac/hmac.factor +++ b/basis/checksums/hmac/hmac.factor @@ -9,9 +9,9 @@ IN: checksums.hmac : seq-bitxor ( seq seq -- seq ) [ bitxor ] 2map ; -: opad ( checksum-state -- seq ) block-size>> HEX: 5c ; +: opad ( checksum-state -- seq ) block-size>> 0x5c ; -: ipad ( checksum-state -- seq ) block-size>> HEX: 36 ; +: ipad ( checksum-state -- seq ) block-size>> 0x36 ; :: init-key ( checksum key checksum-state -- o i ) checksum-state block-size>> key length < diff --git a/basis/checksums/internet/internet-tests.factor b/basis/checksums/internet/internet-tests.factor index b01ba28001..249b21104d 100644 --- a/basis/checksums/internet/internet-tests.factor +++ b/basis/checksums/internet/internet-tests.factor @@ -12,10 +12,10 @@ IN: checksums : test-data ( -- bytes ) B{ - HEX: 00 HEX: 01 - HEX: f2 HEX: 03 - HEX: f4 HEX: f5 - HEX: f6 HEX: f7 + 0x00 0x01 + 0xf2 0x03 + 0xf4 0xf5 + 0xf6 0xf7 } ; [ B{ 34 13 } ] [ test-data internet checksum-bytes ] unit-test diff --git a/basis/checksums/internet/internet.factor b/basis/checksums/internet/internet.factor index 8c609674b1..254d46d0ab 100644 --- a/basis/checksums/internet/internet.factor +++ b/basis/checksums/internet/internet.factor @@ -11,6 +11,6 @@ INSTANCE: internet checksum M: internet checksum-bytes drop 0 swap 2 [ le> + ] each - [ -16 shift ] [ HEX: ffff bitand ] bi + + [ -16 shift ] [ 0xffff bitand ] bi + [ -16 shift ] keep + bitnot 2 >le ; diff --git a/basis/checksums/md5/md5.factor b/basis/checksums/md5/md5.factor index 8a3f5fd48b..6a0d553ec1 100644 --- a/basis/checksums/md5/md5.factor +++ b/basis/checksums/md5/md5.factor @@ -19,7 +19,7 @@ TUPLE: md5-state < checksum-state state old-state ; : ( -- md5 ) md5-state new-checksum-state 64 >>block-size - uint-array{ HEX: 67452301 HEX: efcdab89 HEX: 98badcfe HEX: 10325476 } + uint-array{ 0x67452301 0xefcdab89 0x98badcfe 0x10325476 } [ clone >>state ] [ >>old-state ] bi ; M: md5 initialize-checksum-state drop ; diff --git a/basis/checksums/sha/sha.factor b/basis/checksums/sha/sha.factor index 82d2c2b491..822e4f94e6 100644 --- a/basis/checksums/sha/sha.factor +++ b/basis/checksums/sha/sha.factor @@ -20,19 +20,19 @@ TUPLE: sha1-state < checksum-state K H W word-size ; CONSTANT: initial-H-sha1 { - HEX: 67452301 - HEX: efcdab89 - HEX: 98badcfe - HEX: 10325476 - HEX: c3d2e1f0 + 0x67452301 + 0xefcdab89 + 0x98badcfe + 0x10325476 + 0xc3d2e1f0 } CONSTANT: K-sha1 $[ - 20 HEX: 5a827999 - 20 HEX: 6ed9eba1 - 20 HEX: 8f1bbcdc - 20 HEX: ca62c1d6 + 20 0x5a827999 + 20 0x6ed9eba1 + 20 0x8f1bbcdc + 20 0xca62c1d6 4 { } nappend-as ] @@ -64,83 +64,83 @@ CONSTANT: h 7 CONSTANT: initial-H-224 { - HEX: c1059ed8 HEX: 367cd507 HEX: 3070dd17 HEX: f70e5939 - HEX: ffc00b31 HEX: 68581511 HEX: 64f98fa7 HEX: befa4fa4 + 0xc1059ed8 0x367cd507 0x3070dd17 0xf70e5939 + 0xffc00b31 0x68581511 0x64f98fa7 0xbefa4fa4 } CONSTANT: initial-H-256 { - HEX: 6a09e667 HEX: bb67ae85 HEX: 3c6ef372 HEX: a54ff53a - HEX: 510e527f HEX: 9b05688c HEX: 1f83d9ab HEX: 5be0cd19 + 0x6a09e667 0xbb67ae85 0x3c6ef372 0xa54ff53a + 0x510e527f 0x9b05688c 0x1f83d9ab 0x5be0cd19 } CONSTANT: initial-H-384 { - HEX: cbbb9d5dc1059ed8 - HEX: 629a292a367cd507 - HEX: 9159015a3070dd17 - HEX: 152fecd8f70e5939 - HEX: 67332667ffc00b31 - HEX: 8eb44a8768581511 - HEX: db0c2e0d64f98fa7 - HEX: 47b5481dbefa4fa4 + 0xcbbb9d5dc1059ed8 + 0x629a292a367cd507 + 0x9159015a3070dd17 + 0x152fecd8f70e5939 + 0x67332667ffc00b31 + 0x8eb44a8768581511 + 0xdb0c2e0d64f98fa7 + 0x47b5481dbefa4fa4 } CONSTANT: initial-H-512 { - HEX: 6a09e667f3bcc908 - HEX: bb67ae8584caa73b - HEX: 3c6ef372fe94f82b - HEX: a54ff53a5f1d36f1 - HEX: 510e527fade682d1 - HEX: 9b05688c2b3e6c1f - HEX: 1f83d9abfb41bd6b - HEX: 5be0cd19137e2179 + 0x6a09e667f3bcc908 + 0xbb67ae8584caa73b + 0x3c6ef372fe94f82b + 0xa54ff53a5f1d36f1 + 0x510e527fade682d1 + 0x9b05688c2b3e6c1f + 0x1f83d9abfb41bd6b + 0x5be0cd19137e2179 } CONSTANT: K-256 { - HEX: 428a2f98 HEX: 71374491 HEX: b5c0fbcf HEX: e9b5dba5 - HEX: 3956c25b HEX: 59f111f1 HEX: 923f82a4 HEX: ab1c5ed5 - HEX: d807aa98 HEX: 12835b01 HEX: 243185be HEX: 550c7dc3 - HEX: 72be5d74 HEX: 80deb1fe HEX: 9bdc06a7 HEX: c19bf174 - HEX: e49b69c1 HEX: efbe4786 HEX: 0fc19dc6 HEX: 240ca1cc - HEX: 2de92c6f HEX: 4a7484aa HEX: 5cb0a9dc HEX: 76f988da - HEX: 983e5152 HEX: a831c66d HEX: b00327c8 HEX: bf597fc7 - HEX: c6e00bf3 HEX: d5a79147 HEX: 06ca6351 HEX: 14292967 - HEX: 27b70a85 HEX: 2e1b2138 HEX: 4d2c6dfc HEX: 53380d13 - HEX: 650a7354 HEX: 766a0abb HEX: 81c2c92e HEX: 92722c85 - HEX: a2bfe8a1 HEX: a81a664b HEX: c24b8b70 HEX: c76c51a3 - HEX: d192e819 HEX: d6990624 HEX: f40e3585 HEX: 106aa070 - HEX: 19a4c116 HEX: 1e376c08 HEX: 2748774c HEX: 34b0bcb5 - HEX: 391c0cb3 HEX: 4ed8aa4a HEX: 5b9cca4f HEX: 682e6ff3 - HEX: 748f82ee HEX: 78a5636f HEX: 84c87814 HEX: 8cc70208 - HEX: 90befffa HEX: a4506ceb HEX: bef9a3f7 HEX: c67178f2 + 0x428a2f98 0x71374491 0xb5c0fbcf 0xe9b5dba5 + 0x3956c25b 0x59f111f1 0x923f82a4 0xab1c5ed5 + 0xd807aa98 0x12835b01 0x243185be 0x550c7dc3 + 0x72be5d74 0x80deb1fe 0x9bdc06a7 0xc19bf174 + 0xe49b69c1 0xefbe4786 0x0fc19dc6 0x240ca1cc + 0x2de92c6f 0x4a7484aa 0x5cb0a9dc 0x76f988da + 0x983e5152 0xa831c66d 0xb00327c8 0xbf597fc7 + 0xc6e00bf3 0xd5a79147 0x06ca6351 0x14292967 + 0x27b70a85 0x2e1b2138 0x4d2c6dfc 0x53380d13 + 0x650a7354 0x766a0abb 0x81c2c92e 0x92722c85 + 0xa2bfe8a1 0xa81a664b 0xc24b8b70 0xc76c51a3 + 0xd192e819 0xd6990624 0xf40e3585 0x106aa070 + 0x19a4c116 0x1e376c08 0x2748774c 0x34b0bcb5 + 0x391c0cb3 0x4ed8aa4a 0x5b9cca4f 0x682e6ff3 + 0x748f82ee 0x78a5636f 0x84c87814 0x8cc70208 + 0x90befffa 0xa4506ceb 0xbef9a3f7 0xc67178f2 } CONSTANT: K-384 { - HEX: 428a2f98d728ae22 HEX: 7137449123ef65cd HEX: b5c0fbcfec4d3b2f HEX: e9b5dba58189dbbc - HEX: 3956c25bf348b538 HEX: 59f111f1b605d019 HEX: 923f82a4af194f9b HEX: ab1c5ed5da6d8118 - HEX: d807aa98a3030242 HEX: 12835b0145706fbe HEX: 243185be4ee4b28c HEX: 550c7dc3d5ffb4e2 - HEX: 72be5d74f27b896f HEX: 80deb1fe3b1696b1 HEX: 9bdc06a725c71235 HEX: c19bf174cf692694 - HEX: e49b69c19ef14ad2 HEX: efbe4786384f25e3 HEX: 0fc19dc68b8cd5b5 HEX: 240ca1cc77ac9c65 - HEX: 2de92c6f592b0275 HEX: 4a7484aa6ea6e483 HEX: 5cb0a9dcbd41fbd4 HEX: 76f988da831153b5 - HEX: 983e5152ee66dfab HEX: a831c66d2db43210 HEX: b00327c898fb213f HEX: bf597fc7beef0ee4 - HEX: c6e00bf33da88fc2 HEX: d5a79147930aa725 HEX: 06ca6351e003826f HEX: 142929670a0e6e70 - HEX: 27b70a8546d22ffc HEX: 2e1b21385c26c926 HEX: 4d2c6dfc5ac42aed HEX: 53380d139d95b3df - HEX: 650a73548baf63de HEX: 766a0abb3c77b2a8 HEX: 81c2c92e47edaee6 HEX: 92722c851482353b - HEX: a2bfe8a14cf10364 HEX: a81a664bbc423001 HEX: c24b8b70d0f89791 HEX: c76c51a30654be30 - HEX: d192e819d6ef5218 HEX: d69906245565a910 HEX: f40e35855771202a HEX: 106aa07032bbd1b8 - HEX: 19a4c116b8d2d0c8 HEX: 1e376c085141ab53 HEX: 2748774cdf8eeb99 HEX: 34b0bcb5e19b48a8 - HEX: 391c0cb3c5c95a63 HEX: 4ed8aa4ae3418acb HEX: 5b9cca4f7763e373 HEX: 682e6ff3d6b2b8a3 - HEX: 748f82ee5defb2fc HEX: 78a5636f43172f60 HEX: 84c87814a1f0ab72 HEX: 8cc702081a6439ec - HEX: 90befffa23631e28 HEX: a4506cebde82bde9 HEX: bef9a3f7b2c67915 HEX: c67178f2e372532b - HEX: ca273eceea26619c HEX: d186b8c721c0c207 HEX: eada7dd6cde0eb1e HEX: f57d4f7fee6ed178 - HEX: 06f067aa72176fba HEX: 0a637dc5a2c898a6 HEX: 113f9804bef90dae HEX: 1b710b35131c471b - HEX: 28db77f523047d84 HEX: 32caab7b40c72493 HEX: 3c9ebe0a15c9bebc HEX: 431d67c49c100d4c - HEX: 4cc5d4becb3e42b6 HEX: 597f299cfc657e2a HEX: 5fcb6fab3ad6faec HEX: 6c44198c4a475817 + 0x428a2f98d728ae22 0x7137449123ef65cd 0xb5c0fbcfec4d3b2f 0xe9b5dba58189dbbc + 0x3956c25bf348b538 0x59f111f1b605d019 0x923f82a4af194f9b 0xab1c5ed5da6d8118 + 0xd807aa98a3030242 0x12835b0145706fbe 0x243185be4ee4b28c 0x550c7dc3d5ffb4e2 + 0x72be5d74f27b896f 0x80deb1fe3b1696b1 0x9bdc06a725c71235 0xc19bf174cf692694 + 0xe49b69c19ef14ad2 0xefbe4786384f25e3 0x0fc19dc68b8cd5b5 0x240ca1cc77ac9c65 + 0x2de92c6f592b0275 0x4a7484aa6ea6e483 0x5cb0a9dcbd41fbd4 0x76f988da831153b5 + 0x983e5152ee66dfab 0xa831c66d2db43210 0xb00327c898fb213f 0xbf597fc7beef0ee4 + 0xc6e00bf33da88fc2 0xd5a79147930aa725 0x06ca6351e003826f 0x142929670a0e6e70 + 0x27b70a8546d22ffc 0x2e1b21385c26c926 0x4d2c6dfc5ac42aed 0x53380d139d95b3df + 0x650a73548baf63de 0x766a0abb3c77b2a8 0x81c2c92e47edaee6 0x92722c851482353b + 0xa2bfe8a14cf10364 0xa81a664bbc423001 0xc24b8b70d0f89791 0xc76c51a30654be30 + 0xd192e819d6ef5218 0xd69906245565a910 0xf40e35855771202a 0x106aa07032bbd1b8 + 0x19a4c116b8d2d0c8 0x1e376c085141ab53 0x2748774cdf8eeb99 0x34b0bcb5e19b48a8 + 0x391c0cb3c5c95a63 0x4ed8aa4ae3418acb 0x5b9cca4f7763e373 0x682e6ff3d6b2b8a3 + 0x748f82ee5defb2fc 0x78a5636f43172f60 0x84c87814a1f0ab72 0x8cc702081a6439ec + 0x90befffa23631e28 0xa4506cebde82bde9 0xbef9a3f7b2c67915 0xc67178f2e372532b + 0xca273eceea26619c 0xd186b8c721c0c207 0xeada7dd6cde0eb1e 0xf57d4f7fee6ed178 + 0x06f067aa72176fba 0x0a637dc5a2c898a6 0x113f9804bef90dae 0x1b710b35131c471b + 0x28db77f523047d84 0x32caab7b40c72493 0x3c9ebe0a15c9bebc 0x431d67c49c100d4c + 0x4cc5d4becb3e42b6 0x597f299cfc657e2a 0x5fcb6fab3ad6faec 0x6c44198c4a475817 } ALIAS: K-512 K-384 diff --git a/basis/classes/struct/struct-tests.factor b/basis/classes/struct/struct-tests.factor index 4989f24ee6..b619c5abcd 100644 --- a/basis/classes/struct/struct-tests.factor +++ b/basis/classes/struct/struct-tests.factor @@ -28,7 +28,7 @@ STRUCT: struct-test-foo { z bool } ; STRUCT: struct-test-bar - { w ushort initial: HEX: ffff } + { w ushort initial: 0xffff } { foo struct-test-foo } ; [ 12 ] [ struct-test-foo heap-size ] unit-test @@ -53,7 +53,7 @@ STRUCT: struct-test-bar [ { { "underlying" B{ 98 0 0 98 127 0 0 127 0 0 0 0 } } { { "x" char } 98 } - { { "y" int } HEX: 7F00007F } + { { "y" int } 0x7F00007F } { { "z" bool } f } } ] [ B{ 98 0 0 98 127 0 0 127 0 0 0 0 } struct-test-foo memory>struct diff --git a/basis/cocoa/application/application.factor b/basis/cocoa/application/application.factor index 9e984d5d00..e7e60e1a17 100644 --- a/basis/cocoa/application/application.factor +++ b/basis/cocoa/application/application.factor @@ -17,7 +17,7 @@ CONSTANT: NSApplicationDelegateReplyFailure 2 : NSApp ( -- app ) NSApplication -> sharedApplication ; -CONSTANT: NSAnyEventMask HEX: ffffffff +CONSTANT: NSAnyEventMask 0xffffffff FUNCTION: void NSBeep ( ) ; diff --git a/basis/cocoa/runtime/runtime.factor b/basis/cocoa/runtime/runtime.factor index c375006447..4fbfa622c3 100644 --- a/basis/cocoa/runtime/runtime.factor +++ b/basis/cocoa/runtime/runtime.factor @@ -21,15 +21,15 @@ STRUCT: objc-super { receiver id } { class Class } ; -CONSTANT: CLS_CLASS HEX: 1 -CONSTANT: CLS_META HEX: 2 -CONSTANT: CLS_INITIALIZED HEX: 4 -CONSTANT: CLS_POSING HEX: 8 -CONSTANT: CLS_MAPPED HEX: 10 -CONSTANT: CLS_FLUSH_CACHE HEX: 20 -CONSTANT: CLS_GROW_CACHE HEX: 40 -CONSTANT: CLS_NEED_BIND HEX: 80 -CONSTANT: CLS_METHOD_ARRAY HEX: 100 +CONSTANT: CLS_CLASS 0x1 +CONSTANT: CLS_META 0x2 +CONSTANT: CLS_INITIALIZED 0x4 +CONSTANT: CLS_POSING 0x8 +CONSTANT: CLS_MAPPED 0x10 +CONSTANT: CLS_FLUSH_CACHE 0x20 +CONSTANT: CLS_GROW_CACHE 0x40 +CONSTANT: CLS_NEED_BIND 0x80 +CONSTANT: CLS_METHOD_ARRAY 0x100 FUNCTION: int objc_getClassList ( void* buffer, int bufferLen ) ; diff --git a/basis/cocoa/windows/windows.factor b/basis/cocoa/windows/windows.factor index a4b1b7f210..4f18adeedf 100644 --- a/basis/cocoa/windows/windows.factor +++ b/basis/cocoa/windows/windows.factor @@ -16,7 +16,7 @@ CONSTANT: NSTexturedBackgroundWindowMask 256 CONSTANT: NSUtilityWindowMask 16 CONSTANT: NSDocModalWindowMask 64 CONSTANT: NSNonactivatingPanelMask 128 -CONSTANT: NSHUDWindowMask HEX: 1000 +CONSTANT: NSHUDWindowMask 0x1000 CONSTANT: NSBackingStoreRetained 0 CONSTANT: NSBackingStoreNonretained 1 @@ -27,7 +27,7 @@ CONSTANT: NSBackingStoreBuffered 2 -> initWithContentRect:styleMask:backing:defer: ; : class-for-style ( style -- NSWindow/NSPanel ) - HEX: 1ef0 bitand zero? NSWindow NSPanel ? ; + 0x1ef0 bitand zero? NSWindow NSPanel ? ; : ( view rect style -- window ) dup class-for-style [ swap -> setContentView: ] keep diff --git a/basis/compiler/cfg/intrinsics/simd/simd.factor b/basis/compiler/cfg/intrinsics/simd/simd.factor index 1e1d1c462a..b35efc0d97 100644 --- a/basis/compiler/cfg/intrinsics/simd/simd.factor +++ b/basis/compiler/cfg/intrinsics/simd/simd.factor @@ -22,22 +22,22 @@ IN: compiler.cfg.intrinsics.simd : sign-bit-mask ( rep -- byte-array ) signed-rep { { char-16-rep [ uchar-array{ - HEX: 80 HEX: 80 HEX: 80 HEX: 80 - HEX: 80 HEX: 80 HEX: 80 HEX: 80 - HEX: 80 HEX: 80 HEX: 80 HEX: 80 - HEX: 80 HEX: 80 HEX: 80 HEX: 80 + 0x80 0x80 0x80 0x80 + 0x80 0x80 0x80 0x80 + 0x80 0x80 0x80 0x80 + 0x80 0x80 0x80 0x80 } underlying>> ] } { short-8-rep [ ushort-array{ - HEX: 8000 HEX: 8000 HEX: 8000 HEX: 8000 - HEX: 8000 HEX: 8000 HEX: 8000 HEX: 8000 + 0x8000 0x8000 0x8000 0x8000 + 0x8000 0x8000 0x8000 0x8000 } underlying>> ] } { int-4-rep [ uint-array{ - HEX: 8000,0000 HEX: 8000,0000 - HEX: 8000,0000 HEX: 8000,0000 + 0x8000,0000 0x8000,0000 + 0x8000,0000 0x8000,0000 } underlying>> ] } { longlong-2-rep [ ulonglong-array{ - HEX: 8000,0000,0000,0000 - HEX: 8000,0000,0000,0000 + 0x8000,0000,0000,0000 + 0x8000,0000,0000,0000 } underlying>> ] } } case ; diff --git a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor index 8e63dfebc7..e2c82fb308 100644 --- a/basis/compiler/cfg/value-numbering/value-numbering-tests.factor +++ b/basis/compiler/cfg/value-numbering/value-numbering-tests.factor @@ -119,12 +119,12 @@ cpu x86.64? [ ! Boundary case [ { - T{ ##load-integer f 0 HEX: 7fffffff } + T{ ##load-integer f 0 0x7fffffff } T{ ##replace f 0 D 0 } } ] [ { - T{ ##load-integer f 0 HEX: 7fffffff } + T{ ##load-integer f 0 0x7fffffff } T{ ##replace f 0 D 0 } } value-numbering-step ] unit-test @@ -2024,7 +2024,7 @@ cell 8 = [ { T{ ##peek f 0 D 0 } T{ ##load-integer f 1 -1 } - T{ ##load-integer f 3 HEX: ffffffffffff } + T{ ##load-integer f 3 0xffffffffffff } } ] [ { diff --git a/basis/compiler/constants/constants.factor b/basis/compiler/constants/constants.factor index 7951c1ef0b..9118f804c0 100644 --- a/basis/compiler/constants/constants.factor +++ b/basis/compiler/constants/constants.factor @@ -7,7 +7,7 @@ IN: compiler.constants ! These constants must match vm/memory.h CONSTANT: card-bits 8 CONSTANT: deck-bits 18 -: card-mark ( -- n ) HEX: 40 HEX: 80 bitor ; inline +: card-mark ( -- n ) 0x40 0x80 bitor ; inline ! These constants must match vm/layouts.h : slot-offset ( slot tag -- n ) [ bootstrap-cells ] dip - ; inline diff --git a/basis/compiler/tests/codegen.factor b/basis/compiler/tests/codegen.factor index 3b4123aa28..3fe6293636 100644 --- a/basis/compiler/tests/codegen.factor +++ b/basis/compiler/tests/codegen.factor @@ -462,7 +462,7 @@ TUPLE: myseq { underlying1 byte-array read-only } { underlying2 byte-array read- ! Forgot to two-operand shifts [ 2 0 ] [ 1 1 - [ [ HEX: f bitand ] bi@ [ shift ] [ drop -3 shift ] 2bi ] compile-call + [ [ 0xf bitand ] bi@ [ shift ] [ drop -3 shift ] 2bi ] compile-call ] unit-test ! Alias analysis bug diff --git a/basis/compiler/tests/intrinsics.factor b/basis/compiler/tests/intrinsics.factor index 2ca0270c79..5166deb7ff 100644 --- a/basis/compiler/tests/intrinsics.factor +++ b/basis/compiler/tests/intrinsics.factor @@ -49,12 +49,12 @@ IN: compiler.tests.intrinsics [ CHAR: b ] [ 1 [ "abc" string-nth ] compile-call ] unit-test [ CHAR: b ] [ [ 1 "abc" string-nth ] compile-call ] unit-test -[ HEX: 123456 ] [ 0 "\u123456bc" [ string-nth ] compile-call ] unit-test -[ HEX: 123456 ] [ 0 [ "\u123456bc" string-nth ] compile-call ] unit-test -[ HEX: 123456 ] [ [ 0 "\u123456bc" string-nth ] compile-call ] unit-test -[ HEX: 123456 ] [ 1 "a\u123456c" [ string-nth ] compile-call ] unit-test -[ HEX: 123456 ] [ 1 [ "a\u123456c" string-nth ] compile-call ] unit-test -[ HEX: 123456 ] [ [ 1 "a\u123456c" string-nth ] compile-call ] unit-test +[ 0x123456 ] [ 0 "\u123456bc" [ string-nth ] compile-call ] unit-test +[ 0x123456 ] [ 0 [ "\u123456bc" string-nth ] compile-call ] unit-test +[ 0x123456 ] [ [ 0 "\u123456bc" string-nth ] compile-call ] unit-test +[ 0x123456 ] [ 1 "a\u123456c" [ string-nth ] compile-call ] unit-test +[ 0x123456 ] [ 1 [ "a\u123456c" string-nth ] compile-call ] unit-test +[ 0x123456 ] [ [ 1 "a\u123456c" string-nth ] compile-call ] unit-test [ ] [ [ 0 special-object ] compile-call drop ] unit-test [ ] [ 1 special-object [ 1 set-special-object ] compile-call ] unit-test @@ -244,9 +244,9 @@ IN: compiler.tests.intrinsics [ -4294967296 ] [ -1 [ 32 fixnum-shift ] compile-call ] unit-test [ -4294967296 ] [ -1 [ 16 fixnum-shift 16 fixnum-shift ] compile-call ] unit-test -[ HEX: 10000000 ] [ HEX: 1000000 HEX: 10 [ fixnum* ] compile-call ] unit-test -[ HEX: 8000000 ] [ HEX: -8000000 >fixnum [ 0 swap fixnum- ] compile-call ] unit-test -[ HEX: 8000000 ] [ HEX: -7ffffff >fixnum [ 1 swap fixnum- ] compile-call ] unit-test +[ 0x10000000 ] [ 0x1000000 0x10 [ fixnum* ] compile-call ] unit-test +[ 0x8000000 ] [ -0x8000000 >fixnum [ 0 swap fixnum- ] compile-call ] unit-test +[ 0x8000000 ] [ -0x7ffffff >fixnum [ 1 swap fixnum- ] compile-call ] unit-test [ t ] [ 1 26 fixnum-shift dup [ fixnum+ ] compile-call 1 27 fixnum-shift = ] unit-test [ -134217729 ] [ 1 27 shift neg >fixnum [ -1 fixnum+ ] compile-call ] unit-test @@ -263,8 +263,8 @@ IN: compiler.tests.intrinsics [ t ] [ f [ f eq? ] compile-call ] unit-test cell 8 = [ - [ HEX: 40400000 ] [ - HEX: 4200 [ HEX: 7fff fixnum-bitand 13 fixnum-shift-fast 112 23 fixnum-shift-fast fixnum+fast ] + [ 0x40400000 ] [ + 0x4200 [ 0x7fff fixnum-bitand 13 fixnum-shift-fast 112 23 fixnum-shift-fast fixnum+fast ] compile-call ] unit-test ] when @@ -479,15 +479,15 @@ ERROR: bug-in-fixnum* x y a b ; ] unit-test [ ALIEN: 123 ] [ - HEX: 123 [ ] compile-call + 0x123 [ ] compile-call ] unit-test [ ALIEN: 123 ] [ - HEX: 123 [ { fixnum } declare ] compile-call + 0x123 [ { fixnum } declare ] compile-call ] unit-test [ ALIEN: 123 ] [ - [ HEX: 123 ] compile-call + [ 0x123 ] compile-call ] unit-test [ f ] [ @@ -529,8 +529,8 @@ ERROR: bug-in-fixnum* x y a b ; [ ALIEN: 1234 ALIEN: 2234 ] [ ALIEN: 234 [ { c-ptr } declare - [ HEX: 1000 swap ] - [ HEX: 2000 swap ] bi + [ 0x1000 swap ] + [ 0x2000 swap ] bi ] compile-call ] unit-test diff --git a/basis/compiler/tree/cleanup/cleanup-tests.factor b/basis/compiler/tree/cleanup/cleanup-tests.factor index dfce70ae38..a383b347f9 100644 --- a/basis/compiler/tree/cleanup/cleanup-tests.factor +++ b/basis/compiler/tree/cleanup/cleanup-tests.factor @@ -265,12 +265,12 @@ cell-bits 32 = [ ] unit-test [ t ] [ - [ HEX: ff bitand 0 HEX: ff between? ] + [ 0xff bitand 0 0xff between? ] \ >= inlined? ] unit-test [ t ] [ - [ HEX: ff swap HEX: ff bitand >= ] + [ 0xff swap 0xff bitand >= ] \ >= inlined? ] unit-test diff --git a/basis/compression/run-length/run-length.factor b/basis/compression/run-length/run-length.factor index ce25cd6a63..deaed9e947 100644 --- a/basis/compression/run-length/run-length.factor +++ b/basis/compression/run-length/run-length.factor @@ -9,7 +9,7 @@ IN: compression.run-length 2 group [ first2 ] map B{ } concat-as ; : 8hi-lo ( byte -- hi lo ) - [ HEX: f0 bitand -4 shift ] [ HEX: f bitand ] bi ; inline + [ 0xf0 bitand -4 shift ] [ 0xf bitand ] bi ; inline :: run-length-uncompress-bitmap4 ( byte-array m n -- byte-array' ) byte-array :> sp @@ -21,7 +21,7 @@ IN: compression.run-length [ ! i j [ number>string ] bi@ " " glue . sp next dup 0 = [ - sp next dup HEX: 03 HEX: ff between? [ + sp next dup 0x03 0xff between? [ nip [ sp ] dip dup odd? [ 1 + take-n but-last ] [ take-n ] if [ j matrix i swap nth copy ] [ length j + j! ] bi @@ -53,7 +53,7 @@ IN: compression.run-length [ ! i j [ number>string ] bi@ " " glue . sp next dup 0 = [ - sp next dup HEX: 03 HEX: ff between? [ + sp next dup 0x03 0xff between? [ nip [ sp ] dip dup odd? [ 1 + take-n but-last ] [ take-n ] if [ j matrix i swap nth copy ] [ length j + j! ] bi diff --git a/basis/core-foundation/fsevents/fsevents.factor b/basis/core-foundation/fsevents/fsevents.factor index 2c7bf7e9ec..cbd2fca5e4 100644 --- a/basis/core-foundation/fsevents/fsevents.factor +++ b/basis/core-foundation/fsevents/fsevents.factor @@ -39,7 +39,7 @@ STRUCT: FSEventStreamContext CALLBACK: void FSEventStreamCallback ( FSEventStreamRef streamRef, void* clientCallBackInfo, size_t numEvents, void* eventPaths, FSEventStreamEventFlags* eventFlags, FSEventStreamEventId* eventIds ) ; -CONSTANT: FSEventStreamEventIdSinceNow HEX: FFFFFFFFFFFFFFFF +CONSTANT: FSEventStreamEventIdSinceNow 0xFFFFFFFFFFFFFFFF FUNCTION: FSEventStreamRef FSEventStreamCreate ( CFAllocatorRef allocator, diff --git a/basis/core-foundation/strings/strings-tests.factor b/basis/core-foundation/strings/strings-tests.factor index 1c52752b21..1de4623594 100644 --- a/basis/core-foundation/strings/strings-tests.factor +++ b/basis/core-foundation/strings/strings-tests.factor @@ -12,4 +12,4 @@ IN: core-foundation [ "\0" ] [ "\0" [ CF>string ] [ CFRelease ] bi ] unit-test ! This shouldn't fail -[ ] [ { HEX: 123456 } >string CFRelease ] unit-test \ No newline at end of file +[ ] [ { 0x123456 } >string CFRelease ] unit-test \ No newline at end of file diff --git a/basis/core-foundation/strings/strings.factor b/basis/core-foundation/strings/strings.factor index 75e56dff4f..56f6d1f90a 100644 --- a/basis/core-foundation/strings/strings.factor +++ b/basis/core-foundation/strings/strings.factor @@ -9,20 +9,20 @@ IN: core-foundation.strings TYPEDEF: void* CFStringRef TYPEDEF: int CFStringEncoding -CONSTANT: kCFStringEncodingMacRoman HEX: 0 -CONSTANT: kCFStringEncodingWindowsLatin1 HEX: 0500 -CONSTANT: kCFStringEncodingISOLatin1 HEX: 0201 -CONSTANT: kCFStringEncodingNextStepLatin HEX: 0B01 -CONSTANT: kCFStringEncodingASCII HEX: 0600 -CONSTANT: kCFStringEncodingUnicode HEX: 0100 -CONSTANT: kCFStringEncodingUTF8 HEX: 08000100 -CONSTANT: kCFStringEncodingNonLossyASCII HEX: 0BFF -CONSTANT: kCFStringEncodingUTF16 HEX: 0100 -CONSTANT: kCFStringEncodingUTF16BE HEX: 10000100 -CONSTANT: kCFStringEncodingUTF16LE HEX: 14000100 -CONSTANT: kCFStringEncodingUTF32 HEX: 0c000100 -CONSTANT: kCFStringEncodingUTF32BE HEX: 18000100 -CONSTANT: kCFStringEncodingUTF32LE HEX: 1c000100 +CONSTANT: kCFStringEncodingMacRoman 0x0 +CONSTANT: kCFStringEncodingWindowsLatin1 0x0500 +CONSTANT: kCFStringEncodingISOLatin1 0x0201 +CONSTANT: kCFStringEncodingNextStepLatin 0x0B01 +CONSTANT: kCFStringEncodingASCII 0x0600 +CONSTANT: kCFStringEncodingUnicode 0x0100 +CONSTANT: kCFStringEncodingUTF8 0x08000100 +CONSTANT: kCFStringEncodingNonLossyASCII 0x0BFF +CONSTANT: kCFStringEncodingUTF16 0x0100 +CONSTANT: kCFStringEncodingUTF16BE 0x10000100 +CONSTANT: kCFStringEncodingUTF16LE 0x14000100 +CONSTANT: kCFStringEncodingUTF32 0x0c000100 +CONSTANT: kCFStringEncodingUTF32BE 0x18000100 +CONSTANT: kCFStringEncodingUTF32LE 0x1c000100 FUNCTION: CFStringRef CFStringCreateWithBytes ( CFAllocatorRef alloc, @@ -65,8 +65,8 @@ FUNCTION: CFStringRef CFCopyTypeIDDescription ( CFTypeID type_id ) ; : prepare-CFString ( string -- byte-array ) [ - dup HEX: 10ffff > - [ drop HEX: fffd ] when + dup 0x10ffff > + [ drop 0xfffd ] when ] map utf8 encode ; : ( string -- alien ) diff --git a/basis/core-graphics/core-graphics.factor b/basis/core-graphics/core-graphics.factor index e64cf2ab2d..3e4a17c020 100644 --- a/basis/core-graphics/core-graphics.factor +++ b/basis/core-graphics/core-graphics.factor @@ -15,10 +15,10 @@ CONSTANT: kCGImageAlphaFirst 4 CONSTANT: kCGImageAlphaNoneSkipLast 5 CONSTANT: kCGImageAlphaNoneSkipFirst 6 -CONSTANT: kCGBitmapAlphaInfoMask HEX: 1f +CONSTANT: kCGBitmapAlphaInfoMask 0x1f CONSTANT: kCGBitmapFloatComponents 256 -CONSTANT: kCGBitmapByteOrderMask HEX: 7000 +CONSTANT: kCGBitmapByteOrderMask 0x7000 CONSTANT: kCGBitmapByteOrderDefault 0 CONSTANT: kCGBitmapByteOrder16Little 4096 CONSTANT: kCGBitmapByteOrder32Little 8192 @@ -115,7 +115,7 @@ FUNCTION: size_t CGImageGetHeight ( FUNCTION: void* CGBitmapContextGetData ( CGContextRef c ) ; -CONSTANT: kCGLRendererGenericFloatID HEX: 00020400 +CONSTANT: kCGLRendererGenericFloatID 0x00020400 FUNCTION: CGLError CGLSetParameter ( CGLContextObj ctx, CGLContextParameter pname, GLint* params ) ; diff --git a/basis/cpu/ppc/32/linux/bootstrap.factor b/basis/cpu/ppc/32/linux/bootstrap.factor index 0d75eb0100..7a4b6acd1e 100644 --- a/basis/cpu/ppc/32/linux/bootstrap.factor +++ b/basis/cpu/ppc/32/linux/bootstrap.factor @@ -19,8 +19,8 @@ CONSTANT: frame-reg 31 : nv-int-regs ( -- seq ) 13 31 [a,b] ; : LOAD32 ( r n -- ) - [ -16 shift HEX: ffff bitand LIS ] - [ [ dup ] dip HEX: ffff bitand ORI ] 2bi ; + [ -16 shift 0xffff bitand LIS ] + [ [ dup ] dip 0xffff bitand ORI ] 2bi ; : jit-trap-null ( src -- ) drop ; : jit-load-vm ( dst -- ) diff --git a/basis/cpu/ppc/64/linux/bootstrap.factor b/basis/cpu/ppc/64/linux/bootstrap.factor index 9fd9506cc0..8d2ded480d 100644 --- a/basis/cpu/ppc/64/linux/bootstrap.factor +++ b/basis/cpu/ppc/64/linux/bootstrap.factor @@ -20,11 +20,11 @@ CONSTANT: frame-reg 31 : LOAD64 ( r n -- ) [ dup ] dip { - [ nip -48 shift HEX: ffff bitand LIS ] - [ -32 shift HEX: ffff bitand ORI ] + [ nip -48 shift 0xffff bitand LIS ] + [ -32 shift 0xffff bitand ORI ] [ drop 32 SLDI ] - [ -16 shift HEX: ffff bitand ORIS ] - [ HEX: ffff bitand ORI ] + [ -16 shift 0xffff bitand ORIS ] + [ 0xffff bitand ORI ] } 3cleave ; : jit-trap-null ( src -- ) drop ; diff --git a/basis/cpu/ppc/assembler/assembler.factor b/basis/cpu/ppc/assembler/assembler.factor index 1600853af4..e4d329e99b 100644 --- a/basis/cpu/ppc/assembler/assembler.factor +++ b/basis/cpu/ppc/assembler/assembler.factor @@ -23,10 +23,10 @@ IN: cpu.ppc.assembler [ { 0 1 2 16 21 } bitfield ] dip insn ; : d-insn ( rt ra d opcode -- ) - [ HEX: ffff bitand { 0 16 21 } bitfield ] dip insn ; + [ 0xffff bitand { 0 16 21 } bitfield ] dip insn ; : ds-insn ( rt ra ds rc opcode -- ) - [ [ HEX: 3fff bitand ] dip { 0 2 16 21 } bitfield ] dip insn ; + [ [ 0x3fff bitand ] dip { 0 2 16 21 } bitfield ] dip insn ; : evx-insn ( rt ra rb xo opcode -- ) [ { 0 11 16 21 } bitfield ] dip insn ; @@ -38,12 +38,12 @@ IN: cpu.ppc.assembler [ { 0 1 6 11 16 21 } bitfield ] dip insn ; :: md-insn ( rs ra sh mb xo sh5 rc opcode -- ) - mb [ HEX: 1f bitand 1 shift ] [ -5 shift ] bi bitor :> mb + mb [ 0x1f bitand 1 shift ] [ -5 shift ] bi bitor :> mb rs ra sh mb xo sh5 rc opcode [ { 0 1 2 5 11 16 21 } bitfield ] dip insn ; :: mds-insn ( rs ra rb mb xo rc opcode -- ) - mb [ HEX: 1f bitand 1 shift ] [ -5 shift ] bi bitor :> mb + mb [ 0x1f bitand 1 shift ] [ -5 shift ] bi bitor :> mb rs ra rb mb xo rc opcode [ { 0 1 5 11 16 21 } bitfield ] dip insn ; @@ -78,32 +78,32 @@ IN: cpu.ppc.assembler [ { 0 1 2 11 16 21 } bitfield ] dip insn ; :: xx1-insn ( rt ra rb xo opcode -- ) - rt HEX: 1f bitand ra rb xo rt -5 shift + rt 0x1f bitand ra rb xo rt -5 shift { 0 1 11 16 21 } bitfield opcode insn ; :: xx2-insn ( rt ra rb xo opcode -- ) - rt HEX: 1f bitand ra rb HEX: 1f bitand xo + rt 0x1f bitand ra rb 0x1f bitand xo rb -5 shift rt -5 shift { 0 1 2 11 16 21 } bitfield opcode insn ; :: xx3-insn ( rt ra rb xo opcode -- ) - rt HEX: 1f bitand ra HEX: 1f bitand rb HEX: 1f bitand + rt 0x1f bitand ra 0x1f bitand rb 0x1f bitand xo ra -5 shift rb -5 shift rt -5 shift { 0 1 2 3 11 16 21 } bitfield opcode insn ; :: xx3-rc-insn ( rt ra rb rc xo opcode -- ) - rt HEX: 1f bitand ra HEX: 1f bitand rb HEX: 1f bitand + rt 0x1f bitand ra 0x1f bitand rb 0x1f bitand rc xo ra -5 shift rb -5 shift rt -5 shift { 0 1 2 3 10 11 16 21 } bitfield opcode insn ; :: xx3-rc-dm-insn ( rt ra rb rc dm xo opcode -- ) - rt HEX: 1f bitand ra HEX: 1f bitand rb HEX: 1f bitand + rt 0x1f bitand ra 0x1f bitand rb 0x1f bitand rc dm xo ra -5 shift rb -5 shift rt -5 shift { 0 1 2 3 8 10 11 16 21 } bitfield opcode insn ; :: xx4-insn ( rt ra rb rc xo opcode -- ) - rt HEX: 1f bitand ra HEX: 1f bitand rb HEX: 1f bitand - rc HEX: 1f bitand xo rc -5 shift ra -5 shift rb + rt 0x1f bitand ra 0x1f bitand rb 0x1f bitand + rc 0x1f bitand xo rc -5 shift ra -5 shift rb -5 shift rt -5 shift { 0 1 2 3 4 6 11 16 21 } bitfield opcode insn ; @@ -388,32 +388,32 @@ M: integer BC ( bo bi target_addr -- ) -2 shift 0 0 16 b-insn ; ! 3.3.13.1 64-bit Fixed-Point Rotate Instructions : RLDICL ( ra rs sh mb -- ) - [ swap ] 2dip over [ HEX: 1f bitand ] [ ] [ -5 shift ] + [ swap ] 2dip over [ 0x1f bitand ] [ ] [ -5 shift ] tri* 0 swap 0 30 md-insn ; : RLDICL. ( ra rs sh mb -- ) - [ swap ] 2dip over [ HEX: 1f bitand ] [ ] [ -5 shift ] + [ swap ] 2dip over [ 0x1f bitand ] [ ] [ -5 shift ] tri* 0 swap 1 30 md-insn ; : RLDICR ( ra rs sh me -- ) - [ swap ] 2dip over [ HEX: 1f bitand ] [ ] [ -5 shift ] + [ swap ] 2dip over [ 0x1f bitand ] [ ] [ -5 shift ] tri* 1 swap 0 30 md-insn ; : RLDICR. ( ra rs sh me -- ) - [ swap ] 2dip over [ HEX: 1f bitand ] [ ] [ -5 shift ] + [ swap ] 2dip over [ 0x1f bitand ] [ ] [ -5 shift ] tri* 1 swap 1 30 md-insn ; : RLDIC ( ra rs sh mb -- ) - [ swap ] 2dip over [ HEX: 1f bitand ] [ ] [ -5 shift ] + [ swap ] 2dip over [ 0x1f bitand ] [ ] [ -5 shift ] tri* 2 swap 0 30 md-insn ; : RLDIC. ( ra rs sh mb -- ) - [ swap ] 2dip over [ HEX: 1f bitand ] [ ] [ -5 shift ] + [ swap ] 2dip over [ 0x1f bitand ] [ ] [ -5 shift ] tri* 2 swap 1 30 md-insn ; : RLDCL ( ra rs rb mb -- ) [ swap ] 2dip 8 0 30 mds-insn ; : RLDCL. ( ra rs rb mb -- ) [ swap ] 2dip 8 1 30 mds-insn ; : RLDCR ( ra rs rb me -- ) [ swap ] 2dip 9 0 30 mds-insn ; : RLDCR. ( ra rs rb me -- ) [ swap ] 2dip 9 1 30 mds-insn ; : RLDIMI ( ra rs sh mb -- ) - [ swap ] 2dip over [ HEX: 1f bitand ] [ ] [ -5 shift ] + [ swap ] 2dip over [ 0x1f bitand ] [ ] [ -5 shift ] tri* 3 swap 0 30 md-insn ; : RLDIMI. ( ra rs sh mb -- ) - [ swap ] 2dip over [ HEX: 1f bitand ] [ ] [ -5 shift ] + [ swap ] 2dip over [ 0x1f bitand ] [ ] [ -5 shift ] tri* 3 swap 1 30 md-insn ; ! 3.3.13.2 Fixed-Point Shift Instructions @@ -434,10 +434,10 @@ M: integer BC ( bo bi target_addr -- ) -2 shift 0 0 16 b-insn ; : SRAD ( ra rs rb -- ) [ swap ] dip 794 0 31 x-insn ; : SRAD. ( ra rs rb -- ) [ swap ] dip 794 1 31 x-insn ; : SRADI ( ra rs sh -- ) - [ swap ] dip [ HEX: 1f bitand ] [ -5 shift ] bi + [ swap ] dip [ 0x1f bitand ] [ -5 shift ] bi 413 swap 0 31 xs-insn ; : SRADI. ( ra rs sh -- ) - [ swap ] dip [ HEX: 1f bitand ] [ -5 shift ] bi + [ swap ] dip [ 0x1f bitand ] [ -5 shift ] bi 413 swap 1 31 xs-insn ; ! 3.3.14 BCD Assist Instructions @@ -448,12 +448,12 @@ M: integer BC ( bo bi target_addr -- ) -2 shift 0 0 16 b-insn ; ! 3.3.15 Move To/From System Register Instructions : MTSPR ( spr rs -- ) swap 467 0 31 xfx-insn ; : MFSPR ( rt spr -- ) 339 0 31 xfx-insn ; -: MTCRF ( fxm rs -- ) swap HEX: ff bitand 1 shift 144 0 31 xfx-insn ; +: MTCRF ( fxm rs -- ) swap 0xff bitand 1 shift 144 0 31 xfx-insn ; : MFCR ( rt -- ) 0 19 0 31 xfx-insn ; ! 3.3.15.1 Move To/From One Condition Register Field Instructions -: MTOCRF ( fxm rs -- ) swap HEX: 100 bitor 1 shift 144 0 31 xfx-insn ; -: MFOCRF ( rt fxm -- ) HEX: 100 bitor 1 shift 19 0 31 xfx-insn ; +: MTOCRF ( fxm rs -- ) swap 0x100 bitor 1 shift 144 0 31 xfx-insn ; +: MFOCRF ( rt fxm -- ) 0x100 bitor 1 shift 19 0 31 xfx-insn ; ! 3.3.15.2 Move To/From System Registers (Category: Embedded) : MCRXR ( bf -- ) 2 shift 0 0 512 0 31 x-insn ; @@ -1426,62 +1426,62 @@ tri* 134 1 63 x-insn ; : NMACHLWSO. ( rt ra rb -- ) 1 494 1 4 xo-insn ; deprecated ! E.2.2 Simple Branch Mnemonics -: BLR ( -- ) HEX: 14 0 0 BCLR ; -: BCTR ( -- ) HEX: 14 0 0 BCCTR ; -: BLRL ( -- ) HEX: 14 0 0 BCLRL ; -: BCTRL ( -- ) HEX: 14 0 0 BCCTRL ; -: BT ( bi target_addr -- ) [ HEX: C ] 2dip BC ; -: BTA ( bi target_addr -- ) [ HEX: C ] 2dip BCA ; -: BTLR ( bi target_addr -- ) [ HEX: C ] 2dip BCLR ; -: BTCTR ( bi target_addr -- ) [ HEX: C ] 2dip BCCTR ; -: BTL ( bi target_addr -- ) [ HEX: C ] 2dip BCL ; -: BTLA ( bi target_addr -- ) [ HEX: C ] 2dip BCLA ; -: BTLRL ( bi target_addr -- ) [ HEX: C ] 2dip BCLRL ; -: BTCTRL ( bi target_addr -- ) [ HEX: C ] 2dip BCCTRL ; -: BF ( bi target_addr -- ) [ HEX: 4 ] 2dip BC ; -: BFA ( bi target_addr -- ) [ HEX: 4 ] 2dip BCA ; -: BFLR ( bi target_addr -- ) [ HEX: 4 ] 2dip BCLR ; -: BFCTR ( bi target_addr -- ) [ HEX: 4 ] 2dip BCCTR ; -: BFL ( bi target_addr -- ) [ HEX: 4 ] 2dip BCL ; -: BFLA ( bi target_addr -- ) [ HEX: 4 ] 2dip BCLA ; -: BFLRL ( bi target_addr -- ) [ HEX: 4 ] 2dip BCLRL ; -: BFCTRL ( bi target_addr -- ) [ HEX: 4 ] 2dip BCCTRL ; -: BDNZ ( target_addr -- ) [ HEX: 10 0 ] dip BC ; -: BDNZA ( target_addr -- ) [ HEX: 10 0 ] dip BCA ; -: BDNZLR ( target_addr -- ) [ HEX: 10 0 ] dip BCLR ; -: BDNZL ( target_addr -- ) [ HEX: 10 0 ] dip BCL ; -: BDNZLA ( target_addr -- ) [ HEX: 10 0 ] dip BCLA ; -: BDNZLRL ( target_addr -- ) [ HEX: 10 0 ] dip BCLRL ; -: BDNZT ( bi target_addr -- ) [ HEX: 8 ] 2dip BC ; -: BDNZTA ( bi target_addr -- ) [ HEX: 8 ] 2dip BCA ; -: BDNZTLR ( bi target_addr -- ) [ HEX: 8 ] 2dip BCLR ; -: BDNZTL ( bi target_addr -- ) [ HEX: 8 ] 2dip BCL ; -: BDNZTLA ( bi target_addr -- ) [ HEX: 8 ] 2dip BCLA ; -: BDNZTLRL ( bi target_addr -- ) [ HEX: 8 ] 2dip BCLRL ; -: BDNZF ( bi target_addr -- ) [ HEX: 0 ] 2dip BC ; -: BDNZFA ( bi target_addr -- ) [ HEX: 0 ] 2dip BCA ; -: BDNZFLR ( bi target_addr -- ) [ HEX: 0 ] 2dip BCLR ; -: BDNZFL ( bi target_addr -- ) [ HEX: 0 ] 2dip BCL ; -: BDNZFLA ( bi target_addr -- ) [ HEX: 0 ] 2dip BCLA ; -: BDNZFLRL ( bi target_addr -- ) [ HEX: 0 ] 2dip BCLRL ; -: BDZ ( target_addr -- ) [ HEX: 12 0 ] dip BC ; -: BDZA ( target_addr -- ) [ HEX: 12 0 ] dip BCA ; -: BDZLR ( target_addr -- ) [ HEX: 12 0 ] dip BCLR ; -: BDZL ( target_addr -- ) [ HEX: 12 0 ] dip BCL ; -: BDZLA ( target_addr -- ) [ HEX: 12 0 ] dip BCLA ; -: BDZLRL ( target_addr -- ) [ HEX: 12 0 ] dip BCLRL ; -: BDZT ( bi target_addr -- ) [ HEX: A ] 2dip BC ; -: BDZTA ( bi target_addr -- ) [ HEX: A ] 2dip BCA ; -: BDZTLR ( bi target_addr -- ) [ HEX: A ] 2dip BCLR ; -: BDZTL ( bi target_addr -- ) [ HEX: A ] 2dip BCL ; -: BDZTLA ( bi target_addr -- ) [ HEX: A ] 2dip BCLA ; -: BDZTLRL ( bi target_addr -- ) [ HEX: A ] 2dip BCLRL ; -: BDZF ( bi target_addr -- ) [ HEX: 2 ] 2dip BC ; -: BDZFA ( bi target_addr -- ) [ HEX: 2 ] 2dip BCA ; -: BDZFLR ( bi target_addr -- ) [ HEX: 2 ] 2dip BCLR ; -: BDZFL ( bi target_addr -- ) [ HEX: 2 ] 2dip BCL ; -: BDZFLA ( bi target_addr -- ) [ HEX: 2 ] 2dip BCLA ; -: BDZFLRL ( bi target_addr -- ) [ HEX: 2 ] 2dip BCLRL ; +: BLR ( -- ) 0x14 0 0 BCLR ; +: BCTR ( -- ) 0x14 0 0 BCCTR ; +: BLRL ( -- ) 0x14 0 0 BCLRL ; +: BCTRL ( -- ) 0x14 0 0 BCCTRL ; +: BT ( bi target_addr -- ) [ 0xC ] 2dip BC ; +: BTA ( bi target_addr -- ) [ 0xC ] 2dip BCA ; +: BTLR ( bi target_addr -- ) [ 0xC ] 2dip BCLR ; +: BTCTR ( bi target_addr -- ) [ 0xC ] 2dip BCCTR ; +: BTL ( bi target_addr -- ) [ 0xC ] 2dip BCL ; +: BTLA ( bi target_addr -- ) [ 0xC ] 2dip BCLA ; +: BTLRL ( bi target_addr -- ) [ 0xC ] 2dip BCLRL ; +: BTCTRL ( bi target_addr -- ) [ 0xC ] 2dip BCCTRL ; +: BF ( bi target_addr -- ) [ 0x4 ] 2dip BC ; +: BFA ( bi target_addr -- ) [ 0x4 ] 2dip BCA ; +: BFLR ( bi target_addr -- ) [ 0x4 ] 2dip BCLR ; +: BFCTR ( bi target_addr -- ) [ 0x4 ] 2dip BCCTR ; +: BFL ( bi target_addr -- ) [ 0x4 ] 2dip BCL ; +: BFLA ( bi target_addr -- ) [ 0x4 ] 2dip BCLA ; +: BFLRL ( bi target_addr -- ) [ 0x4 ] 2dip BCLRL ; +: BFCTRL ( bi target_addr -- ) [ 0x4 ] 2dip BCCTRL ; +: BDNZ ( target_addr -- ) [ 0x10 0 ] dip BC ; +: BDNZA ( target_addr -- ) [ 0x10 0 ] dip BCA ; +: BDNZLR ( target_addr -- ) [ 0x10 0 ] dip BCLR ; +: BDNZL ( target_addr -- ) [ 0x10 0 ] dip BCL ; +: BDNZLA ( target_addr -- ) [ 0x10 0 ] dip BCLA ; +: BDNZLRL ( target_addr -- ) [ 0x10 0 ] dip BCLRL ; +: BDNZT ( bi target_addr -- ) [ 0x8 ] 2dip BC ; +: BDNZTA ( bi target_addr -- ) [ 0x8 ] 2dip BCA ; +: BDNZTLR ( bi target_addr -- ) [ 0x8 ] 2dip BCLR ; +: BDNZTL ( bi target_addr -- ) [ 0x8 ] 2dip BCL ; +: BDNZTLA ( bi target_addr -- ) [ 0x8 ] 2dip BCLA ; +: BDNZTLRL ( bi target_addr -- ) [ 0x8 ] 2dip BCLRL ; +: BDNZF ( bi target_addr -- ) [ 0x0 ] 2dip BC ; +: BDNZFA ( bi target_addr -- ) [ 0x0 ] 2dip BCA ; +: BDNZFLR ( bi target_addr -- ) [ 0x0 ] 2dip BCLR ; +: BDNZFL ( bi target_addr -- ) [ 0x0 ] 2dip BCL ; +: BDNZFLA ( bi target_addr -- ) [ 0x0 ] 2dip BCLA ; +: BDNZFLRL ( bi target_addr -- ) [ 0x0 ] 2dip BCLRL ; +: BDZ ( target_addr -- ) [ 0x12 0 ] dip BC ; +: BDZA ( target_addr -- ) [ 0x12 0 ] dip BCA ; +: BDZLR ( target_addr -- ) [ 0x12 0 ] dip BCLR ; +: BDZL ( target_addr -- ) [ 0x12 0 ] dip BCL ; +: BDZLA ( target_addr -- ) [ 0x12 0 ] dip BCLA ; +: BDZLRL ( target_addr -- ) [ 0x12 0 ] dip BCLRL ; +: BDZT ( bi target_addr -- ) [ 0xA ] 2dip BC ; +: BDZTA ( bi target_addr -- ) [ 0xA ] 2dip BCA ; +: BDZTLR ( bi target_addr -- ) [ 0xA ] 2dip BCLR ; +: BDZTL ( bi target_addr -- ) [ 0xA ] 2dip BCL ; +: BDZTLA ( bi target_addr -- ) [ 0xA ] 2dip BCLA ; +: BDZTLRL ( bi target_addr -- ) [ 0xA ] 2dip BCLRL ; +: BDZF ( bi target_addr -- ) [ 0x2 ] 2dip BC ; +: BDZFA ( bi target_addr -- ) [ 0x2 ] 2dip BCA ; +: BDZFLR ( bi target_addr -- ) [ 0x2 ] 2dip BCLR ; +: BDZFL ( bi target_addr -- ) [ 0x2 ] 2dip BCL ; +: BDZFLA ( bi target_addr -- ) [ 0x2 ] 2dip BCLA ; +: BDZFLRL ( bi target_addr -- ) [ 0x2 ] 2dip BCLRL ; ! E.2.3 Branch Mnemonics Incorporating Conditions : BLT ( cr target_addr -- ) [ 4 * 0 + ] dip [ 12 ] 2dip BC ; @@ -1582,62 +1582,62 @@ tri* 134 1 63 x-insn ; : BGECTRL ( cr target_addr -- ) BNLCTRL ; ! E.2.4 Branch Prediction -: BT+ ( bi target_addr -- ) [ HEX: F ] 2dip BC ; -: BTA+ ( bi target_addr -- ) [ HEX: F ] 2dip BCA ; -: BTLR+ ( bi target_addr -- ) [ HEX: F ] 2dip BCLR ; -: BTCTR+ ( bi target_addr -- ) [ HEX: F ] 2dip BCCTR ; -: BTL+ ( bi target_addr -- ) [ HEX: F ] 2dip BCL ; -: BTLA+ ( bi target_addr -- ) [ HEX: F ] 2dip BCLA ; -: BTLRL+ ( bi target_addr -- ) [ HEX: F ] 2dip BCLRL ; -: BTCTRL+ ( bi target_addr -- ) [ HEX: F ] 2dip BCCTRL ; -: BF+ ( bi target_addr -- ) [ HEX: 7 ] 2dip BC ; -: BFA+ ( bi target_addr -- ) [ HEX: 7 ] 2dip BCA ; -: BFLR+ ( bi target_addr -- ) [ HEX: 7 ] 2dip BCLR ; -: BFCTR+ ( bi target_addr -- ) [ HEX: 7 ] 2dip BCCTR ; -: BFL+ ( bi target_addr -- ) [ HEX: 7 ] 2dip BCL ; -: BFLA+ ( bi target_addr -- ) [ HEX: 7 ] 2dip BCLA ; -: BFLRL+ ( bi target_addr -- ) [ HEX: 7 ] 2dip BCLRL ; -: BFCTRL+ ( bi target_addr -- ) [ HEX: 7 ] 2dip BCCTRL ; -: BDNZ+ ( target_addr -- ) [ HEX: 19 0 ] dip BC ; -: BDNZA+ ( target_addr -- ) [ HEX: 19 0 ] dip BCA ; -: BDNZLR+ ( target_addr -- ) [ HEX: 19 0 ] dip BCLR ; -: BDNZL+ ( target_addr -- ) [ HEX: 19 0 ] dip BCL ; -: BDNZLA+ ( target_addr -- ) [ HEX: 19 0 ] dip BCLA ; -: BDNZLRL+ ( target_addr -- ) [ HEX: 19 0 ] dip BCLRL ; -: BDZ+ ( target_addr -- ) [ HEX: 1B 0 ] dip BC ; -: BDZA+ ( target_addr -- ) [ HEX: 1B 0 ] dip BCA ; -: BDZLR+ ( target_addr -- ) [ HEX: 1B 0 ] dip BCLR ; -: BDZL+ ( target_addr -- ) [ HEX: 1B 0 ] dip BCL ; -: BDZLA+ ( target_addr -- ) [ HEX: 1B 0 ] dip BCLA ; -: BDZLRL+ ( target_addr -- ) [ HEX: 1B 0 ] dip BCLRL ; -: BT- ( bi target_addr -- ) [ HEX: E ] 2dip BC ; -: BTA- ( bi target_addr -- ) [ HEX: E ] 2dip BCA ; -: BTLR- ( bi target_addr -- ) [ HEX: E ] 2dip BCLR ; -: BTCTR- ( bi target_addr -- ) [ HEX: E ] 2dip BCCTR ; -: BTL- ( bi target_addr -- ) [ HEX: E ] 2dip BCL ; -: BTLA- ( bi target_addr -- ) [ HEX: E ] 2dip BCLA ; -: BTLRL- ( bi target_addr -- ) [ HEX: E ] 2dip BCLRL ; -: BTCTRL- ( bi target_addr -- ) [ HEX: E ] 2dip BCCTRL ; -: BF- ( bi target_addr -- ) [ HEX: 6 ] 2dip BC ; -: BFA- ( bi target_addr -- ) [ HEX: 6 ] 2dip BCA ; -: BFLR- ( bi target_addr -- ) [ HEX: 6 ] 2dip BCLR ; -: BFCTR- ( bi target_addr -- ) [ HEX: 6 ] 2dip BCCTR ; -: BFL- ( bi target_addr -- ) [ HEX: 6 ] 2dip BCL ; -: BFLA- ( bi target_addr -- ) [ HEX: 6 ] 2dip BCLA ; -: BFLRL- ( bi target_addr -- ) [ HEX: 6 ] 2dip BCLRL ; -: BFCTRL- ( bi target_addr -- ) [ HEX: 6 ] 2dip BCCTRL ; -: BDNZ- ( target_addr -- ) [ HEX: 18 0 ] dip BC ; -: BDNZA- ( target_addr -- ) [ HEX: 18 0 ] dip BCA ; -: BDNZLR- ( target_addr -- ) [ HEX: 18 0 ] dip BCLR ; -: BDNZL- ( target_addr -- ) [ HEX: 18 0 ] dip BCL ; -: BDNZLA- ( target_addr -- ) [ HEX: 18 0 ] dip BCLA ; -: BDNZLRL- ( target_addr -- ) [ HEX: 18 0 ] dip BCLRL ; -: BDZ- ( target_addr -- ) [ HEX: 1A 0 ] dip BC ; -: BDZA- ( target_addr -- ) [ HEX: 1A 0 ] dip BCA ; -: BDZLR- ( target_addr -- ) [ HEX: 1A 0 ] dip BCLR ; -: BDZL- ( target_addr -- ) [ HEX: 1A 0 ] dip BCL ; -: BDZLA- ( target_addr -- ) [ HEX: 1A 0 ] dip BCLA ; -: BDZLRL- ( target_addr -- ) [ HEX: 1A 0 ] dip BCLRL ; +: BT+ ( bi target_addr -- ) [ 0xF ] 2dip BC ; +: BTA+ ( bi target_addr -- ) [ 0xF ] 2dip BCA ; +: BTLR+ ( bi target_addr -- ) [ 0xF ] 2dip BCLR ; +: BTCTR+ ( bi target_addr -- ) [ 0xF ] 2dip BCCTR ; +: BTL+ ( bi target_addr -- ) [ 0xF ] 2dip BCL ; +: BTLA+ ( bi target_addr -- ) [ 0xF ] 2dip BCLA ; +: BTLRL+ ( bi target_addr -- ) [ 0xF ] 2dip BCLRL ; +: BTCTRL+ ( bi target_addr -- ) [ 0xF ] 2dip BCCTRL ; +: BF+ ( bi target_addr -- ) [ 0x7 ] 2dip BC ; +: BFA+ ( bi target_addr -- ) [ 0x7 ] 2dip BCA ; +: BFLR+ ( bi target_addr -- ) [ 0x7 ] 2dip BCLR ; +: BFCTR+ ( bi target_addr -- ) [ 0x7 ] 2dip BCCTR ; +: BFL+ ( bi target_addr -- ) [ 0x7 ] 2dip BCL ; +: BFLA+ ( bi target_addr -- ) [ 0x7 ] 2dip BCLA ; +: BFLRL+ ( bi target_addr -- ) [ 0x7 ] 2dip BCLRL ; +: BFCTRL+ ( bi target_addr -- ) [ 0x7 ] 2dip BCCTRL ; +: BDNZ+ ( target_addr -- ) [ 0x19 0 ] dip BC ; +: BDNZA+ ( target_addr -- ) [ 0x19 0 ] dip BCA ; +: BDNZLR+ ( target_addr -- ) [ 0x19 0 ] dip BCLR ; +: BDNZL+ ( target_addr -- ) [ 0x19 0 ] dip BCL ; +: BDNZLA+ ( target_addr -- ) [ 0x19 0 ] dip BCLA ; +: BDNZLRL+ ( target_addr -- ) [ 0x19 0 ] dip BCLRL ; +: BDZ+ ( target_addr -- ) [ 0x1B 0 ] dip BC ; +: BDZA+ ( target_addr -- ) [ 0x1B 0 ] dip BCA ; +: BDZLR+ ( target_addr -- ) [ 0x1B 0 ] dip BCLR ; +: BDZL+ ( target_addr -- ) [ 0x1B 0 ] dip BCL ; +: BDZLA+ ( target_addr -- ) [ 0x1B 0 ] dip BCLA ; +: BDZLRL+ ( target_addr -- ) [ 0x1B 0 ] dip BCLRL ; +: BT- ( bi target_addr -- ) [ 0xE ] 2dip BC ; +: BTA- ( bi target_addr -- ) [ 0xE ] 2dip BCA ; +: BTLR- ( bi target_addr -- ) [ 0xE ] 2dip BCLR ; +: BTCTR- ( bi target_addr -- ) [ 0xE ] 2dip BCCTR ; +: BTL- ( bi target_addr -- ) [ 0xE ] 2dip BCL ; +: BTLA- ( bi target_addr -- ) [ 0xE ] 2dip BCLA ; +: BTLRL- ( bi target_addr -- ) [ 0xE ] 2dip BCLRL ; +: BTCTRL- ( bi target_addr -- ) [ 0xE ] 2dip BCCTRL ; +: BF- ( bi target_addr -- ) [ 0x6 ] 2dip BC ; +: BFA- ( bi target_addr -- ) [ 0x6 ] 2dip BCA ; +: BFLR- ( bi target_addr -- ) [ 0x6 ] 2dip BCLR ; +: BFCTR- ( bi target_addr -- ) [ 0x6 ] 2dip BCCTR ; +: BFL- ( bi target_addr -- ) [ 0x6 ] 2dip BCL ; +: BFLA- ( bi target_addr -- ) [ 0x6 ] 2dip BCLA ; +: BFLRL- ( bi target_addr -- ) [ 0x6 ] 2dip BCLRL ; +: BFCTRL- ( bi target_addr -- ) [ 0x6 ] 2dip BCCTRL ; +: BDNZ- ( target_addr -- ) [ 0x18 0 ] dip BC ; +: BDNZA- ( target_addr -- ) [ 0x18 0 ] dip BCA ; +: BDNZLR- ( target_addr -- ) [ 0x18 0 ] dip BCLR ; +: BDNZL- ( target_addr -- ) [ 0x18 0 ] dip BCL ; +: BDNZLA- ( target_addr -- ) [ 0x18 0 ] dip BCLA ; +: BDNZLRL- ( target_addr -- ) [ 0x18 0 ] dip BCLRL ; +: BDZ- ( target_addr -- ) [ 0x1A 0 ] dip BC ; +: BDZA- ( target_addr -- ) [ 0x1A 0 ] dip BCA ; +: BDZLR- ( target_addr -- ) [ 0x1A 0 ] dip BCLR ; +: BDZL- ( target_addr -- ) [ 0x1A 0 ] dip BCL ; +: BDZLA- ( target_addr -- ) [ 0x1A 0 ] dip BCLA ; +: BDZLRL- ( target_addr -- ) [ 0x1A 0 ] dip BCLRL ; : BLT+ ( cr target_addr -- ) [ 4 * 0 + ] dip [ 15 ] 2dip BC ; : BLTA+ ( cr target_addr -- ) [ 4 * 0 + ] dip [ 15 ] 2dip BCA ; : BLTLR+ ( cr target_addr -- ) [ 4 * 0 + ] dip [ 15 ] 2dip BCLR ; @@ -2002,4 +2002,4 @@ tri* 134 1 63 x-insn ; : MR. ( dst src -- ) dup OR. ; : NOT ( dst src -- ) dup NOR ; : NOT. ( dst src -- ) dup NOR. ; -: MTCR ( rx -- ) HEX: ff swap MTCRF ; deprecated +: MTCR ( rx -- ) 0xff swap MTCRF ; deprecated diff --git a/basis/cpu/ppc/ppc.factor b/basis/cpu/ppc/ppc.factor index 9111dbea92..8a82728eb2 100644 --- a/basis/cpu/ppc/ppc.factor +++ b/basis/cpu/ppc/ppc.factor @@ -79,16 +79,16 @@ M: ppc gc-root-offset ( spill-slot -- n ) n>> spill@ cell /i ; : LOAD32 ( r n -- ) - [ -16 shift HEX: ffff bitand LIS ] - [ [ dup ] dip HEX: ffff bitand ORI ] 2bi ; + [ -16 shift 0xffff bitand LIS ] + [ [ dup ] dip 0xffff bitand ORI ] 2bi ; : LOAD64 ( r n -- ) [ dup ] dip { - [ nip -48 shift HEX: ffff bitand LIS ] - [ -32 shift HEX: ffff bitand ORI ] + [ nip -48 shift 0xffff bitand LIS ] + [ -32 shift 0xffff bitand ORI ] [ drop 32 SLDI ] - [ -16 shift HEX: ffff bitand ORIS ] - [ HEX: ffff bitand ORI ] + [ -16 shift 0xffff bitand ORIS ] + [ 0xffff bitand ORI ] } 3cleave ; HOOK: %clear-tag-bits cpu ( dst src -- ) @@ -138,9 +138,9 @@ M: ppc.32 %load-cell-imm-rc rc-absolute-ppc-2/2 ; M: ppc.64 %load-cell-imm-rc rc-absolute-ppc-2/2/2/2 ; M: ppc.32 %load-immediate ( reg val -- ) - dup HEX: -8000 HEX: 7fff between? [ LI ] [ LOAD32 ] if ; + dup -0x8000 0x7fff between? [ LI ] [ LOAD32 ] if ; M: ppc.64 %load-immediate ( reg val -- ) - dup HEX: -8000 HEX: 7fff between? [ LI ] [ LOAD64 ] if ; + dup -0x8000 0x7fff between? [ LI ] [ LOAD64 ] if ; M: ppc %load-reference ( reg obj -- ) [ [ 0 %load-cell-imm ] [ %load-cell-imm-rc rel-literal ] bi* ] diff --git a/basis/cpu/x86/32/32.factor b/basis/cpu/x86/32/32.factor index 019b1875fe..f1da80f3f5 100755 --- a/basis/cpu/x86/32/32.factor +++ b/basis/cpu/x86/32/32.factor @@ -46,13 +46,13 @@ M: x86.32 %vm-field-ptr ( dst field -- ) [ 0 MOV ] dip rc-absolute-cell rel-vm ; M: x86.32 %mark-card - drop HEX: ffffffff [+] card-mark MOV + drop 0xffffffff [+] card-mark MOV building get pop rc-absolute-cell rel-cards-offset building get push ; M: x86.32 %mark-deck - drop HEX: ffffffff [+] card-mark MOV + drop 0xffffffff [+] card-mark MOV building get pop rc-absolute-cell rel-decks-offset building get push ; diff --git a/basis/cpu/x86/32/bootstrap.factor b/basis/cpu/x86/32/bootstrap.factor index 23b05548b0..a3edd70ffb 100755 --- a/basis/cpu/x86/32/bootstrap.factor +++ b/basis/cpu/x86/32/bootstrap.factor @@ -217,7 +217,7 @@ IN: bootstrap.x86 \ lazy-jit-compile define-combinator-primitive [ - temp1 HEX: ffffffff CMP f rc-absolute-cell rel-literal + temp1 0xffffffff CMP f rc-absolute-cell rel-literal ] pic-check-tuple jit-define ! Inline cache miss entry points diff --git a/basis/cpu/x86/64/bootstrap.factor b/basis/cpu/x86/64/bootstrap.factor index e299dbf348..8ed80af2c6 100755 --- a/basis/cpu/x86/64/bootstrap.factor +++ b/basis/cpu/x86/64/bootstrap.factor @@ -193,7 +193,7 @@ IN: bootstrap.x86 \ lazy-jit-compile define-combinator-primitive [ - temp2 HEX: ffffffff MOV f rc-absolute-cell rel-literal + temp2 0xffffffff MOV f rc-absolute-cell rel-literal temp1 temp2 CMP ] pic-check-tuple jit-define diff --git a/basis/cpu/x86/assembler/assembler-tests.factor b/basis/cpu/x86/assembler/assembler-tests.factor index eee964197a..072c7d4506 100644 --- a/basis/cpu/x86/assembler/assembler-tests.factor +++ b/basis/cpu/x86/assembler/assembler-tests.factor @@ -13,279 +13,279 @@ IN: cpu.x86.assembler.tests ! immediate operands cell 4 = [ - [ { HEX: b9 HEX: 01 HEX: 00 HEX: 00 HEX: 00 } ] [ [ ECX 1 MOV ] { } make ] unit-test + [ { 0xb9 0x01 0x00 0x00 0x00 } ] [ [ ECX 1 MOV ] { } make ] unit-test ] [ - [ { HEX: b9 HEX: 01 HEX: 00 HEX: 00 HEX: 00 HEX: 00 HEX: 00 HEX: 00 HEX: 00 } ] [ [ ECX 1 MOV ] { } make ] unit-test + [ { 0xb9 0x01 0x00 0x00 0x00 0x00 0x00 0x00 0x00 } ] [ [ ECX 1 MOV ] { } make ] unit-test ] if -[ { HEX: 83 HEX: c1 HEX: 01 } ] [ [ ECX 1 ADD ] { } make ] unit-test -[ { HEX: 81 HEX: c1 HEX: 96 HEX: 00 HEX: 00 HEX: 00 } ] [ [ ECX 150 ADD ] { } make ] unit-test -[ { HEX: f7 HEX: c1 HEX: d2 HEX: 04 HEX: 00 HEX: 00 } ] [ [ ECX 1234 TEST ] { } make ] unit-test +[ { 0x83 0xc1 0x01 } ] [ [ ECX 1 ADD ] { } make ] unit-test +[ { 0x81 0xc1 0x96 0x00 0x00 0x00 } ] [ [ ECX 150 ADD ] { } make ] unit-test +[ { 0xf7 0xc1 0xd2 0x04 0x00 0x00 } ] [ [ ECX 1234 TEST ] { } make ] unit-test ! 64-bit registers -[ { HEX: 40 HEX: 8a HEX: 2a } ] [ [ BPL RDX [] MOV ] { } make ] unit-test +[ { 0x40 0x8a 0x2a } ] [ [ BPL RDX [] MOV ] { } make ] unit-test -[ { HEX: 49 HEX: 89 HEX: 04 HEX: 24 } ] [ [ R12 [] RAX MOV ] { } make ] unit-test -[ { HEX: 49 HEX: 8b HEX: 06 } ] [ [ RAX R14 [] MOV ] { } make ] unit-test +[ { 0x49 0x89 0x04 0x24 } ] [ [ R12 [] RAX MOV ] { } make ] unit-test +[ { 0x49 0x8b 0x06 } ] [ [ RAX R14 [] MOV ] { } make ] unit-test -[ { HEX: 89 HEX: ca } ] [ [ EDX ECX MOV ] { } make ] unit-test -[ { HEX: 4c HEX: 89 HEX: e2 } ] [ [ RDX R12 MOV ] { } make ] unit-test -[ { HEX: 49 HEX: 89 HEX: d4 } ] [ [ R12 RDX MOV ] { } make ] unit-test +[ { 0x89 0xca } ] [ [ EDX ECX MOV ] { } make ] unit-test +[ { 0x4c 0x89 0xe2 } ] [ [ RDX R12 MOV ] { } make ] unit-test +[ { 0x49 0x89 0xd4 } ] [ [ R12 RDX MOV ] { } make ] unit-test ! memory address modes -[ { HEX: 8a HEX: 18 } ] [ [ BL RAX [] MOV ] { } make ] unit-test -[ { HEX: 66 HEX: 8b HEX: 18 } ] [ [ BX RAX [] MOV ] { } make ] unit-test -[ { HEX: 8b HEX: 18 } ] [ [ EBX RAX [] MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 8b HEX: 18 } ] [ [ RBX RAX [] MOV ] { } make ] unit-test -[ { HEX: 88 HEX: 18 } ] [ [ RAX [] BL MOV ] { } make ] unit-test -[ { HEX: 66 HEX: 89 HEX: 18 } ] [ [ RAX [] BX MOV ] { } make ] unit-test -[ { HEX: 89 HEX: 18 } ] [ [ RAX [] EBX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 18 } ] [ [ RAX [] RBX MOV ] { } make ] unit-test +[ { 0x8a 0x18 } ] [ [ BL RAX [] MOV ] { } make ] unit-test +[ { 0x66 0x8b 0x18 } ] [ [ BX RAX [] MOV ] { } make ] unit-test +[ { 0x8b 0x18 } ] [ [ EBX RAX [] MOV ] { } make ] unit-test +[ { 0x48 0x8b 0x18 } ] [ [ RBX RAX [] MOV ] { } make ] unit-test +[ { 0x88 0x18 } ] [ [ RAX [] BL MOV ] { } make ] unit-test +[ { 0x66 0x89 0x18 } ] [ [ RAX [] BX MOV ] { } make ] unit-test +[ { 0x89 0x18 } ] [ [ RAX [] EBX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x18 } ] [ [ RAX [] RBX MOV ] { } make ] unit-test -[ { HEX: 0f HEX: be HEX: c3 } ] [ [ EAX BL MOVSX ] { } make ] unit-test -[ { HEX: 0f HEX: bf HEX: c3 } ] [ [ EAX BX MOVSX ] { } make ] unit-test +[ { 0x0f 0xbe 0xc3 } ] [ [ EAX BL MOVSX ] { } make ] unit-test +[ { 0x0f 0xbf 0xc3 } ] [ [ EAX BX MOVSX ] { } make ] unit-test -[ { HEX: 80 HEX: 08 HEX: 05 } ] [ [ EAX [] 5 OR ] { } make ] unit-test -[ { HEX: c6 HEX: 00 HEX: 05 } ] [ [ EAX [] 5 MOV ] { } make ] unit-test +[ { 0x80 0x08 0x05 } ] [ [ EAX [] 5 OR ] { } make ] unit-test +[ { 0xc6 0x00 0x05 } ] [ [ EAX [] 5 MOV ] { } make ] unit-test -[ { HEX: 49 HEX: 89 HEX: 04 HEX: 1a } ] [ [ R10 RBX [+] RAX MOV ] { } make ] unit-test -[ { HEX: 49 HEX: 89 HEX: 04 HEX: 1b } ] [ [ R11 RBX [+] RAX MOV ] { } make ] unit-test +[ { 0x49 0x89 0x04 0x1a } ] [ [ R10 RBX [+] RAX MOV ] { } make ] unit-test +[ { 0x49 0x89 0x04 0x1b } ] [ [ R11 RBX [+] RAX MOV ] { } make ] unit-test -[ { HEX: 49 HEX: 89 HEX: 04 HEX: 1c } ] [ [ R12 RBX [+] RAX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 04 HEX: 1c } ] [ [ RSP RBX [+] RAX MOV ] { } make ] unit-test +[ { 0x49 0x89 0x04 0x1c } ] [ [ R12 RBX [+] RAX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x04 0x1c } ] [ [ RSP RBX [+] RAX MOV ] { } make ] unit-test -[ { HEX: 49 HEX: 89 HEX: 44 HEX: 1d HEX: 00 } ] [ [ R13 RBX [+] RAX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 44 HEX: 1d HEX: 00 } ] [ [ RBP RBX [+] RAX MOV ] { } make ] unit-test +[ { 0x49 0x89 0x44 0x1d 0x00 } ] [ [ R13 RBX [+] RAX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x44 0x1d 0x00 } ] [ [ RBP RBX [+] RAX MOV ] { } make ] unit-test -[ { HEX: 4a HEX: 89 HEX: 04 HEX: 23 } ] [ [ RBX R12 [+] RAX MOV ] { } make ] unit-test -[ { HEX: 4a HEX: 89 HEX: 04 HEX: 2b } ] [ [ RBX R13 [+] RAX MOV ] { } make ] unit-test +[ { 0x4a 0x89 0x04 0x23 } ] [ [ RBX R12 [+] RAX MOV ] { } make ] unit-test +[ { 0x4a 0x89 0x04 0x2b } ] [ [ RBX R13 [+] RAX MOV ] { } make ] unit-test -[ { HEX: 4b HEX: 89 HEX: 44 HEX: 25 HEX: 00 } ] [ [ R13 R12 [+] RAX MOV ] { } make ] unit-test -[ { HEX: 4b HEX: 89 HEX: 04 HEX: 2c } ] [ [ R12 R13 [+] RAX MOV ] { } make ] unit-test +[ { 0x4b 0x89 0x44 0x25 0x00 } ] [ [ R13 R12 [+] RAX MOV ] { } make ] unit-test +[ { 0x4b 0x89 0x04 0x2c } ] [ [ R12 R13 [+] RAX MOV ] { } make ] unit-test -[ { HEX: 49 HEX: 89 HEX: 04 HEX: 2c } ] [ [ R12 RBP [+] RAX MOV ] { } make ] unit-test +[ { 0x49 0x89 0x04 0x2c } ] [ [ R12 RBP [+] RAX MOV ] { } make ] unit-test [ [ R12 RSP [+] RAX MOV ] { } make ] must-fail -[ { HEX: 89 HEX: 1c HEX: 11 } ] [ [ ECX EDX [+] EBX MOV ] { } make ] unit-test -[ { HEX: 89 HEX: 1c HEX: 51 } ] [ [ ECX EDX 1 0 EBX MOV ] { } make ] unit-test -[ { HEX: 89 HEX: 1c HEX: 91 } ] [ [ ECX EDX 2 0 EBX MOV ] { } make ] unit-test -[ { HEX: 89 HEX: 1c HEX: d1 } ] [ [ ECX EDX 3 0 EBX MOV ] { } make ] unit-test -[ { HEX: 89 HEX: 5c HEX: 11 HEX: 64 } ] [ [ ECX EDX 0 100 EBX MOV ] { } make ] unit-test -[ { HEX: 89 HEX: 5c HEX: 51 HEX: 64 } ] [ [ ECX EDX 1 100 EBX MOV ] { } make ] unit-test -[ { HEX: 89 HEX: 5c HEX: 91 HEX: 64 } ] [ [ ECX EDX 2 100 EBX MOV ] { } make ] unit-test -[ { HEX: 89 HEX: 5c HEX: d1 HEX: 64 } ] [ [ ECX EDX 3 100 EBX MOV ] { } make ] unit-test - -[ { HEX: 48 HEX: 89 HEX: 1c HEX: 11 } ] [ [ RCX RDX [+] RBX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 1c HEX: 51 } ] [ [ RCX RDX 1 0 RBX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 1c HEX: 91 } ] [ [ RCX RDX 2 0 RBX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 1c HEX: d1 } ] [ [ RCX RDX 3 0 RBX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 5c HEX: 11 HEX: 64 } ] [ [ RCX RDX 0 100 RBX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 5c HEX: 51 HEX: 64 } ] [ [ RCX RDX 1 100 RBX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 5c HEX: 91 HEX: 64 } ] [ [ RCX RDX 2 100 RBX MOV ] { } make ] unit-test -[ { HEX: 48 HEX: 89 HEX: 5c HEX: d1 HEX: 64 } ] [ [ RCX RDX 3 100 RBX MOV ] { } make ] unit-test +[ { 0x89 0x1c 0x11 } ] [ [ ECX EDX [+] EBX MOV ] { } make ] unit-test +[ { 0x89 0x1c 0x51 } ] [ [ ECX EDX 1 0 EBX MOV ] { } make ] unit-test +[ { 0x89 0x1c 0x91 } ] [ [ ECX EDX 2 0 EBX MOV ] { } make ] unit-test +[ { 0x89 0x1c 0xd1 } ] [ [ ECX EDX 3 0 EBX MOV ] { } make ] unit-test +[ { 0x89 0x5c 0x11 0x64 } ] [ [ ECX EDX 0 100 EBX MOV ] { } make ] unit-test +[ { 0x89 0x5c 0x51 0x64 } ] [ [ ECX EDX 1 100 EBX MOV ] { } make ] unit-test +[ { 0x89 0x5c 0x91 0x64 } ] [ [ ECX EDX 2 100 EBX MOV ] { } make ] unit-test +[ { 0x89 0x5c 0xd1 0x64 } ] [ [ ECX EDX 3 100 EBX MOV ] { } make ] unit-test + +[ { 0x48 0x89 0x1c 0x11 } ] [ [ RCX RDX [+] RBX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x1c 0x51 } ] [ [ RCX RDX 1 0 RBX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x1c 0x91 } ] [ [ RCX RDX 2 0 RBX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x1c 0xd1 } ] [ [ RCX RDX 3 0 RBX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x5c 0x11 0x64 } ] [ [ RCX RDX 0 100 RBX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x5c 0x51 0x64 } ] [ [ RCX RDX 1 100 RBX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x5c 0x91 0x64 } ] [ [ RCX RDX 2 100 RBX MOV ] { } make ] unit-test +[ { 0x48 0x89 0x5c 0xd1 0x64 } ] [ [ RCX RDX 3 100 RBX MOV ] { } make ] unit-test ! r-rm / m-r sse instruction -[ { HEX: 0f HEX: 10 HEX: c1 } ] [ [ XMM0 XMM1 MOVUPS ] { } make ] unit-test -[ { HEX: 0f HEX: 10 HEX: 01 } ] [ [ XMM0 ECX [] MOVUPS ] { } make ] unit-test -[ { HEX: 0f HEX: 11 HEX: 08 } ] [ [ EAX [] XMM1 MOVUPS ] { } make ] unit-test +[ { 0x0f 0x10 0xc1 } ] [ [ XMM0 XMM1 MOVUPS ] { } make ] unit-test +[ { 0x0f 0x10 0x01 } ] [ [ XMM0 ECX [] MOVUPS ] { } make ] unit-test +[ { 0x0f 0x11 0x08 } ] [ [ EAX [] XMM1 MOVUPS ] { } make ] unit-test -[ { HEX: f3 HEX: 0f HEX: 10 HEX: c1 } ] [ [ XMM0 XMM1 MOVSS ] { } make ] unit-test -[ { HEX: f3 HEX: 0f HEX: 10 HEX: 01 } ] [ [ XMM0 ECX [] MOVSS ] { } make ] unit-test -[ { HEX: f3 HEX: 0f HEX: 11 HEX: 08 } ] [ [ EAX [] XMM1 MOVSS ] { } make ] unit-test +[ { 0xf3 0x0f 0x10 0xc1 } ] [ [ XMM0 XMM1 MOVSS ] { } make ] unit-test +[ { 0xf3 0x0f 0x10 0x01 } ] [ [ XMM0 ECX [] MOVSS ] { } make ] unit-test +[ { 0xf3 0x0f 0x11 0x08 } ] [ [ EAX [] XMM1 MOVSS ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 6f HEX: c1 } ] [ [ XMM0 XMM1 MOVDQA ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 6f HEX: 01 } ] [ [ XMM0 ECX [] MOVDQA ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 7f HEX: 08 } ] [ [ EAX [] XMM1 MOVDQA ] { } make ] unit-test +[ { 0x66 0x0f 0x6f 0xc1 } ] [ [ XMM0 XMM1 MOVDQA ] { } make ] unit-test +[ { 0x66 0x0f 0x6f 0x01 } ] [ [ XMM0 ECX [] MOVDQA ] { } make ] unit-test +[ { 0x66 0x0f 0x7f 0x08 } ] [ [ EAX [] XMM1 MOVDQA ] { } make ] unit-test ! r-rm only sse instruction -[ { HEX: 66 HEX: 0f HEX: 2e HEX: c1 } ] [ [ XMM0 XMM1 UCOMISD ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 2e HEX: 01 } ] [ [ XMM0 ECX [] UCOMISD ] { } make ] unit-test +[ { 0x66 0x0f 0x2e 0xc1 } ] [ [ XMM0 XMM1 UCOMISD ] { } make ] unit-test +[ { 0x66 0x0f 0x2e 0x01 } ] [ [ XMM0 ECX [] UCOMISD ] { } make ] unit-test [ [ EAX [] XMM1 UCOMISD ] { } make ] must-fail -[ { HEX: 66 HEX: 0f HEX: 38 HEX: 2a HEX: 01 } ] [ [ XMM0 ECX [] MOVNTDQA ] { } make ] unit-test +[ { 0x66 0x0f 0x38 0x2a 0x01 } ] [ [ XMM0 ECX [] MOVNTDQA ] { } make ] unit-test -[ { HEX: 66 HEX: 48 HEX: 0f HEX: 6e HEX: c8 } ] [ [ XMM1 RAX MOVD ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 6e HEX: c8 } ] [ [ XMM1 EAX MOVD ] { } make ] unit-test -[ { HEX: 66 HEX: 48 HEX: 0f HEX: 7e HEX: c8 } ] [ [ RAX XMM1 MOVD ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 7e HEX: c8 } ] [ [ EAX XMM1 MOVD ] { } make ] unit-test +[ { 0x66 0x48 0x0f 0x6e 0xc8 } ] [ [ XMM1 RAX MOVD ] { } make ] unit-test +[ { 0x66 0x0f 0x6e 0xc8 } ] [ [ XMM1 EAX MOVD ] { } make ] unit-test +[ { 0x66 0x48 0x0f 0x7e 0xc8 } ] [ [ RAX XMM1 MOVD ] { } make ] unit-test +[ { 0x66 0x0f 0x7e 0xc8 } ] [ [ EAX XMM1 MOVD ] { } make ] unit-test -[ { HEX: f3 HEX: 0f HEX: 7e HEX: 08 } ] [ [ XMM1 EAX [] MOVQ ] { } make ] unit-test -[ { HEX: f3 HEX: 0f HEX: 7e HEX: 08 } ] [ [ XMM1 EAX [] MOVQ ] { } make ] unit-test -[ { HEX: f3 HEX: 0f HEX: 7e HEX: ca } ] [ [ XMM1 XMM2 MOVQ ] { } make ] unit-test +[ { 0xf3 0x0f 0x7e 0x08 } ] [ [ XMM1 EAX [] MOVQ ] { } make ] unit-test +[ { 0xf3 0x0f 0x7e 0x08 } ] [ [ XMM1 EAX [] MOVQ ] { } make ] unit-test +[ { 0xf3 0x0f 0x7e 0xca } ] [ [ XMM1 XMM2 MOVQ ] { } make ] unit-test ! rm-r only sse instructions -[ { HEX: 0f HEX: 2b HEX: 08 } ] [ [ EAX [] XMM1 MOVNTPS ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: e7 HEX: 08 } ] [ [ EAX [] XMM1 MOVNTDQ ] { } make ] unit-test +[ { 0x0f 0x2b 0x08 } ] [ [ EAX [] XMM1 MOVNTPS ] { } make ] unit-test +[ { 0x66 0x0f 0xe7 0x08 } ] [ [ EAX [] XMM1 MOVNTDQ ] { } make ] unit-test ! three-byte-opcode ssse3 instruction -[ { HEX: 66 HEX: 0f HEX: 38 HEX: 02 HEX: c1 } ] [ [ XMM0 XMM1 PHADDD ] { } make ] unit-test +[ { 0x66 0x0f 0x38 0x02 0xc1 } ] [ [ XMM0 XMM1 PHADDD ] { } make ] unit-test ! int/sse conversion instruction -[ { HEX: f2 HEX: 0f HEX: 2c HEX: c0 } ] [ [ EAX XMM0 CVTTSD2SI ] { } make ] unit-test -[ { HEX: f2 HEX: 48 HEX: 0f HEX: 2c HEX: c0 } ] [ [ RAX XMM0 CVTTSD2SI ] { } make ] unit-test -[ { HEX: f2 HEX: 4c HEX: 0f HEX: 2c HEX: e0 } ] [ [ R12 XMM0 CVTTSD2SI ] { } make ] unit-test -[ { HEX: f2 HEX: 0f HEX: 2a HEX: c0 } ] [ [ XMM0 EAX CVTSI2SD ] { } make ] unit-test -[ { HEX: f2 HEX: 48 HEX: 0f HEX: 2a HEX: c0 } ] [ [ XMM0 RAX CVTSI2SD ] { } make ] unit-test -[ { HEX: f2 HEX: 48 HEX: 0f HEX: 2a HEX: c1 } ] [ [ XMM0 RCX CVTSI2SD ] { } make ] unit-test -[ { HEX: f2 HEX: 48 HEX: 0f HEX: 2a HEX: d9 } ] [ [ XMM3 RCX CVTSI2SD ] { } make ] unit-test -[ { HEX: f2 HEX: 48 HEX: 0f HEX: 2a HEX: c0 } ] [ [ XMM0 RAX CVTSI2SD ] { } make ] unit-test -[ { HEX: f2 HEX: 49 HEX: 0f HEX: 2a HEX: c4 } ] [ [ XMM0 R12 CVTSI2SD ] { } make ] unit-test +[ { 0xf2 0x0f 0x2c 0xc0 } ] [ [ EAX XMM0 CVTTSD2SI ] { } make ] unit-test +[ { 0xf2 0x48 0x0f 0x2c 0xc0 } ] [ [ RAX XMM0 CVTTSD2SI ] { } make ] unit-test +[ { 0xf2 0x4c 0x0f 0x2c 0xe0 } ] [ [ R12 XMM0 CVTTSD2SI ] { } make ] unit-test +[ { 0xf2 0x0f 0x2a 0xc0 } ] [ [ XMM0 EAX CVTSI2SD ] { } make ] unit-test +[ { 0xf2 0x48 0x0f 0x2a 0xc0 } ] [ [ XMM0 RAX CVTSI2SD ] { } make ] unit-test +[ { 0xf2 0x48 0x0f 0x2a 0xc1 } ] [ [ XMM0 RCX CVTSI2SD ] { } make ] unit-test +[ { 0xf2 0x48 0x0f 0x2a 0xd9 } ] [ [ XMM3 RCX CVTSI2SD ] { } make ] unit-test +[ { 0xf2 0x48 0x0f 0x2a 0xc0 } ] [ [ XMM0 RAX CVTSI2SD ] { } make ] unit-test +[ { 0xf2 0x49 0x0f 0x2a 0xc4 } ] [ [ XMM0 R12 CVTSI2SD ] { } make ] unit-test ! 3-operand r-rm-imm sse instructions -[ { HEX: 66 HEX: 0f HEX: 70 HEX: c1 HEX: 02 } ] +[ { 0x66 0x0f 0x70 0xc1 0x02 } ] [ [ XMM0 XMM1 2 PSHUFD ] { } make ] unit-test -[ { HEX: 0f HEX: c6 HEX: c1 HEX: 02 } ] +[ { 0x0f 0xc6 0xc1 0x02 } ] [ [ XMM0 XMM1 2 SHUFPS ] { } make ] unit-test ! shufflers with arrays of indexes -[ { HEX: 66 HEX: 0f HEX: 70 HEX: c1 HEX: 02 } ] +[ { 0x66 0x0f 0x70 0xc1 0x02 } ] [ [ XMM0 XMM1 { 2 0 0 0 } PSHUFD ] { } make ] unit-test -[ { HEX: 0f HEX: c6 HEX: c1 HEX: 63 } ] +[ { 0x0f 0xc6 0xc1 0x63 } ] [ [ XMM0 XMM1 { 3 0 2 1 } SHUFPS ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: c6 HEX: c1 HEX: 2 } ] +[ { 0x66 0x0f 0xc6 0xc1 0x2 } ] [ [ XMM0 XMM1 { 0 1 } SHUFPD ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: c6 HEX: c1 HEX: 1 } ] +[ { 0x66 0x0f 0xc6 0xc1 0x1 } ] [ [ XMM0 XMM1 { 1 0 } SHUFPD ] { } make ] unit-test ! scalar register insert/extract sse instructions -[ { HEX: 66 HEX: 0f HEX: c4 HEX: c1 HEX: 02 } ] [ [ XMM0 ECX 2 PINSRW ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: c4 HEX: 04 HEX: 11 HEX: 03 } ] [ [ XMM0 ECX EDX [+] 3 PINSRW ] { } make ] unit-test +[ { 0x66 0x0f 0xc4 0xc1 0x02 } ] [ [ XMM0 ECX 2 PINSRW ] { } make ] unit-test +[ { 0x66 0x0f 0xc4 0x04 0x11 0x03 } ] [ [ XMM0 ECX EDX [+] 3 PINSRW ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: c5 HEX: c1 HEX: 02 } ] [ [ EAX XMM1 2 PEXTRW ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 3a HEX: 15 HEX: 08 HEX: 02 } ] [ [ EAX [] XMM1 2 PEXTRW ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 3a HEX: 15 HEX: 14 HEX: 08 HEX: 03 } ] [ [ EAX ECX [+] XMM2 3 PEXTRW ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 3a HEX: 14 HEX: c8 HEX: 02 } ] [ [ EAX XMM1 2 PEXTRB ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 3a HEX: 14 HEX: 08 HEX: 02 } ] [ [ EAX [] XMM1 2 PEXTRB ] { } make ] unit-test +[ { 0x66 0x0f 0xc5 0xc1 0x02 } ] [ [ EAX XMM1 2 PEXTRW ] { } make ] unit-test +[ { 0x66 0x0f 0x3a 0x15 0x08 0x02 } ] [ [ EAX [] XMM1 2 PEXTRW ] { } make ] unit-test +[ { 0x66 0x0f 0x3a 0x15 0x14 0x08 0x03 } ] [ [ EAX ECX [+] XMM2 3 PEXTRW ] { } make ] unit-test +[ { 0x66 0x0f 0x3a 0x14 0xc8 0x02 } ] [ [ EAX XMM1 2 PEXTRB ] { } make ] unit-test +[ { 0x66 0x0f 0x3a 0x14 0x08 0x02 } ] [ [ EAX [] XMM1 2 PEXTRB ] { } make ] unit-test ! sse shift instructions -[ { HEX: 66 HEX: 0f HEX: 71 HEX: d0 HEX: 05 } ] [ [ XMM0 5 PSRLW ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: d1 HEX: c1 } ] [ [ XMM0 XMM1 PSRLW ] { } make ] unit-test +[ { 0x66 0x0f 0x71 0xd0 0x05 } ] [ [ XMM0 5 PSRLW ] { } make ] unit-test +[ { 0x66 0x0f 0xd1 0xc1 } ] [ [ XMM0 XMM1 PSRLW ] { } make ] unit-test ! sse comparison instructions -[ { HEX: 66 HEX: 0f HEX: c2 HEX: c1 HEX: 02 } ] [ [ XMM0 XMM1 CMPLEPD ] { } make ] unit-test +[ { 0x66 0x0f 0xc2 0xc1 0x02 } ] [ [ XMM0 XMM1 CMPLEPD ] { } make ] unit-test ! unique sse instructions -[ { HEX: 0f HEX: 18 HEX: 00 } ] [ [ EAX [] PREFETCHNTA ] { } make ] unit-test -[ { HEX: 0f HEX: 18 HEX: 08 } ] [ [ EAX [] PREFETCHT0 ] { } make ] unit-test -[ { HEX: 0f HEX: 18 HEX: 10 } ] [ [ EAX [] PREFETCHT1 ] { } make ] unit-test -[ { HEX: 0f HEX: 18 HEX: 18 } ] [ [ EAX [] PREFETCHT2 ] { } make ] unit-test -[ { HEX: 0f HEX: ae HEX: 10 } ] [ [ EAX [] LDMXCSR ] { } make ] unit-test -[ { HEX: 0f HEX: ae HEX: 18 } ] [ [ EAX [] STMXCSR ] { } make ] unit-test +[ { 0x0f 0x18 0x00 } ] [ [ EAX [] PREFETCHNTA ] { } make ] unit-test +[ { 0x0f 0x18 0x08 } ] [ [ EAX [] PREFETCHT0 ] { } make ] unit-test +[ { 0x0f 0x18 0x10 } ] [ [ EAX [] PREFETCHT1 ] { } make ] unit-test +[ { 0x0f 0x18 0x18 } ] [ [ EAX [] PREFETCHT2 ] { } make ] unit-test +[ { 0x0f 0xae 0x10 } ] [ [ EAX [] LDMXCSR ] { } make ] unit-test +[ { 0x0f 0xae 0x18 } ] [ [ EAX [] STMXCSR ] { } make ] unit-test -[ { HEX: 0f HEX: c3 HEX: 08 } ] [ [ EAX [] ECX MOVNTI ] { } make ] unit-test +[ { 0x0f 0xc3 0x08 } ] [ [ EAX [] ECX MOVNTI ] { } make ] unit-test -[ { HEX: 0f HEX: 50 HEX: c1 } ] [ [ EAX XMM1 MOVMSKPS ] { } make ] unit-test -[ { HEX: 66 HEX: 0f HEX: 50 HEX: c1 } ] [ [ EAX XMM1 MOVMSKPD ] { } make ] unit-test +[ { 0x0f 0x50 0xc1 } ] [ [ EAX XMM1 MOVMSKPS ] { } make ] unit-test +[ { 0x66 0x0f 0x50 0xc1 } ] [ [ EAX XMM1 MOVMSKPD ] { } make ] unit-test -[ { HEX: f3 HEX: 0f HEX: b8 HEX: c1 } ] [ [ EAX ECX POPCNT ] { } make ] unit-test -[ { HEX: f3 HEX: 48 HEX: 0f HEX: b8 HEX: c1 } ] [ [ RAX RCX POPCNT ] { } make ] unit-test -[ { HEX: f3 HEX: 0f HEX: b8 HEX: 01 } ] [ [ EAX ECX [] POPCNT ] { } make ] unit-test -[ { HEX: f3 HEX: 0f HEX: b8 HEX: 04 HEX: 11 } ] [ [ EAX ECX EDX [+] POPCNT ] { } make ] unit-test +[ { 0xf3 0x0f 0xb8 0xc1 } ] [ [ EAX ECX POPCNT ] { } make ] unit-test +[ { 0xf3 0x48 0x0f 0xb8 0xc1 } ] [ [ RAX RCX POPCNT ] { } make ] unit-test +[ { 0xf3 0x0f 0xb8 0x01 } ] [ [ EAX ECX [] POPCNT ] { } make ] unit-test +[ { 0xf3 0x0f 0xb8 0x04 0x11 } ] [ [ EAX ECX EDX [+] POPCNT ] { } make ] unit-test -[ { HEX: f2 HEX: 0f HEX: 38 HEX: f0 HEX: c1 } ] [ [ EAX CL CRC32B ] { } make ] unit-test -[ { HEX: f2 HEX: 0f HEX: 38 HEX: f0 HEX: 01 } ] [ [ EAX ECX [] CRC32B ] { } make ] unit-test -[ { HEX: f2 HEX: 0f HEX: 38 HEX: f1 HEX: c1 } ] [ [ EAX ECX CRC32 ] { } make ] unit-test -[ { HEX: f2 HEX: 0f HEX: 38 HEX: f1 HEX: 01 } ] [ [ EAX ECX [] CRC32 ] { } make ] unit-test +[ { 0xf2 0x0f 0x38 0xf0 0xc1 } ] [ [ EAX CL CRC32B ] { } make ] unit-test +[ { 0xf2 0x0f 0x38 0xf0 0x01 } ] [ [ EAX ECX [] CRC32B ] { } make ] unit-test +[ { 0xf2 0x0f 0x38 0xf1 0xc1 } ] [ [ EAX ECX CRC32 ] { } make ] unit-test +[ { 0xf2 0x0f 0x38 0xf1 0x01 } ] [ [ EAX ECX [] CRC32 ] { } make ] unit-test ! shifts -[ { HEX: 48 HEX: d3 HEX: e0 } ] [ [ RAX CL SHL ] { } make ] unit-test -[ { HEX: 48 HEX: d3 HEX: e1 } ] [ [ RCX CL SHL ] { } make ] unit-test -[ { HEX: 48 HEX: d3 HEX: e8 } ] [ [ RAX CL SHR ] { } make ] unit-test -[ { HEX: 48 HEX: d3 HEX: e9 } ] [ [ RCX CL SHR ] { } make ] unit-test +[ { 0x48 0xd3 0xe0 } ] [ [ RAX CL SHL ] { } make ] unit-test +[ { 0x48 0xd3 0xe1 } ] [ [ RCX CL SHL ] { } make ] unit-test +[ { 0x48 0xd3 0xe8 } ] [ [ RAX CL SHR ] { } make ] unit-test +[ { 0x48 0xd3 0xe9 } ] [ [ RCX CL SHR ] { } make ] unit-test -[ { HEX: c1 HEX: e0 HEX: 05 } ] [ [ EAX 5 SHL ] { } make ] unit-test -[ { HEX: c1 HEX: e1 HEX: 05 } ] [ [ ECX 5 SHL ] { } make ] unit-test -[ { HEX: c1 HEX: e8 HEX: 05 } ] [ [ EAX 5 SHR ] { } make ] unit-test -[ { HEX: c1 HEX: e9 HEX: 05 } ] [ [ ECX 5 SHR ] { } make ] unit-test +[ { 0xc1 0xe0 0x05 } ] [ [ EAX 5 SHL ] { } make ] unit-test +[ { 0xc1 0xe1 0x05 } ] [ [ ECX 5 SHL ] { } make ] unit-test +[ { 0xc1 0xe8 0x05 } ] [ [ EAX 5 SHR ] { } make ] unit-test +[ { 0xc1 0xe9 0x05 } ] [ [ ECX 5 SHR ] { } make ] unit-test ! multiplication -[ { HEX: 4d HEX: 6b HEX: c0 HEX: 03 } ] [ [ R8 R8 3 IMUL3 ] { } make ] unit-test -[ { HEX: 49 HEX: 6b HEX: c0 HEX: 03 } ] [ [ RAX R8 3 IMUL3 ] { } make ] unit-test -[ { HEX: 4c HEX: 6b HEX: c0 HEX: 03 } ] [ [ R8 RAX 3 IMUL3 ] { } make ] unit-test -[ { HEX: 48 HEX: 6b HEX: c1 HEX: 03 } ] [ [ RAX RCX 3 IMUL3 ] { } make ] unit-test -[ { HEX: 48 HEX: 69 HEX: c1 HEX: 44 HEX: 03 HEX: 00 HEX: 00 } ] [ [ RAX RCX HEX: 344 IMUL3 ] { } make ] unit-test +[ { 0x4d 0x6b 0xc0 0x03 } ] [ [ R8 R8 3 IMUL3 ] { } make ] unit-test +[ { 0x49 0x6b 0xc0 0x03 } ] [ [ RAX R8 3 IMUL3 ] { } make ] unit-test +[ { 0x4c 0x6b 0xc0 0x03 } ] [ [ R8 RAX 3 IMUL3 ] { } make ] unit-test +[ { 0x48 0x6b 0xc1 0x03 } ] [ [ RAX RCX 3 IMUL3 ] { } make ] unit-test +[ { 0x48 0x69 0xc1 0x44 0x03 0x00 0x00 } ] [ [ RAX RCX 0x344 IMUL3 ] { } make ] unit-test ! BT family instructions -[ { HEX: 0f HEX: ba HEX: e0 HEX: 01 } ] [ [ EAX 1 BT ] { } make ] unit-test -[ { HEX: 0f HEX: ba HEX: f8 HEX: 01 } ] [ [ EAX 1 BTC ] { } make ] unit-test -[ { HEX: 0f HEX: ba HEX: e8 HEX: 01 } ] [ [ EAX 1 BTS ] { } make ] unit-test -[ { HEX: 0f HEX: ba HEX: f0 HEX: 01 } ] [ [ EAX 1 BTR ] { } make ] unit-test -[ { HEX: 48 HEX: 0f HEX: ba HEX: e0 HEX: 01 } ] [ [ RAX 1 BT ] { } make ] unit-test -[ { HEX: 0f HEX: ba HEX: 20 HEX: 01 } ] [ [ EAX [] 1 BT ] { } make ] unit-test - -[ { HEX: 0f HEX: a3 HEX: d8 } ] [ [ EAX EBX BT ] { } make ] unit-test -[ { HEX: 0f HEX: bb HEX: d8 } ] [ [ EAX EBX BTC ] { } make ] unit-test -[ { HEX: 0f HEX: ab HEX: d8 } ] [ [ EAX EBX BTS ] { } make ] unit-test -[ { HEX: 0f HEX: b3 HEX: d8 } ] [ [ EAX EBX BTR ] { } make ] unit-test -[ { HEX: 0f HEX: a3 HEX: 18 } ] [ [ EAX [] EBX BT ] { } make ] unit-test +[ { 0x0f 0xba 0xe0 0x01 } ] [ [ EAX 1 BT ] { } make ] unit-test +[ { 0x0f 0xba 0xf8 0x01 } ] [ [ EAX 1 BTC ] { } make ] unit-test +[ { 0x0f 0xba 0xe8 0x01 } ] [ [ EAX 1 BTS ] { } make ] unit-test +[ { 0x0f 0xba 0xf0 0x01 } ] [ [ EAX 1 BTR ] { } make ] unit-test +[ { 0x48 0x0f 0xba 0xe0 0x01 } ] [ [ RAX 1 BT ] { } make ] unit-test +[ { 0x0f 0xba 0x20 0x01 } ] [ [ EAX [] 1 BT ] { } make ] unit-test + +[ { 0x0f 0xa3 0xd8 } ] [ [ EAX EBX BT ] { } make ] unit-test +[ { 0x0f 0xbb 0xd8 } ] [ [ EAX EBX BTC ] { } make ] unit-test +[ { 0x0f 0xab 0xd8 } ] [ [ EAX EBX BTS ] { } make ] unit-test +[ { 0x0f 0xb3 0xd8 } ] [ [ EAX EBX BTR ] { } make ] unit-test +[ { 0x0f 0xa3 0x18 } ] [ [ EAX [] EBX BT ] { } make ] unit-test ! x87 instructions -[ { HEX: D8 HEX: C5 } ] [ [ ST0 ST5 FADD ] { } make ] unit-test -[ { HEX: DC HEX: C5 } ] [ [ ST5 ST0 FADD ] { } make ] unit-test -[ { HEX: D8 HEX: 00 } ] [ [ ST0 EAX [] FADD ] { } make ] unit-test +[ { 0xD8 0xC5 } ] [ [ ST0 ST5 FADD ] { } make ] unit-test +[ { 0xDC 0xC5 } ] [ [ ST5 ST0 FADD ] { } make ] unit-test +[ { 0xD8 0x00 } ] [ [ ST0 EAX [] FADD ] { } make ] unit-test -[ { HEX: D9 HEX: C2 } ] [ [ ST2 FLD ] { } make ] unit-test -[ { HEX: DD HEX: D2 } ] [ [ ST2 FST ] { } make ] unit-test -[ { HEX: DD HEX: DA } ] [ [ ST2 FSTP ] { } make ] unit-test +[ { 0xD9 0xC2 } ] [ [ ST2 FLD ] { } make ] unit-test +[ { 0xDD 0xD2 } ] [ [ ST2 FST ] { } make ] unit-test +[ { 0xDD 0xDA } ] [ [ ST2 FSTP ] { } make ] unit-test [ { 15 183 195 } ] [ [ EAX BX MOVZX ] { } make ] unit-test bootstrap-cell 4 = [ [ { 100 199 5 0 0 0 0 123 0 0 0 } ] [ [ 0 [] FS 123 MOV ] { } make ] unit-test - [ { HEX: a0 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ AL HEX: 0123,4567 MOVABS ] { } make ] unit-test + [ { 0xa0 0x67 0x45 0x23 0x01 } ] + [ [ AL 0x0123,4567 MOVABS ] { } make ] unit-test - [ { HEX: 66 HEX: a1 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ AX HEX: 0123,4567 MOVABS ] { } make ] unit-test + [ { 0x66 0xa1 0x67 0x45 0x23 0x01 } ] + [ [ AX 0x0123,4567 MOVABS ] { } make ] unit-test - [ { HEX: a1 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ EAX HEX: 0123,4567 MOVABS ] { } make ] unit-test + [ { 0xa1 0x67 0x45 0x23 0x01 } ] + [ [ EAX 0x0123,4567 MOVABS ] { } make ] unit-test - [ { HEX: 48 HEX: a1 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ RAX HEX: 0123,4567 MOVABS ] { } make ] unit-test + [ { 0x48 0xa1 0x67 0x45 0x23 0x01 } ] + [ [ RAX 0x0123,4567 MOVABS ] { } make ] unit-test - [ { HEX: a2 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ HEX: 0123,4567 AL MOVABS ] { } make ] unit-test + [ { 0xa2 0x67 0x45 0x23 0x01 } ] + [ [ 0x0123,4567 AL MOVABS ] { } make ] unit-test - [ { HEX: 66 HEX: a3 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ HEX: 0123,4567 AX MOVABS ] { } make ] unit-test + [ { 0x66 0xa3 0x67 0x45 0x23 0x01 } ] + [ [ 0x0123,4567 AX MOVABS ] { } make ] unit-test - [ { HEX: a3 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ HEX: 0123,4567 EAX MOVABS ] { } make ] unit-test + [ { 0xa3 0x67 0x45 0x23 0x01 } ] + [ [ 0x0123,4567 EAX MOVABS ] { } make ] unit-test - [ { HEX: 48 HEX: a3 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ HEX: 0123,4567 RAX MOVABS ] { } make ] unit-test + [ { 0x48 0xa3 0x67 0x45 0x23 0x01 } ] + [ [ 0x0123,4567 RAX MOVABS ] { } make ] unit-test ] when bootstrap-cell 8 = [ [ { 72 137 13 123 0 0 0 } ] [ [ 123 [RIP+] RCX MOV ] { } make ] unit-test [ { 101 72 137 12 37 123 0 0 0 } ] [ [ 123 [] GS RCX MOV ] { } make ] unit-test - [ { HEX: a0 HEX: ef HEX: cd HEX: ab HEX: 89 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ AL HEX: 0123,4567,89ab,cdef MOVABS ] { } make ] unit-test + [ { 0xa0 0xef 0xcd 0xab 0x89 0x67 0x45 0x23 0x01 } ] + [ [ AL 0x0123,4567,89ab,cdef MOVABS ] { } make ] unit-test - [ { HEX: 66 HEX: a1 HEX: ef HEX: cd HEX: ab HEX: 89 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ AX HEX: 0123,4567,89ab,cdef MOVABS ] { } make ] unit-test + [ { 0x66 0xa1 0xef 0xcd 0xab 0x89 0x67 0x45 0x23 0x01 } ] + [ [ AX 0x0123,4567,89ab,cdef MOVABS ] { } make ] unit-test - [ { HEX: a1 HEX: ef HEX: cd HEX: ab HEX: 89 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ EAX HEX: 0123,4567,89ab,cdef MOVABS ] { } make ] unit-test + [ { 0xa1 0xef 0xcd 0xab 0x89 0x67 0x45 0x23 0x01 } ] + [ [ EAX 0x0123,4567,89ab,cdef MOVABS ] { } make ] unit-test - [ { HEX: 48 HEX: a1 HEX: ef HEX: cd HEX: ab HEX: 89 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ RAX HEX: 0123,4567,89ab,cdef MOVABS ] { } make ] unit-test + [ { 0x48 0xa1 0xef 0xcd 0xab 0x89 0x67 0x45 0x23 0x01 } ] + [ [ RAX 0x0123,4567,89ab,cdef MOVABS ] { } make ] unit-test - [ { HEX: a2 HEX: ef HEX: cd HEX: ab HEX: 89 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ HEX: 0123,4567,89ab,cdef AL MOVABS ] { } make ] unit-test + [ { 0xa2 0xef 0xcd 0xab 0x89 0x67 0x45 0x23 0x01 } ] + [ [ 0x0123,4567,89ab,cdef AL MOVABS ] { } make ] unit-test - [ { HEX: 66 HEX: a3 HEX: ef HEX: cd HEX: ab HEX: 89 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ HEX: 0123,4567,89ab,cdef AX MOVABS ] { } make ] unit-test + [ { 0x66 0xa3 0xef 0xcd 0xab 0x89 0x67 0x45 0x23 0x01 } ] + [ [ 0x0123,4567,89ab,cdef AX MOVABS ] { } make ] unit-test - [ { HEX: a3 HEX: ef HEX: cd HEX: ab HEX: 89 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ HEX: 0123,4567,89ab,cdef EAX MOVABS ] { } make ] unit-test + [ { 0xa3 0xef 0xcd 0xab 0x89 0x67 0x45 0x23 0x01 } ] + [ [ 0x0123,4567,89ab,cdef EAX MOVABS ] { } make ] unit-test - [ { HEX: 48 HEX: a3 HEX: ef HEX: cd HEX: ab HEX: 89 HEX: 67 HEX: 45 HEX: 23 HEX: 01 } ] - [ [ HEX: 0123,4567,89ab,cdef RAX MOVABS ] { } make ] unit-test + [ { 0x48 0xa3 0xef 0xcd 0xab 0x89 0x67 0x45 0x23 0x01 } ] + [ [ 0x0123,4567,89ab,cdef RAX MOVABS ] { } make ] unit-test ] when diff --git a/basis/cpu/x86/assembler/assembler.factor b/basis/cpu/x86/assembler/assembler.factor index 09d7267fb0..49cf0e2d96 100644 --- a/basis/cpu/x86/assembler/assembler.factor +++ b/basis/cpu/x86/assembler/assembler.factor @@ -51,15 +51,15 @@ GENERIC: modifier ( op -- n ) M: indirect modifier dup base>> [ displacement>> { - { [ dup not ] [ BIN: 00 ] } - { [ dup fits-in-byte? ] [ BIN: 01 ] } - { [ dup immediate? ] [ BIN: 10 ] } + { [ dup not ] [ 0b00 ] } + { [ dup fits-in-byte? ] [ 0b01 ] } + { [ dup immediate? ] [ 0b10 ] } } cond nip ] [ - drop BIN: 00 + drop 0b00 ] if ; -M: register modifier drop BIN: 11 ; +M: register modifier drop 0b11 ; GENERIC# n, 1 ( value n -- ) @@ -103,27 +103,27 @@ M: register displacement, drop ; } cond and ; : rex.r ( m op -- n ) - extended? [ BIN: 00000100 bitor ] when ; + extended? [ 0b00000100 bitor ] when ; : rex.b ( m op -- n ) - [ extended? [ BIN: 00000001 bitor ] when ] keep - dup indirect? [ index>> extended? [ BIN: 00000010 bitor ] when ] [ drop ] if ; + [ extended? [ 0b00000001 bitor ] when ] keep + dup indirect? [ index>> extended? [ 0b00000010 bitor ] when ] [ drop ] if ; : no-prefix? ( prefix reg r/m -- ? ) - [ BIN: 01000000 = ] + [ 0b01000000 = ] [ extended-8-bit-register? not ] [ extended-8-bit-register? not ] tri* and and ; :: rex-prefix ( reg r/m rex.w -- ) #! Compile an AMD64 REX prefix. - rex.w reg r/m rex.w? BIN: 01001000 BIN: 01000000 ? + rex.w reg r/m rex.w? 0b01001000 0b01000000 ? reg rex.r r/m rex.b dup reg r/m no-prefix? [ drop ] [ , ] if ; : 16-prefix ( reg -- ) - register-16? [ HEX: 66 , ] when ; + register-16? [ 0x66 , ] when ; : prefix-1 ( reg rex.w -- ) [ drop 16-prefix ] [ [ f ] 2dip rex-prefix ] 2bi ; @@ -136,7 +136,7 @@ M: register displacement, drop ; : opcode, ( opcode -- ) dup array? [ % ] [ , ] if ; : extended-opcode ( opcode -- opcode' ) - dup array? [ OCT: 17 prefix ] [ OCT: 17 swap 2array ] if ; + dup array? [ 0o17 prefix ] [ 0o17 swap 2array ] if ; : extended-opcode, ( opcode -- ) extended-opcode opcode, ; @@ -150,7 +150,7 @@ M: register displacement, drop ; first3 [ [ over ] dip prefix-1 ] dip opcode, swap addressing ; : immediate-operand-size-bit ( dst imm reg,rex.w,opcode -- imm dst reg,rex.w,opcode ) - over integer? [ first3 BIN: 1 opcode-or 3array ] when ; + over integer? [ first3 0b1 opcode-or 3array ] when ; : immediate-1* ( dst imm reg,rex.w,opcode -- ) swap [ 1-operand ] dip 1, ; @@ -162,7 +162,7 @@ M: register displacement, drop ; immediate-operand-size-bit swap [ 1-operand ] dip 4, ; : immediate-fits-in-size-bit ( dst imm reg,rex.w,opcode -- imm dst reg,rex.w,opcode ) - over integer? [ first3 BIN: 10 opcode-or 3array ] when ; + over integer? [ first3 0b10 opcode-or 3array ] when ; : immediate-1/4 ( dst imm reg,rex.w,opcode -- ) #! If imm is a byte, compile the opcode and the byte. @@ -181,10 +181,10 @@ M: register displacement, drop ; : direction-bit ( dst src op -- reg operand op' ) pick register? pick register? not and - [ BIN: 10 opcode-or ] [ swapd ] if ; + [ 0b10 opcode-or ] [ swapd ] if ; : operand-size-bit ( reg operand op -- reg operand op' ) - pick register-8? [ BIN: 1 opcode-or ] unless ; + pick register-8? [ 0b1 opcode-or ] unless ; : 2-operand ( dst src op -- ) direction-bit operand-size-bit @@ -194,21 +194,21 @@ M: register displacement, drop ; PRIVATE> ! Segment override prefixes -: CS ( -- ) HEX: 2e , ; -: ES ( -- ) HEX: 26 , ; -: SS ( -- ) HEX: 36 , ; -: FS ( -- ) HEX: 64 , ; -: GS ( -- ) HEX: 65 , ; +: CS ( -- ) 0x2e , ; +: ES ( -- ) 0x26 , ; +: SS ( -- ) 0x36 , ; +: FS ( -- ) 0x64 , ; +: GS ( -- ) 0x65 , ; ! Moving stuff GENERIC: PUSH ( op -- ) -M: register PUSH f HEX: 50 short-operand ; -M: immediate PUSH HEX: 68 , 4, ; -M: operand PUSH { BIN: 110 f HEX: ff } 1-operand ; +M: register PUSH f 0x50 short-operand ; +M: immediate PUSH 0x68 , 4, ; +M: operand PUSH { 0b110 f 0xff } 1-operand ; GENERIC: POP ( op -- ) -M: register POP f HEX: 58 short-operand ; -M: operand POP { BIN: 000 f HEX: 8f } 1-operand ; +M: register POP f 0x58 short-operand ; +M: operand POP { 0b000 f 0x8f } 1-operand ; ! MOV where the src is immediate. GENERIC: MOV ( dst src -- ) M: immediate MOV (MOV-I) ; -M: operand MOV HEX: 88 2-operand ; +M: operand MOV 0x88 2-operand ; ERROR: bad-movabs-operands dst src ; @@ -237,31 +237,31 @@ GENERIC: MOVABS ( dst src -- ) M: object MOVABS bad-movabs-operands ; M: register MOVABS { - { AL [ HEX: a2 , cell, ] } - { AX [ HEX: 66 , HEX: a3 , cell, ] } - { EAX [ HEX: a3 , cell, ] } - { RAX [ HEX: 48 , HEX: a3 , cell, ] } + { AL [ 0xa2 , cell, ] } + { AX [ 0x66 , 0xa3 , cell, ] } + { EAX [ 0xa3 , cell, ] } + { RAX [ 0x48 , 0xa3 , cell, ] } [ swap bad-movabs-operands ] } case ; M: integer MOVABS swap { - { AL [ HEX: a0 , cell, ] } - { AX [ HEX: 66 , HEX: a1 , cell, ] } - { EAX [ HEX: a1 , cell, ] } - { RAX [ HEX: 48 , HEX: a1 , cell, ] } + { AL [ 0xa0 , cell, ] } + { AX [ 0x66 , 0xa1 , cell, ] } + { EAX [ 0xa1 , cell, ] } + { RAX [ 0x48 , 0xa1 , cell, ] } [ swap bad-movabs-operands ] } case ; -: LEA ( dst src -- ) swap HEX: 8d 2-operand ; +: LEA ( dst src -- ) swap 0x8d 2-operand ; ! Control flow GENERIC: JMP ( op -- ) -M: integer JMP HEX: e9 , 4, ; -M: operand JMP { BIN: 100 t HEX: ff } 1-operand ; +M: integer JMP 0xe9 , 4, ; +M: operand JMP { 0b100 t 0xff } 1-operand ; GENERIC: CALL ( op -- ) -M: integer CALL HEX: e8 , 4, ; -M: operand CALL { BIN: 010 t HEX: ff } 1-operand ; +M: integer CALL 0xe8 , 4, ; +M: operand CALL { 0b010 t 0xff } 1-operand ; -: JO ( dst -- ) HEX: 80 JUMPcc ; -: JNO ( dst -- ) HEX: 81 JUMPcc ; -: JB ( dst -- ) HEX: 82 JUMPcc ; -: JAE ( dst -- ) HEX: 83 JUMPcc ; -: JE ( dst -- ) HEX: 84 JUMPcc ; ! aka JZ -: JNE ( dst -- ) HEX: 85 JUMPcc ; -: JBE ( dst -- ) HEX: 86 JUMPcc ; -: JA ( dst -- ) HEX: 87 JUMPcc ; -: JS ( dst -- ) HEX: 88 JUMPcc ; -: JNS ( dst -- ) HEX: 89 JUMPcc ; -: JP ( dst -- ) HEX: 8a JUMPcc ; -: JNP ( dst -- ) HEX: 8b JUMPcc ; -: JL ( dst -- ) HEX: 8c JUMPcc ; -: JGE ( dst -- ) HEX: 8d JUMPcc ; -: JLE ( dst -- ) HEX: 8e JUMPcc ; -: JG ( dst -- ) HEX: 8f JUMPcc ; - -: SETO ( dst -- ) { HEX: 0f HEX: 90 } SETcc ; -: SETNO ( dst -- ) { HEX: 0f HEX: 91 } SETcc ; -: SETB ( dst -- ) { HEX: 0f HEX: 92 } SETcc ; -: SETAE ( dst -- ) { HEX: 0f HEX: 93 } SETcc ; -: SETE ( dst -- ) { HEX: 0f HEX: 94 } SETcc ; -: SETNE ( dst -- ) { HEX: 0f HEX: 95 } SETcc ; -: SETBE ( dst -- ) { HEX: 0f HEX: 96 } SETcc ; -: SETA ( dst -- ) { HEX: 0f HEX: 97 } SETcc ; -: SETS ( dst -- ) { HEX: 0f HEX: 98 } SETcc ; -: SETNS ( dst -- ) { HEX: 0f HEX: 99 } SETcc ; -: SETP ( dst -- ) { HEX: 0f HEX: 9a } SETcc ; -: SETNP ( dst -- ) { HEX: 0f HEX: 9b } SETcc ; -: SETL ( dst -- ) { HEX: 0f HEX: 9c } SETcc ; -: SETGE ( dst -- ) { HEX: 0f HEX: 9d } SETcc ; -: SETLE ( dst -- ) { HEX: 0f HEX: 9e } SETcc ; -: SETG ( dst -- ) { HEX: 0f HEX: 9f } SETcc ; - -: LEAVE ( -- ) HEX: c9 , ; +: JO ( dst -- ) 0x80 JUMPcc ; +: JNO ( dst -- ) 0x81 JUMPcc ; +: JB ( dst -- ) 0x82 JUMPcc ; +: JAE ( dst -- ) 0x83 JUMPcc ; +: JE ( dst -- ) 0x84 JUMPcc ; ! aka JZ +: JNE ( dst -- ) 0x85 JUMPcc ; +: JBE ( dst -- ) 0x86 JUMPcc ; +: JA ( dst -- ) 0x87 JUMPcc ; +: JS ( dst -- ) 0x88 JUMPcc ; +: JNS ( dst -- ) 0x89 JUMPcc ; +: JP ( dst -- ) 0x8a JUMPcc ; +: JNP ( dst -- ) 0x8b JUMPcc ; +: JL ( dst -- ) 0x8c JUMPcc ; +: JGE ( dst -- ) 0x8d JUMPcc ; +: JLE ( dst -- ) 0x8e JUMPcc ; +: JG ( dst -- ) 0x8f JUMPcc ; + +: SETO ( dst -- ) { 0x0f 0x90 } SETcc ; +: SETNO ( dst -- ) { 0x0f 0x91 } SETcc ; +: SETB ( dst -- ) { 0x0f 0x92 } SETcc ; +: SETAE ( dst -- ) { 0x0f 0x93 } SETcc ; +: SETE ( dst -- ) { 0x0f 0x94 } SETcc ; +: SETNE ( dst -- ) { 0x0f 0x95 } SETcc ; +: SETBE ( dst -- ) { 0x0f 0x96 } SETcc ; +: SETA ( dst -- ) { 0x0f 0x97 } SETcc ; +: SETS ( dst -- ) { 0x0f 0x98 } SETcc ; +: SETNS ( dst -- ) { 0x0f 0x99 } SETcc ; +: SETP ( dst -- ) { 0x0f 0x9a } SETcc ; +: SETNP ( dst -- ) { 0x0f 0x9b } SETcc ; +: SETL ( dst -- ) { 0x0f 0x9c } SETcc ; +: SETGE ( dst -- ) { 0x0f 0x9d } SETcc ; +: SETLE ( dst -- ) { 0x0f 0x9e } SETcc ; +: SETG ( dst -- ) { 0x0f 0x9f } SETcc ; + +: LEAVE ( -- ) 0xc9 , ; : RET ( n -- ) - dup zero? [ drop HEX: c3 , ] [ HEX: c2 , 2, ] if ; + dup zero? [ drop 0xc3 , ] [ 0xc2 , 2, ] if ; ! Arithmetic GENERIC: ADD ( dst src -- ) -M: immediate ADD { BIN: 000 t HEX: 80 } immediate-1/4 ; -M: operand ADD OCT: 000 2-operand ; +M: immediate ADD { 0b000 t 0x80 } immediate-1/4 ; +M: operand ADD 0o000 2-operand ; GENERIC: OR ( dst src -- ) -M: immediate OR { BIN: 001 t HEX: 80 } immediate-1/4 ; -M: operand OR OCT: 010 2-operand ; +M: immediate OR { 0b001 t 0x80 } immediate-1/4 ; +M: operand OR 0o010 2-operand ; GENERIC: ADC ( dst src -- ) -M: immediate ADC { BIN: 010 t HEX: 80 } immediate-1/4 ; -M: operand ADC OCT: 020 2-operand ; +M: immediate ADC { 0b010 t 0x80 } immediate-1/4 ; +M: operand ADC 0o020 2-operand ; GENERIC: SBB ( dst src -- ) -M: immediate SBB { BIN: 011 t HEX: 80 } immediate-1/4 ; -M: operand SBB OCT: 030 2-operand ; +M: immediate SBB { 0b011 t 0x80 } immediate-1/4 ; +M: operand SBB 0o030 2-operand ; GENERIC: AND ( dst src -- ) -M: immediate AND { BIN: 100 t HEX: 80 } immediate-1/4 ; -M: operand AND OCT: 040 2-operand ; +M: immediate AND { 0b100 t 0x80 } immediate-1/4 ; +M: operand AND 0o040 2-operand ; GENERIC: SUB ( dst src -- ) -M: immediate SUB { BIN: 101 t HEX: 80 } immediate-1/4 ; -M: operand SUB OCT: 050 2-operand ; +M: immediate SUB { 0b101 t 0x80 } immediate-1/4 ; +M: operand SUB 0o050 2-operand ; GENERIC: XOR ( dst src -- ) -M: immediate XOR { BIN: 110 t HEX: 80 } immediate-1/4 ; -M: operand XOR OCT: 060 2-operand ; +M: immediate XOR { 0b110 t 0x80 } immediate-1/4 ; +M: operand XOR 0o060 2-operand ; GENERIC: CMP ( dst src -- ) -M: immediate CMP { BIN: 111 t HEX: 80 } immediate-1/4 ; -M: operand CMP OCT: 070 2-operand ; +M: immediate CMP { 0b111 t 0x80 } immediate-1/4 ; +M: operand CMP 0o070 2-operand ; GENERIC: TEST ( dst src -- ) -M: immediate TEST { BIN: 0 t HEX: f7 } immediate-4 ; -M: operand TEST OCT: 204 2-operand ; +M: immediate TEST { 0b0 t 0xf7 } immediate-4 ; +M: operand TEST 0o204 2-operand ; -: XCHG ( dst src -- ) OCT: 207 2-operand ; +: XCHG ( dst src -- ) 0o207 2-operand ; -: BSR ( dst src -- ) { HEX: 0f HEX: bd } (2-operand) ; +: BSR ( dst src -- ) { 0x0f 0xbd } (2-operand) ; GENERIC: BT ( value n -- ) -M: immediate BT ( value n -- ) { BIN: 100 t { HEX: 0f HEX: ba } } immediate-1* ; -M: operand BT ( value n -- ) swap { HEX: 0f HEX: a3 } (2-operand) ; +M: immediate BT ( value n -- ) { 0b100 t { 0x0f 0xba } } immediate-1* ; +M: operand BT ( value n -- ) swap { 0x0f 0xa3 } (2-operand) ; GENERIC: BTC ( value n -- ) -M: immediate BTC ( value n -- ) { BIN: 111 t { HEX: 0f HEX: ba } } immediate-1* ; -M: operand BTC ( value n -- ) swap { HEX: 0f HEX: bb } (2-operand) ; +M: immediate BTC ( value n -- ) { 0b111 t { 0x0f 0xba } } immediate-1* ; +M: operand BTC ( value n -- ) swap { 0x0f 0xbb } (2-operand) ; GENERIC: BTR ( value n -- ) -M: immediate BTR ( value n -- ) { BIN: 110 t { HEX: 0f HEX: ba } } immediate-1* ; -M: operand BTR ( value n -- ) swap { HEX: 0f HEX: b3 } (2-operand) ; +M: immediate BTR ( value n -- ) { 0b110 t { 0x0f 0xba } } immediate-1* ; +M: operand BTR ( value n -- ) swap { 0x0f 0xb3 } (2-operand) ; GENERIC: BTS ( value n -- ) -M: immediate BTS ( value n -- ) { BIN: 101 t { HEX: 0f HEX: ba } } immediate-1* ; -M: operand BTS ( value n -- ) swap { HEX: 0f HEX: ab } (2-operand) ; +M: immediate BTS ( value n -- ) { 0b101 t { 0x0f 0xba } } immediate-1* ; +M: operand BTS ( value n -- ) swap { 0x0f 0xab } (2-operand) ; -: NOT ( dst -- ) { BIN: 010 t HEX: f7 } 1-operand ; -: NEG ( dst -- ) { BIN: 011 t HEX: f7 } 1-operand ; -: MUL ( dst -- ) { BIN: 100 t HEX: f7 } 1-operand ; -: IMUL ( src -- ) { BIN: 101 t HEX: f7 } 1-operand ; -: DIV ( dst -- ) { BIN: 110 t HEX: f7 } 1-operand ; -: IDIV ( src -- ) { BIN: 111 t HEX: f7 } 1-operand ; +: NOT ( dst -- ) { 0b010 t 0xf7 } 1-operand ; +: NEG ( dst -- ) { 0b011 t 0xf7 } 1-operand ; +: MUL ( dst -- ) { 0b100 t 0xf7 } 1-operand ; +: IMUL ( src -- ) { 0b101 t 0xf7 } 1-operand ; +: DIV ( dst -- ) { 0b110 t 0xf7 } 1-operand ; +: IDIV ( src -- ) { 0b111 t 0xf7 } 1-operand ; -: CDQ ( -- ) HEX: 99 , ; -: CQO ( -- ) HEX: 48 , CDQ ; +: CDQ ( -- ) 0x99 , ; +: CQO ( -- ) 0x48 , CDQ ; -: ROL ( dst n -- ) BIN: 000 (SHIFT) ; -: ROR ( dst n -- ) BIN: 001 (SHIFT) ; -: RCL ( dst n -- ) BIN: 010 (SHIFT) ; -: RCR ( dst n -- ) BIN: 011 (SHIFT) ; -: SHL ( dst n -- ) BIN: 100 (SHIFT) ; -: SHR ( dst n -- ) BIN: 101 (SHIFT) ; -: SAR ( dst n -- ) BIN: 111 (SHIFT) ; +: ROL ( dst n -- ) 0b000 (SHIFT) ; +: ROR ( dst n -- ) 0b001 (SHIFT) ; +: RCL ( dst n -- ) 0b010 (SHIFT) ; +: RCR ( dst n -- ) 0b011 (SHIFT) ; +: SHL ( dst n -- ) 0b100 (SHIFT) ; +: SHR ( dst n -- ) 0b101 (SHIFT) ; +: SAR ( dst n -- ) 0b111 (SHIFT) ; : IMUL2 ( dst src -- ) - OCT: 257 extended-opcode (2-operand) ; + 0o257 extended-opcode (2-operand) ; : IMUL3 ( dst src imm -- ) dup fits-in-byte? [ - [ swap HEX: 6a 2-operand ] dip 1, + [ swap 0x6a 2-operand ] dip 1, ] [ - [ swap HEX: 68 2-operand ] dip 4, + [ swap 0x68 2-operand ] dip 4, ] if ; : MOVSX ( dst src -- ) - dup register-32? OCT: 143 OCT: 276 extended-opcode ? - over register-16? [ BIN: 1 opcode-or ] when + dup register-32? 0o143 0o276 extended-opcode ? + over register-16? [ 0b1 opcode-or ] when (2-operand) ; : MOVZX ( dst src -- ) - OCT: 266 extended-opcode - over register-16? [ BIN: 1 opcode-or ] when + 0o266 extended-opcode + over register-16? [ 0b1 opcode-or ] when (2-operand) ; ! Conditional move : MOVcc ( dst src cc -- ) extended-opcode (2-operand) ; -: CMOVO ( dst src -- ) HEX: 40 MOVcc ; -: CMOVNO ( dst src -- ) HEX: 41 MOVcc ; -: CMOVB ( dst src -- ) HEX: 42 MOVcc ; -: CMOVAE ( dst src -- ) HEX: 43 MOVcc ; -: CMOVE ( dst src -- ) HEX: 44 MOVcc ; ! aka CMOVZ -: CMOVNE ( dst src -- ) HEX: 45 MOVcc ; -: CMOVBE ( dst src -- ) HEX: 46 MOVcc ; -: CMOVA ( dst src -- ) HEX: 47 MOVcc ; -: CMOVS ( dst src -- ) HEX: 48 MOVcc ; -: CMOVNS ( dst src -- ) HEX: 49 MOVcc ; -: CMOVP ( dst src -- ) HEX: 4a MOVcc ; -: CMOVNP ( dst src -- ) HEX: 4b MOVcc ; -: CMOVL ( dst src -- ) HEX: 4c MOVcc ; -: CMOVGE ( dst src -- ) HEX: 4d MOVcc ; -: CMOVLE ( dst src -- ) HEX: 4e MOVcc ; -: CMOVG ( dst src -- ) HEX: 4f MOVcc ; +: CMOVO ( dst src -- ) 0x40 MOVcc ; +: CMOVNO ( dst src -- ) 0x41 MOVcc ; +: CMOVB ( dst src -- ) 0x42 MOVcc ; +: CMOVAE ( dst src -- ) 0x43 MOVcc ; +: CMOVE ( dst src -- ) 0x44 MOVcc ; ! aka CMOVZ +: CMOVNE ( dst src -- ) 0x45 MOVcc ; +: CMOVBE ( dst src -- ) 0x46 MOVcc ; +: CMOVA ( dst src -- ) 0x47 MOVcc ; +: CMOVS ( dst src -- ) 0x48 MOVcc ; +: CMOVNS ( dst src -- ) 0x49 MOVcc ; +: CMOVP ( dst src -- ) 0x4a MOVcc ; +: CMOVNP ( dst src -- ) 0x4b MOVcc ; +: CMOVL ( dst src -- ) 0x4c MOVcc ; +: CMOVGE ( dst src -- ) 0x4d MOVcc ; +: CMOVLE ( dst src -- ) 0x4e MOVcc ; +: CMOVG ( dst src -- ) 0x4f MOVcc ; ! CPU Identification -: CPUID ( -- ) HEX: a2 extended-opcode, ; +: CPUID ( -- ) 0xa2 extended-opcode, ; ! Misc -: NOP ( -- ) HEX: 90 , ; -: PAUSE ( -- ) HEX: f3 , HEX: 90 , ; +: NOP ( -- ) 0x90 , ; +: PAUSE ( -- ) 0xf3 , 0x90 , ; -: RDTSC ( -- ) HEX: 0f , HEX: 31 , ; -: RDPMC ( -- ) HEX: 0f , HEX: 33 , ; +: RDTSC ( -- ) 0x0f , 0x31 , ; +: RDPMC ( -- ) 0x0f , 0x33 , ; ! x87 Floating Point Unit -: FSTPS ( operand -- ) { BIN: 011 f HEX: d9 } 1-operand ; -: FSTPL ( operand -- ) { BIN: 011 f HEX: dd } 1-operand ; +: FSTPS ( operand -- ) { 0b011 f 0xd9 } 1-operand ; +: FSTPL ( operand -- ) { 0b011 f 0xdd } 1-operand ; -: FLDS ( operand -- ) { BIN: 000 f HEX: d9 } 1-operand ; -: FLDL ( operand -- ) { BIN: 000 f HEX: dd } 1-operand ; +: FLDS ( operand -- ) { 0b000 f 0xd9 } 1-operand ; +: FLDL ( operand -- ) { 0b000 f 0xdd } 1-operand ; -: FNSTCW ( operand -- ) { BIN: 111 f HEX: d9 } 1-operand ; -: FNSTSW ( operand -- ) { BIN: 111 f HEX: dd } 1-operand ; -: FLDCW ( operand -- ) { BIN: 101 f HEX: d9 } 1-operand ; +: FNSTCW ( operand -- ) { 0b111 f 0xd9 } 1-operand ; +: FNSTSW ( operand -- ) { 0b111 f 0xdd } 1-operand ; +: FLDCW ( operand -- ) { 0b101 f 0xd9 } 1-operand ; -: FNCLEX ( -- ) HEX: db , HEX: e2 , ; -: FNINIT ( -- ) HEX: db , HEX: e3 , ; +: FNCLEX ( -- ) 0xdb , 0xe2 , ; +: FNINIT ( -- ) 0xdb , 0xe3 , ; ERROR: bad-x87-operands ; @@ -472,7 +472,7 @@ ERROR: bad-x87-operands ; :: (x87-op) ( operand opcode reg -- ) opcode , - BIN: 1100,0000 reg + 0b1100,0000 reg 3 shift bitor operand reg-code bitor , ; @@ -497,74 +497,74 @@ ERROR: bad-x87-operands ; PRIVATE> -: F2XM1 ( -- ) { HEX: D9 HEX: F0 } % ; -: FABS ( -- ) { HEX: D9 HEX: E1 } % ; -: FADD ( dst src -- ) HEX: D8 0 x87-m-st0/n-op ; -: FCHS ( -- ) { HEX: D9 HEX: E0 } % ; - -: FCMOVB ( src -- ) HEX: DA 0 x87-st0-op ; -: FCMOVE ( src -- ) HEX: DA 1 x87-st0-op ; -: FCMOVBE ( src -- ) HEX: DA 2 x87-st0-op ; -: FCMOVU ( src -- ) HEX: DA 3 x87-st0-op ; -: FCMOVNB ( src -- ) HEX: DB 0 x87-st0-op ; -: FCMOVNE ( src -- ) HEX: DB 1 x87-st0-op ; -: FCMOVNBE ( src -- ) HEX: DB 2 x87-st0-op ; -: FCMOVNU ( src -- ) HEX: DB 3 x87-st0-op ; - -: FCOMI ( src -- ) HEX: DB 6 x87-st0-op ; -: FUCOMI ( src -- ) HEX: DB 5 x87-st0-op ; -: FCOS ( -- ) { HEX: D9 HEX: FF } % ; -: FDECSTP ( -- ) { HEX: D9 HEX: F6 } % ; -: FINCSTP ( -- ) { HEX: D9 HEX: F7 } % ; -: FDIV ( dst src -- ) HEX: D8 6 x87-m-st0/n-op ; -: FDIVR ( dst src -- ) HEX: D8 7 x87-m-st0/n-op ; - -: FILDD ( src -- ) { BIN: 000 f HEX: DB } 1-operand ; -: FILDQ ( src -- ) { BIN: 101 f HEX: DF } 1-operand ; -: FISTPD ( dst -- ) { BIN: 011 f HEX: DB } 1-operand ; -: FISTPQ ( dst -- ) { BIN: 111 f HEX: DF } 1-operand ; -: FISTTPD ( dst -- ) { BIN: 001 f HEX: DB } 1-operand ; -: FISTTPQ ( dst -- ) { BIN: 001 f HEX: DF } 1-operand ; - -: FLD ( src -- ) HEX: D9 0 x87-st0-op ; -: FLD1 ( -- ) { HEX: D9 HEX: E8 } % ; -: FLDL2T ( -- ) { HEX: D9 HEX: E9 } % ; -: FLDL2E ( -- ) { HEX: D9 HEX: EA } % ; -: FLDPI ( -- ) { HEX: D9 HEX: EB } % ; -: FLDLG2 ( -- ) { HEX: D9 HEX: EC } % ; -: FLDLN2 ( -- ) { HEX: D9 HEX: ED } % ; -: FLDZ ( -- ) { HEX: D9 HEX: EE } % ; - -: FMUL ( dst src -- ) HEX: D8 1 x87-m-st0/n-op ; -: FNOP ( -- ) { HEX: D9 HEX: D0 } % ; -: FPATAN ( -- ) { HEX: D9 HEX: F3 } % ; -: FPREM ( -- ) { HEX: D9 HEX: F8 } % ; -: FPREM1 ( -- ) { HEX: D9 HEX: F5 } % ; -: FRNDINT ( -- ) { HEX: D9 HEX: FC } % ; -: FSCALE ( -- ) { HEX: D9 HEX: FD } % ; -: FSIN ( -- ) { HEX: D9 HEX: FE } % ; -: FSINCOS ( -- ) { HEX: D9 HEX: FB } % ; -: FSQRT ( -- ) { HEX: D9 HEX: FA } % ; - -: FSUB ( dst src -- ) HEX: D8 HEX: 4 x87-m-st0/n-op ; -: FSUBR ( dst src -- ) HEX: D8 HEX: 5 x87-m-st0/n-op ; - -: FST ( src -- ) HEX: DD 2 x87-st0-op ; -: FSTP ( src -- ) HEX: DD 3 x87-st0-op ; - -: FXAM ( -- ) { HEX: D9 HEX: E5 } % ; -: FXCH ( src -- ) HEX: D9 1 x87-st0-op ; - -: FXTRACT ( -- ) { HEX: D9 HEX: F4 } % ; -: FYL2X ( -- ) { HEX: D9 HEX: F1 } % ; -: FYL2XP1 ( -- ) { HEX: D9 HEX: F1 } % ; +: F2XM1 ( -- ) { 0xD9 0xF0 } % ; +: FABS ( -- ) { 0xD9 0xE1 } % ; +: FADD ( dst src -- ) 0xD8 0 x87-m-st0/n-op ; +: FCHS ( -- ) { 0xD9 0xE0 } % ; + +: FCMOVB ( src -- ) 0xDA 0 x87-st0-op ; +: FCMOVE ( src -- ) 0xDA 1 x87-st0-op ; +: FCMOVBE ( src -- ) 0xDA 2 x87-st0-op ; +: FCMOVU ( src -- ) 0xDA 3 x87-st0-op ; +: FCMOVNB ( src -- ) 0xDB 0 x87-st0-op ; +: FCMOVNE ( src -- ) 0xDB 1 x87-st0-op ; +: FCMOVNBE ( src -- ) 0xDB 2 x87-st0-op ; +: FCMOVNU ( src -- ) 0xDB 3 x87-st0-op ; + +: FCOMI ( src -- ) 0xDB 6 x87-st0-op ; +: FUCOMI ( src -- ) 0xDB 5 x87-st0-op ; +: FCOS ( -- ) { 0xD9 0xFF } % ; +: FDECSTP ( -- ) { 0xD9 0xF6 } % ; +: FINCSTP ( -- ) { 0xD9 0xF7 } % ; +: FDIV ( dst src -- ) 0xD8 6 x87-m-st0/n-op ; +: FDIVR ( dst src -- ) 0xD8 7 x87-m-st0/n-op ; + +: FILDD ( src -- ) { 0b000 f 0xDB } 1-operand ; +: FILDQ ( src -- ) { 0b101 f 0xDF } 1-operand ; +: FISTPD ( dst -- ) { 0b011 f 0xDB } 1-operand ; +: FISTPQ ( dst -- ) { 0b111 f 0xDF } 1-operand ; +: FISTTPD ( dst -- ) { 0b001 f 0xDB } 1-operand ; +: FISTTPQ ( dst -- ) { 0b001 f 0xDF } 1-operand ; + +: FLD ( src -- ) 0xD9 0 x87-st0-op ; +: FLD1 ( -- ) { 0xD9 0xE8 } % ; +: FLDL2T ( -- ) { 0xD9 0xE9 } % ; +: FLDL2E ( -- ) { 0xD9 0xEA } % ; +: FLDPI ( -- ) { 0xD9 0xEB } % ; +: FLDLG2 ( -- ) { 0xD9 0xEC } % ; +: FLDLN2 ( -- ) { 0xD9 0xED } % ; +: FLDZ ( -- ) { 0xD9 0xEE } % ; + +: FMUL ( dst src -- ) 0xD8 1 x87-m-st0/n-op ; +: FNOP ( -- ) { 0xD9 0xD0 } % ; +: FPATAN ( -- ) { 0xD9 0xF3 } % ; +: FPREM ( -- ) { 0xD9 0xF8 } % ; +: FPREM1 ( -- ) { 0xD9 0xF5 } % ; +: FRNDINT ( -- ) { 0xD9 0xFC } % ; +: FSCALE ( -- ) { 0xD9 0xFD } % ; +: FSIN ( -- ) { 0xD9 0xFE } % ; +: FSINCOS ( -- ) { 0xD9 0xFB } % ; +: FSQRT ( -- ) { 0xD9 0xFA } % ; + +: FSUB ( dst src -- ) 0xD8 0x4 x87-m-st0/n-op ; +: FSUBR ( dst src -- ) 0xD8 0x5 x87-m-st0/n-op ; + +: FST ( src -- ) 0xDD 2 x87-st0-op ; +: FSTP ( src -- ) 0xDD 3 x87-st0-op ; + +: FXAM ( -- ) { 0xD9 0xE5 } % ; +: FXCH ( src -- ) 0xD9 1 x87-st0-op ; + +: FXTRACT ( -- ) { 0xD9 0xF4 } % ; +: FYL2X ( -- ) { 0xD9 0xF1 } % ; +: FYL2XP1 ( -- ) { 0xD9 0xF1 } % ; ! SSE multimedia instructions : 2-operand-sse-shift ( dst imm reg op1 op2 -- ) [ , ] when* - [ f HEX: 0f ] dip 2array 3array + [ f 0x0f ] dip 2array 3array swapd 1-operand , ; PRIVATE> -: MOVUPS ( dest src -- ) HEX: 10 f 2-operand-sse ; -: MOVUPD ( dest src -- ) HEX: 10 HEX: 66 2-operand-sse ; -: MOVSD ( dest src -- ) HEX: 10 HEX: f2 2-operand-sse ; -: MOVSS ( dest src -- ) HEX: 10 HEX: f3 2-operand-sse ; -: MOVLPS ( dest src -- ) HEX: 12 f 2-operand-sse ; -: MOVLPD ( dest src -- ) HEX: 12 HEX: 66 2-operand-sse ; -: MOVDDUP ( dest src -- ) HEX: 12 HEX: f2 2-operand-rm-sse ; -: MOVSLDUP ( dest src -- ) HEX: 12 HEX: f3 2-operand-rm-sse ; -: UNPCKLPS ( dest src -- ) HEX: 14 f 2-operand-rm-sse ; -: UNPCKLPD ( dest src -- ) HEX: 14 HEX: 66 2-operand-rm-sse ; -: UNPCKHPS ( dest src -- ) HEX: 15 f 2-operand-rm-sse ; -: UNPCKHPD ( dest src -- ) HEX: 15 HEX: 66 2-operand-rm-sse ; -: MOVHPS ( dest src -- ) HEX: 16 f 2-operand-sse ; -: MOVHPD ( dest src -- ) HEX: 16 HEX: 66 2-operand-sse ; -: MOVSHDUP ( dest src -- ) HEX: 16 HEX: f3 2-operand-rm-sse ; +: MOVUPS ( dest src -- ) 0x10 f 2-operand-sse ; +: MOVUPD ( dest src -- ) 0x10 0x66 2-operand-sse ; +: MOVSD ( dest src -- ) 0x10 0xf2 2-operand-sse ; +: MOVSS ( dest src -- ) 0x10 0xf3 2-operand-sse ; +: MOVLPS ( dest src -- ) 0x12 f 2-operand-sse ; +: MOVLPD ( dest src -- ) 0x12 0x66 2-operand-sse ; +: MOVDDUP ( dest src -- ) 0x12 0xf2 2-operand-rm-sse ; +: MOVSLDUP ( dest src -- ) 0x12 0xf3 2-operand-rm-sse ; +: UNPCKLPS ( dest src -- ) 0x14 f 2-operand-rm-sse ; +: UNPCKLPD ( dest src -- ) 0x14 0x66 2-operand-rm-sse ; +: UNPCKHPS ( dest src -- ) 0x15 f 2-operand-rm-sse ; +: UNPCKHPD ( dest src -- ) 0x15 0x66 2-operand-rm-sse ; +: MOVHPS ( dest src -- ) 0x16 f 2-operand-sse ; +: MOVHPD ( dest src -- ) 0x16 0x66 2-operand-sse ; +: MOVSHDUP ( dest src -- ) 0x16 0xf3 2-operand-rm-sse ; ALIAS: MOVHLPS MOVLPS ALIAS: MOVLHPS MOVHPS -: PREFETCHNTA ( mem -- ) { BIN: 000 f { HEX: 0f HEX: 18 } } 1-operand ; -: PREFETCHT0 ( mem -- ) { BIN: 001 f { HEX: 0f HEX: 18 } } 1-operand ; -: PREFETCHT1 ( mem -- ) { BIN: 010 f { HEX: 0f HEX: 18 } } 1-operand ; -: PREFETCHT2 ( mem -- ) { BIN: 011 f { HEX: 0f HEX: 18 } } 1-operand ; - -: MOVAPS ( dest src -- ) HEX: 28 f 2-operand-sse ; -: MOVAPD ( dest src -- ) HEX: 28 HEX: 66 2-operand-sse ; -: CVTSI2SD ( dest src -- ) HEX: 2a HEX: f2 2-operand-int/sse ; -: CVTSI2SS ( dest src -- ) HEX: 2a HEX: f3 2-operand-int/sse ; -: MOVNTPS ( dest src -- ) HEX: 2b f 2-operand-mr-sse ; -: MOVNTPD ( dest src -- ) HEX: 2b HEX: 66 2-operand-mr-sse ; -: CVTTSD2SI ( dest src -- ) HEX: 2c HEX: f2 2-operand-int/sse ; -: CVTTSS2SI ( dest src -- ) HEX: 2c HEX: f3 2-operand-int/sse ; -: CVTSD2SI ( dest src -- ) HEX: 2d HEX: f2 2-operand-int/sse ; -: CVTSS2SI ( dest src -- ) HEX: 2d HEX: f3 2-operand-int/sse ; -: UCOMISS ( dest src -- ) HEX: 2e f 2-operand-rm-sse ; -: UCOMISD ( dest src -- ) HEX: 2e HEX: 66 2-operand-rm-sse ; -: COMISS ( dest src -- ) HEX: 2f f 2-operand-rm-sse ; -: COMISD ( dest src -- ) HEX: 2f HEX: 66 2-operand-rm-sse ; - -: PSHUFB ( dest src -- ) { HEX: 38 HEX: 00 } HEX: 66 2-operand-rm-sse ; -: PHADDW ( dest src -- ) { HEX: 38 HEX: 01 } HEX: 66 2-operand-rm-sse ; -: PHADDD ( dest src -- ) { HEX: 38 HEX: 02 } HEX: 66 2-operand-rm-sse ; -: PHADDSW ( dest src -- ) { HEX: 38 HEX: 03 } HEX: 66 2-operand-rm-sse ; -: PMADDUBSW ( dest src -- ) { HEX: 38 HEX: 04 } HEX: 66 2-operand-rm-sse ; -: PHSUBW ( dest src -- ) { HEX: 38 HEX: 05 } HEX: 66 2-operand-rm-sse ; -: PHSUBD ( dest src -- ) { HEX: 38 HEX: 06 } HEX: 66 2-operand-rm-sse ; -: PHSUBSW ( dest src -- ) { HEX: 38 HEX: 07 } HEX: 66 2-operand-rm-sse ; -: PSIGNB ( dest src -- ) { HEX: 38 HEX: 08 } HEX: 66 2-operand-rm-sse ; -: PSIGNW ( dest src -- ) { HEX: 38 HEX: 09 } HEX: 66 2-operand-rm-sse ; -: PSIGND ( dest src -- ) { HEX: 38 HEX: 0a } HEX: 66 2-operand-rm-sse ; -: PMULHRSW ( dest src -- ) { HEX: 38 HEX: 0b } HEX: 66 2-operand-rm-sse ; -: PBLENDVB ( dest src -- ) { HEX: 38 HEX: 10 } HEX: 66 2-operand-rm-sse ; -: BLENDVPS ( dest src -- ) { HEX: 38 HEX: 14 } HEX: 66 2-operand-rm-sse ; -: BLENDVPD ( dest src -- ) { HEX: 38 HEX: 15 } HEX: 66 2-operand-rm-sse ; -: PTEST ( dest src -- ) { HEX: 38 HEX: 17 } HEX: 66 2-operand-rm-sse ; -: PABSB ( dest src -- ) { HEX: 38 HEX: 1c } HEX: 66 2-operand-rm-sse ; -: PABSW ( dest src -- ) { HEX: 38 HEX: 1d } HEX: 66 2-operand-rm-sse ; -: PABSD ( dest src -- ) { HEX: 38 HEX: 1e } HEX: 66 2-operand-rm-sse ; -: PMOVSXBW ( dest src -- ) { HEX: 38 HEX: 20 } HEX: 66 2-operand-rm-sse ; -: PMOVSXBD ( dest src -- ) { HEX: 38 HEX: 21 } HEX: 66 2-operand-rm-sse ; -: PMOVSXBQ ( dest src -- ) { HEX: 38 HEX: 22 } HEX: 66 2-operand-rm-sse ; -: PMOVSXWD ( dest src -- ) { HEX: 38 HEX: 23 } HEX: 66 2-operand-rm-sse ; -: PMOVSXWQ ( dest src -- ) { HEX: 38 HEX: 24 } HEX: 66 2-operand-rm-sse ; -: PMOVSXDQ ( dest src -- ) { HEX: 38 HEX: 25 } HEX: 66 2-operand-rm-sse ; -: PMULDQ ( dest src -- ) { HEX: 38 HEX: 28 } HEX: 66 2-operand-rm-sse ; -: PCMPEQQ ( dest src -- ) { HEX: 38 HEX: 29 } HEX: 66 2-operand-rm-sse ; -: MOVNTDQA ( dest src -- ) { HEX: 38 HEX: 2a } HEX: 66 2-operand-rm-sse ; -: PACKUSDW ( dest src -- ) { HEX: 38 HEX: 2b } HEX: 66 2-operand-rm-sse ; -: PMOVZXBW ( dest src -- ) { HEX: 38 HEX: 30 } HEX: 66 2-operand-rm-sse ; -: PMOVZXBD ( dest src -- ) { HEX: 38 HEX: 31 } HEX: 66 2-operand-rm-sse ; -: PMOVZXBQ ( dest src -- ) { HEX: 38 HEX: 32 } HEX: 66 2-operand-rm-sse ; -: PMOVZXWD ( dest src -- ) { HEX: 38 HEX: 33 } HEX: 66 2-operand-rm-sse ; -: PMOVZXWQ ( dest src -- ) { HEX: 38 HEX: 34 } HEX: 66 2-operand-rm-sse ; -: PMOVZXDQ ( dest src -- ) { HEX: 38 HEX: 35 } HEX: 66 2-operand-rm-sse ; -: PCMPGTQ ( dest src -- ) { HEX: 38 HEX: 37 } HEX: 66 2-operand-rm-sse ; -: PMINSB ( dest src -- ) { HEX: 38 HEX: 38 } HEX: 66 2-operand-rm-sse ; -: PMINSD ( dest src -- ) { HEX: 38 HEX: 39 } HEX: 66 2-operand-rm-sse ; -: PMINUW ( dest src -- ) { HEX: 38 HEX: 3a } HEX: 66 2-operand-rm-sse ; -: PMINUD ( dest src -- ) { HEX: 38 HEX: 3b } HEX: 66 2-operand-rm-sse ; -: PMAXSB ( dest src -- ) { HEX: 38 HEX: 3c } HEX: 66 2-operand-rm-sse ; -: PMAXSD ( dest src -- ) { HEX: 38 HEX: 3d } HEX: 66 2-operand-rm-sse ; -: PMAXUW ( dest src -- ) { HEX: 38 HEX: 3e } HEX: 66 2-operand-rm-sse ; -: PMAXUD ( dest src -- ) { HEX: 38 HEX: 3f } HEX: 66 2-operand-rm-sse ; -: PMULLD ( dest src -- ) { HEX: 38 HEX: 40 } HEX: 66 2-operand-rm-sse ; -: PHMINPOSUW ( dest src -- ) { HEX: 38 HEX: 41 } HEX: 66 2-operand-rm-sse ; -: CRC32B ( dest src -- ) { HEX: 38 HEX: f0 } HEX: f2 2-operand-rm-sse ; -: CRC32 ( dest src -- ) { HEX: 38 HEX: f1 } HEX: f2 2-operand-rm-sse ; - -: ROUNDPS ( dest src imm -- ) { HEX: 3a HEX: 08 } HEX: 66 3-operand-rm-sse ; -: ROUNDPD ( dest src imm -- ) { HEX: 3a HEX: 09 } HEX: 66 3-operand-rm-sse ; -: ROUNDSS ( dest src imm -- ) { HEX: 3a HEX: 0a } HEX: 66 3-operand-rm-sse ; -: ROUNDSD ( dest src imm -- ) { HEX: 3a HEX: 0b } HEX: 66 3-operand-rm-sse ; -: BLENDPS ( dest src imm -- ) { HEX: 3a HEX: 0c } HEX: 66 3-operand-rm-sse ; -: BLENDPD ( dest src imm -- ) { HEX: 3a HEX: 0d } HEX: 66 3-operand-rm-sse ; -: PBLENDW ( dest src imm -- ) { HEX: 3a HEX: 0e } HEX: 66 3-operand-rm-sse ; -: PALIGNR ( dest src imm -- ) { HEX: 3a HEX: 0f } HEX: 66 3-operand-rm-sse ; - -: PEXTRB ( dest src imm -- ) { HEX: 3a HEX: 14 } HEX: 66 3-operand-mr-sse ; +: PREFETCHNTA ( mem -- ) { 0b000 f { 0x0f 0x18 } } 1-operand ; +: PREFETCHT0 ( mem -- ) { 0b001 f { 0x0f 0x18 } } 1-operand ; +: PREFETCHT1 ( mem -- ) { 0b010 f { 0x0f 0x18 } } 1-operand ; +: PREFETCHT2 ( mem -- ) { 0b011 f { 0x0f 0x18 } } 1-operand ; + +: MOVAPS ( dest src -- ) 0x28 f 2-operand-sse ; +: MOVAPD ( dest src -- ) 0x28 0x66 2-operand-sse ; +: CVTSI2SD ( dest src -- ) 0x2a 0xf2 2-operand-int/sse ; +: CVTSI2SS ( dest src -- ) 0x2a 0xf3 2-operand-int/sse ; +: MOVNTPS ( dest src -- ) 0x2b f 2-operand-mr-sse ; +: MOVNTPD ( dest src -- ) 0x2b 0x66 2-operand-mr-sse ; +: CVTTSD2SI ( dest src -- ) 0x2c 0xf2 2-operand-int/sse ; +: CVTTSS2SI ( dest src -- ) 0x2c 0xf3 2-operand-int/sse ; +: CVTSD2SI ( dest src -- ) 0x2d 0xf2 2-operand-int/sse ; +: CVTSS2SI ( dest src -- ) 0x2d 0xf3 2-operand-int/sse ; +: UCOMISS ( dest src -- ) 0x2e f 2-operand-rm-sse ; +: UCOMISD ( dest src -- ) 0x2e 0x66 2-operand-rm-sse ; +: COMISS ( dest src -- ) 0x2f f 2-operand-rm-sse ; +: COMISD ( dest src -- ) 0x2f 0x66 2-operand-rm-sse ; + +: PSHUFB ( dest src -- ) { 0x38 0x00 } 0x66 2-operand-rm-sse ; +: PHADDW ( dest src -- ) { 0x38 0x01 } 0x66 2-operand-rm-sse ; +: PHADDD ( dest src -- ) { 0x38 0x02 } 0x66 2-operand-rm-sse ; +: PHADDSW ( dest src -- ) { 0x38 0x03 } 0x66 2-operand-rm-sse ; +: PMADDUBSW ( dest src -- ) { 0x38 0x04 } 0x66 2-operand-rm-sse ; +: PHSUBW ( dest src -- ) { 0x38 0x05 } 0x66 2-operand-rm-sse ; +: PHSUBD ( dest src -- ) { 0x38 0x06 } 0x66 2-operand-rm-sse ; +: PHSUBSW ( dest src -- ) { 0x38 0x07 } 0x66 2-operand-rm-sse ; +: PSIGNB ( dest src -- ) { 0x38 0x08 } 0x66 2-operand-rm-sse ; +: PSIGNW ( dest src -- ) { 0x38 0x09 } 0x66 2-operand-rm-sse ; +: PSIGND ( dest src -- ) { 0x38 0x0a } 0x66 2-operand-rm-sse ; +: PMULHRSW ( dest src -- ) { 0x38 0x0b } 0x66 2-operand-rm-sse ; +: PBLENDVB ( dest src -- ) { 0x38 0x10 } 0x66 2-operand-rm-sse ; +: BLENDVPS ( dest src -- ) { 0x38 0x14 } 0x66 2-operand-rm-sse ; +: BLENDVPD ( dest src -- ) { 0x38 0x15 } 0x66 2-operand-rm-sse ; +: PTEST ( dest src -- ) { 0x38 0x17 } 0x66 2-operand-rm-sse ; +: PABSB ( dest src -- ) { 0x38 0x1c } 0x66 2-operand-rm-sse ; +: PABSW ( dest src -- ) { 0x38 0x1d } 0x66 2-operand-rm-sse ; +: PABSD ( dest src -- ) { 0x38 0x1e } 0x66 2-operand-rm-sse ; +: PMOVSXBW ( dest src -- ) { 0x38 0x20 } 0x66 2-operand-rm-sse ; +: PMOVSXBD ( dest src -- ) { 0x38 0x21 } 0x66 2-operand-rm-sse ; +: PMOVSXBQ ( dest src -- ) { 0x38 0x22 } 0x66 2-operand-rm-sse ; +: PMOVSXWD ( dest src -- ) { 0x38 0x23 } 0x66 2-operand-rm-sse ; +: PMOVSXWQ ( dest src -- ) { 0x38 0x24 } 0x66 2-operand-rm-sse ; +: PMOVSXDQ ( dest src -- ) { 0x38 0x25 } 0x66 2-operand-rm-sse ; +: PMULDQ ( dest src -- ) { 0x38 0x28 } 0x66 2-operand-rm-sse ; +: PCMPEQQ ( dest src -- ) { 0x38 0x29 } 0x66 2-operand-rm-sse ; +: MOVNTDQA ( dest src -- ) { 0x38 0x2a } 0x66 2-operand-rm-sse ; +: PACKUSDW ( dest src -- ) { 0x38 0x2b } 0x66 2-operand-rm-sse ; +: PMOVZXBW ( dest src -- ) { 0x38 0x30 } 0x66 2-operand-rm-sse ; +: PMOVZXBD ( dest src -- ) { 0x38 0x31 } 0x66 2-operand-rm-sse ; +: PMOVZXBQ ( dest src -- ) { 0x38 0x32 } 0x66 2-operand-rm-sse ; +: PMOVZXWD ( dest src -- ) { 0x38 0x33 } 0x66 2-operand-rm-sse ; +: PMOVZXWQ ( dest src -- ) { 0x38 0x34 } 0x66 2-operand-rm-sse ; +: PMOVZXDQ ( dest src -- ) { 0x38 0x35 } 0x66 2-operand-rm-sse ; +: PCMPGTQ ( dest src -- ) { 0x38 0x37 } 0x66 2-operand-rm-sse ; +: PMINSB ( dest src -- ) { 0x38 0x38 } 0x66 2-operand-rm-sse ; +: PMINSD ( dest src -- ) { 0x38 0x39 } 0x66 2-operand-rm-sse ; +: PMINUW ( dest src -- ) { 0x38 0x3a } 0x66 2-operand-rm-sse ; +: PMINUD ( dest src -- ) { 0x38 0x3b } 0x66 2-operand-rm-sse ; +: PMAXSB ( dest src -- ) { 0x38 0x3c } 0x66 2-operand-rm-sse ; +: PMAXSD ( dest src -- ) { 0x38 0x3d } 0x66 2-operand-rm-sse ; +: PMAXUW ( dest src -- ) { 0x38 0x3e } 0x66 2-operand-rm-sse ; +: PMAXUD ( dest src -- ) { 0x38 0x3f } 0x66 2-operand-rm-sse ; +: PMULLD ( dest src -- ) { 0x38 0x40 } 0x66 2-operand-rm-sse ; +: PHMINPOSUW ( dest src -- ) { 0x38 0x41 } 0x66 2-operand-rm-sse ; +: CRC32B ( dest src -- ) { 0x38 0xf0 } 0xf2 2-operand-rm-sse ; +: CRC32 ( dest src -- ) { 0x38 0xf1 } 0xf2 2-operand-rm-sse ; + +: ROUNDPS ( dest src imm -- ) { 0x3a 0x08 } 0x66 3-operand-rm-sse ; +: ROUNDPD ( dest src imm -- ) { 0x3a 0x09 } 0x66 3-operand-rm-sse ; +: ROUNDSS ( dest src imm -- ) { 0x3a 0x0a } 0x66 3-operand-rm-sse ; +: ROUNDSD ( dest src imm -- ) { 0x3a 0x0b } 0x66 3-operand-rm-sse ; +: BLENDPS ( dest src imm -- ) { 0x3a 0x0c } 0x66 3-operand-rm-sse ; +: BLENDPD ( dest src imm -- ) { 0x3a 0x0d } 0x66 3-operand-rm-sse ; +: PBLENDW ( dest src imm -- ) { 0x3a 0x0e } 0x66 3-operand-rm-sse ; +: PALIGNR ( dest src imm -- ) { 0x3a 0x0f } 0x66 3-operand-rm-sse ; + +: PEXTRB ( dest src imm -- ) { 0x3a 0x14 } 0x66 3-operand-mr-sse ; : PEXTRW ( dest src imm -- ) pick indirect? [ (PEXTRW-sse4) ] [ (PEXTRW-sse1) ] if ; -: PEXTRD ( dest src imm -- ) { HEX: 3a HEX: 16 } HEX: 66 3-operand-mr-sse ; +: PEXTRD ( dest src imm -- ) { 0x3a 0x16 } 0x66 3-operand-mr-sse ; ALIAS: PEXTRQ PEXTRD -: EXTRACTPS ( dest src imm -- ) { HEX: 3a HEX: 17 } HEX: 66 3-operand-mr-sse ; +: EXTRACTPS ( dest src imm -- ) { 0x3a 0x17 } 0x66 3-operand-mr-sse ; -: PINSRB ( dest src imm -- ) { HEX: 3a HEX: 20 } HEX: 66 3-operand-rm-sse ; -: INSERTPS ( dest src imm -- ) { HEX: 3a HEX: 21 } HEX: 66 3-operand-rm-sse ; -: PINSRD ( dest src imm -- ) { HEX: 3a HEX: 22 } HEX: 66 3-operand-rm-sse ; +: PINSRB ( dest src imm -- ) { 0x3a 0x20 } 0x66 3-operand-rm-sse ; +: INSERTPS ( dest src imm -- ) { 0x3a 0x21 } 0x66 3-operand-rm-sse ; +: PINSRD ( dest src imm -- ) { 0x3a 0x22 } 0x66 3-operand-rm-sse ; ALIAS: PINSRQ PINSRD -: DPPS ( dest src imm -- ) { HEX: 3a HEX: 40 } HEX: 66 3-operand-rm-sse ; -: DPPD ( dest src imm -- ) { HEX: 3a HEX: 41 } HEX: 66 3-operand-rm-sse ; -: MPSADBW ( dest src imm -- ) { HEX: 3a HEX: 42 } HEX: 66 3-operand-rm-sse ; -: PCMPESTRM ( dest src imm -- ) { HEX: 3a HEX: 60 } HEX: 66 3-operand-rm-sse ; -: PCMPESTRI ( dest src imm -- ) { HEX: 3a HEX: 61 } HEX: 66 3-operand-rm-sse ; -: PCMPISTRM ( dest src imm -- ) { HEX: 3a HEX: 62 } HEX: 66 3-operand-rm-sse ; -: PCMPISTRI ( dest src imm -- ) { HEX: 3a HEX: 63 } HEX: 66 3-operand-rm-sse ; - -: MOVMSKPS ( dest src -- ) HEX: 50 f 2-operand-int/sse ; -: MOVMSKPD ( dest src -- ) HEX: 50 HEX: 66 2-operand-int/sse ; -: SQRTPS ( dest src -- ) HEX: 51 f 2-operand-rm-sse ; -: SQRTPD ( dest src -- ) HEX: 51 HEX: 66 2-operand-rm-sse ; -: SQRTSD ( dest src -- ) HEX: 51 HEX: f2 2-operand-rm-sse ; -: SQRTSS ( dest src -- ) HEX: 51 HEX: f3 2-operand-rm-sse ; -: RSQRTPS ( dest src -- ) HEX: 52 f 2-operand-rm-sse ; -: RSQRTSS ( dest src -- ) HEX: 52 HEX: f3 2-operand-rm-sse ; -: RCPPS ( dest src -- ) HEX: 53 f 2-operand-rm-sse ; -: RCPSS ( dest src -- ) HEX: 53 HEX: f3 2-operand-rm-sse ; -: ANDPS ( dest src -- ) HEX: 54 f 2-operand-rm-sse ; -: ANDPD ( dest src -- ) HEX: 54 HEX: 66 2-operand-rm-sse ; -: ANDNPS ( dest src -- ) HEX: 55 f 2-operand-rm-sse ; -: ANDNPD ( dest src -- ) HEX: 55 HEX: 66 2-operand-rm-sse ; -: ORPS ( dest src -- ) HEX: 56 f 2-operand-rm-sse ; -: ORPD ( dest src -- ) HEX: 56 HEX: 66 2-operand-rm-sse ; -: XORPS ( dest src -- ) HEX: 57 f 2-operand-rm-sse ; -: XORPD ( dest src -- ) HEX: 57 HEX: 66 2-operand-rm-sse ; -: ADDPS ( dest src -- ) HEX: 58 f 2-operand-rm-sse ; -: ADDPD ( dest src -- ) HEX: 58 HEX: 66 2-operand-rm-sse ; -: ADDSD ( dest src -- ) HEX: 58 HEX: f2 2-operand-rm-sse ; -: ADDSS ( dest src -- ) HEX: 58 HEX: f3 2-operand-rm-sse ; -: MULPS ( dest src -- ) HEX: 59 f 2-operand-rm-sse ; -: MULPD ( dest src -- ) HEX: 59 HEX: 66 2-operand-rm-sse ; -: MULSD ( dest src -- ) HEX: 59 HEX: f2 2-operand-rm-sse ; -: MULSS ( dest src -- ) HEX: 59 HEX: f3 2-operand-rm-sse ; -: CVTPS2PD ( dest src -- ) HEX: 5a f 2-operand-rm-sse ; -: CVTPD2PS ( dest src -- ) HEX: 5a HEX: 66 2-operand-rm-sse ; -: CVTSD2SS ( dest src -- ) HEX: 5a HEX: f2 2-operand-rm-sse ; -: CVTSS2SD ( dest src -- ) HEX: 5a HEX: f3 2-operand-rm-sse ; -: CVTDQ2PS ( dest src -- ) HEX: 5b f 2-operand-rm-sse ; -: CVTPS2DQ ( dest src -- ) HEX: 5b HEX: 66 2-operand-rm-sse ; -: CVTTPS2DQ ( dest src -- ) HEX: 5b HEX: f3 2-operand-rm-sse ; -: SUBPS ( dest src -- ) HEX: 5c f 2-operand-rm-sse ; -: SUBPD ( dest src -- ) HEX: 5c HEX: 66 2-operand-rm-sse ; -: SUBSD ( dest src -- ) HEX: 5c HEX: f2 2-operand-rm-sse ; -: SUBSS ( dest src -- ) HEX: 5c HEX: f3 2-operand-rm-sse ; -: MINPS ( dest src -- ) HEX: 5d f 2-operand-rm-sse ; -: MINPD ( dest src -- ) HEX: 5d HEX: 66 2-operand-rm-sse ; -: MINSD ( dest src -- ) HEX: 5d HEX: f2 2-operand-rm-sse ; -: MINSS ( dest src -- ) HEX: 5d HEX: f3 2-operand-rm-sse ; -: DIVPS ( dest src -- ) HEX: 5e f 2-operand-rm-sse ; -: DIVPD ( dest src -- ) HEX: 5e HEX: 66 2-operand-rm-sse ; -: DIVSD ( dest src -- ) HEX: 5e HEX: f2 2-operand-rm-sse ; -: DIVSS ( dest src -- ) HEX: 5e HEX: f3 2-operand-rm-sse ; -: MAXPS ( dest src -- ) HEX: 5f f 2-operand-rm-sse ; -: MAXPD ( dest src -- ) HEX: 5f HEX: 66 2-operand-rm-sse ; -: MAXSD ( dest src -- ) HEX: 5f HEX: f2 2-operand-rm-sse ; -: MAXSS ( dest src -- ) HEX: 5f HEX: f3 2-operand-rm-sse ; -: PUNPCKLBW ( dest src -- ) HEX: 60 HEX: 66 2-operand-rm-sse ; -: PUNPCKLWD ( dest src -- ) HEX: 61 HEX: 66 2-operand-rm-sse ; -: PUNPCKLDQ ( dest src -- ) HEX: 62 HEX: 66 2-operand-rm-sse ; -: PACKSSWB ( dest src -- ) HEX: 63 HEX: 66 2-operand-rm-sse ; -: PCMPGTB ( dest src -- ) HEX: 64 HEX: 66 2-operand-rm-sse ; -: PCMPGTW ( dest src -- ) HEX: 65 HEX: 66 2-operand-rm-sse ; -: PCMPGTD ( dest src -- ) HEX: 66 HEX: 66 2-operand-rm-sse ; -: PACKUSWB ( dest src -- ) HEX: 67 HEX: 66 2-operand-rm-sse ; -: PUNPCKHBW ( dest src -- ) HEX: 68 HEX: 66 2-operand-rm-sse ; -: PUNPCKHWD ( dest src -- ) HEX: 69 HEX: 66 2-operand-rm-sse ; -: PUNPCKHDQ ( dest src -- ) HEX: 6a HEX: 66 2-operand-rm-sse ; -: PACKSSDW ( dest src -- ) HEX: 6b HEX: 66 2-operand-rm-sse ; -: PUNPCKLQDQ ( dest src -- ) HEX: 6c HEX: 66 2-operand-rm-sse ; -: PUNPCKHQDQ ( dest src -- ) HEX: 6d HEX: 66 2-operand-rm-sse ; - -: MOVD ( dest src -- ) { HEX: 6e HEX: 7e } HEX: 66 2-operand-rm-mr-sse ; -: MOVDQA ( dest src -- ) { HEX: 6f HEX: 7f } HEX: 66 2-operand-rm-mr-sse ; -: MOVDQU ( dest src -- ) { HEX: 6f HEX: 7f } HEX: f3 2-operand-rm-mr-sse ; +: DPPS ( dest src imm -- ) { 0x3a 0x40 } 0x66 3-operand-rm-sse ; +: DPPD ( dest src imm -- ) { 0x3a 0x41 } 0x66 3-operand-rm-sse ; +: MPSADBW ( dest src imm -- ) { 0x3a 0x42 } 0x66 3-operand-rm-sse ; +: PCMPESTRM ( dest src imm -- ) { 0x3a 0x60 } 0x66 3-operand-rm-sse ; +: PCMPESTRI ( dest src imm -- ) { 0x3a 0x61 } 0x66 3-operand-rm-sse ; +: PCMPISTRM ( dest src imm -- ) { 0x3a 0x62 } 0x66 3-operand-rm-sse ; +: PCMPISTRI ( dest src imm -- ) { 0x3a 0x63 } 0x66 3-operand-rm-sse ; + +: MOVMSKPS ( dest src -- ) 0x50 f 2-operand-int/sse ; +: MOVMSKPD ( dest src -- ) 0x50 0x66 2-operand-int/sse ; +: SQRTPS ( dest src -- ) 0x51 f 2-operand-rm-sse ; +: SQRTPD ( dest src -- ) 0x51 0x66 2-operand-rm-sse ; +: SQRTSD ( dest src -- ) 0x51 0xf2 2-operand-rm-sse ; +: SQRTSS ( dest src -- ) 0x51 0xf3 2-operand-rm-sse ; +: RSQRTPS ( dest src -- ) 0x52 f 2-operand-rm-sse ; +: RSQRTSS ( dest src -- ) 0x52 0xf3 2-operand-rm-sse ; +: RCPPS ( dest src -- ) 0x53 f 2-operand-rm-sse ; +: RCPSS ( dest src -- ) 0x53 0xf3 2-operand-rm-sse ; +: ANDPS ( dest src -- ) 0x54 f 2-operand-rm-sse ; +: ANDPD ( dest src -- ) 0x54 0x66 2-operand-rm-sse ; +: ANDNPS ( dest src -- ) 0x55 f 2-operand-rm-sse ; +: ANDNPD ( dest src -- ) 0x55 0x66 2-operand-rm-sse ; +: ORPS ( dest src -- ) 0x56 f 2-operand-rm-sse ; +: ORPD ( dest src -- ) 0x56 0x66 2-operand-rm-sse ; +: XORPS ( dest src -- ) 0x57 f 2-operand-rm-sse ; +: XORPD ( dest src -- ) 0x57 0x66 2-operand-rm-sse ; +: ADDPS ( dest src -- ) 0x58 f 2-operand-rm-sse ; +: ADDPD ( dest src -- ) 0x58 0x66 2-operand-rm-sse ; +: ADDSD ( dest src -- ) 0x58 0xf2 2-operand-rm-sse ; +: ADDSS ( dest src -- ) 0x58 0xf3 2-operand-rm-sse ; +: MULPS ( dest src -- ) 0x59 f 2-operand-rm-sse ; +: MULPD ( dest src -- ) 0x59 0x66 2-operand-rm-sse ; +: MULSD ( dest src -- ) 0x59 0xf2 2-operand-rm-sse ; +: MULSS ( dest src -- ) 0x59 0xf3 2-operand-rm-sse ; +: CVTPS2PD ( dest src -- ) 0x5a f 2-operand-rm-sse ; +: CVTPD2PS ( dest src -- ) 0x5a 0x66 2-operand-rm-sse ; +: CVTSD2SS ( dest src -- ) 0x5a 0xf2 2-operand-rm-sse ; +: CVTSS2SD ( dest src -- ) 0x5a 0xf3 2-operand-rm-sse ; +: CVTDQ2PS ( dest src -- ) 0x5b f 2-operand-rm-sse ; +: CVTPS2DQ ( dest src -- ) 0x5b 0x66 2-operand-rm-sse ; +: CVTTPS2DQ ( dest src -- ) 0x5b 0xf3 2-operand-rm-sse ; +: SUBPS ( dest src -- ) 0x5c f 2-operand-rm-sse ; +: SUBPD ( dest src -- ) 0x5c 0x66 2-operand-rm-sse ; +: SUBSD ( dest src -- ) 0x5c 0xf2 2-operand-rm-sse ; +: SUBSS ( dest src -- ) 0x5c 0xf3 2-operand-rm-sse ; +: MINPS ( dest src -- ) 0x5d f 2-operand-rm-sse ; +: MINPD ( dest src -- ) 0x5d 0x66 2-operand-rm-sse ; +: MINSD ( dest src -- ) 0x5d 0xf2 2-operand-rm-sse ; +: MINSS ( dest src -- ) 0x5d 0xf3 2-operand-rm-sse ; +: DIVPS ( dest src -- ) 0x5e f 2-operand-rm-sse ; +: DIVPD ( dest src -- ) 0x5e 0x66 2-operand-rm-sse ; +: DIVSD ( dest src -- ) 0x5e 0xf2 2-operand-rm-sse ; +: DIVSS ( dest src -- ) 0x5e 0xf3 2-operand-rm-sse ; +: MAXPS ( dest src -- ) 0x5f f 2-operand-rm-sse ; +: MAXPD ( dest src -- ) 0x5f 0x66 2-operand-rm-sse ; +: MAXSD ( dest src -- ) 0x5f 0xf2 2-operand-rm-sse ; +: MAXSS ( dest src -- ) 0x5f 0xf3 2-operand-rm-sse ; +: PUNPCKLBW ( dest src -- ) 0x60 0x66 2-operand-rm-sse ; +: PUNPCKLWD ( dest src -- ) 0x61 0x66 2-operand-rm-sse ; +: PUNPCKLDQ ( dest src -- ) 0x62 0x66 2-operand-rm-sse ; +: PACKSSWB ( dest src -- ) 0x63 0x66 2-operand-rm-sse ; +: PCMPGTB ( dest src -- ) 0x64 0x66 2-operand-rm-sse ; +: PCMPGTW ( dest src -- ) 0x65 0x66 2-operand-rm-sse ; +: PCMPGTD ( dest src -- ) 0x66 0x66 2-operand-rm-sse ; +: PACKUSWB ( dest src -- ) 0x67 0x66 2-operand-rm-sse ; +: PUNPCKHBW ( dest src -- ) 0x68 0x66 2-operand-rm-sse ; +: PUNPCKHWD ( dest src -- ) 0x69 0x66 2-operand-rm-sse ; +: PUNPCKHDQ ( dest src -- ) 0x6a 0x66 2-operand-rm-sse ; +: PACKSSDW ( dest src -- ) 0x6b 0x66 2-operand-rm-sse ; +: PUNPCKLQDQ ( dest src -- ) 0x6c 0x66 2-operand-rm-sse ; +: PUNPCKHQDQ ( dest src -- ) 0x6d 0x66 2-operand-rm-sse ; + +: MOVD ( dest src -- ) { 0x6e 0x7e } 0x66 2-operand-rm-mr-sse ; +: MOVDQA ( dest src -- ) { 0x6f 0x7f } 0x66 2-operand-rm-mr-sse ; +: MOVDQU ( dest src -- ) { 0x6f 0x7f } 0xf3 2-operand-rm-mr-sse ; : MOVQ ( dest src -- ) - { { HEX: 7e HEX: f3 } { HEX: d6 HEX: 66 } } 2-operand-rm-mr-sse* ; + { { 0x7e 0xf3 } { 0xd6 0x66 } } 2-operand-rm-mr-sse* ; -: PSHUFD ( dest src imm -- ) 4shuffler HEX: 70 HEX: 66 3-operand-rm-sse ; -: PSHUFLW ( dest src imm -- ) 4shuffler HEX: 70 HEX: f2 3-operand-rm-sse ; -: PSHUFHW ( dest src imm -- ) 4shuffler HEX: 70 HEX: f3 3-operand-rm-sse ; +: PSHUFD ( dest src imm -- ) 4shuffler 0x70 0x66 3-operand-rm-sse ; +: PSHUFLW ( dest src imm -- ) 4shuffler 0x70 0xf2 3-operand-rm-sse ; +: PSHUFHW ( dest src imm -- ) 4shuffler 0x70 0xf3 3-operand-rm-sse ; @@ -842,124 +842,124 @@ PRIVATE> : PSRLQ ( dest src -- ) dup integer? [ (PSRLQ-imm) ] [ (PSRLQ-reg) ] if ; : PSLLQ ( dest src -- ) dup integer? [ (PSLLQ-imm) ] [ (PSLLQ-reg) ] if ; -: PSRLDQ ( dest imm -- ) BIN: 011 HEX: 73 HEX: 66 2-operand-sse-shift ; -: PSLLDQ ( dest imm -- ) BIN: 111 HEX: 73 HEX: 66 2-operand-sse-shift ; - -: PCMPEQB ( dest src -- ) HEX: 74 HEX: 66 2-operand-rm-sse ; -: PCMPEQW ( dest src -- ) HEX: 75 HEX: 66 2-operand-rm-sse ; -: PCMPEQD ( dest src -- ) HEX: 76 HEX: 66 2-operand-rm-sse ; -: HADDPD ( dest src -- ) HEX: 7c HEX: 66 2-operand-rm-sse ; -: HADDPS ( dest src -- ) HEX: 7c HEX: f2 2-operand-rm-sse ; -: HSUBPD ( dest src -- ) HEX: 7d HEX: 66 2-operand-rm-sse ; -: HSUBPS ( dest src -- ) HEX: 7d HEX: f2 2-operand-rm-sse ; - -: FXSAVE ( dest -- ) { BIN: 000 f { HEX: 0f HEX: ae } } 1-operand ; -: FXRSTOR ( src -- ) { BIN: 001 f { HEX: 0f HEX: ae } } 1-operand ; -: LDMXCSR ( src -- ) { BIN: 010 f { HEX: 0f HEX: ae } } 1-operand ; -: STMXCSR ( dest -- ) { BIN: 011 f { HEX: 0f HEX: ae } } 1-operand ; -: LFENCE ( -- ) HEX: 0f , HEX: ae , OCT: 350 , ; -: MFENCE ( -- ) HEX: 0f , HEX: ae , OCT: 360 , ; -: SFENCE ( -- ) HEX: 0f , HEX: ae , OCT: 370 , ; -: CLFLUSH ( dest -- ) { BIN: 111 f { HEX: 0f HEX: ae } } 1-operand ; - -: POPCNT ( dest src -- ) HEX: b8 HEX: f3 2-operand-rm-sse ; - -: CMPEQPS ( dest src -- ) 0 HEX: c2 f 2-operand-sse-cmp ; -: CMPLTPS ( dest src -- ) 1 HEX: c2 f 2-operand-sse-cmp ; -: CMPLEPS ( dest src -- ) 2 HEX: c2 f 2-operand-sse-cmp ; -: CMPUNORDPS ( dest src -- ) 3 HEX: c2 f 2-operand-sse-cmp ; -: CMPNEQPS ( dest src -- ) 4 HEX: c2 f 2-operand-sse-cmp ; -: CMPNLTPS ( dest src -- ) 5 HEX: c2 f 2-operand-sse-cmp ; -: CMPNLEPS ( dest src -- ) 6 HEX: c2 f 2-operand-sse-cmp ; -: CMPORDPS ( dest src -- ) 7 HEX: c2 f 2-operand-sse-cmp ; - -: CMPEQPD ( dest src -- ) 0 HEX: c2 HEX: 66 2-operand-sse-cmp ; -: CMPLTPD ( dest src -- ) 1 HEX: c2 HEX: 66 2-operand-sse-cmp ; -: CMPLEPD ( dest src -- ) 2 HEX: c2 HEX: 66 2-operand-sse-cmp ; -: CMPUNORDPD ( dest src -- ) 3 HEX: c2 HEX: 66 2-operand-sse-cmp ; -: CMPNEQPD ( dest src -- ) 4 HEX: c2 HEX: 66 2-operand-sse-cmp ; -: CMPNLTPD ( dest src -- ) 5 HEX: c2 HEX: 66 2-operand-sse-cmp ; -: CMPNLEPD ( dest src -- ) 6 HEX: c2 HEX: 66 2-operand-sse-cmp ; -: CMPORDPD ( dest src -- ) 7 HEX: c2 HEX: 66 2-operand-sse-cmp ; - -: CMPEQSD ( dest src -- ) 0 HEX: c2 HEX: f2 2-operand-sse-cmp ; -: CMPLTSD ( dest src -- ) 1 HEX: c2 HEX: f2 2-operand-sse-cmp ; -: CMPLESD ( dest src -- ) 2 HEX: c2 HEX: f2 2-operand-sse-cmp ; -: CMPUNORDSD ( dest src -- ) 3 HEX: c2 HEX: f2 2-operand-sse-cmp ; -: CMPNEQSD ( dest src -- ) 4 HEX: c2 HEX: f2 2-operand-sse-cmp ; -: CMPNLTSD ( dest src -- ) 5 HEX: c2 HEX: f2 2-operand-sse-cmp ; -: CMPNLESD ( dest src -- ) 6 HEX: c2 HEX: f2 2-operand-sse-cmp ; -: CMPORDSD ( dest src -- ) 7 HEX: c2 HEX: f2 2-operand-sse-cmp ; - -: CMPEQSS ( dest src -- ) 0 HEX: c2 HEX: f3 2-operand-sse-cmp ; -: CMPLTSS ( dest src -- ) 1 HEX: c2 HEX: f3 2-operand-sse-cmp ; -: CMPLESS ( dest src -- ) 2 HEX: c2 HEX: f3 2-operand-sse-cmp ; -: CMPUNORDSS ( dest src -- ) 3 HEX: c2 HEX: f3 2-operand-sse-cmp ; -: CMPNEQSS ( dest src -- ) 4 HEX: c2 HEX: f3 2-operand-sse-cmp ; -: CMPNLTSS ( dest src -- ) 5 HEX: c2 HEX: f3 2-operand-sse-cmp ; -: CMPNLESS ( dest src -- ) 6 HEX: c2 HEX: f3 2-operand-sse-cmp ; -: CMPORDSS ( dest src -- ) 7 HEX: c2 HEX: f3 2-operand-sse-cmp ; - -: MOVNTI ( dest src -- ) swap { HEX: 0f HEX: c3 } (2-operand) ; - -: PINSRW ( dest src imm -- ) HEX: c4 HEX: 66 3-operand-rm-sse ; -: SHUFPS ( dest src imm -- ) 4shuffler HEX: c6 f 3-operand-rm-sse ; -: SHUFPD ( dest src imm -- ) 2shuffler HEX: c6 HEX: 66 3-operand-rm-sse ; - -: ADDSUBPD ( dest src -- ) HEX: d0 HEX: 66 2-operand-rm-sse ; -: ADDSUBPS ( dest src -- ) HEX: d0 HEX: f2 2-operand-rm-sse ; -: PADDQ ( dest src -- ) HEX: d4 HEX: 66 2-operand-rm-sse ; -: PMULLW ( dest src -- ) HEX: d5 HEX: 66 2-operand-rm-sse ; -: PMOVMSKB ( dest src -- ) HEX: d7 HEX: 66 2-operand-rm-sse ; -: PSUBUSB ( dest src -- ) HEX: d8 HEX: 66 2-operand-rm-sse ; -: PSUBUSW ( dest src -- ) HEX: d9 HEX: 66 2-operand-rm-sse ; -: PMINUB ( dest src -- ) HEX: da HEX: 66 2-operand-rm-sse ; -: PAND ( dest src -- ) HEX: db HEX: 66 2-operand-rm-sse ; -: PADDUSB ( dest src -- ) HEX: dc HEX: 66 2-operand-rm-sse ; -: PADDUSW ( dest src -- ) HEX: dd HEX: 66 2-operand-rm-sse ; -: PMAXUB ( dest src -- ) HEX: de HEX: 66 2-operand-rm-sse ; -: PANDN ( dest src -- ) HEX: df HEX: 66 2-operand-rm-sse ; -: PAVGB ( dest src -- ) HEX: e0 HEX: 66 2-operand-rm-sse ; -: PAVGW ( dest src -- ) HEX: e3 HEX: 66 2-operand-rm-sse ; -: PMULHUW ( dest src -- ) HEX: e4 HEX: 66 2-operand-rm-sse ; -: PMULHW ( dest src -- ) HEX: e5 HEX: 66 2-operand-rm-sse ; -: CVTTPD2DQ ( dest src -- ) HEX: e6 HEX: 66 2-operand-rm-sse ; -: CVTPD2DQ ( dest src -- ) HEX: e6 HEX: f2 2-operand-rm-sse ; -: CVTDQ2PD ( dest src -- ) HEX: e6 HEX: f3 2-operand-rm-sse ; - -: MOVNTDQ ( dest src -- ) HEX: e7 HEX: 66 2-operand-mr-sse ; - -: PSUBSB ( dest src -- ) HEX: e8 HEX: 66 2-operand-rm-sse ; -: PSUBSW ( dest src -- ) HEX: e9 HEX: 66 2-operand-rm-sse ; -: PMINSW ( dest src -- ) HEX: ea HEX: 66 2-operand-rm-sse ; -: POR ( dest src -- ) HEX: eb HEX: 66 2-operand-rm-sse ; -: PADDSB ( dest src -- ) HEX: ec HEX: 66 2-operand-rm-sse ; -: PADDSW ( dest src -- ) HEX: ed HEX: 66 2-operand-rm-sse ; -: PMAXSW ( dest src -- ) HEX: ee HEX: 66 2-operand-rm-sse ; -: PXOR ( dest src -- ) HEX: ef HEX: 66 2-operand-rm-sse ; -: LDDQU ( dest src -- ) HEX: f0 HEX: f2 2-operand-rm-sse ; -: PMULUDQ ( dest src -- ) HEX: f4 HEX: 66 2-operand-rm-sse ; -: PMADDWD ( dest src -- ) HEX: f5 HEX: 66 2-operand-rm-sse ; -: PSADBW ( dest src -- ) HEX: f6 HEX: 66 2-operand-rm-sse ; -: MASKMOVDQU ( dest src -- ) HEX: f7 HEX: 66 2-operand-rm-sse ; -: PSUBB ( dest src -- ) HEX: f8 HEX: 66 2-operand-rm-sse ; -: PSUBW ( dest src -- ) HEX: f9 HEX: 66 2-operand-rm-sse ; -: PSUBD ( dest src -- ) HEX: fa HEX: 66 2-operand-rm-sse ; -: PSUBQ ( dest src -- ) HEX: fb HEX: 66 2-operand-rm-sse ; -: PADDB ( dest src -- ) HEX: fc HEX: 66 2-operand-rm-sse ; -: PADDW ( dest src -- ) HEX: fd HEX: 66 2-operand-rm-sse ; -: PADDD ( dest src -- ) HEX: fe HEX: 66 2-operand-rm-sse ; +: PSRLDQ ( dest imm -- ) 0b011 0x73 0x66 2-operand-sse-shift ; +: PSLLDQ ( dest imm -- ) 0b111 0x73 0x66 2-operand-sse-shift ; + +: PCMPEQB ( dest src -- ) 0x74 0x66 2-operand-rm-sse ; +: PCMPEQW ( dest src -- ) 0x75 0x66 2-operand-rm-sse ; +: PCMPEQD ( dest src -- ) 0x76 0x66 2-operand-rm-sse ; +: HADDPD ( dest src -- ) 0x7c 0x66 2-operand-rm-sse ; +: HADDPS ( dest src -- ) 0x7c 0xf2 2-operand-rm-sse ; +: HSUBPD ( dest src -- ) 0x7d 0x66 2-operand-rm-sse ; +: HSUBPS ( dest src -- ) 0x7d 0xf2 2-operand-rm-sse ; + +: FXSAVE ( dest -- ) { 0b000 f { 0x0f 0xae } } 1-operand ; +: FXRSTOR ( src -- ) { 0b001 f { 0x0f 0xae } } 1-operand ; +: LDMXCSR ( src -- ) { 0b010 f { 0x0f 0xae } } 1-operand ; +: STMXCSR ( dest -- ) { 0b011 f { 0x0f 0xae } } 1-operand ; +: LFENCE ( -- ) 0x0f , 0xae , 0o350 , ; +: MFENCE ( -- ) 0x0f , 0xae , 0o360 , ; +: SFENCE ( -- ) 0x0f , 0xae , 0o370 , ; +: CLFLUSH ( dest -- ) { 0b111 f { 0x0f 0xae } } 1-operand ; + +: POPCNT ( dest src -- ) 0xb8 0xf3 2-operand-rm-sse ; + +: CMPEQPS ( dest src -- ) 0 0xc2 f 2-operand-sse-cmp ; +: CMPLTPS ( dest src -- ) 1 0xc2 f 2-operand-sse-cmp ; +: CMPLEPS ( dest src -- ) 2 0xc2 f 2-operand-sse-cmp ; +: CMPUNORDPS ( dest src -- ) 3 0xc2 f 2-operand-sse-cmp ; +: CMPNEQPS ( dest src -- ) 4 0xc2 f 2-operand-sse-cmp ; +: CMPNLTPS ( dest src -- ) 5 0xc2 f 2-operand-sse-cmp ; +: CMPNLEPS ( dest src -- ) 6 0xc2 f 2-operand-sse-cmp ; +: CMPORDPS ( dest src -- ) 7 0xc2 f 2-operand-sse-cmp ; + +: CMPEQPD ( dest src -- ) 0 0xc2 0x66 2-operand-sse-cmp ; +: CMPLTPD ( dest src -- ) 1 0xc2 0x66 2-operand-sse-cmp ; +: CMPLEPD ( dest src -- ) 2 0xc2 0x66 2-operand-sse-cmp ; +: CMPUNORDPD ( dest src -- ) 3 0xc2 0x66 2-operand-sse-cmp ; +: CMPNEQPD ( dest src -- ) 4 0xc2 0x66 2-operand-sse-cmp ; +: CMPNLTPD ( dest src -- ) 5 0xc2 0x66 2-operand-sse-cmp ; +: CMPNLEPD ( dest src -- ) 6 0xc2 0x66 2-operand-sse-cmp ; +: CMPORDPD ( dest src -- ) 7 0xc2 0x66 2-operand-sse-cmp ; + +: CMPEQSD ( dest src -- ) 0 0xc2 0xf2 2-operand-sse-cmp ; +: CMPLTSD ( dest src -- ) 1 0xc2 0xf2 2-operand-sse-cmp ; +: CMPLESD ( dest src -- ) 2 0xc2 0xf2 2-operand-sse-cmp ; +: CMPUNORDSD ( dest src -- ) 3 0xc2 0xf2 2-operand-sse-cmp ; +: CMPNEQSD ( dest src -- ) 4 0xc2 0xf2 2-operand-sse-cmp ; +: CMPNLTSD ( dest src -- ) 5 0xc2 0xf2 2-operand-sse-cmp ; +: CMPNLESD ( dest src -- ) 6 0xc2 0xf2 2-operand-sse-cmp ; +: CMPORDSD ( dest src -- ) 7 0xc2 0xf2 2-operand-sse-cmp ; + +: CMPEQSS ( dest src -- ) 0 0xc2 0xf3 2-operand-sse-cmp ; +: CMPLTSS ( dest src -- ) 1 0xc2 0xf3 2-operand-sse-cmp ; +: CMPLESS ( dest src -- ) 2 0xc2 0xf3 2-operand-sse-cmp ; +: CMPUNORDSS ( dest src -- ) 3 0xc2 0xf3 2-operand-sse-cmp ; +: CMPNEQSS ( dest src -- ) 4 0xc2 0xf3 2-operand-sse-cmp ; +: CMPNLTSS ( dest src -- ) 5 0xc2 0xf3 2-operand-sse-cmp ; +: CMPNLESS ( dest src -- ) 6 0xc2 0xf3 2-operand-sse-cmp ; +: CMPORDSS ( dest src -- ) 7 0xc2 0xf3 2-operand-sse-cmp ; + +: MOVNTI ( dest src -- ) swap { 0x0f 0xc3 } (2-operand) ; + +: PINSRW ( dest src imm -- ) 0xc4 0x66 3-operand-rm-sse ; +: SHUFPS ( dest src imm -- ) 4shuffler 0xc6 f 3-operand-rm-sse ; +: SHUFPD ( dest src imm -- ) 2shuffler 0xc6 0x66 3-operand-rm-sse ; + +: ADDSUBPD ( dest src -- ) 0xd0 0x66 2-operand-rm-sse ; +: ADDSUBPS ( dest src -- ) 0xd0 0xf2 2-operand-rm-sse ; +: PADDQ ( dest src -- ) 0xd4 0x66 2-operand-rm-sse ; +: PMULLW ( dest src -- ) 0xd5 0x66 2-operand-rm-sse ; +: PMOVMSKB ( dest src -- ) 0xd7 0x66 2-operand-rm-sse ; +: PSUBUSB ( dest src -- ) 0xd8 0x66 2-operand-rm-sse ; +: PSUBUSW ( dest src -- ) 0xd9 0x66 2-operand-rm-sse ; +: PMINUB ( dest src -- ) 0xda 0x66 2-operand-rm-sse ; +: PAND ( dest src -- ) 0xdb 0x66 2-operand-rm-sse ; +: PADDUSB ( dest src -- ) 0xdc 0x66 2-operand-rm-sse ; +: PADDUSW ( dest src -- ) 0xdd 0x66 2-operand-rm-sse ; +: PMAXUB ( dest src -- ) 0xde 0x66 2-operand-rm-sse ; +: PANDN ( dest src -- ) 0xdf 0x66 2-operand-rm-sse ; +: PAVGB ( dest src -- ) 0xe0 0x66 2-operand-rm-sse ; +: PAVGW ( dest src -- ) 0xe3 0x66 2-operand-rm-sse ; +: PMULHUW ( dest src -- ) 0xe4 0x66 2-operand-rm-sse ; +: PMULHW ( dest src -- ) 0xe5 0x66 2-operand-rm-sse ; +: CVTTPD2DQ ( dest src -- ) 0xe6 0x66 2-operand-rm-sse ; +: CVTPD2DQ ( dest src -- ) 0xe6 0xf2 2-operand-rm-sse ; +: CVTDQ2PD ( dest src -- ) 0xe6 0xf3 2-operand-rm-sse ; + +: MOVNTDQ ( dest src -- ) 0xe7 0x66 2-operand-mr-sse ; + +: PSUBSB ( dest src -- ) 0xe8 0x66 2-operand-rm-sse ; +: PSUBSW ( dest src -- ) 0xe9 0x66 2-operand-rm-sse ; +: PMINSW ( dest src -- ) 0xea 0x66 2-operand-rm-sse ; +: POR ( dest src -- ) 0xeb 0x66 2-operand-rm-sse ; +: PADDSB ( dest src -- ) 0xec 0x66 2-operand-rm-sse ; +: PADDSW ( dest src -- ) 0xed 0x66 2-operand-rm-sse ; +: PMAXSW ( dest src -- ) 0xee 0x66 2-operand-rm-sse ; +: PXOR ( dest src -- ) 0xef 0x66 2-operand-rm-sse ; +: LDDQU ( dest src -- ) 0xf0 0xf2 2-operand-rm-sse ; +: PMULUDQ ( dest src -- ) 0xf4 0x66 2-operand-rm-sse ; +: PMADDWD ( dest src -- ) 0xf5 0x66 2-operand-rm-sse ; +: PSADBW ( dest src -- ) 0xf6 0x66 2-operand-rm-sse ; +: MASKMOVDQU ( dest src -- ) 0xf7 0x66 2-operand-rm-sse ; +: PSUBB ( dest src -- ) 0xf8 0x66 2-operand-rm-sse ; +: PSUBW ( dest src -- ) 0xf9 0x66 2-operand-rm-sse ; +: PSUBD ( dest src -- ) 0xfa 0x66 2-operand-rm-sse ; +: PSUBQ ( dest src -- ) 0xfb 0x66 2-operand-rm-sse ; +: PADDB ( dest src -- ) 0xfc 0x66 2-operand-rm-sse ; +: PADDW ( dest src -- ) 0xfd 0x66 2-operand-rm-sse ; +: PADDD ( dest src -- ) 0xfe 0x66 2-operand-rm-sse ; ! x86-64 branch prediction hints -: HWNT ( -- ) HEX: 2e , ; ! Hint branch Weakly Not Taken -: HST ( -- ) HEX: 3e , ; ! Hint branch Strongly Taken +: HWNT ( -- ) 0x2e , ; ! Hint branch Weakly Not Taken +: HST ( -- ) 0x3e , ; ! Hint branch Strongly Taken ! interrupt instructions -: INT ( n -- ) dup 3 = [ drop HEX: cc , ] [ HEX: cd , 1, ] if ; +: INT ( n -- ) dup 3 = [ drop 0xcc , ] [ 0xcd , 1, ] if ; ! push/pop flags -: PUSHF ( -- ) HEX: 9c , ; -: POPF ( -- ) HEX: 9d , ; +: PUSHF ( -- ) 0x9c , ; +: POPF ( -- ) 0x9d , ; diff --git a/basis/cpu/x86/bootstrap.factor b/basis/cpu/x86/bootstrap.factor index c600fa5309..3c6d7ae8de 100644 --- a/basis/cpu/x86/bootstrap.factor +++ b/basis/cpu/x86/bootstrap.factor @@ -73,7 +73,7 @@ big-endian off ! need a parameter here. ! See the comment for M\ x86.32 stack-cleanup in cpu.x86.32 - HEX: ffff RET f rc-absolute-2 rel-untagged + 0xffff RET f rc-absolute-2 rel-untagged ] callback-stub jit-define [ @@ -237,7 +237,7 @@ big-endian off ! Load a value from a stack position [ - temp1 ds-reg HEX: 7f [+] MOV f rc-absolute-1 rel-untagged + temp1 ds-reg 0x7f [+] MOV f rc-absolute-1 rel-untagged ] pic-load jit-define [ temp1 tag-mask get AND ] pic-tag jit-define @@ -252,7 +252,7 @@ big-endian off ] pic-tuple jit-define [ - temp1 HEX: 7f CMP f rc-absolute-1 rel-untagged + temp1 0x7f CMP f rc-absolute-1 rel-untagged ] pic-check-tag jit-define [ 0 JE f rc-relative rel-word ] pic-hit jit-define diff --git a/basis/cpu/x86/sse/sse.factor b/basis/cpu/x86/sse/sse.factor index 0f2ab0573f..facc8fe276 100644 --- a/basis/cpu/x86/sse/sse.factor +++ b/basis/cpu/x86/sse/sse.factor @@ -478,9 +478,9 @@ M: x86 %compare-vector-ccs : (%move-vector-mask) ( dst src rep -- mask ) { - { double-2-rep [ MOVMSKPS HEX: f ] } - { float-4-rep [ MOVMSKPS HEX: f ] } - [ drop PMOVMSKB HEX: ffff ] + { double-2-rep [ MOVMSKPS 0xf ] } + { float-4-rep [ MOVMSKPS 0xf ] } + [ drop PMOVMSKB 0xffff ] } case ; M: x86 %move-vector-mask ( dst src rep -- ) @@ -708,8 +708,8 @@ M: x86 %avg-vector-reps M: x86 %dot-vector [ two-operand ] keep { - { float-4-rep [ HEX: ff DPPS ] } - { double-2-rep [ HEX: ff DPPD ] } + { float-4-rep [ 0xff DPPS ] } + { double-2-rep [ 0xff DPPD ] } } case ; M: x86 %dot-vector-reps diff --git a/basis/cpu/x86/x86.factor b/basis/cpu/x86/x86.factor index 931bc240ac..51e32c643d 100644 --- a/basis/cpu/x86/x86.factor +++ b/basis/cpu/x86/x86.factor @@ -87,7 +87,7 @@ M: x86 %replace-imm { { [ dup not ] [ drop \ f type-number MOV ] } { [ dup fixnum? ] [ tag-fixnum MOV ] } - [ [ HEX: ffffffff MOV ] dip rc-absolute rel-literal ] + [ [ 0xffffffff MOV ] dip rc-absolute rel-literal ] } cond ; : (%inc) ( n reg -- ) swap cells dup 0 > [ ADD ] [ neg SUB ] if ; inline @@ -541,7 +541,7 @@ M:: x86 %test ( dst src1 src2 cc temp -- ) dst cc temp %boolean ; : (%compare-tagged) ( src1 src2 -- ) - [ HEX: ffffffff CMP ] dip rc-absolute rel-literal ; + [ 0xffffffff CMP ] dip rc-absolute rel-literal ; M:: x86 %compare-integer-imm ( dst src1 src2 cc temp -- ) src1 src2 CMP @@ -594,11 +594,11 @@ M:: x86 %compare-imm-branch ( label src1 src2 cc -- ) M:: x86 %dispatch ( src temp -- ) ! Load jump table base. - temp HEX: ffffffff MOV + temp 0xffffffff MOV building get length :> start 0 rc-absolute-cell rel-here ! Add jump table base - temp src HEX: 7f [++] JMP + temp src 0x7f [++] JMP building get length :> end ! Fix up the displacement above cell alignment @@ -698,10 +698,10 @@ M: x86 long-long-odd-register? f ; M: x86 float-right-align-on-stack? f ; M: x86 immediate-arithmetic? ( n -- ? ) - HEX: -80000000 HEX: 7fffffff between? ; + -0x80000000 0x7fffffff between? ; M: x86 immediate-bitwise? ( n -- ? ) - HEX: -80000000 HEX: 7fffffff between? ; + -0x80000000 0x7fffffff between? ; : %cmov-float= ( dst src -- ) [ diff --git a/basis/db/postgresql/ffi/ffi.factor b/basis/db/postgresql/ffi/ffi.factor index 2dd7e193b7..9a05d6b1d9 100644 --- a/basis/db/postgresql/ffi/ffi.factor +++ b/basis/db/postgresql/ffi/ffi.factor @@ -12,44 +12,44 @@ IN: db.postgresql.ffi } cond cdecl add-library >> ! ConnSatusType -CONSTANT: CONNECTION_OK HEX: 0 -CONSTANT: CONNECTION_BAD HEX: 1 -CONSTANT: CONNECTION_STARTED HEX: 2 -CONSTANT: CONNECTION_MADE HEX: 3 -CONSTANT: CONNECTION_AWAITING_RESPONSE HEX: 4 -CONSTANT: CONNECTION_AUTH_OK HEX: 5 -CONSTANT: CONNECTION_SETENV HEX: 6 -CONSTANT: CONNECTION_SSL_STARTUP HEX: 7 -CONSTANT: CONNECTION_NEEDED HEX: 8 +CONSTANT: CONNECTION_OK 0x0 +CONSTANT: CONNECTION_BAD 0x1 +CONSTANT: CONNECTION_STARTED 0x2 +CONSTANT: CONNECTION_MADE 0x3 +CONSTANT: CONNECTION_AWAITING_RESPONSE 0x4 +CONSTANT: CONNECTION_AUTH_OK 0x5 +CONSTANT: CONNECTION_SETENV 0x6 +CONSTANT: CONNECTION_SSL_STARTUP 0x7 +CONSTANT: CONNECTION_NEEDED 0x8 ! PostgresPollingStatusType -CONSTANT: PGRES_POLLING_FAILED HEX: 0 -CONSTANT: PGRES_POLLING_READING HEX: 1 -CONSTANT: PGRES_POLLING_WRITING HEX: 2 -CONSTANT: PGRES_POLLING_OK HEX: 3 -CONSTANT: PGRES_POLLING_ACTIVE HEX: 4 +CONSTANT: PGRES_POLLING_FAILED 0x0 +CONSTANT: PGRES_POLLING_READING 0x1 +CONSTANT: PGRES_POLLING_WRITING 0x2 +CONSTANT: PGRES_POLLING_OK 0x3 +CONSTANT: PGRES_POLLING_ACTIVE 0x4 ! ExecStatusType; -CONSTANT: PGRES_EMPTY_QUERY HEX: 0 -CONSTANT: PGRES_COMMAND_OK HEX: 1 -CONSTANT: PGRES_TUPLES_OK HEX: 2 -CONSTANT: PGRES_COPY_OUT HEX: 3 -CONSTANT: PGRES_COPY_IN HEX: 4 -CONSTANT: PGRES_BAD_RESPONSE HEX: 5 -CONSTANT: PGRES_NONFATAL_ERROR HEX: 6 -CONSTANT: PGRES_FATAL_ERROR HEX: 7 +CONSTANT: PGRES_EMPTY_QUERY 0x0 +CONSTANT: PGRES_COMMAND_OK 0x1 +CONSTANT: PGRES_TUPLES_OK 0x2 +CONSTANT: PGRES_COPY_OUT 0x3 +CONSTANT: PGRES_COPY_IN 0x4 +CONSTANT: PGRES_BAD_RESPONSE 0x5 +CONSTANT: PGRES_NONFATAL_ERROR 0x6 +CONSTANT: PGRES_FATAL_ERROR 0x7 ! PGTransactionStatusType; -CONSTANT: PQTRANS_IDLE HEX: 0 -CONSTANT: PQTRANS_ACTIVE HEX: 1 -CONSTANT: PQTRANS_INTRANS HEX: 2 -CONSTANT: PQTRANS_INERROR HEX: 3 -CONSTANT: PQTRANS_UNKNOWN HEX: 4 +CONSTANT: PQTRANS_IDLE 0x0 +CONSTANT: PQTRANS_ACTIVE 0x1 +CONSTANT: PQTRANS_INTRANS 0x2 +CONSTANT: PQTRANS_INERROR 0x3 +CONSTANT: PQTRANS_UNKNOWN 0x4 ! PGVerbosity; -CONSTANT: PQERRORS_TERSE HEX: 0 -CONSTANT: PQERRORS_DEFAULT HEX: 1 -CONSTANT: PQERRORS_VERBOSE HEX: 2 +CONSTANT: PQERRORS_TERSE 0x0 +CONSTANT: PQERRORS_DEFAULT 0x1 +CONSTANT: PQERRORS_VERBOSE 0x2 CONSTANT: InvalidOid 0 diff --git a/basis/db/sqlite/ffi/ffi.factor b/basis/db/sqlite/ffi/ffi.factor index 14b56a7035..7fcb4babf5 100644 --- a/basis/db/sqlite/ffi/ffi.factor +++ b/basis/db/sqlite/ffi/ffi.factor @@ -86,18 +86,18 @@ CONSTANT: SQLITE_NULL 5 CONSTANT: SQLITE_STATIC 0 CONSTANT: SQLITE_TRANSIENT -1 -CONSTANT: SQLITE_OPEN_READONLY HEX: 00000001 -CONSTANT: SQLITE_OPEN_READWRITE HEX: 00000002 -CONSTANT: SQLITE_OPEN_CREATE HEX: 00000004 -CONSTANT: SQLITE_OPEN_DELETEONCLOSE HEX: 00000008 -CONSTANT: SQLITE_OPEN_EXCLUSIVE HEX: 00000010 -CONSTANT: SQLITE_OPEN_MAIN_DB HEX: 00000100 -CONSTANT: SQLITE_OPEN_TEMP_DB HEX: 00000200 -CONSTANT: SQLITE_OPEN_TRANSIENT_DB HEX: 00000400 -CONSTANT: SQLITE_OPEN_MAIN_JOURNAL HEX: 00000800 -CONSTANT: SQLITE_OPEN_TEMP_JOURNAL HEX: 00001000 -CONSTANT: SQLITE_OPEN_SUBJOURNAL HEX: 00002000 -CONSTANT: SQLITE_OPEN_MASTER_JOURNAL HEX: 00004000 +CONSTANT: SQLITE_OPEN_READONLY 0x00000001 +CONSTANT: SQLITE_OPEN_READWRITE 0x00000002 +CONSTANT: SQLITE_OPEN_CREATE 0x00000004 +CONSTANT: SQLITE_OPEN_DELETEONCLOSE 0x00000008 +CONSTANT: SQLITE_OPEN_EXCLUSIVE 0x00000010 +CONSTANT: SQLITE_OPEN_MAIN_DB 0x00000100 +CONSTANT: SQLITE_OPEN_TEMP_DB 0x00000200 +CONSTANT: SQLITE_OPEN_TRANSIENT_DB 0x00000400 +CONSTANT: SQLITE_OPEN_MAIN_JOURNAL 0x00000800 +CONSTANT: SQLITE_OPEN_TEMP_JOURNAL 0x00001000 +CONSTANT: SQLITE_OPEN_SUBJOURNAL 0x00002000 +CONSTANT: SQLITE_OPEN_MASTER_JOURNAL 0x00004000 C-TYPE: sqlite3 C-TYPE: sqlite3_stmt diff --git a/basis/debugger/windows/windows.factor b/basis/debugger/windows/windows.factor index 662d07d037..082291eaf4 100644 --- a/basis/debugger/windows/windows.factor +++ b/basis/debugger/windows/windows.factor @@ -33,7 +33,7 @@ CONSTANT: seh-names { $ STATUS_CONTROL_C_EXIT "STATUS_CONTROL_C_EXIT" } { $ STATUS_FLOAT_MULTIPLE_FAULTS "STATUS_FLOAT_MULTIPLE_FAULTS" } { $ STATUS_FLOAT_MULTIPLE_TRAPS "STATUS_FLOAT_MULTIPLE_TRAPS" } - { HEX: e06d7363 "Visual C++ exception" } + { 0xe06d7363 "Visual C++ exception" } } : seh-name. ( n -- ) @@ -45,11 +45,11 @@ M: windows signal-error. M: ole32-error error. "COM error 0x" write - dup code>> HEX: ffff,ffff bitand >hex write ": " write + dup code>> 0xffff,ffff bitand >hex write ": " write message>> write ; M: windows-error error. "Win32 error 0x" write - dup n>> HEX: ffff,ffff bitand >hex write ": " write + dup n>> 0xffff,ffff bitand >hex write ": " write string>> write ; diff --git a/basis/formatting/formatting-docs.factor b/basis/formatting/formatting-docs.factor index 100c88c4eb..ede5d112fc 100755 --- a/basis/formatting/formatting-docs.factor +++ b/basis/formatting/formatting-docs.factor @@ -56,7 +56,7 @@ HELP: printf "00123" } { $example "USING: formatting ;" - "HEX: ff \"%04X\" printf" + "0xff \"%04X\" printf" "00FF" } { $example "USING: formatting ;" diff --git a/basis/formatting/formatting-tests.factor b/basis/formatting/formatting-tests.factor index 740babf866..0d70484b0b 100755 --- a/basis/formatting/formatting-tests.factor +++ b/basis/formatting/formatting-tests.factor @@ -49,16 +49,16 @@ os windows? [ [ "+001.0E+01" ] [ 10 "%+010.1E" sprintf ] unit-test ] if -[ "ff" ] [ HEX: ff "%x" sprintf ] unit-test -[ "FF" ] [ HEX: ff "%X" sprintf ] unit-test -[ "0f" ] [ HEX: f "%02x" sprintf ] unit-test -[ "0F" ] [ HEX: f "%02X" sprintf ] unit-test +[ "ff" ] [ 0xff "%x" sprintf ] unit-test +[ "FF" ] [ 0xff "%X" sprintf ] unit-test +[ "0f" ] [ 0xf "%02x" sprintf ] unit-test +[ "0F" ] [ 0xf "%02X" sprintf ] unit-test [ "2008-09-10" ] [ 2008 9 10 "%04d-%02d-%02d" sprintf ] unit-test [ "Hello, World!" ] [ "Hello, World!" "%s" sprintf ] unit-test [ "printf test" ] [ "printf test" sprintf ] unit-test [ "char a = 'a'" ] [ CHAR: a "char %c = 'a'" sprintf ] unit-test -[ "00" ] [ HEX: 0 "%02x" sprintf ] unit-test -[ "ff" ] [ HEX: ff "%02x" sprintf ] unit-test +[ "00" ] [ 0x0 "%02x" sprintf ] unit-test +[ "ff" ] [ 0xff "%02x" sprintf ] unit-test [ "0 message(s)" ] [ 0 "message" "%d %s(s)" sprintf ] unit-test [ "0 message(s) with %" ] [ 0 "message" "%d %s(s) with %%" sprintf ] unit-test [ "justif: \"left \"" ] [ "left" "justif: \"%-10s\"" sprintf ] unit-test diff --git a/basis/game/input/dinput/dinput.factor b/basis/game/input/dinput/dinput.factor index 594dc8c059..b883e24e77 100755 --- a/basis/game/input/dinput/dinput.factor +++ b/basis/game/input/dinput/dinput.factor @@ -283,7 +283,7 @@ CONSTANT: pov-values : >slider ( long -- float ) 65535.0 /f ; inline : >pov ( long -- symbol ) - dup HEX: FFFF bitand HEX: FFFF = + dup 0xFFFF bitand 0xFFFF = [ drop pov-neutral ] [ 2750 + 4500 /i pov-values nth ] if ; inline diff --git a/basis/game/input/dinput/keys-array/keys-array.factor b/basis/game/input/dinput/keys-array/keys-array.factor index b9f21f70a2..dca6dbe2b5 100644 --- a/basis/game/input/dinput/keys-array/keys-array.factor +++ b/basis/game/input/dinput/keys-array/keys-array.factor @@ -8,7 +8,7 @@ TUPLE: keys-array C: keys-array : >key ( byte -- ? ) - HEX: 80 bitand c-bool> ; + 0x80 bitand c-bool> ; M: keys-array length length>> ; M: keys-array nth-unsafe underlying>> nth-unsafe >key ; diff --git a/basis/game/input/iokit/iokit.factor b/basis/game/input/iokit/iokit.factor index 3aa888c085..49121964e1 100644 --- a/basis/game/input/iokit/iokit.factor +++ b/basis/game/input/iokit/iokit.factor @@ -42,23 +42,23 @@ CONSTANT: buttons-matching-hash CONSTANT: keys-matching-hash H{ { "UsagePage" 7 } { "Type" 2 } } CONSTANT: x-axis-matching-hash - H{ { "UsagePage" 1 } { "Usage" HEX: 30 } { "Type" 1 } } + H{ { "UsagePage" 1 } { "Usage" 0x30 } { "Type" 1 } } CONSTANT: y-axis-matching-hash - H{ { "UsagePage" 1 } { "Usage" HEX: 31 } { "Type" 1 } } + H{ { "UsagePage" 1 } { "Usage" 0x31 } { "Type" 1 } } CONSTANT: z-axis-matching-hash - H{ { "UsagePage" 1 } { "Usage" HEX: 32 } { "Type" 1 } } + H{ { "UsagePage" 1 } { "Usage" 0x32 } { "Type" 1 } } CONSTANT: rx-axis-matching-hash - H{ { "UsagePage" 1 } { "Usage" HEX: 33 } { "Type" 1 } } + H{ { "UsagePage" 1 } { "Usage" 0x33 } { "Type" 1 } } CONSTANT: ry-axis-matching-hash - H{ { "UsagePage" 1 } { "Usage" HEX: 34 } { "Type" 1 } } + H{ { "UsagePage" 1 } { "Usage" 0x34 } { "Type" 1 } } CONSTANT: rz-axis-matching-hash - H{ { "UsagePage" 1 } { "Usage" HEX: 35 } { "Type" 1 } } + H{ { "UsagePage" 1 } { "Usage" 0x35 } { "Type" 1 } } CONSTANT: slider-matching-hash - H{ { "UsagePage" 1 } { "Usage" HEX: 36 } { "Type" 1 } } + H{ { "UsagePage" 1 } { "Usage" 0x36 } { "Type" 1 } } CONSTANT: wheel-matching-hash - H{ { "UsagePage" 1 } { "Usage" HEX: 38 } { "Type" 1 } } + H{ { "UsagePage" 1 } { "Usage" 0x38 } { "Type" 1 } } CONSTANT: hat-switch-matching-hash - H{ { "UsagePage" 1 } { "Usage" HEX: 39 } { "Type" 1 } } + H{ { "UsagePage" 1 } { "Usage" 0x39 } { "Type" 1 } } : device-elements-matching ( device matching-hash -- vector ) [ @@ -121,23 +121,23 @@ CONSTANT: hat-switch-matching-hash IOHIDElementGetUsagePage 1 = ; inline : x-axis? ( {usage-page,usage} -- ? ) - IOHIDElementGetUsage HEX: 30 = ; inline + IOHIDElementGetUsage 0x30 = ; inline : y-axis? ( {usage-page,usage} -- ? ) - IOHIDElementGetUsage HEX: 31 = ; inline + IOHIDElementGetUsage 0x31 = ; inline : z-axis? ( {usage-page,usage} -- ? ) - IOHIDElementGetUsage HEX: 32 = ; inline + IOHIDElementGetUsage 0x32 = ; inline : rx-axis? ( {usage-page,usage} -- ? ) - IOHIDElementGetUsage HEX: 33 = ; inline + IOHIDElementGetUsage 0x33 = ; inline : ry-axis? ( {usage-page,usage} -- ? ) - IOHIDElementGetUsage HEX: 34 = ; inline + IOHIDElementGetUsage 0x34 = ; inline : rz-axis? ( {usage-page,usage} -- ? ) - IOHIDElementGetUsage HEX: 35 = ; inline + IOHIDElementGetUsage 0x35 = ; inline : slider? ( {usage-page,usage} -- ? ) - IOHIDElementGetUsage HEX: 36 = ; inline + IOHIDElementGetUsage 0x36 = ; inline : wheel? ( {usage-page,usage} -- ? ) - IOHIDElementGetUsage HEX: 38 = ; inline + IOHIDElementGetUsage 0x38 = ; inline : hat-switch? ( {usage-page,usage} -- ? ) - IOHIDElementGetUsage HEX: 39 = ; inline + IOHIDElementGetUsage 0x39 = ; inline CONSTANT: pov-values { diff --git a/basis/game/input/scancodes/scancodes.factor b/basis/game/input/scancodes/scancodes.factor index cfa659e57a..f31bc35bcf 100644 --- a/basis/game/input/scancodes/scancodes.factor +++ b/basis/game/input/scancodes/scancodes.factor @@ -1,175 +1,175 @@ IN: game.input.scancodes -CONSTANT: key-undefined HEX: 0000 -CONSTANT: key-error-roll-over HEX: 0001 -CONSTANT: key-error-post-fail HEX: 0002 -CONSTANT: key-error-undefined HEX: 0003 -CONSTANT: key-a HEX: 0004 -CONSTANT: key-b HEX: 0005 -CONSTANT: key-c HEX: 0006 -CONSTANT: key-d HEX: 0007 -CONSTANT: key-e HEX: 0008 -CONSTANT: key-f HEX: 0009 -CONSTANT: key-g HEX: 000a -CONSTANT: key-h HEX: 000b -CONSTANT: key-i HEX: 000c -CONSTANT: key-j HEX: 000d -CONSTANT: key-k HEX: 000e -CONSTANT: key-l HEX: 000f -CONSTANT: key-m HEX: 0010 -CONSTANT: key-n HEX: 0011 -CONSTANT: key-o HEX: 0012 -CONSTANT: key-p HEX: 0013 -CONSTANT: key-q HEX: 0014 -CONSTANT: key-r HEX: 0015 -CONSTANT: key-s HEX: 0016 -CONSTANT: key-t HEX: 0017 -CONSTANT: key-u HEX: 0018 -CONSTANT: key-v HEX: 0019 -CONSTANT: key-w HEX: 001a -CONSTANT: key-x HEX: 001b -CONSTANT: key-y HEX: 001c -CONSTANT: key-z HEX: 001d -CONSTANT: key-1 HEX: 001e -CONSTANT: key-2 HEX: 001f -CONSTANT: key-3 HEX: 0020 -CONSTANT: key-4 HEX: 0021 -CONSTANT: key-5 HEX: 0022 -CONSTANT: key-6 HEX: 0023 -CONSTANT: key-7 HEX: 0024 -CONSTANT: key-8 HEX: 0025 -CONSTANT: key-9 HEX: 0026 -CONSTANT: key-0 HEX: 0027 -CONSTANT: key-return HEX: 0028 -CONSTANT: key-escape HEX: 0029 -CONSTANT: key-backspace HEX: 002a -CONSTANT: key-tab HEX: 002b -CONSTANT: key-space HEX: 002c -CONSTANT: key-- HEX: 002d -CONSTANT: key-= HEX: 002e -CONSTANT: key-[ HEX: 002f -CONSTANT: key-] HEX: 0030 -CONSTANT: key-\ HEX: 0031 -CONSTANT: key-#-non-us HEX: 0032 -CONSTANT: key-; HEX: 0033 -CONSTANT: key-' HEX: 0034 -CONSTANT: key-` HEX: 0035 -CONSTANT: key-, HEX: 0036 -CONSTANT: key-. HEX: 0037 -CONSTANT: key-/ HEX: 0038 -CONSTANT: key-caps-lock HEX: 0039 -CONSTANT: key-f1 HEX: 003a -CONSTANT: key-f2 HEX: 003b -CONSTANT: key-f3 HEX: 003c -CONSTANT: key-f4 HEX: 003d -CONSTANT: key-f5 HEX: 003e -CONSTANT: key-f6 HEX: 003f -CONSTANT: key-f7 HEX: 0040 -CONSTANT: key-f8 HEX: 0041 -CONSTANT: key-f9 HEX: 0042 -CONSTANT: key-f10 HEX: 0043 -CONSTANT: key-f11 HEX: 0044 -CONSTANT: key-f12 HEX: 0045 -CONSTANT: key-print-screen HEX: 0046 -CONSTANT: key-scroll-lock HEX: 0047 -CONSTANT: key-pause HEX: 0048 -CONSTANT: key-insert HEX: 0049 -CONSTANT: key-home HEX: 004a -CONSTANT: key-page-up HEX: 004b -CONSTANT: key-delete HEX: 004c -CONSTANT: key-end HEX: 004d -CONSTANT: key-page-down HEX: 004e -CONSTANT: key-right-arrow HEX: 004f -CONSTANT: key-left-arrow HEX: 0050 -CONSTANT: key-down-arrow HEX: 0051 -CONSTANT: key-up-arrow HEX: 0052 -CONSTANT: key-keypad-numlock HEX: 0053 -CONSTANT: key-keypad-/ HEX: 0054 -CONSTANT: key-keypad-* HEX: 0055 -CONSTANT: key-keypad-- HEX: 0056 -CONSTANT: key-keypad-+ HEX: 0057 -CONSTANT: key-keypad-enter HEX: 0058 -CONSTANT: key-keypad-1 HEX: 0059 -CONSTANT: key-keypad-2 HEX: 005a -CONSTANT: key-keypad-3 HEX: 005b -CONSTANT: key-keypad-4 HEX: 005c -CONSTANT: key-keypad-5 HEX: 005d -CONSTANT: key-keypad-6 HEX: 005e -CONSTANT: key-keypad-7 HEX: 005f -CONSTANT: key-keypad-8 HEX: 0060 -CONSTANT: key-keypad-9 HEX: 0061 -CONSTANT: key-keypad-0 HEX: 0062 -CONSTANT: key-keypad-. HEX: 0063 -CONSTANT: key-\-non-us HEX: 0064 -CONSTANT: key-application HEX: 0065 -CONSTANT: key-power HEX: 0066 -CONSTANT: key-keypad-= HEX: 0067 -CONSTANT: key-f13 HEX: 0068 -CONSTANT: key-f14 HEX: 0069 -CONSTANT: key-f15 HEX: 006a -CONSTANT: key-f16 HEX: 006b -CONSTANT: key-f17 HEX: 006c -CONSTANT: key-f18 HEX: 006d -CONSTANT: key-f19 HEX: 006e -CONSTANT: key-f20 HEX: 006f -CONSTANT: key-f21 HEX: 0070 -CONSTANT: key-f22 HEX: 0071 -CONSTANT: key-f23 HEX: 0072 -CONSTANT: key-f24 HEX: 0073 -CONSTANT: key-execute HEX: 0074 -CONSTANT: key-help HEX: 0075 -CONSTANT: key-menu HEX: 0076 -CONSTANT: key-select HEX: 0077 -CONSTANT: key-stop HEX: 0078 -CONSTANT: key-again HEX: 0079 -CONSTANT: key-undo HEX: 007a -CONSTANT: key-cut HEX: 007b -CONSTANT: key-copy HEX: 007c -CONSTANT: key-paste HEX: 007d -CONSTANT: key-find HEX: 007e -CONSTANT: key-mute HEX: 007f -CONSTANT: key-volume-up HEX: 0080 -CONSTANT: key-volume-down HEX: 0081 -CONSTANT: key-locking-caps-lock HEX: 0082 -CONSTANT: key-locking-num-lock HEX: 0083 -CONSTANT: key-locking-scroll-lock HEX: 0084 -CONSTANT: key-keypad-, HEX: 0085 -CONSTANT: key-keypad-=-as-400 HEX: 0086 -CONSTANT: key-international-1 HEX: 0087 -CONSTANT: key-international-2 HEX: 0088 -CONSTANT: key-international-3 HEX: 0089 -CONSTANT: key-international-4 HEX: 008a -CONSTANT: key-international-5 HEX: 008b -CONSTANT: key-international-6 HEX: 008c -CONSTANT: key-international-7 HEX: 008d -CONSTANT: key-international-8 HEX: 008e -CONSTANT: key-international-9 HEX: 008f -CONSTANT: key-lang-1 HEX: 0090 -CONSTANT: key-lang-2 HEX: 0091 -CONSTANT: key-lang-3 HEX: 0092 -CONSTANT: key-lang-4 HEX: 0093 -CONSTANT: key-lang-5 HEX: 0094 -CONSTANT: key-lang-6 HEX: 0095 -CONSTANT: key-lang-7 HEX: 0096 -CONSTANT: key-lang-8 HEX: 0097 -CONSTANT: key-lang-9 HEX: 0098 -CONSTANT: key-alternate-erase HEX: 0099 -CONSTANT: key-sysreq HEX: 009a -CONSTANT: key-cancel HEX: 009b -CONSTANT: key-clear HEX: 009c -CONSTANT: key-prior HEX: 009d -CONSTANT: key-enter HEX: 009e -CONSTANT: key-separator HEX: 009f -CONSTANT: key-out HEX: 00a0 -CONSTANT: key-oper HEX: 00a1 -CONSTANT: key-clear-again HEX: 00a2 -CONSTANT: key-crsel-props HEX: 00a3 -CONSTANT: key-exsel HEX: 00a4 -CONSTANT: key-left-control HEX: 00e0 -CONSTANT: key-left-shift HEX: 00e1 -CONSTANT: key-left-alt HEX: 00e2 -CONSTANT: key-left-gui HEX: 00e3 -CONSTANT: key-right-control HEX: 00e4 -CONSTANT: key-right-shift HEX: 00e5 -CONSTANT: key-right-alt HEX: 00e6 -CONSTANT: key-right-gui HEX: 00e7 +CONSTANT: key-undefined 0x0000 +CONSTANT: key-error-roll-over 0x0001 +CONSTANT: key-error-post-fail 0x0002 +CONSTANT: key-error-undefined 0x0003 +CONSTANT: key-a 0x0004 +CONSTANT: key-b 0x0005 +CONSTANT: key-c 0x0006 +CONSTANT: key-d 0x0007 +CONSTANT: key-e 0x0008 +CONSTANT: key-f 0x0009 +CONSTANT: key-g 0x000a +CONSTANT: key-h 0x000b +CONSTANT: key-i 0x000c +CONSTANT: key-j 0x000d +CONSTANT: key-k 0x000e +CONSTANT: key-l 0x000f +CONSTANT: key-m 0x0010 +CONSTANT: key-n 0x0011 +CONSTANT: key-o 0x0012 +CONSTANT: key-p 0x0013 +CONSTANT: key-q 0x0014 +CONSTANT: key-r 0x0015 +CONSTANT: key-s 0x0016 +CONSTANT: key-t 0x0017 +CONSTANT: key-u 0x0018 +CONSTANT: key-v 0x0019 +CONSTANT: key-w 0x001a +CONSTANT: key-x 0x001b +CONSTANT: key-y 0x001c +CONSTANT: key-z 0x001d +CONSTANT: key-1 0x001e +CONSTANT: key-2 0x001f +CONSTANT: key-3 0x0020 +CONSTANT: key-4 0x0021 +CONSTANT: key-5 0x0022 +CONSTANT: key-6 0x0023 +CONSTANT: key-7 0x0024 +CONSTANT: key-8 0x0025 +CONSTANT: key-9 0x0026 +CONSTANT: key-0 0x0027 +CONSTANT: key-return 0x0028 +CONSTANT: key-escape 0x0029 +CONSTANT: key-backspace 0x002a +CONSTANT: key-tab 0x002b +CONSTANT: key-space 0x002c +CONSTANT: key-- 0x002d +CONSTANT: key-= 0x002e +CONSTANT: key-[ 0x002f +CONSTANT: key-] 0x0030 +CONSTANT: key-\ 0x0031 +CONSTANT: key-#-non-us 0x0032 +CONSTANT: key-; 0x0033 +CONSTANT: key-' 0x0034 +CONSTANT: key-` 0x0035 +CONSTANT: key-, 0x0036 +CONSTANT: key-. 0x0037 +CONSTANT: key-/ 0x0038 +CONSTANT: key-caps-lock 0x0039 +CONSTANT: key-f1 0x003a +CONSTANT: key-f2 0x003b +CONSTANT: key-f3 0x003c +CONSTANT: key-f4 0x003d +CONSTANT: key-f5 0x003e +CONSTANT: key-f6 0x003f +CONSTANT: key-f7 0x0040 +CONSTANT: key-f8 0x0041 +CONSTANT: key-f9 0x0042 +CONSTANT: key-f10 0x0043 +CONSTANT: key-f11 0x0044 +CONSTANT: key-f12 0x0045 +CONSTANT: key-print-screen 0x0046 +CONSTANT: key-scroll-lock 0x0047 +CONSTANT: key-pause 0x0048 +CONSTANT: key-insert 0x0049 +CONSTANT: key-home 0x004a +CONSTANT: key-page-up 0x004b +CONSTANT: key-delete 0x004c +CONSTANT: key-end 0x004d +CONSTANT: key-page-down 0x004e +CONSTANT: key-right-arrow 0x004f +CONSTANT: key-left-arrow 0x0050 +CONSTANT: key-down-arrow 0x0051 +CONSTANT: key-up-arrow 0x0052 +CONSTANT: key-keypad-numlock 0x0053 +CONSTANT: key-keypad-/ 0x0054 +CONSTANT: key-keypad-* 0x0055 +CONSTANT: key-keypad-- 0x0056 +CONSTANT: key-keypad-+ 0x0057 +CONSTANT: key-keypad-enter 0x0058 +CONSTANT: key-keypad-1 0x0059 +CONSTANT: key-keypad-2 0x005a +CONSTANT: key-keypad-3 0x005b +CONSTANT: key-keypad-4 0x005c +CONSTANT: key-keypad-5 0x005d +CONSTANT: key-keypad-6 0x005e +CONSTANT: key-keypad-7 0x005f +CONSTANT: key-keypad-8 0x0060 +CONSTANT: key-keypad-9 0x0061 +CONSTANT: key-keypad-0 0x0062 +CONSTANT: key-keypad-. 0x0063 +CONSTANT: key-\-non-us 0x0064 +CONSTANT: key-application 0x0065 +CONSTANT: key-power 0x0066 +CONSTANT: key-keypad-= 0x0067 +CONSTANT: key-f13 0x0068 +CONSTANT: key-f14 0x0069 +CONSTANT: key-f15 0x006a +CONSTANT: key-f16 0x006b +CONSTANT: key-f17 0x006c +CONSTANT: key-f18 0x006d +CONSTANT: key-f19 0x006e +CONSTANT: key-f20 0x006f +CONSTANT: key-f21 0x0070 +CONSTANT: key-f22 0x0071 +CONSTANT: key-f23 0x0072 +CONSTANT: key-f24 0x0073 +CONSTANT: key-execute 0x0074 +CONSTANT: key-help 0x0075 +CONSTANT: key-menu 0x0076 +CONSTANT: key-select 0x0077 +CONSTANT: key-stop 0x0078 +CONSTANT: key-again 0x0079 +CONSTANT: key-undo 0x007a +CONSTANT: key-cut 0x007b +CONSTANT: key-copy 0x007c +CONSTANT: key-paste 0x007d +CONSTANT: key-find 0x007e +CONSTANT: key-mute 0x007f +CONSTANT: key-volume-up 0x0080 +CONSTANT: key-volume-down 0x0081 +CONSTANT: key-locking-caps-lock 0x0082 +CONSTANT: key-locking-num-lock 0x0083 +CONSTANT: key-locking-scroll-lock 0x0084 +CONSTANT: key-keypad-, 0x0085 +CONSTANT: key-keypad-=-as-400 0x0086 +CONSTANT: key-international-1 0x0087 +CONSTANT: key-international-2 0x0088 +CONSTANT: key-international-3 0x0089 +CONSTANT: key-international-4 0x008a +CONSTANT: key-international-5 0x008b +CONSTANT: key-international-6 0x008c +CONSTANT: key-international-7 0x008d +CONSTANT: key-international-8 0x008e +CONSTANT: key-international-9 0x008f +CONSTANT: key-lang-1 0x0090 +CONSTANT: key-lang-2 0x0091 +CONSTANT: key-lang-3 0x0092 +CONSTANT: key-lang-4 0x0093 +CONSTANT: key-lang-5 0x0094 +CONSTANT: key-lang-6 0x0095 +CONSTANT: key-lang-7 0x0096 +CONSTANT: key-lang-8 0x0097 +CONSTANT: key-lang-9 0x0098 +CONSTANT: key-alternate-erase 0x0099 +CONSTANT: key-sysreq 0x009a +CONSTANT: key-cancel 0x009b +CONSTANT: key-clear 0x009c +CONSTANT: key-prior 0x009d +CONSTANT: key-enter 0x009e +CONSTANT: key-separator 0x009f +CONSTANT: key-out 0x00a0 +CONSTANT: key-oper 0x00a1 +CONSTANT: key-clear-again 0x00a2 +CONSTANT: key-crsel-props 0x00a3 +CONSTANT: key-exsel 0x00a4 +CONSTANT: key-left-control 0x00e0 +CONSTANT: key-left-shift 0x00e1 +CONSTANT: key-left-alt 0x00e2 +CONSTANT: key-left-gui 0x00e3 +CONSTANT: key-right-control 0x00e4 +CONSTANT: key-right-shift 0x00e5 +CONSTANT: key-right-alt 0x00e6 +CONSTANT: key-right-gui 0x00e7 diff --git a/basis/game/input/xinput/xinput.factor b/basis/game/input/xinput/xinput.factor index 2f597d0d12..034c949085 100644 --- a/basis/game/input/xinput/xinput.factor +++ b/basis/game/input/xinput/xinput.factor @@ -56,7 +56,7 @@ MACRO: map-index-compose ( seq quot -- seq ) : fill-controller-state ( XINPUT_STATE -- controller-state ) Gamepad>> controller-state new dup rot { - [ wButtons>> HEX: f bitand >pov swap pov<< ] + [ wButtons>> 0xf bitand >pov swap pov<< ] [ wButtons>> fill-buttons swap buttons<< ] [ sThumbLX>> >axis swap x<< ] [ sThumbLY>> >axis swap y<< ] diff --git a/basis/glib/ffi/ffi.factor b/basis/glib/ffi/ffi.factor index f3fa1fc9f4..96d92663eb 100644 --- a/basis/glib/ffi/ffi.factor +++ b/basis/glib/ffi/ffi.factor @@ -18,18 +18,18 @@ LIBRARY: glib IMPLEMENT-STRUCTS: GError GPollFD GSource GSourceFuncs ; -CONSTANT: G_MININT8 HEX: -80 -CONSTANT: G_MAXINT8 HEX: 7f -CONSTANT: G_MAXUINT8 HEX: ff -CONSTANT: G_MININT16 HEX: -8000 -CONSTANT: G_MAXINT16 HEX: 7fff -CONSTANT: G_MAXUINT16 HEX: ffff -CONSTANT: G_MININT32 HEX: -80000000 -CONSTANT: G_MAXINT32 HEX: 7fffffff -CONSTANT: G_MAXUINT32 HEX: ffffffff -CONSTANT: G_MININT64 HEX: -8000000000000000 -CONSTANT: G_MAXINT64 HEX: 7fffffffffffffff -CONSTANT: G_MAXUINT64 HEX: ffffffffffffffff +CONSTANT: G_MININT8 -0x80 +CONSTANT: G_MAXINT8 0x7f +CONSTANT: G_MAXUINT8 0xff +CONSTANT: G_MININT16 -0x8000 +CONSTANT: G_MAXINT16 0x7fff +CONSTANT: G_MAXUINT16 0xffff +CONSTANT: G_MININT32 -0x80000000 +CONSTANT: G_MAXINT32 0x7fffffff +CONSTANT: G_MAXUINT32 0xffffffff +CONSTANT: G_MININT64 -0x8000000000000000 +CONSTANT: G_MAXINT64 0x7fffffffffffffff +CONSTANT: G_MAXUINT64 0xffffffffffffffff GIR: vocab:glib/GLib-2.0.gir diff --git a/basis/io/backend/unix/multiplexers/select/select.factor b/basis/io/backend/unix/multiplexers/select/select.factor index e64e5e707e..09fd5840c2 100644 --- a/basis/io/backend/unix/multiplexers/select/select.factor +++ b/basis/io/backend/unix/multiplexers/select/select.factor @@ -13,7 +13,7 @@ TUPLE: select-mx < mx read-fdset write-fdset ; ! byte order differences on big endian platforms : munge ( i -- i' ) little-endian? [ - cell 4 = [ BIN: 11000 ] [ BIN: 111000 ] if + cell 4 = [ 0b11000 ] [ 0b111000 ] if bitxor ] unless ; inline : ( -- mx ) diff --git a/basis/io/backend/unix/unix.factor b/basis/io/backend/unix/unix.factor index dc5da7e560..60890b6fc0 100755 --- a/basis/io/backend/unix/unix.factor +++ b/basis/io/backend/unix/unix.factor @@ -86,7 +86,7 @@ M: io-timeout summary drop "I/O operation timed out" ; '[ handle>> _ wait-for-fd ] with-timeout ; ! Some general stuff -CONSTANT: file-mode OCT: 0666 +CONSTANT: file-mode 0o0666 ! Readers : (refill) ( port -- n ) diff --git a/basis/io/directories/unix/unix.factor b/basis/io/directories/unix/unix.factor index f8b65bb227..eabf1bf314 100644 --- a/basis/io/directories/unix/unix.factor +++ b/basis/io/directories/unix/unix.factor @@ -8,7 +8,7 @@ math.bitwise sequences system unix unix.stat vocabs.loader classes.struct unix.ffi literals libc vocabs ; IN: io.directories.unix -CONSTANT: file-mode OCT: 0666 +CONSTANT: file-mode 0o0666 CONSTANT: touch-mode flags{ O_WRONLY O_APPEND O_CREAT O_EXCL } @@ -24,7 +24,7 @@ M: unix move-file ( from to -- ) M: unix delete-file ( path -- ) normalize-path unlink-file ; M: unix make-directory ( path -- ) - normalize-path OCT: 777 [ mkdir ] unix-system-call drop ; + normalize-path 0o777 [ mkdir ] unix-system-call drop ; M: unix delete-directory ( path -- ) normalize-path [ rmdir ] unix-system-call drop ; diff --git a/basis/io/encodings/8-bit/8-bit-tests.factor b/basis/io/encodings/8-bit/8-bit-tests.factor index 5178630f0f..5a4b9c2907 100644 --- a/basis/io/encodings/8-bit/8-bit-tests.factor +++ b/basis/io/encodings/8-bit/8-bit-tests.factor @@ -9,7 +9,7 @@ IN: io.encodings.8-bit.tests [ "bar" ] [ "bar" latin1 decode ] unit-test [ { CHAR: b 233 CHAR: r } ] [ B{ CHAR: b 233 CHAR: r } latin1 decode >array ] unit-test -[ { HEX: fffd HEX: 20AC } ] [ B{ HEX: 81 HEX: 80 } windows-1252 decode >array ] unit-test +[ { 0xfffd 0x20AC } ] [ B{ 0x81 0x80 } windows-1252 decode >array ] unit-test [ t ] [ \ latin1 8-bit-encoding? ] unit-test [ "bar" ] [ "bar" \ latin1 decode ] unit-test diff --git a/basis/io/encodings/ascii/ascii-tests.factor b/basis/io/encodings/ascii/ascii-tests.factor index fcd549d31f..13fee51d50 100644 --- a/basis/io/encodings/ascii/ascii-tests.factor +++ b/basis/io/encodings/ascii/ascii-tests.factor @@ -6,4 +6,4 @@ IN: io.encodings.ascii.tests [ B{ 127 } ] [ { 127 } >string ascii encode ] unit-test [ "bar" ] [ "bar" ascii decode ] unit-test -[ { CHAR: b HEX: fffd CHAR: r } ] [ B{ CHAR: b 233 CHAR: r } ascii decode >array ] unit-test +[ { CHAR: b 0xfffd CHAR: r } ] [ B{ CHAR: b 233 CHAR: r } ascii decode >array ] unit-test diff --git a/basis/io/encodings/euc/euc-tests.factor b/basis/io/encodings/euc/euc-tests.factor index c89661c0fd..7c6afce379 100644 --- a/basis/io/encodings/euc/euc-tests.factor +++ b/basis/io/encodings/euc/euc-tests.factor @@ -11,26 +11,26 @@ IN: io.encodings.euc.tests : unicode>euc-kr ( ch -- ch/f ) euc-kr euc-table word-prop value-at ; -[ f ] [ HEX: 80 euc-kr>unicode ] unit-test -[ f ] [ HEX: ff euc-kr>unicode ] unit-test -[ HEX: ac02 ] [ HEX: 8141 euc-kr>unicode ] unit-test -[ HEX: 7f ] [ HEX: 7f euc-kr>unicode ] unit-test -[ HEX: c724 ] [ HEX: c0b1 euc-kr>unicode ] unit-test +[ f ] [ 0x80 euc-kr>unicode ] unit-test +[ f ] [ 0xff euc-kr>unicode ] unit-test +[ 0xac02 ] [ 0x8141 euc-kr>unicode ] unit-test +[ 0x7f ] [ 0x7f euc-kr>unicode ] unit-test +[ 0xc724 ] [ 0xc0b1 euc-kr>unicode ] unit-test -[ HEX: 8141 ] [ HEX: ac02 unicode>euc-kr ] unit-test -[ HEX: 7f ] [ HEX: 7f unicode>euc-kr ] unit-test -[ HEX: c0b1 ] [ HEX: c724 unicode>euc-kr ] unit-test +[ 0x8141 ] [ 0xac02 unicode>euc-kr ] unit-test +[ 0x7f ] [ 0x7f unicode>euc-kr ] unit-test +[ 0xc0b1 ] [ 0xc724 unicode>euc-kr ] unit-test : phrase-unicode ( -- s ) "\u00b3d9\u00d574\u00bb3c\u00acfc \u00bc31\u00b450\u00c0b0\u00c774!" ; : phrase-euc-kr ( -- s ) { - HEX: b5 HEX: bf HEX: c7 HEX: d8 - HEX: b9 HEX: b0 HEX: b0 HEX: fa - HEX: 20 HEX: b9 HEX: e9 HEX: b5 - HEX: ce HEX: bb HEX: ea HEX: c0 - HEX: cc HEX: 21 + 0xb5 0xbf 0xc7 0xd8 + 0xb9 0xb0 0xb0 0xfa + 0x20 0xb9 0xe9 0xb5 + 0xce 0xbb 0xea 0xc0 + 0xcc 0x21 } ; : phrase-unicode>euc-kr ( -- s ) diff --git a/basis/io/encodings/euc/euc.factor b/basis/io/encodings/euc/euc.factor index a61046a5c7..63a2c69cff 100644 --- a/basis/io/encodings/euc/euc.factor +++ b/basis/io/encodings/euc/euc.factor @@ -10,7 +10,7 @@ TUPLE: euc { table biassoc } ; > value-at [ @@ -22,7 +22,7 @@ M: euc encode-char ( char stream encoding -- ) ] [ encode-error ] if* ; : euc-multibyte? ( ch -- ? ) - HEX: 81 HEX: fe between? ; + 0x81 0xfe between? ; :: decode-multibyte ( ch stream encoding -- char ) stream stream-read1 diff --git a/basis/io/encodings/gb18030/gb18030-tests.factor b/basis/io/encodings/gb18030/gb18030-tests.factor index da44d1cf9a..11faeeb8e4 100644 --- a/basis/io/encodings/gb18030/gb18030-tests.factor +++ b/basis/io/encodings/gb18030/gb18030-tests.factor @@ -5,22 +5,22 @@ IN: io.encodings.gb18030.tests [ "hello" ] [ "hello" gb18030 encode >string ] unit-test [ "hello" ] [ "hello" gb18030 decode ] unit-test -[ B{ HEX: A1 HEX: A4 HEX: 81 HEX: 30 HEX: 86 HEX: 30 } ] -[ B{ HEX: B7 HEX: B8 } >string gb18030 encode ] unit-test -[ { HEX: B7 HEX: B8 } ] -[ B{ HEX: A1 HEX: A4 HEX: 81 HEX: 30 HEX: 86 HEX: 30 } gb18030 decode >array ] unit-test -[ { HEX: B7 CHAR: replacement-character } ] -[ B{ HEX: A1 HEX: A4 HEX: 81 HEX: 30 HEX: 86 } gb18030 decode >array ] unit-test -[ { HEX: B7 CHAR: replacement-character } ] -[ B{ HEX: A1 HEX: A4 HEX: 81 HEX: 30 } gb18030 decode >array ] unit-test -[ { HEX: B7 CHAR: replacement-character } ] -[ B{ HEX: A1 HEX: A4 HEX: 81 } gb18030 decode >array ] unit-test -[ { HEX: B7 } ] -[ B{ HEX: A1 HEX: A4 } gb18030 decode >array ] unit-test +[ B{ 0xA1 0xA4 0x81 0x30 0x86 0x30 } ] +[ B{ 0xB7 0xB8 } >string gb18030 encode ] unit-test +[ { 0xB7 0xB8 } ] +[ B{ 0xA1 0xA4 0x81 0x30 0x86 0x30 } gb18030 decode >array ] unit-test +[ { 0xB7 CHAR: replacement-character } ] +[ B{ 0xA1 0xA4 0x81 0x30 0x86 } gb18030 decode >array ] unit-test +[ { 0xB7 CHAR: replacement-character } ] +[ B{ 0xA1 0xA4 0x81 0x30 } gb18030 decode >array ] unit-test +[ { 0xB7 CHAR: replacement-character } ] +[ B{ 0xA1 0xA4 0x81 } gb18030 decode >array ] unit-test +[ { 0xB7 } ] +[ B{ 0xA1 0xA4 } gb18030 decode >array ] unit-test [ { CHAR: replacement-character } ] -[ B{ HEX: A1 } >string gb18030 decode >array ] unit-test -[ { HEX: 44D7 HEX: 464B } ] -[ B{ HEX: 82 HEX: 33 HEX: A3 HEX: 39 HEX: 82 HEX: 33 HEX: C9 HEX: 31 } +[ B{ 0xA1 } >string gb18030 decode >array ] unit-test +[ { 0x44D7 0x464B } ] +[ B{ 0x82 0x33 0xA3 0x39 0x82 0x33 0xC9 0x31 } gb18030 decode >array ] unit-test -[ { HEX: 82 HEX: 33 HEX: A3 HEX: 39 HEX: 82 HEX: 33 HEX: C9 HEX: 31 } ] -[ { HEX: 44D7 HEX: 464B } >string gb18030 encode >array ] unit-test +[ { 0x82 0x33 0xA3 0x39 0x82 0x33 0xC9 0x31 } ] +[ { 0x44D7 0x464B } >string gb18030 encode >array ] unit-test diff --git a/basis/io/encodings/gb18030/gb18030.factor b/basis/io/encodings/gb18030/gb18030.factor index 32b3e1787c..3ba0f7bd08 100644 --- a/basis/io/encodings/gb18030/gb18030.factor +++ b/basis/io/encodings/gb18030/gb18030.factor @@ -62,11 +62,11 @@ TUPLE: range ufirst ulast bfirst blast ; ] ; : unlinear ( num -- bytes ) - B{ HEX: 81 HEX: 30 HEX: 81 HEX: 30 } linear - - 10 /mod HEX: 30 + swap - 126 /mod HEX: 81 + swap - 10 /mod HEX: 30 + swap - HEX: 81 + + B{ 0x81 0x30 0x81 0x30 } linear - + 10 /mod 0x30 + swap + 126 /mod 0x81 + swap + 10 /mod 0x30 + swap + 0x81 + 4byte-array reverse! ; : >interval-map-by ( start-quot end-quot value-quot seq -- interval-map ) @@ -99,11 +99,11 @@ M: gb18030 encode-char ( char stream encoding -- ) ] dip stream-write ; : second-byte? ( ch -- ? ) ! of a double-byte character - { [ HEX: 40 HEX: 7E between? ] [ HEX: 80 HEX: fe between? ] } 1|| ; + { [ 0x40 0x7E between? ] [ 0x80 0xfe between? ] } 1|| ; -: quad-1/3? ( ch -- ? ) HEX: 81 HEX: fe between? ; +: quad-1/3? ( ch -- ? ) 0x81 0xfe between? ; -: quad-2/4? ( ch -- ? ) HEX: 30 HEX: 39 between? ; +: quad-2/4? ( ch -- ? ) 0x30 0x39 between? ; : last-bytes? ( byte-array -- ? ) { [ length 2 = ] [ first quad-1/3? ] [ second quad-2/4? ] } 1&& ; diff --git a/basis/io/encodings/iso2022/iso2022-tests.factor b/basis/io/encodings/iso2022/iso2022-tests.factor index 9111eee955..c641a71959 100644 --- a/basis/io/encodings/iso2022/iso2022-tests.factor +++ b/basis/io/encodings/iso2022/iso2022-tests.factor @@ -12,25 +12,25 @@ IN: io.encodings.iso2022 [ "hi\u00fffd" ] [ B{ CHAR: h CHAR: i ESC CHAR: ( } iso2022 decode ] unit-test [ "hi\u00fffd" ] [ B{ CHAR: h CHAR: i ESC } iso2022 decode ] unit-test -[ B{ CHAR: h ESC CHAR: ( CHAR: J HEX: D8 } ] [ "h\u00ff98" iso2022 encode ] unit-test -[ "h\u00ff98" ] [ B{ CHAR: h ESC CHAR: ( CHAR: J HEX: D8 } iso2022 decode ] unit-test +[ B{ CHAR: h ESC CHAR: ( CHAR: J 0xD8 } ] [ "h\u00ff98" iso2022 encode ] unit-test +[ "h\u00ff98" ] [ B{ CHAR: h ESC CHAR: ( CHAR: J 0xD8 } iso2022 decode ] unit-test [ "hi" ] [ B{ CHAR: h ESC CHAR: ( CHAR: J CHAR: i } iso2022 decode ] unit-test [ "h" ] [ B{ CHAR: h ESC CHAR: ( CHAR: J } iso2022 decode ] unit-test -[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: ( CHAR: J HEX: 80 } iso2022 decode ] unit-test +[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: ( CHAR: J 0x80 } iso2022 decode ] unit-test -[ B{ CHAR: h ESC CHAR: $ CHAR: B HEX: 3E HEX: 47 } ] [ "h\u007126" iso2022 encode ] unit-test -[ "h\u007126" ] [ B{ CHAR: h ESC CHAR: $ CHAR: B HEX: 3E HEX: 47 } iso2022 decode ] unit-test -[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ CHAR: B HEX: 3E } iso2022 decode ] unit-test +[ B{ CHAR: h ESC CHAR: $ CHAR: B 0x3E 0x47 } ] [ "h\u007126" iso2022 encode ] unit-test +[ "h\u007126" ] [ B{ CHAR: h ESC CHAR: $ CHAR: B 0x3E 0x47 } iso2022 decode ] unit-test +[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ CHAR: B 0x3E } iso2022 decode ] unit-test [ "h" ] [ B{ CHAR: h ESC CHAR: $ CHAR: B } iso2022 decode ] unit-test [ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ } iso2022 decode ] unit-test [ "h\u00fffd" ] [ B{ CHAR: h ESC } iso2022 decode ] unit-test -[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ CHAR: B HEX: 80 HEX: 80 } iso2022 decode ] unit-test +[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ CHAR: B 0x80 0x80 } iso2022 decode ] unit-test -[ B{ CHAR: h ESC CHAR: $ CHAR: ( CHAR: D HEX: 38 HEX: 54 } ] [ "h\u0058ce" iso2022 encode ] unit-test -[ "h\u0058ce" ] [ B{ CHAR: h ESC CHAR: $ CHAR: ( CHAR: D HEX: 38 HEX: 54 } iso2022 decode ] unit-test -[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ CHAR: ( CHAR: D HEX: 38 } iso2022 decode ] unit-test +[ B{ CHAR: h ESC CHAR: $ CHAR: ( CHAR: D 0x38 0x54 } ] [ "h\u0058ce" iso2022 encode ] unit-test +[ "h\u0058ce" ] [ B{ CHAR: h ESC CHAR: $ CHAR: ( CHAR: D 0x38 0x54 } iso2022 decode ] unit-test +[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ CHAR: ( CHAR: D 0x38 } iso2022 decode ] unit-test [ "h" ] [ B{ CHAR: h ESC CHAR: $ CHAR: ( CHAR: D } iso2022 decode ] unit-test [ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ CHAR: ( } iso2022 decode ] unit-test -[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ CHAR: ( CHAR: D HEX: 70 HEX: 70 } iso2022 decode ] unit-test +[ "h\u00fffd" ] [ B{ CHAR: h ESC CHAR: $ CHAR: ( CHAR: D 0x70 0x70 } iso2022 decode ] unit-test [ "\u{syriac-music}" iso2022 encode ] must-fail diff --git a/basis/io/encodings/iso2022/iso2022.factor b/basis/io/encodings/iso2022/iso2022.factor index 874ee2378f..1a8b66c3c0 100644 --- a/basis/io/encodings/iso2022/iso2022.factor +++ b/basis/io/encodings/iso2022/iso2022.factor @@ -31,7 +31,7 @@ M: iso2022 M: iso2022 make-iso-coder ; -<< SYNTAX: ESC HEX: 16 suffix! ; >> +<< SYNTAX: ESC 0x16 suffix! ; >> CONSTANT: switch-ascii B{ ESC CHAR: ( CHAR: B } CONSTANT: switch-jis201 B{ ESC CHAR: ( CHAR: J } diff --git a/basis/io/encodings/johab/johab-tests.factor b/basis/io/encodings/johab/johab-tests.factor index 2c7ff96e21..3598bdcc92 100644 --- a/basis/io/encodings/johab/johab-tests.factor +++ b/basis/io/encodings/johab/johab-tests.factor @@ -12,9 +12,9 @@ IN: io.encodings.johab.tests johab euc-table word-prop value-at ; ! johab encodings -[ HEX: 20 ] [ HEX: 20 johab>unicode ] unit-test -[ HEX: 3133 ] [ HEX: 8444 johab>unicode ] unit-test -[ HEX: 8A5D ] [ HEX: AD4F unicode>johab ] unit-test +[ 0x20 ] [ 0x20 johab>unicode ] unit-test +[ 0x3133 ] [ 0x8444 johab>unicode ] unit-test +[ 0x8A5D ] [ 0xAD4F unicode>johab ] unit-test : phrase-unicode ( -- s ) "\u00b3d9\u00d574\u00bb3c\u00acfc \u00bc31\u00b450\u00c0b0\u00c774!" ; diff --git a/basis/io/encodings/shift-jis/shift-jis-tests.factor b/basis/io/encodings/shift-jis/shift-jis-tests.factor index fc15fab819..0f91b233f0 100644 --- a/basis/io/encodings/shift-jis/shift-jis-tests.factor +++ b/basis/io/encodings/shift-jis/shift-jis-tests.factor @@ -7,10 +7,10 @@ IN: io.encodings.shift-jis.tests [ "" ] [ "" shift-jis decode >string ] unit-test [ "" ] [ "" shift-jis encode >string ] unit-test [ { CHAR: replacement-character } shift-jis encode ] must-fail -[ "ab¥ｨ" ] [ { CHAR: a CHAR: b HEX: 5C HEX: A8 } shift-jis decode ] unit-test -[ { CHAR: a CHAR: b HEX: 5C HEX: A8 } ] [ "ab¥ｨ" shift-jis encode >array ] unit-test -[ "ab\\ｨ" ] [ { CHAR: a CHAR: b HEX: 5C HEX: A8 } windows-31j decode ] unit-test -[ { CHAR: a CHAR: b HEX: 5C HEX: A8 } ] [ "ab\\ｨ" windows-31j encode >array ] unit-test +[ "ab¥ｨ" ] [ { CHAR: a CHAR: b 0x5C 0xA8 } shift-jis decode ] unit-test +[ { CHAR: a CHAR: b 0x5C 0xA8 } ] [ "ab¥ｨ" shift-jis encode >array ] unit-test +[ "ab\\ｨ" ] [ { CHAR: a CHAR: b 0x5C 0xA8 } windows-31j decode ] unit-test +[ { CHAR: a CHAR: b 0x5C 0xA8 } ] [ "ab\\ｨ" windows-31j encode >array ] unit-test [ "\u000081\u0000c8" ] [ CHAR: logical-and 1string windows-31j encode >string ] unit-test [ "\u000081\u0000c8" ] [ CHAR: logical-and 1string shift-jis encode >string ] unit-test [ { CHAR: logical-and } ] [ "\u000081\u0000c8" windows-31j decode >array ] unit-test diff --git a/basis/io/encodings/shift-jis/shift-jis.factor b/basis/io/encodings/shift-jis/shift-jis.factor index efb57d8286..c67e0eb9f2 100644 --- a/basis/io/encodings/shift-jis/shift-jis.factor +++ b/basis/io/encodings/shift-jis/shift-jis.factor @@ -43,7 +43,7 @@ make-jis \ shift-jis-table set-value : small? ( char -- ? ) ! ASCII range or single-byte halfwidth katakana - { [ 0 HEX: 7F between? ] [ HEX: A1 HEX: DF between? ] } 1|| ; + { [ 0 0x7F between? ] [ 0xA1 0xDF between? ] } 1|| ; : write-halfword ( stream halfword -- ) h>b/b swap 2byte-array swap stream-write ; diff --git a/basis/io/encodings/strict/strict-tests.factor b/basis/io/encodings/strict/strict-tests.factor index aebb58cc30..5ea87567e3 100644 --- a/basis/io/encodings/strict/strict-tests.factor +++ b/basis/io/encodings/strict/strict-tests.factor @@ -2,5 +2,5 @@ USING: io.encodings.strict io.encodings.ascii tools.test arrays io.encodings.string ; IN: io.encodings.strict.test -[ { HEX: fffd } ] [ { 128 } ascii decode >array ] unit-test +[ { 0xfffd } ] [ { 128 } ascii decode >array ] unit-test [ { 128 } ascii strict decode ] must-fail diff --git a/basis/io/encodings/utf32/utf32-tests.factor b/basis/io/encodings/utf32/utf32-tests.factor index adff0ecf4b..dbfff7befd 100644 --- a/basis/io/encodings/utf32/utf32-tests.factor +++ b/basis/io/encodings/utf32/utf32-tests.factor @@ -6,25 +6,25 @@ io.encodings.string alien.c-types alien.strings accessors classes ; IN: io.encodings.utf32.tests [ { CHAR: x } ] [ B{ 0 0 0 CHAR: x } utf32be decode >array ] unit-test -[ { HEX: 1D11E } ] [ B{ 0 1 HEX: D1 HEX: 1E } utf32be decode >array ] unit-test -[ { CHAR: replacement-character } ] [ B{ 0 1 HEX: D1 } utf32be decode >array ] unit-test +[ { 0x1D11E } ] [ B{ 0 1 0xD1 0x1E } utf32be decode >array ] unit-test +[ { CHAR: replacement-character } ] [ B{ 0 1 0xD1 } utf32be decode >array ] unit-test [ { CHAR: replacement-character } ] [ B{ 0 1 } utf32be decode >array ] unit-test [ { CHAR: replacement-character } ] [ B{ 0 } utf32be decode >array ] unit-test [ { } ] [ { } utf32be decode >array ] unit-test -[ B{ 0 0 0 CHAR: x 0 1 HEX: D1 HEX: 1E } ] [ { CHAR: x HEX: 1d11e } >string utf32be encode ] unit-test +[ B{ 0 0 0 CHAR: x 0 1 0xD1 0x1E } ] [ { CHAR: x 0x1d11e } >string utf32be encode ] unit-test [ { CHAR: x } ] [ B{ CHAR: x 0 0 0 } utf32le decode >array ] unit-test -[ { HEX: 1d11e } ] [ B{ HEX: 1e HEX: d1 1 0 } utf32le decode >array ] unit-test -[ { CHAR: replacement-character } ] [ B{ HEX: 1e HEX: d1 1 } utf32le decode >array ] unit-test -[ { CHAR: replacement-character } ] [ B{ HEX: 1e HEX: d1 } utf32le decode >array ] unit-test -[ { CHAR: replacement-character } ] [ B{ HEX: 1e } utf32le decode >array ] unit-test +[ { 0x1d11e } ] [ B{ 0x1e 0xd1 1 0 } utf32le decode >array ] unit-test +[ { CHAR: replacement-character } ] [ B{ 0x1e 0xd1 1 } utf32le decode >array ] unit-test +[ { CHAR: replacement-character } ] [ B{ 0x1e 0xd1 } utf32le decode >array ] unit-test +[ { CHAR: replacement-character } ] [ B{ 0x1e } utf32le decode >array ] unit-test [ { } ] [ { } utf32le decode >array ] unit-test -[ B{ 120 0 0 0 HEX: 1e HEX: d1 1 0 } ] [ { CHAR: x HEX: 1d11e } >string utf32le encode ] unit-test +[ B{ 120 0 0 0 0x1e 0xd1 1 0 } ] [ { CHAR: x 0x1d11e } >string utf32le encode ] unit-test -[ { CHAR: x } ] [ B{ HEX: ff HEX: fe 0 0 CHAR: x 0 0 0 } utf32 decode >array ] unit-test -[ { CHAR: x } ] [ B{ 0 0 HEX: fe HEX: ff 0 0 0 CHAR: x } utf32 decode >array ] unit-test +[ { CHAR: x } ] [ B{ 0xff 0xfe 0 0 CHAR: x 0 0 0 } utf32 decode >array ] unit-test +[ { CHAR: x } ] [ B{ 0 0 0xfe 0xff 0 0 0 CHAR: x } utf32 decode >array ] unit-test -[ B{ HEX: ff HEX: fe 0 0 120 0 0 0 HEX: 1e HEX: d1 1 0 } ] [ { CHAR: x HEX: 1d11e } >string utf32 encode ] unit-test +[ B{ 0xff 0xfe 0 0 120 0 0 0 0x1e 0xd1 1 0 } ] [ { CHAR: x 0x1d11e } >string utf32 encode ] unit-test diff --git a/basis/io/encodings/utf32/utf32.factor b/basis/io/encodings/utf32/utf32.factor index 4e5c1895cf..e609738ff6 100644 --- a/basis/io/encodings/utf32/utf32.factor +++ b/basis/io/encodings/utf32/utf32.factor @@ -46,9 +46,9 @@ M: utf32le encode-char ! UTF-32 -CONSTANT: bom-le B{ HEX: ff HEX: fe 0 0 } +CONSTANT: bom-le B{ 0xff 0xfe 0 0 } -CONSTANT: bom-be B{ 0 0 HEX: fe HEX: ff } +CONSTANT: bom-be B{ 0 0 0xfe 0xff } : bom>le/be ( bom -- le/be ) dup bom-le sequence= [ drop utf32le ] [ diff --git a/basis/io/files/info/unix/unix-docs.factor b/basis/io/files/info/unix/unix-docs.factor index c8fc965eca..82d1e727f9 100644 --- a/basis/io/files/info/unix/unix-docs.factor +++ b/basis/io/files/info/unix/unix-docs.factor @@ -103,7 +103,7 @@ HELP: set-file-permissions { $description "Sets the file permissions for a given file with the supplied Unix permissions integer. Supplying an octal number with " { $link POSTPONE: OCT: } " is recommended." } { $examples "Using the tradidional octal value:" { $code "USING: io.files.info.unix kernel ;" - "\"resource:license.txt\" OCT: 755 set-file-permissions" + "\"resource:license.txt\" 0o755 set-file-permissions" } "Higher-level, setting named bits:" { $code "USING: io.files.info.unix kernel literals ;" diff --git a/basis/io/files/info/unix/unix.factor b/basis/io/files/info/unix/unix.factor index ca07418a53..8b1701cfea 100644 --- a/basis/io/files/info/unix/unix.factor +++ b/basis/io/files/info/unix/unix.factor @@ -119,24 +119,24 @@ M: file-info file-mode? [ permissions>> ] dip mask? ; PRIVATE> -CONSTANT: UID OCT: 0004000 -CONSTANT: GID OCT: 0002000 -CONSTANT: STICKY OCT: 0001000 -CONSTANT: USER-ALL OCT: 0000700 -CONSTANT: USER-READ OCT: 0000400 -CONSTANT: USER-WRITE OCT: 0000200 -CONSTANT: USER-EXECUTE OCT: 0000100 -CONSTANT: GROUP-ALL OCT: 0000070 -CONSTANT: GROUP-READ OCT: 0000040 -CONSTANT: GROUP-WRITE OCT: 0000020 -CONSTANT: GROUP-EXECUTE OCT: 0000010 -CONSTANT: OTHER-ALL OCT: 0000007 -CONSTANT: OTHER-READ OCT: 0000004 -CONSTANT: OTHER-WRITE OCT: 0000002 -CONSTANT: OTHER-EXECUTE OCT: 0000001 -CONSTANT: ALL-READ OCT: 0000444 -CONSTANT: ALL-WRITE OCT: 0000222 -CONSTANT: ALL-EXECUTE OCT: 0000111 +CONSTANT: UID 0o0004000 +CONSTANT: GID 0o0002000 +CONSTANT: STICKY 0o0001000 +CONSTANT: USER-ALL 0o0000700 +CONSTANT: USER-READ 0o0000400 +CONSTANT: USER-WRITE 0o0000200 +CONSTANT: USER-EXECUTE 0o0000100 +CONSTANT: GROUP-ALL 0o0000070 +CONSTANT: GROUP-READ 0o0000040 +CONSTANT: GROUP-WRITE 0o0000020 +CONSTANT: GROUP-EXECUTE 0o0000010 +CONSTANT: OTHER-ALL 0o0000007 +CONSTANT: OTHER-READ 0o0000004 +CONSTANT: OTHER-WRITE 0o0000002 +CONSTANT: OTHER-EXECUTE 0o0000001 +CONSTANT: ALL-READ 0o0000444 +CONSTANT: ALL-WRITE 0o0000222 +CONSTANT: ALL-EXECUTE 0o0000111 : uid? ( obj -- ? ) UID file-mode? ; : gid? ( obj -- ? ) GID file-mode? ; diff --git a/basis/io/files/unix/unix-tests.factor b/basis/io/files/unix/unix-tests.factor index 3028dc70c8..a7fa1ed4e9 100644 --- a/basis/io/files/unix/unix-tests.factor +++ b/basis/io/files/unix/unix-tests.factor @@ -40,12 +40,12 @@ IN: io.files.unix.tests test-file touch-file ; : perms ( -- n ) - test-file file-permissions OCT: 7777 mask ; + test-file file-permissions 0o7777 mask ; prepare-test-file [ t ] -[ test-file flags{ USER-ALL GROUP-ALL OTHER-ALL } set-file-permissions perms OCT: 777 = ] unit-test +[ test-file flags{ USER-ALL GROUP-ALL OTHER-ALL } set-file-permissions perms 0o777 = ] unit-test [ t ] [ test-file user-read? ] unit-test [ t ] [ test-file user-write? ] unit-test @@ -57,35 +57,35 @@ prepare-test-file [ t ] [ test-file other-write? ] unit-test [ t ] [ test-file other-execute? ] unit-test -[ t ] [ test-file f set-other-execute perms OCT: 776 = ] unit-test +[ t ] [ test-file f set-other-execute perms 0o776 = ] unit-test [ f ] [ test-file file-info other-execute? ] unit-test -[ t ] [ test-file f set-other-write perms OCT: 774 = ] unit-test +[ t ] [ test-file f set-other-write perms 0o774 = ] unit-test [ f ] [ test-file file-info other-write? ] unit-test -[ t ] [ test-file f set-other-read perms OCT: 770 = ] unit-test +[ t ] [ test-file f set-other-read perms 0o770 = ] unit-test [ f ] [ test-file file-info other-read? ] unit-test -[ t ] [ test-file f set-group-execute perms OCT: 760 = ] unit-test +[ t ] [ test-file f set-group-execute perms 0o760 = ] unit-test [ f ] [ test-file file-info group-execute? ] unit-test -[ t ] [ test-file f set-group-write perms OCT: 740 = ] unit-test +[ t ] [ test-file f set-group-write perms 0o740 = ] unit-test [ f ] [ test-file file-info group-write? ] unit-test -[ t ] [ test-file f set-group-read perms OCT: 700 = ] unit-test +[ t ] [ test-file f set-group-read perms 0o700 = ] unit-test [ f ] [ test-file file-info group-read? ] unit-test -[ t ] [ test-file f set-user-execute perms OCT: 600 = ] unit-test +[ t ] [ test-file f set-user-execute perms 0o600 = ] unit-test [ f ] [ test-file file-info other-execute? ] unit-test -[ t ] [ test-file f set-user-write perms OCT: 400 = ] unit-test +[ t ] [ test-file f set-user-write perms 0o400 = ] unit-test [ f ] [ test-file file-info other-write? ] unit-test -[ t ] [ test-file f set-user-read perms OCT: 000 = ] unit-test +[ t ] [ test-file f set-user-read perms 0o000 = ] unit-test [ f ] [ test-file file-info other-read? ] unit-test [ t ] -[ test-file flags{ USER-ALL GROUP-ALL OTHER-EXECUTE } set-file-permissions perms OCT: 771 = ] unit-test +[ test-file flags{ USER-ALL GROUP-ALL OTHER-EXECUTE } set-file-permissions perms 0o771 = ] unit-test prepare-test-file @@ -138,18 +138,18 @@ prepare-test-file [ ] [ test-file f f set-file-ids ] unit-test -[ t ] [ OCT: 4000 uid? ] unit-test -[ t ] [ OCT: 2000 gid? ] unit-test -[ t ] [ OCT: 1000 sticky? ] unit-test -[ t ] [ OCT: 400 user-read? ] unit-test -[ t ] [ OCT: 200 user-write? ] unit-test -[ t ] [ OCT: 100 user-execute? ] unit-test -[ t ] [ OCT: 040 group-read? ] unit-test -[ t ] [ OCT: 020 group-write? ] unit-test -[ t ] [ OCT: 010 group-execute? ] unit-test -[ t ] [ OCT: 004 other-read? ] unit-test -[ t ] [ OCT: 002 other-write? ] unit-test -[ t ] [ OCT: 001 other-execute? ] unit-test +[ t ] [ 0o4000 uid? ] unit-test +[ t ] [ 0o2000 gid? ] unit-test +[ t ] [ 0o1000 sticky? ] unit-test +[ t ] [ 0o400 user-read? ] unit-test +[ t ] [ 0o200 user-write? ] unit-test +[ t ] [ 0o100 user-execute? ] unit-test +[ t ] [ 0o040 group-read? ] unit-test +[ t ] [ 0o020 group-write? ] unit-test +[ t ] [ 0o010 group-execute? ] unit-test +[ t ] [ 0o004 other-read? ] unit-test +[ t ] [ 0o002 other-write? ] unit-test +[ t ] [ 0o001 other-execute? ] unit-test [ f ] [ 0 uid? ] unit-test [ f ] [ 0 gid? ] unit-test diff --git a/basis/io/launcher/windows/windows.factor b/basis/io/launcher/windows/windows.factor index 11650d479c..012de73be7 100755 --- a/basis/io/launcher/windows/windows.factor +++ b/basis/io/launcher/windows/windows.factor @@ -167,7 +167,7 @@ M: windows wait-for-processes ( -- ? ) [ handle>> hProcess>> ] void*-array{ } map-as [ length ] keep 0 0 WaitForMultipleObjects - dup HEX: ffffffff = [ win32-error ] when + dup 0xffffffff = [ win32-error ] when dup WAIT_TIMEOUT = [ 2drop t ] [ swap nth process-exited f ] if ; : duplicate-handle ( handle -- handle' ) diff --git a/basis/io/sockets/windows/windows.factor b/basis/io/sockets/windows/windows.factor index 6b0fa1da47..39d4310bb2 100755 --- a/basis/io/sockets/windows/windows.factor +++ b/basis/io/sockets/windows/windows.factor @@ -72,7 +72,7 @@ M: object ((client)) ( addrspec -- handle ) ! http://support.microsoft.com/kb/127144 ! NOTE: Possibly tweak this because of SYN flood attacks -: listen-backlog ( -- n ) HEX: 7fffffff ; inline +: listen-backlog ( -- n ) 0x7fffffff ; inline M: object (server) ( addrspec -- handle ) [ diff --git a/basis/iokit/hid/hid.factor b/basis/iokit/hid/hid.factor index e72a3517ba..a9a7ceea7c 100644 --- a/basis/iokit/hid/hid.factor +++ b/basis/iokit/hid/hid.factor @@ -79,34 +79,34 @@ CONSTANT: kIOHIDElementTypeOutput 129 CONSTANT: kIOHIDElementTypeFeature 257 CONSTANT: kIOHIDElementTypeCollection 513 -CONSTANT: kIOHIDElementCollectionTypePhysical HEX: 00 -CONSTANT: kIOHIDElementCollectionTypeApplication HEX: 01 -CONSTANT: kIOHIDElementCollectionTypeLogical HEX: 02 -CONSTANT: kIOHIDElementCollectionTypeReport HEX: 03 -CONSTANT: kIOHIDElementCollectionTypeNamedArray HEX: 04 -CONSTANT: kIOHIDElementCollectionTypeUsageSwitch HEX: 05 -CONSTANT: kIOHIDElementCollectionTypeUsageModifier HEX: 06 +CONSTANT: kIOHIDElementCollectionTypePhysical 0x00 +CONSTANT: kIOHIDElementCollectionTypeApplication 0x01 +CONSTANT: kIOHIDElementCollectionTypeLogical 0x02 +CONSTANT: kIOHIDElementCollectionTypeReport 0x03 +CONSTANT: kIOHIDElementCollectionTypeNamedArray 0x04 +CONSTANT: kIOHIDElementCollectionTypeUsageSwitch 0x05 +CONSTANT: kIOHIDElementCollectionTypeUsageModifier 0x06 CONSTANT: kIOHIDReportTypeInput 0 CONSTANT: kIOHIDReportTypeOutput 1 CONSTANT: kIOHIDReportTypeFeature 2 CONSTANT: kIOHIDReportTypeCount 3 -CONSTANT: kIOHIDOptionsTypeNone HEX: 00 -CONSTANT: kIOHIDOptionsTypeSeizeDevice HEX: 01 +CONSTANT: kIOHIDOptionsTypeNone 0x00 +CONSTANT: kIOHIDOptionsTypeSeizeDevice 0x01 -CONSTANT: kIOHIDQueueOptionsTypeNone HEX: 00 -CONSTANT: kIOHIDQueueOptionsTypeEnqueueAll HEX: 01 +CONSTANT: kIOHIDQueueOptionsTypeNone 0x00 +CONSTANT: kIOHIDQueueOptionsTypeEnqueueAll 0x01 -CONSTANT: kIOHIDElementFlagsConstantMask HEX: 0001 -CONSTANT: kIOHIDElementFlagsVariableMask HEX: 0002 -CONSTANT: kIOHIDElementFlagsRelativeMask HEX: 0004 -CONSTANT: kIOHIDElementFlagsWrapMask HEX: 0008 -CONSTANT: kIOHIDElementFlagsNonLinearMask HEX: 0010 -CONSTANT: kIOHIDElementFlagsNoPreferredMask HEX: 0020 -CONSTANT: kIOHIDElementFlagsNullStateMask HEX: 0040 -CONSTANT: kIOHIDElementFlagsVolativeMask HEX: 0080 -CONSTANT: kIOHIDElementFlagsBufferedByteMask HEX: 0100 +CONSTANT: kIOHIDElementFlagsConstantMask 0x0001 +CONSTANT: kIOHIDElementFlagsVariableMask 0x0002 +CONSTANT: kIOHIDElementFlagsRelativeMask 0x0004 +CONSTANT: kIOHIDElementFlagsWrapMask 0x0008 +CONSTANT: kIOHIDElementFlagsNonLinearMask 0x0010 +CONSTANT: kIOHIDElementFlagsNoPreferredMask 0x0020 +CONSTANT: kIOHIDElementFlagsNullStateMask 0x0040 +CONSTANT: kIOHIDElementFlagsVolativeMask 0x0080 +CONSTANT: kIOHIDElementFlagsBufferedByteMask 0x0100 CONSTANT: kIOHIDValueScaleTypeCalibrated 0 CONSTANT: kIOHIDValueScaleTypePhysical 1 diff --git a/basis/json/reader/reader-tests.factor b/basis/json/reader/reader-tests.factor index bac8c96e1a..430be777bc 100644 --- a/basis/json/reader/reader-tests.factor +++ b/basis/json/reader/reader-tests.factor @@ -31,7 +31,7 @@ IN: json.reader.tests ! unicode is allowed in json { "ß∂¬ƒ˚∆" } [ """ "ß∂¬ƒ˚∆"""" json> ] unit-test { 8 9 10 12 13 34 47 92 } >string 1array [ """ "\\b\\t\\n\\f\\r\\"\\/\\\\" """ json> ] unit-test -{ HEX: abcd } >string 1array [ """ "\\uaBCd" """ json> ] unit-test +{ 0xabcd } >string 1array [ """ "\\uaBCd" """ json> ] unit-test { H{ { "a" { } } { "b" 123 } } } [ "{\"a\":[],\"b\":123}" json> ] unit-test { { } } [ "[]" json> ] unit-test diff --git a/basis/literals/literals-docs.factor b/basis/literals/literals-docs.factor index 52aa1cd717..8682da53a7 100644 --- a/basis/literals/literals-docs.factor +++ b/basis/literals/literals-docs.factor @@ -66,8 +66,8 @@ HELP: flags{ { $example "USING: literals kernel prettyprint ;" "IN: scratchpad" - "CONSTANT: x HEX: 1" - "flags{ HEX: 20 x BIN: 100 } .h" + "CONSTANT: x 0x1" + "flags{ 0x20 x 0b100 } .h" "25" } } ; diff --git a/basis/math/bits/bits-docs.factor b/basis/math/bits/bits-docs.factor index 62ae38c828..ecf53b6a08 100644 --- a/basis/math/bits/bits-docs.factor +++ b/basis/math/bits/bits-docs.factor @@ -24,7 +24,7 @@ HELP: make-bits { $values { "number" integer } { "bits" bits } } { $description "Creates a " { $link bits } " object out of the given number, using its log base 2 as the length. This implies that the last element, corresponding to the most significant bit, will be 1." } { $examples - { $example "USING: math.bits prettyprint arrays ;" "BIN: 1101 make-bits >array ." "{ t f t t }" } + { $example "USING: math.bits prettyprint arrays ;" "0b1101 make-bits >array ." "{ t f t t }" } { $example "USING: math.bits prettyprint arrays ;" "-3 make-bits >array ." "{ t f }" } } ; diff --git a/basis/math/bits/bits-tests.factor b/basis/math/bits/bits-tests.factor index c6f4c6e8fa..6a39488bdb 100644 --- a/basis/math/bits/bits-tests.factor +++ b/basis/math/bits/bits-tests.factor @@ -3,12 +3,12 @@ USING: tools.test math math.bits sequences arrays ; IN: math.bits.tests -[ t ] [ BIN: 111111 3 second ] unit-test -[ { t t t } ] [ BIN: 111111 3 >array ] unit-test -[ f ] [ BIN: 111101 3 second ] unit-test -[ { f f t } ] [ BIN: 111100 3 >array ] unit-test -[ 3 ] [ BIN: 111111 3 length ] unit-test -[ 6 ] [ BIN: 111111 make-bits length ] unit-test +[ t ] [ 0b111111 3 second ] unit-test +[ { t t t } ] [ 0b111111 3 >array ] unit-test +[ f ] [ 0b111101 3 second ] unit-test +[ { f f t } ] [ 0b111100 3 >array ] unit-test +[ 3 ] [ 0b111111 3 length ] unit-test +[ 6 ] [ 0b111111 make-bits length ] unit-test [ 0 ] [ 0 make-bits length ] unit-test [ 2 ] [ 3 make-bits length ] unit-test [ 2 ] [ -3 make-bits length ] unit-test diff --git a/basis/math/bitwise/bitwise-docs.factor b/basis/math/bitwise/bitwise-docs.factor index 58950fdd52..a771852027 100644 --- a/basis/math/bitwise/bitwise-docs.factor +++ b/basis/math/bitwise/bitwise-docs.factor @@ -35,7 +35,7 @@ HELP: bitfield HELP: bits { $values { "m" integer } { "n" integer } { "m'" integer } } { $description "Keep only n bits from the integer m." } -{ $example "USING: math.bitwise prettyprint ;" "HEX: 123abcdef 16 bits .h" "cdef" } ; +{ $example "USING: math.bitwise prettyprint ;" "0x123abcdef 16 bits .h" "cdef" } ; HELP: bitroll { $values { "x" integer } { "s" "a shift integer" } { "w" "a wrap integer" } { "y" integer } @@ -43,7 +43,7 @@ HELP: bitroll { $description "Roll n by s bits to the left, wrapping around after w bits." } { $examples { $example "USING: math.bitwise prettyprint ;" "1 -1 32 bitroll .b" "10000000000000000000000000000000" } - { $example "USING: math.bitwise prettyprint ;" "HEX: ffff0000 8 32 bitroll .h" "ff0000ff" } + { $example "USING: math.bitwise prettyprint ;" "0xffff0000 8 32 bitroll .h" "ff0000ff" } } ; HELP: bit-clear? @@ -54,11 +54,11 @@ HELP: bit-clear? { $description "Returns " { $link t } " if the nth bit is set to zero." } { $examples { $example "USING: math.bitwise prettyprint ;" - "HEX: ff 8 bit-clear? ." + "0xff 8 bit-clear? ." "t" } { $example "USING: math.bitwise prettyprint ;" - "HEX: ff 7 bit-clear? ." + "0xff 7 bit-clear? ." "f" } } ; @@ -73,7 +73,7 @@ HELP: bit-count { $description "Returns the number of set bits as an object. This word only works on non-negative integers or objects that can be represented as a byte-array." } { $examples { $example "USING: math.bitwise prettyprint ;" - "HEX: f0 bit-count ." + "0xf0 bit-count ." "4" } { $example "USING: math.bitwise prettyprint ;" @@ -94,11 +94,11 @@ HELP: bitroll-32 { $description "Rolls the number " { $snippet "m" } " by " { $snippet "s" } " bits to the left, wrapping around after 32 bits." } { $examples { $example "USING: math.bitwise prettyprint ;" - "HEX: 1 10 bitroll-32 .h" + "0x1 10 bitroll-32 .h" "400" } { $example "USING: math.bitwise prettyprint ;" - "HEX: 1 -10 bitroll-32 .h" + "0x1 -10 bitroll-32 .h" "400000" } } ; @@ -111,11 +111,11 @@ HELP: bitroll-64 { $description "Rolls the number " { $snippet "m" } " by " { $snippet "s" } " bits to the left, wrapping around after 64 bits." } { $examples { $example "USING: math.bitwise prettyprint ;" - "HEX: 1 10 bitroll-64 .h" + "0x1 10 bitroll-64 .h" "400" } { $example "USING: math.bitwise prettyprint ;" - "HEX: 1 -10 bitroll-64 .h" + "0x1 -10 bitroll-64 .h" "40000000000000" } } ; @@ -130,7 +130,7 @@ HELP: clear-bit { $description "Sets the nth bit of " { $snippet "x" } " to zero." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: ff 7 clear-bit .h" + "0xff 7 clear-bit .h" "7f" } } ; @@ -187,7 +187,7 @@ HELP: >signed } { $examples { $example "USING: math.bitwise prettyprint ;" - "HEX: ff 8 >signed ." + "0xff 8 >signed ." "-1" } } @@ -201,7 +201,7 @@ HELP: mask { $description "After the operation, only the bits that were set in both the mask and the original number are set." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "BIN: 11111111 BIN: 101 mask .b" + "0b11111111 0b101 mask .b" "101" } } ; @@ -214,7 +214,7 @@ HELP: mask-bit { $description "Turns off all bits besides the nth bit." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: ff 2 mask-bit .b" + "0xff 2 mask-bit .b" "100" } } ; @@ -227,12 +227,12 @@ HELP: mask? { $description "Returns true if all of the bits in the mask " { $snippet "n" } " are set in the integer input " { $snippet "x" } "." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: ff HEX: f mask? ." + "0xff 0xf mask? ." "t" } { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: f0 HEX: 1 mask? ." + "0xf0 0x1 mask? ." "f" } } ; @@ -281,7 +281,7 @@ HELP: toggle-bit "1000" } { $example "USING: math.bitwise kernel prettyprint ;" - "BIN: 1000 3 toggle-bit .b" + "0b1000 3 toggle-bit .b" "0" } } ; @@ -314,7 +314,7 @@ HELP: unmask { $description "Clears the bits in " { $snippet "x" } " if they are set in the mask " { $snippet "n" } "." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: ff HEX: 0f unmask .h" + "0xff 0x0f unmask .h" "f0" } } ; @@ -327,7 +327,7 @@ HELP: unmask? { $description "Tests whether unmasking the bits in " { $snippet "x" } " would return an integer greater than zero." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: ff HEX: 0f unmask? ." + "0xff 0x0f unmask? ." "t" } } ; @@ -340,7 +340,7 @@ HELP: w* { $description "Multiplies two integers and wraps the result to a 32-bit unsigned integer." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: ffffffff HEX: 2 w* ." + "0xffffffff 0x2 w* ." "4294967294" } } ; @@ -353,7 +353,7 @@ HELP: w+ { $description "Adds two integers and wraps the result to a 32-bit unsigned integer." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: ffffffff HEX: 2 w+ ." + "0xffffffff 0x2 w+ ." "1" } } ; @@ -366,7 +366,7 @@ HELP: w- { $description "Subtracts two integers and wraps the result to a 32-bit unsigned integer." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: 0 HEX: ff w- ." + "0x0 0xff w- ." "4294967041" } } ; @@ -379,7 +379,7 @@ HELP: W* { $description "Multiplies two integers and wraps the result to a 64-bit unsigned integer." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: ffffffffffffffff HEX: 2 W* ." + "0xffffffffffffffff 0x2 W* ." "18446744073709551614" } } ; @@ -392,7 +392,7 @@ HELP: W+ { $description "Adds two integers and wraps the result to 64-bit unsigned integer." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: ffffffffffffffff HEX: 2 W+ ." + "0xffffffffffffffff 0x2 W+ ." "1" } } ; @@ -405,7 +405,7 @@ HELP: W- { $description "Subtracts two integers and wraps the result to a 64-bit unsigned integer." } { $examples { $example "USING: math.bitwise kernel prettyprint ;" - "HEX: 0 HEX: ff W- ." + "0x0 0xff W- ." "18446744073709551361" } } ; @@ -419,7 +419,7 @@ HELP: wrap { $examples "Equivalent to modding by 8:" { $example "USING: math.bitwise prettyprint ;" - "HEX: ffff 8 wrap .h" + "0xffff 8 wrap .h" "7" } } ; diff --git a/basis/math/bitwise/bitwise-tests.factor b/basis/math/bitwise/bitwise-tests.factor index d0805237fd..0debf887a5 100644 --- a/basis/math/bitwise/bitwise-tests.factor +++ b/basis/math/bitwise/bitwise-tests.factor @@ -26,11 +26,11 @@ IN: math.bitwise.tests [ 8 ] [ 0 3 toggle-bit ] unit-test [ 0 ] [ 8 3 toggle-bit ] unit-test -[ 4 ] [ BIN: 1010101 bit-count ] unit-test -[ 0 ] [ BIN: 0 bit-count ] unit-test -[ 1 ] [ BIN: 1 bit-count ] unit-test +[ 4 ] [ 0b1010101 bit-count ] unit-test +[ 0 ] [ 0b0 bit-count ] unit-test +[ 1 ] [ 0b1 bit-count ] unit-test [ 2 ] [ B{ 1 1 } bit-count ] unit-test -[ 64 ] [ HEX: ffffffffffffffff bit-count ] unit-test +[ 64 ] [ 0xffffffffffffffff bit-count ] unit-test STRUCT: bit-count-struct { a uint } ; @@ -51,21 +51,21 @@ SPECIALIZED-ARRAY: uint-4 [ 1 ] [ B{ 1 0 0 } bit-count ] unit-test [ 3 ] [ B{ 1 1 1 } bit-count ] unit-test -[ t ] [ BIN: 0 even-parity? ] unit-test -[ f ] [ BIN: 1 even-parity? ] unit-test -[ f ] [ BIN: 0 odd-parity? ] unit-test -[ t ] [ BIN: 1 odd-parity? ] unit-test +[ t ] [ 0b0 even-parity? ] unit-test +[ f ] [ 0b1 even-parity? ] unit-test +[ f ] [ 0b0 odd-parity? ] unit-test +[ t ] [ 0b1 odd-parity? ] unit-test -[ -1 ] [ HEX: ff 4 >signed ] unit-test -[ -1 ] [ HEX: ff 8 >signed ] unit-test -[ 255 ] [ HEX: ff 16 >signed ] unit-test +[ -1 ] [ 0xff 4 >signed ] unit-test +[ -1 ] [ 0xff 8 >signed ] unit-test +[ 255 ] [ 0xff 16 >signed ] unit-test [ 2 ] [ 3 >even ] unit-test [ 3 ] [ 3 >odd ] unit-test [ 5 ] [ 4 >odd ] unit-test -[ t ] [ HEX: ff 1 mask? ] unit-test -[ f ] [ HEX: 0 1 mask? ] unit-test +[ t ] [ 0xff 1 mask? ] unit-test +[ f ] [ 0x0 1 mask? ] unit-test [ 7 ] [ 5 next-odd ] unit-test [ 7 ] [ 6 next-odd ] unit-test @@ -73,7 +73,7 @@ SPECIALIZED-ARRAY: uint-4 [ 6 ] [ 5 next-even ] unit-test [ 8 ] [ 6 next-even ] unit-test -[ f ] [ HEX: 1 0 bit-clear? ] unit-test -[ t ] [ HEX: 0 1 bit-clear? ] unit-test +[ f ] [ 0x1 0 bit-clear? ] unit-test +[ t ] [ 0x0 1 bit-clear? ] unit-test [ -1 bit-count ] [ invalid-bit-count-target? ] must-fail-with diff --git a/basis/math/bitwise/bitwise.factor b/basis/math/bitwise/bitwise.factor index ebc8b9f8f7..785f77c711 100644 --- a/basis/math/bitwise/bitwise.factor +++ b/basis/math/bitwise/bitwise.factor @@ -77,7 +77,7 @@ DEFER: byte-bit-count \ byte-bit-count 256 iota [ 8 0 [ [ 1 + ] when ] reduce -] B{ } map-as '[ HEX: ff bitand _ nth-unsafe ] +] B{ } map-as '[ 0xff bitand _ nth-unsafe ] ( byte -- table ) define-declared \ byte-bit-count make-inline diff --git a/basis/math/constants/constants.factor b/basis/math/constants/constants.factor index cb81ded8ea..4f0718d1d1 100644 --- a/basis/math/constants/constants.factor +++ b/basis/math/constants/constants.factor @@ -8,7 +8,7 @@ IN: math.constants : phi ( -- phi ) 1.61803398874989484820 ; inline : pi ( -- pi ) 3.14159265358979323846 ; inline : 2pi ( -- pi ) 2 pi * ; inline -: epsilon ( -- epsilon ) HEX: 3cb0000000000000 bits>double ; foldable -: single-epsilon ( -- epsilon ) HEX: 34000000 bits>float ; foldable -: smallest-float ( -- x ) HEX: 1 bits>double ; foldable -: largest-float ( -- x ) HEX: 7fefffffffffffff bits>double ; foldable +: epsilon ( -- epsilon ) 0x3cb0000000000000 bits>double ; foldable +: single-epsilon ( -- epsilon ) 0x34000000 bits>float ; foldable +: smallest-float ( -- x ) 0x1 bits>double ; foldable +: largest-float ( -- x ) 0x7fefffffffffffff bits>double ; foldable diff --git a/basis/math/floats/env/env-tests.factor b/basis/math/floats/env/env-tests.factor index 5ef5815199..df4e9e3d11 100755 --- a/basis/math/floats/env/env-tests.factor +++ b/basis/math/floats/env/env-tests.factor @@ -42,10 +42,10 @@ os linux? cpu x86.64? and [ [ t ] +fp-invalid-operation+ [ -1.0 ] [ fsqrt ] test-fp-exception-compiled unit-test [ - HEX: 3fd5,5555,5555,5555 - HEX: 3fc9,9999,9999,999a - HEX: bfc9,9999,9999,999a - HEX: bfd5,5555,5555,5555 + 0x3fd5,5555,5555,5555 + 0x3fc9,9999,9999,999a + 0xbfc9,9999,9999,999a + 0xbfd5,5555,5555,5555 ] [ +round-nearest+ [ 1.0 3.0 /f double>bits @@ -56,10 +56,10 @@ os linux? cpu x86.64? and [ ] unit-test [ - HEX: 3fd5,5555,5555,5555 - HEX: 3fc9,9999,9999,9999 - HEX: bfc9,9999,9999,999a - HEX: bfd5,5555,5555,5556 + 0x3fd5,5555,5555,5555 + 0x3fc9,9999,9999,9999 + 0xbfc9,9999,9999,999a + 0xbfd5,5555,5555,5556 ] [ +round-down+ [ 1.0 3.0 /f double>bits @@ -70,10 +70,10 @@ os linux? cpu x86.64? and [ ] unit-test [ - HEX: 3fd5,5555,5555,5556 - HEX: 3fc9,9999,9999,999a - HEX: bfc9,9999,9999,9999 - HEX: bfd5,5555,5555,5555 + 0x3fd5,5555,5555,5556 + 0x3fc9,9999,9999,999a + 0xbfc9,9999,9999,9999 + 0xbfd5,5555,5555,5555 ] [ +round-up+ [ 1.0 3.0 /f double>bits @@ -84,10 +84,10 @@ os linux? cpu x86.64? and [ ] unit-test [ - HEX: 3fd5,5555,5555,5555 - HEX: 3fc9,9999,9999,9999 - HEX: bfc9,9999,9999,9999 - HEX: bfd5,5555,5555,5555 + 0x3fd5,5555,5555,5555 + 0x3fc9,9999,9999,9999 + 0xbfc9,9999,9999,9999 + 0xbfd5,5555,5555,5555 ] [ +round-zero+ [ 1.0 3.0 /f double>bits @@ -99,10 +99,10 @@ os linux? cpu x86.64? and [ ! ensure rounding mode is restored to +round-nearest+ [ - HEX: 3fd5,5555,5555,5555 - HEX: 3fc9,9999,9999,999a - HEX: bfc9,9999,9999,999a - HEX: bfd5,5555,5555,5555 + 0x3fd5,5555,5555,5555 + 0x3fc9,9999,9999,999a + 0xbfc9,9999,9999,999a + 0xbfd5,5555,5555,5555 ] [ 1.0 3.0 /f double>bits 1.0 5.0 /f double>bits diff --git a/basis/math/floats/env/env.factor b/basis/math/floats/env/env.factor index 301c1bb5ab..3185896871 100644 --- a/basis/math/floats/env/env.factor +++ b/basis/math/floats/env/env.factor @@ -105,11 +105,11 @@ GENERIC# (set-denormal-mode) 1 ( fp-env mode -- fp-env ) CONSTANT: vm-error-exception-flag>bit H{ - { +fp-invalid-operation+ HEX: 01 } - { +fp-overflow+ HEX: 02 } - { +fp-underflow+ HEX: 04 } - { +fp-zero-divide+ HEX: 08 } - { +fp-inexact+ HEX: 10 } + { +fp-invalid-operation+ 0x01 } + { +fp-overflow+ 0x02 } + { +fp-underflow+ 0x04 } + { +fp-zero-divide+ 0x08 } + { +fp-inexact+ 0x10 } } PRIVATE> diff --git a/basis/math/floats/env/ppc/ppc.factor b/basis/math/floats/env/ppc/ppc.factor index 1387009425..eef8ae5365 100644 --- a/basis/math/floats/env/ppc/ppc.factor +++ b/basis/math/floats/env/ppc/ppc.factor @@ -20,17 +20,17 @@ STRUCT: ppc-vmx-env : set_ppc_fpu_env ( env -- ) void { void* } cdecl [ 0 3 0 LFD - HEX: ff 0 0 0 MTFSF + 0xff 0 0 0 MTFSF ] alien-assembly ; : get_ppc_vmx_env ( env -- ) void { void* } cdecl [ 0 MFVSCR 4 1 16 SUBI - 5 HEX: f LI + 5 0xf LI 4 4 5 ANDC 0 0 4 STVXL - 5 HEX: c LI + 5 0xc LI 6 5 4 LWZX 6 3 0 STW ] alien-assembly ; @@ -38,9 +38,9 @@ STRUCT: ppc-vmx-env : set_ppc_vmx_env ( env -- ) void { void* } cdecl [ 3 1 16 SUBI - 5 HEX: f LI + 5 0xf LI 4 4 5 ANDC - 5 HEX: c LI + 5 0xc LI 6 3 0 LWZ 6 5 4 STWX 0 0 4 LVXL @@ -64,36 +64,36 @@ M: ppc-vmx-env (set-fp-env-register) M: ppc (fp-env-registers) 1array ; -CONSTANT: ppc-exception-flag-bits HEX: fff8,0700 +CONSTANT: ppc-exception-flag-bits 0xfff8,0700 CONSTANT: ppc-exception-flag>bit H{ - { +fp-invalid-operation+ HEX: 2000,0000 } - { +fp-overflow+ HEX: 1000,0000 } - { +fp-underflow+ HEX: 0800,0000 } - { +fp-zero-divide+ HEX: 0400,0000 } - { +fp-inexact+ HEX: 0200,0000 } + { +fp-invalid-operation+ 0x2000,0000 } + { +fp-overflow+ 0x1000,0000 } + { +fp-underflow+ 0x0800,0000 } + { +fp-zero-divide+ 0x0400,0000 } + { +fp-inexact+ 0x0200,0000 } } -CONSTANT: ppc-fp-traps-bits HEX: f8 +CONSTANT: ppc-fp-traps-bits 0xf8 CONSTANT: ppc-fp-traps>bit H{ - { +fp-invalid-operation+ HEX: 80 } - { +fp-overflow+ HEX: 40 } - { +fp-underflow+ HEX: 20 } - { +fp-zero-divide+ HEX: 10 } - { +fp-inexact+ HEX: 08 } + { +fp-invalid-operation+ 0x80 } + { +fp-overflow+ 0x40 } + { +fp-underflow+ 0x20 } + { +fp-zero-divide+ 0x10 } + { +fp-inexact+ 0x08 } } -CONSTANT: ppc-rounding-mode-bits HEX: 3 +CONSTANT: ppc-rounding-mode-bits 0x3 CONSTANT: ppc-rounding-mode>bit $[ H{ - { +round-nearest+ HEX: 0 } - { +round-zero+ HEX: 1 } - { +round-up+ HEX: 2 } - { +round-down+ HEX: 3 } + { +round-nearest+ 0x0 } + { +round-zero+ 0x1 } + { +round-up+ 0x2 } + { +round-down+ 0x3 } } >biassoc ] -CONSTANT: ppc-denormal-mode-bits HEX: 4 +CONSTANT: ppc-denormal-mode-bits 0x4 M: ppc-fpu-env (get-exception-flags) ( register -- exceptions ) fpscr>> ppc-exception-flag>bit mask> ; inline @@ -120,7 +120,7 @@ M: ppc-fpu-env (set-denormal-mode) ( register mode -- register' ) } case ] curry change-fpscr ; inline -CONSTANT: vmx-denormal-mode-bits HEX: 10000 +CONSTANT: vmx-denormal-mode-bits 0x10000 M: ppc-vmx-env (get-exception-flags) ( register -- exceptions ) drop { } ; inline diff --git a/basis/math/floats/env/x86/x86.factor b/basis/math/floats/env/x86/x86.factor index cf7910f6be..2659e2bb57 100644 --- a/basis/math/floats/env/x86/x86.factor +++ b/basis/math/floats/env/x86/x86.factor @@ -32,36 +32,36 @@ M: x87-env (set-fp-env-register) M: x86 (fp-env-registers) sse2? [ 2array ] [ 1array ] if ; -CONSTANT: sse-exception-flag-bits HEX: 3f +CONSTANT: sse-exception-flag-bits 0x3f CONSTANT: sse-exception-flag>bit H{ - { +fp-invalid-operation+ HEX: 01 } - { +fp-overflow+ HEX: 08 } - { +fp-underflow+ HEX: 10 } - { +fp-zero-divide+ HEX: 04 } - { +fp-inexact+ HEX: 20 } + { +fp-invalid-operation+ 0x01 } + { +fp-overflow+ 0x08 } + { +fp-underflow+ 0x10 } + { +fp-zero-divide+ 0x04 } + { +fp-inexact+ 0x20 } } -CONSTANT: sse-fp-traps-bits HEX: 1f80 +CONSTANT: sse-fp-traps-bits 0x1f80 CONSTANT: sse-fp-traps>bit H{ - { +fp-invalid-operation+ HEX: 0080 } - { +fp-overflow+ HEX: 0400 } - { +fp-underflow+ HEX: 0800 } - { +fp-zero-divide+ HEX: 0200 } - { +fp-inexact+ HEX: 1000 } + { +fp-invalid-operation+ 0x0080 } + { +fp-overflow+ 0x0400 } + { +fp-underflow+ 0x0800 } + { +fp-zero-divide+ 0x0200 } + { +fp-inexact+ 0x1000 } } -CONSTANT: sse-rounding-mode-bits HEX: 6000 +CONSTANT: sse-rounding-mode-bits 0x6000 CONSTANT: sse-rounding-mode>bit $[ H{ - { +round-nearest+ HEX: 0000 } - { +round-down+ HEX: 2000 } - { +round-up+ HEX: 4000 } - { +round-zero+ HEX: 6000 } + { +round-nearest+ 0x0000 } + { +round-down+ 0x2000 } + { +round-up+ 0x4000 } + { +round-zero+ 0x6000 } } >biassoc ] -CONSTANT: sse-denormal-mode-bits HEX: 8040 +CONSTANT: sse-denormal-mode-bits 0x8040 M: sse-env (get-exception-flags) ( register -- exceptions ) mxcsr>> sse-exception-flag>bit mask> ; inline @@ -90,24 +90,24 @@ M: sse-env (set-denormal-mode) ( register mode -- register' ) SINGLETON: +fp-x87-stack-fault+ -CONSTANT: x87-exception-bits HEX: 7f +CONSTANT: x87-exception-bits 0x7f CONSTANT: x87-exception>bit H{ - { +fp-invalid-operation+ HEX: 01 } - { +fp-overflow+ HEX: 08 } - { +fp-underflow+ HEX: 10 } - { +fp-zero-divide+ HEX: 04 } - { +fp-inexact+ HEX: 20 } - { +fp-x87-stack-fault+ HEX: 40 } + { +fp-invalid-operation+ 0x01 } + { +fp-overflow+ 0x08 } + { +fp-underflow+ 0x10 } + { +fp-zero-divide+ 0x04 } + { +fp-inexact+ 0x20 } + { +fp-x87-stack-fault+ 0x40 } } -CONSTANT: x87-rounding-mode-bits HEX: 0c00 +CONSTANT: x87-rounding-mode-bits 0x0c00 CONSTANT: x87-rounding-mode>bit $[ H{ - { +round-nearest+ HEX: 0000 } - { +round-down+ HEX: 0400 } - { +round-up+ HEX: 0800 } - { +round-zero+ HEX: 0c00 } + { +round-nearest+ 0x0000 } + { +round-down+ 0x0400 } + { +round-up+ 0x0800 } + { +round-zero+ 0x0c00 } } >biassoc ] M: x87-env (get-exception-flags) ( register -- exceptions ) diff --git a/basis/math/floats/half/half-tests.factor b/basis/math/floats/half/half-tests.factor index 26bd304142..6a4574eac3 100644 --- a/basis/math/floats/half/half-tests.factor +++ b/basis/math/floats/half/half-tests.factor @@ -3,32 +3,32 @@ math tools.test specialized-arrays alien.data classes.struct ; SPECIALIZED-ARRAY: half IN: math.floats.half.tests -[ HEX: 0000 ] [ 0.0 half>bits ] unit-test -[ HEX: 8000 ] [ -0.0 half>bits ] unit-test -[ HEX: 3e00 ] [ 1.5 half>bits ] unit-test -[ HEX: be00 ] [ -1.5 half>bits ] unit-test -[ HEX: 7c00 ] [ 1/0. half>bits ] unit-test -[ HEX: fc00 ] [ -1/0. half>bits ] unit-test -[ HEX: 7eaa ] [ NAN: aaaaaaaaaaaaa half>bits ] unit-test +[ 0x0000 ] [ 0.0 half>bits ] unit-test +[ 0x8000 ] [ -0.0 half>bits ] unit-test +[ 0x3e00 ] [ 1.5 half>bits ] unit-test +[ 0xbe00 ] [ -1.5 half>bits ] unit-test +[ 0x7c00 ] [ 1/0. half>bits ] unit-test +[ 0xfc00 ] [ -1/0. half>bits ] unit-test +[ 0x7eaa ] [ NAN: aaaaaaaaaaaaa half>bits ] unit-test ! too-big floats overflow to infinity -[ HEX: 7c00 ] [ 65536.0 half>bits ] unit-test -[ HEX: fc00 ] [ -65536.0 half>bits ] unit-test -[ HEX: 7c00 ] [ 131072.0 half>bits ] unit-test -[ HEX: fc00 ] [ -131072.0 half>bits ] unit-test +[ 0x7c00 ] [ 65536.0 half>bits ] unit-test +[ 0xfc00 ] [ -65536.0 half>bits ] unit-test +[ 0x7c00 ] [ 131072.0 half>bits ] unit-test +[ 0xfc00 ] [ -131072.0 half>bits ] unit-test ! too-small floats flush to zero -[ HEX: 0000 ] [ 1.0e-9 half>bits ] unit-test -[ HEX: 8000 ] [ -1.0e-9 half>bits ] unit-test - -[ 0.0 ] [ HEX: 0000 bits>half ] unit-test -[ -0.0 ] [ HEX: 8000 bits>half ] unit-test -[ 1.5 ] [ HEX: 3e00 bits>half ] unit-test -[ -1.5 ] [ HEX: be00 bits>half ] unit-test -[ 1/0. ] [ HEX: 7c00 bits>half ] unit-test -[ -1/0. ] [ HEX: fc00 bits>half ] unit-test -[ 3.0 ] [ HEX: 4200 bits>half ] unit-test -[ t ] [ HEX: 7e00 bits>half fp-nan? ] unit-test +[ 0x0000 ] [ 1.0e-9 half>bits ] unit-test +[ 0x8000 ] [ -1.0e-9 half>bits ] unit-test + +[ 0.0 ] [ 0x0000 bits>half ] unit-test +[ -0.0 ] [ 0x8000 bits>half ] unit-test +[ 1.5 ] [ 0x3e00 bits>half ] unit-test +[ -1.5 ] [ 0xbe00 bits>half ] unit-test +[ 1/0. ] [ 0x7c00 bits>half ] unit-test +[ -1/0. ] [ 0xfc00 bits>half ] unit-test +[ 3.0 ] [ 0x4200 bits>half ] unit-test +[ t ] [ 0x7e00 bits>half fp-nan? ] unit-test STRUCT: halves { tom half } diff --git a/basis/math/floats/half/half.factor b/basis/math/floats/half/half.factor index d82e3b1fdd..711c69c517 100644 --- a/basis/math/floats/half/half.factor +++ b/basis/math/floats/half/half.factor @@ -7,21 +7,21 @@ IN: math.floats.half : half>bits ( float -- bits ) float>bits [ -31 shift 15 shift ] [ - HEX: 7fffffff bitand + 0x7fffffff bitand dup zero? [ - dup HEX: 7f800000 >= [ -13 shift HEX: 7fff bitand ] [ + dup 0x7f800000 >= [ -13 shift 0x7fff bitand ] [ -13 shift 112 10 shift - - 0 HEX: 7c00 clamp + 0 0x7c00 clamp ] if ] unless ] bi bitor ; : bits>half ( bits -- float ) [ -15 shift 31 shift ] [ - HEX: 7fff bitand + 0x7fff bitand dup zero? [ - dup HEX: 7c00 >= [ 13 shift HEX: 7f800000 bitor ] [ + dup 0x7c00 >= [ 13 shift 0x7f800000 bitor ] [ 13 shift 112 23 shift + ] if diff --git a/basis/math/functions/functions-tests.factor b/basis/math/functions/functions-tests.factor index edd66f9b83..c7646db228 100644 --- a/basis/math/functions/functions-tests.factor +++ b/basis/math/functions/functions-tests.factor @@ -27,7 +27,7 @@ IN: math.functions.tests [ t ] [ e pi i* ^ imaginary-part -0.00001 0.00001 between? ] unit-test [ 1/0. ] [ 2.0 1024 ^ ] unit-test -[ HEX: 1.0p-1024 ] [ 2.0 -1024 ^ ] unit-test +[ 0x1.0p-1024 ] [ 2.0 -1024 ^ ] unit-test [ t ] [ 0 0 ^ fp-nan? ] unit-test [ 0.0 ] [ 0.0 1.0 ^ ] unit-test @@ -59,8 +59,8 @@ IN: math.functions.tests [ 0.0 ] [ 1.0 log ] unit-test [ 1.0 ] [ e log ] unit-test -CONSTANT: log-factorial-1000 HEX: 1.71820d04e2eb6p12 -CONSTANT: log10-factorial-1000 HEX: 1.40f3593ed6f8ep11 +CONSTANT: log-factorial-1000 0x1.71820d04e2eb6p12 +CONSTANT: log10-factorial-1000 0x1.40f3593ed6f8ep11 [ $ log-factorial-1000 t ] [ 1000 factorial [ log ] [ bignum? ] bi ] unit-test [ C{ $ log-factorial-1000 $ pi } t ] [ 1000 factorial neg [ log ] [ bignum? ] bi ] unit-test diff --git a/basis/math/functions/functions.factor b/basis/math/functions/functions.factor index 94bee1ade6..f1e68c9f86 100644 --- a/basis/math/functions/functions.factor +++ b/basis/math/functions/functions.factor @@ -160,14 +160,14 @@ GENERIC: frexp ( x -- y exp ) M: float frexp dup fp-special? [ dup zero? ] unless* [ 0 ] [ double>bits - [ HEX: 800f,ffff,ffff,ffff bitand 0.5 double>bits bitor bits>double ] - [ -52 shift HEX: 7ff bitand 1022 - ] bi + [ 0x800f,ffff,ffff,ffff bitand 0.5 double>bits bitor bits>double ] + [ -52 shift 0x7ff bitand 1022 - ] bi ] if ; inline M: integer frexp [ 0.0 0 ] [ dup 0 > [ 1 ] [ abs -1 ] if swap dup log2 [ - 52 swap - shift HEX: 000f,ffff,ffff,ffff bitand + 52 swap - shift 0x000f,ffff,ffff,ffff bitand 0.5 double>bits bitor bits>double ] [ 1 + ] bi [ * ] dip ] if-zero ; inline @@ -183,11 +183,11 @@ M: complex log >polar [ flog ] dip rect> ; inline integer ; inline + -0x1.ffff,ffff,ffff,fp1023 >integer ; inline : most-positive-finite-float ( -- x ) - HEX: 1.ffff,ffff,ffff,fp1023 >integer ; inline -CONSTANT: log-2 HEX: 1.62e42fefa39efp-1 -CONSTANT: log10-2 HEX: 1.34413509f79ffp-2 + 0x1.ffff,ffff,ffff,fp1023 >integer ; inline +CONSTANT: log-2 0x1.62e42fefa39efp-1 +CONSTANT: log10-2 0x1.34413509f79ffp-2 : (representable-as-float?) ( x -- ? ) most-negative-finite-float diff --git a/basis/math/vectors/simd/simd-tests.factor b/basis/math/vectors/simd/simd-tests.factor index 8f9f2b5daf..198846c1fc 100644 --- a/basis/math/vectors/simd/simd-tests.factor +++ b/basis/math/vectors/simd/simd-tests.factor @@ -191,11 +191,11 @@ TUPLE: simd-test-failure ] [ = ] check-optimizer ] unit-test -[ HEX: ffffffff ] [ HEX: ffffffff uint-4-with first ] unit-test +[ 0xffffffff ] [ 0xffffffff uint-4-with first ] unit-test -[ HEX: ffffffff ] [ HEX: ffffffff [ uint-4-with ] compile-call first ] unit-test +[ 0xffffffff ] [ 0xffffffff [ uint-4-with ] compile-call first ] unit-test -[ HEX: ffffffff ] [ [ HEX: ffffffff uint-4-with ] compile-call first ] unit-test +[ 0xffffffff ] [ [ 0xffffffff uint-4-with ] compile-call first ] unit-test "== Checking -boa constructors" print @@ -206,7 +206,7 @@ TUPLE: simd-test-failure ] [ = ] check-optimizer ] unit-test -[ HEX: ffffffff ] [ HEX: ffffffff 2 3 4 [ uint-4-boa ] compile-call first ] unit-test +[ 0xffffffff ] [ 0xffffffff 2 3 4 [ uint-4-boa ] compile-call first ] unit-test "== Checking vector operations" print @@ -566,12 +566,12 @@ TUPLE: inconsistent-vector-test bool branch ; '[ [ _ 1quotation ] dip '[ _ swap nth ] ] [ = ] check-optimizer ; inline [ { } ] [ float-4{ 1.0 2.0 3.0 4.0 } test-accesses ] unit-test -[ { } ] [ int-4{ HEX: 7fffffff 3 4 -8 } test-accesses ] unit-test -[ { } ] [ uint-4{ HEX: ffffffff 2 3 4 } test-accesses ] unit-test +[ { } ] [ int-4{ 0x7fffffff 3 4 -8 } test-accesses ] unit-test +[ { } ] [ uint-4{ 0xffffffff 2 3 4 } test-accesses ] unit-test -[ HEX: 7fffffff ] [ int-4{ HEX: 7fffffff 3 4 -8 } first ] unit-test -[ -8 ] [ int-4{ HEX: 7fffffff 3 4 -8 } last ] unit-test -[ HEX: ffffffff ] [ uint-4{ HEX: ffffffff 2 3 4 } first ] unit-test +[ 0x7fffffff ] [ int-4{ 0x7fffffff 3 4 -8 } first ] unit-test +[ -8 ] [ int-4{ 0x7fffffff 3 4 -8 } last ] unit-test +[ 0xffffffff ] [ uint-4{ 0xffffffff 2 3 4 } first ] unit-test [ { } ] [ double-2{ 1.0 2.0 } test-accesses ] unit-test [ { } ] [ longlong-2{ 1 2 } test-accesses ] unit-test @@ -583,8 +583,8 @@ TUPLE: inconsistent-vector-test bool branch ; '[ [ _ 1quotation ] dip '[ _ vbroadcast ] ] [ = ] check-optimizer ; [ { } ] [ float-4{ 1.0 2.0 3.0 4.0 } test-broadcast ] unit-test -[ { } ] [ int-4{ HEX: 7fffffff 3 4 -8 } test-broadcast ] unit-test -[ { } ] [ uint-4{ HEX: ffffffff 2 3 4 } test-broadcast ] unit-test +[ { } ] [ int-4{ 0x7fffffff 3 4 -8 } test-broadcast ] unit-test +[ { } ] [ uint-4{ 0xffffffff 2 3 4 } test-broadcast ] unit-test [ { } ] [ double-2{ 1.0 2.0 } test-broadcast ] unit-test [ { } ] [ longlong-2{ 1 2 } test-broadcast ] unit-test diff --git a/basis/math/vectors/vectors-docs.factor b/basis/math/vectors/vectors-docs.factor index 3c8e6ae336..12707a696f 100644 --- a/basis/math/vectors/vectors-docs.factor +++ b/basis/math/vectors/vectors-docs.factor @@ -438,14 +438,14 @@ HELP: vshuffle " { 4 [ uchar-16{ 3 2 1 0 7 6 5 4 11 10 9 8 15 14 13 12 } ] }" " } case ;" "" - "int-4{ HEX: 11223344 HEX: 11223344 HEX: 11223344 HEX: 11223344 }" + "int-4{ 0x11223344 0x11223344 0x11223344 0x11223344 }" "4 endian-swap vshuffle" "16 number-base [ . ] with-variable" """int-4{ - HEX: 44332211 - HEX: 44332211 - HEX: 44332211 - HEX: 44332211 + 0x44332211 + 0x44332211 + 0x44332211 + 0x44332211 }""" } } ; diff --git a/basis/nibble-arrays/nibble-arrays.factor b/basis/nibble-arrays/nibble-arrays.factor index 0e7298165c..d519d4f5bc 100644 --- a/basis/nibble-arrays/nibble-arrays.factor +++ b/basis/nibble-arrays/nibble-arrays.factor @@ -10,7 +10,7 @@ TUPLE: nibble-array bytes ( m -- n ) 1 + 2/ ; inline diff --git a/basis/opengl/gl/gl.factor b/basis/opengl/gl/gl.factor index 16f5cf64a6..d1e510beec 100644 --- a/basis/opengl/gl/gl.factor +++ b/basis/opengl/gl/gl.factor @@ -32,599 +32,599 @@ TYPEDEF: c-string[ascii] GLstring ! Constants ! Boolean values -CONSTANT: GL_FALSE HEX: 0 -CONSTANT: GL_TRUE HEX: 1 +CONSTANT: GL_FALSE 0x0 +CONSTANT: GL_TRUE 0x1 ! Data types -CONSTANT: GL_BYTE HEX: 1400 -CONSTANT: GL_UNSIGNED_BYTE HEX: 1401 -CONSTANT: GL_SHORT HEX: 1402 -CONSTANT: GL_UNSIGNED_SHORT HEX: 1403 -CONSTANT: GL_INT HEX: 1404 -CONSTANT: GL_UNSIGNED_INT HEX: 1405 -CONSTANT: GL_FLOAT HEX: 1406 -CONSTANT: GL_2_BYTES HEX: 1407 -CONSTANT: GL_3_BYTES HEX: 1408 -CONSTANT: GL_4_BYTES HEX: 1409 -CONSTANT: GL_DOUBLE HEX: 140A +CONSTANT: GL_BYTE 0x1400 +CONSTANT: GL_UNSIGNED_BYTE 0x1401 +CONSTANT: GL_SHORT 0x1402 +CONSTANT: GL_UNSIGNED_SHORT 0x1403 +CONSTANT: GL_INT 0x1404 +CONSTANT: GL_UNSIGNED_INT 0x1405 +CONSTANT: GL_FLOAT 0x1406 +CONSTANT: GL_2_BYTES 0x1407 +CONSTANT: GL_3_BYTES 0x1408 +CONSTANT: GL_4_BYTES 0x1409 +CONSTANT: GL_DOUBLE 0x140A ! Primitives -CONSTANT: GL_POINTS HEX: 0000 -CONSTANT: GL_LINES HEX: 0001 -CONSTANT: GL_LINE_LOOP HEX: 0002 -CONSTANT: GL_LINE_STRIP HEX: 0003 -CONSTANT: GL_TRIANGLES HEX: 0004 -CONSTANT: GL_TRIANGLE_STRIP HEX: 0005 -CONSTANT: GL_TRIANGLE_FAN HEX: 0006 -CONSTANT: GL_QUADS HEX: 0007 -CONSTANT: GL_QUAD_STRIP HEX: 0008 -CONSTANT: GL_POLYGON HEX: 0009 +CONSTANT: GL_POINTS 0x0000 +CONSTANT: GL_LINES 0x0001 +CONSTANT: GL_LINE_LOOP 0x0002 +CONSTANT: GL_LINE_STRIP 0x0003 +CONSTANT: GL_TRIANGLES 0x0004 +CONSTANT: GL_TRIANGLE_STRIP 0x0005 +CONSTANT: GL_TRIANGLE_FAN 0x0006 +CONSTANT: GL_QUADS 0x0007 +CONSTANT: GL_QUAD_STRIP 0x0008 +CONSTANT: GL_POLYGON 0x0009 ! Vertex arrays -CONSTANT: GL_VERTEX_ARRAY HEX: 8074 -CONSTANT: GL_NORMAL_ARRAY HEX: 8075 -CONSTANT: GL_COLOR_ARRAY HEX: 8076 -CONSTANT: GL_INDEX_ARRAY HEX: 8077 -CONSTANT: GL_TEXTURE_COORD_ARRAY HEX: 8078 -CONSTANT: GL_EDGE_FLAG_ARRAY HEX: 8079 -CONSTANT: GL_VERTEX_ARRAY_SIZE HEX: 807A -CONSTANT: GL_VERTEX_ARRAY_TYPE HEX: 807B -CONSTANT: GL_VERTEX_ARRAY_STRIDE HEX: 807C -CONSTANT: GL_NORMAL_ARRAY_TYPE HEX: 807E -CONSTANT: GL_NORMAL_ARRAY_STRIDE HEX: 807F -CONSTANT: GL_COLOR_ARRAY_SIZE HEX: 8081 -CONSTANT: GL_COLOR_ARRAY_TYPE HEX: 8082 -CONSTANT: GL_COLOR_ARRAY_STRIDE HEX: 8083 -CONSTANT: GL_INDEX_ARRAY_TYPE HEX: 8085 -CONSTANT: GL_INDEX_ARRAY_STRIDE HEX: 8086 -CONSTANT: GL_TEXTURE_COORD_ARRAY_SIZE HEX: 8088 -CONSTANT: GL_TEXTURE_COORD_ARRAY_TYPE HEX: 8089 -CONSTANT: GL_TEXTURE_COORD_ARRAY_STRIDE HEX: 808A -CONSTANT: GL_EDGE_FLAG_ARRAY_STRIDE HEX: 808C -CONSTANT: GL_VERTEX_ARRAY_POINTER HEX: 808E -CONSTANT: GL_NORMAL_ARRAY_POINTER HEX: 808F -CONSTANT: GL_COLOR_ARRAY_POINTER HEX: 8090 -CONSTANT: GL_INDEX_ARRAY_POINTER HEX: 8091 -CONSTANT: GL_TEXTURE_COORD_ARRAY_POINTER HEX: 8092 -CONSTANT: GL_EDGE_FLAG_ARRAY_POINTER HEX: 8093 -CONSTANT: GL_V2F HEX: 2A20 -CONSTANT: GL_V3F HEX: 2A21 -CONSTANT: GL_C4UB_V2F HEX: 2A22 -CONSTANT: GL_C4UB_V3F HEX: 2A23 -CONSTANT: GL_C3F_V3F HEX: 2A24 -CONSTANT: GL_N3F_V3F HEX: 2A25 -CONSTANT: GL_C4F_N3F_V3F HEX: 2A26 -CONSTANT: GL_T2F_V3F HEX: 2A27 -CONSTANT: GL_T4F_V4F HEX: 2A28 -CONSTANT: GL_T2F_C4UB_V3F HEX: 2A29 -CONSTANT: GL_T2F_C3F_V3F HEX: 2A2A -CONSTANT: GL_T2F_N3F_V3F HEX: 2A2B -CONSTANT: GL_T2F_C4F_N3F_V3F HEX: 2A2C -CONSTANT: GL_T4F_C4F_N3F_V4F HEX: 2A2D +CONSTANT: GL_VERTEX_ARRAY 0x8074 +CONSTANT: GL_NORMAL_ARRAY 0x8075 +CONSTANT: GL_COLOR_ARRAY 0x8076 +CONSTANT: GL_INDEX_ARRAY 0x8077 +CONSTANT: GL_TEXTURE_COORD_ARRAY 0x8078 +CONSTANT: GL_EDGE_FLAG_ARRAY 0x8079 +CONSTANT: GL_VERTEX_ARRAY_SIZE 0x807A +CONSTANT: GL_VERTEX_ARRAY_TYPE 0x807B +CONSTANT: GL_VERTEX_ARRAY_STRIDE 0x807C +CONSTANT: GL_NORMAL_ARRAY_TYPE 0x807E +CONSTANT: GL_NORMAL_ARRAY_STRIDE 0x807F +CONSTANT: GL_COLOR_ARRAY_SIZE 0x8081 +CONSTANT: GL_COLOR_ARRAY_TYPE 0x8082 +CONSTANT: GL_COLOR_ARRAY_STRIDE 0x8083 +CONSTANT: GL_INDEX_ARRAY_TYPE 0x8085 +CONSTANT: GL_INDEX_ARRAY_STRIDE 0x8086 +CONSTANT: GL_TEXTURE_COORD_ARRAY_SIZE 0x8088 +CONSTANT: GL_TEXTURE_COORD_ARRAY_TYPE 0x8089 +CONSTANT: GL_TEXTURE_COORD_ARRAY_STRIDE 0x808A +CONSTANT: GL_EDGE_FLAG_ARRAY_STRIDE 0x808C +CONSTANT: GL_VERTEX_ARRAY_POINTER 0x808E +CONSTANT: GL_NORMAL_ARRAY_POINTER 0x808F +CONSTANT: GL_COLOR_ARRAY_POINTER 0x8090 +CONSTANT: GL_INDEX_ARRAY_POINTER 0x8091 +CONSTANT: GL_TEXTURE_COORD_ARRAY_POINTER 0x8092 +CONSTANT: GL_EDGE_FLAG_ARRAY_POINTER 0x8093 +CONSTANT: GL_V2F 0x2A20 +CONSTANT: GL_V3F 0x2A21 +CONSTANT: GL_C4UB_V2F 0x2A22 +CONSTANT: GL_C4UB_V3F 0x2A23 +CONSTANT: GL_C3F_V3F 0x2A24 +CONSTANT: GL_N3F_V3F 0x2A25 +CONSTANT: GL_C4F_N3F_V3F 0x2A26 +CONSTANT: GL_T2F_V3F 0x2A27 +CONSTANT: GL_T4F_V4F 0x2A28 +CONSTANT: GL_T2F_C4UB_V3F 0x2A29 +CONSTANT: GL_T2F_C3F_V3F 0x2A2A +CONSTANT: GL_T2F_N3F_V3F 0x2A2B +CONSTANT: GL_T2F_C4F_N3F_V3F 0x2A2C +CONSTANT: GL_T4F_C4F_N3F_V4F 0x2A2D ! Matrix mode -CONSTANT: GL_MATRIX_MODE HEX: 0BA0 -CONSTANT: GL_MODELVIEW HEX: 1700 -CONSTANT: GL_PROJECTION HEX: 1701 -CONSTANT: GL_TEXTURE HEX: 1702 +CONSTANT: GL_MATRIX_MODE 0x0BA0 +CONSTANT: GL_MODELVIEW 0x1700 +CONSTANT: GL_PROJECTION 0x1701 +CONSTANT: GL_TEXTURE 0x1702 ! Points -CONSTANT: GL_POINT_SMOOTH HEX: 0B10 -CONSTANT: GL_POINT_SIZE HEX: 0B11 -CONSTANT: GL_POINT_SIZE_GRANULARITY HEX: 0B13 -CONSTANT: GL_POINT_SIZE_RANGE HEX: 0B12 +CONSTANT: GL_POINT_SMOOTH 0x0B10 +CONSTANT: GL_POINT_SIZE 0x0B11 +CONSTANT: GL_POINT_SIZE_GRANULARITY 0x0B13 +CONSTANT: GL_POINT_SIZE_RANGE 0x0B12 ! Lines -CONSTANT: GL_LINE_SMOOTH HEX: 0B20 -CONSTANT: GL_LINE_STIPPLE HEX: 0B24 -CONSTANT: GL_LINE_STIPPLE_PATTERN HEX: 0B25 -CONSTANT: GL_LINE_STIPPLE_REPEAT HEX: 0B26 -CONSTANT: GL_LINE_WIDTH HEX: 0B21 -CONSTANT: GL_LINE_WIDTH_GRANULARITY HEX: 0B23 -CONSTANT: GL_LINE_WIDTH_RANGE HEX: 0B22 +CONSTANT: GL_LINE_SMOOTH 0x0B20 +CONSTANT: GL_LINE_STIPPLE 0x0B24 +CONSTANT: GL_LINE_STIPPLE_PATTERN 0x0B25 +CONSTANT: GL_LINE_STIPPLE_REPEAT 0x0B26 +CONSTANT: GL_LINE_WIDTH 0x0B21 +CONSTANT: GL_LINE_WIDTH_GRANULARITY 0x0B23 +CONSTANT: GL_LINE_WIDTH_RANGE 0x0B22 ! Polygons -CONSTANT: GL_POINT HEX: 1B00 -CONSTANT: GL_LINE HEX: 1B01 -CONSTANT: GL_FILL HEX: 1B02 -CONSTANT: GL_CW HEX: 0900 -CONSTANT: GL_CCW HEX: 0901 -CONSTANT: GL_FRONT HEX: 0404 -CONSTANT: GL_BACK HEX: 0405 -CONSTANT: GL_POLYGON_MODE HEX: 0B40 -CONSTANT: GL_POLYGON_SMOOTH HEX: 0B41 -CONSTANT: GL_POLYGON_STIPPLE HEX: 0B42 -CONSTANT: GL_EDGE_FLAG HEX: 0B43 -CONSTANT: GL_CULL_FACE HEX: 0B44 -CONSTANT: GL_CULL_FACE_MODE HEX: 0B45 -CONSTANT: GL_FRONT_FACE HEX: 0B46 -CONSTANT: GL_POLYGON_OFFSET_FACTOR HEX: 8038 -CONSTANT: GL_POLYGON_OFFSET_UNITS HEX: 2A00 -CONSTANT: GL_POLYGON_OFFSET_POINT HEX: 2A01 -CONSTANT: GL_POLYGON_OFFSET_LINE HEX: 2A02 -CONSTANT: GL_POLYGON_OFFSET_FILL HEX: 8037 +CONSTANT: GL_POINT 0x1B00 +CONSTANT: GL_LINE 0x1B01 +CONSTANT: GL_FILL 0x1B02 +CONSTANT: GL_CW 0x0900 +CONSTANT: GL_CCW 0x0901 +CONSTANT: GL_FRONT 0x0404 +CONSTANT: GL_BACK 0x0405 +CONSTANT: GL_POLYGON_MODE 0x0B40 +CONSTANT: GL_POLYGON_SMOOTH 0x0B41 +CONSTANT: GL_POLYGON_STIPPLE 0x0B42 +CONSTANT: GL_EDGE_FLAG 0x0B43 +CONSTANT: GL_CULL_FACE 0x0B44 +CONSTANT: GL_CULL_FACE_MODE 0x0B45 +CONSTANT: GL_FRONT_FACE 0x0B46 +CONSTANT: GL_POLYGON_OFFSET_FACTOR 0x8038 +CONSTANT: GL_POLYGON_OFFSET_UNITS 0x2A00 +CONSTANT: GL_POLYGON_OFFSET_POINT 0x2A01 +CONSTANT: GL_POLYGON_OFFSET_LINE 0x2A02 +CONSTANT: GL_POLYGON_OFFSET_FILL 0x8037 ! Display Lists -CONSTANT: GL_COMPILE HEX: 1300 -CONSTANT: GL_COMPILE_AND_EXECUTE HEX: 1301 -CONSTANT: GL_LIST_BASE HEX: 0B32 -CONSTANT: GL_LIST_INDEX HEX: 0B33 -CONSTANT: GL_LIST_MODE HEX: 0B30 +CONSTANT: GL_COMPILE 0x1300 +CONSTANT: GL_COMPILE_AND_EXECUTE 0x1301 +CONSTANT: GL_LIST_BASE 0x0B32 +CONSTANT: GL_LIST_INDEX 0x0B33 +CONSTANT: GL_LIST_MODE 0x0B30 ! Depth buffer -CONSTANT: GL_NEVER HEX: 0200 -CONSTANT: GL_LESS HEX: 0201 -CONSTANT: GL_EQUAL HEX: 0202 -CONSTANT: GL_LEQUAL HEX: 0203 -CONSTANT: GL_GREATER HEX: 0204 -CONSTANT: GL_NOTEQUAL HEX: 0205 -CONSTANT: GL_GEQUAL HEX: 0206 -CONSTANT: GL_ALWAYS HEX: 0207 -CONSTANT: GL_DEPTH_TEST HEX: 0B71 -CONSTANT: GL_DEPTH_BITS HEX: 0D56 -CONSTANT: GL_DEPTH_CLEAR_VALUE HEX: 0B73 -CONSTANT: GL_DEPTH_FUNC HEX: 0B74 -CONSTANT: GL_DEPTH_RANGE HEX: 0B70 -CONSTANT: GL_DEPTH_WRITEMASK HEX: 0B72 -CONSTANT: GL_DEPTH_COMPONENT HEX: 1902 +CONSTANT: GL_NEVER 0x0200 +CONSTANT: GL_LESS 0x0201 +CONSTANT: GL_EQUAL 0x0202 +CONSTANT: GL_LEQUAL 0x0203 +CONSTANT: GL_GREATER 0x0204 +CONSTANT: GL_NOTEQUAL 0x0205 +CONSTANT: GL_GEQUAL 0x0206 +CONSTANT: GL_ALWAYS 0x0207 +CONSTANT: GL_DEPTH_TEST 0x0B71 +CONSTANT: GL_DEPTH_BITS 0x0D56 +CONSTANT: GL_DEPTH_CLEAR_VALUE 0x0B73 +CONSTANT: GL_DEPTH_FUNC 0x0B74 +CONSTANT: GL_DEPTH_RANGE 0x0B70 +CONSTANT: GL_DEPTH_WRITEMASK 0x0B72 +CONSTANT: GL_DEPTH_COMPONENT 0x1902 ! Lighting -CONSTANT: GL_LIGHTING HEX: 0B50 -CONSTANT: GL_LIGHT0 HEX: 4000 -CONSTANT: GL_LIGHT1 HEX: 4001 -CONSTANT: GL_LIGHT2 HEX: 4002 -CONSTANT: GL_LIGHT3 HEX: 4003 -CONSTANT: GL_LIGHT4 HEX: 4004 -CONSTANT: GL_LIGHT5 HEX: 4005 -CONSTANT: GL_LIGHT6 HEX: 4006 -CONSTANT: GL_LIGHT7 HEX: 4007 -CONSTANT: GL_SPOT_EXPONENT HEX: 1205 -CONSTANT: GL_SPOT_CUTOFF HEX: 1206 -CONSTANT: GL_CONSTANT_ATTENUATION HEX: 1207 -CONSTANT: GL_LINEAR_ATTENUATION HEX: 1208 -CONSTANT: GL_QUADRATIC_ATTENUATION HEX: 1209 -CONSTANT: GL_AMBIENT HEX: 1200 -CONSTANT: GL_DIFFUSE HEX: 1201 -CONSTANT: GL_SPECULAR HEX: 1202 -CONSTANT: GL_SHININESS HEX: 1601 -CONSTANT: GL_EMISSION HEX: 1600 -CONSTANT: GL_POSITION HEX: 1203 -CONSTANT: GL_SPOT_DIRECTION HEX: 1204 -CONSTANT: GL_AMBIENT_AND_DIFFUSE HEX: 1602 -CONSTANT: GL_COLOR_INDEXES HEX: 1603 -CONSTANT: GL_LIGHT_MODEL_TWO_SIDE HEX: 0B52 -CONSTANT: GL_LIGHT_MODEL_LOCAL_VIEWER HEX: 0B51 -CONSTANT: GL_LIGHT_MODEL_AMBIENT HEX: 0B53 -CONSTANT: GL_FRONT_AND_BACK HEX: 0408 -CONSTANT: GL_SHADE_MODEL HEX: 0B54 -CONSTANT: GL_FLAT HEX: 1D00 -CONSTANT: GL_SMOOTH HEX: 1D01 -CONSTANT: GL_COLOR_MATERIAL HEX: 0B57 -CONSTANT: GL_COLOR_MATERIAL_FACE HEX: 0B55 -CONSTANT: GL_COLOR_MATERIAL_PARAMETER HEX: 0B56 -CONSTANT: GL_NORMALIZE HEX: 0BA1 +CONSTANT: GL_LIGHTING 0x0B50 +CONSTANT: GL_LIGHT0 0x4000 +CONSTANT: GL_LIGHT1 0x4001 +CONSTANT: GL_LIGHT2 0x4002 +CONSTANT: GL_LIGHT3 0x4003 +CONSTANT: GL_LIGHT4 0x4004 +CONSTANT: GL_LIGHT5 0x4005 +CONSTANT: GL_LIGHT6 0x4006 +CONSTANT: GL_LIGHT7 0x4007 +CONSTANT: GL_SPOT_EXPONENT 0x1205 +CONSTANT: GL_SPOT_CUTOFF 0x1206 +CONSTANT: GL_CONSTANT_ATTENUATION 0x1207 +CONSTANT: GL_LINEAR_ATTENUATION 0x1208 +CONSTANT: GL_QUADRATIC_ATTENUATION 0x1209 +CONSTANT: GL_AMBIENT 0x1200 +CONSTANT: GL_DIFFUSE 0x1201 +CONSTANT: GL_SPECULAR 0x1202 +CONSTANT: GL_SHININESS 0x1601 +CONSTANT: GL_EMISSION 0x1600 +CONSTANT: GL_POSITION 0x1203 +CONSTANT: GL_SPOT_DIRECTION 0x1204 +CONSTANT: GL_AMBIENT_AND_DIFFUSE 0x1602 +CONSTANT: GL_COLOR_INDEXES 0x1603 +CONSTANT: GL_LIGHT_MODEL_TWO_SIDE 0x0B52 +CONSTANT: GL_LIGHT_MODEL_LOCAL_VIEWER 0x0B51 +CONSTANT: GL_LIGHT_MODEL_AMBIENT 0x0B53 +CONSTANT: GL_FRONT_AND_BACK 0x0408 +CONSTANT: GL_SHADE_MODEL 0x0B54 +CONSTANT: GL_FLAT 0x1D00 +CONSTANT: GL_SMOOTH 0x1D01 +CONSTANT: GL_COLOR_MATERIAL 0x0B57 +CONSTANT: GL_COLOR_MATERIAL_FACE 0x0B55 +CONSTANT: GL_COLOR_MATERIAL_PARAMETER 0x0B56 +CONSTANT: GL_NORMALIZE 0x0BA1 ! User clipping planes -CONSTANT: GL_CLIP_PLANE0 HEX: 3000 -CONSTANT: GL_CLIP_PLANE1 HEX: 3001 -CONSTANT: GL_CLIP_PLANE2 HEX: 3002 -CONSTANT: GL_CLIP_PLANE3 HEX: 3003 -CONSTANT: GL_CLIP_PLANE4 HEX: 3004 -CONSTANT: GL_CLIP_PLANE5 HEX: 3005 +CONSTANT: GL_CLIP_PLANE0 0x3000 +CONSTANT: GL_CLIP_PLANE1 0x3001 +CONSTANT: GL_CLIP_PLANE2 0x3002 +CONSTANT: GL_CLIP_PLANE3 0x3003 +CONSTANT: GL_CLIP_PLANE4 0x3004 +CONSTANT: GL_CLIP_PLANE5 0x3005 ! Accumulation buffer -CONSTANT: GL_ACCUM_RED_BITS HEX: 0D58 -CONSTANT: GL_ACCUM_GREEN_BITS HEX: 0D59 -CONSTANT: GL_ACCUM_BLUE_BITS HEX: 0D5A -CONSTANT: GL_ACCUM_ALPHA_BITS HEX: 0D5B -CONSTANT: GL_ACCUM_CLEAR_VALUE HEX: 0B80 -CONSTANT: GL_ACCUM HEX: 0100 -CONSTANT: GL_ADD HEX: 0104 -CONSTANT: GL_LOAD HEX: 0101 -CONSTANT: GL_MULT HEX: 0103 -CONSTANT: GL_RETURN HEX: 0102 +CONSTANT: GL_ACCUM_RED_BITS 0x0D58 +CONSTANT: GL_ACCUM_GREEN_BITS 0x0D59 +CONSTANT: GL_ACCUM_BLUE_BITS 0x0D5A +CONSTANT: GL_ACCUM_ALPHA_BITS 0x0D5B +CONSTANT: GL_ACCUM_CLEAR_VALUE 0x0B80 +CONSTANT: GL_ACCUM 0x0100 +CONSTANT: GL_ADD 0x0104 +CONSTANT: GL_LOAD 0x0101 +CONSTANT: GL_MULT 0x0103 +CONSTANT: GL_RETURN 0x0102 ! Alpha testing -CONSTANT: GL_ALPHA_TEST HEX: 0BC0 -CONSTANT: GL_ALPHA_TEST_REF HEX: 0BC2 -CONSTANT: GL_ALPHA_TEST_FUNC HEX: 0BC1 +CONSTANT: GL_ALPHA_TEST 0x0BC0 +CONSTANT: GL_ALPHA_TEST_REF 0x0BC2 +CONSTANT: GL_ALPHA_TEST_FUNC 0x0BC1 ! Blending -CONSTANT: GL_BLEND HEX: 0BE2 -CONSTANT: GL_BLEND_SRC HEX: 0BE1 -CONSTANT: GL_BLEND_DST HEX: 0BE0 -CONSTANT: GL_ZERO HEX: 0 -CONSTANT: GL_ONE HEX: 1 -CONSTANT: GL_SRC_COLOR HEX: 0300 -CONSTANT: GL_ONE_MINUS_SRC_COLOR HEX: 0301 -CONSTANT: GL_SRC_ALPHA HEX: 0302 -CONSTANT: GL_ONE_MINUS_SRC_ALPHA HEX: 0303 -CONSTANT: GL_DST_ALPHA HEX: 0304 -CONSTANT: GL_ONE_MINUS_DST_ALPHA HEX: 0305 -CONSTANT: GL_DST_COLOR HEX: 0306 -CONSTANT: GL_ONE_MINUS_DST_COLOR HEX: 0307 -CONSTANT: GL_SRC_ALPHA_SATURATE HEX: 0308 +CONSTANT: GL_BLEND 0x0BE2 +CONSTANT: GL_BLEND_SRC 0x0BE1 +CONSTANT: GL_BLEND_DST 0x0BE0 +CONSTANT: GL_ZERO 0x0 +CONSTANT: GL_ONE 0x1 +CONSTANT: GL_SRC_COLOR 0x0300 +CONSTANT: GL_ONE_MINUS_SRC_COLOR 0x0301 +CONSTANT: GL_SRC_ALPHA 0x0302 +CONSTANT: GL_ONE_MINUS_SRC_ALPHA 0x0303 +CONSTANT: GL_DST_ALPHA 0x0304 +CONSTANT: GL_ONE_MINUS_DST_ALPHA 0x0305 +CONSTANT: GL_DST_COLOR 0x0306 +CONSTANT: GL_ONE_MINUS_DST_COLOR 0x0307 +CONSTANT: GL_SRC_ALPHA_SATURATE 0x0308 ! Render Mode -CONSTANT: GL_FEEDBACK HEX: 1C01 -CONSTANT: GL_RENDER HEX: 1C00 -CONSTANT: GL_SELECT HEX: 1C02 +CONSTANT: GL_FEEDBACK 0x1C01 +CONSTANT: GL_RENDER 0x1C00 +CONSTANT: GL_SELECT 0x1C02 ! Feedback -CONSTANT: GL_2D HEX: 0600 -CONSTANT: GL_3D HEX: 0601 -CONSTANT: GL_3D_COLOR HEX: 0602 -CONSTANT: GL_3D_COLOR_TEXTURE HEX: 0603 -CONSTANT: GL_4D_COLOR_TEXTURE HEX: 0604 -CONSTANT: GL_POINT_TOKEN HEX: 0701 -CONSTANT: GL_LINE_TOKEN HEX: 0702 -CONSTANT: GL_LINE_RESET_TOKEN HEX: 0707 -CONSTANT: GL_POLYGON_TOKEN HEX: 0703 -CONSTANT: GL_BITMAP_TOKEN HEX: 0704 -CONSTANT: GL_DRAW_PIXEL_TOKEN HEX: 0705 -CONSTANT: GL_COPY_PIXEL_TOKEN HEX: 0706 -CONSTANT: GL_PASS_THROUGH_TOKEN HEX: 0700 -CONSTANT: GL_FEEDBACK_BUFFER_POINTER HEX: 0DF0 -CONSTANT: GL_FEEDBACK_BUFFER_SIZE HEX: 0DF1 -CONSTANT: GL_FEEDBACK_BUFFER_TYPE HEX: 0DF2 +CONSTANT: GL_2D 0x0600 +CONSTANT: GL_3D 0x0601 +CONSTANT: GL_3D_COLOR 0x0602 +CONSTANT: GL_3D_COLOR_TEXTURE 0x0603 +CONSTANT: GL_4D_COLOR_TEXTURE 0x0604 +CONSTANT: GL_POINT_TOKEN 0x0701 +CONSTANT: GL_LINE_TOKEN 0x0702 +CONSTANT: GL_LINE_RESET_TOKEN 0x0707 +CONSTANT: GL_POLYGON_TOKEN 0x0703 +CONSTANT: GL_BITMAP_TOKEN 0x0704 +CONSTANT: GL_DRAW_PIXEL_TOKEN 0x0705 +CONSTANT: GL_COPY_PIXEL_TOKEN 0x0706 +CONSTANT: GL_PASS_THROUGH_TOKEN 0x0700 +CONSTANT: GL_FEEDBACK_BUFFER_POINTER 0x0DF0 +CONSTANT: GL_FEEDBACK_BUFFER_SIZE 0x0DF1 +CONSTANT: GL_FEEDBACK_BUFFER_TYPE 0x0DF2 ! Selection -CONSTANT: GL_SELECTION_BUFFER_POINTER HEX: 0DF3 -CONSTANT: GL_SELECTION_BUFFER_SIZE HEX: 0DF4 +CONSTANT: GL_SELECTION_BUFFER_POINTER 0x0DF3 +CONSTANT: GL_SELECTION_BUFFER_SIZE 0x0DF4 ! Fog -CONSTANT: GL_FOG HEX: 0B60 -CONSTANT: GL_FOG_MODE HEX: 0B65 -CONSTANT: GL_FOG_DENSITY HEX: 0B62 -CONSTANT: GL_FOG_COLOR HEX: 0B66 -CONSTANT: GL_FOG_INDEX HEX: 0B61 -CONSTANT: GL_FOG_START HEX: 0B63 -CONSTANT: GL_FOG_END HEX: 0B64 -CONSTANT: GL_LINEAR HEX: 2601 -CONSTANT: GL_EXP HEX: 0800 -CONSTANT: GL_EXP2 HEX: 0801 +CONSTANT: GL_FOG 0x0B60 +CONSTANT: GL_FOG_MODE 0x0B65 +CONSTANT: GL_FOG_DENSITY 0x0B62 +CONSTANT: GL_FOG_COLOR 0x0B66 +CONSTANT: GL_FOG_INDEX 0x0B61 +CONSTANT: GL_FOG_START 0x0B63 +CONSTANT: GL_FOG_END 0x0B64 +CONSTANT: GL_LINEAR 0x2601 +CONSTANT: GL_EXP 0x0800 +CONSTANT: GL_EXP2 0x0801 ! Logic Ops -CONSTANT: GL_LOGIC_OP HEX: 0BF1 -CONSTANT: GL_INDEX_LOGIC_OP HEX: 0BF1 -CONSTANT: GL_COLOR_LOGIC_OP HEX: 0BF2 -CONSTANT: GL_LOGIC_OP_MODE HEX: 0BF0 -CONSTANT: GL_CLEAR HEX: 1500 -CONSTANT: GL_SET HEX: 150F -CONSTANT: GL_COPY HEX: 1503 -CONSTANT: GL_COPY_INVERTED HEX: 150C -CONSTANT: GL_NOOP HEX: 1505 -CONSTANT: GL_INVERT HEX: 150A -CONSTANT: GL_AND HEX: 1501 -CONSTANT: GL_NAND HEX: 150E -CONSTANT: GL_OR HEX: 1507 -CONSTANT: GL_NOR HEX: 1508 -CONSTANT: GL_XOR HEX: 1506 -CONSTANT: GL_EQUIV HEX: 1509 -CONSTANT: GL_AND_REVERSE HEX: 1502 -CONSTANT: GL_AND_INVERTED HEX: 1504 -CONSTANT: GL_OR_REVERSE HEX: 150B -CONSTANT: GL_OR_INVERTED HEX: 150D +CONSTANT: GL_LOGIC_OP 0x0BF1 +CONSTANT: GL_INDEX_LOGIC_OP 0x0BF1 +CONSTANT: GL_COLOR_LOGIC_OP 0x0BF2 +CONSTANT: GL_LOGIC_OP_MODE 0x0BF0 +CONSTANT: GL_CLEAR 0x1500 +CONSTANT: GL_SET 0x150F +CONSTANT: GL_COPY 0x1503 +CONSTANT: GL_COPY_INVERTED 0x150C +CONSTANT: GL_NOOP 0x1505 +CONSTANT: GL_INVERT 0x150A +CONSTANT: GL_AND 0x1501 +CONSTANT: GL_NAND 0x150E +CONSTANT: GL_OR 0x1507 +CONSTANT: GL_NOR 0x1508 +CONSTANT: GL_XOR 0x1506 +CONSTANT: GL_EQUIV 0x1509 +CONSTANT: GL_AND_REVERSE 0x1502 +CONSTANT: GL_AND_INVERTED 0x1504 +CONSTANT: GL_OR_REVERSE 0x150B +CONSTANT: GL_OR_INVERTED 0x150D ! Stencil -CONSTANT: GL_STENCIL_TEST HEX: 0B90 -CONSTANT: GL_STENCIL_WRITEMASK HEX: 0B98 -CONSTANT: GL_STENCIL_BITS HEX: 0D57 -CONSTANT: GL_STENCIL_FUNC HEX: 0B92 -CONSTANT: GL_STENCIL_VALUE_MASK HEX: 0B93 -CONSTANT: GL_STENCIL_REF HEX: 0B97 -CONSTANT: GL_STENCIL_FAIL HEX: 0B94 -CONSTANT: GL_STENCIL_PASS_DEPTH_PASS HEX: 0B96 -CONSTANT: GL_STENCIL_PASS_DEPTH_FAIL HEX: 0B95 -CONSTANT: GL_STENCIL_CLEAR_VALUE HEX: 0B91 -CONSTANT: GL_STENCIL_INDEX HEX: 1901 -CONSTANT: GL_KEEP HEX: 1E00 -CONSTANT: GL_REPLACE HEX: 1E01 -CONSTANT: GL_INCR HEX: 1E02 -CONSTANT: GL_DECR HEX: 1E03 +CONSTANT: GL_STENCIL_TEST 0x0B90 +CONSTANT: GL_STENCIL_WRITEMASK 0x0B98 +CONSTANT: GL_STENCIL_BITS 0x0D57 +CONSTANT: GL_STENCIL_FUNC 0x0B92 +CONSTANT: GL_STENCIL_VALUE_MASK 0x0B93 +CONSTANT: GL_STENCIL_REF 0x0B97 +CONSTANT: GL_STENCIL_FAIL 0x0B94 +CONSTANT: GL_STENCIL_PASS_DEPTH_PASS 0x0B96 +CONSTANT: GL_STENCIL_PASS_DEPTH_FAIL 0x0B95 +CONSTANT: GL_STENCIL_CLEAR_VALUE 0x0B91 +CONSTANT: GL_STENCIL_INDEX 0x1901 +CONSTANT: GL_KEEP 0x1E00 +CONSTANT: GL_REPLACE 0x1E01 +CONSTANT: GL_INCR 0x1E02 +CONSTANT: GL_DECR 0x1E03 ! Buffers, Pixel Drawing/Reading -CONSTANT: GL_NONE HEX: 0 -CONSTANT: GL_LEFT HEX: 0406 -CONSTANT: GL_RIGHT HEX: 0407 -CONSTANT: GL_FRONT_LEFT HEX: 0400 -CONSTANT: GL_FRONT_RIGHT HEX: 0401 -CONSTANT: GL_BACK_LEFT HEX: 0402 -CONSTANT: GL_BACK_RIGHT HEX: 0403 -CONSTANT: GL_AUX0 HEX: 0409 -CONSTANT: GL_AUX1 HEX: 040A -CONSTANT: GL_AUX2 HEX: 040B -CONSTANT: GL_AUX3 HEX: 040C -CONSTANT: GL_COLOR_INDEX HEX: 1900 -CONSTANT: GL_RED HEX: 1903 -CONSTANT: GL_GREEN HEX: 1904 -CONSTANT: GL_BLUE HEX: 1905 -CONSTANT: GL_ALPHA HEX: 1906 -CONSTANT: GL_LUMINANCE HEX: 1909 -CONSTANT: GL_LUMINANCE_ALPHA HEX: 190A -CONSTANT: GL_ALPHA_BITS HEX: 0D55 -CONSTANT: GL_RED_BITS HEX: 0D52 -CONSTANT: GL_GREEN_BITS HEX: 0D53 -CONSTANT: GL_BLUE_BITS HEX: 0D54 -CONSTANT: GL_INDEX_BITS HEX: 0D51 -CONSTANT: GL_SUBPIXEL_BITS HEX: 0D50 -CONSTANT: GL_AUX_BUFFERS HEX: 0C00 -CONSTANT: GL_READ_BUFFER HEX: 0C02 -CONSTANT: GL_DRAW_BUFFER HEX: 0C01 -CONSTANT: GL_DOUBLEBUFFER HEX: 0C32 -CONSTANT: GL_STEREO HEX: 0C33 -CONSTANT: GL_BITMAP HEX: 1A00 -CONSTANT: GL_COLOR HEX: 1800 -CONSTANT: GL_DEPTH HEX: 1801 -CONSTANT: GL_STENCIL HEX: 1802 -CONSTANT: GL_DITHER HEX: 0BD0 -CONSTANT: GL_RGB HEX: 1907 -CONSTANT: GL_RGBA HEX: 1908 +CONSTANT: GL_NONE 0x0 +CONSTANT: GL_LEFT 0x0406 +CONSTANT: GL_RIGHT 0x0407 +CONSTANT: GL_FRONT_LEFT 0x0400 +CONSTANT: GL_FRONT_RIGHT 0x0401 +CONSTANT: GL_BACK_LEFT 0x0402 +CONSTANT: GL_BACK_RIGHT 0x0403 +CONSTANT: GL_AUX0 0x0409 +CONSTANT: GL_AUX1 0x040A +CONSTANT: GL_AUX2 0x040B +CONSTANT: GL_AUX3 0x040C +CONSTANT: GL_COLOR_INDEX 0x1900 +CONSTANT: GL_RED 0x1903 +CONSTANT: GL_GREEN 0x1904 +CONSTANT: GL_BLUE 0x1905 +CONSTANT: GL_ALPHA 0x1906 +CONSTANT: GL_LUMINANCE 0x1909 +CONSTANT: GL_LUMINANCE_ALPHA 0x190A +CONSTANT: GL_ALPHA_BITS 0x0D55 +CONSTANT: GL_RED_BITS 0x0D52 +CONSTANT: GL_GREEN_BITS 0x0D53 +CONSTANT: GL_BLUE_BITS 0x0D54 +CONSTANT: GL_INDEX_BITS 0x0D51 +CONSTANT: GL_SUBPIXEL_BITS 0x0D50 +CONSTANT: GL_AUX_BUFFERS 0x0C00 +CONSTANT: GL_READ_BUFFER 0x0C02 +CONSTANT: GL_DRAW_BUFFER 0x0C01 +CONSTANT: GL_DOUBLEBUFFER 0x0C32 +CONSTANT: GL_STEREO 0x0C33 +CONSTANT: GL_BITMAP 0x1A00 +CONSTANT: GL_COLOR 0x1800 +CONSTANT: GL_DEPTH 0x1801 +CONSTANT: GL_STENCIL 0x1802 +CONSTANT: GL_DITHER 0x0BD0 +CONSTANT: GL_RGB 0x1907 +CONSTANT: GL_RGBA 0x1908 ! Implementation limits -CONSTANT: GL_MAX_LIST_NESTING HEX: 0B31 -CONSTANT: GL_MAX_ATTRIB_STACK_DEPTH HEX: 0D35 -CONSTANT: GL_MAX_MODELVIEW_STACK_DEPTH HEX: 0D36 -CONSTANT: GL_MAX_NAME_STACK_DEPTH HEX: 0D37 -CONSTANT: GL_MAX_PROJECTION_STACK_DEPTH HEX: 0D38 -CONSTANT: GL_MAX_TEXTURE_STACK_DEPTH HEX: 0D39 -CONSTANT: GL_MAX_EVAL_ORDER HEX: 0D30 -CONSTANT: GL_MAX_LIGHTS HEX: 0D31 -CONSTANT: GL_MAX_CLIP_PLANES HEX: 0D32 -CONSTANT: GL_MAX_TEXTURE_SIZE HEX: 0D33 -CONSTANT: GL_MAX_PIXEL_MAP_TABLE HEX: 0D34 -CONSTANT: GL_MAX_VIEWPORT_DIMS HEX: 0D3A -CONSTANT: GL_MAX_CLIENT_ATTRIB_STACK_DEPTH HEX: 0D3B +CONSTANT: GL_MAX_LIST_NESTING 0x0B31 +CONSTANT: GL_MAX_ATTRIB_STACK_DEPTH 0x0D35 +CONSTANT: GL_MAX_MODELVIEW_STACK_DEPTH 0x0D36 +CONSTANT: GL_MAX_NAME_STACK_DEPTH 0x0D37 +CONSTANT: GL_MAX_PROJECTION_STACK_DEPTH 0x0D38 +CONSTANT: GL_MAX_TEXTURE_STACK_DEPTH 0x0D39 +CONSTANT: GL_MAX_EVAL_ORDER 0x0D30 +CONSTANT: GL_MAX_LIGHTS 0x0D31 +CONSTANT: GL_MAX_CLIP_PLANES 0x0D32 +CONSTANT: GL_MAX_TEXTURE_SIZE 0x0D33 +CONSTANT: GL_MAX_PIXEL_MAP_TABLE 0x0D34 +CONSTANT: GL_MAX_VIEWPORT_DIMS 0x0D3A +CONSTANT: GL_MAX_CLIENT_ATTRIB_STACK_DEPTH 0x0D3B ! Gets -CONSTANT: GL_ATTRIB_STACK_DEPTH HEX: 0BB0 -CONSTANT: GL_CLIENT_ATTRIB_STACK_DEPTH HEX: 0BB1 -CONSTANT: GL_COLOR_CLEAR_VALUE HEX: 0C22 -CONSTANT: GL_COLOR_WRITEMASK HEX: 0C23 -CONSTANT: GL_CURRENT_INDEX HEX: 0B01 -CONSTANT: GL_CURRENT_COLOR HEX: 0B00 -CONSTANT: GL_CURRENT_NORMAL HEX: 0B02 -CONSTANT: GL_CURRENT_RASTER_COLOR HEX: 0B04 -CONSTANT: GL_CURRENT_RASTER_DISTANCE HEX: 0B09 -CONSTANT: GL_CURRENT_RASTER_INDEX HEX: 0B05 -CONSTANT: GL_CURRENT_RASTER_POSITION HEX: 0B07 -CONSTANT: GL_CURRENT_RASTER_TEXTURE_COORDS HEX: 0B06 -CONSTANT: GL_CURRENT_RASTER_POSITION_VALID HEX: 0B08 -CONSTANT: GL_CURRENT_TEXTURE_COORDS HEX: 0B03 -CONSTANT: GL_INDEX_CLEAR_VALUE HEX: 0C20 -CONSTANT: GL_INDEX_MODE HEX: 0C30 -CONSTANT: GL_INDEX_WRITEMASK HEX: 0C21 -CONSTANT: GL_MODELVIEW_MATRIX HEX: 0BA6 -CONSTANT: GL_MODELVIEW_STACK_DEPTH HEX: 0BA3 -CONSTANT: GL_NAME_STACK_DEPTH HEX: 0D70 -CONSTANT: GL_PROJECTION_MATRIX HEX: 0BA7 -CONSTANT: GL_PROJECTION_STACK_DEPTH HEX: 0BA4 -CONSTANT: GL_RENDER_MODE HEX: 0C40 -CONSTANT: GL_RGBA_MODE HEX: 0C31 -CONSTANT: GL_TEXTURE_MATRIX HEX: 0BA8 -CONSTANT: GL_TEXTURE_STACK_DEPTH HEX: 0BA5 -CONSTANT: GL_VIEWPORT HEX: 0BA2 +CONSTANT: GL_ATTRIB_STACK_DEPTH 0x0BB0 +CONSTANT: GL_CLIENT_ATTRIB_STACK_DEPTH 0x0BB1 +CONSTANT: GL_COLOR_CLEAR_VALUE 0x0C22 +CONSTANT: GL_COLOR_WRITEMASK 0x0C23 +CONSTANT: GL_CURRENT_INDEX 0x0B01 +CONSTANT: GL_CURRENT_COLOR 0x0B00 +CONSTANT: GL_CURRENT_NORMAL 0x0B02 +CONSTANT: GL_CURRENT_RASTER_COLOR 0x0B04 +CONSTANT: GL_CURRENT_RASTER_DISTANCE 0x0B09 +CONSTANT: GL_CURRENT_RASTER_INDEX 0x0B05 +CONSTANT: GL_CURRENT_RASTER_POSITION 0x0B07 +CONSTANT: GL_CURRENT_RASTER_TEXTURE_COORDS 0x0B06 +CONSTANT: GL_CURRENT_RASTER_POSITION_VALID 0x0B08 +CONSTANT: GL_CURRENT_TEXTURE_COORDS 0x0B03 +CONSTANT: GL_INDEX_CLEAR_VALUE 0x0C20 +CONSTANT: GL_INDEX_MODE 0x0C30 +CONSTANT: GL_INDEX_WRITEMASK 0x0C21 +CONSTANT: GL_MODELVIEW_MATRIX 0x0BA6 +CONSTANT: GL_MODELVIEW_STACK_DEPTH 0x0BA3 +CONSTANT: GL_NAME_STACK_DEPTH 0x0D70 +CONSTANT: GL_PROJECTION_MATRIX 0x0BA7 +CONSTANT: GL_PROJECTION_STACK_DEPTH 0x0BA4 +CONSTANT: GL_RENDER_MODE 0x0C40 +CONSTANT: GL_RGBA_MODE 0x0C31 +CONSTANT: GL_TEXTURE_MATRIX 0x0BA8 +CONSTANT: GL_TEXTURE_STACK_DEPTH 0x0BA5 +CONSTANT: GL_VIEWPORT 0x0BA2 ! Evaluators inline -CONSTANT: GL_AUTO_NORMAL HEX: 0D80 -CONSTANT: GL_MAP1_COLOR_4 HEX: 0D90 -CONSTANT: GL_MAP1_INDEX HEX: 0D91 -CONSTANT: GL_MAP1_NORMAL HEX: 0D92 -CONSTANT: GL_MAP1_TEXTURE_COORD_1 HEX: 0D93 -CONSTANT: GL_MAP1_TEXTURE_COORD_2 HEX: 0D94 -CONSTANT: GL_MAP1_TEXTURE_COORD_3 HEX: 0D95 -CONSTANT: GL_MAP1_TEXTURE_COORD_4 HEX: 0D96 -CONSTANT: GL_MAP1_VERTEX_3 HEX: 0D97 -CONSTANT: GL_MAP1_VERTEX_4 HEX: 0D98 -CONSTANT: GL_MAP2_COLOR_4 HEX: 0DB0 -CONSTANT: GL_MAP2_INDEX HEX: 0DB1 -CONSTANT: GL_MAP2_NORMAL HEX: 0DB2 -CONSTANT: GL_MAP2_TEXTURE_COORD_1 HEX: 0DB3 -CONSTANT: GL_MAP2_TEXTURE_COORD_2 HEX: 0DB4 -CONSTANT: GL_MAP2_TEXTURE_COORD_3 HEX: 0DB5 -CONSTANT: GL_MAP2_TEXTURE_COORD_4 HEX: 0DB6 -CONSTANT: GL_MAP2_VERTEX_3 HEX: 0DB7 -CONSTANT: GL_MAP2_VERTEX_4 HEX: 0DB8 -CONSTANT: GL_MAP1_GRID_DOMAIN HEX: 0DD0 -CONSTANT: GL_MAP1_GRID_SEGMENTS HEX: 0DD1 -CONSTANT: GL_MAP2_GRID_DOMAIN HEX: 0DD2 -CONSTANT: GL_MAP2_GRID_SEGMENTS HEX: 0DD3 -CONSTANT: GL_COEFF HEX: 0A00 -CONSTANT: GL_DOMAIN HEX: 0A02 -CONSTANT: GL_ORDER HEX: 0A01 +CONSTANT: GL_AUTO_NORMAL 0x0D80 +CONSTANT: GL_MAP1_COLOR_4 0x0D90 +CONSTANT: GL_MAP1_INDEX 0x0D91 +CONSTANT: GL_MAP1_NORMAL 0x0D92 +CONSTANT: GL_MAP1_TEXTURE_COORD_1 0x0D93 +CONSTANT: GL_MAP1_TEXTURE_COORD_2 0x0D94 +CONSTANT: GL_MAP1_TEXTURE_COORD_3 0x0D95 +CONSTANT: GL_MAP1_TEXTURE_COORD_4 0x0D96 +CONSTANT: GL_MAP1_VERTEX_3 0x0D97 +CONSTANT: GL_MAP1_VERTEX_4 0x0D98 +CONSTANT: GL_MAP2_COLOR_4 0x0DB0 +CONSTANT: GL_MAP2_INDEX 0x0DB1 +CONSTANT: GL_MAP2_NORMAL 0x0DB2 +CONSTANT: GL_MAP2_TEXTURE_COORD_1 0x0DB3 +CONSTANT: GL_MAP2_TEXTURE_COORD_2 0x0DB4 +CONSTANT: GL_MAP2_TEXTURE_COORD_3 0x0DB5 +CONSTANT: GL_MAP2_TEXTURE_COORD_4 0x0DB6 +CONSTANT: GL_MAP2_VERTEX_3 0x0DB7 +CONSTANT: GL_MAP2_VERTEX_4 0x0DB8 +CONSTANT: GL_MAP1_GRID_DOMAIN 0x0DD0 +CONSTANT: GL_MAP1_GRID_SEGMENTS 0x0DD1 +CONSTANT: GL_MAP2_GRID_DOMAIN 0x0DD2 +CONSTANT: GL_MAP2_GRID_SEGMENTS 0x0DD3 +CONSTANT: GL_COEFF 0x0A00 +CONSTANT: GL_DOMAIN 0x0A02 +CONSTANT: GL_ORDER 0x0A01 ! Hints inline -CONSTANT: GL_FOG_HINT HEX: 0C54 -CONSTANT: GL_LINE_SMOOTH_HINT HEX: 0C52 -CONSTANT: GL_PERSPECTIVE_CORRECTION_HINT HEX: 0C50 -CONSTANT: GL_POINT_SMOOTH_HINT HEX: 0C51 -CONSTANT: GL_POLYGON_SMOOTH_HINT HEX: 0C53 -CONSTANT: GL_DONT_CARE HEX: 1100 -CONSTANT: GL_FASTEST HEX: 1101 -CONSTANT: GL_NICEST HEX: 1102 +CONSTANT: GL_FOG_HINT 0x0C54 +CONSTANT: GL_LINE_SMOOTH_HINT 0x0C52 +CONSTANT: GL_PERSPECTIVE_CORRECTION_HINT 0x0C50 +CONSTANT: GL_POINT_SMOOTH_HINT 0x0C51 +CONSTANT: GL_POLYGON_SMOOTH_HINT 0x0C53 +CONSTANT: GL_DONT_CARE 0x1100 +CONSTANT: GL_FASTEST 0x1101 +CONSTANT: GL_NICEST 0x1102 ! Scissor box inline -CONSTANT: GL_SCISSOR_TEST HEX: 0C11 -CONSTANT: GL_SCISSOR_BOX HEX: 0C10 +CONSTANT: GL_SCISSOR_TEST 0x0C11 +CONSTANT: GL_SCISSOR_BOX 0x0C10 ! Pixel Mode / Transfer inline -CONSTANT: GL_MAP_COLOR HEX: 0D10 -CONSTANT: GL_MAP_STENCIL HEX: 0D11 -CONSTANT: GL_INDEX_SHIFT HEX: 0D12 -CONSTANT: GL_INDEX_OFFSET HEX: 0D13 -CONSTANT: GL_RED_SCALE HEX: 0D14 -CONSTANT: GL_RED_BIAS HEX: 0D15 -CONSTANT: GL_GREEN_SCALE HEX: 0D18 -CONSTANT: GL_GREEN_BIAS HEX: 0D19 -CONSTANT: GL_BLUE_SCALE HEX: 0D1A -CONSTANT: GL_BLUE_BIAS HEX: 0D1B -CONSTANT: GL_ALPHA_SCALE HEX: 0D1C -CONSTANT: GL_ALPHA_BIAS HEX: 0D1D -CONSTANT: GL_DEPTH_SCALE HEX: 0D1E -CONSTANT: GL_DEPTH_BIAS HEX: 0D1F -CONSTANT: GL_PIXEL_MAP_S_TO_S_SIZE HEX: 0CB1 -CONSTANT: GL_PIXEL_MAP_I_TO_I_SIZE HEX: 0CB0 -CONSTANT: GL_PIXEL_MAP_I_TO_R_SIZE HEX: 0CB2 -CONSTANT: GL_PIXEL_MAP_I_TO_G_SIZE HEX: 0CB3 -CONSTANT: GL_PIXEL_MAP_I_TO_B_SIZE HEX: 0CB4 -CONSTANT: GL_PIXEL_MAP_I_TO_A_SIZE HEX: 0CB5 -CONSTANT: GL_PIXEL_MAP_R_TO_R_SIZE HEX: 0CB6 -CONSTANT: GL_PIXEL_MAP_G_TO_G_SIZE HEX: 0CB7 -CONSTANT: GL_PIXEL_MAP_B_TO_B_SIZE HEX: 0CB8 -CONSTANT: GL_PIXEL_MAP_A_TO_A_SIZE HEX: 0CB9 -CONSTANT: GL_PIXEL_MAP_S_TO_S HEX: 0C71 -CONSTANT: GL_PIXEL_MAP_I_TO_I HEX: 0C70 -CONSTANT: GL_PIXEL_MAP_I_TO_R HEX: 0C72 -CONSTANT: GL_PIXEL_MAP_I_TO_G HEX: 0C73 -CONSTANT: GL_PIXEL_MAP_I_TO_B HEX: 0C74 -CONSTANT: GL_PIXEL_MAP_I_TO_A HEX: 0C75 -CONSTANT: GL_PIXEL_MAP_R_TO_R HEX: 0C76 -CONSTANT: GL_PIXEL_MAP_G_TO_G HEX: 0C77 -CONSTANT: GL_PIXEL_MAP_B_TO_B HEX: 0C78 -CONSTANT: GL_PIXEL_MAP_A_TO_A HEX: 0C79 -CONSTANT: GL_PACK_ALIGNMENT HEX: 0D05 -CONSTANT: GL_PACK_LSB_FIRST HEX: 0D01 -CONSTANT: GL_PACK_ROW_LENGTH HEX: 0D02 -CONSTANT: GL_PACK_SKIP_PIXELS HEX: 0D04 -CONSTANT: GL_PACK_SKIP_ROWS HEX: 0D03 -CONSTANT: GL_PACK_SWAP_BYTES HEX: 0D00 -CONSTANT: GL_UNPACK_ALIGNMENT HEX: 0CF5 -CONSTANT: GL_UNPACK_LSB_FIRST HEX: 0CF1 -CONSTANT: GL_UNPACK_ROW_LENGTH HEX: 0CF2 -CONSTANT: GL_UNPACK_SKIP_PIXELS HEX: 0CF4 -CONSTANT: GL_UNPACK_SKIP_ROWS HEX: 0CF3 -CONSTANT: GL_UNPACK_SWAP_BYTES HEX: 0CF0 -CONSTANT: GL_ZOOM_X HEX: 0D16 -CONSTANT: GL_ZOOM_Y HEX: 0D17 +CONSTANT: GL_MAP_COLOR 0x0D10 +CONSTANT: GL_MAP_STENCIL 0x0D11 +CONSTANT: GL_INDEX_SHIFT 0x0D12 +CONSTANT: GL_INDEX_OFFSET 0x0D13 +CONSTANT: GL_RED_SCALE 0x0D14 +CONSTANT: GL_RED_BIAS 0x0D15 +CONSTANT: GL_GREEN_SCALE 0x0D18 +CONSTANT: GL_GREEN_BIAS 0x0D19 +CONSTANT: GL_BLUE_SCALE 0x0D1A +CONSTANT: GL_BLUE_BIAS 0x0D1B +CONSTANT: GL_ALPHA_SCALE 0x0D1C +CONSTANT: GL_ALPHA_BIAS 0x0D1D +CONSTANT: GL_DEPTH_SCALE 0x0D1E +CONSTANT: GL_DEPTH_BIAS 0x0D1F +CONSTANT: GL_PIXEL_MAP_S_TO_S_SIZE 0x0CB1 +CONSTANT: GL_PIXEL_MAP_I_TO_I_SIZE 0x0CB0 +CONSTANT: GL_PIXEL_MAP_I_TO_R_SIZE 0x0CB2 +CONSTANT: GL_PIXEL_MAP_I_TO_G_SIZE 0x0CB3 +CONSTANT: GL_PIXEL_MAP_I_TO_B_SIZE 0x0CB4 +CONSTANT: GL_PIXEL_MAP_I_TO_A_SIZE 0x0CB5 +CONSTANT: GL_PIXEL_MAP_R_TO_R_SIZE 0x0CB6 +CONSTANT: GL_PIXEL_MAP_G_TO_G_SIZE 0x0CB7 +CONSTANT: GL_PIXEL_MAP_B_TO_B_SIZE 0x0CB8 +CONSTANT: GL_PIXEL_MAP_A_TO_A_SIZE 0x0CB9 +CONSTANT: GL_PIXEL_MAP_S_TO_S 0x0C71 +CONSTANT: GL_PIXEL_MAP_I_TO_I 0x0C70 +CONSTANT: GL_PIXEL_MAP_I_TO_R 0x0C72 +CONSTANT: GL_PIXEL_MAP_I_TO_G 0x0C73 +CONSTANT: GL_PIXEL_MAP_I_TO_B 0x0C74 +CONSTANT: GL_PIXEL_MAP_I_TO_A 0x0C75 +CONSTANT: GL_PIXEL_MAP_R_TO_R 0x0C76 +CONSTANT: GL_PIXEL_MAP_G_TO_G 0x0C77 +CONSTANT: GL_PIXEL_MAP_B_TO_B 0x0C78 +CONSTANT: GL_PIXEL_MAP_A_TO_A 0x0C79 +CONSTANT: GL_PACK_ALIGNMENT 0x0D05 +CONSTANT: GL_PACK_LSB_FIRST 0x0D01 +CONSTANT: GL_PACK_ROW_LENGTH 0x0D02 +CONSTANT: GL_PACK_SKIP_PIXELS 0x0D04 +CONSTANT: GL_PACK_SKIP_ROWS 0x0D03 +CONSTANT: GL_PACK_SWAP_BYTES 0x0D00 +CONSTANT: GL_UNPACK_ALIGNMENT 0x0CF5 +CONSTANT: GL_UNPACK_LSB_FIRST 0x0CF1 +CONSTANT: GL_UNPACK_ROW_LENGTH 0x0CF2 +CONSTANT: GL_UNPACK_SKIP_PIXELS 0x0CF4 +CONSTANT: GL_UNPACK_SKIP_ROWS 0x0CF3 +CONSTANT: GL_UNPACK_SWAP_BYTES 0x0CF0 +CONSTANT: GL_ZOOM_X 0x0D16 +CONSTANT: GL_ZOOM_Y 0x0D17 ! Texture mapping inline -CONSTANT: GL_TEXTURE_ENV HEX: 2300 -CONSTANT: GL_TEXTURE_ENV_MODE HEX: 2200 -CONSTANT: GL_TEXTURE_1D HEX: 0DE0 -CONSTANT: GL_TEXTURE_2D HEX: 0DE1 -CONSTANT: GL_TEXTURE_WRAP_S HEX: 2802 -CONSTANT: GL_TEXTURE_WRAP_T HEX: 2803 -CONSTANT: GL_TEXTURE_MAG_FILTER HEX: 2800 -CONSTANT: GL_TEXTURE_MIN_FILTER HEX: 2801 -CONSTANT: GL_TEXTURE_ENV_COLOR HEX: 2201 -CONSTANT: GL_TEXTURE_GEN_S HEX: 0C60 -CONSTANT: GL_TEXTURE_GEN_T HEX: 0C61 -CONSTANT: GL_TEXTURE_GEN_MODE HEX: 2500 -CONSTANT: GL_TEXTURE_BORDER_COLOR HEX: 1004 -CONSTANT: GL_TEXTURE_WIDTH HEX: 1000 -CONSTANT: GL_TEXTURE_HEIGHT HEX: 1001 -CONSTANT: GL_TEXTURE_BORDER HEX: 1005 -CONSTANT: GL_TEXTURE_COMPONENTS HEX: 1003 -CONSTANT: GL_TEXTURE_RED_SIZE HEX: 805C -CONSTANT: GL_TEXTURE_GREEN_SIZE HEX: 805D -CONSTANT: GL_TEXTURE_BLUE_SIZE HEX: 805E -CONSTANT: GL_TEXTURE_ALPHA_SIZE HEX: 805F -CONSTANT: GL_TEXTURE_LUMINANCE_SIZE HEX: 8060 -CONSTANT: GL_TEXTURE_INTENSITY_SIZE HEX: 8061 -CONSTANT: GL_NEAREST_MIPMAP_NEAREST HEX: 2700 -CONSTANT: GL_NEAREST_MIPMAP_LINEAR HEX: 2702 -CONSTANT: GL_LINEAR_MIPMAP_NEAREST HEX: 2701 -CONSTANT: GL_LINEAR_MIPMAP_LINEAR HEX: 2703 -CONSTANT: GL_OBJECT_LINEAR HEX: 2401 -CONSTANT: GL_OBJECT_PLANE HEX: 2501 -CONSTANT: GL_EYE_LINEAR HEX: 2400 -CONSTANT: GL_EYE_PLANE HEX: 2502 -CONSTANT: GL_SPHERE_MAP HEX: 2402 -CONSTANT: GL_DECAL HEX: 2101 -CONSTANT: GL_MODULATE HEX: 2100 -CONSTANT: GL_NEAREST HEX: 2600 -CONSTANT: GL_REPEAT HEX: 2901 -CONSTANT: GL_CLAMP HEX: 2900 -CONSTANT: GL_S HEX: 2000 -CONSTANT: GL_T HEX: 2001 -CONSTANT: GL_R HEX: 2002 -CONSTANT: GL_Q HEX: 2003 -CONSTANT: GL_TEXTURE_GEN_R HEX: 0C62 -CONSTANT: GL_TEXTURE_GEN_Q HEX: 0C63 +CONSTANT: GL_TEXTURE_ENV 0x2300 +CONSTANT: GL_TEXTURE_ENV_MODE 0x2200 +CONSTANT: GL_TEXTURE_1D 0x0DE0 +CONSTANT: GL_TEXTURE_2D 0x0DE1 +CONSTANT: GL_TEXTURE_WRAP_S 0x2802 +CONSTANT: GL_TEXTURE_WRAP_T 0x2803 +CONSTANT: GL_TEXTURE_MAG_FILTER 0x2800 +CONSTANT: GL_TEXTURE_MIN_FILTER 0x2801 +CONSTANT: GL_TEXTURE_ENV_COLOR 0x2201 +CONSTANT: GL_TEXTURE_GEN_S 0x0C60 +CONSTANT: GL_TEXTURE_GEN_T 0x0C61 +CONSTANT: GL_TEXTURE_GEN_MODE 0x2500 +CONSTANT: GL_TEXTURE_BORDER_COLOR 0x1004 +CONSTANT: GL_TEXTURE_WIDTH 0x1000 +CONSTANT: GL_TEXTURE_HEIGHT 0x1001 +CONSTANT: GL_TEXTURE_BORDER 0x1005 +CONSTANT: GL_TEXTURE_COMPONENTS 0x1003 +CONSTANT: GL_TEXTURE_RED_SIZE 0x805C +CONSTANT: GL_TEXTURE_GREEN_SIZE 0x805D +CONSTANT: GL_TEXTURE_BLUE_SIZE 0x805E +CONSTANT: GL_TEXTURE_ALPHA_SIZE 0x805F +CONSTANT: GL_TEXTURE_LUMINANCE_SIZE 0x8060 +CONSTANT: GL_TEXTURE_INTENSITY_SIZE 0x8061 +CONSTANT: GL_NEAREST_MIPMAP_NEAREST 0x2700 +CONSTANT: GL_NEAREST_MIPMAP_LINEAR 0x2702 +CONSTANT: GL_LINEAR_MIPMAP_NEAREST 0x2701 +CONSTANT: GL_LINEAR_MIPMAP_LINEAR 0x2703 +CONSTANT: GL_OBJECT_LINEAR 0x2401 +CONSTANT: GL_OBJECT_PLANE 0x2501 +CONSTANT: GL_EYE_LINEAR 0x2400 +CONSTANT: GL_EYE_PLANE 0x2502 +CONSTANT: GL_SPHERE_MAP 0x2402 +CONSTANT: GL_DECAL 0x2101 +CONSTANT: GL_MODULATE 0x2100 +CONSTANT: GL_NEAREST 0x2600 +CONSTANT: GL_REPEAT 0x2901 +CONSTANT: GL_CLAMP 0x2900 +CONSTANT: GL_S 0x2000 +CONSTANT: GL_T 0x2001 +CONSTANT: GL_R 0x2002 +CONSTANT: GL_Q 0x2003 +CONSTANT: GL_TEXTURE_GEN_R 0x0C62 +CONSTANT: GL_TEXTURE_GEN_Q 0x0C63 ! Utility inline -CONSTANT: GL_VENDOR HEX: 1F00 -CONSTANT: GL_RENDERER HEX: 1F01 -CONSTANT: GL_VERSION HEX: 1F02 -CONSTANT: GL_EXTENSIONS HEX: 1F03 +CONSTANT: GL_VENDOR 0x1F00 +CONSTANT: GL_RENDERER 0x1F01 +CONSTANT: GL_VERSION 0x1F02 +CONSTANT: GL_EXTENSIONS 0x1F03 ! Errors inline -CONSTANT: GL_NO_ERROR HEX: 0 -CONSTANT: GL_INVALID_VALUE HEX: 0501 -CONSTANT: GL_INVALID_ENUM HEX: 0500 -CONSTANT: GL_INVALID_OPERATION HEX: 0502 -CONSTANT: GL_STACK_OVERFLOW HEX: 0503 -CONSTANT: GL_STACK_UNDERFLOW HEX: 0504 -CONSTANT: GL_OUT_OF_MEMORY HEX: 0505 +CONSTANT: GL_NO_ERROR 0x0 +CONSTANT: GL_INVALID_VALUE 0x0501 +CONSTANT: GL_INVALID_ENUM 0x0500 +CONSTANT: GL_INVALID_OPERATION 0x0502 +CONSTANT: GL_STACK_OVERFLOW 0x0503 +CONSTANT: GL_STACK_UNDERFLOW 0x0504 +CONSTANT: GL_OUT_OF_MEMORY 0x0505 ! glPush/PopAttrib bits -CONSTANT: GL_CURRENT_BIT HEX: 00000001 -CONSTANT: GL_POINT_BIT HEX: 00000002 -CONSTANT: GL_LINE_BIT HEX: 00000004 -CONSTANT: GL_POLYGON_BIT HEX: 00000008 -CONSTANT: GL_POLYGON_STIPPLE_BIT HEX: 00000010 -CONSTANT: GL_PIXEL_MODE_BIT HEX: 00000020 -CONSTANT: GL_LIGHTING_BIT HEX: 00000040 -CONSTANT: GL_FOG_BIT HEX: 00000080 -CONSTANT: GL_DEPTH_BUFFER_BIT HEX: 00000100 -CONSTANT: GL_ACCUM_BUFFER_BIT HEX: 00000200 -CONSTANT: GL_STENCIL_BUFFER_BIT HEX: 00000400 -CONSTANT: GL_VIEWPORT_BIT HEX: 00000800 -CONSTANT: GL_TRANSFORM_BIT HEX: 00001000 -CONSTANT: GL_ENABLE_BIT HEX: 00002000 -CONSTANT: GL_COLOR_BUFFER_BIT HEX: 00004000 -CONSTANT: GL_HINT_BIT HEX: 00008000 -CONSTANT: GL_EVAL_BIT HEX: 00010000 -CONSTANT: GL_LIST_BIT HEX: 00020000 -CONSTANT: GL_TEXTURE_BIT HEX: 00040000 -CONSTANT: GL_SCISSOR_BIT HEX: 00080000 -CONSTANT: GL_ALL_ATTRIB_BITS HEX: 000FFFFF +CONSTANT: GL_CURRENT_BIT 0x00000001 +CONSTANT: GL_POINT_BIT 0x00000002 +CONSTANT: GL_LINE_BIT 0x00000004 +CONSTANT: GL_POLYGON_BIT 0x00000008 +CONSTANT: GL_POLYGON_STIPPLE_BIT 0x00000010 +CONSTANT: GL_PIXEL_MODE_BIT 0x00000020 +CONSTANT: GL_LIGHTING_BIT 0x00000040 +CONSTANT: GL_FOG_BIT 0x00000080 +CONSTANT: GL_DEPTH_BUFFER_BIT 0x00000100 +CONSTANT: GL_ACCUM_BUFFER_BIT 0x00000200 +CONSTANT: GL_STENCIL_BUFFER_BIT 0x00000400 +CONSTANT: GL_VIEWPORT_BIT 0x00000800 +CONSTANT: GL_TRANSFORM_BIT 0x00001000 +CONSTANT: GL_ENABLE_BIT 0x00002000 +CONSTANT: GL_COLOR_BUFFER_BIT 0x00004000 +CONSTANT: GL_HINT_BIT 0x00008000 +CONSTANT: GL_EVAL_BIT 0x00010000 +CONSTANT: GL_LIST_BIT 0x00020000 +CONSTANT: GL_TEXTURE_BIT 0x00040000 +CONSTANT: GL_SCISSOR_BIT 0x00080000 +CONSTANT: GL_ALL_ATTRIB_BITS 0x000FFFFF ! OpenGL 1.1 -CONSTANT: GL_PROXY_TEXTURE_1D HEX: 8063 -CONSTANT: GL_PROXY_TEXTURE_2D HEX: 8064 -CONSTANT: GL_TEXTURE_PRIORITY HEX: 8066 -CONSTANT: GL_TEXTURE_RESIDENT HEX: 8067 -CONSTANT: GL_TEXTURE_BINDING_1D HEX: 8068 -CONSTANT: GL_TEXTURE_BINDING_2D HEX: 8069 -CONSTANT: GL_TEXTURE_INTERNAL_FORMAT HEX: 1003 -CONSTANT: GL_ALPHA4 HEX: 803B -CONSTANT: GL_ALPHA8 HEX: 803C -CONSTANT: GL_ALPHA12 HEX: 803D -CONSTANT: GL_ALPHA16 HEX: 803E -CONSTANT: GL_LUMINANCE4 HEX: 803F -CONSTANT: GL_LUMINANCE8 HEX: 8040 -CONSTANT: GL_LUMINANCE12 HEX: 8041 -CONSTANT: GL_LUMINANCE16 HEX: 8042 -CONSTANT: GL_LUMINANCE4_ALPHA4 HEX: 8043 -CONSTANT: GL_LUMINANCE6_ALPHA2 HEX: 8044 -CONSTANT: GL_LUMINANCE8_ALPHA8 HEX: 8045 -CONSTANT: GL_LUMINANCE12_ALPHA4 HEX: 8046 -CONSTANT: GL_LUMINANCE12_ALPHA12 HEX: 8047 -CONSTANT: GL_LUMINANCE16_ALPHA16 HEX: 8048 -CONSTANT: GL_INTENSITY HEX: 8049 -CONSTANT: GL_INTENSITY4 HEX: 804A -CONSTANT: GL_INTENSITY8 HEX: 804B -CONSTANT: GL_INTENSITY12 HEX: 804C -CONSTANT: GL_INTENSITY16 HEX: 804D -CONSTANT: GL_R3_G3_B2 HEX: 2A10 -CONSTANT: GL_RGB4 HEX: 804F -CONSTANT: GL_RGB5 HEX: 8050 -CONSTANT: GL_RGB8 HEX: 8051 -CONSTANT: GL_RGB10 HEX: 8052 -CONSTANT: GL_RGB12 HEX: 8053 -CONSTANT: GL_RGB16 HEX: 8054 -CONSTANT: GL_RGBA2 HEX: 8055 -CONSTANT: GL_RGBA4 HEX: 8056 -CONSTANT: GL_RGB5_A1 HEX: 8057 -CONSTANT: GL_RGBA8 HEX: 8058 -CONSTANT: GL_RGB10_A2 HEX: 8059 -CONSTANT: GL_RGBA12 HEX: 805A -CONSTANT: GL_RGBA16 HEX: 805B -CONSTANT: GL_CLIENT_PIXEL_STORE_BIT HEX: 00000001 -CONSTANT: GL_CLIENT_VERTEX_ARRAY_BIT HEX: 00000002 -CONSTANT: GL_ALL_CLIENT_ATTRIB_BITS HEX: FFFFFFFF -CONSTANT: GL_CLIENT_ALL_ATTRIB_BITS HEX: FFFFFFFF +CONSTANT: GL_PROXY_TEXTURE_1D 0x8063 +CONSTANT: GL_PROXY_TEXTURE_2D 0x8064 +CONSTANT: GL_TEXTURE_PRIORITY 0x8066 +CONSTANT: GL_TEXTURE_RESIDENT 0x8067 +CONSTANT: GL_TEXTURE_BINDING_1D 0x8068 +CONSTANT: GL_TEXTURE_BINDING_2D 0x8069 +CONSTANT: GL_TEXTURE_INTERNAL_FORMAT 0x1003 +CONSTANT: GL_ALPHA4 0x803B +CONSTANT: GL_ALPHA8 0x803C +CONSTANT: GL_ALPHA12 0x803D +CONSTANT: GL_ALPHA16 0x803E +CONSTANT: GL_LUMINANCE4 0x803F +CONSTANT: GL_LUMINANCE8 0x8040 +CONSTANT: GL_LUMINANCE12 0x8041 +CONSTANT: GL_LUMINANCE16 0x8042 +CONSTANT: GL_LUMINANCE4_ALPHA4 0x8043 +CONSTANT: GL_LUMINANCE6_ALPHA2 0x8044 +CONSTANT: GL_LUMINANCE8_ALPHA8 0x8045 +CONSTANT: GL_LUMINANCE12_ALPHA4 0x8046 +CONSTANT: GL_LUMINANCE12_ALPHA12 0x8047 +CONSTANT: GL_LUMINANCE16_ALPHA16 0x8048 +CONSTANT: GL_INTENSITY 0x8049 +CONSTANT: GL_INTENSITY4 0x804A +CONSTANT: GL_INTENSITY8 0x804B +CONSTANT: GL_INTENSITY12 0x804C +CONSTANT: GL_INTENSITY16 0x804D +CONSTANT: GL_R3_G3_B2 0x2A10 +CONSTANT: GL_RGB4 0x804F +CONSTANT: GL_RGB5 0x8050 +CONSTANT: GL_RGB8 0x8051 +CONSTANT: GL_RGB10 0x8052 +CONSTANT: GL_RGB12 0x8053 +CONSTANT: GL_RGB16 0x8054 +CONSTANT: GL_RGBA2 0x8055 +CONSTANT: GL_RGBA4 0x8056 +CONSTANT: GL_RGB5_A1 0x8057 +CONSTANT: GL_RGBA8 0x8058 +CONSTANT: GL_RGB10_A2 0x8059 +CONSTANT: GL_RGBA12 0x805A +CONSTANT: GL_RGBA16 0x805B +CONSTANT: GL_CLIENT_PIXEL_STORE_BIT 0x00000001 +CONSTANT: GL_CLIENT_VERTEX_ARRAY_BIT 0x00000002 +CONSTANT: GL_ALL_CLIENT_ATTRIB_BITS 0xFFFFFFFF +CONSTANT: GL_CLIENT_ALL_ATTRIB_BITS 0xFFFFFFFF LIBRARY: gl @@ -1124,47 +1124,47 @@ FUNCTION: void glPopName ( ) ; ! OpenGL 1.2 -CONSTANT: GL_SMOOTH_POINT_SIZE_RANGE HEX: 0B12 -CONSTANT: GL_SMOOTH_POINT_SIZE_GRANULARITY HEX: 0B13 -CONSTANT: GL_SMOOTH_LINE_WIDTH_RANGE HEX: 0B22 -CONSTANT: GL_SMOOTH_LINE_WIDTH_GRANULARITY HEX: 0B23 -CONSTANT: GL_UNSIGNED_BYTE_3_3_2 HEX: 8032 -CONSTANT: GL_UNSIGNED_SHORT_4_4_4_4 HEX: 8033 -CONSTANT: GL_UNSIGNED_SHORT_5_5_5_1 HEX: 8034 -CONSTANT: GL_UNSIGNED_INT_8_8_8_8 HEX: 8035 -CONSTANT: GL_UNSIGNED_INT_10_10_10_2 HEX: 8036 -CONSTANT: GL_RESCALE_NORMAL HEX: 803A -CONSTANT: GL_TEXTURE_BINDING_3D HEX: 806A -CONSTANT: GL_PACK_SKIP_IMAGES HEX: 806B -CONSTANT: GL_PACK_IMAGE_HEIGHT HEX: 806C -CONSTANT: GL_UNPACK_SKIP_IMAGES HEX: 806D -CONSTANT: GL_UNPACK_IMAGE_HEIGHT HEX: 806E -CONSTANT: GL_TEXTURE_3D HEX: 806F -CONSTANT: GL_PROXY_TEXTURE_3D HEX: 8070 -CONSTANT: GL_TEXTURE_DEPTH HEX: 8071 -CONSTANT: GL_TEXTURE_WRAP_R HEX: 8072 -CONSTANT: GL_MAX_3D_TEXTURE_SIZE HEX: 8073 -CONSTANT: GL_BGR HEX: 80E0 -CONSTANT: GL_BGRA HEX: 80E1 -CONSTANT: GL_MAX_ELEMENTS_VERTICES HEX: 80E8 -CONSTANT: GL_MAX_ELEMENTS_INDICES HEX: 80E9 -CONSTANT: GL_CLAMP_TO_EDGE HEX: 812F -CONSTANT: GL_TEXTURE_MIN_LOD HEX: 813A -CONSTANT: GL_TEXTURE_MAX_LOD HEX: 813B -CONSTANT: GL_TEXTURE_BASE_LEVEL HEX: 813C -CONSTANT: GL_TEXTURE_MAX_LEVEL HEX: 813D -CONSTANT: GL_LIGHT_MODEL_COLOR_CONTROL HEX: 81F8 -CONSTANT: GL_SINGLE_COLOR HEX: 81F9 -CONSTANT: GL_SEPARATE_SPECULAR_COLOR HEX: 81FA -CONSTANT: GL_UNSIGNED_BYTE_2_3_3_REV HEX: 8362 -CONSTANT: GL_UNSIGNED_SHORT_5_6_5 HEX: 8363 -CONSTANT: GL_UNSIGNED_SHORT_5_6_5_REV HEX: 8364 -CONSTANT: GL_UNSIGNED_SHORT_4_4_4_4_REV HEX: 8365 -CONSTANT: GL_UNSIGNED_SHORT_1_5_5_5_REV HEX: 8366 -CONSTANT: GL_UNSIGNED_INT_8_8_8_8_REV HEX: 8367 -CONSTANT: GL_UNSIGNED_INT_2_10_10_10_REV HEX: 8368 -CONSTANT: GL_ALIASED_POINT_SIZE_RANGE HEX: 846D -CONSTANT: GL_ALIASED_LINE_WIDTH_RANGE HEX: 846E +CONSTANT: GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 +CONSTANT: GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 +CONSTANT: GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 +CONSTANT: GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 +CONSTANT: GL_UNSIGNED_BYTE_3_3_2 0x8032 +CONSTANT: GL_UNSIGNED_SHORT_4_4_4_4 0x8033 +CONSTANT: GL_UNSIGNED_SHORT_5_5_5_1 0x8034 +CONSTANT: GL_UNSIGNED_INT_8_8_8_8 0x8035 +CONSTANT: GL_UNSIGNED_INT_10_10_10_2 0x8036 +CONSTANT: GL_RESCALE_NORMAL 0x803A +CONSTANT: GL_TEXTURE_BINDING_3D 0x806A +CONSTANT: GL_PACK_SKIP_IMAGES 0x806B +CONSTANT: GL_PACK_IMAGE_HEIGHT 0x806C +CONSTANT: GL_UNPACK_SKIP_IMAGES 0x806D +CONSTANT: GL_UNPACK_IMAGE_HEIGHT 0x806E +CONSTANT: GL_TEXTURE_3D 0x806F +CONSTANT: GL_PROXY_TEXTURE_3D 0x8070 +CONSTANT: GL_TEXTURE_DEPTH 0x8071 +CONSTANT: GL_TEXTURE_WRAP_R 0x8072 +CONSTANT: GL_MAX_3D_TEXTURE_SIZE 0x8073 +CONSTANT: GL_BGR 0x80E0 +CONSTANT: GL_BGRA 0x80E1 +CONSTANT: GL_MAX_ELEMENTS_VERTICES 0x80E8 +CONSTANT: GL_MAX_ELEMENTS_INDICES 0x80E9 +CONSTANT: GL_CLAMP_TO_EDGE 0x812F +CONSTANT: GL_TEXTURE_MIN_LOD 0x813A +CONSTANT: GL_TEXTURE_MAX_LOD 0x813B +CONSTANT: GL_TEXTURE_BASE_LEVEL 0x813C +CONSTANT: GL_TEXTURE_MAX_LEVEL 0x813D +CONSTANT: GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 +CONSTANT: GL_SINGLE_COLOR 0x81F9 +CONSTANT: GL_SEPARATE_SPECULAR_COLOR 0x81FA +CONSTANT: GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 +CONSTANT: GL_UNSIGNED_SHORT_5_6_5 0x8363 +CONSTANT: GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 +CONSTANT: GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 +CONSTANT: GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 +CONSTANT: GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 +CONSTANT: GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 +CONSTANT: GL_ALIASED_POINT_SIZE_RANGE 0x846D +CONSTANT: GL_ALIASED_LINE_WIDTH_RANGE 0x846E GL-FUNCTION: void glCopyTexSubImage3D { glCopyTexSubImage3DEXT } ( GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height ) ; GL-FUNCTION: void glDrawRangeElements { glDrawRangeElementsEXT } ( GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, GLvoid* indices ) ; @@ -1175,118 +1175,118 @@ GL-FUNCTION: void glTexSubImage3D { glTexSubImage3DEXT } ( GLenum target, GLint ! GL_ARB_imaging -CONSTANT: GL_CONSTANT_COLOR HEX: 8001 -CONSTANT: GL_ONE_MINUS_CONSTANT_COLOR HEX: 8002 -CONSTANT: GL_CONSTANT_ALPHA HEX: 8003 -CONSTANT: GL_ONE_MINUS_CONSTANT_ALPHA HEX: 8004 -CONSTANT: GL_BLEND_COLOR HEX: 8005 -CONSTANT: GL_FUNC_ADD HEX: 8006 -CONSTANT: GL_MIN HEX: 8007 -CONSTANT: GL_MAX HEX: 8008 -CONSTANT: GL_BLEND_EQUATION HEX: 8009 -CONSTANT: GL_FUNC_SUBTRACT HEX: 800A -CONSTANT: GL_FUNC_REVERSE_SUBTRACT HEX: 800B +CONSTANT: GL_CONSTANT_COLOR 0x8001 +CONSTANT: GL_ONE_MINUS_CONSTANT_COLOR 0x8002 +CONSTANT: GL_CONSTANT_ALPHA 0x8003 +CONSTANT: GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 +CONSTANT: GL_BLEND_COLOR 0x8005 +CONSTANT: GL_FUNC_ADD 0x8006 +CONSTANT: GL_MIN 0x8007 +CONSTANT: GL_MAX 0x8008 +CONSTANT: GL_BLEND_EQUATION 0x8009 +CONSTANT: GL_FUNC_SUBTRACT 0x800A +CONSTANT: GL_FUNC_REVERSE_SUBTRACT 0x800B ! OpenGL 1.3 -CONSTANT: GL_MULTISAMPLE HEX: 809D -CONSTANT: GL_SAMPLE_ALPHA_TO_COVERAGE HEX: 809E -CONSTANT: GL_SAMPLE_ALPHA_TO_ONE HEX: 809F -CONSTANT: GL_SAMPLE_COVERAGE HEX: 80A0 -CONSTANT: GL_SAMPLE_BUFFERS HEX: 80A8 -CONSTANT: GL_SAMPLES HEX: 80A9 -CONSTANT: GL_SAMPLE_COVERAGE_VALUE HEX: 80AA -CONSTANT: GL_SAMPLE_COVERAGE_INVERT HEX: 80AB -CONSTANT: GL_CLAMP_TO_BORDER HEX: 812D -CONSTANT: GL_TEXTURE0 HEX: 84C0 -CONSTANT: GL_TEXTURE1 HEX: 84C1 -CONSTANT: GL_TEXTURE2 HEX: 84C2 -CONSTANT: GL_TEXTURE3 HEX: 84C3 -CONSTANT: GL_TEXTURE4 HEX: 84C4 -CONSTANT: GL_TEXTURE5 HEX: 84C5 -CONSTANT: GL_TEXTURE6 HEX: 84C6 -CONSTANT: GL_TEXTURE7 HEX: 84C7 -CONSTANT: GL_TEXTURE8 HEX: 84C8 -CONSTANT: GL_TEXTURE9 HEX: 84C9 -CONSTANT: GL_TEXTURE10 HEX: 84CA -CONSTANT: GL_TEXTURE11 HEX: 84CB -CONSTANT: GL_TEXTURE12 HEX: 84CC -CONSTANT: GL_TEXTURE13 HEX: 84CD -CONSTANT: GL_TEXTURE14 HEX: 84CE -CONSTANT: GL_TEXTURE15 HEX: 84CF -CONSTANT: GL_TEXTURE16 HEX: 84D0 -CONSTANT: GL_TEXTURE17 HEX: 84D1 -CONSTANT: GL_TEXTURE18 HEX: 84D2 -CONSTANT: GL_TEXTURE19 HEX: 84D3 -CONSTANT: GL_TEXTURE20 HEX: 84D4 -CONSTANT: GL_TEXTURE21 HEX: 84D5 -CONSTANT: GL_TEXTURE22 HEX: 84D6 -CONSTANT: GL_TEXTURE23 HEX: 84D7 -CONSTANT: GL_TEXTURE24 HEX: 84D8 -CONSTANT: GL_TEXTURE25 HEX: 84D9 -CONSTANT: GL_TEXTURE26 HEX: 84DA -CONSTANT: GL_TEXTURE27 HEX: 84DB -CONSTANT: GL_TEXTURE28 HEX: 84DC -CONSTANT: GL_TEXTURE29 HEX: 84DD -CONSTANT: GL_TEXTURE30 HEX: 84DE -CONSTANT: GL_TEXTURE31 HEX: 84DF -CONSTANT: GL_ACTIVE_TEXTURE HEX: 84E0 -CONSTANT: GL_CLIENT_ACTIVE_TEXTURE HEX: 84E1 -CONSTANT: GL_MAX_TEXTURE_UNITS HEX: 84E2 -CONSTANT: GL_TRANSPOSE_MODELVIEW_MATRIX HEX: 84E3 -CONSTANT: GL_TRANSPOSE_PROJECTION_MATRIX HEX: 84E4 -CONSTANT: GL_TRANSPOSE_TEXTURE_MATRIX HEX: 84E5 -CONSTANT: GL_TRANSPOSE_COLOR_MATRIX HEX: 84E6 -CONSTANT: GL_SUBTRACT HEX: 84E7 -CONSTANT: GL_COMPRESSED_ALPHA HEX: 84E9 -CONSTANT: GL_COMPRESSED_LUMINANCE HEX: 84EA -CONSTANT: GL_COMPRESSED_LUMINANCE_ALPHA HEX: 84EB -CONSTANT: GL_COMPRESSED_INTENSITY HEX: 84EC -CONSTANT: GL_COMPRESSED_RGB HEX: 84ED -CONSTANT: GL_COMPRESSED_RGBA HEX: 84EE -CONSTANT: GL_TEXTURE_COMPRESSION_HINT HEX: 84EF -CONSTANT: GL_NORMAL_MAP HEX: 8511 -CONSTANT: GL_REFLECTION_MAP HEX: 8512 -CONSTANT: GL_TEXTURE_CUBE_MAP HEX: 8513 -CONSTANT: GL_TEXTURE_BINDING_CUBE_MAP HEX: 8514 -CONSTANT: GL_TEXTURE_CUBE_MAP_POSITIVE_X HEX: 8515 -CONSTANT: GL_TEXTURE_CUBE_MAP_NEGATIVE_X HEX: 8516 -CONSTANT: GL_TEXTURE_CUBE_MAP_POSITIVE_Y HEX: 8517 -CONSTANT: GL_TEXTURE_CUBE_MAP_NEGATIVE_Y HEX: 8518 -CONSTANT: GL_TEXTURE_CUBE_MAP_POSITIVE_Z HEX: 8519 -CONSTANT: GL_TEXTURE_CUBE_MAP_NEGATIVE_Z HEX: 851A -CONSTANT: GL_PROXY_TEXTURE_CUBE_MAP HEX: 851B -CONSTANT: GL_MAX_CUBE_MAP_TEXTURE_SIZE HEX: 851C -CONSTANT: GL_COMBINE HEX: 8570 -CONSTANT: GL_COMBINE_RGB HEX: 8571 -CONSTANT: GL_COMBINE_ALPHA HEX: 8572 -CONSTANT: GL_RGB_SCALE HEX: 8573 -CONSTANT: GL_ADD_SIGNED HEX: 8574 -CONSTANT: GL_INTERPOLATE HEX: 8575 -CONSTANT: GL_CONSTANT HEX: 8576 -CONSTANT: GL_PRIMARY_COLOR HEX: 8577 -CONSTANT: GL_PREVIOUS HEX: 8578 -CONSTANT: GL_SOURCE0_RGB HEX: 8580 -CONSTANT: GL_SOURCE1_RGB HEX: 8581 -CONSTANT: GL_SOURCE2_RGB HEX: 8582 -CONSTANT: GL_SOURCE0_ALPHA HEX: 8588 -CONSTANT: GL_SOURCE1_ALPHA HEX: 8589 -CONSTANT: GL_SOURCE2_ALPHA HEX: 858A -CONSTANT: GL_OPERAND0_RGB HEX: 8590 -CONSTANT: GL_OPERAND1_RGB HEX: 8591 -CONSTANT: GL_OPERAND2_RGB HEX: 8592 -CONSTANT: GL_OPERAND0_ALPHA HEX: 8598 -CONSTANT: GL_OPERAND1_ALPHA HEX: 8599 -CONSTANT: GL_OPERAND2_ALPHA HEX: 859A -CONSTANT: GL_TEXTURE_COMPRESSED_IMAGE_SIZE HEX: 86A0 -CONSTANT: GL_TEXTURE_COMPRESSED HEX: 86A1 -CONSTANT: GL_NUM_COMPRESSED_TEXTURE_FORMATS HEX: 86A2 -CONSTANT: GL_COMPRESSED_TEXTURE_FORMATS HEX: 86A3 -CONSTANT: GL_DOT3_RGB HEX: 86AE -CONSTANT: GL_DOT3_RGBA HEX: 86AF -CONSTANT: GL_MULTISAMPLE_BIT HEX: 20000000 +CONSTANT: GL_MULTISAMPLE 0x809D +CONSTANT: GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E +CONSTANT: GL_SAMPLE_ALPHA_TO_ONE 0x809F +CONSTANT: GL_SAMPLE_COVERAGE 0x80A0 +CONSTANT: GL_SAMPLE_BUFFERS 0x80A8 +CONSTANT: GL_SAMPLES 0x80A9 +CONSTANT: GL_SAMPLE_COVERAGE_VALUE 0x80AA +CONSTANT: GL_SAMPLE_COVERAGE_INVERT 0x80AB +CONSTANT: GL_CLAMP_TO_BORDER 0x812D +CONSTANT: GL_TEXTURE0 0x84C0 +CONSTANT: GL_TEXTURE1 0x84C1 +CONSTANT: GL_TEXTURE2 0x84C2 +CONSTANT: GL_TEXTURE3 0x84C3 +CONSTANT: GL_TEXTURE4 0x84C4 +CONSTANT: GL_TEXTURE5 0x84C5 +CONSTANT: GL_TEXTURE6 0x84C6 +CONSTANT: GL_TEXTURE7 0x84C7 +CONSTANT: GL_TEXTURE8 0x84C8 +CONSTANT: GL_TEXTURE9 0x84C9 +CONSTANT: GL_TEXTURE10 0x84CA +CONSTANT: GL_TEXTURE11 0x84CB +CONSTANT: GL_TEXTURE12 0x84CC +CONSTANT: GL_TEXTURE13 0x84CD +CONSTANT: GL_TEXTURE14 0x84CE +CONSTANT: GL_TEXTURE15 0x84CF +CONSTANT: GL_TEXTURE16 0x84D0 +CONSTANT: GL_TEXTURE17 0x84D1 +CONSTANT: GL_TEXTURE18 0x84D2 +CONSTANT: GL_TEXTURE19 0x84D3 +CONSTANT: GL_TEXTURE20 0x84D4 +CONSTANT: GL_TEXTURE21 0x84D5 +CONSTANT: GL_TEXTURE22 0x84D6 +CONSTANT: GL_TEXTURE23 0x84D7 +CONSTANT: GL_TEXTURE24 0x84D8 +CONSTANT: GL_TEXTURE25 0x84D9 +CONSTANT: GL_TEXTURE26 0x84DA +CONSTANT: GL_TEXTURE27 0x84DB +CONSTANT: GL_TEXTURE28 0x84DC +CONSTANT: GL_TEXTURE29 0x84DD +CONSTANT: GL_TEXTURE30 0x84DE +CONSTANT: GL_TEXTURE31 0x84DF +CONSTANT: GL_ACTIVE_TEXTURE 0x84E0 +CONSTANT: GL_CLIENT_ACTIVE_TEXTURE 0x84E1 +CONSTANT: GL_MAX_TEXTURE_UNITS 0x84E2 +CONSTANT: GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 +CONSTANT: GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 +CONSTANT: GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 +CONSTANT: GL_TRANSPOSE_COLOR_MATRIX 0x84E6 +CONSTANT: GL_SUBTRACT 0x84E7 +CONSTANT: GL_COMPRESSED_ALPHA 0x84E9 +CONSTANT: GL_COMPRESSED_LUMINANCE 0x84EA +CONSTANT: GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB +CONSTANT: GL_COMPRESSED_INTENSITY 0x84EC +CONSTANT: GL_COMPRESSED_RGB 0x84ED +CONSTANT: GL_COMPRESSED_RGBA 0x84EE +CONSTANT: GL_TEXTURE_COMPRESSION_HINT 0x84EF +CONSTANT: GL_NORMAL_MAP 0x8511 +CONSTANT: GL_REFLECTION_MAP 0x8512 +CONSTANT: GL_TEXTURE_CUBE_MAP 0x8513 +CONSTANT: GL_TEXTURE_BINDING_CUBE_MAP 0x8514 +CONSTANT: GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 +CONSTANT: GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 +CONSTANT: GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 +CONSTANT: GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 +CONSTANT: GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 +CONSTANT: GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A +CONSTANT: GL_PROXY_TEXTURE_CUBE_MAP 0x851B +CONSTANT: GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C +CONSTANT: GL_COMBINE 0x8570 +CONSTANT: GL_COMBINE_RGB 0x8571 +CONSTANT: GL_COMBINE_ALPHA 0x8572 +CONSTANT: GL_RGB_SCALE 0x8573 +CONSTANT: GL_ADD_SIGNED 0x8574 +CONSTANT: GL_INTERPOLATE 0x8575 +CONSTANT: GL_CONSTANT 0x8576 +CONSTANT: GL_PRIMARY_COLOR 0x8577 +CONSTANT: GL_PREVIOUS 0x8578 +CONSTANT: GL_SOURCE0_RGB 0x8580 +CONSTANT: GL_SOURCE1_RGB 0x8581 +CONSTANT: GL_SOURCE2_RGB 0x8582 +CONSTANT: GL_SOURCE0_ALPHA 0x8588 +CONSTANT: GL_SOURCE1_ALPHA 0x8589 +CONSTANT: GL_SOURCE2_ALPHA 0x858A +CONSTANT: GL_OPERAND0_RGB 0x8590 +CONSTANT: GL_OPERAND1_RGB 0x8591 +CONSTANT: GL_OPERAND2_RGB 0x8592 +CONSTANT: GL_OPERAND0_ALPHA 0x8598 +CONSTANT: GL_OPERAND1_ALPHA 0x8599 +CONSTANT: GL_OPERAND2_ALPHA 0x859A +CONSTANT: GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 +CONSTANT: GL_TEXTURE_COMPRESSED 0x86A1 +CONSTANT: GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 +CONSTANT: GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 +CONSTANT: GL_DOT3_RGB 0x86AE +CONSTANT: GL_DOT3_RGBA 0x86AF +CONSTANT: GL_MULTISAMPLE_BIT 0x20000000 GL-FUNCTION: void glActiveTexture { glActiveTextureARB } ( GLenum texture ) ; GL-FUNCTION: void glClientActiveTexture { glClientActiveTextureARB } ( GLenum texture ) ; @@ -1339,45 +1339,45 @@ GL-FUNCTION: void glSampleCoverage { glSampleCoverageARB } ( GLclampf value, GLb ! OpenGL 1.4 -CONSTANT: GL_BLEND_DST_RGB HEX: 80C8 -CONSTANT: GL_BLEND_SRC_RGB HEX: 80C9 -CONSTANT: GL_BLEND_DST_ALPHA HEX: 80CA -CONSTANT: GL_BLEND_SRC_ALPHA HEX: 80CB -CONSTANT: GL_POINT_SIZE_MIN HEX: 8126 -CONSTANT: GL_POINT_SIZE_MAX HEX: 8127 -CONSTANT: GL_POINT_FADE_THRESHOLD_SIZE HEX: 8128 -CONSTANT: GL_POINT_DISTANCE_ATTENUATION HEX: 8129 -CONSTANT: GL_GENERATE_MIPMAP HEX: 8191 -CONSTANT: GL_GENERATE_MIPMAP_HINT HEX: 8192 -CONSTANT: GL_DEPTH_COMPONENT16 HEX: 81A5 -CONSTANT: GL_DEPTH_COMPONENT24 HEX: 81A6 -CONSTANT: GL_DEPTH_COMPONENT32 HEX: 81A7 -CONSTANT: GL_MIRRORED_REPEAT HEX: 8370 -CONSTANT: GL_FOG_COORDINATE_SOURCE HEX: 8450 -CONSTANT: GL_FOG_COORDINATE HEX: 8451 -CONSTANT: GL_FRAGMENT_DEPTH HEX: 8452 -CONSTANT: GL_CURRENT_FOG_COORDINATE HEX: 8453 -CONSTANT: GL_FOG_COORDINATE_ARRAY_TYPE HEX: 8454 -CONSTANT: GL_FOG_COORDINATE_ARRAY_STRIDE HEX: 8455 -CONSTANT: GL_FOG_COORDINATE_ARRAY_POINTER HEX: 8456 -CONSTANT: GL_FOG_COORDINATE_ARRAY HEX: 8457 -CONSTANT: GL_COLOR_SUM HEX: 8458 -CONSTANT: GL_CURRENT_SECONDARY_COLOR HEX: 8459 -CONSTANT: GL_SECONDARY_COLOR_ARRAY_SIZE HEX: 845A -CONSTANT: GL_SECONDARY_COLOR_ARRAY_TYPE HEX: 845B -CONSTANT: GL_SECONDARY_COLOR_ARRAY_STRIDE HEX: 845C -CONSTANT: GL_SECONDARY_COLOR_ARRAY_POINTER HEX: 845D -CONSTANT: GL_SECONDARY_COLOR_ARRAY HEX: 845E -CONSTANT: GL_MAX_TEXTURE_LOD_BIAS HEX: 84FD -CONSTANT: GL_TEXTURE_FILTER_CONTROL HEX: 8500 -CONSTANT: GL_TEXTURE_LOD_BIAS HEX: 8501 -CONSTANT: GL_INCR_WRAP HEX: 8507 -CONSTANT: GL_DECR_WRAP HEX: 8508 -CONSTANT: GL_TEXTURE_DEPTH_SIZE HEX: 884A -CONSTANT: GL_DEPTH_TEXTURE_MODE HEX: 884B -CONSTANT: GL_TEXTURE_COMPARE_MODE HEX: 884C -CONSTANT: GL_TEXTURE_COMPARE_FUNC HEX: 884D -CONSTANT: GL_COMPARE_R_TO_TEXTURE HEX: 884E +CONSTANT: GL_BLEND_DST_RGB 0x80C8 +CONSTANT: GL_BLEND_SRC_RGB 0x80C9 +CONSTANT: GL_BLEND_DST_ALPHA 0x80CA +CONSTANT: GL_BLEND_SRC_ALPHA 0x80CB +CONSTANT: GL_POINT_SIZE_MIN 0x8126 +CONSTANT: GL_POINT_SIZE_MAX 0x8127 +CONSTANT: GL_POINT_FADE_THRESHOLD_SIZE 0x8128 +CONSTANT: GL_POINT_DISTANCE_ATTENUATION 0x8129 +CONSTANT: GL_GENERATE_MIPMAP 0x8191 +CONSTANT: GL_GENERATE_MIPMAP_HINT 0x8192 +CONSTANT: GL_DEPTH_COMPONENT16 0x81A5 +CONSTANT: GL_DEPTH_COMPONENT24 0x81A6 +CONSTANT: GL_DEPTH_COMPONENT32 0x81A7 +CONSTANT: GL_MIRRORED_REPEAT 0x8370 +CONSTANT: GL_FOG_COORDINATE_SOURCE 0x8450 +CONSTANT: GL_FOG_COORDINATE 0x8451 +CONSTANT: GL_FRAGMENT_DEPTH 0x8452 +CONSTANT: GL_CURRENT_FOG_COORDINATE 0x8453 +CONSTANT: GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 +CONSTANT: GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 +CONSTANT: GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 +CONSTANT: GL_FOG_COORDINATE_ARRAY 0x8457 +CONSTANT: GL_COLOR_SUM 0x8458 +CONSTANT: GL_CURRENT_SECONDARY_COLOR 0x8459 +CONSTANT: GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A +CONSTANT: GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B +CONSTANT: GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C +CONSTANT: GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D +CONSTANT: GL_SECONDARY_COLOR_ARRAY 0x845E +CONSTANT: GL_MAX_TEXTURE_LOD_BIAS 0x84FD +CONSTANT: GL_TEXTURE_FILTER_CONTROL 0x8500 +CONSTANT: GL_TEXTURE_LOD_BIAS 0x8501 +CONSTANT: GL_INCR_WRAP 0x8507 +CONSTANT: GL_DECR_WRAP 0x8508 +CONSTANT: GL_TEXTURE_DEPTH_SIZE 0x884A +CONSTANT: GL_DEPTH_TEXTURE_MODE 0x884B +CONSTANT: GL_TEXTURE_COMPARE_MODE 0x884C +CONSTANT: GL_TEXTURE_COMPARE_FUNC 0x884D +CONSTANT: GL_COMPARE_R_TO_TEXTURE 0x884E GL-FUNCTION: void glBlendColor { glBlendColorEXT } ( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha ) ; GL-FUNCTION: void glBlendEquation { glBlendEquationEXT } ( GLenum mode ) ; @@ -1429,42 +1429,42 @@ GL-FUNCTION: void glWindowPos3sv { glWindowPos3svARB } ( GLshort* p ) ; ! OpenGL 1.5 -CONSTANT: GL_BUFFER_SIZE HEX: 8764 -CONSTANT: GL_BUFFER_USAGE HEX: 8765 -CONSTANT: GL_QUERY_COUNTER_BITS HEX: 8864 -CONSTANT: GL_CURRENT_QUERY HEX: 8865 -CONSTANT: GL_QUERY_RESULT HEX: 8866 -CONSTANT: GL_QUERY_RESULT_AVAILABLE HEX: 8867 -CONSTANT: GL_ARRAY_BUFFER HEX: 8892 -CONSTANT: GL_ELEMENT_ARRAY_BUFFER HEX: 8893 -CONSTANT: GL_ARRAY_BUFFER_BINDING HEX: 8894 -CONSTANT: GL_ELEMENT_ARRAY_BUFFER_BINDING HEX: 8895 -CONSTANT: GL_VERTEX_ARRAY_BUFFER_BINDING HEX: 8896 -CONSTANT: GL_NORMAL_ARRAY_BUFFER_BINDING HEX: 8897 -CONSTANT: GL_COLOR_ARRAY_BUFFER_BINDING HEX: 8898 -CONSTANT: GL_INDEX_ARRAY_BUFFER_BINDING HEX: 8899 -CONSTANT: GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING HEX: 889A -CONSTANT: GL_EDGE_FLAG_ARRAY_BUFFER_BINDING HEX: 889B -CONSTANT: GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING HEX: 889C -CONSTANT: GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING HEX: 889D -CONSTANT: GL_WEIGHT_ARRAY_BUFFER_BINDING HEX: 889E -CONSTANT: GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING HEX: 889F -CONSTANT: GL_READ_ONLY HEX: 88B8 -CONSTANT: GL_WRITE_ONLY HEX: 88B9 -CONSTANT: GL_READ_WRITE HEX: 88BA -CONSTANT: GL_BUFFER_ACCESS HEX: 88BB -CONSTANT: GL_BUFFER_MAPPED HEX: 88BC -CONSTANT: GL_BUFFER_MAP_POINTER HEX: 88BD -CONSTANT: GL_STREAM_DRAW HEX: 88E0 -CONSTANT: GL_STREAM_READ HEX: 88E1 -CONSTANT: GL_STREAM_COPY HEX: 88E2 -CONSTANT: GL_STATIC_DRAW HEX: 88E4 -CONSTANT: GL_STATIC_READ HEX: 88E5 -CONSTANT: GL_STATIC_COPY HEX: 88E6 -CONSTANT: GL_DYNAMIC_DRAW HEX: 88E8 -CONSTANT: GL_DYNAMIC_READ HEX: 88E9 -CONSTANT: GL_DYNAMIC_COPY HEX: 88EA -CONSTANT: GL_SAMPLES_PASSED HEX: 8914 +CONSTANT: GL_BUFFER_SIZE 0x8764 +CONSTANT: GL_BUFFER_USAGE 0x8765 +CONSTANT: GL_QUERY_COUNTER_BITS 0x8864 +CONSTANT: GL_CURRENT_QUERY 0x8865 +CONSTANT: GL_QUERY_RESULT 0x8866 +CONSTANT: GL_QUERY_RESULT_AVAILABLE 0x8867 +CONSTANT: GL_ARRAY_BUFFER 0x8892 +CONSTANT: GL_ELEMENT_ARRAY_BUFFER 0x8893 +CONSTANT: GL_ARRAY_BUFFER_BINDING 0x8894 +CONSTANT: GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 +CONSTANT: GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 +CONSTANT: GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 +CONSTANT: GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 +CONSTANT: GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 +CONSTANT: GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A +CONSTANT: GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B +CONSTANT: GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C +CONSTANT: GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D +CONSTANT: GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E +CONSTANT: GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F +CONSTANT: GL_READ_ONLY 0x88B8 +CONSTANT: GL_WRITE_ONLY 0x88B9 +CONSTANT: GL_READ_WRITE 0x88BA +CONSTANT: GL_BUFFER_ACCESS 0x88BB +CONSTANT: GL_BUFFER_MAPPED 0x88BC +CONSTANT: GL_BUFFER_MAP_POINTER 0x88BD +CONSTANT: GL_STREAM_DRAW 0x88E0 +CONSTANT: GL_STREAM_READ 0x88E1 +CONSTANT: GL_STREAM_COPY 0x88E2 +CONSTANT: GL_STATIC_DRAW 0x88E4 +CONSTANT: GL_STATIC_READ 0x88E5 +CONSTANT: GL_STATIC_COPY 0x88E6 +CONSTANT: GL_DYNAMIC_DRAW 0x88E8 +CONSTANT: GL_DYNAMIC_READ 0x88E9 +CONSTANT: GL_DYNAMIC_COPY 0x88EA +CONSTANT: GL_SAMPLES_PASSED 0x8914 ALIAS: GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE ALIAS: GL_FOG_COORD GL_FOG_COORDINATE ALIAS: GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY @@ -1507,89 +1507,89 @@ GL-FUNCTION: GLboolean glUnmapBuffer { glUnmapBufferARB } ( GLenum target ) ; ! OpenGL 2.0 -CONSTANT: GL_VERTEX_ATTRIB_ARRAY_ENABLED HEX: 8622 -CONSTANT: GL_VERTEX_ATTRIB_ARRAY_SIZE HEX: 8623 -CONSTANT: GL_VERTEX_ATTRIB_ARRAY_STRIDE HEX: 8624 -CONSTANT: GL_VERTEX_ATTRIB_ARRAY_TYPE HEX: 8625 -CONSTANT: GL_CURRENT_VERTEX_ATTRIB HEX: 8626 -CONSTANT: GL_VERTEX_PROGRAM_POINT_SIZE HEX: 8642 -CONSTANT: GL_VERTEX_PROGRAM_TWO_SIDE HEX: 8643 -CONSTANT: GL_VERTEX_ATTRIB_ARRAY_POINTER HEX: 8645 -CONSTANT: GL_STENCIL_BACK_FUNC HEX: 8800 -CONSTANT: GL_STENCIL_BACK_FAIL HEX: 8801 -CONSTANT: GL_STENCIL_BACK_PASS_DEPTH_FAIL HEX: 8802 -CONSTANT: GL_STENCIL_BACK_PASS_DEPTH_PASS HEX: 8803 -CONSTANT: GL_MAX_DRAW_BUFFERS HEX: 8824 -CONSTANT: GL_DRAW_BUFFER0 HEX: 8825 -CONSTANT: GL_DRAW_BUFFER1 HEX: 8826 -CONSTANT: GL_DRAW_BUFFER2 HEX: 8827 -CONSTANT: GL_DRAW_BUFFER3 HEX: 8828 -CONSTANT: GL_DRAW_BUFFER4 HEX: 8829 -CONSTANT: GL_DRAW_BUFFER5 HEX: 882A -CONSTANT: GL_DRAW_BUFFER6 HEX: 882B -CONSTANT: GL_DRAW_BUFFER7 HEX: 882C -CONSTANT: GL_DRAW_BUFFER8 HEX: 882D -CONSTANT: GL_DRAW_BUFFER9 HEX: 882E -CONSTANT: GL_DRAW_BUFFER10 HEX: 882F -CONSTANT: GL_DRAW_BUFFER11 HEX: 8830 -CONSTANT: GL_DRAW_BUFFER12 HEX: 8831 -CONSTANT: GL_DRAW_BUFFER13 HEX: 8832 -CONSTANT: GL_DRAW_BUFFER14 HEX: 8833 -CONSTANT: GL_DRAW_BUFFER15 HEX: 8834 -CONSTANT: GL_BLEND_EQUATION_ALPHA HEX: 883D -CONSTANT: GL_POINT_SPRITE HEX: 8861 -CONSTANT: GL_COORD_REPLACE HEX: 8862 -CONSTANT: GL_MAX_VERTEX_ATTRIBS HEX: 8869 -CONSTANT: GL_VERTEX_ATTRIB_ARRAY_NORMALIZED HEX: 886A -CONSTANT: GL_MAX_TEXTURE_COORDS HEX: 8871 -CONSTANT: GL_MAX_TEXTURE_IMAGE_UNITS HEX: 8872 -CONSTANT: GL_FRAGMENT_SHADER HEX: 8B30 -CONSTANT: GL_VERTEX_SHADER HEX: 8B31 -CONSTANT: GL_MAX_FRAGMENT_UNIFORM_COMPONENTS HEX: 8B49 -CONSTANT: GL_MAX_VERTEX_UNIFORM_COMPONENTS HEX: 8B4A -CONSTANT: GL_MAX_VARYING_FLOATS HEX: 8B4B -CONSTANT: GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS HEX: 8B4C -CONSTANT: GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS HEX: 8B4D -CONSTANT: GL_SHADER_TYPE HEX: 8B4F -CONSTANT: GL_FLOAT_VEC2 HEX: 8B50 -CONSTANT: GL_FLOAT_VEC3 HEX: 8B51 -CONSTANT: GL_FLOAT_VEC4 HEX: 8B52 -CONSTANT: GL_INT_VEC2 HEX: 8B53 -CONSTANT: GL_INT_VEC3 HEX: 8B54 -CONSTANT: GL_INT_VEC4 HEX: 8B55 -CONSTANT: GL_BOOL HEX: 8B56 -CONSTANT: GL_BOOL_VEC2 HEX: 8B57 -CONSTANT: GL_BOOL_VEC3 HEX: 8B58 -CONSTANT: GL_BOOL_VEC4 HEX: 8B59 -CONSTANT: GL_FLOAT_MAT2 HEX: 8B5A -CONSTANT: GL_FLOAT_MAT3 HEX: 8B5B -CONSTANT: GL_FLOAT_MAT4 HEX: 8B5C -CONSTANT: GL_SAMPLER_1D HEX: 8B5D -CONSTANT: GL_SAMPLER_2D HEX: 8B5E -CONSTANT: GL_SAMPLER_3D HEX: 8B5F -CONSTANT: GL_SAMPLER_CUBE HEX: 8B60 -CONSTANT: GL_SAMPLER_1D_SHADOW HEX: 8B61 -CONSTANT: GL_SAMPLER_2D_SHADOW HEX: 8B62 -CONSTANT: GL_DELETE_STATUS HEX: 8B80 -CONSTANT: GL_COMPILE_STATUS HEX: 8B81 -CONSTANT: GL_LINK_STATUS HEX: 8B82 -CONSTANT: GL_VALIDATE_STATUS HEX: 8B83 -CONSTANT: GL_INFO_LOG_LENGTH HEX: 8B84 -CONSTANT: GL_ATTACHED_SHADERS HEX: 8B85 -CONSTANT: GL_ACTIVE_UNIFORMS HEX: 8B86 -CONSTANT: GL_ACTIVE_UNIFORM_MAX_LENGTH HEX: 8B87 -CONSTANT: GL_SHADER_SOURCE_LENGTH HEX: 8B88 -CONSTANT: GL_ACTIVE_ATTRIBUTES HEX: 8B89 -CONSTANT: GL_ACTIVE_ATTRIBUTE_MAX_LENGTH HEX: 8B8A -CONSTANT: GL_FRAGMENT_SHADER_DERIVATIVE_HINT HEX: 8B8B -CONSTANT: GL_SHADING_LANGUAGE_VERSION HEX: 8B8C -CONSTANT: GL_CURRENT_PROGRAM HEX: 8B8D -CONSTANT: GL_POINT_SPRITE_COORD_ORIGIN HEX: 8CA0 -CONSTANT: GL_LOWER_LEFT HEX: 8CA1 -CONSTANT: GL_UPPER_LEFT HEX: 8CA2 -CONSTANT: GL_STENCIL_BACK_REF HEX: 8CA3 -CONSTANT: GL_STENCIL_BACK_VALUE_MASK HEX: 8CA4 -CONSTANT: GL_STENCIL_BACK_WRITEMASK HEX: 8CA5 +CONSTANT: GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 +CONSTANT: GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 +CONSTANT: GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 +CONSTANT: GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 +CONSTANT: GL_CURRENT_VERTEX_ATTRIB 0x8626 +CONSTANT: GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 +CONSTANT: GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 +CONSTANT: GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 +CONSTANT: GL_STENCIL_BACK_FUNC 0x8800 +CONSTANT: GL_STENCIL_BACK_FAIL 0x8801 +CONSTANT: GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 +CONSTANT: GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 +CONSTANT: GL_MAX_DRAW_BUFFERS 0x8824 +CONSTANT: GL_DRAW_BUFFER0 0x8825 +CONSTANT: GL_DRAW_BUFFER1 0x8826 +CONSTANT: GL_DRAW_BUFFER2 0x8827 +CONSTANT: GL_DRAW_BUFFER3 0x8828 +CONSTANT: GL_DRAW_BUFFER4 0x8829 +CONSTANT: GL_DRAW_BUFFER5 0x882A +CONSTANT: GL_DRAW_BUFFER6 0x882B +CONSTANT: GL_DRAW_BUFFER7 0x882C +CONSTANT: GL_DRAW_BUFFER8 0x882D +CONSTANT: GL_DRAW_BUFFER9 0x882E +CONSTANT: GL_DRAW_BUFFER10 0x882F +CONSTANT: GL_DRAW_BUFFER11 0x8830 +CONSTANT: GL_DRAW_BUFFER12 0x8831 +CONSTANT: GL_DRAW_BUFFER13 0x8832 +CONSTANT: GL_DRAW_BUFFER14 0x8833 +CONSTANT: GL_DRAW_BUFFER15 0x8834 +CONSTANT: GL_BLEND_EQUATION_ALPHA 0x883D +CONSTANT: GL_POINT_SPRITE 0x8861 +CONSTANT: GL_COORD_REPLACE 0x8862 +CONSTANT: GL_MAX_VERTEX_ATTRIBS 0x8869 +CONSTANT: GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A +CONSTANT: GL_MAX_TEXTURE_COORDS 0x8871 +CONSTANT: GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 +CONSTANT: GL_FRAGMENT_SHADER 0x8B30 +CONSTANT: GL_VERTEX_SHADER 0x8B31 +CONSTANT: GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 +CONSTANT: GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A +CONSTANT: GL_MAX_VARYING_FLOATS 0x8B4B +CONSTANT: GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C +CONSTANT: GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D +CONSTANT: GL_SHADER_TYPE 0x8B4F +CONSTANT: GL_FLOAT_VEC2 0x8B50 +CONSTANT: GL_FLOAT_VEC3 0x8B51 +CONSTANT: GL_FLOAT_VEC4 0x8B52 +CONSTANT: GL_INT_VEC2 0x8B53 +CONSTANT: GL_INT_VEC3 0x8B54 +CONSTANT: GL_INT_VEC4 0x8B55 +CONSTANT: GL_BOOL 0x8B56 +CONSTANT: GL_BOOL_VEC2 0x8B57 +CONSTANT: GL_BOOL_VEC3 0x8B58 +CONSTANT: GL_BOOL_VEC4 0x8B59 +CONSTANT: GL_FLOAT_MAT2 0x8B5A +CONSTANT: GL_FLOAT_MAT3 0x8B5B +CONSTANT: GL_FLOAT_MAT4 0x8B5C +CONSTANT: GL_SAMPLER_1D 0x8B5D +CONSTANT: GL_SAMPLER_2D 0x8B5E +CONSTANT: GL_SAMPLER_3D 0x8B5F +CONSTANT: GL_SAMPLER_CUBE 0x8B60 +CONSTANT: GL_SAMPLER_1D_SHADOW 0x8B61 +CONSTANT: GL_SAMPLER_2D_SHADOW 0x8B62 +CONSTANT: GL_DELETE_STATUS 0x8B80 +CONSTANT: GL_COMPILE_STATUS 0x8B81 +CONSTANT: GL_LINK_STATUS 0x8B82 +CONSTANT: GL_VALIDATE_STATUS 0x8B83 +CONSTANT: GL_INFO_LOG_LENGTH 0x8B84 +CONSTANT: GL_ATTACHED_SHADERS 0x8B85 +CONSTANT: GL_ACTIVE_UNIFORMS 0x8B86 +CONSTANT: GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 +CONSTANT: GL_SHADER_SOURCE_LENGTH 0x8B88 +CONSTANT: GL_ACTIVE_ATTRIBUTES 0x8B89 +CONSTANT: GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A +CONSTANT: GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B +CONSTANT: GL_SHADING_LANGUAGE_VERSION 0x8B8C +CONSTANT: GL_CURRENT_PROGRAM 0x8B8D +CONSTANT: GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 +CONSTANT: GL_LOWER_LEFT 0x8CA1 +CONSTANT: GL_UPPER_LEFT 0x8CA2 +CONSTANT: GL_STENCIL_BACK_REF 0x8CA3 +CONSTANT: GL_STENCIL_BACK_VALUE_MASK 0x8CA4 +CONSTANT: GL_STENCIL_BACK_WRITEMASK 0x8CA5 ALIAS: GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION GL-FUNCTION: void glAttachShader { glAttachObjectARB } ( GLuint program, GLuint shader ) ; @@ -1690,29 +1690,29 @@ GL-FUNCTION: void glVertexAttribPointer { glVertexAttribPointerARB } ( GLuint in ! OpenGL 2.1 -CONSTANT: GL_CURRENT_RASTER_SECONDARY_COLOR HEX: 845F -CONSTANT: GL_PIXEL_PACK_BUFFER HEX: 88EB -CONSTANT: GL_PIXEL_UNPACK_BUFFER HEX: 88EC -CONSTANT: GL_PIXEL_PACK_BUFFER_BINDING HEX: 88ED -CONSTANT: GL_PIXEL_UNPACK_BUFFER_BINDING HEX: 88EF -CONSTANT: GL_SRGB HEX: 8C40 -CONSTANT: GL_SRGB8 HEX: 8C41 -CONSTANT: GL_SRGB_ALPHA HEX: 8C42 -CONSTANT: GL_SRGB8_ALPHA8 HEX: 8C43 -CONSTANT: GL_SLUMINANCE_ALPHA HEX: 8C44 -CONSTANT: GL_SLUMINANCE8_ALPHA8 HEX: 8C45 -CONSTANT: GL_SLUMINANCE HEX: 8C46 -CONSTANT: GL_SLUMINANCE8 HEX: 8C47 -CONSTANT: GL_COMPRESSED_SRGB HEX: 8C48 -CONSTANT: GL_COMPRESSED_SRGB_ALPHA HEX: 8C49 -CONSTANT: GL_COMPRESSED_SLUMINANCE HEX: 8C4A -CONSTANT: GL_COMPRESSED_SLUMINANCE_ALPHA HEX: 8C4B -CONSTANT: GL_FLOAT_MAT2x3 HEX: 8B65 -CONSTANT: GL_FLOAT_MAT2x4 HEX: 8B66 -CONSTANT: GL_FLOAT_MAT3x2 HEX: 8B67 -CONSTANT: GL_FLOAT_MAT3x4 HEX: 8B68 -CONSTANT: GL_FLOAT_MAT4x2 HEX: 8B69 -CONSTANT: GL_FLOAT_MAT4x3 HEX: 8B6A +CONSTANT: GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F +CONSTANT: GL_PIXEL_PACK_BUFFER 0x88EB +CONSTANT: GL_PIXEL_UNPACK_BUFFER 0x88EC +CONSTANT: GL_PIXEL_PACK_BUFFER_BINDING 0x88ED +CONSTANT: GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF +CONSTANT: GL_SRGB 0x8C40 +CONSTANT: GL_SRGB8 0x8C41 +CONSTANT: GL_SRGB_ALPHA 0x8C42 +CONSTANT: GL_SRGB8_ALPHA8 0x8C43 +CONSTANT: GL_SLUMINANCE_ALPHA 0x8C44 +CONSTANT: GL_SLUMINANCE8_ALPHA8 0x8C45 +CONSTANT: GL_SLUMINANCE 0x8C46 +CONSTANT: GL_SLUMINANCE8 0x8C47 +CONSTANT: GL_COMPRESSED_SRGB 0x8C48 +CONSTANT: GL_COMPRESSED_SRGB_ALPHA 0x8C49 +CONSTANT: GL_COMPRESSED_SLUMINANCE 0x8C4A +CONSTANT: GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B +CONSTANT: GL_FLOAT_MAT2x3 0x8B65 +CONSTANT: GL_FLOAT_MAT2x4 0x8B66 +CONSTANT: GL_FLOAT_MAT3x2 0x8B67 +CONSTANT: GL_FLOAT_MAT3x4 0x8B68 +CONSTANT: GL_FLOAT_MAT4x2 0x8B69 +CONSTANT: GL_FLOAT_MAT4x3 0x8B6A GL-FUNCTION: void glUniformMatrix2x3fv { } ( GLint location, GLsizei count, GLboolean transpose, GLfloat* value ) ; GL-FUNCTION: void glUniformMatrix2x4fv { } ( GLint location, GLsizei count, GLboolean transpose, GLfloat* value ) ; @@ -1727,245 +1727,245 @@ GL-FUNCTION: void glUniformMatrix4x3fv { } ( GLint location, GLsizei count, GLbo TYPEDEF: ushort GLhalf -CONSTANT: GL_VERTEX_ATTRIB_ARRAY_INTEGER HEX: 88FD -CONSTANT: GL_SAMPLER_CUBE_SHADOW HEX: 8DC5 -CONSTANT: GL_UNSIGNED_INT_VEC2 HEX: 8DC6 -CONSTANT: GL_UNSIGNED_INT_VEC3 HEX: 8DC7 -CONSTANT: GL_UNSIGNED_INT_VEC4 HEX: 8DC8 -CONSTANT: GL_INT_SAMPLER_1D HEX: 8DC9 -CONSTANT: GL_INT_SAMPLER_2D HEX: 8DCA -CONSTANT: GL_INT_SAMPLER_3D HEX: 8DCB -CONSTANT: GL_INT_SAMPLER_CUBE HEX: 8DCC -CONSTANT: GL_INT_SAMPLER_2D_RECT HEX: 8DCD -CONSTANT: GL_INT_SAMPLER_1D_ARRAY HEX: 8DCE -CONSTANT: GL_INT_SAMPLER_2D_ARRAY HEX: 8DCF -CONSTANT: GL_UNSIGNED_INT_SAMPLER_1D HEX: 8DD1 -CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D HEX: 8DD2 -CONSTANT: GL_UNSIGNED_INT_SAMPLER_3D HEX: 8DD3 -CONSTANT: GL_UNSIGNED_INT_SAMPLER_CUBE HEX: 8DD4 -CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_RECT HEX: 8DD5 -CONSTANT: GL_UNSIGNED_INT_SAMPLER_1D_ARRAY HEX: 8DD6 -CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_ARRAY HEX: 8DD7 -CONSTANT: GL_MIN_PROGRAM_TEXEL_OFFSET HEX: 8904 -CONSTANT: GL_MAX_PROGRAM_TEXEL_OFFSET HEX: 8905 - -CONSTANT: GL_RGBA32F HEX: 8814 -CONSTANT: GL_RGB32F HEX: 8815 -CONSTANT: GL_RGBA16F HEX: 881A -CONSTANT: GL_RGB16F HEX: 881B -CONSTANT: GL_TEXTURE_RED_TYPE HEX: 8C10 -CONSTANT: GL_TEXTURE_GREEN_TYPE HEX: 8C11 -CONSTANT: GL_TEXTURE_BLUE_TYPE HEX: 8C12 -CONSTANT: GL_TEXTURE_ALPHA_TYPE HEX: 8C13 -CONSTANT: GL_TEXTURE_DEPTH_TYPE HEX: 8C16 -CONSTANT: GL_UNSIGNED_NORMALIZED HEX: 8C17 - -CONSTANT: GL_QUERY_WAIT HEX: 8E13 -CONSTANT: GL_QUERY_NO_WAIT HEX: 8E14 -CONSTANT: GL_QUERY_BY_REGION_WAIT HEX: 8E15 -CONSTANT: GL_QUERY_BY_REGION_NO_WAIT HEX: 8E16 - -CONSTANT: GL_HALF_FLOAT HEX: 140B - -CONSTANT: GL_MAP_READ_BIT HEX: 0001 -CONSTANT: GL_MAP_WRITE_BIT HEX: 0002 -CONSTANT: GL_MAP_INVALIDATE_RANGE_BIT HEX: 0004 -CONSTANT: GL_MAP_INVALIDATE_BUFFER_BIT HEX: 0008 -CONSTANT: GL_MAP_FLUSH_EXPLICIT_BIT HEX: 0010 -CONSTANT: GL_MAP_UNSYNCHRONIZED_BIT HEX: 0020 - -CONSTANT: GL_R8 HEX: 8229 -CONSTANT: GL_R16 HEX: 822A -CONSTANT: GL_RG8 HEX: 822B -CONSTANT: GL_RG16 HEX: 822C -CONSTANT: GL_R16F HEX: 822D -CONSTANT: GL_R32F HEX: 822E -CONSTANT: GL_RG16F HEX: 822F -CONSTANT: GL_RG32F HEX: 8230 -CONSTANT: GL_R8I HEX: 8231 -CONSTANT: GL_R8UI HEX: 8232 -CONSTANT: GL_R16I HEX: 8233 -CONSTANT: GL_R16UI HEX: 8234 -CONSTANT: GL_R32I HEX: 8235 -CONSTANT: GL_R32UI HEX: 8236 -CONSTANT: GL_RG8I HEX: 8237 -CONSTANT: GL_RG8UI HEX: 8238 -CONSTANT: GL_RG16I HEX: 8239 -CONSTANT: GL_RG16UI HEX: 823A -CONSTANT: GL_RG32I HEX: 823B -CONSTANT: GL_RG32UI HEX: 823C -CONSTANT: GL_RG HEX: 8227 -CONSTANT: GL_COMPRESSED_RED HEX: 8225 -CONSTANT: GL_COMPRESSED_RG HEX: 8226 -CONSTANT: GL_RG_INTEGER HEX: 8228 - -CONSTANT: GL_VERTEX_ARRAY_BINDING HEX: 85B5 - -CONSTANT: GL_CLAMP_READ_COLOR HEX: 891C -CONSTANT: GL_FIXED_ONLY HEX: 891D - -CONSTANT: GL_DEPTH_COMPONENT32F HEX: 8CAC -CONSTANT: GL_DEPTH32F_STENCIL8 HEX: 8CAD - -CONSTANT: GL_RGB9_E5 HEX: 8C3D -CONSTANT: GL_UNSIGNED_INT_5_9_9_9_REV HEX: 8C3E -CONSTANT: GL_TEXTURE_SHARED_SIZE HEX: 8C3F - -CONSTANT: GL_R11F_G11F_B10F HEX: 8C3A -CONSTANT: GL_UNSIGNED_INT_10F_11F_11F_REV HEX: 8C3B - -CONSTANT: GL_INVALID_FRAMEBUFFER_OPERATION HEX: 0506 -CONSTANT: GL_MAX_RENDERBUFFER_SIZE HEX: 84E8 -CONSTANT: GL_FRAMEBUFFER_BINDING HEX: 8CA6 -CONSTANT: GL_RENDERBUFFER_BINDING HEX: 8CA7 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE HEX: 8CD0 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME HEX: 8CD1 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL HEX: 8CD2 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE HEX: 8CD3 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING HEX: 8210 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE HEX: 8211 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE HEX: 8212 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE HEX: 8213 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE HEX: 8214 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE HEX: 8215 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE HEX: 8216 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE HEX: 8217 -CONSTANT: GL_FRAMEBUFFER_DEFAULT HEX: 8218 -CONSTANT: GL_FRAMEBUFFER_UNDEFINED HEX: 8219 -CONSTANT: GL_DEPTH_STENCIL_ATTACHMENT HEX: 821A -CONSTANT: GL_FRAMEBUFFER_COMPLETE HEX: 8CD5 -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT HEX: 8CD6 -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT HEX: 8CD7 -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER HEX: 8CDB -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER HEX: 8CDC -CONSTANT: GL_FRAMEBUFFER_UNSUPPORTED HEX: 8CDD -CONSTANT: GL_MAX_COLOR_ATTACHMENTS HEX: 8CDF -CONSTANT: GL_COLOR_ATTACHMENT0 HEX: 8CE0 -CONSTANT: GL_COLOR_ATTACHMENT1 HEX: 8CE1 -CONSTANT: GL_COLOR_ATTACHMENT2 HEX: 8CE2 -CONSTANT: GL_COLOR_ATTACHMENT3 HEX: 8CE3 -CONSTANT: GL_COLOR_ATTACHMENT4 HEX: 8CE4 -CONSTANT: GL_COLOR_ATTACHMENT5 HEX: 8CE5 -CONSTANT: GL_COLOR_ATTACHMENT6 HEX: 8CE6 -CONSTANT: GL_COLOR_ATTACHMENT7 HEX: 8CE7 -CONSTANT: GL_COLOR_ATTACHMENT8 HEX: 8CE8 -CONSTANT: GL_COLOR_ATTACHMENT9 HEX: 8CE9 -CONSTANT: GL_COLOR_ATTACHMENT10 HEX: 8CEA -CONSTANT: GL_COLOR_ATTACHMENT11 HEX: 8CEB -CONSTANT: GL_COLOR_ATTACHMENT12 HEX: 8CEC -CONSTANT: GL_COLOR_ATTACHMENT13 HEX: 8CED -CONSTANT: GL_COLOR_ATTACHMENT14 HEX: 8CEE -CONSTANT: GL_COLOR_ATTACHMENT15 HEX: 8CEF -CONSTANT: GL_DEPTH_ATTACHMENT HEX: 8D00 -CONSTANT: GL_STENCIL_ATTACHMENT HEX: 8D20 -CONSTANT: GL_FRAMEBUFFER HEX: 8D40 -CONSTANT: GL_RENDERBUFFER HEX: 8D41 -CONSTANT: GL_RENDERBUFFER_WIDTH HEX: 8D42 -CONSTANT: GL_RENDERBUFFER_HEIGHT HEX: 8D43 -CONSTANT: GL_RENDERBUFFER_INTERNAL_FORMAT HEX: 8D44 -CONSTANT: GL_STENCIL_INDEX1 HEX: 8D46 -CONSTANT: GL_STENCIL_INDEX4 HEX: 8D47 -CONSTANT: GL_STENCIL_INDEX8 HEX: 8D48 -CONSTANT: GL_STENCIL_INDEX16 HEX: 8D49 -CONSTANT: GL_RENDERBUFFER_RED_SIZE HEX: 8D50 -CONSTANT: GL_RENDERBUFFER_GREEN_SIZE HEX: 8D51 -CONSTANT: GL_RENDERBUFFER_BLUE_SIZE HEX: 8D52 -CONSTANT: GL_RENDERBUFFER_ALPHA_SIZE HEX: 8D53 -CONSTANT: GL_RENDERBUFFER_DEPTH_SIZE HEX: 8D54 -CONSTANT: GL_RENDERBUFFER_STENCIL_SIZE HEX: 8D55 - -CONSTANT: GL_READ_FRAMEBUFFER HEX: 8CA8 -CONSTANT: GL_DRAW_FRAMEBUFFER HEX: 8CA9 +CONSTANT: GL_VERTEX_ATTRIB_ARRAY_INTEGER 0x88FD +CONSTANT: GL_SAMPLER_CUBE_SHADOW 0x8DC5 +CONSTANT: GL_UNSIGNED_INT_VEC2 0x8DC6 +CONSTANT: GL_UNSIGNED_INT_VEC3 0x8DC7 +CONSTANT: GL_UNSIGNED_INT_VEC4 0x8DC8 +CONSTANT: GL_INT_SAMPLER_1D 0x8DC9 +CONSTANT: GL_INT_SAMPLER_2D 0x8DCA +CONSTANT: GL_INT_SAMPLER_3D 0x8DCB +CONSTANT: GL_INT_SAMPLER_CUBE 0x8DCC +CONSTANT: GL_INT_SAMPLER_2D_RECT 0x8DCD +CONSTANT: GL_INT_SAMPLER_1D_ARRAY 0x8DCE +CONSTANT: GL_INT_SAMPLER_2D_ARRAY 0x8DCF +CONSTANT: GL_UNSIGNED_INT_SAMPLER_1D 0x8DD1 +CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D 0x8DD2 +CONSTANT: GL_UNSIGNED_INT_SAMPLER_3D 0x8DD3 +CONSTANT: GL_UNSIGNED_INT_SAMPLER_CUBE 0x8DD4 +CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_RECT 0x8DD5 +CONSTANT: GL_UNSIGNED_INT_SAMPLER_1D_ARRAY 0x8DD6 +CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_ARRAY 0x8DD7 +CONSTANT: GL_MIN_PROGRAM_TEXEL_OFFSET 0x8904 +CONSTANT: GL_MAX_PROGRAM_TEXEL_OFFSET 0x8905 + +CONSTANT: GL_RGBA32F 0x8814 +CONSTANT: GL_RGB32F 0x8815 +CONSTANT: GL_RGBA16F 0x881A +CONSTANT: GL_RGB16F 0x881B +CONSTANT: GL_TEXTURE_RED_TYPE 0x8C10 +CONSTANT: GL_TEXTURE_GREEN_TYPE 0x8C11 +CONSTANT: GL_TEXTURE_BLUE_TYPE 0x8C12 +CONSTANT: GL_TEXTURE_ALPHA_TYPE 0x8C13 +CONSTANT: GL_TEXTURE_DEPTH_TYPE 0x8C16 +CONSTANT: GL_UNSIGNED_NORMALIZED 0x8C17 + +CONSTANT: GL_QUERY_WAIT 0x8E13 +CONSTANT: GL_QUERY_NO_WAIT 0x8E14 +CONSTANT: GL_QUERY_BY_REGION_WAIT 0x8E15 +CONSTANT: GL_QUERY_BY_REGION_NO_WAIT 0x8E16 + +CONSTANT: GL_HALF_FLOAT 0x140B + +CONSTANT: GL_MAP_READ_BIT 0x0001 +CONSTANT: GL_MAP_WRITE_BIT 0x0002 +CONSTANT: GL_MAP_INVALIDATE_RANGE_BIT 0x0004 +CONSTANT: GL_MAP_INVALIDATE_BUFFER_BIT 0x0008 +CONSTANT: GL_MAP_FLUSH_EXPLICIT_BIT 0x0010 +CONSTANT: GL_MAP_UNSYNCHRONIZED_BIT 0x0020 + +CONSTANT: GL_R8 0x8229 +CONSTANT: GL_R16 0x822A +CONSTANT: GL_RG8 0x822B +CONSTANT: GL_RG16 0x822C +CONSTANT: GL_R16F 0x822D +CONSTANT: GL_R32F 0x822E +CONSTANT: GL_RG16F 0x822F +CONSTANT: GL_RG32F 0x8230 +CONSTANT: GL_R8I 0x8231 +CONSTANT: GL_R8UI 0x8232 +CONSTANT: GL_R16I 0x8233 +CONSTANT: GL_R16UI 0x8234 +CONSTANT: GL_R32I 0x8235 +CONSTANT: GL_R32UI 0x8236 +CONSTANT: GL_RG8I 0x8237 +CONSTANT: GL_RG8UI 0x8238 +CONSTANT: GL_RG16I 0x8239 +CONSTANT: GL_RG16UI 0x823A +CONSTANT: GL_RG32I 0x823B +CONSTANT: GL_RG32UI 0x823C +CONSTANT: GL_RG 0x8227 +CONSTANT: GL_COMPRESSED_RED 0x8225 +CONSTANT: GL_COMPRESSED_RG 0x8226 +CONSTANT: GL_RG_INTEGER 0x8228 + +CONSTANT: GL_VERTEX_ARRAY_BINDING 0x85B5 + +CONSTANT: GL_CLAMP_READ_COLOR 0x891C +CONSTANT: GL_FIXED_ONLY 0x891D + +CONSTANT: GL_DEPTH_COMPONENT32F 0x8CAC +CONSTANT: GL_DEPTH32F_STENCIL8 0x8CAD + +CONSTANT: GL_RGB9_E5 0x8C3D +CONSTANT: GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E +CONSTANT: GL_TEXTURE_SHARED_SIZE 0x8C3F + +CONSTANT: GL_R11F_G11F_B10F 0x8C3A +CONSTANT: GL_UNSIGNED_INT_10F_11F_11F_REV 0x8C3B + +CONSTANT: GL_INVALID_FRAMEBUFFER_OPERATION 0x0506 +CONSTANT: GL_MAX_RENDERBUFFER_SIZE 0x84E8 +CONSTANT: GL_FRAMEBUFFER_BINDING 0x8CA6 +CONSTANT: GL_RENDERBUFFER_BINDING 0x8CA7 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE 0x8CD0 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME 0x8CD1 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL 0x8CD2 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE 0x8CD3 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_COLOR_ENCODING 0x8210 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_COMPONENT_TYPE 0x8211 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE 0x8212 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE 0x8213 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE 0x8214 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE 0x8215 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE 0x8216 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE 0x8217 +CONSTANT: GL_FRAMEBUFFER_DEFAULT 0x8218 +CONSTANT: GL_FRAMEBUFFER_UNDEFINED 0x8219 +CONSTANT: GL_DEPTH_STENCIL_ATTACHMENT 0x821A +CONSTANT: GL_FRAMEBUFFER_COMPLETE 0x8CD5 +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT 0x8CD6 +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT 0x8CD7 +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER 0x8CDB +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER 0x8CDC +CONSTANT: GL_FRAMEBUFFER_UNSUPPORTED 0x8CDD +CONSTANT: GL_MAX_COLOR_ATTACHMENTS 0x8CDF +CONSTANT: GL_COLOR_ATTACHMENT0 0x8CE0 +CONSTANT: GL_COLOR_ATTACHMENT1 0x8CE1 +CONSTANT: GL_COLOR_ATTACHMENT2 0x8CE2 +CONSTANT: GL_COLOR_ATTACHMENT3 0x8CE3 +CONSTANT: GL_COLOR_ATTACHMENT4 0x8CE4 +CONSTANT: GL_COLOR_ATTACHMENT5 0x8CE5 +CONSTANT: GL_COLOR_ATTACHMENT6 0x8CE6 +CONSTANT: GL_COLOR_ATTACHMENT7 0x8CE7 +CONSTANT: GL_COLOR_ATTACHMENT8 0x8CE8 +CONSTANT: GL_COLOR_ATTACHMENT9 0x8CE9 +CONSTANT: GL_COLOR_ATTACHMENT10 0x8CEA +CONSTANT: GL_COLOR_ATTACHMENT11 0x8CEB +CONSTANT: GL_COLOR_ATTACHMENT12 0x8CEC +CONSTANT: GL_COLOR_ATTACHMENT13 0x8CED +CONSTANT: GL_COLOR_ATTACHMENT14 0x8CEE +CONSTANT: GL_COLOR_ATTACHMENT15 0x8CEF +CONSTANT: GL_DEPTH_ATTACHMENT 0x8D00 +CONSTANT: GL_STENCIL_ATTACHMENT 0x8D20 +CONSTANT: GL_FRAMEBUFFER 0x8D40 +CONSTANT: GL_RENDERBUFFER 0x8D41 +CONSTANT: GL_RENDERBUFFER_WIDTH 0x8D42 +CONSTANT: GL_RENDERBUFFER_HEIGHT 0x8D43 +CONSTANT: GL_RENDERBUFFER_INTERNAL_FORMAT 0x8D44 +CONSTANT: GL_STENCIL_INDEX1 0x8D46 +CONSTANT: GL_STENCIL_INDEX4 0x8D47 +CONSTANT: GL_STENCIL_INDEX8 0x8D48 +CONSTANT: GL_STENCIL_INDEX16 0x8D49 +CONSTANT: GL_RENDERBUFFER_RED_SIZE 0x8D50 +CONSTANT: GL_RENDERBUFFER_GREEN_SIZE 0x8D51 +CONSTANT: GL_RENDERBUFFER_BLUE_SIZE 0x8D52 +CONSTANT: GL_RENDERBUFFER_ALPHA_SIZE 0x8D53 +CONSTANT: GL_RENDERBUFFER_DEPTH_SIZE 0x8D54 +CONSTANT: GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 + +CONSTANT: GL_READ_FRAMEBUFFER 0x8CA8 +CONSTANT: GL_DRAW_FRAMEBUFFER 0x8CA9 ALIAS: GL_DRAW_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING -CONSTANT: GL_READ_FRAMEBUFFER_BINDING HEX: 8CAA - -CONSTANT: GL_RENDERBUFFER_SAMPLES HEX: 8CAB -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE HEX: 8D56 -CONSTANT: GL_MAX_SAMPLES HEX: 8D57 - -CONSTANT: GL_DEPTH_STENCIL HEX: 84F9 -CONSTANT: GL_UNSIGNED_INT_24_8 HEX: 84FA -CONSTANT: GL_DEPTH24_STENCIL8 HEX: 88F0 -CONSTANT: GL_TEXTURE_STENCIL_SIZE HEX: 88F1 - -CONSTANT: GL_RGBA32UI HEX: 8D70 -CONSTANT: GL_RGB32UI HEX: 8D71 - -CONSTANT: GL_RGBA16UI HEX: 8D76 -CONSTANT: GL_RGB16UI HEX: 8D77 - -CONSTANT: GL_RGBA8UI HEX: 8D7C -CONSTANT: GL_RGB8UI HEX: 8D7D - -CONSTANT: GL_RGBA32I HEX: 8D82 -CONSTANT: GL_RGB32I HEX: 8D83 - -CONSTANT: GL_RGBA16I HEX: 8D88 -CONSTANT: GL_RGB16I HEX: 8D89 - -CONSTANT: GL_RGBA8I HEX: 8D8E -CONSTANT: GL_RGB8I HEX: 8D8F - -CONSTANT: GL_RED_INTEGER HEX: 8D94 -CONSTANT: GL_GREEN_INTEGER HEX: 8D95 -CONSTANT: GL_BLUE_INTEGER HEX: 8D96 -CONSTANT: GL_RGB_INTEGER HEX: 8D98 -CONSTANT: GL_RGBA_INTEGER HEX: 8D99 -CONSTANT: GL_BGR_INTEGER HEX: 8D9A -CONSTANT: GL_BGRA_INTEGER HEX: 8D9B - -CONSTANT: GL_FLOAT_32_UNSIGNED_INT_24_8_REV HEX: 8DAD - -CONSTANT: GL_TEXTURE_1D_ARRAY HEX: 8C18 -CONSTANT: GL_TEXTURE_2D_ARRAY HEX: 8C1A - -CONSTANT: GL_PROXY_TEXTURE_2D_ARRAY HEX: 8C1B - -CONSTANT: GL_PROXY_TEXTURE_1D_ARRAY HEX: 8C19 - -CONSTANT: GL_TEXTURE_BINDING_1D_ARRAY HEX: 8C1C -CONSTANT: GL_TEXTURE_BINDING_2D_ARRAY HEX: 8C1D -CONSTANT: GL_MAX_ARRAY_TEXTURE_LAYERS HEX: 88FF - -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER HEX: 8CD4 - -CONSTANT: GL_SAMPLER_1D_ARRAY HEX: 8DC0 -CONSTANT: GL_SAMPLER_2D_ARRAY HEX: 8DC1 -CONSTANT: GL_SAMPLER_1D_ARRAY_SHADOW HEX: 8DC3 -CONSTANT: GL_SAMPLER_2D_ARRAY_SHADOW HEX: 8DC4 - -CONSTANT: GL_COMPRESSED_RED_RGTC1 HEX: 8DBB -CONSTANT: GL_COMPRESSED_SIGNED_RED_RGTC1 HEX: 8DBC -CONSTANT: GL_COMPRESSED_RG_RGTC2 HEX: 8DBD -CONSTANT: GL_COMPRESSED_SIGNED_RG_RGTC2 HEX: 8DBE - -CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER HEX: 8C8E -CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_START HEX: 8C84 -CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_SIZE HEX: 8C85 -CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_BINDING HEX: 8C8F -CONSTANT: GL_INTERLEAVED_ATTRIBS HEX: 8C8C -CONSTANT: GL_SEPARATE_ATTRIBS HEX: 8C8D -CONSTANT: GL_PRIMITIVES_GENERATED HEX: 8C87 -CONSTANT: GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN HEX: 8C88 -CONSTANT: GL_RASTERIZER_DISCARD HEX: 8C89 -CONSTANT: GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS HEX: 8C8A -CONSTANT: GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS HEX: 8C8B -CONSTANT: GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS HEX: 8C80 -CONSTANT: GL_TRANSFORM_FEEDBACK_VARYINGS HEX: 8C83 -CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_MODE HEX: 8C7F -CONSTANT: GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH HEX: 8C76 - -CONSTANT: GL_FRAMEBUFFER_SRGB HEX: 8DB9 - -CONSTANT: GL_MAJOR_VERSION HEX: 821B -CONSTANT: GL_MINOR_VERSION HEX: 821C -CONSTANT: GL_NUM_EXTENSIONS HEX: 821D -CONSTANT: GL_CONTEXT_FLAGS HEX: 821E -CONSTANT: GL_INDEX HEX: 8222 -CONSTANT: GL_DEPTH_BUFFER HEX: 8223 -CONSTANT: GL_STENCIL_BUFFER HEX: 8224 -CONSTANT: GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT HEX: 0001 +CONSTANT: GL_READ_FRAMEBUFFER_BINDING 0x8CAA + +CONSTANT: GL_RENDERBUFFER_SAMPLES 0x8CAB +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 +CONSTANT: GL_MAX_SAMPLES 0x8D57 + +CONSTANT: GL_DEPTH_STENCIL 0x84F9 +CONSTANT: GL_UNSIGNED_INT_24_8 0x84FA +CONSTANT: GL_DEPTH24_STENCIL8 0x88F0 +CONSTANT: GL_TEXTURE_STENCIL_SIZE 0x88F1 + +CONSTANT: GL_RGBA32UI 0x8D70 +CONSTANT: GL_RGB32UI 0x8D71 + +CONSTANT: GL_RGBA16UI 0x8D76 +CONSTANT: GL_RGB16UI 0x8D77 + +CONSTANT: GL_RGBA8UI 0x8D7C +CONSTANT: GL_RGB8UI 0x8D7D + +CONSTANT: GL_RGBA32I 0x8D82 +CONSTANT: GL_RGB32I 0x8D83 + +CONSTANT: GL_RGBA16I 0x8D88 +CONSTANT: GL_RGB16I 0x8D89 + +CONSTANT: GL_RGBA8I 0x8D8E +CONSTANT: GL_RGB8I 0x8D8F + +CONSTANT: GL_RED_INTEGER 0x8D94 +CONSTANT: GL_GREEN_INTEGER 0x8D95 +CONSTANT: GL_BLUE_INTEGER 0x8D96 +CONSTANT: GL_RGB_INTEGER 0x8D98 +CONSTANT: GL_RGBA_INTEGER 0x8D99 +CONSTANT: GL_BGR_INTEGER 0x8D9A +CONSTANT: GL_BGRA_INTEGER 0x8D9B + +CONSTANT: GL_FLOAT_32_UNSIGNED_INT_24_8_REV 0x8DAD + +CONSTANT: GL_TEXTURE_1D_ARRAY 0x8C18 +CONSTANT: GL_TEXTURE_2D_ARRAY 0x8C1A + +CONSTANT: GL_PROXY_TEXTURE_2D_ARRAY 0x8C1B + +CONSTANT: GL_PROXY_TEXTURE_1D_ARRAY 0x8C19 + +CONSTANT: GL_TEXTURE_BINDING_1D_ARRAY 0x8C1C +CONSTANT: GL_TEXTURE_BINDING_2D_ARRAY 0x8C1D +CONSTANT: GL_MAX_ARRAY_TEXTURE_LAYERS 0x88FF + +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER 0x8CD4 + +CONSTANT: GL_SAMPLER_1D_ARRAY 0x8DC0 +CONSTANT: GL_SAMPLER_2D_ARRAY 0x8DC1 +CONSTANT: GL_SAMPLER_1D_ARRAY_SHADOW 0x8DC3 +CONSTANT: GL_SAMPLER_2D_ARRAY_SHADOW 0x8DC4 + +CONSTANT: GL_COMPRESSED_RED_RGTC1 0x8DBB +CONSTANT: GL_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC +CONSTANT: GL_COMPRESSED_RG_RGTC2 0x8DBD +CONSTANT: GL_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE + +CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER 0x8C8E +CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_START 0x8C84 +CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_SIZE 0x8C85 +CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_BINDING 0x8C8F +CONSTANT: GL_INTERLEAVED_ATTRIBS 0x8C8C +CONSTANT: GL_SEPARATE_ATTRIBS 0x8C8D +CONSTANT: GL_PRIMITIVES_GENERATED 0x8C87 +CONSTANT: GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN 0x8C88 +CONSTANT: GL_RASTERIZER_DISCARD 0x8C89 +CONSTANT: GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS 0x8C8A +CONSTANT: GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS 0x8C8B +CONSTANT: GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS 0x8C80 +CONSTANT: GL_TRANSFORM_FEEDBACK_VARYINGS 0x8C83 +CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_MODE 0x8C7F +CONSTANT: GL_TRANSFORM_FEEDBACK_VARYING_MAX_LENGTH 0x8C76 + +CONSTANT: GL_FRAMEBUFFER_SRGB 0x8DB9 + +CONSTANT: GL_MAJOR_VERSION 0x821B +CONSTANT: GL_MINOR_VERSION 0x821C +CONSTANT: GL_NUM_EXTENSIONS 0x821D +CONSTANT: GL_CONTEXT_FLAGS 0x821E +CONSTANT: GL_INDEX 0x8222 +CONSTANT: GL_DEPTH_BUFFER 0x8223 +CONSTANT: GL_STENCIL_BUFFER 0x8224 +CONSTANT: GL_CONTEXT_FLAG_FORWARD_COMPATIBLE_BIT 0x0001 ALIAS: GL_COMPARE_REF_TO_TEXTURE GL_COMPARE_R_TO_TEXTURE ALIAS: GL_MAX_VARYING_COMPONENTS GL_MAX_VARYING_FLOATS @@ -2082,77 +2082,77 @@ GL-FUNCTION: void glFlushMappedBufferRange { glFlushMappedBufferRangeAPPLE } ( G ! OpenGL 3.1 -CONSTANT: GL_RED_SNORM HEX: 8F90 -CONSTANT: GL_RG_SNORM HEX: 8F91 -CONSTANT: GL_RGB_SNORM HEX: 8F92 -CONSTANT: GL_RGBA_SNORM HEX: 8F93 -CONSTANT: GL_R8_SNORM HEX: 8F94 -CONSTANT: GL_RG8_SNORM HEX: 8F95 -CONSTANT: GL_RGB8_SNORM HEX: 8F96 -CONSTANT: GL_RGBA8_SNORM HEX: 8F97 -CONSTANT: GL_R16_SNORM HEX: 8F98 -CONSTANT: GL_RG16_SNORM HEX: 8F99 -CONSTANT: GL_RGB16_SNORM HEX: 8F9A -CONSTANT: GL_RGBA16_SNORM HEX: 8F9B -CONSTANT: GL_SIGNED_NORMALIZED HEX: 8F9C - -CONSTANT: GL_PRIMITIVE_RESTART HEX: 8F9D -CONSTANT: GL_PRIMITIVE_RESTART_INDEX HEX: 8F9E - -CONSTANT: GL_COPY_READ_BUFFER HEX: 8F36 -CONSTANT: GL_COPY_WRITE_BUFFER HEX: 8F37 - -CONSTANT: GL_UNIFORM_BUFFER HEX: 8A11 -CONSTANT: GL_UNIFORM_BUFFER_BINDING HEX: 8A28 -CONSTANT: GL_UNIFORM_BUFFER_START HEX: 8A29 -CONSTANT: GL_UNIFORM_BUFFER_SIZE HEX: 8A2A -CONSTANT: GL_MAX_VERTEX_UNIFORM_BLOCKS HEX: 8A2B -CONSTANT: GL_MAX_GEOMETRY_UNIFORM_BLOCKS HEX: 8A2C -CONSTANT: GL_MAX_FRAGMENT_UNIFORM_BLOCKS HEX: 8A2D -CONSTANT: GL_MAX_COMBINED_UNIFORM_BLOCKS HEX: 8A2E -CONSTANT: GL_MAX_UNIFORM_BUFFER_BINDINGS HEX: 8A2F -CONSTANT: GL_MAX_UNIFORM_BLOCK_SIZE HEX: 8A30 -CONSTANT: GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS HEX: 8A31 -CONSTANT: GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS HEX: 8A32 -CONSTANT: GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS HEX: 8A33 -CONSTANT: GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT HEX: 8A34 -CONSTANT: GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH HEX: 8A35 -CONSTANT: GL_ACTIVE_UNIFORM_BLOCKS HEX: 8A36 -CONSTANT: GL_UNIFORM_TYPE HEX: 8A37 -CONSTANT: GL_UNIFORM_SIZE HEX: 8A38 -CONSTANT: GL_UNIFORM_NAME_LENGTH HEX: 8A39 -CONSTANT: GL_UNIFORM_BLOCK_INDEX HEX: 8A3A -CONSTANT: GL_UNIFORM_OFFSET HEX: 8A3B -CONSTANT: GL_UNIFORM_ARRAY_STRIDE HEX: 8A3C -CONSTANT: GL_UNIFORM_MATRIX_STRIDE HEX: 8A3D -CONSTANT: GL_UNIFORM_IS_ROW_MAJOR HEX: 8A3E -CONSTANT: GL_UNIFORM_BLOCK_BINDING HEX: 8A3F -CONSTANT: GL_UNIFORM_BLOCK_DATA_SIZE HEX: 8A40 -CONSTANT: GL_UNIFORM_BLOCK_NAME_LENGTH HEX: 8A41 -CONSTANT: GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS HEX: 8A42 -CONSTANT: GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES HEX: 8A43 -CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER HEX: 8A44 -CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER HEX: 8A45 -CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER HEX: 8A46 -CONSTANT: GL_INVALID_INDEX HEX: FFFFFFFF - -CONSTANT: GL_TEXTURE_RECTANGLE HEX: 84F5 -CONSTANT: GL_TEXTURE_BINDING_RECTANGLE HEX: 84F6 -CONSTANT: GL_PROXY_TEXTURE_RECTANGLE HEX: 84F7 -CONSTANT: GL_MAX_RECTANGLE_TEXTURE_SIZE HEX: 84F8 -CONSTANT: GL_SAMPLER_2D_RECT HEX: 8B63 -CONSTANT: GL_SAMPLER_2D_RECT_SHADOW HEX: 8B64 - -CONSTANT: GL_SAMPLER_BUFFER HEX: 8DC2 -CONSTANT: GL_INT_SAMPLER_BUFFER HEX: 8DD0 -CONSTANT: GL_UNSIGNED_INT_SAMPLER_BUFFER HEX: 8DD8 - -CONSTANT: GL_TEXTURE_BUFFER HEX: 8C2A - -CONSTANT: GL_MAX_TEXTURE_BUFFER_SIZE HEX: 8C2B -CONSTANT: GL_TEXTURE_BINDING_BUFFER HEX: 8C2C -CONSTANT: GL_TEXTURE_BUFFER_DATA_STORE_BINDING HEX: 8C2D -CONSTANT: GL_TEXTURE_BUFFER_FORMAT HEX: 8C2E +CONSTANT: GL_RED_SNORM 0x8F90 +CONSTANT: GL_RG_SNORM 0x8F91 +CONSTANT: GL_RGB_SNORM 0x8F92 +CONSTANT: GL_RGBA_SNORM 0x8F93 +CONSTANT: GL_R8_SNORM 0x8F94 +CONSTANT: GL_RG8_SNORM 0x8F95 +CONSTANT: GL_RGB8_SNORM 0x8F96 +CONSTANT: GL_RGBA8_SNORM 0x8F97 +CONSTANT: GL_R16_SNORM 0x8F98 +CONSTANT: GL_RG16_SNORM 0x8F99 +CONSTANT: GL_RGB16_SNORM 0x8F9A +CONSTANT: GL_RGBA16_SNORM 0x8F9B +CONSTANT: GL_SIGNED_NORMALIZED 0x8F9C + +CONSTANT: GL_PRIMITIVE_RESTART 0x8F9D +CONSTANT: GL_PRIMITIVE_RESTART_INDEX 0x8F9E + +CONSTANT: GL_COPY_READ_BUFFER 0x8F36 +CONSTANT: GL_COPY_WRITE_BUFFER 0x8F37 + +CONSTANT: GL_UNIFORM_BUFFER 0x8A11 +CONSTANT: GL_UNIFORM_BUFFER_BINDING 0x8A28 +CONSTANT: GL_UNIFORM_BUFFER_START 0x8A29 +CONSTANT: GL_UNIFORM_BUFFER_SIZE 0x8A2A +CONSTANT: GL_MAX_VERTEX_UNIFORM_BLOCKS 0x8A2B +CONSTANT: GL_MAX_GEOMETRY_UNIFORM_BLOCKS 0x8A2C +CONSTANT: GL_MAX_FRAGMENT_UNIFORM_BLOCKS 0x8A2D +CONSTANT: GL_MAX_COMBINED_UNIFORM_BLOCKS 0x8A2E +CONSTANT: GL_MAX_UNIFORM_BUFFER_BINDINGS 0x8A2F +CONSTANT: GL_MAX_UNIFORM_BLOCK_SIZE 0x8A30 +CONSTANT: GL_MAX_COMBINED_VERTEX_UNIFORM_COMPONENTS 0x8A31 +CONSTANT: GL_MAX_COMBINED_GEOMETRY_UNIFORM_COMPONENTS 0x8A32 +CONSTANT: GL_MAX_COMBINED_FRAGMENT_UNIFORM_COMPONENTS 0x8A33 +CONSTANT: GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT 0x8A34 +CONSTANT: GL_ACTIVE_UNIFORM_BLOCK_MAX_NAME_LENGTH 0x8A35 +CONSTANT: GL_ACTIVE_UNIFORM_BLOCKS 0x8A36 +CONSTANT: GL_UNIFORM_TYPE 0x8A37 +CONSTANT: GL_UNIFORM_SIZE 0x8A38 +CONSTANT: GL_UNIFORM_NAME_LENGTH 0x8A39 +CONSTANT: GL_UNIFORM_BLOCK_INDEX 0x8A3A +CONSTANT: GL_UNIFORM_OFFSET 0x8A3B +CONSTANT: GL_UNIFORM_ARRAY_STRIDE 0x8A3C +CONSTANT: GL_UNIFORM_MATRIX_STRIDE 0x8A3D +CONSTANT: GL_UNIFORM_IS_ROW_MAJOR 0x8A3E +CONSTANT: GL_UNIFORM_BLOCK_BINDING 0x8A3F +CONSTANT: GL_UNIFORM_BLOCK_DATA_SIZE 0x8A40 +CONSTANT: GL_UNIFORM_BLOCK_NAME_LENGTH 0x8A41 +CONSTANT: GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS 0x8A42 +CONSTANT: GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES 0x8A43 +CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER 0x8A44 +CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER 0x8A45 +CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER 0x8A46 +CONSTANT: GL_INVALID_INDEX 0xFFFFFFFF + +CONSTANT: GL_TEXTURE_RECTANGLE 0x84F5 +CONSTANT: GL_TEXTURE_BINDING_RECTANGLE 0x84F6 +CONSTANT: GL_PROXY_TEXTURE_RECTANGLE 0x84F7 +CONSTANT: GL_MAX_RECTANGLE_TEXTURE_SIZE 0x84F8 +CONSTANT: GL_SAMPLER_2D_RECT 0x8B63 +CONSTANT: GL_SAMPLER_2D_RECT_SHADOW 0x8B64 + +CONSTANT: GL_SAMPLER_BUFFER 0x8DC2 +CONSTANT: GL_INT_SAMPLER_BUFFER 0x8DD0 +CONSTANT: GL_UNSIGNED_INT_SAMPLER_BUFFER 0x8DD8 + +CONSTANT: GL_TEXTURE_BUFFER 0x8C2A + +CONSTANT: GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B +CONSTANT: GL_TEXTURE_BINDING_BUFFER 0x8C2C +CONSTANT: GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D +CONSTANT: GL_TEXTURE_BUFFER_FORMAT 0x8C2E GL-FUNCTION: void glDrawArraysInstanced { glDrawArraysInstancedARB } ( GLenum mode, GLint first, GLsizei count, GLsizei primcount ) ; GL-FUNCTION: void glDrawElementsInstanced { glDrawElementsInstancedARB } ( GLenum mode, GLsizei count, GLenum type, GLvoid* indices, GLsizei primcount ) ; @@ -2172,70 +2172,70 @@ GL-FUNCTION: void glCopyBufferSubData { glCopyBufferSubDataEXT } ( GLenum readta ! OpenGL 3.2 -CONSTANT: GL_CONTEXT_CORE_PROFILE_BIT HEX: 00000001 -CONSTANT: GL_CONTEXT_COMPATIBILITY_PROFILE_BIT HEX: 00000002 -CONSTANT: GL_LINES_ADJACENCY HEX: 000A -CONSTANT: GL_LINE_STRIP_ADJACENCY HEX: 000B -CONSTANT: GL_TRIANGLES_ADJACENCY HEX: 000C -CONSTANT: GL_TRIANGLE_STRIP_ADJACENCY HEX: 000D -CONSTANT: GL_PROGRAM_POINT_SIZE HEX: 8642 -CONSTANT: GL_GEOMETRY_VERTICES_OUT HEX: 8916 -CONSTANT: GL_GEOMETRY_INPUT_TYPE HEX: 8917 -CONSTANT: GL_GEOMETRY_OUTPUT_TYPE HEX: 8918 -CONSTANT: GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS HEX: 8C29 -CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_LAYERED HEX: 8DA7 -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS HEX: 8DA8 -CONSTANT: GL_GEOMETRY_SHADER HEX: 8DD9 -CONSTANT: GL_MAX_GEOMETRY_UNIFORM_COMPONENTS HEX: 8DDF -CONSTANT: GL_MAX_GEOMETRY_OUTPUT_VERTICES HEX: 8DE0 -CONSTANT: GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS HEX: 8DE1 -CONSTANT: GL_MAX_VERTEX_OUTPUT_COMPONENTS HEX: 9122 -CONSTANT: GL_MAX_GEOMETRY_INPUT_COMPONENTS HEX: 9123 -CONSTANT: GL_MAX_GEOMETRY_OUTPUT_COMPONENTS HEX: 9124 -CONSTANT: GL_MAX_FRAGMENT_INPUT_COMPONENTS HEX: 9125 -CONSTANT: GL_CONTEXT_PROFILE_MASK HEX: 9126 -CONSTANT: GL_MAX_SERVER_WAIT_TIMEOUT HEX: 9111 -CONSTANT: GL_OBJECT_TYPE HEX: 9112 -CONSTANT: GL_SYNC_CONDITION HEX: 9113 -CONSTANT: GL_SYNC_STATUS HEX: 9114 -CONSTANT: GL_SYNC_FLAGS HEX: 9115 -CONSTANT: GL_SYNC_FENCE HEX: 9116 -CONSTANT: GL_SYNC_GPU_COMMANDS_COMPLETE HEX: 9117 -CONSTANT: GL_UNSIGNALED HEX: 9118 -CONSTANT: GL_SIGNALED HEX: 9119 -CONSTANT: GL_ALREADY_SIGNALED HEX: 911A -CONSTANT: GL_TIMEOUT_EXPIRED HEX: 911B -CONSTANT: GL_CONDITION_SATISFIED HEX: 911C -CONSTANT: GL_WAIT_FAILED HEX: 911D -CONSTANT: GL_SYNC_FLUSH_COMMANDS_BIT HEX: 00000001 -CONSTANT: GL_TIMEOUT_IGNORED HEX: FFFF,FFFF,FFFF,FFFF -CONSTANT: GL_SAMPLE_POSITION HEX: 8E50 -CONSTANT: GL_SAMPLE_MASK HEX: 8E51 -CONSTANT: GL_SAMPLE_MASK_VALUE HEX: 8E52 -CONSTANT: GL_MAX_SAMPLE_MASK_WORDS HEX: 8E59 -CONSTANT: GL_TEXTURE_2D_MULTISAMPLE HEX: 9100 -CONSTANT: GL_PROXY_TEXTURE_2D_MULTISAMPLE HEX: 9101 -CONSTANT: GL_TEXTURE_2D_MULTISAMPLE_ARRAY HEX: 9102 -CONSTANT: GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY HEX: 9103 -CONSTANT: GL_TEXTURE_BINDING_2D_MULTISAMPLE HEX: 9104 -CONSTANT: GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY HEX: 9105 -CONSTANT: GL_TEXTURE_SAMPLES HEX: 9106 -CONSTANT: GL_TEXTURE_FIXED_SAMPLE_LOCATIONS HEX: 9107 -CONSTANT: GL_SAMPLER_2D_MULTISAMPLE HEX: 9108 -CONSTANT: GL_INT_SAMPLER_2D_MULTISAMPLE HEX: 9109 -CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE HEX: 910A -CONSTANT: GL_SAMPLER_2D_MULTISAMPLE_ARRAY HEX: 910B -CONSTANT: GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY HEX: 910C -CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY HEX: 910D -CONSTANT: GL_MAX_COLOR_TEXTURE_SAMPLES HEX: 910E -CONSTANT: GL_MAX_DEPTH_TEXTURE_SAMPLES HEX: 910F -CONSTANT: GL_MAX_INTEGER_SAMPLES HEX: 9110 -CONSTANT: GL_DEPTH_CLAMP HEX: 864F -CONSTANT: GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION HEX: 8E4C -CONSTANT: GL_FIRST_VERTEX_CONVENTION HEX: 8E4D -CONSTANT: GL_LAST_VERTEX_CONVENTION HEX: 8E4E -CONSTANT: GL_PROVOKING_VERTEX HEX: 8E4F -CONSTANT: GL_TEXTURE_CUBE_MAP_SEAMLESS HEX: 884F +CONSTANT: GL_CONTEXT_CORE_PROFILE_BIT 0x00000001 +CONSTANT: GL_CONTEXT_COMPATIBILITY_PROFILE_BIT 0x00000002 +CONSTANT: GL_LINES_ADJACENCY 0x000A +CONSTANT: GL_LINE_STRIP_ADJACENCY 0x000B +CONSTANT: GL_TRIANGLES_ADJACENCY 0x000C +CONSTANT: GL_TRIANGLE_STRIP_ADJACENCY 0x000D +CONSTANT: GL_PROGRAM_POINT_SIZE 0x8642 +CONSTANT: GL_GEOMETRY_VERTICES_OUT 0x8916 +CONSTANT: GL_GEOMETRY_INPUT_TYPE 0x8917 +CONSTANT: GL_GEOMETRY_OUTPUT_TYPE 0x8918 +CONSTANT: GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS 0x8C29 +CONSTANT: GL_FRAMEBUFFER_ATTACHMENT_LAYERED 0x8DA7 +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS 0x8DA8 +CONSTANT: GL_GEOMETRY_SHADER 0x8DD9 +CONSTANT: GL_MAX_GEOMETRY_UNIFORM_COMPONENTS 0x8DDF +CONSTANT: GL_MAX_GEOMETRY_OUTPUT_VERTICES 0x8DE0 +CONSTANT: GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS 0x8DE1 +CONSTANT: GL_MAX_VERTEX_OUTPUT_COMPONENTS 0x9122 +CONSTANT: GL_MAX_GEOMETRY_INPUT_COMPONENTS 0x9123 +CONSTANT: GL_MAX_GEOMETRY_OUTPUT_COMPONENTS 0x9124 +CONSTANT: GL_MAX_FRAGMENT_INPUT_COMPONENTS 0x9125 +CONSTANT: GL_CONTEXT_PROFILE_MASK 0x9126 +CONSTANT: GL_MAX_SERVER_WAIT_TIMEOUT 0x9111 +CONSTANT: GL_OBJECT_TYPE 0x9112 +CONSTANT: GL_SYNC_CONDITION 0x9113 +CONSTANT: GL_SYNC_STATUS 0x9114 +CONSTANT: GL_SYNC_FLAGS 0x9115 +CONSTANT: GL_SYNC_FENCE 0x9116 +CONSTANT: GL_SYNC_GPU_COMMANDS_COMPLETE 0x9117 +CONSTANT: GL_UNSIGNALED 0x9118 +CONSTANT: GL_SIGNALED 0x9119 +CONSTANT: GL_ALREADY_SIGNALED 0x911A +CONSTANT: GL_TIMEOUT_EXPIRED 0x911B +CONSTANT: GL_CONDITION_SATISFIED 0x911C +CONSTANT: GL_WAIT_FAILED 0x911D +CONSTANT: GL_SYNC_FLUSH_COMMANDS_BIT 0x00000001 +CONSTANT: GL_TIMEOUT_IGNORED 0xFFFF,FFFF,FFFF,FFFF +CONSTANT: GL_SAMPLE_POSITION 0x8E50 +CONSTANT: GL_SAMPLE_MASK 0x8E51 +CONSTANT: GL_SAMPLE_MASK_VALUE 0x8E52 +CONSTANT: GL_MAX_SAMPLE_MASK_WORDS 0x8E59 +CONSTANT: GL_TEXTURE_2D_MULTISAMPLE 0x9100 +CONSTANT: GL_PROXY_TEXTURE_2D_MULTISAMPLE 0x9101 +CONSTANT: GL_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9102 +CONSTANT: GL_PROXY_TEXTURE_2D_MULTISAMPLE_ARRAY 0x9103 +CONSTANT: GL_TEXTURE_BINDING_2D_MULTISAMPLE 0x9104 +CONSTANT: GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY 0x9105 +CONSTANT: GL_TEXTURE_SAMPLES 0x9106 +CONSTANT: GL_TEXTURE_FIXED_SAMPLE_LOCATIONS 0x9107 +CONSTANT: GL_SAMPLER_2D_MULTISAMPLE 0x9108 +CONSTANT: GL_INT_SAMPLER_2D_MULTISAMPLE 0x9109 +CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE 0x910A +CONSTANT: GL_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910B +CONSTANT: GL_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910C +CONSTANT: GL_UNSIGNED_INT_SAMPLER_2D_MULTISAMPLE_ARRAY 0x910D +CONSTANT: GL_MAX_COLOR_TEXTURE_SAMPLES 0x910E +CONSTANT: GL_MAX_DEPTH_TEXTURE_SAMPLES 0x910F +CONSTANT: GL_MAX_INTEGER_SAMPLES 0x9110 +CONSTANT: GL_DEPTH_CLAMP 0x864F +CONSTANT: GL_QUADS_FOLLOW_PROVOKING_VERTEX_CONVENTION 0x8E4C +CONSTANT: GL_FIRST_VERTEX_CONVENTION 0x8E4D +CONSTANT: GL_LAST_VERTEX_CONVENTION 0x8E4E +CONSTANT: GL_PROVOKING_VERTEX 0x8E4F +CONSTANT: GL_TEXTURE_CUBE_MAP_SEAMLESS 0x884F GL-FUNCTION: void glFramebufferTexture { glFramebufferTextureARB glFramebufferTextureEXT } ( GLenum target, GLenum attachment, GLuint texture, GLint level ) ; @@ -2260,27 +2260,27 @@ GL-FUNCTION: void glSampleMaski { } ( GLuint index, GLbitfield mask ) ; ! OpenGL 3.3 -CONSTANT: GL_SRC1_COLOR HEX: 88F9 -CONSTANT: GL_ONE_MINUS_SRC1_COLOR HEX: 88FA -CONSTANT: GL_ONE_MINUS_SRC1_ALPHA HEX: 88FB -CONSTANT: GL_MAX_DUAL_SOURCE_DRAW_BUFFERS HEX: 88FC +CONSTANT: GL_SRC1_COLOR 0x88F9 +CONSTANT: GL_ONE_MINUS_SRC1_COLOR 0x88FA +CONSTANT: GL_ONE_MINUS_SRC1_ALPHA 0x88FB +CONSTANT: GL_MAX_DUAL_SOURCE_DRAW_BUFFERS 0x88FC -CONSTANT: GL_ANY_SAMPLES_PASSED HEX: 8C2F +CONSTANT: GL_ANY_SAMPLES_PASSED 0x8C2F -CONSTANT: GL_SAMPLER_BINDING HEX: 8919 +CONSTANT: GL_SAMPLER_BINDING 0x8919 -CONSTANT: GL_RGB10_A2UI HEX: 906F +CONSTANT: GL_RGB10_A2UI 0x906F -CONSTANT: GL_TEXTURE_SWIZZLE_R HEX: 8E42 -CONSTANT: GL_TEXTURE_SWIZZLE_G HEX: 8E43 -CONSTANT: GL_TEXTURE_SWIZZLE_B HEX: 8E44 -CONSTANT: GL_TEXTURE_SWIZZLE_A HEX: 8E45 -CONSTANT: GL_TEXTURE_SWIZZLE_RGBA HEX: 8E46 +CONSTANT: GL_TEXTURE_SWIZZLE_R 0x8E42 +CONSTANT: GL_TEXTURE_SWIZZLE_G 0x8E43 +CONSTANT: GL_TEXTURE_SWIZZLE_B 0x8E44 +CONSTANT: GL_TEXTURE_SWIZZLE_A 0x8E45 +CONSTANT: GL_TEXTURE_SWIZZLE_RGBA 0x8E46 -CONSTANT: GL_TIME_ELAPSED HEX: 88BF -CONSTANT: GL_TIMESTAMP HEX: 8E28 +CONSTANT: GL_TIME_ELAPSED 0x88BF +CONSTANT: GL_TIMESTAMP 0x8E28 -CONSTANT: GL_INT_2_10_10_10_REV HEX: 8D9F +CONSTANT: GL_INT_2_10_10_10_REV 0x8D9F GL-FUNCTION: void glBindFragDataLocationIndexed { } ( GLuint program, GLuint colorNumber, GLuint index, GLstring name ) ; GL-FUNCTION: GLint glGetFragDataIndex { } ( GLuint program, GLstring name ) ; @@ -2346,76 +2346,76 @@ GL-FUNCTION: void glVertexAttribP4uiv { } ( GLuint index, GLenum type, GLboolean ! OpenGL 4.0 -CONSTANT: GL_DRAW_INDIRECT_BUFFER HEX: 8F3F -CONSTANT: GL_DRAW_INDIRECT_BUFFER_BINDING HEX: 8F43 - -CONSTANT: GL_GEOMETRY_SHADER_INVOCATIONS HEX: 887F -CONSTANT: GL_MAX_GEOMETRY_SHADER_INVOCATIONS HEX: 8E5A -CONSTANT: GL_MIN_FRAGMENT_INTERPOLATION_OFFSET HEX: 8E5B -CONSTANT: GL_MAX_FRAGMENT_INTERPOLATION_OFFSET HEX: 8E5C -CONSTANT: GL_FRAGMENT_INTERPOLATION_OFFSET_BITS HEX: 8E5D -CONSTANT: GL_MAX_VERTEX_STREAMS HEX: 8E71 - -CONSTANT: GL_DOUBLE_VEC2 HEX: 8FFC -CONSTANT: GL_DOUBLE_VEC3 HEX: 8FFD -CONSTANT: GL_DOUBLE_VEC4 HEX: 8FFE -CONSTANT: GL_DOUBLE_MAT2 HEX: 8F46 -CONSTANT: GL_DOUBLE_MAT3 HEX: 8F47 -CONSTANT: GL_DOUBLE_MAT4 HEX: 8F48 -CONSTANT: GL_DOUBLE_MAT2x3 HEX: 8F49 -CONSTANT: GL_DOUBLE_MAT2x4 HEX: 8F4A -CONSTANT: GL_DOUBLE_MAT3x2 HEX: 8F4B -CONSTANT: GL_DOUBLE_MAT3x4 HEX: 8F4C -CONSTANT: GL_DOUBLE_MAT4x2 HEX: 8F4D -CONSTANT: GL_DOUBLE_MAT4x3 HEX: 8F4E - -CONSTANT: GL_ACTIVE_SUBROUTINES HEX: 8DE5 -CONSTANT: GL_ACTIVE_SUBROUTINE_UNIFORMS HEX: 8DE6 -CONSTANT: GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS HEX: 8E47 -CONSTANT: GL_ACTIVE_SUBROUTINE_MAX_LENGTH HEX: 8E48 -CONSTANT: GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH HEX: 8E49 -CONSTANT: GL_MAX_SUBROUTINES HEX: 8DE7 -CONSTANT: GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS HEX: 8DE8 -CONSTANT: GL_NUM_COMPATIBLE_SUBROUTINES HEX: 8E4A -CONSTANT: GL_COMPATIBLE_SUBROUTINES HEX: 8E4B - -CONSTANT: GL_PATCHES HEX: 000E -CONSTANT: GL_PATCH_VERTICES HEX: 8E72 -CONSTANT: GL_PATCH_DEFAULT_INNER_LEVEL HEX: 8E73 -CONSTANT: GL_PATCH_DEFAULT_OUTER_LEVEL HEX: 8E74 -CONSTANT: GL_TESS_CONTROL_OUTPUT_VERTICES HEX: 8E75 -CONSTANT: GL_TESS_GEN_MODE HEX: 8E76 -CONSTANT: GL_TESS_GEN_SPACING HEX: 8E77 -CONSTANT: GL_TESS_GEN_VERTEX_ORDER HEX: 8E78 -CONSTANT: GL_TESS_GEN_POINT_MODE HEX: 8E79 -CONSTANT: GL_ISOLINES HEX: 8E7A -CONSTANT: GL_FRACTIONAL_ODD HEX: 8E7B -CONSTANT: GL_FRACTIONAL_EVEN HEX: 8E7C -CONSTANT: GL_MAX_PATCH_VERTICES HEX: 8E7D -CONSTANT: GL_MAX_TESS_GEN_LEVEL HEX: 8E7E -CONSTANT: GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS HEX: 8E7F -CONSTANT: GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS HEX: 8E80 -CONSTANT: GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS HEX: 8E81 -CONSTANT: GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS HEX: 8E82 -CONSTANT: GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS HEX: 8E83 -CONSTANT: GL_MAX_TESS_PATCH_COMPONENTS HEX: 8E84 -CONSTANT: GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS HEX: 8E85 -CONSTANT: GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS HEX: 8E86 -CONSTANT: GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS HEX: 8E89 -CONSTANT: GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS HEX: 8E8A -CONSTANT: GL_MAX_TESS_CONTROL_INPUT_COMPONENTS HEX: 886C -CONSTANT: GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS HEX: 886D -CONSTANT: GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS HEX: 8E1E -CONSTANT: GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS HEX: 8E1F -CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER HEX: 84F0 -CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER HEX: 84F1 -CONSTANT: GL_TESS_EVALUATION_SHADER HEX: 8E87 -CONSTANT: GL_TESS_CONTROL_SHADER HEX: 8E88 -CONSTANT: GL_TRANSFORM_FEEDBACK HEX: 8E22 -CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED HEX: 8E23 -CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE HEX: 8E24 -CONSTANT: GL_TRANSFORM_FEEDBACK_BINDING HEX: 8E25 -CONSTANT: GL_MAX_TRANSFORM_FEEDBACK_BUFFERS HEX: 8E70 +CONSTANT: GL_DRAW_INDIRECT_BUFFER 0x8F3F +CONSTANT: GL_DRAW_INDIRECT_BUFFER_BINDING 0x8F43 + +CONSTANT: GL_GEOMETRY_SHADER_INVOCATIONS 0x887F +CONSTANT: GL_MAX_GEOMETRY_SHADER_INVOCATIONS 0x8E5A +CONSTANT: GL_MIN_FRAGMENT_INTERPOLATION_OFFSET 0x8E5B +CONSTANT: GL_MAX_FRAGMENT_INTERPOLATION_OFFSET 0x8E5C +CONSTANT: GL_FRAGMENT_INTERPOLATION_OFFSET_BITS 0x8E5D +CONSTANT: GL_MAX_VERTEX_STREAMS 0x8E71 + +CONSTANT: GL_DOUBLE_VEC2 0x8FFC +CONSTANT: GL_DOUBLE_VEC3 0x8FFD +CONSTANT: GL_DOUBLE_VEC4 0x8FFE +CONSTANT: GL_DOUBLE_MAT2 0x8F46 +CONSTANT: GL_DOUBLE_MAT3 0x8F47 +CONSTANT: GL_DOUBLE_MAT4 0x8F48 +CONSTANT: GL_DOUBLE_MAT2x3 0x8F49 +CONSTANT: GL_DOUBLE_MAT2x4 0x8F4A +CONSTANT: GL_DOUBLE_MAT3x2 0x8F4B +CONSTANT: GL_DOUBLE_MAT3x4 0x8F4C +CONSTANT: GL_DOUBLE_MAT4x2 0x8F4D +CONSTANT: GL_DOUBLE_MAT4x3 0x8F4E + +CONSTANT: GL_ACTIVE_SUBROUTINES 0x8DE5 +CONSTANT: GL_ACTIVE_SUBROUTINE_UNIFORMS 0x8DE6 +CONSTANT: GL_ACTIVE_SUBROUTINE_UNIFORM_LOCATIONS 0x8E47 +CONSTANT: GL_ACTIVE_SUBROUTINE_MAX_LENGTH 0x8E48 +CONSTANT: GL_ACTIVE_SUBROUTINE_UNIFORM_MAX_LENGTH 0x8E49 +CONSTANT: GL_MAX_SUBROUTINES 0x8DE7 +CONSTANT: GL_MAX_SUBROUTINE_UNIFORM_LOCATIONS 0x8DE8 +CONSTANT: GL_NUM_COMPATIBLE_SUBROUTINES 0x8E4A +CONSTANT: GL_COMPATIBLE_SUBROUTINES 0x8E4B + +CONSTANT: GL_PATCHES 0x000E +CONSTANT: GL_PATCH_VERTICES 0x8E72 +CONSTANT: GL_PATCH_DEFAULT_INNER_LEVEL 0x8E73 +CONSTANT: GL_PATCH_DEFAULT_OUTER_LEVEL 0x8E74 +CONSTANT: GL_TESS_CONTROL_OUTPUT_VERTICES 0x8E75 +CONSTANT: GL_TESS_GEN_MODE 0x8E76 +CONSTANT: GL_TESS_GEN_SPACING 0x8E77 +CONSTANT: GL_TESS_GEN_VERTEX_ORDER 0x8E78 +CONSTANT: GL_TESS_GEN_POINT_MODE 0x8E79 +CONSTANT: GL_ISOLINES 0x8E7A +CONSTANT: GL_FRACTIONAL_ODD 0x8E7B +CONSTANT: GL_FRACTIONAL_EVEN 0x8E7C +CONSTANT: GL_MAX_PATCH_VERTICES 0x8E7D +CONSTANT: GL_MAX_TESS_GEN_LEVEL 0x8E7E +CONSTANT: GL_MAX_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E7F +CONSTANT: GL_MAX_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E80 +CONSTANT: GL_MAX_TESS_CONTROL_TEXTURE_IMAGE_UNITS 0x8E81 +CONSTANT: GL_MAX_TESS_EVALUATION_TEXTURE_IMAGE_UNITS 0x8E82 +CONSTANT: GL_MAX_TESS_CONTROL_OUTPUT_COMPONENTS 0x8E83 +CONSTANT: GL_MAX_TESS_PATCH_COMPONENTS 0x8E84 +CONSTANT: GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS 0x8E85 +CONSTANT: GL_MAX_TESS_EVALUATION_OUTPUT_COMPONENTS 0x8E86 +CONSTANT: GL_MAX_TESS_CONTROL_UNIFORM_BLOCKS 0x8E89 +CONSTANT: GL_MAX_TESS_EVALUATION_UNIFORM_BLOCKS 0x8E8A +CONSTANT: GL_MAX_TESS_CONTROL_INPUT_COMPONENTS 0x886C +CONSTANT: GL_MAX_TESS_EVALUATION_INPUT_COMPONENTS 0x886D +CONSTANT: GL_MAX_COMBINED_TESS_CONTROL_UNIFORM_COMPONENTS 0x8E1E +CONSTANT: GL_MAX_COMBINED_TESS_EVALUATION_UNIFORM_COMPONENTS 0x8E1F +CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER 0x84F0 +CONSTANT: GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER 0x84F1 +CONSTANT: GL_TESS_EVALUATION_SHADER 0x8E87 +CONSTANT: GL_TESS_CONTROL_SHADER 0x8E88 +CONSTANT: GL_TRANSFORM_FEEDBACK 0x8E22 +CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_PAUSED 0x8E23 +CONSTANT: GL_TRANSFORM_FEEDBACK_BUFFER_ACTIVE 0x8E24 +CONSTANT: GL_TRANSFORM_FEEDBACK_BINDING 0x8E25 +CONSTANT: GL_MAX_TRANSFORM_FEEDBACK_BUFFERS 0x8E70 GL-FUNCTION: void glUniform1d { } ( GLint location, GLdouble x ) ; GL-FUNCTION: void glUniform2d { } ( GLint location, GLdouble x, GLdouble y ) ; @@ -2488,65 +2488,65 @@ GL-FUNCTION: void glFramebufferTextureLayerARB { glFramebufferTextureLayerEXT } GL-FUNCTION: void glFramebufferTextureFaceARB { glFramebufferTextureFaceEXT } ( GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face ) ; -CONSTANT: GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB HEX: 8DDD -CONSTANT: GL_MAX_VERTEX_VARYING_COMPONENTS_ARB HEX: 8DDE -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB HEX: 8DA9 +CONSTANT: GL_MAX_GEOMETRY_VARYING_COMPONENTS_ARB 0x8DDD +CONSTANT: GL_MAX_VERTEX_VARYING_COMPONENTS_ARB 0x8DDE +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_ARB 0x8DA9 ! GL_EXT_framebuffer_object -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT HEX: 8CD9 -CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT HEX: 8CDA +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 +CONSTANT: GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA ! GL_ARB_texture_float -CONSTANT: GL_ALPHA32F_ARB HEX: 8816 -CONSTANT: GL_INTENSITY32F_ARB HEX: 8817 -CONSTANT: GL_LUMINANCE32F_ARB HEX: 8818 -CONSTANT: GL_LUMINANCE_ALPHA32F_ARB HEX: 8819 -CONSTANT: GL_ALPHA16F_ARB HEX: 881C -CONSTANT: GL_INTENSITY16F_ARB HEX: 881D -CONSTANT: GL_LUMINANCE16F_ARB HEX: 881E -CONSTANT: GL_LUMINANCE_ALPHA16F_ARB HEX: 881F -CONSTANT: GL_TEXTURE_LUMINANCE_TYPE_ARB HEX: 8C14 -CONSTANT: GL_TEXTURE_INTENSITY_TYPE_ARB HEX: 8C15 +CONSTANT: GL_ALPHA32F_ARB 0x8816 +CONSTANT: GL_INTENSITY32F_ARB 0x8817 +CONSTANT: GL_LUMINANCE32F_ARB 0x8818 +CONSTANT: GL_LUMINANCE_ALPHA32F_ARB 0x8819 +CONSTANT: GL_ALPHA16F_ARB 0x881C +CONSTANT: GL_INTENSITY16F_ARB 0x881D +CONSTANT: GL_LUMINANCE16F_ARB 0x881E +CONSTANT: GL_LUMINANCE_ALPHA16F_ARB 0x881F +CONSTANT: GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 +CONSTANT: GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 ! GL_EXT_texture_integer -CONSTANT: GL_ALPHA32UI_EXT HEX: 8D72 -CONSTANT: GL_INTENSITY32UI_EXT HEX: 8D73 -CONSTANT: GL_LUMINANCE32UI_EXT HEX: 8D74 -CONSTANT: GL_LUMINANCE_ALPHA32UI_EXT HEX: 8D75 +CONSTANT: GL_ALPHA32UI_EXT 0x8D72 +CONSTANT: GL_INTENSITY32UI_EXT 0x8D73 +CONSTANT: GL_LUMINANCE32UI_EXT 0x8D74 +CONSTANT: GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 -CONSTANT: GL_ALPHA16UI_EXT HEX: 8D78 -CONSTANT: GL_INTENSITY16UI_EXT HEX: 8D79 -CONSTANT: GL_LUMINANCE16UI_EXT HEX: 8D7A -CONSTANT: GL_LUMINANCE_ALPHA16UI_EXT HEX: 8D7B +CONSTANT: GL_ALPHA16UI_EXT 0x8D78 +CONSTANT: GL_INTENSITY16UI_EXT 0x8D79 +CONSTANT: GL_LUMINANCE16UI_EXT 0x8D7A +CONSTANT: GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B -CONSTANT: GL_ALPHA8UI_EXT HEX: 8D7E -CONSTANT: GL_INTENSITY8UI_EXT HEX: 8D7F -CONSTANT: GL_LUMINANCE8UI_EXT HEX: 8D80 -CONSTANT: GL_LUMINANCE_ALPHA8UI_EXT HEX: 8D81 +CONSTANT: GL_ALPHA8UI_EXT 0x8D7E +CONSTANT: GL_INTENSITY8UI_EXT 0x8D7F +CONSTANT: GL_LUMINANCE8UI_EXT 0x8D80 +CONSTANT: GL_LUMINANCE_ALPHA8UI_EXT 0x8D81 -CONSTANT: GL_ALPHA32I_EXT HEX: 8D84 -CONSTANT: GL_INTENSITY32I_EXT HEX: 8D85 -CONSTANT: GL_LUMINANCE32I_EXT HEX: 8D86 -CONSTANT: GL_LUMINANCE_ALPHA32I_EXT HEX: 8D87 +CONSTANT: GL_ALPHA32I_EXT 0x8D84 +CONSTANT: GL_INTENSITY32I_EXT 0x8D85 +CONSTANT: GL_LUMINANCE32I_EXT 0x8D86 +CONSTANT: GL_LUMINANCE_ALPHA32I_EXT 0x8D87 -CONSTANT: GL_ALPHA16I_EXT HEX: 8D8A -CONSTANT: GL_INTENSITY16I_EXT HEX: 8D8B -CONSTANT: GL_LUMINANCE16I_EXT HEX: 8D8C -CONSTANT: GL_LUMINANCE_ALPHA16I_EXT HEX: 8D8D +CONSTANT: GL_ALPHA16I_EXT 0x8D8A +CONSTANT: GL_INTENSITY16I_EXT 0x8D8B +CONSTANT: GL_LUMINANCE16I_EXT 0x8D8C +CONSTANT: GL_LUMINANCE_ALPHA16I_EXT 0x8D8D -CONSTANT: GL_ALPHA8I_EXT HEX: 8D90 -CONSTANT: GL_INTENSITY8I_EXT HEX: 8D91 -CONSTANT: GL_LUMINANCE8I_EXT HEX: 8D92 -CONSTANT: GL_LUMINANCE_ALPHA8I_EXT HEX: 8D93 +CONSTANT: GL_ALPHA8I_EXT 0x8D90 +CONSTANT: GL_INTENSITY8I_EXT 0x8D91 +CONSTANT: GL_LUMINANCE8I_EXT 0x8D92 +CONSTANT: GL_LUMINANCE_ALPHA8I_EXT 0x8D93 -CONSTANT: GL_ALPHA_INTEGER_EXT HEX: 8D97 -CONSTANT: GL_LUMINANCE_INTEGER_EXT HEX: 8D9C -CONSTANT: GL_LUMINANCE_ALPHA_INTEGER_EXT HEX: 8D9D +CONSTANT: GL_ALPHA_INTEGER_EXT 0x8D97 +CONSTANT: GL_LUMINANCE_INTEGER_EXT 0x8D9C +CONSTANT: GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D GL-FUNCTION: void glClearColorIiEXT { } ( GLint r, GLint g, GLint b, GLint a ) ; GL-FUNCTION: void glClearColorIuiEXT { } ( GLuint r, GLuint g, GLuint b, GLuint a ) ; @@ -2554,16 +2554,16 @@ GL-FUNCTION: void glClearColorIuiEXT { } ( GLuint r, GLuint g, GLuint b, GLuint ! GL_EXT_texture_compression_s3tc, GL_EXT_texture_compression_dxt1 -CONSTANT: GL_COMPRESSED_RGB_S3TC_DXT1_EXT HEX: 83F0 -CONSTANT: GL_COMPRESSED_RGBA_S3TC_DXT1_EXT HEX: 83F1 -CONSTANT: GL_COMPRESSED_RGBA_S3TC_DXT3_EXT HEX: 83F2 -CONSTANT: GL_COMPRESSED_RGBA_S3TC_DXT5_EXT HEX: 83F3 +CONSTANT: GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 +CONSTANT: GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 +CONSTANT: GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 +CONSTANT: GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 ! GL_EXT_texture_compression_latc -CONSTANT: GL_COMPRESSED_LUMINANCE_LATC1_EXT HEX: 8C70 -CONSTANT: GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT HEX: 8C71 -CONSTANT: GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT HEX: 8C72 -CONSTANT: GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT HEX: 8C73 +CONSTANT: GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 +CONSTANT: GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 +CONSTANT: GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72 +CONSTANT: GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73 diff --git a/basis/opengl/opengl.factor b/basis/opengl/opengl.factor index 9269a4f56c..a8b04eafbc 100644 --- a/basis/opengl/opengl.factor +++ b/basis/opengl/opengl.factor @@ -22,14 +22,14 @@ IN: opengl : error>string ( n -- string ) H{ - { HEX: 0 "No error" } - { HEX: 0501 "Invalid value" } - { HEX: 0500 "Invalid enumerant" } - { HEX: 0502 "Invalid operation" } - { HEX: 0503 "Stack overflow" } - { HEX: 0504 "Stack underflow" } - { HEX: 0505 "Out of memory" } - { HEX: 0506 "Invalid framebuffer operation" } + { 0x0 "No error" } + { 0x0501 "Invalid value" } + { 0x0500 "Invalid enumerant" } + { 0x0502 "Invalid operation" } + { 0x0503 "Stack overflow" } + { 0x0504 "Stack underflow" } + { 0x0505 "Out of memory" } + { 0x0506 "Invalid framebuffer operation" } } at "Unknown error" or ; TUPLE: gl-error function code string ; diff --git a/basis/openssl/libcrypto/libcrypto.factor b/basis/openssl/libcrypto/libcrypto.factor index 3e8252493b..2a6d40035d 100644 --- a/basis/openssl/libcrypto/libcrypto.factor +++ b/basis/openssl/libcrypto/libcrypto.factor @@ -48,11 +48,11 @@ STRUCT: bio { crypto-ex-data-stack void* } { crypto-ex-data-dummy int } ; -CONSTANT: BIO_NOCLOSE HEX: 00 -CONSTANT: BIO_CLOSE HEX: 01 +CONSTANT: BIO_NOCLOSE 0x00 +CONSTANT: BIO_CLOSE 0x01 -CONSTANT: RSA_3 HEX: 3 -CONSTANT: RSA_F4 HEX: 10001 +CONSTANT: RSA_3 0x3 +CONSTANT: RSA_F4 0x10001 CONSTANT: BIO_C_SET_SSL 109 CONSTANT: BIO_C_GET_SSL 110 diff --git a/basis/openssl/libssl/libssl.factor b/basis/openssl/libssl/libssl.factor index 8b3c2e9917..efef9f3bc5 100644 --- a/basis/openssl/libssl/libssl.factor +++ b/basis/openssl/libssl/libssl.factor @@ -252,15 +252,15 @@ FUNCTION: void* BIO_f_ssl ( ) ; : SSL_CTX_set_session_cache_mode ( ctx mode -- n ) [ SSL_CTRL_SET_SESS_CACHE_MODE ] dip f SSL_CTX_ctrl ; -CONSTANT: SSL_SESS_CACHE_OFF HEX: 0000 -CONSTANT: SSL_SESS_CACHE_CLIENT HEX: 0001 -CONSTANT: SSL_SESS_CACHE_SERVER HEX: 0002 +CONSTANT: SSL_SESS_CACHE_OFF 0x0000 +CONSTANT: SSL_SESS_CACHE_CLIENT 0x0001 +CONSTANT: SSL_SESS_CACHE_SERVER 0x0002 CONSTANT: SSL_SESS_CACHE_BOTH flags{ SSL_SESS_CACHE_CLIENT SSL_SESS_CACHE_SERVER } -CONSTANT: SSL_SESS_CACHE_NO_AUTO_CLEAR HEX: 0080 -CONSTANT: SSL_SESS_CACHE_NO_INTERNAL_LOOKUP HEX: 0100 -CONSTANT: SSL_SESS_CACHE_NO_INTERNAL_STORE HEX: 0200 +CONSTANT: SSL_SESS_CACHE_NO_AUTO_CLEAR 0x0080 +CONSTANT: SSL_SESS_CACHE_NO_INTERNAL_LOOKUP 0x0100 +CONSTANT: SSL_SESS_CACHE_NO_INTERNAL_STORE 0x0200 CONSTANT: SSL_SESS_CACHE_NO_INTERNAL flags{ SSL_SESS_CACHE_NO_INTERNAL_LOOKUP SSL_SESS_CACHE_NO_INTERNAL_STORE } diff --git a/basis/prettyprint/prettyprint-tests.factor b/basis/prettyprint/prettyprint-tests.factor index 0a1adae8a0..2eed7b47d2 100644 --- a/basis/prettyprint/prettyprint-tests.factor +++ b/basis/prettyprint/prettyprint-tests.factor @@ -10,14 +10,14 @@ IN: prettyprint.tests [ "4" ] [ 4 unparse ] unit-test [ "4096" ] [ 4096 unparse ] unit-test -[ "BIN: 1000000000000" ] [ 2 number-base [ 4096 unparse ] with-variable ] unit-test -[ "OCT: 10000" ] [ 8 number-base [ 4096 unparse ] with-variable ] unit-test -[ "HEX: 1000" ] [ 16 number-base [ 4096 unparse ] with-variable ] unit-test +[ "0b1000000000000" ] [ 2 number-base [ 4096 unparse ] with-variable ] unit-test +[ "0o10000" ] [ 8 number-base [ 4096 unparse ] with-variable ] unit-test +[ "0x1000" ] [ 16 number-base [ 4096 unparse ] with-variable ] unit-test [ "1.0" ] [ 1.0 unparse ] unit-test [ "8.0" ] [ 8.0 unparse ] unit-test [ "8.0" ] [ 2 number-base [ 8.0 unparse ] with-variable ] unit-test [ "8.0" ] [ 8 number-base [ 8.0 unparse ] with-variable ] unit-test -[ "HEX: 1.0p3" ] [ 16 number-base [ 8.0 unparse ] with-variable ] unit-test +[ "0x1.0p3" ] [ 16 number-base [ 8.0 unparse ] with-variable ] unit-test [ "1267650600228229401496703205376" ] [ 1 100 shift unparse ] unit-test [ "+" ] [ \ + unparse ] unit-test diff --git a/basis/random/mersenne-twister/mersenne-twister.factor b/basis/random/mersenne-twister/mersenne-twister.factor index 3d379bb4ec..908e62fe66 100644 --- a/basis/random/mersenne-twister/mersenne-twister.factor +++ b/basis/random/mersenne-twister/mersenne-twister.factor @@ -14,7 +14,7 @@ TUPLE: mersenne-twister { seq uint-array } { i fixnum } ; CONSTANT: n 624 CONSTANT: m 397 -CONSTANT: a uint-array{ 0 HEX: 9908b0df } +CONSTANT: a uint-array{ 0 0x9908b0df } : y ( n seq -- y ) [ nth-unsafe 31 mask-bit ] @@ -49,8 +49,8 @@ CONSTANT: a uint-array{ 0 HEX: 9908b0df } : mt-temper ( y -- yt ) dup -11 shift bitxor - dup 7 shift HEX: 9d2c5680 bitand bitxor - dup 15 shift HEX: efc60000 bitand bitxor + dup 7 shift 0x9d2c5680 bitand bitxor + dup 15 shift 0xefc60000 bitand bitxor dup -18 shift bitxor ; inline : next-index ( mt -- i ) diff --git a/basis/random/sfmt/sfmt.factor b/basis/random/sfmt/sfmt.factor index d2c4e2d448..4777058bae 100644 --- a/basis/random/sfmt/sfmt.factor +++ b/basis/random/sfmt/sfmt.factor @@ -160,8 +160,8 @@ M: sfmt seed-random ( sfmt seed -- sfmt ) : ( seed -- sfmt ) 156 122 - uint-4{ HEX: dfffffef HEX: ddfecb7f HEX: bffaffff HEX: bffffff6 } - uint-4{ HEX: 1 HEX: 0 HEX: 0 HEX: 13c9e684 } + uint-4{ 0xdfffffef 0xddfecb7f 0xbffaffff 0xbffffff6 } + uint-4{ 0x1 0x0 0x0 0x13c9e684 } ; inline : default-sfmt ( -- sfmt ) diff --git a/basis/regexp/classes/classes.factor b/basis/regexp/classes/classes.factor index f81962f5d8..0f0128a5a5 100644 --- a/basis/regexp/classes/classes.factor +++ b/basis/regexp/classes/classes.factor @@ -96,7 +96,7 @@ M: hex-digit-class class-member? ( obj class -- ? ) : java-blank? ( ch -- ? ) { CHAR: \s CHAR: \t CHAR: \n - HEX: b HEX: 7 CHAR: \r + 0xb 0x7 CHAR: \r } member? ; M: java-blank-class class-member? ( obj class -- ? ) diff --git a/basis/regexp/parser/parser.factor b/basis/regexp/parser/parser.factor index a038351cb0..41e9d19ba4 100644 --- a/basis/regexp/parser/parser.factor +++ b/basis/regexp/parser/parser.factor @@ -73,9 +73,9 @@ MEMO: simple-category-table ( -- table ) { CHAR: t [ CHAR: \t ] } { CHAR: n [ CHAR: \n ] } { CHAR: r [ CHAR: \r ] } - { CHAR: f [ HEX: c ] } - { CHAR: a [ HEX: 7 ] } - { CHAR: e [ HEX: 1b ] } + { CHAR: f [ 0xc ] } + { CHAR: a [ 0x7 ] } + { CHAR: e [ 0x1b ] } { CHAR: \\ [ CHAR: \\ ] } { CHAR: w [ c-identifier-class ] } diff --git a/basis/serialize/serialize.factor b/basis/serialize/serialize.factor index 86d5ca8676..3151bea80b 100644 --- a/basis/serialize/serialize.factor +++ b/basis/serialize/serialize.factor @@ -40,12 +40,12 @@ SYMBOL: serialized ! otherwise be confused with a small number. : serialize-cell ( n -- ) [ 0 write1 ] [ - dup HEX: 7e <= [ - HEX: 80 bitor write1 + dup 0x7e <= [ + 0x80 bitor write1 ] [ dup log2 8 /i 1 + - dup HEX: 7f >= [ - HEX: ff write1 + dup 0x7f >= [ + 0xff write1 dup serialize-cell ] [ dup write1 @@ -56,8 +56,8 @@ SYMBOL: serialized : deserialize-cell ( -- n ) read1 { - { [ dup HEX: ff = ] [ drop deserialize-cell read be> ] } - { [ dup HEX: 80 >= ] [ HEX: 80 bitxor ] } + { [ dup 0xff = ] [ drop deserialize-cell read be> ] } + { [ dup 0x80 >= ] [ 0x80 bitxor ] } [ read be> ] } cond ; diff --git a/basis/simple-flat-file/simple-flat-file-tests.factor b/basis/simple-flat-file/simple-flat-file-tests.factor index 33b6d4ac2a..4949d3f188 100644 --- a/basis/simple-flat-file/simple-flat-file-tests.factor +++ b/basis/simple-flat-file/simple-flat-file-tests.factor @@ -14,10 +14,10 @@ MEMO: ( -- code-table ) [ 3 ] [ 3 at ] unit-test [ 3 ] [ 3 value-at ] unit-test -[ HEX: AD2A ] [ HEX: 8253 at ] unit-test -[ HEX: 8253 ] [ HEX: AD2A value-at ] unit-test +[ 0xAD2A ] [ 0x8253 at ] unit-test +[ 0x8253 ] [ 0xAD2A value-at ] unit-test -[ HEX: AD31 ] [ HEX: 8258 at ] unit-test -[ HEX: 8258 ] [ HEX: AD31 value-at ] unit-test +[ 0xAD31 ] [ 0x8258 at ] unit-test +[ 0x8258 ] [ 0xAD31 value-at ] unit-test diff --git a/basis/specialized-arrays/specialized-arrays-tests.factor b/basis/specialized-arrays/specialized-arrays-tests.factor index 48328a5c13..ca0194daad 100644 --- a/basis/specialized-arrays/specialized-arrays-tests.factor +++ b/basis/specialized-arrays/specialized-arrays-tests.factor @@ -37,8 +37,8 @@ SPECIALIZED-ARRAYS: bool uchar ushort char uint float ulonglong ; int-array{ 3 1 3 3 7 } malloc-byte-array 5 int >array ] unit-test -[ float-array{ HEX: 1.222,222 HEX: 1.111,112 } ] -[ float-array{ HEX: 1.222,222,2 HEX: 1.111,111,1 } ] unit-test +[ float-array{ 0x1.222,222 0x1.111,112 } ] +[ float-array{ 0x1.222,222,2 0x1.111,111,1 } ] unit-test [ f ] [ float-array{ 4 3 2 1 } dup clone [ underlying>> ] bi@ eq? ] unit-test diff --git a/basis/system-info/macosx/macosx.factor b/basis/system-info/macosx/macosx.factor index 62c6e9d156..8b4a4fda35 100644 --- a/basis/system-info/macosx/macosx.factor +++ b/basis/system-info/macosx/macosx.factor @@ -24,18 +24,18 @@ FUNCTION: OSErr Gestalt ( OSType selector, SInt32* response ) ; : system-version-bugfix ( -- n ) "sys3" be> gestalt ; CONSTANT: system-code-names H{ - { HEX: 1070 "Lion" } - { HEX: 1060 "Snow Leopard" } - { HEX: 1050 "Leopard" } - { HEX: 1040 "Tiger" } - { HEX: 1030 "Panther" } - { HEX: 1020 "Jaguar" } - { HEX: 1010 "Puma" } - { HEX: 1000 "Cheetah" } + { 0x1070 "Lion" } + { 0x1060 "Snow Leopard" } + { 0x1050 "Leopard" } + { 0x1040 "Tiger" } + { 0x1030 "Panther" } + { 0x1020 "Jaguar" } + { 0x1010 "Puma" } + { 0x1000 "Cheetah" } } : system-code-name ( -- str/f ) - system-version HEX: FFF0 bitand system-code-names at ; + system-version 0xFFF0 bitand system-code-names at ; PRIVATE> diff --git a/basis/system-info/windows/windows.factor b/basis/system-info/windows/windows.factor index 9af9910aba..7bd5a8b8fd 100644 --- a/basis/system-info/windows/windows.factor +++ b/basis/system-info/windows/windows.factor @@ -20,7 +20,7 @@ IN: system-info.windows ! 0 = x86, 6 = Intel Itanium, 9 = x64 (AMD or Intel), 10 = WOW64, 0xffff = Unk : processor-architecture ( -- n ) - system-info dwOemId>> HEX: ffff0000 bitand ; + system-info dwOemId>> 0xffff0000 bitand ; : os-version-struct ( -- os-version ) OSVERSIONINFO diff --git a/basis/tools/deploy/macosx/macosx.factor b/basis/tools/deploy/macosx/macosx.factor index 4d62ee399a..98b3d2528a 100644 --- a/basis/tools/deploy/macosx/macosx.factor +++ b/basis/tools/deploy/macosx/macosx.factor @@ -59,7 +59,7 @@ IN: tools.deploy.macosx [ create-app-plist ] [ "Contents/MacOS/" append-path copy-vm ] } 2cleave - dup OCT: 755 set-file-permissions ; + dup 0o755 set-file-permissions ; : deploy.app-image ( vocab bundle-name -- str ) [ % "/Contents/Resources/" % % ".image" % ] "" make ; diff --git a/basis/tools/deploy/unix/unix.factor b/basis/tools/deploy/unix/unix.factor index 95abb0d875..629e607b62 100644 --- a/basis/tools/deploy/unix/unix.factor +++ b/basis/tools/deploy/unix/unix.factor @@ -7,7 +7,7 @@ IN: tools.deploy.unix : create-app-dir ( vocab bundle-name -- vm ) copy-vm - dup OCT: 755 set-file-permissions ; + dup 0o755 set-file-permissions ; : bundle-name ( -- str ) deploy-name get ; diff --git a/basis/ui/backend/cocoa/views/views.factor b/basis/ui/backend/cocoa/views/views.factor index 788939f23a..38dd21c10d 100644 --- a/basis/ui/backend/cocoa/views/views.factor +++ b/basis/ui/backend/cocoa/views/views.factor @@ -20,10 +20,10 @@ IN: ui.backend.cocoa.views CONSTANT: modifiers { - { S+ HEX: 20000 } - { C+ HEX: 40000 } - { A+ HEX: 100000 } - { M+ HEX: 80000 } + { S+ 0x20000 } + { C+ 0x40000 } + { A+ 0x100000 } + { M+ 0x80000 } } CONSTANT: key-codes diff --git a/basis/ui/backend/x11/x11.factor b/basis/ui/backend/x11/x11.factor index 49b37abe33..abbd2654be 100644 --- a/basis/ui/backend/x11/x11.factor +++ b/basis/ui/backend/x11/x11.factor @@ -98,37 +98,37 @@ M: x11-ui-backend (pixel-format-attribute) CONSTANT: modifiers { - { S+ HEX: 1 } - { C+ HEX: 4 } - { A+ HEX: 8 } + { S+ 0x1 } + { C+ 0x4 } + { A+ 0x8 } } CONSTANT: key-codes H{ - { HEX: FF08 "BACKSPACE" } - { HEX: FF09 "TAB" } - { HEX: FF0D "RET" } - { HEX: FF8D "ENTER" } - { HEX: FF1B "ESC" } - { HEX: FFFF "DELETE" } - { HEX: FF50 "HOME" } - { HEX: FF51 "LEFT" } - { HEX: FF52 "UP" } - { HEX: FF53 "RIGHT" } - { HEX: FF54 "DOWN" } - { HEX: FF55 "PAGE_UP" } - { HEX: FF56 "PAGE_DOWN" } - { HEX: FF57 "END" } - { HEX: FF58 "BEGIN" } - { HEX: FFBE "F1" } - { HEX: FFBF "F2" } - { HEX: FFC0 "F3" } - { HEX: FFC1 "F4" } - { HEX: FFC2 "F5" } - { HEX: FFC3 "F6" } - { HEX: FFC4 "F7" } - { HEX: FFC5 "F8" } - { HEX: FFC6 "F9" } + { 0xFF08 "BACKSPACE" } + { 0xFF09 "TAB" } + { 0xFF0D "RET" } + { 0xFF8D "ENTER" } + { 0xFF1B "ESC" } + { 0xFFFF "DELETE" } + { 0xFF50 "HOME" } + { 0xFF51 "LEFT" } + { 0xFF52 "UP" } + { 0xFF53 "RIGHT" } + { 0xFF54 "DOWN" } + { 0xFF55 "PAGE_UP" } + { 0xFF56 "PAGE_DOWN" } + { 0xFF57 "END" } + { 0xFF58 "BEGIN" } + { 0xFFBE "F1" } + { 0xFFBF "F2" } + { 0xFFC0 "F3" } + { 0xFFC1 "F4" } + { 0xFFC2 "F5" } + { 0xFFC3 "F6" } + { 0xFFC4 "F7" } + { 0xFFC5 "F8" } + { 0xFFC6 "F9" } } : key-code ( keysym -- keycode action? ) diff --git a/basis/unicode/breaks/breaks.factor b/basis/unicode/breaks/breaks.factor index f4e9b739e3..9aaa273634 100644 --- a/basis/unicode/breaks/breaks.factor +++ b/basis/unicode/breaks/breaks.factor @@ -32,15 +32,15 @@ CONSTANT: graphemes 12 [ dup medial? [ drop V ] [ final? T Any ? ] if ] if ; : hangul-class ( ch -- class ) - hangul-base - HEX: 1C mod zero? LV LVT ? ; + hangul-base - 0x1C mod zero? LV LVT ? ; CATEGORY: grapheme-control Zl Zp Cc Cf ; : control-class ( ch -- class ) { { CHAR: \r [ CR ] } { CHAR: \n [ LF ] } - { HEX: 200C [ Extend ] } - { HEX: 200D [ Extend ] } + { 0x200C [ Extend ] } + { 0x200D [ Extend ] } [ drop Control ] } case ; diff --git a/basis/unicode/case/case-tests.factor b/basis/unicode/case/case-tests.factor index 76fe0088e8..a91667ede3 100644 --- a/basis/unicode/case/case-tests.factor +++ b/basis/unicode/case/case-tests.factor @@ -20,8 +20,8 @@ IN: unicode.case.tests "lt" locale set [ f ] [ i-dot? ] unit-test [ t ] [ lithuanian? ] unit-test - [ "i\u000307\u000300" ] [ HEX: CC 1string nfd >lower ] unit-test - [ "\u00012f\u000307" ] [ HEX: 12E 1string nfd >lower nfc ] unit-test + [ "i\u000307\u000300" ] [ 0xCC 1string nfd >lower ] unit-test + [ "\u00012f\u000307" ] [ 0x12E 1string nfd >lower nfc ] unit-test [ "I\u000300" ] [ "i\u000307\u000300" >upper ] unit-test ! [ "I\u000300" ] [ "i\u000307\u000300" >title ] unit-test ] with-scope diff --git a/basis/unicode/categories/categories-tests.factor b/basis/unicode/categories/categories-tests.factor index 0970df7ad8..59e83c2b29 100644 --- a/basis/unicode/categories/categories-tests.factor +++ b/basis/unicode/categories/categories-tests.factor @@ -8,10 +8,10 @@ IN: unicode.categories.tests printable? alpha? control? uncased? character? } [ execute ] with map ] unit-test [ "Nd" ] [ CHAR: 3 category ] unit-test -[ "Lo" ] [ HEX: 3400 category ] unit-test -[ "Lo" ] [ HEX: 3450 category ] unit-test -[ "Lo" ] [ HEX: 4DB5 category ] unit-test -[ "Cs" ] [ HEX: DD00 category ] unit-test +[ "Lo" ] [ 0x3400 category ] unit-test +[ "Lo" ] [ 0x3450 category ] unit-test +[ "Lo" ] [ 0x4DB5 category ] unit-test +[ "Cs" ] [ 0xDD00 category ] unit-test [ t ] [ CHAR: \t blank? ] unit-test [ t ] [ CHAR: \s blank? ] unit-test [ t ] [ CHAR: \r blank? ] unit-test diff --git a/basis/unicode/collation/collation.factor b/basis/unicode/collation/collation.factor index 05338c8ea4..50d032dd18 100644 --- a/basis/unicode/collation/collation.factor +++ b/basis/unicode/collation/collation.factor @@ -43,17 +43,17 @@ ducet insert-helpers : base ( char -- base ) { - { [ dup HEX: 3400 HEX: 4DB5 between? ] [ drop HEX: FB80 ] } ! Extension A - { [ dup HEX: 20000 HEX: 2A6D6 between? ] [ drop HEX: FB80 ] } ! Extension B - { [ dup HEX: 4E00 HEX: 9FC3 between? ] [ drop HEX: FB40 ] } ! CJK - [ drop HEX: FBC0 ] ! Other + { [ dup 0x3400 0x4DB5 between? ] [ drop 0xFB80 ] } ! Extension A + { [ dup 0x20000 0x2A6D6 between? ] [ drop 0xFB80 ] } ! Extension B + { [ dup 0x4E00 0x9FC3 between? ] [ drop 0xFB40 ] } ! CJK + [ drop 0xFBC0 ] ! Other } cond ; : AAAA ( char -- weight ) - [ base ] [ -15 shift ] bi + HEX: 20 2 f weight boa ; + [ base ] [ -15 shift ] bi + 0x20 2 f weight boa ; : BBBB ( char -- weight ) - HEX: 7FFF bitand HEX: 8000 bitor 0 0 f weight boa ; + 0x7FFF bitand 0x8000 bitor 0 0 f weight boa ; : illegal? ( char -- ? ) { [ "Noncharacter_Code_Point" property? ] [ category "Cs" = ] } 1|| ; @@ -101,7 +101,7 @@ ducet insert-helpers map [ zero? not ] filter % 0 , ; inline : variable-weight ( weight -- ) - dup ignorable?>> [ primary>> ] [ drop HEX: FFFF ] if , ; + dup ignorable?>> [ primary>> ] [ drop 0xFFFF ] if , ; : weights>bytes ( weights -- byte-array ) [ diff --git a/basis/unicode/data/data.factor b/basis/unicode/data/data.factor index 2282828681..a04e689b17 100644 --- a/basis/unicode/data/data.factor +++ b/basis/unicode/data/data.factor @@ -58,7 +58,7 @@ CONSTANT: categories MEMO: categories-map ( -- hashtable ) categories [ swap ] H{ } assoc-map-as ; -CONSTANT: num-chars HEX: 2FA1E +CONSTANT: num-chars 0x2FA1E PRIVATE> @@ -68,9 +68,9 @@ PRIVATE> ! Cf = 26; Mn = 5; Cn = 29 ! Use a compressed array instead? dup category-map ?nth [ ] [ - dup HEX: E0001 HEX: E007F between? + dup 0xE0001 0xE007F between? [ drop 26 ] [ - HEX: E0100 HEX: E01EF between? 5 29 ? + 0xE0100 0xE01EF between? 5 29 ? ] if ] ?if ; diff --git a/basis/unicode/normalize/normalize.factor b/basis/unicode/normalize/normalize.factor index b1cba07511..c0215aedbd 100644 --- a/basis/unicode/normalize/normalize.factor +++ b/basis/unicode/normalize/normalize.factor @@ -8,11 +8,11 @@ IN: unicode.normalize jamo ( hangul -- jamo-string ) hangul-base - final-count /mod final-base + diff --git a/basis/unix/ffi/linux/linux.factor b/basis/unix/ffi/linux/linux.factor index d5de05b8c9..0e568ba46a 100644 --- a/basis/unix/ffi/linux/linux.factor +++ b/basis/unix/ffi/linux/linux.factor @@ -5,15 +5,15 @@ IN: unix.ffi CONSTANT: MAXPATHLEN 1024 -CONSTANT: O_RDONLY HEX: 0000 -CONSTANT: O_WRONLY HEX: 0001 -CONSTANT: O_RDWR HEX: 0002 -CONSTANT: O_CREAT HEX: 0040 -CONSTANT: O_EXCL HEX: 0080 -CONSTANT: O_NOCTTY HEX: 0100 -CONSTANT: O_TRUNC HEX: 0200 -CONSTANT: O_APPEND HEX: 0400 -CONSTANT: O_NONBLOCK HEX: 0800 +CONSTANT: O_RDONLY 0x0000 +CONSTANT: O_WRONLY 0x0001 +CONSTANT: O_RDWR 0x0002 +CONSTANT: O_CREAT 0x0040 +CONSTANT: O_EXCL 0x0080 +CONSTANT: O_NOCTTY 0x0100 +CONSTANT: O_TRUNC 0x0200 +CONSTANT: O_APPEND 0x0400 +CONSTANT: O_NONBLOCK 0x0800 ALIAS: O_NDELAY O_NONBLOCK @@ -23,8 +23,8 @@ CONSTANT: FD_SETSIZE 1024 CONSTANT: SO_REUSEADDR 2 CONSTANT: SO_OOBINLINE 10 -CONSTANT: SO_SNDTIMEO HEX: 15 -CONSTANT: SO_RCVTIMEO HEX: 14 +CONSTANT: SO_SNDTIMEO 0x15 +CONSTANT: SO_RCVTIMEO 0x14 CONSTANT: F_SETFD 2 CONSTANT: FD_CLOEXEC 1 diff --git a/basis/unix/ffi/macosx/macosx.factor b/basis/unix/ffi/macosx/macosx.factor index 5d7643c6db..d17f8caa60 100644 --- a/basis/unix/ffi/macosx/macosx.factor +++ b/basis/unix/ffi/macosx/macosx.factor @@ -5,22 +5,22 @@ IN: unix.ffi CONSTANT: MAXPATHLEN 1024 -CONSTANT: O_RDONLY HEX: 0000 -CONSTANT: O_WRONLY HEX: 0001 -CONSTANT: O_RDWR HEX: 0002 -CONSTANT: O_NONBLOCK HEX: 0004 -CONSTANT: O_APPEND HEX: 0008 -CONSTANT: O_CREAT HEX: 0200 -CONSTANT: O_TRUNC HEX: 0400 -CONSTANT: O_EXCL HEX: 0800 -CONSTANT: O_NOCTTY HEX: 20000 +CONSTANT: O_RDONLY 0x0000 +CONSTANT: O_WRONLY 0x0001 +CONSTANT: O_RDWR 0x0002 +CONSTANT: O_NONBLOCK 0x0004 +CONSTANT: O_APPEND 0x0008 +CONSTANT: O_CREAT 0x0200 +CONSTANT: O_TRUNC 0x0400 +CONSTANT: O_EXCL 0x0800 +CONSTANT: O_NOCTTY 0x20000 ALIAS: O_NDELAY O_NONBLOCK -CONSTANT: SOL_SOCKET HEX: ffff -CONSTANT: SO_REUSEADDR HEX: 4 -CONSTANT: SO_OOBINLINE HEX: 100 -CONSTANT: SO_SNDTIMEO HEX: 1005 -CONSTANT: SO_RCVTIMEO HEX: 1006 +CONSTANT: SOL_SOCKET 0xffff +CONSTANT: SO_REUSEADDR 0x4 +CONSTANT: SO_OOBINLINE 0x100 +CONSTANT: SO_SNDTIMEO 0x1005 +CONSTANT: SO_RCVTIMEO 0x1006 CONSTANT: F_SETFD 2 CONSTANT: F_SETFL 4 diff --git a/basis/unix/kqueue/kqueue.factor b/basis/unix/kqueue/kqueue.factor index c526a8c327..c47ee3ecae 100644 --- a/basis/unix/kqueue/kqueue.factor +++ b/basis/unix/kqueue/kqueue.factor @@ -9,47 +9,47 @@ IN: unix.kqueue FUNCTION: int kqueue ( ) ; ! actions -CONSTANT: EV_ADD HEX: 1 ! add event to kq (implies enable) -CONSTANT: EV_DELETE HEX: 2 ! delete event from kq -CONSTANT: EV_ENABLE HEX: 4 ! enable event -CONSTANT: EV_DISABLE HEX: 8 ! disable event (not reported) +CONSTANT: EV_ADD 0x1 ! add event to kq (implies enable) +CONSTANT: EV_DELETE 0x2 ! delete event from kq +CONSTANT: EV_ENABLE 0x4 ! enable event +CONSTANT: EV_DISABLE 0x8 ! disable event (not reported) ! flags -CONSTANT: EV_ONESHOT HEX: 10 ! only report one occurrence -CONSTANT: EV_CLEAR HEX: 20 ! clear event state after reporting +CONSTANT: EV_ONESHOT 0x10 ! only report one occurrence +CONSTANT: EV_CLEAR 0x20 ! clear event state after reporting -CONSTANT: EV_SYSFLAGS HEX: f000 ! reserved by system -CONSTANT: EV_FLAG0 HEX: 1000 ! filter-specific flag -CONSTANT: EV_FLAG1 HEX: 2000 ! filter-specific flag +CONSTANT: EV_SYSFLAGS 0xf000 ! reserved by system +CONSTANT: EV_FLAG0 0x1000 ! filter-specific flag +CONSTANT: EV_FLAG1 0x2000 ! filter-specific flag ! returned values -CONSTANT: EV_EOF HEX: 8000 ! EOF detected -CONSTANT: EV_ERROR HEX: 4000 ! error, data contains errno +CONSTANT: EV_EOF 0x8000 ! EOF detected +CONSTANT: EV_ERROR 0x4000 ! error, data contains errno ALIAS: EV_POLL EV_FLAG0 ALIAS: EV_OOBAND EV_FLAG1 -CONSTANT: NOTE_LOWAT HEX: 00000001 ! low water mark - -CONSTANT: NOTE_DELETE HEX: 00000001 ! vnode was removed -CONSTANT: NOTE_WRITE HEX: 00000002 ! data contents changed -CONSTANT: NOTE_EXTEND HEX: 00000004 ! size increased -CONSTANT: NOTE_ATTRIB HEX: 00000008 ! attributes changed -CONSTANT: NOTE_LINK HEX: 00000010 ! link count changed -CONSTANT: NOTE_RENAME HEX: 00000020 ! vnode was renamed -CONSTANT: NOTE_REVOKE HEX: 00000040 ! vnode access was revoked - -CONSTANT: NOTE_EXIT HEX: 80000000 ! process exited -CONSTANT: NOTE_FORK HEX: 40000000 ! process forked -CONSTANT: NOTE_EXEC HEX: 20000000 ! process exec'd -CONSTANT: NOTE_PCTRLMASK HEX: f0000000 ! mask for hint bits -CONSTANT: NOTE_PDATAMASK HEX: 000fffff ! mask for pid - -CONSTANT: NOTE_SECONDS HEX: 00000001 ! data is seconds -CONSTANT: NOTE_USECONDS HEX: 00000002 ! data is microseconds -CONSTANT: NOTE_NSECONDS HEX: 00000004 ! data is nanoseconds -CONSTANT: NOTE_ABSOLUTE HEX: 00000008 ! absolute timeout - -CONSTANT: NOTE_TRACK HEX: 00000001 ! follow across forks -CONSTANT: NOTE_TRACKERR HEX: 00000002 ! could not track child -CONSTANT: NOTE_CHILD HEX: 00000004 ! am a child process +CONSTANT: NOTE_LOWAT 0x00000001 ! low water mark + +CONSTANT: NOTE_DELETE 0x00000001 ! vnode was removed +CONSTANT: NOTE_WRITE 0x00000002 ! data contents changed +CONSTANT: NOTE_EXTEND 0x00000004 ! size increased +CONSTANT: NOTE_ATTRIB 0x00000008 ! attributes changed +CONSTANT: NOTE_LINK 0x00000010 ! link count changed +CONSTANT: NOTE_RENAME 0x00000020 ! vnode was renamed +CONSTANT: NOTE_REVOKE 0x00000040 ! vnode access was revoked + +CONSTANT: NOTE_EXIT 0x80000000 ! process exited +CONSTANT: NOTE_FORK 0x40000000 ! process forked +CONSTANT: NOTE_EXEC 0x20000000 ! process exec'd +CONSTANT: NOTE_PCTRLMASK 0xf0000000 ! mask for hint bits +CONSTANT: NOTE_PDATAMASK 0x000fffff ! mask for pid + +CONSTANT: NOTE_SECONDS 0x00000001 ! data is seconds +CONSTANT: NOTE_USECONDS 0x00000002 ! data is microseconds +CONSTANT: NOTE_NSECONDS 0x00000004 ! data is nanoseconds +CONSTANT: NOTE_ABSOLUTE 0x00000008 ! absolute timeout + +CONSTANT: NOTE_TRACK 0x00000001 ! follow across forks +CONSTANT: NOTE_TRACKERR 0x00000002 ! could not track child +CONSTANT: NOTE_CHILD 0x00000004 ! am a child process diff --git a/basis/unix/linux/epoll/epoll.factor b/basis/unix/linux/epoll/epoll.factor index df8e72bc0c..31b5ee5ef1 100644 --- a/basis/unix/linux/epoll/epoll.factor +++ b/basis/unix/linux/epoll/epoll.factor @@ -24,16 +24,16 @@ CONSTANT: EPOLL_CTL_ADD 1 ! Add a file decriptor to the interface. CONSTANT: EPOLL_CTL_DEL 2 ! Remove a file decriptor from the interface. CONSTANT: EPOLL_CTL_MOD 3 ! Change file decriptor epoll_event structure. -CONSTANT: EPOLLIN HEX: 001 -CONSTANT: EPOLLPRI HEX: 002 -CONSTANT: EPOLLOUT HEX: 004 -CONSTANT: EPOLLRDNORM HEX: 040 -CONSTANT: EPOLLRDBAND HEX: 080 -CONSTANT: EPOLLWRNORM HEX: 100 -CONSTANT: EPOLLWRBAND HEX: 200 -CONSTANT: EPOLLMSG HEX: 400 -CONSTANT: EPOLLERR HEX: 008 -CONSTANT: EPOLLHUP HEX: 010 -CONSTANT: EPOLLRDHUP HEX: 2000 +CONSTANT: EPOLLIN 0x001 +CONSTANT: EPOLLPRI 0x002 +CONSTANT: EPOLLOUT 0x004 +CONSTANT: EPOLLRDNORM 0x040 +CONSTANT: EPOLLRDBAND 0x080 +CONSTANT: EPOLLWRNORM 0x100 +CONSTANT: EPOLLWRBAND 0x200 +CONSTANT: EPOLLMSG 0x400 +CONSTANT: EPOLLERR 0x008 +CONSTANT: EPOLLHUP 0x010 +CONSTANT: EPOLLRDHUP 0x2000 : EPOLLONESHOT ( -- n ) 30 2^ ; inline : EPOLLET ( -- n ) 31 2^ ; inline diff --git a/basis/unix/linux/inotify/inotify.factor b/basis/unix/linux/inotify/inotify.factor index 947191e7dd..1e6edc985e 100644 --- a/basis/unix/linux/inotify/inotify.factor +++ b/basis/unix/linux/inotify/inotify.factor @@ -11,31 +11,31 @@ STRUCT: inotify-event { len uint } { name char[0] } ; -CONSTANT: IN_ACCESS HEX: 1 ! File was accessed -CONSTANT: IN_MODIFY HEX: 2 ! File was modified -CONSTANT: IN_ATTRIB HEX: 4 ! Metadata changed -CONSTANT: IN_CLOSE_WRITE HEX: 8 ! Writtable file was closed -CONSTANT: IN_CLOSE_NOWRITE HEX: 10 ! Unwrittable file closed -CONSTANT: IN_OPEN HEX: 20 ! File was opened -CONSTANT: IN_MOVED_FROM HEX: 40 ! File was moved from X -CONSTANT: IN_MOVED_TO HEX: 80 ! File was moved to Y -CONSTANT: IN_CREATE HEX: 100 ! Subfile was created -CONSTANT: IN_DELETE HEX: 200 ! Subfile was deleted -CONSTANT: IN_DELETE_SELF HEX: 400 ! Self was deleted -CONSTANT: IN_MOVE_SELF HEX: 800 ! Self was moved - -CONSTANT: IN_UNMOUNT HEX: 2000 ! Backing fs was unmounted -CONSTANT: IN_Q_OVERFLOW HEX: 4000 ! Event queued overflowed -CONSTANT: IN_IGNORED HEX: 8000 ! File was ignored +CONSTANT: IN_ACCESS 0x1 ! File was accessed +CONSTANT: IN_MODIFY 0x2 ! File was modified +CONSTANT: IN_ATTRIB 0x4 ! Metadata changed +CONSTANT: IN_CLOSE_WRITE 0x8 ! Writtable file was closed +CONSTANT: IN_CLOSE_NOWRITE 0x10 ! Unwrittable file closed +CONSTANT: IN_OPEN 0x20 ! File was opened +CONSTANT: IN_MOVED_FROM 0x40 ! File was moved from X +CONSTANT: IN_MOVED_TO 0x80 ! File was moved to Y +CONSTANT: IN_CREATE 0x100 ! Subfile was created +CONSTANT: IN_DELETE 0x200 ! Subfile was deleted +CONSTANT: IN_DELETE_SELF 0x400 ! Self was deleted +CONSTANT: IN_MOVE_SELF 0x800 ! Self was moved + +CONSTANT: IN_UNMOUNT 0x2000 ! Backing fs was unmounted +CONSTANT: IN_Q_OVERFLOW 0x4000 ! Event queued overflowed +CONSTANT: IN_IGNORED 0x8000 ! File was ignored CONSTANT: IN_CLOSE flags{ IN_CLOSE_WRITE IN_CLOSE_NOWRITE } CONSTANT: IN_MOVE flags{ IN_MOVED_FROM IN_MOVED_TO } -CONSTANT: IN_ONLYDIR HEX: 1000000 ! only watch the path if it is a directory -CONSTANT: IN_DONT_FOLLOW HEX: 2000000 ! don't follow a sym link -CONSTANT: IN_MASK_ADD HEX: 20000000 ! add to the mask of an already existing watch -CONSTANT: IN_ISDIR HEX: 40000000 ! event occurred against dir -CONSTANT: IN_ONESHOT HEX: 80000000 ! only send event once +CONSTANT: IN_ONLYDIR 0x1000000 ! only watch the path if it is a directory +CONSTANT: IN_DONT_FOLLOW 0x2000000 ! don't follow a sym link +CONSTANT: IN_MASK_ADD 0x20000000 ! add to the mask of an already existing watch +CONSTANT: IN_ISDIR 0x40000000 ! event occurred against dir +CONSTANT: IN_ONESHOT 0x80000000 ! only send event once CONSTANT: IN_CHANGE_EVENTS flags{ diff --git a/basis/unix/process/process.factor b/basis/unix/process/process.factor index 7f12c639f8..f0d12d70d3 100644 --- a/basis/unix/process/process.factor +++ b/basis/unix/process/process.factor @@ -65,30 +65,30 @@ CONSTANT: WUNTRACED 2 CONSTANT: WSTOPPED 2 CONSTANT: WEXITED 4 CONSTANT: WCONTINUED 8 -CONSTANT: WNOWAIT HEX: 1000000 +CONSTANT: WNOWAIT 0x1000000 ! Examining status : WTERMSIG ( status -- value ) - HEX: 7f bitand ; inline + 0x7f bitand ; inline : WIFEXITED ( status -- ? ) WTERMSIG 0 = ; inline : WEXITSTATUS ( status -- value ) - HEX: ff00 bitand -8 shift ; inline + 0xff00 bitand -8 shift ; inline : WIFSIGNALED ( status -- ? ) - HEX: 7f bitand 1 + -1 shift 0 > ; inline + 0x7f bitand 1 + -1 shift 0 > ; inline : WCOREFLAG ( -- value ) - HEX: 80 ; inline + 0x80 ; inline : WCOREDUMP ( status -- ? ) WCOREFLAG bitand 0 = not ; inline : WIFSTOPPED ( status -- ? ) - HEX: ff bitand HEX: 7f = ; inline + 0xff bitand 0x7f = ; inline : WSTOPSIG ( status -- value ) WEXITSTATUS ; inline diff --git a/basis/unix/stat/stat.factor b/basis/unix/stat/stat.factor index 2f15ac7e00..26429aa9f7 100644 --- a/basis/unix/stat/stat.factor +++ b/basis/unix/stat/stat.factor @@ -4,16 +4,16 @@ IN: unix.stat ! File Types -CONSTANT: S_IFMT OCT: 170000 ! These bits determine file type. - -CONSTANT: S_IFDIR OCT: 40000 ! Directory. -CONSTANT: S_IFCHR OCT: 20000 ! Character device. -CONSTANT: S_IFBLK OCT: 60000 ! Block device. -CONSTANT: S_IFREG OCT: 100000 ! Regular file. -CONSTANT: S_IFIFO OCT: 010000 ! FIFO. -CONSTANT: S_IFLNK OCT: 120000 ! Symbolic link. -CONSTANT: S_IFSOCK OCT: 140000 ! Socket. -CONSTANT: S_IFWHT OCT: 160000 ! Whiteout. +CONSTANT: S_IFMT 0o170000 ! These bits determine file type. + +CONSTANT: S_IFDIR 0o40000 ! Directory. +CONSTANT: S_IFCHR 0o20000 ! Character device. +CONSTANT: S_IFBLK 0o60000 ! Block device. +CONSTANT: S_IFREG 0o100000 ! Regular file. +CONSTANT: S_IFIFO 0o010000 ! FIFO. +CONSTANT: S_IFLNK 0o120000 ! Symbolic link. +CONSTANT: S_IFSOCK 0o140000 ! Socket. +CONSTANT: S_IFWHT 0o160000 ! Whiteout. STRUCT: fsid { __val int[2] } ; diff --git a/basis/unix/statfs/macosx/macosx.factor b/basis/unix/statfs/macosx/macosx.factor index b5ae2c2223..50bb0c2227 100644 --- a/basis/unix/statfs/macosx/macosx.factor +++ b/basis/unix/statfs/macosx/macosx.factor @@ -6,27 +6,27 @@ grouping system alien.strings math.bitwise alien.syntax unix.types classes.struct unix.ffi literals ; IN: unix.statfs.macosx -CONSTANT: MNT_RDONLY HEX: 00000001 -CONSTANT: MNT_SYNCHRONOUS HEX: 00000002 -CONSTANT: MNT_NOEXEC HEX: 00000004 -CONSTANT: MNT_NOSUID HEX: 00000008 -CONSTANT: MNT_NODEV HEX: 00000010 -CONSTANT: MNT_UNION HEX: 00000020 -CONSTANT: MNT_ASYNC HEX: 00000040 -CONSTANT: MNT_EXPORTED HEX: 00000100 -CONSTANT: MNT_QUARANTINE HEX: 00000400 -CONSTANT: MNT_LOCAL HEX: 00001000 -CONSTANT: MNT_QUOTA HEX: 00002000 -CONSTANT: MNT_ROOTFS HEX: 00004000 -CONSTANT: MNT_DOVOLFS HEX: 00008000 -CONSTANT: MNT_DONTBROWSE HEX: 00100000 -CONSTANT: MNT_IGNORE_OWNERSHIP HEX: 00200000 -CONSTANT: MNT_AUTOMOUNTED HEX: 00400000 -CONSTANT: MNT_JOURNALED HEX: 00800000 -CONSTANT: MNT_NOUSERXATTR HEX: 01000000 -CONSTANT: MNT_DEFWRITE HEX: 02000000 -CONSTANT: MNT_MULTILABEL HEX: 04000000 -CONSTANT: MNT_NOATIME HEX: 10000000 +CONSTANT: MNT_RDONLY 0x00000001 +CONSTANT: MNT_SYNCHRONOUS 0x00000002 +CONSTANT: MNT_NOEXEC 0x00000004 +CONSTANT: MNT_NOSUID 0x00000008 +CONSTANT: MNT_NODEV 0x00000010 +CONSTANT: MNT_UNION 0x00000020 +CONSTANT: MNT_ASYNC 0x00000040 +CONSTANT: MNT_EXPORTED 0x00000100 +CONSTANT: MNT_QUARANTINE 0x00000400 +CONSTANT: MNT_LOCAL 0x00001000 +CONSTANT: MNT_QUOTA 0x00002000 +CONSTANT: MNT_ROOTFS 0x00004000 +CONSTANT: MNT_DOVOLFS 0x00008000 +CONSTANT: MNT_DONTBROWSE 0x00100000 +CONSTANT: MNT_IGNORE_OWNERSHIP 0x00200000 +CONSTANT: MNT_AUTOMOUNTED 0x00400000 +CONSTANT: MNT_JOURNALED 0x00800000 +CONSTANT: MNT_NOUSERXATTR 0x01000000 +CONSTANT: MNT_DEFWRITE 0x02000000 +CONSTANT: MNT_MULTILABEL 0x04000000 +CONSTANT: MNT_NOATIME 0x10000000 ALIAS: MNT_UNKNOWNPERMISSIONS MNT_IGNORE_OWNERSHIP CONSTANT: MNT_VISFLAGMASK @@ -40,9 +40,9 @@ CONSTANT: MNT_VISFLAGMASK MNT_NOUSERXATTR MNT_DEFWRITE MNT_MULTILABEL MNT_NOATIME } -CONSTANT: MNT_UPDATE HEX: 00010000 -CONSTANT: MNT_RELOAD HEX: 00040000 -CONSTANT: MNT_FORCE HEX: 00080000 +CONSTANT: MNT_UPDATE 0x00010000 +CONSTANT: MNT_RELOAD 0x00040000 +CONSTANT: MNT_FORCE 0x00080000 CONSTANT: MNT_CMDFLAGS flags{ MNT_UPDATE MNT_RELOAD MNT_FORCE } @@ -55,35 +55,35 @@ CONSTANT: VFS_SET_PACKAGE_EXTS 3 CONSTANT: MNT_WAIT 1 CONSTANT: MNT_NOWAIT 2 -CONSTANT: VFS_CTL_VERS1 HEX: 01 +CONSTANT: VFS_CTL_VERS1 0x01 -CONSTANT: VFS_CTL_STATFS HEX: 00010001 -CONSTANT: VFS_CTL_UMOUNT HEX: 00010002 -CONSTANT: VFS_CTL_QUERY HEX: 00010003 -CONSTANT: VFS_CTL_NEWADDR HEX: 00010004 -CONSTANT: VFS_CTL_TIMEO HEX: 00010005 -CONSTANT: VFS_CTL_NOLOCKS HEX: 00010006 +CONSTANT: VFS_CTL_STATFS 0x00010001 +CONSTANT: VFS_CTL_UMOUNT 0x00010002 +CONSTANT: VFS_CTL_QUERY 0x00010003 +CONSTANT: VFS_CTL_NEWADDR 0x00010004 +CONSTANT: VFS_CTL_TIMEO 0x00010005 +CONSTANT: VFS_CTL_NOLOCKS 0x00010006 STRUCT: vfsquery { vq_flags uint32_t } { vq_spare uint32_t[31] } ; -CONSTANT: VQ_NOTRESP HEX: 0001 -CONSTANT: VQ_NEEDAUTH HEX: 0002 -CONSTANT: VQ_LOWDISK HEX: 0004 -CONSTANT: VQ_MOUNT HEX: 0008 -CONSTANT: VQ_UNMOUNT HEX: 0010 -CONSTANT: VQ_DEAD HEX: 0020 -CONSTANT: VQ_ASSIST HEX: 0040 -CONSTANT: VQ_NOTRESPLOCK HEX: 0080 -CONSTANT: VQ_UPDATE HEX: 0100 -CONSTANT: VQ_FLAG0200 HEX: 0200 -CONSTANT: VQ_FLAG0400 HEX: 0400 -CONSTANT: VQ_FLAG0800 HEX: 0800 -CONSTANT: VQ_FLAG1000 HEX: 1000 -CONSTANT: VQ_FLAG2000 HEX: 2000 -CONSTANT: VQ_FLAG4000 HEX: 4000 -CONSTANT: VQ_FLAG8000 HEX: 8000 +CONSTANT: VQ_NOTRESP 0x0001 +CONSTANT: VQ_NEEDAUTH 0x0002 +CONSTANT: VQ_LOWDISK 0x0004 +CONSTANT: VQ_MOUNT 0x0008 +CONSTANT: VQ_UNMOUNT 0x0010 +CONSTANT: VQ_DEAD 0x0020 +CONSTANT: VQ_ASSIST 0x0040 +CONSTANT: VQ_NOTRESPLOCK 0x0080 +CONSTANT: VQ_UPDATE 0x0100 +CONSTANT: VQ_FLAG0200 0x0200 +CONSTANT: VQ_FLAG0400 0x0400 +CONSTANT: VQ_FLAG0800 0x0800 +CONSTANT: VQ_FLAG1000 0x1000 +CONSTANT: VQ_FLAG2000 0x2000 +CONSTANT: VQ_FLAG4000 0x4000 +CONSTANT: VQ_FLAG8000 0x8000 CONSTANT: NFSV4_MAX_FH_SIZE 128 CONSTANT: NFSV3_MAX_FH_SIZE 64 diff --git a/basis/unix/statvfs/macosx/macosx.factor b/basis/unix/statvfs/macosx/macosx.factor index 18b794acbf..79c9b0e313 100644 --- a/basis/unix/statvfs/macosx/macosx.factor +++ b/basis/unix/statvfs/macosx/macosx.factor @@ -17,7 +17,7 @@ STRUCT: statvfs { f_namemax ulong } ; ! Flags -CONSTANT: ST_RDONLY HEX: 1 ! Read-only file system -CONSTANT: ST_NOSUID HEX: 2 ! Does not honor setuid/setgid +CONSTANT: ST_RDONLY 0x1 ! Read-only file system +CONSTANT: ST_NOSUID 0x2 ! Does not honor setuid/setgid FUNCTION: int statvfs ( c-string path, statvfs* buf ) ; diff --git a/basis/uuid/uuid.factor b/basis/uuid/uuid.factor index a41a5e868f..3bbc930896 100644 --- a/basis/uuid/uuid.factor +++ b/basis/uuid/uuid.factor @@ -11,16 +11,16 @@ IN: uuid ! 0x01b21dd213814000L is the number of 100-ns intervals ! between the UUID epoch 1582-10-15 00:00:00 and the ! Unix epoch 1970-01-01 00:00:00. - gmt timestamp>micros 10 * HEX: 01b21dd213814000 + - [ -48 shift HEX: 0fff bitand ] - [ -32 shift HEX: ffff bitand ] - [ HEX: ffffffff bitand ] + gmt timestamp>micros 10 * 0x01b21dd213814000 + + [ -48 shift 0x0fff bitand ] + [ -32 shift 0xffff bitand ] + [ 0xffffffff bitand ] tri ; : (hardware) ( -- address ) ! Choose a random 48-bit number with eighth bit ! set to 1 (as recommended in RFC 4122) - 48 random-bits HEX: 010000000000 bitor ; + 48 random-bits 0x010000000000 bitor ; : (clock) ( -- clockseq ) ! Choose a random 14-bit number @@ -35,9 +35,9 @@ IN: uuid : (version) ( n version -- n' ) [ - HEX: c000 48 shift bitnot bitand - HEX: 8000 48 shift bitor - HEX: f000 64 shift bitnot bitand + 0xc000 48 shift bitnot bitand + 0x8000 48 shift bitor + 0xf000 64 shift bitnot bitand ] dip 76 shift bitor ; : uuid>string ( n -- string ) diff --git a/basis/windows/advapi32/advapi32.factor b/basis/windows/advapi32/advapi32.factor index 5195d0e21c..a150f054a0 100755 --- a/basis/windows/advapi32/advapi32.factor +++ b/basis/windows/advapi32/advapi32.factor @@ -51,11 +51,11 @@ CONSTANT: ACCESS_DENIED_ACE_TYPE 1 CONSTANT: SYSTEM_AUDIT_ACE_TYPE 2 CONSTANT: SYSTEM_ALARM_ACE_TYPE 3 -CONSTANT: OBJECT_INHERIT_ACE HEX: 1 -CONSTANT: CONTAINER_INHERIT_ACE HEX: 2 -CONSTANT: NO_PROPAGATE_INHERIT_ACE HEX: 4 -CONSTANT: INHERIT_ONLY_ACE HEX: 8 -CONSTANT: VALID_INHERIT_FLAGS HEX: f +CONSTANT: OBJECT_INHERIT_ACE 0x1 +CONSTANT: CONTAINER_INHERIT_ACE 0x2 +CONSTANT: NO_PROPAGATE_INHERIT_ACE 0x4 +CONSTANT: INHERIT_ONLY_ACE 0x8 +CONSTANT: VALID_INHERIT_FLAGS 0xf STRUCT: ACE_HEADER { AceType BYTE } @@ -243,39 +243,39 @@ CONSTANT: SE_GROUP_ENABLED 4 CONSTANT: SE_GROUP_OWNER 8 CONSTANT: SE_GROUP_LOGON_ID -1073741824 -CONSTANT: NTE_BAD_UID HEX: 80090001 -CONSTANT: NTE_BAD_HASH HEX: 80090002 -CONSTANT: NTE_BAD_KEY HEX: 80090003 -CONSTANT: NTE_BAD_LEN HEX: 80090004 -CONSTANT: NTE_BAD_DATA HEX: 80090005 -CONSTANT: NTE_BAD_SIGNATURE HEX: 80090006 -CONSTANT: NTE_BAD_VER HEX: 80090007 -CONSTANT: NTE_BAD_ALGID HEX: 80090008 -CONSTANT: NTE_BAD_FLAGS HEX: 80090009 -CONSTANT: NTE_BAD_TYPE HEX: 8009000A -CONSTANT: NTE_BAD_KEY_STATE HEX: 8009000B -CONSTANT: NTE_BAD_HASH_STATE HEX: 8009000C -CONSTANT: NTE_NO_KEY HEX: 8009000D -CONSTANT: NTE_NO_MEMORY HEX: 8009000E -CONSTANT: NTE_EXISTS HEX: 8009000F -CONSTANT: NTE_PERM HEX: 80090010 -CONSTANT: NTE_NOT_FOUND HEX: 80090011 -CONSTANT: NTE_DOUBLE_ENCRYPT HEX: 80090012 -CONSTANT: NTE_BAD_PROVIDER HEX: 80090013 -CONSTANT: NTE_BAD_PROV_TYPE HEX: 80090014 -CONSTANT: NTE_BAD_PUBLIC_KEY HEX: 80090015 -CONSTANT: NTE_BAD_KEYSET HEX: 80090016 -CONSTANT: NTE_PROV_TYPE_NOT_DEF HEX: 80090017 -CONSTANT: NTE_PROV_TYPE_ENTRY_BAD HEX: 80090018 -CONSTANT: NTE_KEYSET_NOT_DEF HEX: 80090019 -CONSTANT: NTE_KEYSET_ENTRY_BAD HEX: 8009001A -CONSTANT: NTE_PROV_TYPE_NO_MATCH HEX: 8009001B -CONSTANT: NTE_SIGNATURE_FILE_BAD HEX: 8009001C -CONSTANT: NTE_PROVIDER_DLL_FAIL HEX: 8009001D -CONSTANT: NTE_PROV_DLL_NOT_FOUND HEX: 8009001E -CONSTANT: NTE_BAD_KEYSET_PARAM HEX: 8009001F -CONSTANT: NTE_FAIL HEX: 80090020 -CONSTANT: NTE_SYS_ERR HEX: 80090021 +CONSTANT: NTE_BAD_UID 0x80090001 +CONSTANT: NTE_BAD_HASH 0x80090002 +CONSTANT: NTE_BAD_KEY 0x80090003 +CONSTANT: NTE_BAD_LEN 0x80090004 +CONSTANT: NTE_BAD_DATA 0x80090005 +CONSTANT: NTE_BAD_SIGNATURE 0x80090006 +CONSTANT: NTE_BAD_VER 0x80090007 +CONSTANT: NTE_BAD_ALGID 0x80090008 +CONSTANT: NTE_BAD_FLAGS 0x80090009 +CONSTANT: NTE_BAD_TYPE 0x8009000A +CONSTANT: NTE_BAD_KEY_STATE 0x8009000B +CONSTANT: NTE_BAD_HASH_STATE 0x8009000C +CONSTANT: NTE_NO_KEY 0x8009000D +CONSTANT: NTE_NO_MEMORY 0x8009000E +CONSTANT: NTE_EXISTS 0x8009000F +CONSTANT: NTE_PERM 0x80090010 +CONSTANT: NTE_NOT_FOUND 0x80090011 +CONSTANT: NTE_DOUBLE_ENCRYPT 0x80090012 +CONSTANT: NTE_BAD_PROVIDER 0x80090013 +CONSTANT: NTE_BAD_PROV_TYPE 0x80090014 +CONSTANT: NTE_BAD_PUBLIC_KEY 0x80090015 +CONSTANT: NTE_BAD_KEYSET 0x80090016 +CONSTANT: NTE_PROV_TYPE_NOT_DEF 0x80090017 +CONSTANT: NTE_PROV_TYPE_ENTRY_BAD 0x80090018 +CONSTANT: NTE_KEYSET_NOT_DEF 0x80090019 +CONSTANT: NTE_KEYSET_ENTRY_BAD 0x8009001A +CONSTANT: NTE_PROV_TYPE_NO_MATCH 0x8009001B +CONSTANT: NTE_SIGNATURE_FILE_BAD 0x8009001C +CONSTANT: NTE_PROVIDER_DLL_FAIL 0x8009001D +CONSTANT: NTE_PROV_DLL_NOT_FOUND 0x8009001E +CONSTANT: NTE_BAD_KEYSET_PARAM 0x8009001F +CONSTANT: NTE_FAIL 0x80090020 +CONSTANT: NTE_SYS_ERR 0x80090021 ! SID is a variable length structure TYPEDEF: void* PSID @@ -290,28 +290,28 @@ CONSTANT: GROUP_SECURITY_INFORMATION 2 CONSTANT: DACL_SECURITY_INFORMATION 4 CONSTANT: SACL_SECURITY_INFORMATION 8 -CONSTANT: DELETE HEX: 00010000 -CONSTANT: READ_CONTROL HEX: 00020000 -CONSTANT: WRITE_DAC HEX: 00040000 -CONSTANT: WRITE_OWNER HEX: 00080000 -CONSTANT: SYNCHRONIZE HEX: 00100000 -CONSTANT: STANDARD_RIGHTS_REQUIRED HEX: 000f0000 +CONSTANT: DELETE 0x00010000 +CONSTANT: READ_CONTROL 0x00020000 +CONSTANT: WRITE_DAC 0x00040000 +CONSTANT: WRITE_OWNER 0x00080000 +CONSTANT: SYNCHRONIZE 0x00100000 +CONSTANT: STANDARD_RIGHTS_REQUIRED 0x000f0000 ALIAS: STANDARD_RIGHTS_READ READ_CONTROL ALIAS: STANDARD_RIGHTS_WRITE READ_CONTROL ALIAS: STANDARD_RIGHTS_EXECUTE READ_CONTROL -CONSTANT: TOKEN_TOKEN_ADJUST_DEFAULT HEX: 0080 -CONSTANT: TOKEN_ADJUST_GROUPS HEX: 0040 -CONSTANT: TOKEN_ADJUST_PRIVILEGES HEX: 0020 -CONSTANT: TOKEN_ADJUST_SESSIONID HEX: 0100 -CONSTANT: TOKEN_ASSIGN_PRIMARY HEX: 0001 -CONSTANT: TOKEN_DUPLICATE HEX: 0002 +CONSTANT: TOKEN_TOKEN_ADJUST_DEFAULT 0x0080 +CONSTANT: TOKEN_ADJUST_GROUPS 0x0040 +CONSTANT: TOKEN_ADJUST_PRIVILEGES 0x0020 +CONSTANT: TOKEN_ADJUST_SESSIONID 0x0100 +CONSTANT: TOKEN_ASSIGN_PRIMARY 0x0001 +CONSTANT: TOKEN_DUPLICATE 0x0002 ALIAS: TOKEN_EXECUTE STANDARD_RIGHTS_EXECUTE -CONSTANT: TOKEN_IMPERSONATE HEX: 0004 -CONSTANT: TOKEN_QUERY HEX: 0008 -CONSTANT: TOKEN_QUERY_SOURCE HEX: 0010 -CONSTANT: TOKEN_ADJUST_DEFAULT HEX: 0080 +CONSTANT: TOKEN_IMPERSONATE 0x0004 +CONSTANT: TOKEN_QUERY 0x0008 +CONSTANT: TOKEN_QUERY_SOURCE 0x0010 +CONSTANT: TOKEN_ADJUST_DEFAULT 0x0080 CONSTANT: TOKEN_READ flags{ STANDARD_RIGHTS_READ TOKEN_QUERY } CONSTANT: TOKEN_WRITE @@ -336,28 +336,28 @@ CONSTANT: TOKEN_ALL_ACCESS TOKEN_ADJUST_DEFAULT } -CONSTANT: HKEY_CLASSES_ROOT HEX: 80000000 -CONSTANT: HKEY_CURRENT_USER HEX: 80000001 -CONSTANT: HKEY_LOCAL_MACHINE HEX: 80000002 -CONSTANT: HKEY_USERS HEX: 80000003 -CONSTANT: HKEY_PERFORMANCE_DATA HEX: 80000004 -CONSTANT: HKEY_CURRENT_CONFIG HEX: 80000005 -CONSTANT: HKEY_DYN_DATA HEX: 80000006 -CONSTANT: HKEY_PERFORMANCE_TEXT HEX: 80000050 -CONSTANT: HKEY_PERFORMANCE_NLSTEXT HEX: 80000060 - -CONSTANT: KEY_QUERY_VALUE HEX: 0001 -CONSTANT: KEY_SET_VALUE HEX: 0002 -CONSTANT: KEY_CREATE_SUB_KEY HEX: 0004 -CONSTANT: KEY_ENUMERATE_SUB_KEYS HEX: 0008 -CONSTANT: KEY_NOTIFY HEX: 0010 -CONSTANT: KEY_CREATE_LINK HEX: 0020 -CONSTANT: KEY_READ HEX: 20019 -CONSTANT: KEY_WOW64_32KEY HEX: 0200 -CONSTANT: KEY_WOW64_64KEY HEX: 0100 -CONSTANT: KEY_WRITE HEX: 20006 +CONSTANT: HKEY_CLASSES_ROOT 0x80000000 +CONSTANT: HKEY_CURRENT_USER 0x80000001 +CONSTANT: HKEY_LOCAL_MACHINE 0x80000002 +CONSTANT: HKEY_USERS 0x80000003 +CONSTANT: HKEY_PERFORMANCE_DATA 0x80000004 +CONSTANT: HKEY_CURRENT_CONFIG 0x80000005 +CONSTANT: HKEY_DYN_DATA 0x80000006 +CONSTANT: HKEY_PERFORMANCE_TEXT 0x80000050 +CONSTANT: HKEY_PERFORMANCE_NLSTEXT 0x80000060 + +CONSTANT: KEY_QUERY_VALUE 0x0001 +CONSTANT: KEY_SET_VALUE 0x0002 +CONSTANT: KEY_CREATE_SUB_KEY 0x0004 +CONSTANT: KEY_ENUMERATE_SUB_KEYS 0x0008 +CONSTANT: KEY_NOTIFY 0x0010 +CONSTANT: KEY_CREATE_LINK 0x0020 +CONSTANT: KEY_READ 0x20019 +CONSTANT: KEY_WOW64_32KEY 0x0200 +CONSTANT: KEY_WOW64_64KEY 0x0100 +CONSTANT: KEY_WRITE 0x20006 ALIAS: KEY_EXECUTE KEY_READ -CONSTANT: KEY_ALL_ACCESS HEX: F003F +CONSTANT: KEY_ALL_ACCESS 0xF003F CONSTANT: REG_NONE 0 CONSTANT: REG_SZ 1 @@ -449,7 +449,7 @@ CONSTANT: CALG_DH_EPHEM flags{ ALG_CLASS_KEY_EXCHANGE ALG_TYPE_STREAM ALG_TYPE_D CONSTANT: CALG_DESX flags{ ALG_CLASS_DATA_ENCRYPT ALG_TYPE_BLOCK ALG_SID_DESX } ! CONSTANT: CALG_TLS1PRF flags{ ALG_CLASS_DHASH ALG_TYPE_ANY ALG_SID_TLS1PRF } -CONSTANT: CRYPT_VERIFYCONTEXT HEX: F0000000 +CONSTANT: CRYPT_VERIFYCONTEXT 0xF0000000 CONSTANT: CRYPT_NEWKEYSET 8 CONSTANT: CRYPT_DELETEKEYSET 16 CONSTANT: CRYPT_MACHINE_KEYSET 32 @@ -643,27 +643,27 @@ CONSTANT: szOID_SERVER_GATED_CRYPTO "4235658" CONSTANT: szOID_SGC_NETSCAPE "2.16.840.1.113730.4.1" CONSTANT: szOID_PKIX_KP_CLIENT_AUTH "1.3.6.1.5.5.7.3.2" -CONSTANT: CRYPT_NOHASHOID HEX: 00000001 -CONSTANT: CRYPT_NO_SALT HEX: 10 -CONSTANT: CRYPT_PREGEN HEX: 40 -CONSTANT: CRYPT_RECIPIENT HEX: 10 -CONSTANT: CRYPT_INITIATOR HEX: 40 -CONSTANT: CRYPT_ONLINE HEX: 80 -CONSTANT: CRYPT_SF HEX: 100 -CONSTANT: CRYPT_CREATE_IV HEX: 200 -CONSTANT: CRYPT_KEK HEX: 400 -CONSTANT: CRYPT_DATA_KEY HEX: 800 -CONSTANT: CRYPT_VOLATILE HEX: 1000 -CONSTANT: CRYPT_SGCKEY HEX: 2000 - -CONSTANT: KEYSTATEBLOB HEX: C -CONSTANT: OPAQUEKEYBLOB HEX: 9 -CONSTANT: PLAINTEXTKEYBLOB HEX: 8 -CONSTANT: PRIVATEKEYBLOB HEX: 7 -CONSTANT: PUBLICKEYBLOB HEX: 6 -CONSTANT: PUBLICKEYBLOBEX HEX: A -CONSTANT: SIMPLEBLOB HEX: 1 -CONSTANT: SYMMETRICWRAPKEYBLOB HEX: B +CONSTANT: CRYPT_NOHASHOID 0x00000001 +CONSTANT: CRYPT_NO_SALT 0x10 +CONSTANT: CRYPT_PREGEN 0x40 +CONSTANT: CRYPT_RECIPIENT 0x10 +CONSTANT: CRYPT_INITIATOR 0x40 +CONSTANT: CRYPT_ONLINE 0x80 +CONSTANT: CRYPT_SF 0x100 +CONSTANT: CRYPT_CREATE_IV 0x200 +CONSTANT: CRYPT_KEK 0x400 +CONSTANT: CRYPT_DATA_KEY 0x800 +CONSTANT: CRYPT_VOLATILE 0x1000 +CONSTANT: CRYPT_SGCKEY 0x2000 + +CONSTANT: KEYSTATEBLOB 0xC +CONSTANT: OPAQUEKEYBLOB 0x9 +CONSTANT: PLAINTEXTKEYBLOB 0x8 +CONSTANT: PRIVATEKEYBLOB 0x7 +CONSTANT: PUBLICKEYBLOB 0x6 +CONSTANT: PUBLICKEYBLOBEX 0xA +CONSTANT: SIMPLEBLOB 0x1 +CONSTANT: SYMMETRICWRAPKEYBLOB 0xB TYPEDEF: void* SID diff --git a/basis/windows/com/com.factor b/basis/windows/com/com.factor index 7bdf8d1a9f..41059c5669 100644 --- a/basis/windows/com/com.factor +++ b/basis/windows/com/com.factor @@ -52,7 +52,7 @@ CONSTANT: STGM_READ 0 CONSTANT: STGM_WRITE 1 CONSTANT: STGM_READWRITE 2 -CONSTANT: STG_E_INVALIDFUNCTION HEX: 80030001 +CONSTANT: STG_E_INVALIDFUNCTION 0x80030001 CONSTANT: STGTY_STORAGE 1 CONSTANT: STGTY_STREAM 2 diff --git a/basis/windows/ddk/hid/hid.factor b/basis/windows/ddk/hid/hid.factor index 957ff8609e..ac7db53490 100755 --- a/basis/windows/ddk/hid/hid.factor +++ b/basis/windows/ddk/hid/hid.factor @@ -11,197 +11,197 @@ TYPEDEF: LONG NTSTATUS TYPEDEF: USHORT USAGE TYPEDEF: USAGE* PUSAGE -CONSTANT: HID_USAGE_PAGE_UNDEFINED HEX: 00 -CONSTANT: HID_USAGE_PAGE_GENERIC HEX: 01 -CONSTANT: HID_USAGE_PAGE_SIMULATION HEX: 02 -CONSTANT: HID_USAGE_PAGE_VR HEX: 03 -CONSTANT: HID_USAGE_PAGE_SPORT HEX: 04 -CONSTANT: HID_USAGE_PAGE_GAME HEX: 05 -CONSTANT: HID_USAGE_PAGE_KEYBOARD HEX: 07 -CONSTANT: HID_USAGE_PAGE_LED HEX: 08 -CONSTANT: HID_USAGE_PAGE_BUTTON HEX: 09 -CONSTANT: HID_USAGE_PAGE_ORDINAL HEX: 0A -CONSTANT: HID_USAGE_PAGE_TELEPHONY HEX: 0B -CONSTANT: HID_USAGE_PAGE_CONSUMER HEX: 0C -CONSTANT: HID_USAGE_PAGE_DIGITIZER HEX: 0D -CONSTANT: HID_USAGE_PAGE_UNICODE HEX: 10 -CONSTANT: HID_USAGE_PAGE_ALPHANUMERIC HEX: 14 - -CONSTANT: HID_USAGE_PAGE_MICROSOFT_BLUETOOTH_HANDSFREE HEX: FFF3 - -CONSTANT: HID_USAGE_GENERIC_POINTER HEX: 01 -CONSTANT: HID_USAGE_GENERIC_MOUSE HEX: 02 -CONSTANT: HID_USAGE_GENERIC_JOYSTICK HEX: 04 -CONSTANT: HID_USAGE_GENERIC_GAMEPAD HEX: 05 -CONSTANT: HID_USAGE_GENERIC_KEYBOARD HEX: 06 -CONSTANT: HID_USAGE_GENERIC_KEYPAD HEX: 07 -CONSTANT: HID_USAGE_GENERIC_SYSTEM_CTL HEX: 80 - -CONSTANT: HID_USAGE_GENERIC_X HEX: 30 -CONSTANT: HID_USAGE_GENERIC_Y HEX: 31 -CONSTANT: HID_USAGE_GENERIC_Z HEX: 32 -CONSTANT: HID_USAGE_GENERIC_RX HEX: 33 -CONSTANT: HID_USAGE_GENERIC_RY HEX: 34 -CONSTANT: HID_USAGE_GENERIC_RZ HEX: 35 -CONSTANT: HID_USAGE_GENERIC_SLIDER HEX: 36 -CONSTANT: HID_USAGE_GENERIC_DIAL HEX: 37 -CONSTANT: HID_USAGE_GENERIC_WHEEL HEX: 38 -CONSTANT: HID_USAGE_GENERIC_HATSWITCH HEX: 39 -CONSTANT: HID_USAGE_GENERIC_COUNTED_BUFFER HEX: 3A -CONSTANT: HID_USAGE_GENERIC_BYTE_COUNT HEX: 3B -CONSTANT: HID_USAGE_GENERIC_MOTION_WAKEUP HEX: 3C -CONSTANT: HID_USAGE_GENERIC_VX HEX: 40 -CONSTANT: HID_USAGE_GENERIC_VY HEX: 41 -CONSTANT: HID_USAGE_GENERIC_VZ HEX: 42 -CONSTANT: HID_USAGE_GENERIC_VBRX HEX: 43 -CONSTANT: HID_USAGE_GENERIC_VBRY HEX: 44 -CONSTANT: HID_USAGE_GENERIC_VBRZ HEX: 45 -CONSTANT: HID_USAGE_GENERIC_VNO HEX: 46 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_POWER HEX: 81 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_SLEEP HEX: 82 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_WAKE HEX: 83 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_CONTEXT_MENU HEX: 84 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_MAIN_MENU HEX: 85 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_APP_MENU HEX: 86 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_HELP_MENU HEX: 87 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_EXIT HEX: 88 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_SELECT HEX: 89 -CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_RIGHT HEX: 8A -CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_LEFT HEX: 8B -CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_UP HEX: 8C -CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_DOWN HEX: 8D - -CONSTANT: HID_USAGE_SIMULATION_RUDDER HEX: BA -CONSTANT: HID_USAGE_SIMULATION_THROTTLE HEX: BB - -CONSTANT: HID_USAGE_KEYBOARD_NOEVENT HEX: 00 -CONSTANT: HID_USAGE_KEYBOARD_ROLLOVER HEX: 01 -CONSTANT: HID_USAGE_KEYBOARD_POSTFAIL HEX: 02 -CONSTANT: HID_USAGE_KEYBOARD_UNDEFINED HEX: 03 - -CONSTANT: HID_USAGE_KEYBOARD_aA HEX: 04 -CONSTANT: HID_USAGE_KEYBOARD_zZ HEX: 1D -CONSTANT: HID_USAGE_KEYBOARD_ONE HEX: 1E -CONSTANT: HID_USAGE_KEYBOARD_ZERO HEX: 27 -CONSTANT: HID_USAGE_KEYBOARD_LCTRL HEX: E0 -CONSTANT: HID_USAGE_KEYBOARD_LSHFT HEX: E1 -CONSTANT: HID_USAGE_KEYBOARD_LALT HEX: E2 -CONSTANT: HID_USAGE_KEYBOARD_LGUI HEX: E3 -CONSTANT: HID_USAGE_KEYBOARD_RCTRL HEX: E4 -CONSTANT: HID_USAGE_KEYBOARD_RSHFT HEX: E5 -CONSTANT: HID_USAGE_KEYBOARD_RALT HEX: E6 -CONSTANT: HID_USAGE_KEYBOARD_RGUI HEX: E7 -CONSTANT: HID_USAGE_KEYBOARD_SCROLL_LOCK HEX: 47 -CONSTANT: HID_USAGE_KEYBOARD_NUM_LOCK HEX: 53 -CONSTANT: HID_USAGE_KEYBOARD_CAPS_LOCK HEX: 39 -CONSTANT: HID_USAGE_KEYBOARD_F1 HEX: 3A -CONSTANT: HID_USAGE_KEYBOARD_F12 HEX: 45 -CONSTANT: HID_USAGE_KEYBOARD_RETURN HEX: 28 -CONSTANT: HID_USAGE_KEYBOARD_ESCAPE HEX: 29 -CONSTANT: HID_USAGE_KEYBOARD_DELETE HEX: 2A -CONSTANT: HID_USAGE_KEYBOARD_PRINT_SCREEN HEX: 46 - -CONSTANT: HID_USAGE_LED_NUM_LOCK HEX: 01 -CONSTANT: HID_USAGE_LED_CAPS_LOCK HEX: 02 -CONSTANT: HID_USAGE_LED_SCROLL_LOCK HEX: 03 -CONSTANT: HID_USAGE_LED_COMPOSE HEX: 04 -CONSTANT: HID_USAGE_LED_KANA HEX: 05 -CONSTANT: HID_USAGE_LED_POWER HEX: 06 -CONSTANT: HID_USAGE_LED_SHIFT HEX: 07 -CONSTANT: HID_USAGE_LED_DO_NOT_DISTURB HEX: 08 -CONSTANT: HID_USAGE_LED_MUTE HEX: 09 -CONSTANT: HID_USAGE_LED_TONE_ENABLE HEX: 0A -CONSTANT: HID_USAGE_LED_HIGH_CUT_FILTER HEX: 0B -CONSTANT: HID_USAGE_LED_LOW_CUT_FILTER HEX: 0C -CONSTANT: HID_USAGE_LED_EQUALIZER_ENABLE HEX: 0D -CONSTANT: HID_USAGE_LED_SOUND_FIELD_ON HEX: 0E -CONSTANT: HID_USAGE_LED_SURROUND_FIELD_ON HEX: 0F -CONSTANT: HID_USAGE_LED_REPEAT HEX: 10 -CONSTANT: HID_USAGE_LED_STEREO HEX: 11 -CONSTANT: HID_USAGE_LED_SAMPLING_RATE_DETECT HEX: 12 -CONSTANT: HID_USAGE_LED_SPINNING HEX: 13 -CONSTANT: HID_USAGE_LED_CAV HEX: 14 -CONSTANT: HID_USAGE_LED_CLV HEX: 15 -CONSTANT: HID_USAGE_LED_RECORDING_FORMAT_DET HEX: 16 -CONSTANT: HID_USAGE_LED_OFF_HOOK HEX: 17 -CONSTANT: HID_USAGE_LED_RING HEX: 18 -CONSTANT: HID_USAGE_LED_MESSAGE_WAITING HEX: 19 -CONSTANT: HID_USAGE_LED_DATA_MODE HEX: 1A -CONSTANT: HID_USAGE_LED_BATTERY_OPERATION HEX: 1B -CONSTANT: HID_USAGE_LED_BATTERY_OK HEX: 1C -CONSTANT: HID_USAGE_LED_BATTERY_LOW HEX: 1D -CONSTANT: HID_USAGE_LED_SPEAKER HEX: 1E -CONSTANT: HID_USAGE_LED_HEAD_SET HEX: 1F -CONSTANT: HID_USAGE_LED_HOLD HEX: 20 -CONSTANT: HID_USAGE_LED_MICROPHONE HEX: 21 -CONSTANT: HID_USAGE_LED_COVERAGE HEX: 22 -CONSTANT: HID_USAGE_LED_NIGHT_MODE HEX: 23 -CONSTANT: HID_USAGE_LED_SEND_CALLS HEX: 24 -CONSTANT: HID_USAGE_LED_CALL_PICKUP HEX: 25 -CONSTANT: HID_USAGE_LED_CONFERENCE HEX: 26 -CONSTANT: HID_USAGE_LED_STAND_BY HEX: 27 -CONSTANT: HID_USAGE_LED_CAMERA_ON HEX: 28 -CONSTANT: HID_USAGE_LED_CAMERA_OFF HEX: 29 -CONSTANT: HID_USAGE_LED_ON_LINE HEX: 2A -CONSTANT: HID_USAGE_LED_OFF_LINE HEX: 2B -CONSTANT: HID_USAGE_LED_BUSY HEX: 2C -CONSTANT: HID_USAGE_LED_READY HEX: 2D -CONSTANT: HID_USAGE_LED_PAPER_OUT HEX: 2E -CONSTANT: HID_USAGE_LED_PAPER_JAM HEX: 2F -CONSTANT: HID_USAGE_LED_REMOTE HEX: 30 -CONSTANT: HID_USAGE_LED_FORWARD HEX: 31 -CONSTANT: HID_USAGE_LED_REVERSE HEX: 32 -CONSTANT: HID_USAGE_LED_STOP HEX: 33 -CONSTANT: HID_USAGE_LED_REWIND HEX: 34 -CONSTANT: HID_USAGE_LED_FAST_FORWARD HEX: 35 -CONSTANT: HID_USAGE_LED_PLAY HEX: 36 -CONSTANT: HID_USAGE_LED_PAUSE HEX: 37 -CONSTANT: HID_USAGE_LED_RECORD HEX: 38 -CONSTANT: HID_USAGE_LED_ERROR HEX: 39 -CONSTANT: HID_USAGE_LED_SELECTED_INDICATOR HEX: 3A -CONSTANT: HID_USAGE_LED_IN_USE_INDICATOR HEX: 3B -CONSTANT: HID_USAGE_LED_MULTI_MODE_INDICATOR HEX: 3C -CONSTANT: HID_USAGE_LED_INDICATOR_ON HEX: 3D -CONSTANT: HID_USAGE_LED_INDICATOR_FLASH HEX: 3E -CONSTANT: HID_USAGE_LED_INDICATOR_SLOW_BLINK HEX: 3F -CONSTANT: HID_USAGE_LED_INDICATOR_FAST_BLINK HEX: 40 -CONSTANT: HID_USAGE_LED_INDICATOR_OFF HEX: 41 -CONSTANT: HID_USAGE_LED_FLASH_ON_TIME HEX: 42 -CONSTANT: HID_USAGE_LED_SLOW_BLINK_ON_TIME HEX: 43 -CONSTANT: HID_USAGE_LED_SLOW_BLINK_OFF_TIME HEX: 44 -CONSTANT: HID_USAGE_LED_FAST_BLINK_ON_TIME HEX: 45 -CONSTANT: HID_USAGE_LED_FAST_BLINK_OFF_TIME HEX: 46 -CONSTANT: HID_USAGE_LED_INDICATOR_COLOR HEX: 47 -CONSTANT: HID_USAGE_LED_RED HEX: 48 -CONSTANT: HID_USAGE_LED_GREEN HEX: 49 -CONSTANT: HID_USAGE_LED_AMBER HEX: 4A -CONSTANT: HID_USAGE_LED_GENERIC_INDICATOR HEX: 4B - -CONSTANT: HID_USAGE_TELEPHONY_PHONE HEX: 01 -CONSTANT: HID_USAGE_TELEPHONY_ANSWERING_MACHINE HEX: 02 -CONSTANT: HID_USAGE_TELEPHONY_MESSAGE_CONTROLS HEX: 03 -CONSTANT: HID_USAGE_TELEPHONY_HANDSET HEX: 04 -CONSTANT: HID_USAGE_TELEPHONY_HEADSET HEX: 05 -CONSTANT: HID_USAGE_TELEPHONY_KEYPAD HEX: 06 -CONSTANT: HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON HEX: 07 -CONSTANT: HID_USAGE_TELEPHONY_REDIAL HEX: 24 -CONSTANT: HID_USAGE_TELEPHONY_TRANSFER HEX: 25 -CONSTANT: HID_USAGE_TELEPHONY_DROP HEX: 26 -CONSTANT: HID_USAGE_TELEPHONY_LINE HEX: 2A -CONSTANT: HID_USAGE_TELEPHONY_RING_ENABLE HEX: 2D -CONSTANT: HID_USAGE_TELEPHONY_SEND HEX: 31 -CONSTANT: HID_USAGE_TELEPHONY_KEYPAD_0 HEX: B0 -CONSTANT: HID_USAGE_TELEPHONY_KEYPAD_D HEX: BF -CONSTANT: HID_USAGE_TELEPHONY_HOST_AVAILABLE HEX: F1 - -CONSTANT: HID_USAGE_MS_BTH_HF_DIALNUMBER HEX: 21 -CONSTANT: HID_USAGE_MS_BTH_HF_DIALMEMORY HEX: 22 - -CONSTANT: HID_USAGE_CONSUMERCTRL HEX: 01 -CONSTANT: HID_USAGE_DIGITIZER_PEN HEX: 02 -CONSTANT: HID_USAGE_DIGITIZER_IN_RANGE HEX: 32 -CONSTANT: HID_USAGE_DIGITIZER_TIP_SWITCH HEX: 42 -CONSTANT: HID_USAGE_DIGITIZER_BARREL_SWITCH HEX: 44 +CONSTANT: HID_USAGE_PAGE_UNDEFINED 0x00 +CONSTANT: HID_USAGE_PAGE_GENERIC 0x01 +CONSTANT: HID_USAGE_PAGE_SIMULATION 0x02 +CONSTANT: HID_USAGE_PAGE_VR 0x03 +CONSTANT: HID_USAGE_PAGE_SPORT 0x04 +CONSTANT: HID_USAGE_PAGE_GAME 0x05 +CONSTANT: HID_USAGE_PAGE_KEYBOARD 0x07 +CONSTANT: HID_USAGE_PAGE_LED 0x08 +CONSTANT: HID_USAGE_PAGE_BUTTON 0x09 +CONSTANT: HID_USAGE_PAGE_ORDINAL 0x0A +CONSTANT: HID_USAGE_PAGE_TELEPHONY 0x0B +CONSTANT: HID_USAGE_PAGE_CONSUMER 0x0C +CONSTANT: HID_USAGE_PAGE_DIGITIZER 0x0D +CONSTANT: HID_USAGE_PAGE_UNICODE 0x10 +CONSTANT: HID_USAGE_PAGE_ALPHANUMERIC 0x14 + +CONSTANT: HID_USAGE_PAGE_MICROSOFT_BLUETOOTH_HANDSFREE 0xFFF3 + +CONSTANT: HID_USAGE_GENERIC_POINTER 0x01 +CONSTANT: HID_USAGE_GENERIC_MOUSE 0x02 +CONSTANT: HID_USAGE_GENERIC_JOYSTICK 0x04 +CONSTANT: HID_USAGE_GENERIC_GAMEPAD 0x05 +CONSTANT: HID_USAGE_GENERIC_KEYBOARD 0x06 +CONSTANT: HID_USAGE_GENERIC_KEYPAD 0x07 +CONSTANT: HID_USAGE_GENERIC_SYSTEM_CTL 0x80 + +CONSTANT: HID_USAGE_GENERIC_X 0x30 +CONSTANT: HID_USAGE_GENERIC_Y 0x31 +CONSTANT: HID_USAGE_GENERIC_Z 0x32 +CONSTANT: HID_USAGE_GENERIC_RX 0x33 +CONSTANT: HID_USAGE_GENERIC_RY 0x34 +CONSTANT: HID_USAGE_GENERIC_RZ 0x35 +CONSTANT: HID_USAGE_GENERIC_SLIDER 0x36 +CONSTANT: HID_USAGE_GENERIC_DIAL 0x37 +CONSTANT: HID_USAGE_GENERIC_WHEEL 0x38 +CONSTANT: HID_USAGE_GENERIC_HATSWITCH 0x39 +CONSTANT: HID_USAGE_GENERIC_COUNTED_BUFFER 0x3A +CONSTANT: HID_USAGE_GENERIC_BYTE_COUNT 0x3B +CONSTANT: HID_USAGE_GENERIC_MOTION_WAKEUP 0x3C +CONSTANT: HID_USAGE_GENERIC_VX 0x40 +CONSTANT: HID_USAGE_GENERIC_VY 0x41 +CONSTANT: HID_USAGE_GENERIC_VZ 0x42 +CONSTANT: HID_USAGE_GENERIC_VBRX 0x43 +CONSTANT: HID_USAGE_GENERIC_VBRY 0x44 +CONSTANT: HID_USAGE_GENERIC_VBRZ 0x45 +CONSTANT: HID_USAGE_GENERIC_VNO 0x46 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_POWER 0x81 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_SLEEP 0x82 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_WAKE 0x83 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_CONTEXT_MENU 0x84 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_MAIN_MENU 0x85 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_APP_MENU 0x86 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_HELP_MENU 0x87 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_EXIT 0x88 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_SELECT 0x89 +CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_RIGHT 0x8A +CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_LEFT 0x8B +CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_UP 0x8C +CONSTANT: HID_USAGE_GENERIC_SYSCTL_MENU_DOWN 0x8D + +CONSTANT: HID_USAGE_SIMULATION_RUDDER 0xBA +CONSTANT: HID_USAGE_SIMULATION_THROTTLE 0xBB + +CONSTANT: HID_USAGE_KEYBOARD_NOEVENT 0x00 +CONSTANT: HID_USAGE_KEYBOARD_ROLLOVER 0x01 +CONSTANT: HID_USAGE_KEYBOARD_POSTFAIL 0x02 +CONSTANT: HID_USAGE_KEYBOARD_UNDEFINED 0x03 + +CONSTANT: HID_USAGE_KEYBOARD_aA 0x04 +CONSTANT: HID_USAGE_KEYBOARD_zZ 0x1D +CONSTANT: HID_USAGE_KEYBOARD_ONE 0x1E +CONSTANT: HID_USAGE_KEYBOARD_ZERO 0x27 +CONSTANT: HID_USAGE_KEYBOARD_LCTRL 0xE0 +CONSTANT: HID_USAGE_KEYBOARD_LSHFT 0xE1 +CONSTANT: HID_USAGE_KEYBOARD_LALT 0xE2 +CONSTANT: HID_USAGE_KEYBOARD_LGUI 0xE3 +CONSTANT: HID_USAGE_KEYBOARD_RCTRL 0xE4 +CONSTANT: HID_USAGE_KEYBOARD_RSHFT 0xE5 +CONSTANT: HID_USAGE_KEYBOARD_RALT 0xE6 +CONSTANT: HID_USAGE_KEYBOARD_RGUI 0xE7 +CONSTANT: HID_USAGE_KEYBOARD_SCROLL_LOCK 0x47 +CONSTANT: HID_USAGE_KEYBOARD_NUM_LOCK 0x53 +CONSTANT: HID_USAGE_KEYBOARD_CAPS_LOCK 0x39 +CONSTANT: HID_USAGE_KEYBOARD_F1 0x3A +CONSTANT: HID_USAGE_KEYBOARD_F12 0x45 +CONSTANT: HID_USAGE_KEYBOARD_RETURN 0x28 +CONSTANT: HID_USAGE_KEYBOARD_ESCAPE 0x29 +CONSTANT: HID_USAGE_KEYBOARD_DELETE 0x2A +CONSTANT: HID_USAGE_KEYBOARD_PRINT_SCREEN 0x46 + +CONSTANT: HID_USAGE_LED_NUM_LOCK 0x01 +CONSTANT: HID_USAGE_LED_CAPS_LOCK 0x02 +CONSTANT: HID_USAGE_LED_SCROLL_LOCK 0x03 +CONSTANT: HID_USAGE_LED_COMPOSE 0x04 +CONSTANT: HID_USAGE_LED_KANA 0x05 +CONSTANT: HID_USAGE_LED_POWER 0x06 +CONSTANT: HID_USAGE_LED_SHIFT 0x07 +CONSTANT: HID_USAGE_LED_DO_NOT_DISTURB 0x08 +CONSTANT: HID_USAGE_LED_MUTE 0x09 +CONSTANT: HID_USAGE_LED_TONE_ENABLE 0x0A +CONSTANT: HID_USAGE_LED_HIGH_CUT_FILTER 0x0B +CONSTANT: HID_USAGE_LED_LOW_CUT_FILTER 0x0C +CONSTANT: HID_USAGE_LED_EQUALIZER_ENABLE 0x0D +CONSTANT: HID_USAGE_LED_SOUND_FIELD_ON 0x0E +CONSTANT: HID_USAGE_LED_SURROUND_FIELD_ON 0x0F +CONSTANT: HID_USAGE_LED_REPEAT 0x10 +CONSTANT: HID_USAGE_LED_STEREO 0x11 +CONSTANT: HID_USAGE_LED_SAMPLING_RATE_DETECT 0x12 +CONSTANT: HID_USAGE_LED_SPINNING 0x13 +CONSTANT: HID_USAGE_LED_CAV 0x14 +CONSTANT: HID_USAGE_LED_CLV 0x15 +CONSTANT: HID_USAGE_LED_RECORDING_FORMAT_DET 0x16 +CONSTANT: HID_USAGE_LED_OFF_HOOK 0x17 +CONSTANT: HID_USAGE_LED_RING 0x18 +CONSTANT: HID_USAGE_LED_MESSAGE_WAITING 0x19 +CONSTANT: HID_USAGE_LED_DATA_MODE 0x1A +CONSTANT: HID_USAGE_LED_BATTERY_OPERATION 0x1B +CONSTANT: HID_USAGE_LED_BATTERY_OK 0x1C +CONSTANT: HID_USAGE_LED_BATTERY_LOW 0x1D +CONSTANT: HID_USAGE_LED_SPEAKER 0x1E +CONSTANT: HID_USAGE_LED_HEAD_SET 0x1F +CONSTANT: HID_USAGE_LED_HOLD 0x20 +CONSTANT: HID_USAGE_LED_MICROPHONE 0x21 +CONSTANT: HID_USAGE_LED_COVERAGE 0x22 +CONSTANT: HID_USAGE_LED_NIGHT_MODE 0x23 +CONSTANT: HID_USAGE_LED_SEND_CALLS 0x24 +CONSTANT: HID_USAGE_LED_CALL_PICKUP 0x25 +CONSTANT: HID_USAGE_LED_CONFERENCE 0x26 +CONSTANT: HID_USAGE_LED_STAND_BY 0x27 +CONSTANT: HID_USAGE_LED_CAMERA_ON 0x28 +CONSTANT: HID_USAGE_LED_CAMERA_OFF 0x29 +CONSTANT: HID_USAGE_LED_ON_LINE 0x2A +CONSTANT: HID_USAGE_LED_OFF_LINE 0x2B +CONSTANT: HID_USAGE_LED_BUSY 0x2C +CONSTANT: HID_USAGE_LED_READY 0x2D +CONSTANT: HID_USAGE_LED_PAPER_OUT 0x2E +CONSTANT: HID_USAGE_LED_PAPER_JAM 0x2F +CONSTANT: HID_USAGE_LED_REMOTE 0x30 +CONSTANT: HID_USAGE_LED_FORWARD 0x31 +CONSTANT: HID_USAGE_LED_REVERSE 0x32 +CONSTANT: HID_USAGE_LED_STOP 0x33 +CONSTANT: HID_USAGE_LED_REWIND 0x34 +CONSTANT: HID_USAGE_LED_FAST_FORWARD 0x35 +CONSTANT: HID_USAGE_LED_PLAY 0x36 +CONSTANT: HID_USAGE_LED_PAUSE 0x37 +CONSTANT: HID_USAGE_LED_RECORD 0x38 +CONSTANT: HID_USAGE_LED_ERROR 0x39 +CONSTANT: HID_USAGE_LED_SELECTED_INDICATOR 0x3A +CONSTANT: HID_USAGE_LED_IN_USE_INDICATOR 0x3B +CONSTANT: HID_USAGE_LED_MULTI_MODE_INDICATOR 0x3C +CONSTANT: HID_USAGE_LED_INDICATOR_ON 0x3D +CONSTANT: HID_USAGE_LED_INDICATOR_FLASH 0x3E +CONSTANT: HID_USAGE_LED_INDICATOR_SLOW_BLINK 0x3F +CONSTANT: HID_USAGE_LED_INDICATOR_FAST_BLINK 0x40 +CONSTANT: HID_USAGE_LED_INDICATOR_OFF 0x41 +CONSTANT: HID_USAGE_LED_FLASH_ON_TIME 0x42 +CONSTANT: HID_USAGE_LED_SLOW_BLINK_ON_TIME 0x43 +CONSTANT: HID_USAGE_LED_SLOW_BLINK_OFF_TIME 0x44 +CONSTANT: HID_USAGE_LED_FAST_BLINK_ON_TIME 0x45 +CONSTANT: HID_USAGE_LED_FAST_BLINK_OFF_TIME 0x46 +CONSTANT: HID_USAGE_LED_INDICATOR_COLOR 0x47 +CONSTANT: HID_USAGE_LED_RED 0x48 +CONSTANT: HID_USAGE_LED_GREEN 0x49 +CONSTANT: HID_USAGE_LED_AMBER 0x4A +CONSTANT: HID_USAGE_LED_GENERIC_INDICATOR 0x4B + +CONSTANT: HID_USAGE_TELEPHONY_PHONE 0x01 +CONSTANT: HID_USAGE_TELEPHONY_ANSWERING_MACHINE 0x02 +CONSTANT: HID_USAGE_TELEPHONY_MESSAGE_CONTROLS 0x03 +CONSTANT: HID_USAGE_TELEPHONY_HANDSET 0x04 +CONSTANT: HID_USAGE_TELEPHONY_HEADSET 0x05 +CONSTANT: HID_USAGE_TELEPHONY_KEYPAD 0x06 +CONSTANT: HID_USAGE_TELEPHONY_PROGRAMMABLE_BUTTON 0x07 +CONSTANT: HID_USAGE_TELEPHONY_REDIAL 0x24 +CONSTANT: HID_USAGE_TELEPHONY_TRANSFER 0x25 +CONSTANT: HID_USAGE_TELEPHONY_DROP 0x26 +CONSTANT: HID_USAGE_TELEPHONY_LINE 0x2A +CONSTANT: HID_USAGE_TELEPHONY_RING_ENABLE 0x2D +CONSTANT: HID_USAGE_TELEPHONY_SEND 0x31 +CONSTANT: HID_USAGE_TELEPHONY_KEYPAD_0 0xB0 +CONSTANT: HID_USAGE_TELEPHONY_KEYPAD_D 0xBF +CONSTANT: HID_USAGE_TELEPHONY_HOST_AVAILABLE 0xF1 + +CONSTANT: HID_USAGE_MS_BTH_HF_DIALNUMBER 0x21 +CONSTANT: HID_USAGE_MS_BTH_HF_DIALMEMORY 0x22 + +CONSTANT: HID_USAGE_CONSUMERCTRL 0x01 +CONSTANT: HID_USAGE_DIGITIZER_PEN 0x02 +CONSTANT: HID_USAGE_DIGITIZER_IN_RANGE 0x32 +CONSTANT: HID_USAGE_DIGITIZER_TIP_SWITCH 0x42 +CONSTANT: HID_USAGE_DIGITIZER_BARREL_SWITCH 0x44 CONSTANT: HIDP_LINK_COLLECTION_ROOT -1 CONSTANT: HIDP_LINK_COLLECTION_UNSPECIFIED 0 @@ -641,28 +641,28 @@ HidP_TranslateUsagesToI8042ScanCodes ( PVOID InsertCodesContext ) ; -CONSTANT: FACILITY_HID_ERROR_CODE HEX: 11 +CONSTANT: FACILITY_HID_ERROR_CODE 0x11 : HIDP_ERROR_CODES ( SEV CODE -- HRESULT ) [ 28 shift ] dip bitor FACILITY_HID_ERROR_CODE 16 shift bitor ; inline -: HIDP_STATUS_SUCCESS ( -- HRESULT ) HEX: 0 HEX: 0 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_NULL ( -- HRESULT ) HEX: 8 HEX: 1 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_INVALID_PREPARSED_DATA ( -- HRESULT ) HEX: C HEX: 1 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_INVALID_REPORT_TYPE ( -- HRESULT ) HEX: C HEX: 2 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_INVALID_REPORT_LENGTH ( -- HRESULT ) HEX: C HEX: 3 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_USAGE_NOT_FOUND ( -- HRESULT ) HEX: C HEX: 4 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_VALUE_OUT_OF_RANGE ( -- HRESULT ) HEX: C HEX: 5 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_BAD_LOG_PHY_VALUES ( -- HRESULT ) HEX: C HEX: 6 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_BUFFER_TOO_SMALL ( -- HRESULT ) HEX: C HEX: 7 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_INTERNAL_ERROR ( -- HRESULT ) HEX: C HEX: 8 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_I8042_TRANS_UNKNOWN ( -- HRESULT ) HEX: C HEX: 9 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_INCOMPATIBLE_REPORT_ID ( -- HRESULT ) HEX: C HEX: A HIDP_ERROR_CODES ; inline -: HIDP_STATUS_NOT_VALUE_ARRAY ( -- HRESULT ) HEX: C HEX: B HIDP_ERROR_CODES ; inline -: HIDP_STATUS_IS_VALUE_ARRAY ( -- HRESULT ) HEX: C HEX: C HIDP_ERROR_CODES ; inline -: HIDP_STATUS_DATA_INDEX_NOT_FOUND ( -- HRESULT ) HEX: C HEX: D HIDP_ERROR_CODES ; inline -: HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE ( -- HRESULT ) HEX: C HEX: E HIDP_ERROR_CODES ; inline -: HIDP_STATUS_BUTTON_NOT_PRESSED ( -- HRESULT ) HEX: C HEX: F HIDP_ERROR_CODES ; inline -: HIDP_STATUS_REPORT_DOES_NOT_EXIST ( -- HRESULT ) HEX: C HEX: 10 HIDP_ERROR_CODES ; inline -: HIDP_STATUS_NOT_IMPLEMENTED ( -- HRESULT ) HEX: C HEX: 20 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_SUCCESS ( -- HRESULT ) 0x0 0x0 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_NULL ( -- HRESULT ) 0x8 0x1 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_INVALID_PREPARSED_DATA ( -- HRESULT ) 0xC 0x1 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_INVALID_REPORT_TYPE ( -- HRESULT ) 0xC 0x2 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_INVALID_REPORT_LENGTH ( -- HRESULT ) 0xC 0x3 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_USAGE_NOT_FOUND ( -- HRESULT ) 0xC 0x4 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_VALUE_OUT_OF_RANGE ( -- HRESULT ) 0xC 0x5 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_BAD_LOG_PHY_VALUES ( -- HRESULT ) 0xC 0x6 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_BUFFER_TOO_SMALL ( -- HRESULT ) 0xC 0x7 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_INTERNAL_ERROR ( -- HRESULT ) 0xC 0x8 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_I8042_TRANS_UNKNOWN ( -- HRESULT ) 0xC 0x9 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_INCOMPATIBLE_REPORT_ID ( -- HRESULT ) 0xC 0xA HIDP_ERROR_CODES ; inline +: HIDP_STATUS_NOT_VALUE_ARRAY ( -- HRESULT ) 0xC 0xB HIDP_ERROR_CODES ; inline +: HIDP_STATUS_IS_VALUE_ARRAY ( -- HRESULT ) 0xC 0xC HIDP_ERROR_CODES ; inline +: HIDP_STATUS_DATA_INDEX_NOT_FOUND ( -- HRESULT ) 0xC 0xD HIDP_ERROR_CODES ; inline +: HIDP_STATUS_DATA_INDEX_OUT_OF_RANGE ( -- HRESULT ) 0xC 0xE HIDP_ERROR_CODES ; inline +: HIDP_STATUS_BUTTON_NOT_PRESSED ( -- HRESULT ) 0xC 0xF HIDP_ERROR_CODES ; inline +: HIDP_STATUS_REPORT_DOES_NOT_EXIST ( -- HRESULT ) 0xC 0x10 HIDP_ERROR_CODES ; inline +: HIDP_STATUS_NOT_IMPLEMENTED ( -- HRESULT ) 0xC 0x20 HIDP_ERROR_CODES ; inline : HIDP_STATUS_I8242_TRANS_UNKNOWN ( -- HRESULT ) HIDP_STATUS_I8042_TRANS_UNKNOWN ; inline STRUCT: HIDD_CONFIGURATION diff --git a/basis/windows/ddk/setupapi/setupapi.factor b/basis/windows/ddk/setupapi/setupapi.factor index 7af177b480..ff9ceb4c1e 100755 --- a/basis/windows/ddk/setupapi/setupapi.factor +++ b/basis/windows/ddk/setupapi/setupapi.factor @@ -17,46 +17,46 @@ CONSTANT: LOGTOKEN_NO_LOG 1 CONSTANT: LOGTOKEN_SETUPAPI_APPLOG 2 CONSTANT: LOGTOKEN_SETUPAPI_DEVLOG 3 -CONSTANT: TXTLOG_SETUPAPI_DEVLOG HEX: 00000001 -CONSTANT: TXTLOG_SETUPAPI_CMDLINE HEX: 00000002 -CONSTANT: TXTLOG_SETUPAPI_BITS HEX: 00000003 - -CONSTANT: TXTLOG_ERROR HEX: 1 -CONSTANT: TXTLOG_WARNING HEX: 2 -CONSTANT: TXTLOG_SYSTEM_STATE_CHANGE HEX: 3 -CONSTANT: TXTLOG_SUMMARY HEX: 4 -CONSTANT: TXTLOG_DETAILS HEX: 5 -CONSTANT: TXTLOG_VERBOSE HEX: 6 -CONSTANT: TXTLOG_VERY_VERBOSE HEX: 7 - -CONSTANT: TXTLOG_RESERVED_FLAGS HEX: 0000FFF0 - -CONSTANT: TXTLOG_TIMESTAMP HEX: 00010000 -CONSTANT: TXTLOG_DEPTH_INCR HEX: 00020000 -CONSTANT: TXTLOG_DEPTH_DECR HEX: 00040000 -CONSTANT: TXTLOG_TAB_1 HEX: 00080000 -CONSTANT: TXTLOG_FLUSH_FILE HEX: 00100000 - -: TXTLOG_LEVEL ( flags -- n ) HEX: f bitand ; inline - -CONSTANT: TXTLOG_DEVINST HEX: 00000001 -CONSTANT: TXTLOG_INF HEX: 00000002 -CONSTANT: TXTLOG_FILEQ HEX: 00000004 -CONSTANT: TXTLOG_COPYFILES HEX: 00000008 -CONSTANT: TXTLOG_SIGVERIF HEX: 00000020 -CONSTANT: TXTLOG_BACKUP HEX: 00000080 -CONSTANT: TXTLOG_UI HEX: 00000100 -CONSTANT: TXTLOG_UTIL HEX: 00000200 -CONSTANT: TXTLOG_INFDB HEX: 00000400 -CONSTANT: TXTLOG_POLICY HEX: 00800000 -CONSTANT: TXTLOG_NEWDEV HEX: 01000000 -CONSTANT: TXTLOG_UMPNPMGR HEX: 02000000 -CONSTANT: TXTLOG_DRIVER_STORE HEX: 04000000 -CONSTANT: TXTLOG_SETUP HEX: 08000000 -CONSTANT: TXTLOG_CMI HEX: 10000000 -CONSTANT: TXTLOG_DEVMGR HEX: 20000000 -CONSTANT: TXTLOG_INSTALLER HEX: 40000000 -CONSTANT: TXTLOG_VENDOR HEX: 80000000 +CONSTANT: TXTLOG_SETUPAPI_DEVLOG 0x00000001 +CONSTANT: TXTLOG_SETUPAPI_CMDLINE 0x00000002 +CONSTANT: TXTLOG_SETUPAPI_BITS 0x00000003 + +CONSTANT: TXTLOG_ERROR 0x1 +CONSTANT: TXTLOG_WARNING 0x2 +CONSTANT: TXTLOG_SYSTEM_STATE_CHANGE 0x3 +CONSTANT: TXTLOG_SUMMARY 0x4 +CONSTANT: TXTLOG_DETAILS 0x5 +CONSTANT: TXTLOG_VERBOSE 0x6 +CONSTANT: TXTLOG_VERY_VERBOSE 0x7 + +CONSTANT: TXTLOG_RESERVED_FLAGS 0x0000FFF0 + +CONSTANT: TXTLOG_TIMESTAMP 0x00010000 +CONSTANT: TXTLOG_DEPTH_INCR 0x00020000 +CONSTANT: TXTLOG_DEPTH_DECR 0x00040000 +CONSTANT: TXTLOG_TAB_1 0x00080000 +CONSTANT: TXTLOG_FLUSH_FILE 0x00100000 + +: TXTLOG_LEVEL ( flags -- n ) 0xf bitand ; inline + +CONSTANT: TXTLOG_DEVINST 0x00000001 +CONSTANT: TXTLOG_INF 0x00000002 +CONSTANT: TXTLOG_FILEQ 0x00000004 +CONSTANT: TXTLOG_COPYFILES 0x00000008 +CONSTANT: TXTLOG_SIGVERIF 0x00000020 +CONSTANT: TXTLOG_BACKUP 0x00000080 +CONSTANT: TXTLOG_UI 0x00000100 +CONSTANT: TXTLOG_UTIL 0x00000200 +CONSTANT: TXTLOG_INFDB 0x00000400 +CONSTANT: TXTLOG_POLICY 0x00800000 +CONSTANT: TXTLOG_NEWDEV 0x01000000 +CONSTANT: TXTLOG_UMPNPMGR 0x02000000 +CONSTANT: TXTLOG_DRIVER_STORE 0x04000000 +CONSTANT: TXTLOG_SETUP 0x08000000 +CONSTANT: TXTLOG_CMI 0x10000000 +CONSTANT: TXTLOG_DEVMGR 0x20000000 +CONSTANT: TXTLOG_INSTALLER 0x40000000 +CONSTANT: TXTLOG_VENDOR 0x80000000 TYPEDEF: void* HPROPSHEETPAGE TYPEDEF: void* HIMAGELIST @@ -129,14 +129,14 @@ 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 HEX: 00000000 -CONSTANT: INF_STYLE_OLDNT HEX: 00000001 -CONSTANT: INF_STYLE_WIN4 HEX: 00000002 -CONSTANT: INF_STYLE_CACHE_ENABLE HEX: 00000010 -CONSTANT: INF_STYLE_CACHE_DISABLE HEX: 00000020 -CONSTANT: INF_STYLE_CACHE_IGNORE HEX: 00000040 +CONSTANT: INF_STYLE_NONE 0x00000000 +CONSTANT: INF_STYLE_OLDNT 0x00000001 +CONSTANT: INF_STYLE_WIN4 0x00000002 +CONSTANT: INF_STYLE_CACHE_ENABLE 0x00000010 +CONSTANT: INF_STYLE_CACHE_DISABLE 0x00000020 +CONSTANT: INF_STYLE_CACHE_IGNORE 0x00000040 CONSTANT: DIRID_ABSOLUTE -1 -CONSTANT: DIRID_ABSOLUTE_16BIT HEX: ffff +CONSTANT: DIRID_ABSOLUTE_16BIT 0xffff CONSTANT: DIRID_NULL 0 CONSTANT: DIRID_SRCPATH 1 CONSTANT: DIRID_WINDOWS 10 @@ -171,40 +171,40 @@ CONSTANT: DIRID_PROGRAM_FILES_COMMON 16427 CONSTANT: DIRID_PROGRAM_FILES_COMMONX86 16428 CONSTANT: DIRID_COMMON_TEMPLATES 16429 CONSTANT: DIRID_COMMON_DOCUMENTS 16430 -CONSTANT: DIRID_USER HEX: 8000 +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 -CONSTANT: SPFILENOTIFY_STARTQUEUE HEX: 00000001 -CONSTANT: SPFILENOTIFY_ENDQUEUE HEX: 00000002 -CONSTANT: SPFILENOTIFY_STARTSUBQUEUE HEX: 00000003 -CONSTANT: SPFILENOTIFY_ENDSUBQUEUE HEX: 00000004 -CONSTANT: SPFILENOTIFY_STARTDELETE HEX: 00000005 -CONSTANT: SPFILENOTIFY_ENDDELETE HEX: 00000006 -CONSTANT: SPFILENOTIFY_DELETEERROR HEX: 00000007 -CONSTANT: SPFILENOTIFY_STARTRENAME HEX: 00000008 -CONSTANT: SPFILENOTIFY_ENDRENAME HEX: 00000009 -CONSTANT: SPFILENOTIFY_RENAMEERROR HEX: 0000000a -CONSTANT: SPFILENOTIFY_STARTCOPY HEX: 0000000b -CONSTANT: SPFILENOTIFY_ENDCOPY HEX: 0000000c -CONSTANT: SPFILENOTIFY_COPYERROR HEX: 0000000d -CONSTANT: SPFILENOTIFY_NEEDMEDIA HEX: 0000000e -CONSTANT: SPFILENOTIFY_QUEUESCAN HEX: 0000000f -CONSTANT: SPFILENOTIFY_CABINETINFO HEX: 00000010 -CONSTANT: SPFILENOTIFY_FILEINCABINET HEX: 00000011 -CONSTANT: SPFILENOTIFY_NEEDNEWCABINET HEX: 00000012 -CONSTANT: SPFILENOTIFY_FILEEXTRACTED HEX: 00000013 -CONSTANT: SPFILENOTIFY_FILEOPDELAYED HEX: 00000014 -CONSTANT: SPFILENOTIFY_STARTBACKUP HEX: 00000015 -CONSTANT: SPFILENOTIFY_BACKUPERROR HEX: 00000016 -CONSTANT: SPFILENOTIFY_ENDBACKUP HEX: 00000017 -CONSTANT: SPFILENOTIFY_QUEUESCAN_EX HEX: 00000018 -CONSTANT: SPFILENOTIFY_STARTREGISTRATION HEX: 00000019 -CONSTANT: SPFILENOTIFY_ENDREGISTRATION HEX: 00000020 -CONSTANT: SPFILENOTIFY_QUEUESCAN_SIGNERINFO HEX: 00000040 -CONSTANT: SPFILENOTIFY_LANGMISMATCH HEX: 00010000 -CONSTANT: SPFILENOTIFY_TARGETEXISTS HEX: 00020000 -CONSTANT: SPFILENOTIFY_TARGETNEWER HEX: 00040000 +CONSTANT: SPFILENOTIFY_STARTQUEUE 0x00000001 +CONSTANT: SPFILENOTIFY_ENDQUEUE 0x00000002 +CONSTANT: SPFILENOTIFY_STARTSUBQUEUE 0x00000003 +CONSTANT: SPFILENOTIFY_ENDSUBQUEUE 0x00000004 +CONSTANT: SPFILENOTIFY_STARTDELETE 0x00000005 +CONSTANT: SPFILENOTIFY_ENDDELETE 0x00000006 +CONSTANT: SPFILENOTIFY_DELETEERROR 0x00000007 +CONSTANT: SPFILENOTIFY_STARTRENAME 0x00000008 +CONSTANT: SPFILENOTIFY_ENDRENAME 0x00000009 +CONSTANT: SPFILENOTIFY_RENAMEERROR 0x0000000a +CONSTANT: SPFILENOTIFY_STARTCOPY 0x0000000b +CONSTANT: SPFILENOTIFY_ENDCOPY 0x0000000c +CONSTANT: SPFILENOTIFY_COPYERROR 0x0000000d +CONSTANT: SPFILENOTIFY_NEEDMEDIA 0x0000000e +CONSTANT: SPFILENOTIFY_QUEUESCAN 0x0000000f +CONSTANT: SPFILENOTIFY_CABINETINFO 0x00000010 +CONSTANT: SPFILENOTIFY_FILEINCABINET 0x00000011 +CONSTANT: SPFILENOTIFY_NEEDNEWCABINET 0x00000012 +CONSTANT: SPFILENOTIFY_FILEEXTRACTED 0x00000013 +CONSTANT: SPFILENOTIFY_FILEOPDELAYED 0x00000014 +CONSTANT: SPFILENOTIFY_STARTBACKUP 0x00000015 +CONSTANT: SPFILENOTIFY_BACKUPERROR 0x00000016 +CONSTANT: SPFILENOTIFY_ENDBACKUP 0x00000017 +CONSTANT: SPFILENOTIFY_QUEUESCAN_EX 0x00000018 +CONSTANT: SPFILENOTIFY_STARTREGISTRATION 0x00000019 +CONSTANT: SPFILENOTIFY_ENDREGISTRATION 0x00000020 +CONSTANT: SPFILENOTIFY_QUEUESCAN_SIGNERINFO 0x00000040 +CONSTANT: SPFILENOTIFY_LANGMISMATCH 0x00010000 +CONSTANT: SPFILENOTIFY_TARGETEXISTS 0x00020000 +CONSTANT: SPFILENOTIFY_TARGETNEWER 0x00040000 CONSTANT: FILEOP_COPY 0 CONSTANT: FILEOP_RENAME 1 CONSTANT: FILEOP_DELETE 2 @@ -214,21 +214,21 @@ CONSTANT: FILEOP_DOIT 1 CONSTANT: FILEOP_SKIP 2 CONSTANT: FILEOP_RETRY $ FILEOP_DOIT CONSTANT: FILEOP_NEWPATH 4 -CONSTANT: COPYFLG_WARN_IF_SKIP HEX: 00000001 -CONSTANT: COPYFLG_NOSKIP HEX: 00000002 -CONSTANT: COPYFLG_NOVERSIONCHECK HEX: 00000004 -CONSTANT: COPYFLG_FORCE_FILE_IN_USE HEX: 00000008 -CONSTANT: COPYFLG_NO_OVERWRITE HEX: 00000010 -CONSTANT: COPYFLG_NO_VERSION_DIALOG HEX: 00000020 -CONSTANT: COPYFLG_OVERWRITE_OLDER_ONLY HEX: 00000040 -CONSTANT: COPYFLG_PROTECTED_WINDOWS_DRIVER_FILE HEX: 00000100 -CONSTANT: COPYFLG_REPLACEONLY HEX: 00000400 -CONSTANT: COPYFLG_NODECOMP HEX: 00000800 -CONSTANT: COPYFLG_REPLACE_BOOT_FILE HEX: 00001000 -CONSTANT: COPYFLG_NOPRUNE HEX: 00002000 -CONSTANT: COPYFLG_IN_USE_TRY_RENAME HEX: 00004000 -CONSTANT: DELFLG_IN_USE HEX: 00000001 -CONSTANT: DELFLG_IN_USE1 HEX: 00010000 +CONSTANT: COPYFLG_WARN_IF_SKIP 0x00000001 +CONSTANT: COPYFLG_NOSKIP 0x00000002 +CONSTANT: COPYFLG_NOVERSIONCHECK 0x00000004 +CONSTANT: COPYFLG_FORCE_FILE_IN_USE 0x00000008 +CONSTANT: COPYFLG_NO_OVERWRITE 0x00000010 +CONSTANT: COPYFLG_NO_VERSION_DIALOG 0x00000020 +CONSTANT: COPYFLG_OVERWRITE_OLDER_ONLY 0x00000040 +CONSTANT: COPYFLG_PROTECTED_WINDOWS_DRIVER_FILE 0x00000100 +CONSTANT: COPYFLG_REPLACEONLY 0x00000400 +CONSTANT: COPYFLG_NODECOMP 0x00000800 +CONSTANT: COPYFLG_REPLACE_BOOT_FILE 0x00001000 +CONSTANT: COPYFLG_NOPRUNE 0x00002000 +CONSTANT: COPYFLG_IN_USE_TRY_RENAME 0x00004000 +CONSTANT: DELFLG_IN_USE 0x00000001 +CONSTANT: DELFLG_IN_USE1 0x00010000 STRUCT: FILEPATHS_A { Target PCSTR } { Source PCSTR } @@ -337,13 +337,13 @@ 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 -CONSTANT: SPREG_SUCCESS HEX: 00000000 -CONSTANT: SPREG_LOADLIBRARY HEX: 00000001 -CONSTANT: SPREG_GETPROCADDR HEX: 00000002 -CONSTANT: SPREG_REGSVR HEX: 00000003 -CONSTANT: SPREG_DLLINSTALL HEX: 00000004 -CONSTANT: SPREG_TIMEOUT HEX: 00000005 -CONSTANT: SPREG_UNKNOWN HEX: FFFFFFFF +CONSTANT: SPREG_SUCCESS 0x00000000 +CONSTANT: SPREG_LOADLIBRARY 0x00000001 +CONSTANT: SPREG_GETPROCADDR 0x00000002 +CONSTANT: SPREG_REGSVR 0x00000003 +CONSTANT: SPREG_DLLINSTALL 0x00000004 +CONSTANT: SPREG_TIMEOUT 0x00000005 +CONSTANT: SPREG_UNKNOWN 0xFFFFFFFF TYPEDEF: PVOID HSPFILEQ @@ -395,9 +395,9 @@ STRUCT: SP_DEVICE_INTERFACE_DATA { Reserved ULONG_PTR } ; TYPEDEF: SP_DEVICE_INTERFACE_DATA* PSP_DEVICE_INTERFACE_DATA -CONSTANT: SPINT_ACTIVE HEX: 00000001 -CONSTANT: SPINT_DEFAULT HEX: 00000002 -CONSTANT: SPINT_REMOVED HEX: 00000004 +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 CONSTANT: SPID_ACTIVE $ SPINT_ACTIVE @@ -438,49 +438,49 @@ 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 -CONSTANT: DIF_SELECTDEVICE HEX: 00000001 -CONSTANT: DIF_INSTALLDEVICE HEX: 00000002 -CONSTANT: DIF_ASSIGNRESOURCES HEX: 00000003 -CONSTANT: DIF_PROPERTIES HEX: 00000004 -CONSTANT: DIF_REMOVE HEX: 00000005 -CONSTANT: DIF_FIRSTTIMESETUP HEX: 00000006 -CONSTANT: DIF_FOUNDDEVICE HEX: 00000007 -CONSTANT: DIF_SELECTCLASSDRIVERS HEX: 00000008 -CONSTANT: DIF_VALIDATECLASSDRIVERS HEX: 00000009 -CONSTANT: DIF_INSTALLCLASSDRIVERS HEX: 0000000A -CONSTANT: DIF_CALCDISKSPACE HEX: 0000000B -CONSTANT: DIF_DESTROYPRIVATEDATA HEX: 0000000C -CONSTANT: DIF_VALIDATEDRIVER HEX: 0000000D -CONSTANT: DIF_DETECT HEX: 0000000F -CONSTANT: DIF_INSTALLWIZARD HEX: 00000010 -CONSTANT: DIF_DESTROYWIZARDDATA HEX: 00000011 -CONSTANT: DIF_PROPERTYCHANGE HEX: 00000012 -CONSTANT: DIF_ENABLECLASS HEX: 00000013 -CONSTANT: DIF_DETECTVERIFY HEX: 00000014 -CONSTANT: DIF_INSTALLDEVICEFILES HEX: 00000015 -CONSTANT: DIF_UNREMOVE HEX: 00000016 -CONSTANT: DIF_SELECTBESTCOMPATDRV HEX: 00000017 -CONSTANT: DIF_ALLOW_INSTALL HEX: 00000018 -CONSTANT: DIF_REGISTERDEVICE HEX: 00000019 -CONSTANT: DIF_NEWDEVICEWIZARD_PRESELECT HEX: 0000001A -CONSTANT: DIF_NEWDEVICEWIZARD_SELECT HEX: 0000001B -CONSTANT: DIF_NEWDEVICEWIZARD_PREANALYZE HEX: 0000001C -CONSTANT: DIF_NEWDEVICEWIZARD_POSTANALYZE HEX: 0000001D -CONSTANT: DIF_NEWDEVICEWIZARD_FINISHINSTALL HEX: 0000001E -CONSTANT: DIF_UNUSED1 HEX: 0000001F -CONSTANT: DIF_INSTALLINTERFACES HEX: 00000020 -CONSTANT: DIF_DETECTCANCEL HEX: 00000021 -CONSTANT: DIF_REGISTER_COINSTALLERS HEX: 00000022 -CONSTANT: DIF_ADDPROPERTYPAGE_ADVANCED HEX: 00000023 -CONSTANT: DIF_ADDPROPERTYPAGE_BASIC HEX: 00000024 -CONSTANT: DIF_RESERVED1 HEX: 00000025 -CONSTANT: DIF_TROUBLESHOOTER HEX: 00000026 -CONSTANT: DIF_POWERMESSAGEWAKE HEX: 00000027 -CONSTANT: DIF_ADDREMOTEPROPERTYPAGE_ADVANCED HEX: 00000028 -CONSTANT: DIF_UPDATEDRIVER_UI HEX: 00000029 -CONSTANT: DIF_FINISHINSTALL_ACTION HEX: 0000002A -CONSTANT: DIF_RESERVED2 HEX: 00000030 -CONSTANT: DIF_MOVEDEVICE HEX: 0000000E +CONSTANT: DIF_SELECTDEVICE 0x00000001 +CONSTANT: DIF_INSTALLDEVICE 0x00000002 +CONSTANT: DIF_ASSIGNRESOURCES 0x00000003 +CONSTANT: DIF_PROPERTIES 0x00000004 +CONSTANT: DIF_REMOVE 0x00000005 +CONSTANT: DIF_FIRSTTIMESETUP 0x00000006 +CONSTANT: DIF_FOUNDDEVICE 0x00000007 +CONSTANT: DIF_SELECTCLASSDRIVERS 0x00000008 +CONSTANT: DIF_VALIDATECLASSDRIVERS 0x00000009 +CONSTANT: DIF_INSTALLCLASSDRIVERS 0x0000000A +CONSTANT: DIF_CALCDISKSPACE 0x0000000B +CONSTANT: DIF_DESTROYPRIVATEDATA 0x0000000C +CONSTANT: DIF_VALIDATEDRIVER 0x0000000D +CONSTANT: DIF_DETECT 0x0000000F +CONSTANT: DIF_INSTALLWIZARD 0x00000010 +CONSTANT: DIF_DESTROYWIZARDDATA 0x00000011 +CONSTANT: DIF_PROPERTYCHANGE 0x00000012 +CONSTANT: DIF_ENABLECLASS 0x00000013 +CONSTANT: DIF_DETECTVERIFY 0x00000014 +CONSTANT: DIF_INSTALLDEVICEFILES 0x00000015 +CONSTANT: DIF_UNREMOVE 0x00000016 +CONSTANT: DIF_SELECTBESTCOMPATDRV 0x00000017 +CONSTANT: DIF_ALLOW_INSTALL 0x00000018 +CONSTANT: DIF_REGISTERDEVICE 0x00000019 +CONSTANT: DIF_NEWDEVICEWIZARD_PRESELECT 0x0000001A +CONSTANT: DIF_NEWDEVICEWIZARD_SELECT 0x0000001B +CONSTANT: DIF_NEWDEVICEWIZARD_PREANALYZE 0x0000001C +CONSTANT: DIF_NEWDEVICEWIZARD_POSTANALYZE 0x0000001D +CONSTANT: DIF_NEWDEVICEWIZARD_FINISHINSTALL 0x0000001E +CONSTANT: DIF_UNUSED1 0x0000001F +CONSTANT: DIF_INSTALLINTERFACES 0x00000020 +CONSTANT: DIF_DETECTCANCEL 0x00000021 +CONSTANT: DIF_REGISTER_COINSTALLERS 0x00000022 +CONSTANT: DIF_ADDPROPERTYPAGE_ADVANCED 0x00000023 +CONSTANT: DIF_ADDPROPERTYPAGE_BASIC 0x00000024 +CONSTANT: DIF_RESERVED1 0x00000025 +CONSTANT: DIF_TROUBLESHOOTER 0x00000026 +CONSTANT: DIF_POWERMESSAGEWAKE 0x00000027 +CONSTANT: DIF_ADDREMOTEPROPERTYPAGE_ADVANCED 0x00000028 +CONSTANT: DIF_UPDATEDRIVER_UI 0x00000029 +CONSTANT: DIF_FINISHINSTALL_ACTION 0x0000002A +CONSTANT: DIF_RESERVED2 0x00000030 +CONSTANT: DIF_MOVEDEVICE 0x0000000E TYPEDEF: UINT DI_FUNCTION STRUCT: SP_DEVINSTALL_PARAMS_A @@ -510,70 +510,70 @@ 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 HEX: 00000001 -CONSTANT: DI_SHOWCOMPAT HEX: 00000002 -CONSTANT: DI_SHOWCLASS HEX: 00000004 -CONSTANT: DI_SHOWALL HEX: 00000007 -CONSTANT: DI_NOVCP HEX: 00000008 -CONSTANT: DI_DIDCOMPAT HEX: 00000010 -CONSTANT: DI_DIDCLASS HEX: 00000020 -CONSTANT: DI_AUTOASSIGNRES HEX: 00000040 -CONSTANT: DI_NEEDRESTART HEX: 00000080 -CONSTANT: DI_NEEDREBOOT HEX: 00000100 -CONSTANT: DI_NOBROWSE HEX: 00000200 -CONSTANT: DI_MULTMFGS HEX: 00000400 -CONSTANT: DI_DISABLED HEX: 00000800 -CONSTANT: DI_GENERALPAGE_ADDED HEX: 00001000 -CONSTANT: DI_RESOURCEPAGE_ADDED HEX: 00002000 -CONSTANT: DI_PROPERTIES_CHANGE HEX: 00004000 -CONSTANT: DI_INF_IS_SORTED HEX: 00008000 -CONSTANT: DI_ENUMSINGLEINF HEX: 00010000 -CONSTANT: DI_DONOTCALLCONFIGMG HEX: 00020000 -CONSTANT: DI_INSTALLDISABLED HEX: 00040000 -CONSTANT: DI_COMPAT_FROM_CLASS HEX: 00080000 -CONSTANT: DI_CLASSINSTALLPARAMS HEX: 00100000 -CONSTANT: DI_NODI_DEFAULTACTION HEX: 00200000 -CONSTANT: DI_QUIETINSTALL HEX: 00800000 -CONSTANT: DI_NOFILECOPY HEX: 01000000 -CONSTANT: DI_FORCECOPY HEX: 02000000 -CONSTANT: DI_DRIVERPAGE_ADDED HEX: 04000000 -CONSTANT: DI_USECI_SELECTSTRINGS HEX: 08000000 -CONSTANT: DI_OVERRIDE_INFFLAGS HEX: 10000000 -CONSTANT: DI_PROPS_NOCHANGEUSAGE HEX: 20000000 -CONSTANT: DI_NOSELECTICONS HEX: 40000000 -CONSTANT: DI_NOWRITE_IDS HEX: 80000000 -CONSTANT: DI_FLAGSEX_RESERVED2 HEX: 00000001 -CONSTANT: DI_FLAGSEX_RESERVED3 HEX: 00000002 -CONSTANT: DI_FLAGSEX_CI_FAILED HEX: 00000004 -CONSTANT: DI_FLAGSEX_FINISHINSTALL_ACTION HEX: 00000008 -CONSTANT: DI_FLAGSEX_DIDINFOLIST HEX: 00000010 -CONSTANT: DI_FLAGSEX_DIDCOMPATINFO HEX: 00000020 -CONSTANT: DI_FLAGSEX_FILTERCLASSES HEX: 00000040 -CONSTANT: DI_FLAGSEX_SETFAILEDINSTALL HEX: 00000080 -CONSTANT: DI_FLAGSEX_DEVICECHANGE HEX: 00000100 -CONSTANT: DI_FLAGSEX_ALWAYSWRITEIDS HEX: 00000200 -CONSTANT: DI_FLAGSEX_PROPCHANGE_PENDING HEX: 00000400 -CONSTANT: DI_FLAGSEX_ALLOWEXCLUDEDDRVS HEX: 00000800 -CONSTANT: DI_FLAGSEX_NOUIONQUERYREMOVE HEX: 00001000 -CONSTANT: DI_FLAGSEX_USECLASSFORCOMPAT HEX: 00002000 -CONSTANT: DI_FLAGSEX_RESERVED4 HEX: 00004000 -CONSTANT: DI_FLAGSEX_NO_DRVREG_MODIFY HEX: 00008000 -CONSTANT: DI_FLAGSEX_IN_SYSTEM_SETUP HEX: 00010000 -CONSTANT: DI_FLAGSEX_INET_DRIVER HEX: 00020000 -CONSTANT: DI_FLAGSEX_APPENDDRIVERLIST HEX: 00040000 -CONSTANT: DI_FLAGSEX_PREINSTALLBACKUP HEX: 00080000 -CONSTANT: DI_FLAGSEX_BACKUPONREPLACE HEX: 00100000 -CONSTANT: DI_FLAGSEX_DRIVERLIST_FROM_URL HEX: 00200000 -CONSTANT: DI_FLAGSEX_RESERVED1 HEX: 00400000 -CONSTANT: DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS HEX: 00800000 -CONSTANT: DI_FLAGSEX_POWERPAGE_ADDED HEX: 01000000 -CONSTANT: DI_FLAGSEX_FILTERSIMILARDRIVERS HEX: 02000000 -CONSTANT: DI_FLAGSEX_INSTALLEDDRIVER HEX: 04000000 -CONSTANT: DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE HEX: 08000000 -CONSTANT: DI_FLAGSEX_ALTPLATFORM_DRVSEARCH HEX: 10000000 -CONSTANT: DI_FLAGSEX_RESTART_DEVICE_ONLY HEX: 20000000 -CONSTANT: DI_FLAGSEX_RECURSIVESEARCH HEX: 40000000 -CONSTANT: DI_FLAGSEX_SEARCH_PUBLISHED_INFS HEX: 80000000 +CONSTANT: DI_SHOWOEM 0x00000001 +CONSTANT: DI_SHOWCOMPAT 0x00000002 +CONSTANT: DI_SHOWCLASS 0x00000004 +CONSTANT: DI_SHOWALL 0x00000007 +CONSTANT: DI_NOVCP 0x00000008 +CONSTANT: DI_DIDCOMPAT 0x00000010 +CONSTANT: DI_DIDCLASS 0x00000020 +CONSTANT: DI_AUTOASSIGNRES 0x00000040 +CONSTANT: DI_NEEDRESTART 0x00000080 +CONSTANT: DI_NEEDREBOOT 0x00000100 +CONSTANT: DI_NOBROWSE 0x00000200 +CONSTANT: DI_MULTMFGS 0x00000400 +CONSTANT: DI_DISABLED 0x00000800 +CONSTANT: DI_GENERALPAGE_ADDED 0x00001000 +CONSTANT: DI_RESOURCEPAGE_ADDED 0x00002000 +CONSTANT: DI_PROPERTIES_CHANGE 0x00004000 +CONSTANT: DI_INF_IS_SORTED 0x00008000 +CONSTANT: DI_ENUMSINGLEINF 0x00010000 +CONSTANT: DI_DONOTCALLCONFIGMG 0x00020000 +CONSTANT: DI_INSTALLDISABLED 0x00040000 +CONSTANT: DI_COMPAT_FROM_CLASS 0x00080000 +CONSTANT: DI_CLASSINSTALLPARAMS 0x00100000 +CONSTANT: DI_NODI_DEFAULTACTION 0x00200000 +CONSTANT: DI_QUIETINSTALL 0x00800000 +CONSTANT: DI_NOFILECOPY 0x01000000 +CONSTANT: DI_FORCECOPY 0x02000000 +CONSTANT: DI_DRIVERPAGE_ADDED 0x04000000 +CONSTANT: DI_USECI_SELECTSTRINGS 0x08000000 +CONSTANT: DI_OVERRIDE_INFFLAGS 0x10000000 +CONSTANT: DI_PROPS_NOCHANGEUSAGE 0x20000000 +CONSTANT: DI_NOSELECTICONS 0x40000000 +CONSTANT: DI_NOWRITE_IDS 0x80000000 +CONSTANT: DI_FLAGSEX_RESERVED2 0x00000001 +CONSTANT: DI_FLAGSEX_RESERVED3 0x00000002 +CONSTANT: DI_FLAGSEX_CI_FAILED 0x00000004 +CONSTANT: DI_FLAGSEX_FINISHINSTALL_ACTION 0x00000008 +CONSTANT: DI_FLAGSEX_DIDINFOLIST 0x00000010 +CONSTANT: DI_FLAGSEX_DIDCOMPATINFO 0x00000020 +CONSTANT: DI_FLAGSEX_FILTERCLASSES 0x00000040 +CONSTANT: DI_FLAGSEX_SETFAILEDINSTALL 0x00000080 +CONSTANT: DI_FLAGSEX_DEVICECHANGE 0x00000100 +CONSTANT: DI_FLAGSEX_ALWAYSWRITEIDS 0x00000200 +CONSTANT: DI_FLAGSEX_PROPCHANGE_PENDING 0x00000400 +CONSTANT: DI_FLAGSEX_ALLOWEXCLUDEDDRVS 0x00000800 +CONSTANT: DI_FLAGSEX_NOUIONQUERYREMOVE 0x00001000 +CONSTANT: DI_FLAGSEX_USECLASSFORCOMPAT 0x00002000 +CONSTANT: DI_FLAGSEX_RESERVED4 0x00004000 +CONSTANT: DI_FLAGSEX_NO_DRVREG_MODIFY 0x00008000 +CONSTANT: DI_FLAGSEX_IN_SYSTEM_SETUP 0x00010000 +CONSTANT: DI_FLAGSEX_INET_DRIVER 0x00020000 +CONSTANT: DI_FLAGSEX_APPENDDRIVERLIST 0x00040000 +CONSTANT: DI_FLAGSEX_PREINSTALLBACKUP 0x00080000 +CONSTANT: DI_FLAGSEX_BACKUPONREPLACE 0x00100000 +CONSTANT: DI_FLAGSEX_DRIVERLIST_FROM_URL 0x00200000 +CONSTANT: DI_FLAGSEX_RESERVED1 0x00400000 +CONSTANT: DI_FLAGSEX_EXCLUDE_OLD_INET_DRIVERS 0x00800000 +CONSTANT: DI_FLAGSEX_POWERPAGE_ADDED 0x01000000 +CONSTANT: DI_FLAGSEX_FILTERSIMILARDRIVERS 0x02000000 +CONSTANT: DI_FLAGSEX_INSTALLEDDRIVER 0x04000000 +CONSTANT: DI_FLAGSEX_NO_CLASSLIST_NODE_MERGE 0x08000000 +CONSTANT: DI_FLAGSEX_ALTPLATFORM_DRVSEARCH 0x10000000 +CONSTANT: DI_FLAGSEX_RESTART_DEVICE_ONLY 0x20000000 +CONSTANT: DI_FLAGSEX_RECURSIVESEARCH 0x40000000 +CONSTANT: DI_FLAGSEX_SEARCH_PUBLISHED_INFS 0x80000000 STRUCT: SP_CLASSINSTALL_HEADER { cbSize DWORD } @@ -589,14 +589,14 @@ TYPEDEF: SP_ENABLECLASS_PARAMS* PSP_ENABLECLASS_PARAMS CONSTANT: ENABLECLASS_QUERY 0 CONSTANT: ENABLECLASS_SUCCESS 1 CONSTANT: ENABLECLASS_FAILURE 2 -CONSTANT: DICS_ENABLE HEX: 00000001 -CONSTANT: DICS_DISABLE HEX: 00000002 -CONSTANT: DICS_PROPCHANGE HEX: 00000003 -CONSTANT: DICS_START HEX: 00000004 -CONSTANT: DICS_STOP HEX: 00000005 -CONSTANT: DICS_FLAG_GLOBAL HEX: 00000001 -CONSTANT: DICS_FLAG_CONFIGSPECIFIC HEX: 00000002 -CONSTANT: DICS_FLAG_CONFIGGENERAL HEX: 00000004 +CONSTANT: DICS_ENABLE 0x00000001 +CONSTANT: DICS_DISABLE 0x00000002 +CONSTANT: DICS_PROPCHANGE 0x00000003 +CONSTANT: DICS_START 0x00000004 +CONSTANT: DICS_STOP 0x00000005 +CONSTANT: DICS_FLAG_GLOBAL 0x00000001 +CONSTANT: DICS_FLAG_CONFIGSPECIFIC 0x00000002 +CONSTANT: DICS_FLAG_CONFIGGENERAL 0x00000004 STRUCT: SP_PROPCHANGE_PARAMS { ClassInstallHeader SP_CLASSINSTALL_HEADER } @@ -611,8 +611,8 @@ STRUCT: SP_REMOVEDEVICE_PARAMS { HwProfile DWORD } ; TYPEDEF: SP_REMOVEDEVICE_PARAMS* PSP_REMOVEDEVICE_PARAMS -CONSTANT: DI_REMOVEDEVICE_GLOBAL HEX: 00000001 -CONSTANT: DI_REMOVEDEVICE_CONFIGSPECIFIC HEX: 00000002 +CONSTANT: DI_REMOVEDEVICE_GLOBAL 0x00000001 +CONSTANT: DI_REMOVEDEVICE_CONFIGSPECIFIC 0x00000002 STRUCT: SP_UNREMOVEDEVICE_PARAMS { ClassInstallHeader SP_CLASSINSTALL_HEADER } @@ -620,7 +620,7 @@ STRUCT: SP_UNREMOVEDEVICE_PARAMS { HwProfile DWORD } ; TYPEDEF: SP_UNREMOVEDEVICE_PARAMS* PSP_UNREMOVEDEVICE_PARAMS -CONSTANT: DI_UNREMOVEDEVICE_CONFIGSPECIFIC HEX: 00000002 +CONSTANT: DI_UNREMOVEDEVICE_CONFIGSPECIFIC 0x00000002 STRUCT: SP_SELECTDEVICE_PARAMS_A { ClassInstallHeader SP_CLASSINSTALL_HEADER } @@ -661,25 +661,25 @@ STRUCT: SP_INSTALLWIZARD_DATA { hwndWizardDlg HWND } ; TYPEDEF: SP_INSTALLWIZARD_DATA* PSP_INSTALLWIZARD_DATA -CONSTANT: NDW_INSTALLFLAG_DIDFACTDEFS HEX: 00000001 -CONSTANT: NDW_INSTALLFLAG_HARDWAREALLREADYIN HEX: 00000002 +CONSTANT: NDW_INSTALLFLAG_DIDFACTDEFS 0x00000001 +CONSTANT: NDW_INSTALLFLAG_HARDWAREALLREADYIN 0x00000002 CONSTANT: NDW_INSTALLFLAG_NEEDRESTART $ DI_NEEDRESTART CONSTANT: NDW_INSTALLFLAG_NEEDREBOOT $ DI_NEEDREBOOT -CONSTANT: NDW_INSTALLFLAG_NEEDSHUTDOWN HEX: 00000200 -CONSTANT: NDW_INSTALLFLAG_EXPRESSINTRO HEX: 00000400 -CONSTANT: NDW_INSTALLFLAG_SKIPISDEVINSTALLED HEX: 00000800 -CONSTANT: NDW_INSTALLFLAG_NODETECTEDDEVS HEX: 00001000 -CONSTANT: NDW_INSTALLFLAG_INSTALLSPECIFIC HEX: 00002000 -CONSTANT: NDW_INSTALLFLAG_SKIPCLASSLIST HEX: 00004000 -CONSTANT: NDW_INSTALLFLAG_CI_PICKED_OEM HEX: 00008000 -CONSTANT: NDW_INSTALLFLAG_PCMCIAMODE HEX: 00010000 -CONSTANT: NDW_INSTALLFLAG_PCMCIADEVICE HEX: 00020000 -CONSTANT: NDW_INSTALLFLAG_USERCANCEL HEX: 00040000 -CONSTANT: NDW_INSTALLFLAG_KNOWNCLASS HEX: 00080000 -CONSTANT: DYNAWIZ_FLAG_PAGESADDED HEX: 00000001 -CONSTANT: DYNAWIZ_FLAG_ANALYZE_HANDLECONFLICT HEX: 00000008 -CONSTANT: DYNAWIZ_FLAG_INSTALLDET_NEXT HEX: 00000002 -CONSTANT: DYNAWIZ_FLAG_INSTALLDET_PREV HEX: 00000004 +CONSTANT: NDW_INSTALLFLAG_NEEDSHUTDOWN 0x00000200 +CONSTANT: NDW_INSTALLFLAG_EXPRESSINTRO 0x00000400 +CONSTANT: NDW_INSTALLFLAG_SKIPISDEVINSTALLED 0x00000800 +CONSTANT: NDW_INSTALLFLAG_NODETECTEDDEVS 0x00001000 +CONSTANT: NDW_INSTALLFLAG_INSTALLSPECIFIC 0x00002000 +CONSTANT: NDW_INSTALLFLAG_SKIPCLASSLIST 0x00004000 +CONSTANT: NDW_INSTALLFLAG_CI_PICKED_OEM 0x00008000 +CONSTANT: NDW_INSTALLFLAG_PCMCIAMODE 0x00010000 +CONSTANT: NDW_INSTALLFLAG_PCMCIADEVICE 0x00020000 +CONSTANT: NDW_INSTALLFLAG_USERCANCEL 0x00040000 +CONSTANT: NDW_INSTALLFLAG_KNOWNCLASS 0x00080000 +CONSTANT: DYNAWIZ_FLAG_PAGESADDED 0x00000001 +CONSTANT: DYNAWIZ_FLAG_ANALYZE_HANDLECONFLICT 0x00000008 +CONSTANT: DYNAWIZ_FLAG_INSTALLDET_NEXT 0x00000002 +CONSTANT: DYNAWIZ_FLAG_INSTALLDET_PREV 0x00000004 CONSTANT: MIN_IDD_DYNAWIZ_RESOURCE_ID 10000 CONSTANT: MAX_IDD_DYNAWIZ_RESOURCE_ID 11000 CONSTANT: IDD_DYNAWIZ_FIRSTPAGE 10000 @@ -810,42 +810,42 @@ STRUCT: SP_DRVINSTALL_PARAMS { Reserved DWORD } ; TYPEDEF: SP_DRVINSTALL_PARAMS* PSP_DRVINSTALL_PARAMS -CONSTANT: DNF_DUPDESC HEX: 00000001 -CONSTANT: DNF_OLDDRIVER HEX: 00000002 -CONSTANT: DNF_EXCLUDEFROMLIST HEX: 00000004 -CONSTANT: DNF_NODRIVER HEX: 00000008 -CONSTANT: DNF_LEGACYINF HEX: 00000010 -CONSTANT: DNF_CLASS_DRIVER HEX: 00000020 -CONSTANT: DNF_COMPATIBLE_DRIVER HEX: 00000040 -CONSTANT: DNF_INET_DRIVER HEX: 00000080 -CONSTANT: DNF_UNUSED1 HEX: 00000100 -CONSTANT: DNF_UNUSED2 HEX: 00000200 -CONSTANT: DNF_OLD_INET_DRIVER HEX: 00000400 -CONSTANT: DNF_BAD_DRIVER HEX: 00000800 -CONSTANT: DNF_DUPPROVIDER HEX: 00001000 -CONSTANT: DNF_INF_IS_SIGNED HEX: 00002000 -CONSTANT: DNF_OEM_F6_INF HEX: 00004000 -CONSTANT: DNF_DUPDRIVERVER HEX: 00008000 -CONSTANT: DNF_BASIC_DRIVER HEX: 00010000 -CONSTANT: DNF_AUTHENTICODE_SIGNED HEX: 00020000 -CONSTANT: DNF_INSTALLEDDRIVER HEX: 00040000 -CONSTANT: DNF_ALWAYSEXCLUDEFROMLIST HEX: 00080000 -CONSTANT: DNF_INBOX_DRIVER HEX: 00100000 -CONSTANT: DNF_REQUESTADDITIONALSOFTWARE HEX: 00200000 -CONSTANT: DNF_UNUSED_22 HEX: 00400000 -CONSTANT: DNF_UNUSED_23 HEX: 00800000 -CONSTANT: DNF_UNUSED_24 HEX: 01000000 -CONSTANT: DNF_UNUSED_25 HEX: 02000000 -CONSTANT: DNF_UNUSED_26 HEX: 04000000 -CONSTANT: DNF_UNUSED_27 HEX: 08000000 -CONSTANT: DNF_UNUSED_28 HEX: 10000000 -CONSTANT: DNF_UNUSED_29 HEX: 20000000 -CONSTANT: DNF_UNUSED_30 HEX: 40000000 -CONSTANT: DNF_UNUSED_31 HEX: 80000000 -CONSTANT: DRIVER_HARDWAREID_RANK HEX: 00000FFF -CONSTANT: DRIVER_HARDWAREID_MASK HEX: 80000FFF -CONSTANT: DRIVER_UNTRUSTED_RANK HEX: 80000000 -CONSTANT: DRIVER_W9X_SUSPECT_RANK HEX: C0000000 +CONSTANT: DNF_DUPDESC 0x00000001 +CONSTANT: DNF_OLDDRIVER 0x00000002 +CONSTANT: DNF_EXCLUDEFROMLIST 0x00000004 +CONSTANT: DNF_NODRIVER 0x00000008 +CONSTANT: DNF_LEGACYINF 0x00000010 +CONSTANT: DNF_CLASS_DRIVER 0x00000020 +CONSTANT: DNF_COMPATIBLE_DRIVER 0x00000040 +CONSTANT: DNF_INET_DRIVER 0x00000080 +CONSTANT: DNF_UNUSED1 0x00000100 +CONSTANT: DNF_UNUSED2 0x00000200 +CONSTANT: DNF_OLD_INET_DRIVER 0x00000400 +CONSTANT: DNF_BAD_DRIVER 0x00000800 +CONSTANT: DNF_DUPPROVIDER 0x00001000 +CONSTANT: DNF_INF_IS_SIGNED 0x00002000 +CONSTANT: DNF_OEM_F6_INF 0x00004000 +CONSTANT: DNF_DUPDRIVERVER 0x00008000 +CONSTANT: DNF_BASIC_DRIVER 0x00010000 +CONSTANT: DNF_AUTHENTICODE_SIGNED 0x00020000 +CONSTANT: DNF_INSTALLEDDRIVER 0x00040000 +CONSTANT: DNF_ALWAYSEXCLUDEFROMLIST 0x00080000 +CONSTANT: DNF_INBOX_DRIVER 0x00100000 +CONSTANT: DNF_REQUESTADDITIONALSOFTWARE 0x00200000 +CONSTANT: DNF_UNUSED_22 0x00400000 +CONSTANT: DNF_UNUSED_23 0x00800000 +CONSTANT: DNF_UNUSED_24 0x01000000 +CONSTANT: DNF_UNUSED_25 0x02000000 +CONSTANT: DNF_UNUSED_26 0x04000000 +CONSTANT: DNF_UNUSED_27 0x08000000 +CONSTANT: DNF_UNUSED_28 0x10000000 +CONSTANT: DNF_UNUSED_29 0x20000000 +CONSTANT: DNF_UNUSED_30 0x40000000 +CONSTANT: DNF_UNUSED_31 0x80000000 +CONSTANT: DRIVER_HARDWAREID_RANK 0x00000FFF +CONSTANT: DRIVER_HARDWAREID_MASK 0x80000FFF +CONSTANT: DRIVER_UNTRUSTED_RANK 0x80000000 +CONSTANT: DRIVER_W9X_SUSPECT_RANK 0xC0000000 CALLBACK: DWORD PSP_DETSIG_CMPPROC ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA NewDeviceData, PSP_DEVINFO_DATA ExistingDeviceData, PVOID CompareContext ) ; @@ -913,93 +913,93 @@ CONSTANT: ERROR_EXPECTED_SECTION_NAME $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ CONSTANT: ERROR_BAD_SECTION_NAME_LINE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 1 bitor bitor ] CONSTANT: ERROR_SECTION_NAME_TOO_LONG $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 2 bitor bitor ] CONSTANT: ERROR_GENERAL_SYNTAX $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 3 bitor bitor ] -CONSTANT: ERROR_WRONG_INF_STYLE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 100 bitor bitor ] -CONSTANT: ERROR_SECTION_NOT_FOUND $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 101 bitor bitor ] -CONSTANT: ERROR_LINE_NOT_FOUND $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 102 bitor bitor ] -CONSTANT: ERROR_NO_BACKUP $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 103 bitor bitor ] -CONSTANT: ERROR_NO_ASSOCIATED_CLASS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 200 bitor bitor ] -CONSTANT: ERROR_CLASS_MISMATCH $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 201 bitor bitor ] -CONSTANT: ERROR_DUPLICATE_FOUND $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 202 bitor bitor ] -CONSTANT: ERROR_NO_DRIVER_SELECTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 203 bitor bitor ] -CONSTANT: ERROR_KEY_DOES_NOT_EXIST $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 204 bitor bitor ] -CONSTANT: ERROR_INVALID_DEVINST_NAME $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 205 bitor bitor ] -CONSTANT: ERROR_INVALID_CLASS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 206 bitor bitor ] -CONSTANT: ERROR_DEVINST_ALREADY_EXISTS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 207 bitor bitor ] -CONSTANT: ERROR_DEVINFO_NOT_REGISTERED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 208 bitor bitor ] -CONSTANT: ERROR_INVALID_REG_PROPERTY $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 209 bitor bitor ] -CONSTANT: ERROR_NO_INF $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20A bitor bitor ] -CONSTANT: ERROR_NO_SUCH_DEVINST $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20B bitor bitor ] -CONSTANT: ERROR_CANT_LOAD_CLASS_ICON $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20C bitor bitor ] -CONSTANT: ERROR_INVALID_CLASS_INSTALLER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20D bitor bitor ] -CONSTANT: ERROR_DI_DO_DEFAULT $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20E bitor bitor ] -CONSTANT: ERROR_DI_NOFILECOPY $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 20F bitor bitor ] -CONSTANT: ERROR_INVALID_HWPROFILE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 210 bitor bitor ] -CONSTANT: ERROR_NO_DEVICE_SELECTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 211 bitor bitor ] -CONSTANT: ERROR_DEVINFO_LIST_LOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 212 bitor bitor ] -CONSTANT: ERROR_DEVINFO_DATA_LOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 213 bitor bitor ] -CONSTANT: ERROR_DI_BAD_PATH $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 214 bitor bitor ] -CONSTANT: ERROR_NO_CLASSINSTALL_PARAMS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 215 bitor bitor ] -CONSTANT: ERROR_FILEQUEUE_LOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 216 bitor bitor ] -CONSTANT: ERROR_BAD_SERVICE_INSTALLSECT $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 217 bitor bitor ] -CONSTANT: ERROR_NO_CLASS_DRIVER_LIST $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 218 bitor bitor ] -CONSTANT: ERROR_NO_ASSOCIATED_SERVICE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 219 bitor bitor ] -CONSTANT: ERROR_NO_DEFAULT_DEVICE_INTERFACE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21A bitor bitor ] -CONSTANT: ERROR_DEVICE_INTERFACE_ACTIVE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21B bitor bitor ] -CONSTANT: ERROR_DEVICE_INTERFACE_REMOVED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21C bitor bitor ] -CONSTANT: ERROR_BAD_INTERFACE_INSTALLSECT $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21D bitor bitor ] -CONSTANT: ERROR_NO_SUCH_INTERFACE_CLASS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21E bitor bitor ] -CONSTANT: ERROR_INVALID_REFERENCE_STRING $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 21F bitor bitor ] -CONSTANT: ERROR_INVALID_MACHINENAME $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 220 bitor bitor ] -CONSTANT: ERROR_REMOTE_COMM_FAILURE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 221 bitor bitor ] -CONSTANT: ERROR_MACHINE_UNAVAILABLE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 222 bitor bitor ] -CONSTANT: ERROR_NO_CONFIGMGR_SERVICES $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 223 bitor bitor ] -CONSTANT: ERROR_INVALID_PROPPAGE_PROVIDER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 224 bitor bitor ] -CONSTANT: ERROR_NO_SUCH_DEVICE_INTERFACE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 225 bitor bitor ] -CONSTANT: ERROR_DI_POSTPROCESSING_REQUIRED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 226 bitor bitor ] -CONSTANT: ERROR_INVALID_COINSTALLER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 227 bitor bitor ] -CONSTANT: ERROR_NO_COMPAT_DRIVERS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 228 bitor bitor ] -CONSTANT: ERROR_NO_DEVICE_ICON $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 229 bitor bitor ] -CONSTANT: ERROR_INVALID_INF_LOGCONFIG $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22A bitor bitor ] -CONSTANT: ERROR_DI_DONT_INSTALL $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22B bitor bitor ] -CONSTANT: ERROR_INVALID_FILTER_DRIVER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22C bitor bitor ] -CONSTANT: ERROR_NON_WINDOWS_NT_DRIVER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22D bitor bitor ] -CONSTANT: ERROR_NON_WINDOWS_DRIVER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22E bitor bitor ] -CONSTANT: ERROR_NO_CATALOG_FOR_OEM_INF $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 22F bitor bitor ] -CONSTANT: ERROR_DEVINSTALL_QUEUE_NONNATIVE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 230 bitor bitor ] -CONSTANT: ERROR_NOT_DISABLEABLE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 231 bitor bitor ] -CONSTANT: ERROR_CANT_REMOVE_DEVINST $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 232 bitor bitor ] -CONSTANT: ERROR_INVALID_TARGET $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 233 bitor bitor ] -CONSTANT: ERROR_DRIVER_NONNATIVE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 234 bitor bitor ] -CONSTANT: ERROR_IN_WOW64 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 235 bitor bitor ] -CONSTANT: ERROR_SET_SYSTEM_RESTORE_POINT $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 236 bitor bitor ] -CONSTANT: ERROR_SCE_DISABLED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 238 bitor bitor ] -CONSTANT: ERROR_UNKNOWN_EXCEPTION $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 239 bitor bitor ] -CONSTANT: ERROR_PNP_REGISTRY_ERROR $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23A bitor bitor ] -CONSTANT: ERROR_REMOTE_REQUEST_UNSUPPORTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23B bitor bitor ] -CONSTANT: ERROR_NOT_AN_INSTALLED_OEM_INF $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23C bitor bitor ] -CONSTANT: ERROR_INF_IN_USE_BY_DEVICES $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23D bitor bitor ] -CONSTANT: ERROR_DI_FUNCTION_OBSOLETE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23E bitor bitor ] -CONSTANT: ERROR_NO_AUTHENTICODE_CATALOG $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 23F bitor bitor ] -CONSTANT: ERROR_AUTHENTICODE_DISALLOWED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 240 bitor bitor ] -CONSTANT: ERROR_AUTHENTICODE_TRUSTED_PUBLISHER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 241 bitor bitor ] -CONSTANT: ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 242 bitor bitor ] -CONSTANT: ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 243 bitor bitor ] -CONSTANT: ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 244 bitor bitor ] -CONSTANT: ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 245 bitor bitor ] -CONSTANT: ERROR_DEVICE_INSTALLER_NOT_READY $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 246 bitor bitor ] -CONSTANT: ERROR_DRIVER_STORE_ADD_FAILED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 247 bitor bitor ] -CONSTANT: ERROR_DEVICE_INSTALL_BLOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 248 bitor bitor ] -CONSTANT: ERROR_DRIVER_INSTALL_BLOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 249 bitor bitor ] -CONSTANT: ERROR_WRONG_INF_TYPE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 24A bitor bitor ] -CONSTANT: ERROR_FILE_HASH_NOT_IN_CATALOG $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 24B bitor bitor ] -CONSTANT: ERROR_DRIVER_STORE_DELETE_FAILED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 24C bitor bitor ] -CONSTANT: ERROR_UNRECOVERABLE_STACK_OVERFLOW $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 300 bitor bitor ] +CONSTANT: ERROR_WRONG_INF_STYLE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x100 bitor bitor ] +CONSTANT: ERROR_SECTION_NOT_FOUND $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x101 bitor bitor ] +CONSTANT: ERROR_LINE_NOT_FOUND $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x102 bitor bitor ] +CONSTANT: ERROR_NO_BACKUP $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x103 bitor bitor ] +CONSTANT: ERROR_NO_ASSOCIATED_CLASS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x200 bitor bitor ] +CONSTANT: ERROR_CLASS_MISMATCH $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x201 bitor bitor ] +CONSTANT: ERROR_DUPLICATE_FOUND $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x202 bitor bitor ] +CONSTANT: ERROR_NO_DRIVER_SELECTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x203 bitor bitor ] +CONSTANT: ERROR_KEY_DOES_NOT_EXIST $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x204 bitor bitor ] +CONSTANT: ERROR_INVALID_DEVINST_NAME $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x205 bitor bitor ] +CONSTANT: ERROR_INVALID_CLASS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x206 bitor bitor ] +CONSTANT: ERROR_DEVINST_ALREADY_EXISTS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x207 bitor bitor ] +CONSTANT: ERROR_DEVINFO_NOT_REGISTERED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x208 bitor bitor ] +CONSTANT: ERROR_INVALID_REG_PROPERTY $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x209 bitor bitor ] +CONSTANT: ERROR_NO_INF $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20A bitor bitor ] +CONSTANT: ERROR_NO_SUCH_DEVINST $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20B bitor bitor ] +CONSTANT: ERROR_CANT_LOAD_CLASS_ICON $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20C bitor bitor ] +CONSTANT: ERROR_INVALID_CLASS_INSTALLER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20D bitor bitor ] +CONSTANT: ERROR_DI_DO_DEFAULT $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20E bitor bitor ] +CONSTANT: ERROR_DI_NOFILECOPY $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x20F bitor bitor ] +CONSTANT: ERROR_INVALID_HWPROFILE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x210 bitor bitor ] +CONSTANT: ERROR_NO_DEVICE_SELECTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x211 bitor bitor ] +CONSTANT: ERROR_DEVINFO_LIST_LOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x212 bitor bitor ] +CONSTANT: ERROR_DEVINFO_DATA_LOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x213 bitor bitor ] +CONSTANT: ERROR_DI_BAD_PATH $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x214 bitor bitor ] +CONSTANT: ERROR_NO_CLASSINSTALL_PARAMS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x215 bitor bitor ] +CONSTANT: ERROR_FILEQUEUE_LOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x216 bitor bitor ] +CONSTANT: ERROR_BAD_SERVICE_INSTALLSECT $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x217 bitor bitor ] +CONSTANT: ERROR_NO_CLASS_DRIVER_LIST $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x218 bitor bitor ] +CONSTANT: ERROR_NO_ASSOCIATED_SERVICE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x219 bitor bitor ] +CONSTANT: ERROR_NO_DEFAULT_DEVICE_INTERFACE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21A bitor bitor ] +CONSTANT: ERROR_DEVICE_INTERFACE_ACTIVE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21B bitor bitor ] +CONSTANT: ERROR_DEVICE_INTERFACE_REMOVED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21C bitor bitor ] +CONSTANT: ERROR_BAD_INTERFACE_INSTALLSECT $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21D bitor bitor ] +CONSTANT: ERROR_NO_SUCH_INTERFACE_CLASS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21E bitor bitor ] +CONSTANT: ERROR_INVALID_REFERENCE_STRING $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x21F bitor bitor ] +CONSTANT: ERROR_INVALID_MACHINENAME $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x220 bitor bitor ] +CONSTANT: ERROR_REMOTE_COMM_FAILURE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x221 bitor bitor ] +CONSTANT: ERROR_MACHINE_UNAVAILABLE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x222 bitor bitor ] +CONSTANT: ERROR_NO_CONFIGMGR_SERVICES $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x223 bitor bitor ] +CONSTANT: ERROR_INVALID_PROPPAGE_PROVIDER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x224 bitor bitor ] +CONSTANT: ERROR_NO_SUCH_DEVICE_INTERFACE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x225 bitor bitor ] +CONSTANT: ERROR_DI_POSTPROCESSING_REQUIRED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x226 bitor bitor ] +CONSTANT: ERROR_INVALID_COINSTALLER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x227 bitor bitor ] +CONSTANT: ERROR_NO_COMPAT_DRIVERS $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x228 bitor bitor ] +CONSTANT: ERROR_NO_DEVICE_ICON $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x229 bitor bitor ] +CONSTANT: ERROR_INVALID_INF_LOGCONFIG $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22A bitor bitor ] +CONSTANT: ERROR_DI_DONT_INSTALL $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22B bitor bitor ] +CONSTANT: ERROR_INVALID_FILTER_DRIVER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22C bitor bitor ] +CONSTANT: ERROR_NON_WINDOWS_NT_DRIVER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22D bitor bitor ] +CONSTANT: ERROR_NON_WINDOWS_DRIVER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22E bitor bitor ] +CONSTANT: ERROR_NO_CATALOG_FOR_OEM_INF $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x22F bitor bitor ] +CONSTANT: ERROR_DEVINSTALL_QUEUE_NONNATIVE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x230 bitor bitor ] +CONSTANT: ERROR_NOT_DISABLEABLE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x231 bitor bitor ] +CONSTANT: ERROR_CANT_REMOVE_DEVINST $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x232 bitor bitor ] +CONSTANT: ERROR_INVALID_TARGET $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x233 bitor bitor ] +CONSTANT: ERROR_DRIVER_NONNATIVE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x234 bitor bitor ] +CONSTANT: ERROR_IN_WOW64 $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x235 bitor bitor ] +CONSTANT: ERROR_SET_SYSTEM_RESTORE_POINT $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x236 bitor bitor ] +CONSTANT: ERROR_SCE_DISABLED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x238 bitor bitor ] +CONSTANT: ERROR_UNKNOWN_EXCEPTION $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x239 bitor bitor ] +CONSTANT: ERROR_PNP_REGISTRY_ERROR $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23A bitor bitor ] +CONSTANT: ERROR_REMOTE_REQUEST_UNSUPPORTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23B bitor bitor ] +CONSTANT: ERROR_NOT_AN_INSTALLED_OEM_INF $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23C bitor bitor ] +CONSTANT: ERROR_INF_IN_USE_BY_DEVICES $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23D bitor bitor ] +CONSTANT: ERROR_DI_FUNCTION_OBSOLETE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23E bitor bitor ] +CONSTANT: ERROR_NO_AUTHENTICODE_CATALOG $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x23F bitor bitor ] +CONSTANT: ERROR_AUTHENTICODE_DISALLOWED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x240 bitor bitor ] +CONSTANT: ERROR_AUTHENTICODE_TRUSTED_PUBLISHER $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x241 bitor bitor ] +CONSTANT: ERROR_AUTHENTICODE_TRUST_NOT_ESTABLISHED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x242 bitor bitor ] +CONSTANT: ERROR_AUTHENTICODE_PUBLISHER_NOT_TRUSTED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x243 bitor bitor ] +CONSTANT: ERROR_SIGNATURE_OSATTRIBUTE_MISMATCH $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x244 bitor bitor ] +CONSTANT: ERROR_ONLY_VALIDATE_VIA_AUTHENTICODE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x245 bitor bitor ] +CONSTANT: ERROR_DEVICE_INSTALLER_NOT_READY $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x246 bitor bitor ] +CONSTANT: ERROR_DRIVER_STORE_ADD_FAILED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x247 bitor bitor ] +CONSTANT: ERROR_DEVICE_INSTALL_BLOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x248 bitor bitor ] +CONSTANT: ERROR_DRIVER_INSTALL_BLOCKED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x249 bitor bitor ] +CONSTANT: ERROR_WRONG_INF_TYPE $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24A bitor bitor ] +CONSTANT: ERROR_FILE_HASH_NOT_IN_CATALOG $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24B bitor bitor ] +CONSTANT: ERROR_DRIVER_STORE_DELETE_FAILED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x24C bitor bitor ] +CONSTANT: ERROR_UNRECOVERABLE_STACK_OVERFLOW $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x300 bitor bitor ] CONSTANT: EXCEPTION_SPAPI_UNRECOVERABLE_STACK_OVERFLOW $ ERROR_UNRECOVERABLE_STACK_OVERFLOW CONSTANT: ERROR_NO_DEFAULT_INTERFACE_DEVICE $ ERROR_NO_DEFAULT_DEVICE_INTERFACE CONSTANT: ERROR_INTERFACE_DEVICE_ACTIVE $ ERROR_DEVICE_INTERFACE_ACTIVE CONSTANT: ERROR_INTERFACE_DEVICE_REMOVED $ ERROR_DEVICE_INTERFACE_REMOVED CONSTANT: ERROR_NO_SUCH_INTERFACE_DEVICE $ ERROR_NO_SUCH_DEVICE_INTERFACE -CONSTANT: ERROR_NOT_INSTALLED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR HEX: 1000 bitor bitor ] +CONSTANT: ERROR_NOT_INSTALLED $[ APPLICATION_ERROR_MASK ERROR_SEVERITY_ERROR 0x1000 bitor bitor ] FUNCTION: BOOL SetupGetInfInformationA ( LPCVOID InfSpec, DWORD SearchControl, PSP_INF_INFORMATION ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ; FUNCTION: BOOL SetupGetInfInformationW ( LPCVOID InfSpec, DWORD SearchControl, PSP_INF_INFORMATION ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ; @@ -1106,14 +1106,14 @@ FUNCTION: BOOL SetupGetTargetPathA ( HINF InfHandle, PINFCONTEXT InfContext, PCS FUNCTION: BOOL SetupGetTargetPathW ( HINF InfHandle, PINFCONTEXT InfContext, PCWSTR Section, PWSTR ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ; ALIAS: SetupGetTargetPath SetupGetTargetPathW -CONSTANT: SRCLIST_TEMPORARY HEX: 00000001 -CONSTANT: SRCLIST_NOBROWSE HEX: 00000002 -CONSTANT: SRCLIST_SYSTEM HEX: 00000010 -CONSTANT: SRCLIST_USER HEX: 00000020 -CONSTANT: SRCLIST_SYSIFADMIN HEX: 00000040 -CONSTANT: SRCLIST_SUBDIRS HEX: 00000100 -CONSTANT: SRCLIST_APPEND HEX: 00000200 -CONSTANT: SRCLIST_NOSTRIPPLATFORM HEX: 00000400 +CONSTANT: SRCLIST_TEMPORARY 0x00000001 +CONSTANT: SRCLIST_NOBROWSE 0x00000002 +CONSTANT: SRCLIST_SYSTEM 0x00000010 +CONSTANT: SRCLIST_USER 0x00000020 +CONSTANT: SRCLIST_SYSIFADMIN 0x00000040 +CONSTANT: SRCLIST_SUBDIRS 0x00000100 +CONSTANT: SRCLIST_APPEND 0x00000200 +CONSTANT: SRCLIST_NOSTRIPPLATFORM 0x00000400 FUNCTION: BOOL SetupSetSourceListA ( DWORD Flags, PCSTR* SourceList, UINT SourceCount ) ; FUNCTION: BOOL SetupSetSourceListW ( DWORD Flags, PCWSTR* SourceList, UINT SourceCount ) ; @@ -1156,17 +1156,17 @@ FUNCTION: UINT SetupBackupErrorA ( HWND hwndParent, PCSTR DialogTitle, PCSTR Sou FUNCTION: UINT SetupBackupErrorW ( HWND hwndParent, PCWSTR DialogTitle, PCWSTR SourceFile, PCWSTR TargetFile, UINT Win32ErrorCode, DWORD Style ) ; ALIAS: SetupBackupError SetupBackupErrorW -CONSTANT: IDF_NOBROWSE HEX: 00000001 -CONSTANT: IDF_NOSKIP HEX: 00000002 -CONSTANT: IDF_NODETAILS HEX: 00000004 -CONSTANT: IDF_NOCOMPRESSED HEX: 00000008 -CONSTANT: IDF_CHECKFIRST HEX: 00000100 -CONSTANT: IDF_NOBEEP HEX: 00000200 -CONSTANT: IDF_NOFOREGROUND HEX: 00000400 -CONSTANT: IDF_WARNIFSKIP HEX: 00000800 -CONSTANT: IDF_NOREMOVABLEMEDIAPROMPT HEX: 00001000 -CONSTANT: IDF_USEDISKNAMEASPROMPT HEX: 00002000 -CONSTANT: IDF_OEMDISK HEX: 80000000 +CONSTANT: IDF_NOBROWSE 0x00000001 +CONSTANT: IDF_NOSKIP 0x00000002 +CONSTANT: IDF_NODETAILS 0x00000004 +CONSTANT: IDF_NOCOMPRESSED 0x00000008 +CONSTANT: IDF_CHECKFIRST 0x00000100 +CONSTANT: IDF_NOBEEP 0x00000200 +CONSTANT: IDF_NOFOREGROUND 0x00000400 +CONSTANT: IDF_WARNIFSKIP 0x00000800 +CONSTANT: IDF_NOREMOVABLEMEDIAPROMPT 0x00001000 +CONSTANT: IDF_USEDISKNAMEASPROMPT 0x00002000 +CONSTANT: IDF_OEMDISK 0x80000000 CONSTANT: DPROMPT_SUCCESS 0 CONSTANT: DPROMPT_CANCEL 1 @@ -1182,7 +1182,7 @@ FUNCTION: BOOL SetupSetDirectoryIdExA ( HINF InfHandle, DWORD Id, PCSTR Director FUNCTION: BOOL SetupSetDirectoryIdExW ( HINF InfHandle, DWORD Id, PCWSTR Directory, DWORD Flags, DWORD Reserved1, PVOID Reserved2 ) ; ALIAS: SetupSetDirectoryIdEx SetupSetDirectoryIdExW -CONSTANT: SETDIRID_NOT_FULL_PATH HEX: 00000001 +CONSTANT: SETDIRID_NOT_FULL_PATH 0x00000001 FUNCTION: BOOL SetupGetSourceInfoA ( HINF InfHandle, UINT SourceId, UINT InfoDesired, PSTR ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ; FUNCTION: BOOL SetupGetSourceInfoW ( HINF InfHandle, UINT SourceId, UINT InfoDesired, PWSTR ReturnBuffer, DWORD ReturnBufferSize, PDWORD RequiredSize ) ; @@ -1193,7 +1193,7 @@ CONSTANT: SRCINFO_TAGFILE 2 CONSTANT: SRCINFO_DESCRIPTION 3 CONSTANT: SRCINFO_FLAGS 4 CONSTANT: SRCINFO_TAGFILE2 5 -CONSTANT: SRC_FLAGS_CABFILE HEX: 0010 +CONSTANT: SRC_FLAGS_CABFILE 0x0010 FUNCTION: BOOL SetupInstallFileA ( HINF InfHandle, PINFCONTEXT InfContext, PCSTR SourceFile, PCSTR SourcePathRoot, PCSTR DestinationName, DWORD CopyStyle, PSP_FILE_CALLBACK_A CopyMsgHandler, PVOID Context ) ; FUNCTION: BOOL SetupInstallFileW ( HINF InfHandle, PINFCONTEXT InfContext, PCWSTR SourceFile, PCWSTR SourcePathRoot, PCWSTR DestinationName, DWORD CopyStyle, PSP_FILE_CALLBACK_W CopyMsgHandler, PVOID Context ) ; @@ -1203,40 +1203,40 @@ FUNCTION: BOOL SetupInstallFileExA ( HINF InfHandle, PINFCONTEXT InfContext, PCS FUNCTION: BOOL SetupInstallFileExW ( HINF InfHandle, PINFCONTEXT InfContext, PCWSTR SourceFile, PCWSTR SourcePathRoot, PCWSTR DestinationName, DWORD CopyStyle, PSP_FILE_CALLBACK_W CopyMsgHandler, PVOID Context, PBOOL FileWasInUse ) ; ALIAS: SetupInstallFileEx SetupInstallFileExW -CONSTANT: SP_COPY_DELETESOURCE HEX: 0000001 -CONSTANT: SP_COPY_REPLACEONLY HEX: 0000002 -CONSTANT: SP_COPY_NEWER HEX: 0000004 +CONSTANT: SP_COPY_DELETESOURCE 0x0000001 +CONSTANT: SP_COPY_REPLACEONLY 0x0000002 +CONSTANT: SP_COPY_NEWER 0x0000004 CONSTANT: SP_COPY_NEWER_OR_SAME $ SP_COPY_NEWER -CONSTANT: SP_COPY_NOOVERWRITE HEX: 0000008 -CONSTANT: SP_COPY_NODECOMP HEX: 0000010 -CONSTANT: SP_COPY_LANGUAGEAWARE HEX: 0000020 -CONSTANT: SP_COPY_SOURCE_ABSOLUTE HEX: 0000040 -CONSTANT: SP_COPY_SOURCEPATH_ABSOLUTE HEX: 0000080 -CONSTANT: SP_COPY_IN_USE_NEEDS_REBOOT HEX: 0000100 -CONSTANT: SP_COPY_FORCE_IN_USE HEX: 0000200 -CONSTANT: SP_COPY_NOSKIP HEX: 0000400 -CONSTANT: SP_FLAG_CABINETCONTINUATION HEX: 0000800 -CONSTANT: SP_COPY_FORCE_NOOVERWRITE HEX: 0001000 -CONSTANT: SP_COPY_FORCE_NEWER HEX: 0002000 -CONSTANT: SP_COPY_WARNIFSKIP HEX: 0004000 -CONSTANT: SP_COPY_NOBROWSE HEX: 0008000 -CONSTANT: SP_COPY_NEWER_ONLY HEX: 0010000 -CONSTANT: SP_COPY_RESERVED HEX: 0020000 -CONSTANT: SP_COPY_OEMINF_CATALOG_ONLY HEX: 0040000 -CONSTANT: SP_COPY_REPLACE_BOOT_FILE HEX: 0080000 -CONSTANT: SP_COPY_NOPRUNE HEX: 0100000 -CONSTANT: SP_COPY_OEM_F6_INF HEX: 0200000 -CONSTANT: SP_COPY_ALREADYDECOMP HEX: 0400000 -CONSTANT: SP_COPY_WINDOWS_SIGNED HEX: 1000000 -CONSTANT: SP_COPY_PNPLOCKED HEX: 2000000 -CONSTANT: SP_COPY_IN_USE_TRY_RENAME HEX: 4000000 -CONSTANT: SP_COPY_INBOX_INF HEX: 8000000 -CONSTANT: SP_COPY_HARDLINK HEX: 10000000 - -CONSTANT: SP_BACKUP_BACKUPPASS HEX: 00000001 -CONSTANT: SP_BACKUP_DEMANDPASS HEX: 00000002 -CONSTANT: SP_BACKUP_SPECIAL HEX: 00000004 -CONSTANT: SP_BACKUP_BOOTFILE HEX: 00000008 +CONSTANT: SP_COPY_NOOVERWRITE 0x0000008 +CONSTANT: SP_COPY_NODECOMP 0x0000010 +CONSTANT: SP_COPY_LANGUAGEAWARE 0x0000020 +CONSTANT: SP_COPY_SOURCE_ABSOLUTE 0x0000040 +CONSTANT: SP_COPY_SOURCEPATH_ABSOLUTE 0x0000080 +CONSTANT: SP_COPY_IN_USE_NEEDS_REBOOT 0x0000100 +CONSTANT: SP_COPY_FORCE_IN_USE 0x0000200 +CONSTANT: SP_COPY_NOSKIP 0x0000400 +CONSTANT: SP_FLAG_CABINETCONTINUATION 0x0000800 +CONSTANT: SP_COPY_FORCE_NOOVERWRITE 0x0001000 +CONSTANT: SP_COPY_FORCE_NEWER 0x0002000 +CONSTANT: SP_COPY_WARNIFSKIP 0x0004000 +CONSTANT: SP_COPY_NOBROWSE 0x0008000 +CONSTANT: SP_COPY_NEWER_ONLY 0x0010000 +CONSTANT: SP_COPY_RESERVED 0x0020000 +CONSTANT: SP_COPY_OEMINF_CATALOG_ONLY 0x0040000 +CONSTANT: SP_COPY_REPLACE_BOOT_FILE 0x0080000 +CONSTANT: SP_COPY_NOPRUNE 0x0100000 +CONSTANT: SP_COPY_OEM_F6_INF 0x0200000 +CONSTANT: SP_COPY_ALREADYDECOMP 0x0400000 +CONSTANT: SP_COPY_WINDOWS_SIGNED 0x1000000 +CONSTANT: SP_COPY_PNPLOCKED 0x2000000 +CONSTANT: SP_COPY_IN_USE_TRY_RENAME 0x4000000 +CONSTANT: SP_COPY_INBOX_INF 0x8000000 +CONSTANT: SP_COPY_HARDLINK 0x10000000 + +CONSTANT: SP_BACKUP_BACKUPPASS 0x00000001 +CONSTANT: SP_BACKUP_DEMANDPASS 0x00000002 +CONSTANT: SP_BACKUP_SPECIAL 0x00000004 +CONSTANT: SP_BACKUP_BOOTFILE 0x00000008 FUNCTION: HSPFILEQ SetupOpenFileQueue ( ) ; FUNCTION: BOOL SetupCloseFileQueue ( HSPFILEQ QueueHandle ) ; @@ -1288,28 +1288,28 @@ FUNCTION: BOOL SetupScanFileQueueA ( HSPFILEQ FileQueue, DWORD Flags, HWND Windo FUNCTION: BOOL SetupScanFileQueueW ( HSPFILEQ FileQueue, DWORD Flags, HWND Window, PSP_FILE_CALLBACK_W CallbackRoutine, PVOID CallbackContext, PDWORD Result ) ; ALIAS: SetupScanFileQueue SetupScanFileQueueW -CONSTANT: SPQ_SCAN_FILE_PRESENCE HEX: 00000001 -CONSTANT: SPQ_SCAN_FILE_VALIDITY HEX: 00000002 -CONSTANT: SPQ_SCAN_USE_CALLBACK HEX: 00000004 -CONSTANT: SPQ_SCAN_USE_CALLBACKEX HEX: 00000008 -CONSTANT: SPQ_SCAN_INFORM_USER HEX: 00000010 -CONSTANT: SPQ_SCAN_PRUNE_COPY_QUEUE HEX: 00000020 -CONSTANT: SPQ_SCAN_USE_CALLBACK_SIGNERINFO HEX: 00000040 -CONSTANT: SPQ_SCAN_PRUNE_DELREN HEX: 00000080 -CONSTANT: SPQ_SCAN_FILE_PRESENCE_WITHOUT_SOURCE HEX: 00000100 -CONSTANT: SPQ_SCAN_FILE_COMPARISON HEX: 00000200 -CONSTANT: SPQ_SCAN_ACTIVATE_DRP HEX: 00000400 -CONSTANT: SPQ_DELAYED_COPY HEX: 00000001 +CONSTANT: SPQ_SCAN_FILE_PRESENCE 0x00000001 +CONSTANT: SPQ_SCAN_FILE_VALIDITY 0x00000002 +CONSTANT: SPQ_SCAN_USE_CALLBACK 0x00000004 +CONSTANT: SPQ_SCAN_USE_CALLBACKEX 0x00000008 +CONSTANT: SPQ_SCAN_INFORM_USER 0x00000010 +CONSTANT: SPQ_SCAN_PRUNE_COPY_QUEUE 0x00000020 +CONSTANT: SPQ_SCAN_USE_CALLBACK_SIGNERINFO 0x00000040 +CONSTANT: SPQ_SCAN_PRUNE_DELREN 0x00000080 +CONSTANT: SPQ_SCAN_FILE_PRESENCE_WITHOUT_SOURCE 0x00000100 +CONSTANT: SPQ_SCAN_FILE_COMPARISON 0x00000200 +CONSTANT: SPQ_SCAN_ACTIVATE_DRP 0x00000400 +CONSTANT: SPQ_DELAYED_COPY 0x00000001 FUNCTION: BOOL SetupGetFileQueueCount ( HSPFILEQ FileQueue, UINT SubQueueFileOp, PUINT NumOperations ) ; FUNCTION: BOOL SetupGetFileQueueFlags ( HSPFILEQ FileQueue, PDWORD Flags ) ; FUNCTION: BOOL SetupSetFileQueueFlags ( HSPFILEQ FileQueue, DWORD FlagMask, DWORD Flags ) ; -CONSTANT: SPQ_FLAG_BACKUP_AWARE HEX: 00000001 -CONSTANT: SPQ_FLAG_ABORT_IF_UNSIGNED HEX: 00000002 -CONSTANT: SPQ_FLAG_FILES_MODIFIED HEX: 00000004 -CONSTANT: SPQ_FLAG_DO_SHUFFLEMOVE HEX: 00000008 -CONSTANT: SPQ_FLAG_VALID HEX: 0000000F +CONSTANT: SPQ_FLAG_BACKUP_AWARE 0x00000001 +CONSTANT: SPQ_FLAG_ABORT_IF_UNSIGNED 0x00000002 +CONSTANT: SPQ_FLAG_FILES_MODIFIED 0x00000004 +CONSTANT: SPQ_FLAG_DO_SHUFFLEMOVE 0x00000008 +CONSTANT: SPQ_FLAG_VALID 0x0000000F CONSTANT: SPOST_NONE 0 CONSTANT: SPOST_PATH 1 @@ -1320,8 +1320,8 @@ FUNCTION: BOOL SetupCopyOEMInfA ( PCSTR SourceInfFileName, PCSTR OEMSourceMediaL FUNCTION: BOOL SetupCopyOEMInfW ( PCWSTR SourceInfFileName, PCWSTR OEMSourceMediaLocation, DWORD OEMSourceMediaType, DWORD CopyStyle, PWSTR DestinationInfFileName, DWORD DestinationInfFileNameSize, PDWORD RequiredSize, PWSTR* DestinationInfFileNameComponent ) ; ALIAS: SetupCopyOEMInf SetupCopyOEMInfW -CONSTANT: SUOI_FORCEDELETE HEX: 00000001 -CONSTANT: SUOI_INTERNAL1 HEX: 00000002 +CONSTANT: SUOI_FORCEDELETE 0x00000001 +CONSTANT: SUOI_INTERNAL1 0x00000002 FUNCTION: BOOL SetupUninstallOEMInfA ( PCSTR InfFileName, DWORD Flags, PVOID Reserved ) ; FUNCTION: BOOL SetupUninstallOEMInfW ( PCWSTR InfFileName, DWORD Flags, PVOID Reserved ) ; @@ -1333,8 +1333,8 @@ FUNCTION: HDSKSPC SetupCreateDiskSpaceListA ( PVOID Reserved1, DWORD Reserved2, FUNCTION: HDSKSPC SetupCreateDiskSpaceListW ( PVOID Reserved1, DWORD Reserved2, UINT Flags ) ; ALIAS: SetupCreateDiskSpaceList SetupCreateDiskSpaceListW -CONSTANT: SPDSL_IGNORE_DISK HEX: 00000001 -CONSTANT: SPDSL_DISALLOW_NEGATIVE_ADJUST HEX: 00000002 +CONSTANT: SPDSL_IGNORE_DISK 0x00000001 +CONSTANT: SPDSL_DISALLOW_NEGATIVE_ADJUST 0x00000002 FUNCTION: HDSKSPC SetupDuplicateDiskSpaceListA ( HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags ) ; FUNCTION: HDSKSPC SetupDuplicateDiskSpaceListW ( HDSKSPC DiskSpace, PVOID Reserved1, DWORD Reserved2, UINT Flags ) ; @@ -1383,9 +1383,9 @@ ALIAS: SetupIterateCabinet SetupIterateCabinetW FUNCTION: INT SetupPromptReboot ( HSPFILEQ FileQueue, HWND Owner, BOOL ScanOnly ) ; -CONSTANT: SPFILEQ_FILE_IN_USE HEX: 00000001 -CONSTANT: SPFILEQ_REBOOT_RECOMMENDED HEX: 00000002 -CONSTANT: SPFILEQ_REBOOT_IN_PROGRESS HEX: 00000004 +CONSTANT: SPFILEQ_FILE_IN_USE 0x00000001 +CONSTANT: SPFILEQ_REBOOT_RECOMMENDED 0x00000002 +CONSTANT: SPFILEQ_REBOOT_IN_PROGRESS 0x00000004 FUNCTION: PVOID SetupInitDefaultQueueCallback ( HWND OwnerWindow ) ; FUNCTION: PVOID SetupInitDefaultQueueCallbackEx ( HWND OwnerWindow, HWND AlternateProgressWindow, UINT ProgressMessage, DWORD Reserved1, PVOID Reserved2 ) ; @@ -1395,24 +1395,24 @@ FUNCTION: UINT SetupDefaultQueueCallbackA ( PVOID Context, UINT Notification, UI FUNCTION: UINT SetupDefaultQueueCallbackW ( PVOID Context, UINT Notification, UINT_PTR Param1, UINT_PTR Param2 ) ; ALIAS: SetupDefaultQueueCallback SetupDefaultQueueCallbackW -CONSTANT: FLG_ADDREG_DELREG_BIT HEX: 00008000 -CONSTANT: FLG_ADDREG_BINVALUETYPE HEX: 00000001 -CONSTANT: FLG_ADDREG_NOCLOBBER HEX: 00000002 -CONSTANT: FLG_ADDREG_DELVAL HEX: 00000004 -CONSTANT: FLG_ADDREG_APPEND HEX: 00000008 -CONSTANT: FLG_ADDREG_KEYONLY HEX: 00000010 -CONSTANT: FLG_ADDREG_OVERWRITEONLY HEX: 00000020 -CONSTANT: FLG_ADDREG_64BITKEY HEX: 00001000 -CONSTANT: FLG_ADDREG_KEYONLY_COMMON HEX: 00002000 -CONSTANT: FLG_ADDREG_32BITKEY HEX: 00004000 -CONSTANT: FLG_ADDREG_TYPE_MASK HEX: FFFF0001 -CONSTANT: FLG_ADDREG_TYPE_SZ HEX: 00000000 -CONSTANT: FLG_ADDREG_TYPE_MULTI_SZ HEX: 00010000 -CONSTANT: FLG_ADDREG_TYPE_EXPAND_SZ HEX: 00020000 -CONSTANT: FLG_ADDREG_TYPE_BINARY HEX: 00000001 -CONSTANT: FLG_ADDREG_TYPE_DWORD HEX: 00010001 -CONSTANT: FLG_ADDREG_TYPE_NONE HEX: 00020001 -CONSTANT: FLG_DELREG_VALUE HEX: 00000000 +CONSTANT: FLG_ADDREG_DELREG_BIT 0x00008000 +CONSTANT: FLG_ADDREG_BINVALUETYPE 0x00000001 +CONSTANT: FLG_ADDREG_NOCLOBBER 0x00000002 +CONSTANT: FLG_ADDREG_DELVAL 0x00000004 +CONSTANT: FLG_ADDREG_APPEND 0x00000008 +CONSTANT: FLG_ADDREG_KEYONLY 0x00000010 +CONSTANT: FLG_ADDREG_OVERWRITEONLY 0x00000020 +CONSTANT: FLG_ADDREG_64BITKEY 0x00001000 +CONSTANT: FLG_ADDREG_KEYONLY_COMMON 0x00002000 +CONSTANT: FLG_ADDREG_32BITKEY 0x00004000 +CONSTANT: FLG_ADDREG_TYPE_MASK 0xFFFF0001 +CONSTANT: FLG_ADDREG_TYPE_SZ 0x00000000 +CONSTANT: FLG_ADDREG_TYPE_MULTI_SZ 0x00010000 +CONSTANT: FLG_ADDREG_TYPE_EXPAND_SZ 0x00020000 +CONSTANT: FLG_ADDREG_TYPE_BINARY 0x00000001 +CONSTANT: FLG_ADDREG_TYPE_DWORD 0x00010001 +CONSTANT: FLG_ADDREG_TYPE_NONE 0x00020001 +CONSTANT: FLG_DELREG_VALUE 0x00000000 CONSTANT: FLG_DELREG_TYPE_MASK $ FLG_ADDREG_TYPE_MASK CONSTANT: FLG_DELREG_TYPE_SZ $ FLG_ADDREG_TYPE_SZ CONSTANT: FLG_DELREG_TYPE_MULTI_SZ $ FLG_ADDREG_TYPE_MULTI_SZ @@ -1423,66 +1423,66 @@ CONSTANT: FLG_DELREG_TYPE_NONE $ FLG_ADDREG_TYPE_NONE CONSTANT: FLG_DELREG_64BITKEY $ FLG_ADDREG_64BITKEY CONSTANT: FLG_DELREG_KEYONLY_COMMON $ FLG_ADDREG_KEYONLY_COMMON CONSTANT: FLG_DELREG_32BITKEY $ FLG_ADDREG_32BITKEY -CONSTANT: FLG_DELREG_OPERATION_MASK HEX: 000000FE -CONSTANT: FLG_DELREG_MULTI_SZ_DELSTRING HEX: 00018002 -CONSTANT: FLG_BITREG_CLEARBITS HEX: 00000000 -CONSTANT: FLG_BITREG_SETBITS HEX: 00000001 -CONSTANT: FLG_BITREG_64BITKEY HEX: 00001000 -CONSTANT: FLG_BITREG_32BITKEY HEX: 00004000 -CONSTANT: FLG_INI2REG_64BITKEY HEX: 00001000 -CONSTANT: FLG_INI2REG_32BITKEY HEX: 00004000 -CONSTANT: FLG_REGSVR_DLLREGISTER HEX: 00000001 -CONSTANT: FLG_REGSVR_DLLINSTALL HEX: 00000002 -CONSTANT: FLG_PROFITEM_CURRENTUSER HEX: 00000001 -CONSTANT: FLG_PROFITEM_DELETE HEX: 00000002 -CONSTANT: FLG_PROFITEM_GROUP HEX: 00000004 -CONSTANT: FLG_PROFITEM_CSIDL HEX: 00000008 -CONSTANT: FLG_ADDPROPERTY_NOCLOBBER HEX: 00000001 -CONSTANT: FLG_ADDPROPERTY_OVERWRITEONLY HEX: 00000002 -CONSTANT: FLG_ADDPROPERTY_APPEND HEX: 00000004 -CONSTANT: FLG_ADDPROPERTY_OR HEX: 00000008 -CONSTANT: FLG_ADDPROPERTY_AND HEX: 00000010 -CONSTANT: FLG_DELPROPERTY_MULTI_SZ_DELSTRING HEX: 00000001 +CONSTANT: FLG_DELREG_OPERATION_MASK 0x000000FE +CONSTANT: FLG_DELREG_MULTI_SZ_DELSTRING 0x00018002 +CONSTANT: FLG_BITREG_CLEARBITS 0x00000000 +CONSTANT: FLG_BITREG_SETBITS 0x00000001 +CONSTANT: FLG_BITREG_64BITKEY 0x00001000 +CONSTANT: FLG_BITREG_32BITKEY 0x00004000 +CONSTANT: FLG_INI2REG_64BITKEY 0x00001000 +CONSTANT: FLG_INI2REG_32BITKEY 0x00004000 +CONSTANT: FLG_REGSVR_DLLREGISTER 0x00000001 +CONSTANT: FLG_REGSVR_DLLINSTALL 0x00000002 +CONSTANT: FLG_PROFITEM_CURRENTUSER 0x00000001 +CONSTANT: FLG_PROFITEM_DELETE 0x00000002 +CONSTANT: FLG_PROFITEM_GROUP 0x00000004 +CONSTANT: FLG_PROFITEM_CSIDL 0x00000008 +CONSTANT: FLG_ADDPROPERTY_NOCLOBBER 0x00000001 +CONSTANT: FLG_ADDPROPERTY_OVERWRITEONLY 0x00000002 +CONSTANT: FLG_ADDPROPERTY_APPEND 0x00000004 +CONSTANT: FLG_ADDPROPERTY_OR 0x00000008 +CONSTANT: FLG_ADDPROPERTY_AND 0x00000010 +CONSTANT: FLG_DELPROPERTY_MULTI_SZ_DELSTRING 0x00000001 FUNCTION: BOOL SetupInstallFromInfSectionA ( HWND Owner, HINF InfHandle, PCSTR SectionName, UINT Flags, HKEY RelativeKeyRoot, PCSTR SourceRootPath, UINT CopyFlags, PSP_FILE_CALLBACK_A MsgHandler, PVOID Context, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData ) ; FUNCTION: BOOL SetupInstallFromInfSectionW ( HWND Owner, HINF InfHandle, PCWSTR SectionName, UINT Flags, HKEY RelativeKeyRoot, PCWSTR SourceRootPath, UINT CopyFlags, PSP_FILE_CALLBACK_W MsgHandler, PVOID Context, HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData ) ; ALIAS: SetupInstallFromInfSection SetupInstallFromInfSectionW -CONSTANT: SPINST_LOGCONFIG HEX: 00000001 -CONSTANT: SPINST_INIFILES HEX: 00000002 -CONSTANT: SPINST_REGISTRY HEX: 00000004 -CONSTANT: SPINST_INI2REG HEX: 00000008 -CONSTANT: SPINST_FILES HEX: 00000010 -CONSTANT: SPINST_BITREG HEX: 00000020 -CONSTANT: SPINST_REGSVR HEX: 00000040 -CONSTANT: SPINST_UNREGSVR HEX: 00000080 -CONSTANT: SPINST_PROFILEITEMS HEX: 00000100 -CONSTANT: SPINST_COPYINF HEX: 00000200 -CONSTANT: SPINST_PROPERTIES HEX: 00000400 -CONSTANT: SPINST_ALL HEX: 000007ff -CONSTANT: SPINST_SINGLESECTION HEX: 00010000 -CONSTANT: SPINST_LOGCONFIG_IS_FORCED HEX: 00020000 -CONSTANT: SPINST_LOGCONFIGS_ARE_OVERRIDES HEX: 00040000 -CONSTANT: SPINST_REGISTERCALLBACKAWARE HEX: 00080000 -CONSTANT: SPINST_DEVICEINSTALL HEX: 00100000 +CONSTANT: SPINST_LOGCONFIG 0x00000001 +CONSTANT: SPINST_INIFILES 0x00000002 +CONSTANT: SPINST_REGISTRY 0x00000004 +CONSTANT: SPINST_INI2REG 0x00000008 +CONSTANT: SPINST_FILES 0x00000010 +CONSTANT: SPINST_BITREG 0x00000020 +CONSTANT: SPINST_REGSVR 0x00000040 +CONSTANT: SPINST_UNREGSVR 0x00000080 +CONSTANT: SPINST_PROFILEITEMS 0x00000100 +CONSTANT: SPINST_COPYINF 0x00000200 +CONSTANT: SPINST_PROPERTIES 0x00000400 +CONSTANT: SPINST_ALL 0x000007ff +CONSTANT: SPINST_SINGLESECTION 0x00010000 +CONSTANT: SPINST_LOGCONFIG_IS_FORCED 0x00020000 +CONSTANT: SPINST_LOGCONFIGS_ARE_OVERRIDES 0x00040000 +CONSTANT: SPINST_REGISTERCALLBACKAWARE 0x00080000 +CONSTANT: SPINST_DEVICEINSTALL 0x00100000 FUNCTION: BOOL SetupInstallFilesFromInfSectionA ( HINF InfHandle, HINF LayoutInfHandle, HSPFILEQ FileQueue, PCSTR SectionName, PCSTR SourceRootPath, UINT CopyFlags ) ; FUNCTION: BOOL SetupInstallFilesFromInfSectionW ( HINF InfHandle, HINF LayoutInfHandle, HSPFILEQ FileQueue, PCWSTR SectionName, PCWSTR SourceRootPath, UINT CopyFlags ) ; ALIAS: SetupInstallFilesFromInfSection SetupInstallFilesFromInfSectionW -CONSTANT: SPSVCINST_TAGTOFRONT HEX: 00000001 -CONSTANT: SPSVCINST_ASSOCSERVICE HEX: 00000002 -CONSTANT: SPSVCINST_DELETEEVENTLOGENTRY HEX: 00000004 -CONSTANT: SPSVCINST_NOCLOBBER_DISPLAYNAME HEX: 00000008 -CONSTANT: SPSVCINST_NOCLOBBER_STARTTYPE HEX: 00000010 -CONSTANT: SPSVCINST_NOCLOBBER_ERRORCONTROL HEX: 00000020 -CONSTANT: SPSVCINST_NOCLOBBER_LOADORDERGROUP HEX: 00000040 -CONSTANT: SPSVCINST_NOCLOBBER_DEPENDENCIES HEX: 00000080 -CONSTANT: SPSVCINST_NOCLOBBER_DESCRIPTION HEX: 00000100 -CONSTANT: SPSVCINST_STOPSERVICE HEX: 00000200 -CONSTANT: SPSVCINST_CLOBBER_SECURITY HEX: 00000400 -CONSTANT: SPSVCINST_STARTSERVICE HEX: 00000800 -CONSTANT: SPSVCINST_NOCLOBBER_REQUIREDPRIVILEGES HEX: 00001000 +CONSTANT: SPSVCINST_TAGTOFRONT 0x00000001 +CONSTANT: SPSVCINST_ASSOCSERVICE 0x00000002 +CONSTANT: SPSVCINST_DELETEEVENTLOGENTRY 0x00000004 +CONSTANT: SPSVCINST_NOCLOBBER_DISPLAYNAME 0x00000008 +CONSTANT: SPSVCINST_NOCLOBBER_STARTTYPE 0x00000010 +CONSTANT: SPSVCINST_NOCLOBBER_ERRORCONTROL 0x00000020 +CONSTANT: SPSVCINST_NOCLOBBER_LOADORDERGROUP 0x00000040 +CONSTANT: SPSVCINST_NOCLOBBER_DEPENDENCIES 0x00000080 +CONSTANT: SPSVCINST_NOCLOBBER_DESCRIPTION 0x00000100 +CONSTANT: SPSVCINST_STOPSERVICE 0x00000200 +CONSTANT: SPSVCINST_CLOBBER_SECURITY 0x00000400 +CONSTANT: SPSVCINST_STARTSERVICE 0x00000800 +CONSTANT: SPSVCINST_NOCLOBBER_REQUIREDPRIVILEGES 0x00001000 FUNCTION: BOOL SetupInstallServicesFromInfSectionA ( HINF InfHandle, PCSTR SectionName, DWORD Flags ) ; FUNCTION: BOOL SetupInstallServicesFromInfSectionW ( HINF InfHandle, PCWSTR SectionName, DWORD Flags ) ; @@ -1502,16 +1502,16 @@ FUNCTION: HSPFILELOG SetupInitializeFileLogA ( PCSTR LogFileName, DWORD Flags ) FUNCTION: HSPFILELOG SetupInitializeFileLogW ( PCWSTR LogFileName, DWORD Flags ) ; ALIAS: SetupInitializeFileLog SetupInitializeFileLogW -CONSTANT: SPFILELOG_SYSTEMLOG HEX: 00000001 -CONSTANT: SPFILELOG_FORCENEW HEX: 00000002 -CONSTANT: SPFILELOG_QUERYONLY HEX: 00000004 +CONSTANT: SPFILELOG_SYSTEMLOG 0x00000001 +CONSTANT: SPFILELOG_FORCENEW 0x00000002 +CONSTANT: SPFILELOG_QUERYONLY 0x00000004 FUNCTION: BOOL SetupTerminateFileLog ( HSPFILELOG FileLogHandle ) ; FUNCTION: BOOL SetupLogFileA ( HSPFILELOG FileLogHandle, PCSTR LogSectionName, PCSTR SourceFilename, PCSTR TargetFilename, DWORD Checksum, PCSTR DiskTagfile, PCSTR DiskDescription, PCSTR OtherInfo, DWORD Flags ) ; FUNCTION: BOOL SetupLogFileW ( HSPFILELOG FileLogHandle, PCWSTR LogSectionName, PCWSTR SourceFilename, PCWSTR TargetFilename, DWORD Checksum, PCWSTR DiskTagfile, PCWSTR DiskDescription, PCWSTR OtherInfo, DWORD Flags ) ; ALIAS: SetupLogFile SetupLogFileW -CONSTANT: SPFILELOG_OEMFILE HEX: 00000001 +CONSTANT: SPFILELOG_OEMFILE 0x00000001 FUNCTION: BOOL SetupRemoveFileLogEntryA ( HSPFILELOG FileLogHandle, PCSTR LogSectionName, PCSTR TargetFilename ) ; FUNCTION: BOOL SetupRemoveFileLogEntryW ( HSPFILELOG FileLogHandle, PCWSTR LogSectionName, PCWSTR TargetFilename ) ; ALIAS: SetupRemoveFileLogEntry SetupRemoveFileLogEntryW @@ -1529,11 +1529,11 @@ FUNCTION: BOOL SetupQueryFileLogW ( HSPFILELOG FileLogHandle, PCWSTR LogSectionN ALIAS: SetupQueryFileLog SetupQueryFileLogW TYPEDEF: DWORD LogSeverity -CONSTANT: LogSevInformation HEX: 00000000 -CONSTANT: LogSevWarning HEX: 00000001 -CONSTANT: LogSevError HEX: 00000002 -CONSTANT: LogSevFatalError HEX: 00000003 -CONSTANT: LogSevMaximum HEX: 00000004 +CONSTANT: LogSevInformation 0x00000000 +CONSTANT: LogSevWarning 0x00000001 +CONSTANT: LogSevError 0x00000002 +CONSTANT: LogSevFatalError 0x00000003 +CONSTANT: LogSevMaximum 0x00000004 FUNCTION: BOOL SetupOpenLog ( BOOL Erase ) ; FUNCTION: BOOL SetupLogErrorA ( LPCSTR MessageString, LogSeverity Severity ) ; @@ -1570,15 +1570,15 @@ FUNCTION: BOOL SetupDiGetDeviceInfoListDetailA ( HDEVINFO DeviceInfoSet, PSP_DEV FUNCTION: BOOL SetupDiGetDeviceInfoListDetailW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_LIST_DETAIL_DATA_W DeviceInfoSetDetailData ) ; ALIAS: SetupDiGetDeviceInfoListDetail SetupDiGetDeviceInfoListDetailW -CONSTANT: DICD_GENERATE_ID HEX: 00000001 -CONSTANT: DICD_INHERIT_CLASSDRVS HEX: 00000002 +CONSTANT: DICD_GENERATE_ID 0x00000001 +CONSTANT: DICD_INHERIT_CLASSDRVS 0x00000002 FUNCTION: BOOL SetupDiCreateDeviceInfoA ( HDEVINFO DeviceInfoSet, PCSTR DeviceName, GUID* ClassGuid, PCSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, PSP_DEVINFO_DATA DeviceInfoData ) ; FUNCTION: BOOL SetupDiCreateDeviceInfoW ( HDEVINFO DeviceInfoSet, PCWSTR DeviceName, GUID* ClassGuid, PCWSTR DeviceDescription, HWND hwndParent, DWORD CreationFlags, PSP_DEVINFO_DATA DeviceInfoData ) ; ALIAS: SetupDiCreateDeviceInfo SetupDiCreateDeviceInfoW -CONSTANT: DIOD_INHERIT_CLASSDRVS HEX: 00000002 -CONSTANT: DIOD_CANCEL_REMOVE HEX: 00000004 +CONSTANT: DIOD_INHERIT_CLASSDRVS 0x00000002 +CONSTANT: DIOD_CANCEL_REMOVE 0x00000004 FUNCTION: BOOL SetupDiOpenDeviceInfoA ( HDEVINFO DeviceInfoSet, PCSTR DeviceInstanceId, HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData ) ; FUNCTION: BOOL SetupDiOpenDeviceInfoW ( HDEVINFO DeviceInfoSet, PCWSTR DeviceInstanceId, HWND hwndParent, DWORD OpenFlags, PSP_DEVINFO_DATA DeviceInfoData ) ; @@ -1603,7 +1603,7 @@ ALIAS: SetupDiCreateInterfaceDeviceA SetupDiCreateDeviceInterfaceA ALIAS: SetupDiCreateInterfaceDevice SetupDiCreateDeviceInterfaceW -CONSTANT: DIODI_NO_ADD HEX: 00000001 +CONSTANT: DIODI_NO_ADD 0x00000001 FUNCTION: BOOL SetupDiOpenDeviceInterfaceA ( HDEVINFO DeviceInfoSet, PCSTR DevicePath, DWORD OpenFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData ) ; FUNCTION: BOOL SetupDiOpenDeviceInterfaceW ( HDEVINFO DeviceInfoSet, PCWSTR DevicePath, DWORD OpenFlags, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData ) ; @@ -1637,13 +1637,13 @@ ALIAS: SetupDiInstallInterfaceDevices SetupDiInstallDeviceInterfaces FUNCTION: BOOL SetupDiSetDeviceInterfaceDefault ( HDEVINFO DeviceInfoSet, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, DWORD Flags, PVOID Reserved ) ; -CONSTANT: SPRDI_FIND_DUPS HEX: 00000001 +CONSTANT: SPRDI_FIND_DUPS 0x00000001 FUNCTION: BOOL SetupDiRegisterDeviceInfo ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Flags, PSP_DETSIG_CMPPROC CompareProc, PVOID CompareContext, PSP_DEVINFO_DATA DupDeviceInfoData ) ; -CONSTANT: SPDIT_NODRIVER HEX: 00000000 -CONSTANT: SPDIT_CLASSDRIVER HEX: 00000001 -CONSTANT: SPDIT_COMPATDRIVER HEX: 00000002 +CONSTANT: SPDIT_NODRIVER 0x00000000 +CONSTANT: SPDIT_CLASSDRIVER 0x00000001 +CONSTANT: SPDIT_COMPATDRIVER 0x00000002 FUNCTION: BOOL SetupDiBuildDriverInfoList ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType ) ; FUNCTION: BOOL SetupDiCancelDriverInfoSearch ( HDEVINFO DeviceInfoSet ) ; @@ -1665,11 +1665,11 @@ ALIAS: SetupDiGetDriverInfoDetail SetupDiGetDriverInfoDetailW FUNCTION: BOOL SetupDiDestroyDriverInfoList ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD DriverType ) ; -CONSTANT: DIGCF_DEFAULT HEX: 00000001 -CONSTANT: DIGCF_PRESENT HEX: 00000002 -CONSTANT: DIGCF_ALLCLASSES HEX: 00000004 -CONSTANT: DIGCF_PROFILE HEX: 00000008 -CONSTANT: DIGCF_DEVICEINTERFACE HEX: 00000010 +CONSTANT: DIGCF_DEFAULT 0x00000001 +CONSTANT: DIGCF_PRESENT 0x00000002 +CONSTANT: DIGCF_ALLCLASSES 0x00000004 +CONSTANT: DIGCF_PROFILE 0x00000008 +CONSTANT: DIGCF_DEVICEINTERFACE 0x00000010 CONSTANT: DIGCF_INTERFACEDEVICE $ DIGCF_DEVICEINTERFACE FUNCTION: HDEVINFO SetupDiGetClassDevsA ( GUID* ClassGuid, PCSTR Enumerator, HWND hwndParent, DWORD Flags ) ; @@ -1684,8 +1684,8 @@ FUNCTION: BOOL SetupDiGetINFClassA ( PCSTR InfName, LPGUID ClassGuid, PSTR Class FUNCTION: BOOL SetupDiGetINFClassW ( PCWSTR InfName, LPGUID ClassGuid, PWSTR ClassName, DWORD ClassNameSize, PDWORD RequiredSize ) ; ALIAS: SetupDiGetINFClass SetupDiGetINFClassW -CONSTANT: DIBCI_NOINSTALLCLASS HEX: 00000001 -CONSTANT: DIBCI_NODISPLAYCLASS HEX: 00000002 +CONSTANT: DIBCI_NOINSTALLCLASS 0x00000001 +CONSTANT: DIBCI_NODISPLAYCLASS 0x00000002 FUNCTION: BOOL SetupDiBuildClassInfoList ( DWORD Flags, LPGUID ClassGuidList, DWORD ClassGuidListSize, PDWORD RequiredSize ) ; FUNCTION: BOOL SetupDiBuildClassInfoListExA ( DWORD Flags, LPGUID ClassGuidList, DWORD ClassGuidListSize, PDWORD RequiredSize, PCSTR MachineName, PVOID Reserved ) ; @@ -1722,8 +1722,8 @@ ALIAS: SetupDiInstallClassEx SetupDiInstallClassExW FUNCTION: HKEY SetupDiOpenClassRegKey ( GUID* ClassGuid, REGSAM samDesired ) ; -CONSTANT: DIOCR_INSTALLER HEX: 00000001 -CONSTANT: DIOCR_INTERFACE HEX: 00000002 +CONSTANT: DIOCR_INSTALLER 0x00000001 +CONSTANT: DIOCR_INTERFACE 0x00000002 FUNCTION: HKEY SetupDiOpenClassRegKeyExA ( GUID* ClassGuid, REGSAM samDesired, DWORD Flags, PCSTR MachineName, PVOID Reserved ) ; FUNCTION: HKEY SetupDiOpenClassRegKeyExW ( GUID* ClassGuid, REGSAM samDesired, DWORD Flags, PCWSTR MachineName, PVOID Reserved ) ; @@ -1742,9 +1742,9 @@ ALIAS: SetupDiOpenInterfaceDeviceRegKey SetupDiOpenDeviceInterfaceRegKey FUNCTION: BOOL SetupDiDeleteDeviceInterfaceRegKey ( HDEVINFO DeviceInfoSet, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, DWORD Reserved ) ; ALIAS: SetupDiDeleteInterfaceDeviceRegKey SetupDiDeleteDeviceInterfaceRegKey -CONSTANT: DIREG_DEV HEX: 00000001 -CONSTANT: DIREG_DRV HEX: 00000002 -CONSTANT: DIREG_BOTH HEX: 00000004 +CONSTANT: DIREG_DEV 0x00000001 +CONSTANT: DIREG_DRV 0x00000002 +CONSTANT: DIREG_BOTH 0x00000004 FUNCTION: HKEY SetupDiCreateDevRegKeyA ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Scope, DWORD HwProfile, DWORD KeyType, HINF InfHandle, PCSTR InfSectionName ) ; FUNCTION: HKEY SetupDiCreateDevRegKeyW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Scope, DWORD HwProfile, DWORD KeyType, HINF InfHandle, PCWSTR InfSectionName ) ; @@ -1771,8 +1771,8 @@ ALIAS: SetupDiGetDeviceInterfaceProperty SetupDiGetDeviceInterfacePropertyW FUNCTION: BOOL SetupDiSetDeviceInterfacePropertyW ( HDEVINFO DeviceInfoSet, PSP_DEVICE_INTERFACE_DATA DeviceInterfaceData, DEVPROPKEY* PropertyKey, DEVPROPTYPE PropertyType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, DWORD Flags ) ; ALIAS: SetupDiSetDeviceInterfaceProperty SetupDiSetDeviceInterfacePropertyW -CONSTANT: DICLASSPROP_INSTALLER HEX: 00000001 -CONSTANT: DICLASSPROP_INTERFACE HEX: 00000002 +CONSTANT: DICLASSPROP_INSTALLER 0x00000001 +CONSTANT: DICLASSPROP_INTERFACE 0x00000002 FUNCTION: BOOL SetupDiGetClassPropertyKeys ( GUID* ClassGuid, DEVPROPKEY* PropertyKeyArray, DWORD PropertyKeyCount, PDWORD RequiredPropertyKeyCount, DWORD Flags ) ; FUNCTION: BOOL SetupDiGetClassPropertyKeysExW ( GUID* ClassGuid, DEVPROPKEY* PropertyKeyArray, DWORD PropertyKeyCount, PDWORD RequiredPropertyKeyCount, DWORD Flags, PCWSTR MachineName, PVOID Reserved ) ; @@ -1790,52 +1790,52 @@ ALIAS: SetupDiSetClassProperty SetupDiSetClassPropertyW FUNCTION: BOOL SetupDiSetClassPropertyExW ( GUID* ClassGuid, DEVPROPKEY* PropertyKey, DEVPROPTYPE PropertyType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, DWORD Flags, PCWSTR MachineName, PVOID Reserved ) ; ALIAS: SetupDiSetClassPropertyEx SetupDiSetClassPropertyExW -CONSTANT: SPDRP_DEVICEDESC HEX: 00000000 -CONSTANT: SPDRP_HARDWAREID HEX: 00000001 -CONSTANT: SPDRP_COMPATIBLEIDS HEX: 00000002 -CONSTANT: SPDRP_UNUSED0 HEX: 00000003 -CONSTANT: SPDRP_SERVICE HEX: 00000004 -CONSTANT: SPDRP_UNUSED1 HEX: 00000005 -CONSTANT: SPDRP_UNUSED2 HEX: 00000006 -CONSTANT: SPDRP_CLASS HEX: 00000007 -CONSTANT: SPDRP_CLASSGUID HEX: 00000008 -CONSTANT: SPDRP_DRIVER HEX: 00000009 -CONSTANT: SPDRP_CONFIGFLAGS HEX: 0000000A -CONSTANT: SPDRP_MFG HEX: 0000000B -CONSTANT: SPDRP_FRIENDLYNAME HEX: 0000000C -CONSTANT: SPDRP_LOCATION_INFORMATION HEX: 0000000D -CONSTANT: SPDRP_PHYSICAL_DEVICE_OBJECT_NAME HEX: 0000000E -CONSTANT: SPDRP_CAPABILITIES HEX: 0000000F -CONSTANT: SPDRP_UI_NUMBER HEX: 00000010 -CONSTANT: SPDRP_UPPERFILTERS HEX: 00000011 -CONSTANT: SPDRP_LOWERFILTERS HEX: 00000012 -CONSTANT: SPDRP_BUSTYPEGUID HEX: 00000013 -CONSTANT: SPDRP_LEGACYBUSTYPE HEX: 00000014 -CONSTANT: SPDRP_BUSNUMBER HEX: 00000015 -CONSTANT: SPDRP_ENUMERATOR_NAME HEX: 00000016 -CONSTANT: SPDRP_SECURITY HEX: 00000017 -CONSTANT: SPDRP_SECURITY_SDS HEX: 00000018 -CONSTANT: SPDRP_DEVTYPE HEX: 00000019 -CONSTANT: SPDRP_EXCLUSIVE HEX: 0000001A -CONSTANT: SPDRP_CHARACTERISTICS HEX: 0000001B -CONSTANT: SPDRP_ADDRESS HEX: 0000001C -CONSTANT: SPDRP_UI_NUMBER_DESC_FORMAT HEX: 0000001D -CONSTANT: SPDRP_DEVICE_POWER_DATA HEX: 0000001E -CONSTANT: SPDRP_REMOVAL_POLICY HEX: 0000001F -CONSTANT: SPDRP_REMOVAL_POLICY_HW_DEFAULT HEX: 00000020 -CONSTANT: SPDRP_REMOVAL_POLICY_OVERRIDE HEX: 00000021 -CONSTANT: SPDRP_INSTALL_STATE HEX: 00000022 -CONSTANT: SPDRP_LOCATION_PATHS HEX: 00000023 -CONSTANT: SPDRP_BASE_CONTAINERID HEX: 00000024 -CONSTANT: SPDRP_MAXIMUM_PROPERTY HEX: 00000025 -CONSTANT: SPCRP_UPPERFILTERS HEX: 00000011 -CONSTANT: SPCRP_LOWERFILTERS HEX: 00000012 -CONSTANT: SPCRP_SECURITY HEX: 00000017 -CONSTANT: SPCRP_SECURITY_SDS HEX: 00000018 -CONSTANT: SPCRP_DEVTYPE HEX: 00000019 -CONSTANT: SPCRP_EXCLUSIVE HEX: 0000001A -CONSTANT: SPCRP_CHARACTERISTICS HEX: 0000001B -CONSTANT: SPCRP_MAXIMUM_PROPERTY HEX: 0000001C +CONSTANT: SPDRP_DEVICEDESC 0x00000000 +CONSTANT: SPDRP_HARDWAREID 0x00000001 +CONSTANT: SPDRP_COMPATIBLEIDS 0x00000002 +CONSTANT: SPDRP_UNUSED0 0x00000003 +CONSTANT: SPDRP_SERVICE 0x00000004 +CONSTANT: SPDRP_UNUSED1 0x00000005 +CONSTANT: SPDRP_UNUSED2 0x00000006 +CONSTANT: SPDRP_CLASS 0x00000007 +CONSTANT: SPDRP_CLASSGUID 0x00000008 +CONSTANT: SPDRP_DRIVER 0x00000009 +CONSTANT: SPDRP_CONFIGFLAGS 0x0000000A +CONSTANT: SPDRP_MFG 0x0000000B +CONSTANT: SPDRP_FRIENDLYNAME 0x0000000C +CONSTANT: SPDRP_LOCATION_INFORMATION 0x0000000D +CONSTANT: SPDRP_PHYSICAL_DEVICE_OBJECT_NAME 0x0000000E +CONSTANT: SPDRP_CAPABILITIES 0x0000000F +CONSTANT: SPDRP_UI_NUMBER 0x00000010 +CONSTANT: SPDRP_UPPERFILTERS 0x00000011 +CONSTANT: SPDRP_LOWERFILTERS 0x00000012 +CONSTANT: SPDRP_BUSTYPEGUID 0x00000013 +CONSTANT: SPDRP_LEGACYBUSTYPE 0x00000014 +CONSTANT: SPDRP_BUSNUMBER 0x00000015 +CONSTANT: SPDRP_ENUMERATOR_NAME 0x00000016 +CONSTANT: SPDRP_SECURITY 0x00000017 +CONSTANT: SPDRP_SECURITY_SDS 0x00000018 +CONSTANT: SPDRP_DEVTYPE 0x00000019 +CONSTANT: SPDRP_EXCLUSIVE 0x0000001A +CONSTANT: SPDRP_CHARACTERISTICS 0x0000001B +CONSTANT: SPDRP_ADDRESS 0x0000001C +CONSTANT: SPDRP_UI_NUMBER_DESC_FORMAT 0x0000001D +CONSTANT: SPDRP_DEVICE_POWER_DATA 0x0000001E +CONSTANT: SPDRP_REMOVAL_POLICY 0x0000001F +CONSTANT: SPDRP_REMOVAL_POLICY_HW_DEFAULT 0x00000020 +CONSTANT: SPDRP_REMOVAL_POLICY_OVERRIDE 0x00000021 +CONSTANT: SPDRP_INSTALL_STATE 0x00000022 +CONSTANT: SPDRP_LOCATION_PATHS 0x00000023 +CONSTANT: SPDRP_BASE_CONTAINERID 0x00000024 +CONSTANT: SPDRP_MAXIMUM_PROPERTY 0x00000025 +CONSTANT: SPCRP_UPPERFILTERS 0x00000011 +CONSTANT: SPCRP_LOWERFILTERS 0x00000012 +CONSTANT: SPCRP_SECURITY 0x00000017 +CONSTANT: SPCRP_SECURITY_SDS 0x00000018 +CONSTANT: SPCRP_DEVTYPE 0x00000019 +CONSTANT: SPCRP_EXCLUSIVE 0x0000001A +CONSTANT: SPCRP_CHARACTERISTICS 0x0000001B +CONSTANT: SPCRP_MAXIMUM_PROPERTY 0x0000001C FUNCTION: BOOL SetupDiGetDeviceRegistryPropertyA ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Property, PDWORD PropertyRegDataType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, PDWORD RequiredSize ) ; FUNCTION: BOOL SetupDiGetDeviceRegistryPropertyW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, DWORD Property, PDWORD PropertyRegDataType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, PDWORD RequiredSize ) ; @@ -1880,9 +1880,9 @@ ALIAS: SetupDiSetDriverInstallParams SetupDiSetDriverInstallParamsW FUNCTION: BOOL SetupDiLoadClassIcon ( GUID* ClassGuid, HICON* LargeIcon, PINT MiniIconIndex ) ; FUNCTION: BOOL SetupDiLoadDeviceIcon ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, UINT cxIcon, UINT cyIcon, DWORD Flags, HICON* hIcon ) ; -CONSTANT: DMI_MASK HEX: 00000001 -CONSTANT: DMI_BKCOLOR HEX: 00000002 -CONSTANT: DMI_USERECT HEX: 00000004 +CONSTANT: DMI_MASK 0x00000001 +CONSTANT: DMI_BKCOLOR 0x00000002 +CONSTANT: DMI_USERECT 0x00000004 FUNCTION: INT SetupDiDrawMiniIcon ( HDC hdc, RECT rc, INT MiniIconIndex, DWORD Flags ) ; FUNCTION: BOOL SetupDiGetClassBitmapIndex ( GUID* ClassGuid, PINT MiniIconIndex ) ; @@ -1894,10 +1894,10 @@ ALIAS: SetupDiGetClassImageListEx SetupDiGetClassImageListExW FUNCTION: BOOL SetupDiGetClassImageIndex ( PSP_CLASSIMAGELIST_DATA ClassImageListData, GUID* ClassGuid, PINT ImageIndex ) ; FUNCTION: BOOL SetupDiDestroyClassImageList ( PSP_CLASSIMAGELIST_DATA ClassImageListData ) ; -CONSTANT: DIGCDP_FLAG_BASIC HEX: 00000001 -CONSTANT: DIGCDP_FLAG_ADVANCED HEX: 00000002 -CONSTANT: DIGCDP_FLAG_REMOTE_BASIC HEX: 00000003 -CONSTANT: DIGCDP_FLAG_REMOTE_ADVANCED HEX: 00000004 +CONSTANT: DIGCDP_FLAG_BASIC 0x00000001 +CONSTANT: DIGCDP_FLAG_ADVANCED 0x00000002 +CONSTANT: DIGCDP_FLAG_REMOTE_BASIC 0x00000003 +CONSTANT: DIGCDP_FLAG_REMOTE_ADVANCED 0x00000004 FUNCTION: BOOL SetupDiGetClassDevPropertySheetsA ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, LPPROPSHEETHEADERA PropertySheetHeader, DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, DWORD PropertySheetType ) ; FUNCTION: BOOL SetupDiGetClassDevPropertySheetsW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, LPPROPSHEETHEADERW PropertySheetHeader, DWORD PropertySheetHeaderPageListSize, PDWORD RequiredSize, DWORD PropertySheetType ) ; @@ -1941,8 +1941,8 @@ FUNCTION: BOOL SetupDiGetHwProfileFriendlyNameExA ( DWORD HwProfile, PSTR Friend FUNCTION: BOOL SetupDiGetHwProfileFriendlyNameExW ( DWORD HwProfile, PWSTR FriendlyName, DWORD FriendlyNameSize, PDWORD RequiredSize, PCWSTR MachineName, PVOID Reserved ) ; ALIAS: SetupDiGetHwProfileFriendlyNameEx SetupDiGetHwProfileFriendlyNameExW -CONSTANT: SPWPT_SELECTDEVICE HEX: 00000001 -CONSTANT: SPWP_USE_DEVINFO_DATA HEX: 00000001 +CONSTANT: SPWPT_SELECTDEVICE 0x00000001 +CONSTANT: SPWP_USE_DEVINFO_DATA 0x00000001 FUNCTION: HPROPSHEETPAGE SetupDiGetWizardPage ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PSP_INSTALLWIZARD_DATA InstallWizardData, DWORD PageType, DWORD Flags ) ; FUNCTION: BOOL SetupDiGetSelectedDevice ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData ) ; @@ -1998,17 +1998,17 @@ 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 -CONSTANT: SIGNERSCORE_UNKNOWN HEX: FF000000 -CONSTANT: SIGNERSCORE_W9X_SUSPECT HEX: C0000000 -CONSTANT: SIGNERSCORE_UNSIGNED HEX: 80000000 -CONSTANT: SIGNERSCORE_AUTHENTICODE HEX: 0F000000 -CONSTANT: SIGNERSCORE_WHQL HEX: 0D000005 -CONSTANT: SIGNERSCORE_UNCLASSIFIED HEX: 0D000004 -CONSTANT: SIGNERSCORE_INBOX HEX: 0D000003 -CONSTANT: SIGNERSCORE_LOGO_STANDARD HEX: 0D000002 -CONSTANT: SIGNERSCORE_LOGO_PREMIUM HEX: 0D000001 -CONSTANT: SIGNERSCORE_MASK HEX: FF000000 -CONSTANT: SIGNERSCORE_SIGNED_MASK HEX: F0000000 +CONSTANT: SIGNERSCORE_UNKNOWN 0xFF000000 +CONSTANT: SIGNERSCORE_W9X_SUSPECT 0xC0000000 +CONSTANT: SIGNERSCORE_UNSIGNED 0x80000000 +CONSTANT: SIGNERSCORE_AUTHENTICODE 0x0F000000 +CONSTANT: SIGNERSCORE_WHQL 0x0D000005 +CONSTANT: SIGNERSCORE_UNCLASSIFIED 0x0D000004 +CONSTANT: SIGNERSCORE_INBOX 0x0D000003 +CONSTANT: SIGNERSCORE_LOGO_STANDARD 0x0D000002 +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 @@ -2021,12 +2021,12 @@ FUNCTION: BOOL SetupVerifyInfFileA ( PCSTR InfName, PSP_ALTPLATFORM_INFO AltPlat FUNCTION: BOOL SetupVerifyInfFileW ( PCWSTR InfName, PSP_ALTPLATFORM_INFO AltPlatformInfo, PSP_INF_SIGNER_INFO_W InfSignerInfo ) ; ALIAS: SetupVerifyInfFile SetupVerifyInfFileW -CONSTANT: DICUSTOMDEVPROP_MERGE_MULTISZ HEX: 00000001 +CONSTANT: DICUSTOMDEVPROP_MERGE_MULTISZ 0x00000001 FUNCTION: BOOL SetupDiGetCustomDevicePropertyA ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PCSTR CustomPropertyName, DWORD Flags, PDWORD PropertyRegDataType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, PDWORD RequiredSize ) ; FUNCTION: BOOL SetupDiGetCustomDevicePropertyW ( HDEVINFO DeviceInfoSet, PSP_DEVINFO_DATA DeviceInfoData, PCWSTR CustomPropertyName, DWORD Flags, PDWORD PropertyRegDataType, PBYTE PropertyBuffer, DWORD PropertyBufferSize, PDWORD RequiredSize ) ; ALIAS: SetupDiGetCustomDeviceProperty SetupDiGetCustomDevicePropertyW -CONSTANT: SCWMI_CLOBBER_SECURITY HEX: 00000001 +CONSTANT: SCWMI_CLOBBER_SECURITY 0x00000001 FUNCTION: BOOL SetupConfigureWmiFromInfSectionA ( HINF InfHandle, PCSTR SectionName, DWORD Flags ) ; FUNCTION: BOOL SetupConfigureWmiFromInfSectionW ( HINF InfHandle, PCWSTR SectionName, DWORD Flags ) ; ALIAS: SetupConfigureWmiFromInfSection SetupConfigureWmiFromInfSectionW diff --git a/basis/windows/directx/audiodefs/audiodefs.factor b/basis/windows/directx/audiodefs/audiodefs.factor index 13e598366f..f45b687934 100644 --- a/basis/windows/directx/audiodefs/audiodefs.factor +++ b/basis/windows/directx/audiodefs/audiodefs.factor @@ -65,41 +65,41 @@ STRUCT: ADPCMWAVEFORMAT CONSTANT: WAVE_FORMAT_ADPCM 2 CONSTANT: WAVE_FORMAT_UNKNOWN 0 CONSTANT: WAVE_FORMAT_IEEE_FLOAT 3 -CONSTANT: WAVE_FORMAT_MPEGLAYER3 HEX: 0055 -CONSTANT: WAVE_FORMAT_DOLBY_AC3_SPDIF HEX: 0092 -CONSTANT: WAVE_FORMAT_WMAUDIO2 HEX: 0161 -CONSTANT: WAVE_FORMAT_WMAUDIO3 HEX: 0162 -CONSTANT: WAVE_FORMAT_WMASPDIF HEX: 0164 -CONSTANT: WAVE_FORMAT_EXTENSIBLE HEX: FFFE +CONSTANT: WAVE_FORMAT_MPEGLAYER3 0x0055 +CONSTANT: WAVE_FORMAT_DOLBY_AC3_SPDIF 0x0092 +CONSTANT: WAVE_FORMAT_WMAUDIO2 0x0161 +CONSTANT: WAVE_FORMAT_WMAUDIO3 0x0162 +CONSTANT: WAVE_FORMAT_WMASPDIF 0x0164 +CONSTANT: WAVE_FORMAT_EXTENSIBLE 0xFFFE -CONSTANT: SPEAKER_FRONT_LEFT HEX: 00000001 -CONSTANT: SPEAKER_FRONT_RIGHT HEX: 00000002 -CONSTANT: SPEAKER_FRONT_CENTER HEX: 00000004 -CONSTANT: SPEAKER_LOW_FREQUENCY HEX: 00000008 -CONSTANT: SPEAKER_BACK_LEFT HEX: 00000010 -CONSTANT: SPEAKER_BACK_RIGHT HEX: 00000020 -CONSTANT: SPEAKER_FRONT_LEFT_OF_CENTER HEX: 00000040 -CONSTANT: SPEAKER_FRONT_RIGHT_OF_CENTER HEX: 00000080 -CONSTANT: SPEAKER_BACK_CENTER HEX: 00000100 -CONSTANT: SPEAKER_SIDE_LEFT HEX: 00000200 -CONSTANT: SPEAKER_SIDE_RIGHT HEX: 00000400 -CONSTANT: SPEAKER_TOP_CENTER HEX: 00000800 -CONSTANT: SPEAKER_TOP_FRONT_LEFT HEX: 00001000 -CONSTANT: SPEAKER_TOP_FRONT_CENTER HEX: 00002000 -CONSTANT: SPEAKER_TOP_FRONT_RIGHT HEX: 00004000 -CONSTANT: SPEAKER_TOP_BACK_LEFT HEX: 00008000 -CONSTANT: SPEAKER_TOP_BACK_CENTER HEX: 00010000 -CONSTANT: SPEAKER_TOP_BACK_RIGHT HEX: 00020000 -CONSTANT: SPEAKER_RESERVED HEX: 7FFC0000 -CONSTANT: SPEAKER_ALL HEX: 80000000 +CONSTANT: SPEAKER_FRONT_LEFT 0x00000001 +CONSTANT: SPEAKER_FRONT_RIGHT 0x00000002 +CONSTANT: SPEAKER_FRONT_CENTER 0x00000004 +CONSTANT: SPEAKER_LOW_FREQUENCY 0x00000008 +CONSTANT: SPEAKER_BACK_LEFT 0x00000010 +CONSTANT: SPEAKER_BACK_RIGHT 0x00000020 +CONSTANT: SPEAKER_FRONT_LEFT_OF_CENTER 0x00000040 +CONSTANT: SPEAKER_FRONT_RIGHT_OF_CENTER 0x00000080 +CONSTANT: SPEAKER_BACK_CENTER 0x00000100 +CONSTANT: SPEAKER_SIDE_LEFT 0x00000200 +CONSTANT: SPEAKER_SIDE_RIGHT 0x00000400 +CONSTANT: SPEAKER_TOP_CENTER 0x00000800 +CONSTANT: SPEAKER_TOP_FRONT_LEFT 0x00001000 +CONSTANT: SPEAKER_TOP_FRONT_CENTER 0x00002000 +CONSTANT: SPEAKER_TOP_FRONT_RIGHT 0x00004000 +CONSTANT: SPEAKER_TOP_BACK_LEFT 0x00008000 +CONSTANT: SPEAKER_TOP_BACK_CENTER 0x00010000 +CONSTANT: SPEAKER_TOP_BACK_RIGHT 0x00020000 +CONSTANT: SPEAKER_RESERVED 0x7FFC0000 +CONSTANT: SPEAKER_ALL 0x80000000 -CONSTANT: SPEAKER_MONO HEX: 00000004 -CONSTANT: SPEAKER_STEREO HEX: 00000003 -CONSTANT: SPEAKER_2POINT1 HEX: 0000000B -CONSTANT: SPEAKER_SURROUND HEX: 00010007 -CONSTANT: SPEAKER_QUAD HEX: 00028003 -CONSTANT: SPEAKER_4POINT1 HEX: 0002800B -CONSTANT: SPEAKER_5POINT1 HEX: 0002800F -CONSTANT: SPEAKER_7POINT1 HEX: 000280CF -CONSTANT: SPEAKER_5POINT1_SURROUND HEX: 0000060F -CONSTANT: SPEAKER_7POINT1_SURROUND HEX: 0002860F +CONSTANT: SPEAKER_MONO 0x00000004 +CONSTANT: SPEAKER_STEREO 0x00000003 +CONSTANT: SPEAKER_2POINT1 0x0000000B +CONSTANT: SPEAKER_SURROUND 0x00010007 +CONSTANT: SPEAKER_QUAD 0x00028003 +CONSTANT: SPEAKER_4POINT1 0x0002800B +CONSTANT: SPEAKER_5POINT1 0x0002800F +CONSTANT: SPEAKER_7POINT1 0x000280CF +CONSTANT: SPEAKER_5POINT1_SURROUND 0x0000060F +CONSTANT: SPEAKER_7POINT1_SURROUND 0x0002860F diff --git a/basis/windows/directx/d2d1/d2d1.factor b/basis/windows/directx/d2d1/d2d1.factor index d8fedc003a..a79cd856f3 100644 --- a/basis/windows/directx/d2d1/d2d1.factor +++ b/basis/windows/directx/d2d1/d2d1.factor @@ -6,54 +6,54 @@ IN: windows.directx.d2d1 LIBRARY: d2d1 -CONSTANT: D2D1_INVALID_TAG HEX: ffffffffffffffff +CONSTANT: D2D1_INVALID_TAG 0xffffffffffffffff CONSTANT: D2D1_DEFAULT_FLATTENING_TOLERANCE 0.25 CONSTANT: D2D1_ALPHA_MODE_UNKNOWN 0 CONSTANT: D2D1_ALPHA_MODE_PREMULTIPLIED 1 CONSTANT: D2D1_ALPHA_MODE_STRAIGHT 2 CONSTANT: D2D1_ALPHA_MODE_IGNORE 3 -CONSTANT: D2D1_ALPHA_MODE_FORCE_DWORD HEX: ffffffff +CONSTANT: D2D1_ALPHA_MODE_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_ALPHA_MODE CONSTANT: D2D1_GAMMA_2_2 0 CONSTANT: D2D1_GAMMA_1_0 1 -CONSTANT: D2D1_GAMMA_FORCE_DWORD HEX: ffffffff +CONSTANT: D2D1_GAMMA_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_OPACITY_MASK_CONTENT_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_EXTEND_MODE_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_EXTEND_MODE CONSTANT: D2D1_ANTIALIAS_MODE_PER_PRIMITIVE 0 CONSTANT: D2D1_ANTIALIAS_MODE_ALIASED 1 -CONSTANT: D2D1_ANTIALIAS_MODE_FORCE_DWORD HEX: ffffffff +CONSTANT: D2D1_ANTIALIAS_MODE_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_TEXT_ANTIALIAS_MODE_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_BITMAP_INTERPOLATION_MODE_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_BITMAP_INTERPOLATION_MODE -CONSTANT: D2D1_DRAW_TEXT_OPTIONS_NO_SNAP HEX: 00000001 -CONSTANT: D2D1_DRAW_TEXT_OPTIONS_CLIP HEX: 00000002 -CONSTANT: D2D1_DRAW_TEXT_OPTIONS_NONE HEX: 00000000 -CONSTANT: D2D1_DRAW_TEXT_OPTIONS_FORCE_DWORD HEX: ffffffff +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 STRUCT: D2D1_PIXEL_FORMAT @@ -100,14 +100,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 HEX: ffffffff +CONSTANT: D2D1_ARC_SIZE_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_CAP_STYLE_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_CAP_STYLE CONSTANT: D2D1_DASH_STYLE_SOLID 0 @@ -116,21 +116,21 @@ CONSTANT: D2D1_DASH_STYLE_DOT 2 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 HEX: ffffffff +CONSTANT: D2D1_DASH_STYLE_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_LINE_JOIN_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_COMBINE_MODE_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_COMBINE_MODE CONSTANT: D2D1_GEOMETRY_RELATION_UNKNOWN 0 @@ -138,22 +138,22 @@ CONSTANT: D2D1_GEOMETRY_RELATION_DISJOINT 1 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 HEX: ffffffff +CONSTANT: D2D1_GEOMETRY_RELATION_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_GEOMETRY_SIMPLIFICATION_OPTION_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_GEOMETRY_SIMPLIFICATION_OPTION CONSTANT: D2D1_FIGURE_BEGIN_FILLED 0 CONSTANT: D2D1_FIGURE_BEGIN_HOLLOW 1 -CONSTANT: D2D1_FIGURE_BEGIN_FORCE_DWORD HEX: ffffffff +CONSTANT: D2D1_FIGURE_BEGIN_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_FIGURE_BEGIN CONSTANT: D2D1_FIGURE_END_OPEN 0 CONSTANT: D2D1_FIGURE_END_CLOSED 1 -CONSTANT: D2D1_FIGURE_END_FORCE_DWORD HEX: ffffffff +CONSTANT: D2D1_FIGURE_END_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_FIGURE_END STRUCT: D2D1_BEZIER_SEGMENT @@ -166,20 +166,20 @@ STRUCT: D2D1_TRIANGLE { point2 D2D1_POINT_2F } { point3 D2D1_POINT_2F } ; -CONSTANT: D2D1_PATH_SEGMENT_NONE HEX: 00000000 -CONSTANT: D2D1_PATH_SEGMENT_FORCE_UNSTROKED HEX: 00000001 -CONSTANT: D2D1_PATH_SEGMENT_FORCE_ROUND_LINE_JOIN HEX: 00000002 -CONSTANT: D2D1_PATH_SEGMENT_FORCE_DWORD HEX: ffffffff +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 CONSTANT: D2D1_SWEEP_DIRECTION_COUNTER_CLOCKWISE 0 CONSTANT: D2D1_SWEEP_DIRECTION_CLOCKWISE 1 -CONSTANT: D2D1_SWEEP_DIRECTION_FORCE_DWORD HEX: ffffffff +CONSTANT: D2D1_SWEEP_DIRECTION_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_SWEEP_DIRECTION CONSTANT: D2D1_FILL_MODE_ALTERNATE 0 CONSTANT: D2D1_FILL_MODE_WINDING 1 -CONSTANT: D2D1_FILL_MODE_FORCE_DWORD HEX: ffffffff +CONSTANT: D2D1_FILL_MODE_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_FILL_MODE STRUCT: D2D1_ARC_SEGMENT @@ -212,9 +212,9 @@ STRUCT: D2D1_STROKE_STYLE_PROPERTIES { dashStyle D2D1_DASH_STYLE } { dashOffset FLOAT } ; -CONSTANT: D2D1_LAYER_OPTIONS_NONE HEX: 00000000 -CONSTANT: D2D1_LAYER_OPTIONS_INITIALIZE_FOR_CLEARTYPE HEX: 00000001 -CONSTANT: D2D1_LAYER_OPTIONS_FORCE_DWORD HEX: ffffffff +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 C-TYPE: ID2D1Geometry @@ -230,33 +230,33 @@ STRUCT: D2D1_LAYER_PARAMETERS { opacityBrush ID2D1Brush* } { layerOptions D2D1_LAYER_OPTIONS } ; -CONSTANT: D2D1_WINDOW_STATE_NONE HEX: 00000000 -CONSTANT: D2D1_WINDOW_STATE_OCCLUDED HEX: 00000001 -CONSTANT: D2D1_WINDOW_STATE_FORCE_DWORD HEX: ffffffff +CONSTANT: D2D1_WINDOW_STATE_NONE 0x00000000 +CONSTANT: D2D1_WINDOW_STATE_OCCLUDED 0x00000001 +CONSTANT: D2D1_WINDOW_STATE_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_RENDER_TARGET_TYPE_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_RENDER_TARGET_TYPE CONSTANT: D2D1_FEATURE_LEVEL_DEFAULT 0 -CONSTANT: D2D1_FEATURE_LEVEL_9 HEX: 9100 -CONSTANT: D2D1_FEATURE_LEVEL_10 HEX: a000 -CONSTANT: D2D1_FEATURE_LEVEL_FORCE_DWORD HEX: ffffffff +CONSTANT: D2D1_FEATURE_LEVEL_9 0x9100 +CONSTANT: D2D1_FEATURE_LEVEL_10 0xa000 +CONSTANT: D2D1_FEATURE_LEVEL_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_FEATURE_LEVEL -CONSTANT: D2D1_RENDER_TARGET_USAGE_NONE HEX: 00000000 -CONSTANT: D2D1_RENDER_TARGET_USAGE_FORCE_BITMAP_REMOTING HEX: 00000001 -CONSTANT: D2D1_RENDER_TARGET_USAGE_GDI_COMPATIBLE HEX: 00000002 -CONSTANT: D2D1_RENDER_TARGET_USAGE_FORCE_DWORD HEX: ffffffff +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 -CONSTANT: D2D1_PRESENT_OPTIONS_NONE HEX: 00000000 -CONSTANT: D2D1_PRESENT_OPTIONS_RETAIN_CONTENTS HEX: 00000001 -CONSTANT: D2D1_PRESENT_OPTIONS_IMMEDIATELY HEX: 00000002 -CONSTANT: D2D1_PRESENT_OPTIONS_FORCE_DWORD HEX: ffffffff +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 STRUCT: D2D1_RENDER_TARGET_PROPERTIES @@ -272,9 +272,9 @@ STRUCT: D2D1_HWND_RENDER_TARGET_PROPERTIES { pixelSize D2D1_SIZE_U } { presentOptions D2D1_PRESENT_OPTIONS } ; -CONSTANT: D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_NONE HEX: 00000000 -CONSTANT: D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_GDI_COMPATIBLE HEX: 00000001 -CONSTANT: D2D1_COMPATIBLE_RENDER_TARGET_OPTIONS_FORCE_DWORD HEX: ffffffff +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 STRUCT: D2D1_DRAWING_STATE_DESCRIPTION @@ -286,19 +286,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 HEX: ffffffff +CONSTANT: D2D1_DC_INITIALIZE_MODE_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_DEBUG_LEVEL_FORCE_DWORD 0xffffffff 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 HEX: ffffffff +CONSTANT: D2D1_FACTORY_TYPE_FORCE_DWORD 0xffffffff TYPEDEF: int D2D1_FACTORY_TYPE STRUCT: D2D1_FACTORY_OPTIONS diff --git a/basis/windows/directx/d2derr/d2derr.factor b/basis/windows/directx/d2derr/d2derr.factor index 1e5d891aaa..6339e2e2e2 100644 --- a/basis/windows/directx/d2derr/d2derr.factor +++ b/basis/windows/directx/d2derr/d2derr.factor @@ -1,34 +1,34 @@ USING: ; IN: windows.directx.d2derr -CONSTANT: D2DERR_UNSUPPORTED_PIXEL_FORMAT HEX: 88982f80 -CONSTANT: D2DERR_INSUFFICIENT_BUFFER HEX: 80007007a -CONSTANT: D2DERR_WRONG_STATE HEX: 88990001 -CONSTANT: D2DERR_NOT_INITIALIZED HEX: 88990002 -CONSTANT: D2DERR_UNSUPPORTED_OPERATION HEX: 88990003 -CONSTANT: D2DERR_SCANNER_FAILED HEX: 88990004 -CONSTANT: D2DERR_SCREEN_ACCESS_DENIED HEX: 88990005 -CONSTANT: D2DERR_DISPLAY_STATE_INVALID HEX: 88990006 -CONSTANT: D2DERR_ZERO_VECTOR HEX: 88990007 -CONSTANT: D2DERR_INTERNAL_ERROR HEX: 88990008 -CONSTANT: D2DERR_DISPLAY_FORMAT_NOT_SUPPORTED HEX: 88990009 -CONSTANT: D2DERR_INVALID_CALL HEX: 8899000A -CONSTANT: D2DERR_NO_HARDWARE_DEVICE HEX: 8899000B -CONSTANT: D2DERR_RECREATE_TARGET HEX: 8899000C -CONSTANT: D2DERR_TOO_MANY_SHADER_ELEMENTS HEX: 8899000D -CONSTANT: D2DERR_SHADER_COMPILE_FAILED HEX: 8899000E -CONSTANT: D2DERR_MAX_TEXTURE_SIZE_EXCEEDED HEX: 8899000F -CONSTANT: D2DERR_UNSUPPORTED_VERSION HEX: 88990010 -CONSTANT: D2DERR_BAD_NUMBER HEX: 88990011 -CONSTANT: D2DERR_WRONG_FACTORY HEX: 88990012 -CONSTANT: D2DERR_LAYER_ALREADY_IN_USE HEX: 88990013 -CONSTANT: D2DERR_POP_CALL_DID_NOT_MATCH_PUSH HEX: 88990014 -CONSTANT: D2DERR_WRONG_RESOURCE_DOMAIN HEX: 88990015 -CONSTANT: D2DERR_PUSH_POP_UNBALANCED HEX: 88990016 -CONSTANT: D2DERR_RENDER_TARGET_HAS_LAYER_OR_CLIPRECT HEX: 88990017 -CONSTANT: D2DERR_INCOMPATIBLE_BRUSH_TYPES HEX: 88990018 -CONSTANT: D2DERR_WIN32_ERROR HEX: 88990019 -CONSTANT: D2DERR_TARGET_NOT_GDI_COMPATIBLE HEX: 8899001A -CONSTANT: D2DERR_TEXT_EFFECT_IS_WRONG_TYPE HEX: 8899001B -CONSTANT: D2DERR_TEXT_RENDERER_NOT_RELEASED HEX: 8899001C -CONSTANT: D2DERR_EXCEEDS_MAX_BITMAP_SIZE HEX: 8899001D +CONSTANT: D2DERR_UNSUPPORTED_PIXEL_FORMAT 0x88982f80 +CONSTANT: D2DERR_INSUFFICIENT_BUFFER 0x80007007a +CONSTANT: D2DERR_WRONG_STATE 0x88990001 +CONSTANT: D2DERR_NOT_INITIALIZED 0x88990002 +CONSTANT: D2DERR_UNSUPPORTED_OPERATION 0x88990003 +CONSTANT: D2DERR_SCANNER_FAILED 0x88990004 +CONSTANT: D2DERR_SCREEN_ACCESS_DENIED 0x88990005 +CONSTANT: D2DERR_DISPLAY_STATE_INVALID 0x88990006 +CONSTANT: D2DERR_ZERO_VECTOR 0x88990007 +CONSTANT: D2DERR_INTERNAL_ERROR 0x88990008 +CONSTANT: D2DERR_DISPLAY_FORMAT_NOT_SUPPORTED 0x88990009 +CONSTANT: D2DERR_INVALID_CALL 0x8899000A +CONSTANT: D2DERR_NO_HARDWARE_DEVICE 0x8899000B +CONSTANT: D2DERR_RECREATE_TARGET 0x8899000C +CONSTANT: D2DERR_TOO_MANY_SHADER_ELEMENTS 0x8899000D +CONSTANT: D2DERR_SHADER_COMPILE_FAILED 0x8899000E +CONSTANT: D2DERR_MAX_TEXTURE_SIZE_EXCEEDED 0x8899000F +CONSTANT: D2DERR_UNSUPPORTED_VERSION 0x88990010 +CONSTANT: D2DERR_BAD_NUMBER 0x88990011 +CONSTANT: D2DERR_WRONG_FACTORY 0x88990012 +CONSTANT: D2DERR_LAYER_ALREADY_IN_USE 0x88990013 +CONSTANT: D2DERR_POP_CALL_DID_NOT_MATCH_PUSH 0x88990014 +CONSTANT: D2DERR_WRONG_RESOURCE_DOMAIN 0x88990015 +CONSTANT: D2DERR_PUSH_POP_UNBALANCED 0x88990016 +CONSTANT: D2DERR_RENDER_TARGET_HAS_LAYER_OR_CLIPRECT 0x88990017 +CONSTANT: D2DERR_INCOMPATIBLE_BRUSH_TYPES 0x88990018 +CONSTANT: D2DERR_WIN32_ERROR 0x88990019 +CONSTANT: D2DERR_TARGET_NOT_GDI_COMPATIBLE 0x8899001A +CONSTANT: D2DERR_TEXT_EFFECT_IS_WRONG_TYPE 0x8899001B +CONSTANT: D2DERR_TEXT_RENDERER_NOT_RELEASED 0x8899001C +CONSTANT: D2DERR_EXCEEDS_MAX_BITMAP_SIZE 0x8899001D diff --git a/basis/windows/directx/d3d10/d3d10.factor b/basis/windows/directx/d3d10/d3d10.factor index cd9bf58405..2c97b7365d 100644 --- a/basis/windows/directx/d3d10/d3d10.factor +++ b/basis/windows/directx/d3d10/d3d10.factor @@ -5,9 +5,9 @@ IN: windows.directx.d3d10 LIBRARY: d3d10 -CONSTANT: D3D10_16BIT_INDEX_STRIP_CUT_VALUE HEX: ffff -CONSTANT: D3D10_32BIT_INDEX_STRIP_CUT_VALUE HEX: ffffffff -CONSTANT: D3D10_8BIT_INDEX_STRIP_CUT_VALUE HEX: ff +CONSTANT: D3D10_16BIT_INDEX_STRIP_CUT_VALUE 0xffff +CONSTANT: D3D10_32BIT_INDEX_STRIP_CUT_VALUE 0xffffffff +CONSTANT: D3D10_8BIT_INDEX_STRIP_CUT_VALUE 0xff CONSTANT: D3D10_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT 9 CONSTANT: D3D10_CLIP_OR_CULL_DISTANCE_COUNT 8 CONSTANT: D3D10_CLIP_OR_CULL_DISTANCE_ELEMENT_COUNT 2 @@ -55,15 +55,15 @@ CONSTANT: D3D10_DEFAULT_DEPTH_BIAS_CLAMP 0 CONSTANT: D3D10_DEFAULT_MAX_ANISOTROPY 16.0 CONSTANT: D3D10_DEFAULT_MIP_LOD_BIAS 0.0 CONSTANT: D3D10_DEFAULT_RENDER_TARGET_ARRAY_INDEX 0 -CONSTANT: D3D10_DEFAULT_SAMPLE_MASK HEX: ffffffff +CONSTANT: D3D10_DEFAULT_SAMPLE_MASK 0xffffffff CONSTANT: D3D10_DEFAULT_SCISSOR_ENDX 0 CONSTANT: D3D10_DEFAULT_SCISSOR_ENDY 0 CONSTANT: D3D10_DEFAULT_SCISSOR_STARTX 0 CONSTANT: D3D10_DEFAULT_SCISSOR_STARTY 0 CONSTANT: D3D10_DEFAULT_SLOPE_SCALED_DEPTH_BIAS 0.0 -CONSTANT: D3D10_DEFAULT_STENCIL_READ_MASK HEX: ff +CONSTANT: D3D10_DEFAULT_STENCIL_READ_MASK 0xff CONSTANT: D3D10_DEFAULT_STENCIL_REFERENCE 0 -CONSTANT: D3D10_DEFAULT_STENCIL_WRITE_MASK HEX: ff +CONSTANT: D3D10_DEFAULT_STENCIL_WRITE_MASK 0xff CONSTANT: D3D10_DEFAULT_VIEWPORT_AND_SCISSORRECT_INDEX 0 CONSTANT: D3D10_DEFAULT_VIEWPORT_HEIGHT 0 CONSTANT: D3D10_DEFAULT_VIEWPORT_MAX_DEPTH 0.0 @@ -110,8 +110,8 @@ CONSTANT: D3D10_IA_VERTEX_ID_BIT_COUNT 3 CONSTANT: D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT 16 CONSTANT: D3D10_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS 64 CONSTANT: D3D10_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT 16 -CONSTANT: D3D10_INTEGER_DIVIDE_BY_ZERO_QUOTIENT HEX: ffffffff -CONSTANT: D3D10_INTEGER_DIVIDE_BY_ZERO_REMAINDER HEX: ffffffff +CONSTANT: D3D10_INTEGER_DIVIDE_BY_ZERO_QUOTIENT 0xffffffff +CONSTANT: D3D10_INTEGER_DIVIDE_BY_ZERO_REMAINDER 0xffffffff CONSTANT: D3D10_LINEAR_GAMMA 1.0 CONSTANT: D3D10_MAX_BORDER_COLOR_COMPONENT 1.0 CONSTANT: D3D10_MAX_DEPTH 1.0 @@ -130,9 +130,9 @@ CONSTANT: D3D10_MULTISAMPLE_ANTIALIAS_LINE_WIDTH 1 CONSTANT: D3D10_NONSAMPLE_FETCH_OUT_OF_RANGE_ACCESS_RESULT 0 CONSTANT: D3D10_PIXEL_ADDRESS_RANGE_BIT_COUNT 13 CONSTANT: D3D10_PRE_SCISSOR_PIXEL_ADDRESS_RANGE_BIT_COUNT 15 -CONSTANT: D3D10_PS_FRONTFACING_DEFAULT_VALUE HEX: ffffffff +CONSTANT: D3D10_PS_FRONTFACING_DEFAULT_VALUE 0xffffffff CONSTANT: D3D10_PS_FRONTFACING_FALSE_VALUE 0 -CONSTANT: D3D10_PS_FRONTFACING_TRUE_VALUE HEX: ffffffff +CONSTANT: D3D10_PS_FRONTFACING_TRUE_VALUE 0xffffffff CONSTANT: D3D10_PS_INPUT_REGISTER_COMPONENTS 4 CONSTANT: D3D10_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT 32 CONSTANT: D3D10_PS_INPUT_REGISTER_COUNT 32 @@ -178,7 +178,7 @@ CONSTANT: D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT 8 CONSTANT: D3D10_SO_BUFFER_MAX_STRIDE_IN_BYTES 2048 CONSTANT: D3D10_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES 256 CONSTANT: D3D10_SO_BUFFER_SLOT_COUNT 4 -CONSTANT: D3D10_SO_DDI_REGISTER_INDEX_DENOTING_GAP HEX: ffffffff +CONSTANT: D3D10_SO_DDI_REGISTER_INDEX_DENOTING_GAP 0xffffffff CONSTANT: D3D10_SO_MULTIPLE_BUFFER_ELEMENTS_PER_BUFFER 1 CONSTANT: D3D10_SO_SINGLE_BUFFER_COMPONENT_LIMIT 64 CONSTANT: D3D10_SRGB_GAMMA 2.2 @@ -225,17 +225,17 @@ CONSTANT: D3D_SPEC_VERSION 1 CONSTANT: D3D10_1_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT 16 CONSTANT: D3D10_1_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT 16 -CONSTANT: _FACD3D10 HEX: 879 -CONSTANT: _FACD3D10DEBUG HEX: 87A +CONSTANT: _FACD3D10 0x879 +CONSTANT: _FACD3D10DEBUG 0x87A -CONSTANT: D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS HEX: 88790001 -CONSTANT: D3D10_ERROR_FILE_NOT_FOUND HEX: 88790002 +CONSTANT: D3D10_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS 0x88790001 +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 -CONSTANT: D3D10_APPEND_ALIGNED_ELEMENT HEX: ffffffff +CONSTANT: D3D10_APPEND_ALIGNED_ELEMENT 0xffffffff STRUCT: D3D10_INPUT_ELEMENT_DESC { SemanticName LPCSTR } @@ -335,24 +335,24 @@ CONSTANT: D3D10_USAGE_DYNAMIC 2 CONSTANT: D3D10_USAGE_STAGING 3 TYPEDEF: int D3D10_USAGE -CONSTANT: D3D10_BIND_VERTEX_BUFFER HEX: 1 -CONSTANT: D3D10_BIND_INDEX_BUFFER HEX: 2 -CONSTANT: D3D10_BIND_CONSTANT_BUFFER HEX: 4 -CONSTANT: D3D10_BIND_SHADER_RESOURCE HEX: 8 -CONSTANT: D3D10_BIND_STREAM_OUTPUT HEX: 10 -CONSTANT: D3D10_BIND_RENDER_TARGET HEX: 20 -CONSTANT: D3D10_BIND_DEPTH_STENCIL HEX: 40 +CONSTANT: D3D10_BIND_VERTEX_BUFFER 0x1 +CONSTANT: D3D10_BIND_INDEX_BUFFER 0x2 +CONSTANT: D3D10_BIND_CONSTANT_BUFFER 0x4 +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 -CONSTANT: D3D10_CPU_ACCESS_WRITE HEX: 10000 -CONSTANT: D3D10_CPU_ACCESS_READ HEX: 20000 +CONSTANT: D3D10_CPU_ACCESS_WRITE 0x10000 +CONSTANT: D3D10_CPU_ACCESS_READ 0x20000 TYPEDEF: int D3D10_CPU_ACCESS_FLAG -CONSTANT: D3D10_RESOURCE_MISC_GENERATE_MIPS HEX: 1 -CONSTANT: D3D10_RESOURCE_MISC_SHARED HEX: 2 -CONSTANT: D3D10_RESOURCE_MISC_TEXTURECUBE HEX: 4 -CONSTANT: D3D10_RESOURCE_MISC_SHARED_KEYEDMUTEX HEX: 10 -CONSTANT: D3D10_RESOURCE_MISC_GDI_COMPATIBLE HEX: 20 +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 CONSTANT: D3D10_MAP_READ 1 @@ -362,14 +362,14 @@ CONSTANT: D3D10_MAP_WRITE_DISCARD 4 CONSTANT: D3D10_MAP_WRITE_NO_OVERWRITE 5 TYPEDEF: int D3D10_MAP -CONSTANT: D3D10_MAP_FLAG_DO_NOT_WAIT HEX: 100000 +CONSTANT: D3D10_MAP_FLAG_DO_NOT_WAIT 0x100000 TYPEDEF: int D3D10_MAP_FLAG -CONSTANT: D3D10_RAISE_FLAG_DRIVER_INTERNAL_ERROR HEX: 1 +CONSTANT: D3D10_RAISE_FLAG_DRIVER_INTERNAL_ERROR 0x1 TYPEDEF: int D3D10_RAISE_FLAG -CONSTANT: D3D10_CLEAR_DEPTH HEX: 1 -CONSTANT: D3D10_CLEAR_STENCIL HEX: 2 +CONSTANT: D3D10_CLEAR_DEPTH 0x1 +CONSTANT: D3D10_CLEAR_STENCIL 0x2 TYPEDEF: int D3D10_CLEAR_FLAG TYPEDEF: RECT D3D10_RECT @@ -757,37 +757,37 @@ COM-INTERFACE: ID3D10PixelShader ID3D10DeviceChild {68B601-9D00-4cde-8346-8E7F67 COM-INTERFACE: ID3D10InputLayout ID3D10DeviceChild {7E4C0B-342C-4106-A19F-4F2704F689F0} ; CONSTANT: D3D10_FILTER_MIN_MAG_MIP_POINT 0 -CONSTANT: D3D10_FILTER_MIN_MAG_POINT_MIP_LINEAR HEX: 1 -CONSTANT: D3D10_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT HEX: 4 -CONSTANT: D3D10_FILTER_MIN_POINT_MAG_MIP_LINEAR HEX: 5 -CONSTANT: D3D10_FILTER_MIN_LINEAR_MAG_MIP_POINT HEX: 10 -CONSTANT: D3D10_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR HEX: 11 -CONSTANT: D3D10_FILTER_MIN_MAG_LINEAR_MIP_POINT HEX: 14 -CONSTANT: D3D10_FILTER_MIN_MAG_MIP_LINEAR HEX: 15 -CONSTANT: D3D10_FILTER_ANISOTROPIC HEX: 55 -CONSTANT: D3D10_FILTER_COMPARISON_MIN_MAG_MIP_POINT HEX: 80 -CONSTANT: D3D10_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR HEX: 81 -CONSTANT: D3D10_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT HEX: 84 -CONSTANT: D3D10_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR HEX: 85 -CONSTANT: D3D10_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT HEX: 90 -CONSTANT: D3D10_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR HEX: 91 -CONSTANT: D3D10_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT HEX: 94 -CONSTANT: D3D10_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR HEX: 95 -CONSTANT: D3D10_FILTER_COMPARISON_ANISOTROPIC HEX: d5 -CONSTANT: D3D10_FILTER_TEXT_1BIT HEX: 80000000 +CONSTANT: D3D10_FILTER_MIN_MAG_POINT_MIP_LINEAR 0x1 +CONSTANT: D3D10_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT 0x4 +CONSTANT: D3D10_FILTER_MIN_POINT_MAG_MIP_LINEAR 0x5 +CONSTANT: D3D10_FILTER_MIN_LINEAR_MAG_MIP_POINT 0x10 +CONSTANT: D3D10_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR 0x11 +CONSTANT: D3D10_FILTER_MIN_MAG_LINEAR_MIP_POINT 0x14 +CONSTANT: D3D10_FILTER_MIN_MAG_MIP_LINEAR 0x15 +CONSTANT: D3D10_FILTER_ANISOTROPIC 0x55 +CONSTANT: D3D10_FILTER_COMPARISON_MIN_MAG_MIP_POINT 0x80 +CONSTANT: D3D10_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR 0x81 +CONSTANT: D3D10_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT 0x84 +CONSTANT: D3D10_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR 0x85 +CONSTANT: D3D10_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT 0x90 +CONSTANT: D3D10_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR 0x91 +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 CONSTANT: D3D10_FILTER_TYPE_POINT 0 CONSTANT: D3D10_FILTER_TYPE_LINEAR 1 TYPEDEF: int D3D10_FILTER_TYPE -CONSTANT: D3D10_FILTER_TYPE_MASK HEX: 3 +CONSTANT: D3D10_FILTER_TYPE_MASK 0x3 CONSTANT: D3D10_MIN_FILTER_SHIFT 4 CONSTANT: D3D10_MAG_FILTER_SHIFT 2 CONSTANT: D3D10_MIP_FILTER_SHIFT 0 -CONSTANT: D3D10_COMPARISON_FILTERING_BIT HEX: 80 -CONSTANT: D3D10_ANISOTROPIC_FILTERING_BIT HEX: 40 -CONSTANT: D3D10_TEXT_1BIT_BIT HEX: 80000000 +CONSTANT: D3D10_COMPARISON_FILTERING_BIT 0x80 +CONSTANT: D3D10_ANISOTROPIC_FILTERING_BIT 0x40 +CONSTANT: D3D10_TEXT_1BIT_BIT 0x80000000 CONSTANT: D3D10_TEXTURE_ADDRESS_WRAP 1 CONSTANT: D3D10_TEXTURE_ADDRESS_MIRROR 2 @@ -812,31 +812,31 @@ TYPEDEF: D3D10_SAMPLER_DESC D3D10SAMPLER_DESC COM-INTERFACE: ID3D10SamplerState ID3D10DeviceChild {9B7E4C0C-342C-4106-A19F-4F2704F689F0} void GetDesc ( D3D10SAMPLER_DESC* pDesc ) ; -CONSTANT: D3D10_FORMAT_SUPPORT_BUFFER HEX: 1 -CONSTANT: D3D10_FORMAT_SUPPORT_IA_VERTEX_BUFFER HEX: 2 -CONSTANT: D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER HEX: 4 -CONSTANT: D3D10_FORMAT_SUPPORT_SO_BUFFER HEX: 8 -CONSTANT: D3D10_FORMAT_SUPPORT_TEXTURE1D HEX: 10 -CONSTANT: D3D10_FORMAT_SUPPORT_TEXTURE2D HEX: 20 -CONSTANT: D3D10_FORMAT_SUPPORT_TEXTURE3D HEX: 40 -CONSTANT: D3D10_FORMAT_SUPPORT_TEXTURECUBE HEX: 80 -CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_LOAD HEX: 100 -CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_SAMPLE HEX: 200 -CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON HEX: 400 -CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT HEX: 800 -CONSTANT: D3D10_FORMAT_SUPPORT_MIP HEX: 1000 -CONSTANT: D3D10_FORMAT_SUPPORT_MIP_AUTOGEN HEX: 2000 -CONSTANT: D3D10_FORMAT_SUPPORT_RENDER_TARGET HEX: 4000 -CONSTANT: D3D10_FORMAT_SUPPORT_BLENDABLE HEX: 8000 -CONSTANT: D3D10_FORMAT_SUPPORT_DEPTH_STENCIL HEX: 10000 -CONSTANT: D3D10_FORMAT_SUPPORT_CPU_LOCKABLE HEX: 20000 -CONSTANT: D3D10_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE HEX: 40000 -CONSTANT: D3D10_FORMAT_SUPPORT_DISPLAY HEX: 80000 -CONSTANT: D3D10_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT HEX: 100000 -CONSTANT: D3D10_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET HEX: 200000 -CONSTANT: D3D10_FORMAT_SUPPORT_MULTISAMPLE_LOAD HEX: 400000 -CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_GATHER HEX: 800000 -CONSTANT: D3D10_FORMAT_SUPPORT_BACK_BUFFER_CAST HEX: 100000 +CONSTANT: D3D10_FORMAT_SUPPORT_BUFFER 0x1 +CONSTANT: D3D10_FORMAT_SUPPORT_IA_VERTEX_BUFFER 0x2 +CONSTANT: D3D10_FORMAT_SUPPORT_IA_INDEX_BUFFER 0x4 +CONSTANT: D3D10_FORMAT_SUPPORT_SO_BUFFER 0x8 +CONSTANT: D3D10_FORMAT_SUPPORT_TEXTURE1D 0x10 +CONSTANT: D3D10_FORMAT_SUPPORT_TEXTURE2D 0x20 +CONSTANT: D3D10_FORMAT_SUPPORT_TEXTURE3D 0x40 +CONSTANT: D3D10_FORMAT_SUPPORT_TEXTURECUBE 0x80 +CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_LOAD 0x100 +CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_SAMPLE 0x200 +CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON 0x400 +CONSTANT: D3D10_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT 0x800 +CONSTANT: D3D10_FORMAT_SUPPORT_MIP 0x1000 +CONSTANT: D3D10_FORMAT_SUPPORT_MIP_AUTOGEN 0x2000 +CONSTANT: D3D10_FORMAT_SUPPORT_RENDER_TARGET 0x4000 +CONSTANT: D3D10_FORMAT_SUPPORT_BLENDABLE 0x8000 +CONSTANT: D3D10_FORMAT_SUPPORT_DEPTH_STENCIL 0x10000 +CONSTANT: D3D10_FORMAT_SUPPORT_CPU_LOCKABLE 0x20000 +CONSTANT: D3D10_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE 0x40000 +CONSTANT: D3D10_FORMAT_SUPPORT_DISPLAY 0x80000 +CONSTANT: D3D10_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT 0x100000 +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 COM-INTERFACE: ID3D10Asynchronous ID3D10DeviceChild {9B7E4C0D-342C-4106-A19F-4F2704F689F0} @@ -906,7 +906,7 @@ CONSTANT: D3D10_COUNTER_PS_MEMORY_LIMITED 14 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 HEX: 40000000 +CONSTANT: D3D10_COUNTER_DEVICE_DEPENDENT_0 0x40000000 TYPEDEF: int D3D10_COUNTER CONSTANT: D3D10_COUNTER_TYPE_FLOAT32 0 @@ -1030,23 +1030,23 @@ COM-INTERFACE: ID3D10Multithread IUnknown {9B7E4E00-342C-4106-A19F-4F2704F689F0} BOOL SetMultithreadProtected ( BOOL bMTProtect ) BOOL GetMultithreadProtected ( ) ; -CONSTANT: D3D10_CREATE_DEVICE_SINGLETHREADED HEX: 1 -CONSTANT: D3D10_CREATE_DEVICE_DEBUG HEX: 2 -CONSTANT: D3D10_CREATE_DEVICE_SWITCH_TO_REF HEX: 4 -CONSTANT: D3D10_CREATE_DEVICE_PREVENT_INTERNAL_THREADING_OPTIMIZATIONS HEX: 8 -CONSTANT: D3D10_CREATE_DEVICE_ALLOW_NULL_FROM_MAP HEX: 10 -CONSTANT: D3D10_CREATE_DEVICE_BGRA_SUPPORT HEX: 20 -CONSTANT: D3D10_CREATE_DEVICE_STRICT_VALIDATION HEX: 200 +CONSTANT: D3D10_CREATE_DEVICE_SINGLETHREADED 0x1 +CONSTANT: D3D10_CREATE_DEVICE_DEBUG 0x2 +CONSTANT: D3D10_CREATE_DEVICE_SWITCH_TO_REF 0x4 +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 CONSTANT: D3D10_SDK_VERSION 29 -CONSTANT: D3DX10_ERR_CANNOT_MODIFY_INDEX_BUFFER HEX: 88760B54 -CONSTANT: D3DX10_ERR_INVALID_MESH HEX: 88760B55 -CONSTANT: D3DX10_ERR_CANNOT_ATTR_SORT HEX: 88760B56 -CONSTANT: D3DX10_ERR_SKINNING_NOT_SUPPORTED HEX: 88760B57 -CONSTANT: D3DX10_ERR_TOO_MANY_INFLUENCES HEX: 88760B58 -CONSTANT: D3DX10_ERR_INVALID_DATA HEX: 88760B59 -CONSTANT: D3DX10_ERR_LOADED_MESH_HAS_NO_DATA HEX: 88760B5A -CONSTANT: D3DX10_ERR_DUPLICATE_NAMED_FRAGMENT HEX: 88760B5B -CONSTANT: D3DX10_ERR_CANNOT_REMOVE_LAST_ITEM HEX: 88760B5C +CONSTANT: D3DX10_ERR_CANNOT_MODIFY_INDEX_BUFFER 0x88760B54 +CONSTANT: D3DX10_ERR_INVALID_MESH 0x88760B55 +CONSTANT: D3DX10_ERR_CANNOT_ATTR_SORT 0x88760B56 +CONSTANT: D3DX10_ERR_SKINNING_NOT_SUPPORTED 0x88760B57 +CONSTANT: D3DX10_ERR_TOO_MANY_INFLUENCES 0x88760B58 +CONSTANT: D3DX10_ERR_INVALID_DATA 0x88760B59 +CONSTANT: D3DX10_ERR_LOADED_MESH_HAS_NO_DATA 0x88760B5A +CONSTANT: D3DX10_ERR_DUPLICATE_NAMED_FRAGMENT 0x88760B5B +CONSTANT: D3DX10_ERR_CANNOT_REMOVE_LAST_ITEM 0x88760B5C diff --git a/basis/windows/directx/d3d10_1/d3d10_1.factor b/basis/windows/directx/d3d10_1/d3d10_1.factor index d3281b02b4..3c34f3223a 100644 --- a/basis/windows/directx/d3d10_1/d3d10_1.factor +++ b/basis/windows/directx/d3d10_1/d3d10_1.factor @@ -6,7 +6,7 @@ IN: windows.directx.d3d10_1 LIBRARY: d3d10_1 -CONSTANT: D3D10_1_DEFAULT_SAMPLE_MASK HEX: ffffffff +CONSTANT: D3D10_1_DEFAULT_SAMPLE_MASK 0xffffffff CONSTANT: D3D10_1_FLOAT16_FUSED_TOLERANCE_IN_ULP 0.6 CONSTANT: D3D10_1_FLOAT32_TO_INTEGER_TOLERANCE_IN_ULP 0.6 CONSTANT: D3D10_1_GS_INPUT_REGISTER_COUNT 32 @@ -28,11 +28,11 @@ CONSTANT: D3D10_1_SUBPIXEL_FRACTIONAL_BIT_COUNT 8 CONSTANT: D3D10_1_VS_INPUT_REGISTER_COUNT 32 CONSTANT: D3D10_1_VS_OUTPUT_REGISTER_COUNT 32 -CONSTANT: D3D10_FEATURE_LEVEL_10_0 HEX: a000 -CONSTANT: D3D10_FEATURE_LEVEL_10_1 HEX: a100 -CONSTANT: D3D10_FEATURE_LEVEL_9_1 HEX: 9100 -CONSTANT: D3D10_FEATURE_LEVEL_9_2 HEX: 9200 -CONSTANT: D3D10_FEATURE_LEVEL_9_3 HEX: 9300 +CONSTANT: D3D10_FEATURE_LEVEL_10_0 0xa000 +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 STRUCT: D3D10_RENDER_TARGET_BLEND_DESC1 @@ -91,8 +91,8 @@ STRUCT: D3D10_SHADER_RESOURCE_VIEW_DESC1 COM-INTERFACE: ID3D10ShaderResourceView1 ID3D10ShaderResourceView {9B7E4C87-342C-4106-A19F-4F2704F689F0} void GetDesc1 ( D3D10_SHADER_RESOURCE_VIEW_DESC1* pDesc ) ; -CONSTANT: D3D10_STANDARD_MULTISAMPLE_PATTERN HEX: ffffffff -CONSTANT: D3D10_CENTER_MULTISAMPLE_PATTERN HEX: fffffffe +CONSTANT: D3D10_STANDARD_MULTISAMPLE_PATTERN 0xffffffff +CONSTANT: D3D10_CENTER_MULTISAMPLE_PATTERN 0xfffffffe TYPEDEF: int D3D10_STANDARD_MULTISAMPLE_QUALITY_LEVELS COM-INTERFACE: ID3D10Device1 ID3D10Device {9B7E4C8F-342C-4106-A19F-4F2704F689F0} @@ -105,7 +105,7 @@ COM-INTERFACE: ID3D10Device1 ID3D10Device {9B7E4C8F-342C-4106-A19F-4F2704F689F0} ID3D10BlendState1** ppBlendState ) D3D10_FEATURE_LEVEL1 GetFeatureLevel ( ) ; -CONSTANT: D3D10_1_SDK_VERSION HEX: 20 +CONSTANT: D3D10_1_SDK_VERSION 0x20 FUNCTION: HRESULT D3D10CreateDevice1 ( IDXGIAdapter* pAdapter, diff --git a/basis/windows/directx/d3d10_1shader/d3d10_1shader.factor b/basis/windows/directx/d3d10_1shader/d3d10_1shader.factor index 03a390155a..06c151cc1b 100644 --- a/basis/windows/directx/d3d10_1shader/d3d10_1shader.factor +++ b/basis/windows/directx/d3d10_1shader/d3d10_1shader.factor @@ -17,7 +17,7 @@ CONSTANT: D3D10_SHADER_DEBUG_REG_IMMEDIATECBUFFER 8 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 HEX: 7fffffff +CONSTANT: D3D10_SHADER_DEBUG_REG_FORCE_DWORD 0x7fffffff TYPEDEF: int D3D10_SHADER_DEBUG_REGTYPE CONSTANT: D3D10_SHADER_DEBUG_SCOPE_GLOBAL 0 @@ -28,12 +28,12 @@ CONSTANT: D3D10_SHADER_DEBUG_SCOPE_FUNC_PARAMS 4 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 HEX: 7fffffff +CONSTANT: D3D10_SHADER_DEBUG_SCOPE_FORCE_DWORD 0x7fffffff 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 HEX: 7fffffff +CONSTANT: D3D10_SHADER_DEBUG_VAR_FORCE_DWORD 0x7fffffff TYPEDEF: int D3D10_SHADER_DEBUG_VARTYPE STRUCT: D3D10_SHADER_DEBUG_TOKEN_INFO diff --git a/basis/windows/directx/d3d10shader/d3d10shader.factor b/basis/windows/directx/d3d10shader/d3d10shader.factor index a4c0899760..a4fed72af9 100644 --- a/basis/windows/directx/d3d10shader/d3d10shader.factor +++ b/basis/windows/directx/d3d10shader/d3d10shader.factor @@ -39,14 +39,14 @@ CONSTANT: D3D10_SVC_OBJECT 4 CONSTANT: D3D10_SVC_STRUCT 5 CONSTANT: D3D11_SVC_INTERFACE_CLASS 6 CONSTANT: D3D11_SVC_INTERFACE_POINTER 7 -CONSTANT: D3D10_SVC_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3D10_SVC_FORCE_DWORD 0x7fffffff 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 HEX: 7fffffff +CONSTANT: D3D10_SVF_FORCE_DWORD 0x7fffffff TYPEDEF: int D3D10_SHADER_VARIABLE_FLAGS TYPEDEF: D3D10_SHADER_VARIABLE_FLAGS* LPD3D10_SHADER_VARIABLE_FLAGS @@ -84,7 +84,7 @@ CONSTANT: D3D11_SVT_DOMAINSHADER 36 CONSTANT: D3D11_SVT_INTERFACE_POINTER 37 CONSTANT: D3D11_SVT_COMPUTESHADER 38 CONSTANT: D3D11_SVT_DOUBLE 39 -CONSTANT: D3D10_SVT_FORCE_DWORD HEX: 7ffffff +CONSTANT: D3D10_SVT_FORCE_DWORD 0x7ffffff TYPEDEF: int D3D10_SHADER_VARIABLE_TYPE TYPEDEF: D3D10_SHADER_VARIABLE_TYPE* LPD3D10_SHADER_VARIABLE_TYPE @@ -93,7 +93,7 @@ CONSTANT: D3D10_SIF_COMPARISON_SAMPLER 2 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 HEX: 7ffffff +CONSTANT: D3D10_SIF_FORCE_DWORD 0x7ffffff TYPEDEF: int D3D10_SHADER_INPUT_FLAGS TYPEDEF: D3D10_SHADER_INPUT_FLAGS* LPD3D10_SHADER_INPUT_FLAGS @@ -113,7 +113,7 @@ 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 HEX: 7fffffff +CONSTANT: D3D10_CBF_FORCE_DWORD 0x7fffffff TYPEDEF: int D3D10_SHADER_CBUFFER_FLAGS TYPEDEF: D3D10_SHADER_CBUFFER_FLAGS* LPD3D10_SHADER_CBUFFER_FLAGS @@ -162,7 +162,7 @@ TYPEDEF: int D3D10_REGISTER_COMPONENT_TYPE CONSTANT: D3D10_INCLUDE_LOCAL 0 CONSTANT: D3D10_INCLUDE_SYSTEM 1 -CONSTANT: D3D10_INCLUDE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3D10_INCLUDE_FORCE_DWORD 0x7fffffff TYPEDEF: int D3D10_INCLUDE_TYPE TYPEDEF: D3D10_INCLUDE_TYPE* LPD3D10_INCLUDE_TYPE diff --git a/basis/windows/directx/d3d11/d3d11.factor b/basis/windows/directx/d3d11/d3d11.factor index 29cbbad1bb..b41e4df44c 100644 --- a/basis/windows/directx/d3d11/d3d11.factor +++ b/basis/windows/directx/d3d11/d3d11.factor @@ -6,9 +6,9 @@ IN: windows.directx.d3d11 LIBRARY: d3d11 -CONSTANT: D3D11_16BIT_INDEX_STRIP_CUT_VALUE HEX: ffff -CONSTANT: D3D11_32BIT_INDEX_STRIP_CUT_VALUE HEX: ffffffff -CONSTANT: D3D11_8BIT_INDEX_STRIP_CUT_VALUE HEX: ff +CONSTANT: D3D11_16BIT_INDEX_STRIP_CUT_VALUE 0xffff +CONSTANT: D3D11_32BIT_INDEX_STRIP_CUT_VALUE 0xffffffff +CONSTANT: D3D11_8BIT_INDEX_STRIP_CUT_VALUE 0xff CONSTANT: D3D11_ARRAY_AXIS_ADDRESS_RANGE_BIT_COUNT 9 @@ -109,15 +109,15 @@ CONSTANT: D3D11_DEFAULT_DEPTH_BIAS_CLAMP 0.0 CONSTANT: D3D11_DEFAULT_MAX_ANISOTROPY 16 CONSTANT: D3D11_DEFAULT_MIP_LOD_BIAS 0.0 CONSTANT: D3D11_DEFAULT_RENDER_TARGET_ARRAY_INDEX 0 -CONSTANT: D3D11_DEFAULT_SAMPLE_MASK HEX: ffffffff +CONSTANT: D3D11_DEFAULT_SAMPLE_MASK 0xffffffff CONSTANT: D3D11_DEFAULT_SCISSOR_ENDX 0 CONSTANT: D3D11_DEFAULT_SCISSOR_ENDY 0 CONSTANT: D3D11_DEFAULT_SCISSOR_STARTX 0 CONSTANT: D3D11_DEFAULT_SCISSOR_STARTY 0 CONSTANT: D3D11_DEFAULT_SLOPE_SCALED_DEPTH_BIAS 0.0 -CONSTANT: D3D11_DEFAULT_STENCIL_READ_MASK HEX: ff +CONSTANT: D3D11_DEFAULT_STENCIL_READ_MASK 0xff CONSTANT: D3D11_DEFAULT_STENCIL_REFERENCE 0 -CONSTANT: D3D11_DEFAULT_STENCIL_WRITE_MASK HEX: ff +CONSTANT: D3D11_DEFAULT_STENCIL_WRITE_MASK 0xff CONSTANT: D3D11_DEFAULT_VIEWPORT_AND_SCISSORRECT_INDEX 0 CONSTANT: D3D11_DEFAULT_VIEWPORT_HEIGHT 0 CONSTANT: D3D11_DEFAULT_VIEWPORT_MAX_DEPTH 0.0 @@ -190,7 +190,7 @@ CONSTANT: D3D11_HS_CONTROL_POINT_REGISTER_COMPONENTS 4 CONSTANT: D3D11_HS_CONTROL_POINT_REGISTER_COMPONENT_BIT_COUNT 32 CONSTANT: D3D11_HS_CONTROL_POINT_REGISTER_READS_PER_INST 2 CONSTANT: D3D11_HS_CONTROL_POINT_REGISTER_READ_PORTS 1 -CONSTANT: D3D11_HS_FORK_PHASE_INSTANCE_COUNT_UPPER_BOUND HEX: ffffffff +CONSTANT: D3D11_HS_FORK_PHASE_INSTANCE_COUNT_UPPER_BOUND 0xffffffff CONSTANT: D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENTS 1 CONSTANT: D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COMPONENT_BIT_COUNT 32 CONSTANT: D3D11_HS_INPUT_FORK_INSTANCE_ID_REGISTER_COUNT 1 @@ -206,7 +206,7 @@ CONSTANT: D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COMPONENT_BIT_COUNT 32 CONSTANT: D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_COUNT 1 CONSTANT: D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READS_PER_INST 2 CONSTANT: D3D11_HS_INPUT_PRIMITIVE_ID_REGISTER_READ_PORTS 1 -CONSTANT: D3D11_HS_JOIN_PHASE_INSTANCE_COUNT_UPPER_BOUND HEX: ffffffff +CONSTANT: D3D11_HS_JOIN_PHASE_INSTANCE_COUNT_UPPER_BOUND 0xffffffff CONSTANT: D3D11_HS_MAXTESSFACTOR_LOWER_BOUND 1.0 CONSTANT: D3D11_HS_MAXTESSFACTOR_UPPER_BOUND 64.0 CONSTANT: D3D11_HS_OUTPUT_CONTROL_POINTS_MAX_TOTAL_SCALARS 3968 @@ -234,11 +234,11 @@ CONSTANT: D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT 32 CONSTANT: D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENTS_COMPONENTS 128 CONSTANT: D3D11_IA_VERTEX_INPUT_STRUCTURE_ELEMENT_COUNT 32 -CONSTANT: D3D11_INTEGER_DIVIDE_BY_ZERO_QUOTIENT HEX: ffffffff -CONSTANT: D3D11_INTEGER_DIVIDE_BY_ZERO_REMAINDER HEX: ffffffff +CONSTANT: D3D11_INTEGER_DIVIDE_BY_ZERO_QUOTIENT 0xffffffff +CONSTANT: D3D11_INTEGER_DIVIDE_BY_ZERO_REMAINDER 0xffffffff -CONSTANT: D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL HEX: ffffffff -CONSTANT: D3D11_KEEP_UNORDERED_ACCESS_VIEWS HEX: ffffffff +CONSTANT: D3D11_KEEP_RENDER_TARGETS_AND_DEPTH_STENCIL 0xffffffff +CONSTANT: D3D11_KEEP_UNORDERED_ACCESS_VIEWS 0xffffffff CONSTANT: D3D11_LINEAR_GAMMA 1.0 @@ -273,9 +273,9 @@ CONSTANT: D3D11_PS_CS_UAV_REGISTER_COMPONENTS 1 CONSTANT: D3D11_PS_CS_UAV_REGISTER_COUNT 8 CONSTANT: D3D11_PS_CS_UAV_REGISTER_READS_PER_INST 1 CONSTANT: D3D11_PS_CS_UAV_REGISTER_READ_PORTS 1 -CONSTANT: D3D11_PS_FRONTFACING_DEFAULT_VALUE HEX: ffffffff +CONSTANT: D3D11_PS_FRONTFACING_DEFAULT_VALUE 0xffffffff CONSTANT: D3D11_PS_FRONTFACING_FALSE_VALUE 0 -CONSTANT: D3D11_PS_FRONTFACING_TRUE_VALUE HEX: ffffffff +CONSTANT: D3D11_PS_FRONTFACING_TRUE_VALUE 0xffffffff CONSTANT: D3D11_PS_INPUT_REGISTER_COMPONENTS 4 CONSTANT: D3D11_PS_INPUT_REGISTER_COMPONENT_BIT_COUNT 32 CONSTANT: D3D11_PS_INPUT_REGISTER_COUNT 32 @@ -337,8 +337,8 @@ CONSTANT: D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT 8 CONSTANT: D3D11_SO_BUFFER_MAX_STRIDE_IN_BYTES 2048 CONSTANT: D3D11_SO_BUFFER_MAX_WRITE_WINDOW_IN_BYTES 512 CONSTANT: D3D11_SO_BUFFER_SLOT_COUNT 4 -CONSTANT: D3D11_SO_DDI_REGISTER_INDEX_DENOTING_GAP HEX: ffffffff -CONSTANT: D3D11_SO_NO_RASTERIZED_STREAM HEX: ffffffff +CONSTANT: D3D11_SO_DDI_REGISTER_INDEX_DENOTING_GAP 0xffffffff +CONSTANT: D3D11_SO_NO_RASTERIZED_STREAM 0xffffffff CONSTANT: D3D11_SO_OUTPUT_COMPONENT_COUNT 128 CONSTANT: D3D11_SO_STREAM_COUNT 4 @@ -398,16 +398,16 @@ CONSTANT: D3D11_WHQL_CONTEXT_COUNT_FOR_RESOURCE_LIMIT 10 CONSTANT: D3D11_WHQL_DRAWINDEXED_INDEX_COUNT_2_TO_EXP 25 CONSTANT: D3D11_WHQL_DRAW_VERTEX_COUNT_2_TO_EXP 25 -CONSTANT: D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS HEX: 887c0001 -CONSTANT: D3D11_ERROR_FILE_NOT_FOUND HEX: 887c0002 -CONSTANT: D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS HEX: 887c003 -CONSTANT: D3D11_ERROR_DEFERRED_CONTEXT_MAP_WITHOUT_INITIAL_DISCARD HEX: 887c004 +CONSTANT: D3D11_ERROR_TOO_MANY_UNIQUE_STATE_OBJECTS 0x887c0001 +CONSTANT: D3D11_ERROR_FILE_NOT_FOUND 0x887c0002 +CONSTANT: D3D11_ERROR_TOO_MANY_UNIQUE_VIEW_OBJECTS 0x887c003 +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 -CONSTANT: D3D11_APPEND_ALIGNED_ELEMENT HEX: ffffffff +CONSTANT: D3D11_APPEND_ALIGNED_ELEMENT 0xffffffff STRUCT: D3D11_INPUT_ELEMENT_DESC { SemanticName LPCSTR } @@ -593,8 +593,8 @@ CONSTANT: D3D11_BIND_DEPTH_STENCIL 64 CONSTANT: D3D11_BIND_UNORDERED_ACCESS 128 TYPEDEF: int D3D11_BIND_FLAG -CONSTANT: D3D11_CPU_ACCESS_WRITE HEX: 10000 -CONSTANT: D3D11_CPU_ACCESS_READ HEX: 20000 +CONSTANT: D3D11_CPU_ACCESS_WRITE 0x10000 +CONSTANT: D3D11_CPU_ACCESS_READ 0x20000 TYPEDEF: int D3D11_CPU_ACCESS_FLAG CONSTANT: D3D11_RESOURCE_MISC_GENERATE_MIPS 1 @@ -615,7 +615,7 @@ CONSTANT: D3D11_MAP_WRITE_DISCARD 4 CONSTANT: D3D11_MAP_WRITE_NO_OVERWRITE 5 TYPEDEF: int D3D11_MAP -CONSTANT: D3D11_MAP_FLAG_DO_NOT_WAIT HEX: 100000 +CONSTANT: D3D11_MAP_FLAG_DO_NOT_WAIT 0x100000 TYPEDEF: int D3D11_MAP_FLAG CONSTANT: D3D11_RAISE_FLAG_DRIVER_INTERNAL_ERROR 1 @@ -1078,24 +1078,24 @@ COM-INTERFACE: ID3D11ComputeShader ID3D11DeviceChild {4f5b196e-c2bd-495e-bd01-1f COM-INTERFACE: ID3D11InputLayout ID3D11DeviceChild {e4819ddc-4cf0-4025-bd26-5de82a3e07b7} ; -CONSTANT: D3D11_FILTER_MIN_MAG_MIP_POINT HEX: 0 -CONSTANT: D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR HEX: 1 -CONSTANT: D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT HEX: 4 -CONSTANT: D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR HEX: 5 -CONSTANT: D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT HEX: 10 -CONSTANT: D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR HEX: 11 -CONSTANT: D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT HEX: 14 -CONSTANT: D3D11_FILTER_MIN_MAG_MIP_LINEAR HEX: 15 -CONSTANT: D3D11_FILTER_ANISOTROPIC HEX: 55 -CONSTANT: D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT HEX: 80 -CONSTANT: D3D11_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR HEX: 81 -CONSTANT: D3D11_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT HEX: 84 -CONSTANT: D3D11_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR HEX: 85 -CONSTANT: D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT HEX: 90 -CONSTANT: D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_POINT_MIP_LINEAR HEX: 91 -CONSTANT: D3D11_FILTER_COMPARISON_MIN_MAG_LINEAR_MIP_POINT HEX: 94 -CONSTANT: D3D11_FILTER_COMPARISON_MIN_MAG_MIP_LINEAR HEX: 95 -CONSTANT: D3D11_FILTER_COMPARISON_ANISOTROPIC HEX: d5 +CONSTANT: D3D11_FILTER_MIN_MAG_MIP_POINT 0x0 +CONSTANT: D3D11_FILTER_MIN_MAG_POINT_MIP_LINEAR 0x1 +CONSTANT: D3D11_FILTER_MIN_POINT_MAG_LINEAR_MIP_POINT 0x4 +CONSTANT: D3D11_FILTER_MIN_POINT_MAG_MIP_LINEAR 0x5 +CONSTANT: D3D11_FILTER_MIN_LINEAR_MAG_MIP_POINT 0x10 +CONSTANT: D3D11_FILTER_MIN_LINEAR_MAG_POINT_MIP_LINEAR 0x11 +CONSTANT: D3D11_FILTER_MIN_MAG_LINEAR_MIP_POINT 0x14 +CONSTANT: D3D11_FILTER_MIN_MAG_MIP_LINEAR 0x15 +CONSTANT: D3D11_FILTER_ANISOTROPIC 0x55 +CONSTANT: D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT 0x80 +CONSTANT: D3D11_FILTER_COMPARISON_MIN_MAG_POINT_MIP_LINEAR 0x81 +CONSTANT: D3D11_FILTER_COMPARISON_MIN_POINT_MAG_LINEAR_MIP_POINT 0x84 +CONSTANT: D3D11_FILTER_COMPARISON_MIN_POINT_MAG_MIP_LINEAR 0x85 +CONSTANT: D3D11_FILTER_COMPARISON_MIN_LINEAR_MAG_MIP_POINT 0x90 +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 CONSTANT: D3D11_FILTER_TYPE_POINT 0 @@ -1106,8 +1106,8 @@ CONSTANT: D3D11_FILTER_TYPE_MASK 3 CONSTANT: D3D11_MIN_FILTER_SHIFT 4 CONSTANT: D3D11_MAG_FILTER_SHIFT 2 CONSTANT: D3D11_MIP_FILTER_SHIFT 0 -CONSTANT: D3D11_COMPARISON_FILTERING_BIT HEX: 80 -CONSTANT: D3D11_ANISOTROPIC_FILTERING_BIT HEX: 40 +CONSTANT: D3D11_COMPARISON_FILTERING_BIT 0x80 +CONSTANT: D3D11_ANISOTROPIC_FILTERING_BIT 0x40 CONSTANT: D3D11_TEXTURE_ADDRESS_WRAP 1 CONSTANT: D3D11_TEXTURE_ADDRESS_MIRROR 2 @@ -1131,43 +1131,43 @@ STRUCT: D3D11_SAMPLER_DESC COM-INTERFACE: ID3D11SamplerState ID3D11DeviceChild {da6fea51-564c-4487-9810-f0d0f9b4e3a5} void GetDesc ( D3D11_SAMPLER_DESC* pDesc ) ; -CONSTANT: D3D11_FORMAT_SUPPORT_BUFFER HEX: 1 -CONSTANT: D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER HEX: 2 -CONSTANT: D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER HEX: 4 -CONSTANT: D3D11_FORMAT_SUPPORT_SO_BUFFER HEX: 8 -CONSTANT: D3D11_FORMAT_SUPPORT_TEXTURE1D HEX: 10 -CONSTANT: D3D11_FORMAT_SUPPORT_TEXTURE2D HEX: 20 -CONSTANT: D3D11_FORMAT_SUPPORT_TEXTURE3D HEX: 40 -CONSTANT: D3D11_FORMAT_SUPPORT_TEXTURECUBE HEX: 80 -CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_LOAD HEX: 100 -CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_SAMPLE HEX: 200 -CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON HEX: 400 -CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT HEX: 800 -CONSTANT: D3D11_FORMAT_SUPPORT_MIP HEX: 1000 -CONSTANT: D3D11_FORMAT_SUPPORT_MIP_AUTOGEN HEX: 2000 -CONSTANT: D3D11_FORMAT_SUPPORT_RENDER_TARGET HEX: 4000 -CONSTANT: D3D11_FORMAT_SUPPORT_BLENDABLE HEX: 8000 -CONSTANT: D3D11_FORMAT_SUPPORT_DEPTH_STENCIL HEX: 10000 -CONSTANT: D3D11_FORMAT_SUPPORT_CPU_LOCKABLE HEX: 20000 -CONSTANT: D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE HEX: 40000 -CONSTANT: D3D11_FORMAT_SUPPORT_DISPLAY HEX: 80000 -CONSTANT: D3D11_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT HEX: 100000 -CONSTANT: D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET HEX: 200000 -CONSTANT: D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD HEX: 400000 -CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_GATHER HEX: 800000 -CONSTANT: D3D11_FORMAT_SUPPORT_BACK_BUFFER_CAST HEX: 1000000 -CONSTANT: D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW HEX: 2000000 -CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_GATHER_COMPARISON HEX: 4000000 +CONSTANT: D3D11_FORMAT_SUPPORT_BUFFER 0x1 +CONSTANT: D3D11_FORMAT_SUPPORT_IA_VERTEX_BUFFER 0x2 +CONSTANT: D3D11_FORMAT_SUPPORT_IA_INDEX_BUFFER 0x4 +CONSTANT: D3D11_FORMAT_SUPPORT_SO_BUFFER 0x8 +CONSTANT: D3D11_FORMAT_SUPPORT_TEXTURE1D 0x10 +CONSTANT: D3D11_FORMAT_SUPPORT_TEXTURE2D 0x20 +CONSTANT: D3D11_FORMAT_SUPPORT_TEXTURE3D 0x40 +CONSTANT: D3D11_FORMAT_SUPPORT_TEXTURECUBE 0x80 +CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_LOAD 0x100 +CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_SAMPLE 0x200 +CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_COMPARISON 0x400 +CONSTANT: D3D11_FORMAT_SUPPORT_SHADER_SAMPLE_MONO_TEXT 0x800 +CONSTANT: D3D11_FORMAT_SUPPORT_MIP 0x1000 +CONSTANT: D3D11_FORMAT_SUPPORT_MIP_AUTOGEN 0x2000 +CONSTANT: D3D11_FORMAT_SUPPORT_RENDER_TARGET 0x4000 +CONSTANT: D3D11_FORMAT_SUPPORT_BLENDABLE 0x8000 +CONSTANT: D3D11_FORMAT_SUPPORT_DEPTH_STENCIL 0x10000 +CONSTANT: D3D11_FORMAT_SUPPORT_CPU_LOCKABLE 0x20000 +CONSTANT: D3D11_FORMAT_SUPPORT_MULTISAMPLE_RESOLVE 0x40000 +CONSTANT: D3D11_FORMAT_SUPPORT_DISPLAY 0x80000 +CONSTANT: D3D11_FORMAT_SUPPORT_CAST_WITHIN_BIT_LAYOUT 0x100000 +CONSTANT: D3D11_FORMAT_SUPPORT_MULTISAMPLE_RENDERTARGET 0x200000 +CONSTANT: D3D11_FORMAT_SUPPORT_MULTISAMPLE_LOAD 0x400000 +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 -CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD HEX: 1 -CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS HEX: 2 -CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE HEX: 4 -CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE HEX: 8 -CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX HEX: 10 -CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_UNSIGNED_MIN_OR_MAX HEX: 20 -CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_TYPED_LOAD HEX: 40 -CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_TYPED_STORE HEX: 80 +CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_ADD 0x1 +CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_BITWISE_OPS 0x2 +CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_COMPARE_STORE_OR_COMPARE_EXCHANGE 0x4 +CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_EXCHANGE 0x8 +CONSTANT: D3D11_FORMAT_SUPPORT2_UAV_ATOMIC_SIGNED_MIN_OR_MAX 0x10 +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 COM-INTERFACE: ID3D11Asynchronous ID3D11DeviceChild {4b35d0cd-1e15-4258-9c98-1b1333f6dd3b} @@ -1227,7 +1227,7 @@ STRUCT: D3D11_QUERY_DATA_SO_STATISTICS { NumPrimitivesWritten UINT64 } { PrimitivesStorageNeeded UINT64 } ; -CONSTANT: D3D11_COUNTER_DEVICE_DEPENDENT_0 HEX: 40000000 +CONSTANT: D3D11_COUNTER_DEVICE_DEPENDENT_0 0x40000000 TYPEDEF: int D3D11_COUNTER CONSTANT: D3D11_COUNTER_TYPE_FLOAT32 0 @@ -1248,8 +1248,8 @@ STRUCT: D3D11_COUNTER_INFO COM-INTERFACE: ID3D11Counter ID3D11Asynchronous {6e8c49fb-a371-4770-b440-29086022b741} void GetDesc ( D3D11_COUNTER_DESC* pDesc ) ; -CONSTANT: D3D11_STANDARD_MULTISAMPLE_PATTERN HEX: ffffffff -CONSTANT: D3D11_CENTER_MULTISAMPLE_PATTERN HEX: fffffffe +CONSTANT: D3D11_STANDARD_MULTISAMPLE_PATTERN 0xffffffff +CONSTANT: D3D11_CENTER_MULTISAMPLE_PATTERN 0xfffffffe TYPEDEF: int D3D11_STANDARD_MULTISAMPLE_QUALITY_LEVELS CONSTANT: D3D11_DEVICE_CONTEXT_IMMEDIATE 0 diff --git a/basis/windows/directx/d3d9/d3d9.factor b/basis/windows/directx/d3d9/d3d9.factor index a132a735bd..0c4481dfca 100644 --- a/basis/windows/directx/d3d9/d3d9.factor +++ b/basis/windows/directx/d3d9/d3d9.factor @@ -5,7 +5,7 @@ IN: windows.directx.d3d9 LIBRARY: d3d9 -CONSTANT: DIRECT3D_VERSION HEX: 0900 +CONSTANT: DIRECT3D_VERSION 0x0900 CONSTANT: D3D_SDK_VERSION 32 CONSTANT: D3D9b_SDK_VERSION 31 @@ -327,26 +327,26 @@ COM-INTERFACE: IDirect3DQuery9 IUnknown {d9771460-a695-4f26-bbd3-27b840b541cc} TYPEDEF: IDirect3DQuery9* LPDIRECT3DQUERY9 TYPEDEF: IDirect3DQuery9* PDIRECT3DQUERY9 -CONSTANT: D3DSPD_IUNKNOWN HEX: 00000001 +CONSTANT: D3DSPD_IUNKNOWN 0x00000001 -CONSTANT: D3DCREATE_FPU_PRESERVE HEX: 00000002 -CONSTANT: D3DCREATE_MULTITHREADED HEX: 00000004 +CONSTANT: D3DCREATE_FPU_PRESERVE 0x00000002 +CONSTANT: D3DCREATE_MULTITHREADED 0x00000004 -CONSTANT: D3DCREATE_PUREDEVICE HEX: 00000010 -CONSTANT: D3DCREATE_SOFTWARE_VERTEXPROCESSING HEX: 00000020 -CONSTANT: D3DCREATE_HARDWARE_VERTEXPROCESSING HEX: 00000040 -CONSTANT: D3DCREATE_MIXED_VERTEXPROCESSING HEX: 00000080 +CONSTANT: D3DCREATE_PUREDEVICE 0x00000010 +CONSTANT: D3DCREATE_SOFTWARE_VERTEXPROCESSING 0x00000020 +CONSTANT: D3DCREATE_HARDWARE_VERTEXPROCESSING 0x00000040 +CONSTANT: D3DCREATE_MIXED_VERTEXPROCESSING 0x00000080 -CONSTANT: D3DCREATE_DISABLE_DRIVER_MANAGEMENT HEX: 00000100 -CONSTANT: D3DCREATE_ADAPTERGROUP_DEVICE HEX: 00000200 -CONSTANT: D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX HEX: 00000400 +CONSTANT: D3DCREATE_DISABLE_DRIVER_MANAGEMENT 0x00000100 +CONSTANT: D3DCREATE_ADAPTERGROUP_DEVICE 0x00000200 +CONSTANT: D3DCREATE_DISABLE_DRIVER_MANAGEMENT_EX 0x00000400 -CONSTANT: D3DCREATE_NOWINDOWCHANGES HEX: 00000800 +CONSTANT: D3DCREATE_NOWINDOWCHANGES 0x00000800 -CONSTANT: D3DCREATE_DISABLE_PSGP_THREADING HEX: 00002000 -CONSTANT: D3DCREATE_ENABLE_PRESENTSTATS HEX: 00004000 -CONSTANT: D3DCREATE_DISABLE_PRINTSCREEN HEX: 00008000 -CONSTANT: D3DCREATE_SCREENSAVER HEX: 10000000 +CONSTANT: D3DCREATE_DISABLE_PSGP_THREADING 0x00002000 +CONSTANT: D3DCREATE_ENABLE_PRESENTSTATS 0x00004000 +CONSTANT: D3DCREATE_DISABLE_PRINTSCREEN 0x00008000 +CONSTANT: D3DCREATE_SCREENSAVER 0x10000000 CONSTANT: D3DADAPTER_DEFAULT 0 CONSTANT: D3DENUM_WHQL_LEVEL 2 @@ -354,58 +354,58 @@ CONSTANT: D3DENUM_NO_DRIVERVERSION 4 CONSTANT: D3DPRESENT_BACK_BUFFERS_MAX 3 CONSTANT: D3DPRESENT_BACK_BUFFERS_MAX_EX 30 -CONSTANT: D3DSGR_NO_CALIBRATION HEX: 00000000 -CONSTANT: D3DSGR_CALIBRATE HEX: 00000001 +CONSTANT: D3DSGR_NO_CALIBRATION 0x00000000 +CONSTANT: D3DSGR_CALIBRATE 0x00000001 -CONSTANT: D3DCURSOR_IMMEDIATE_UPDATE HEX: 00000001 +CONSTANT: D3DCURSOR_IMMEDIATE_UPDATE 0x00000001 -CONSTANT: D3DPRESENT_DONOTWAIT HEX: 00000001 -CONSTANT: D3DPRESENT_LINEAR_CONTENT HEX: 00000002 +CONSTANT: D3DPRESENT_DONOTWAIT 0x00000001 +CONSTANT: D3DPRESENT_LINEAR_CONTENT 0x00000002 -CONSTANT: D3DPRESENT_DONOTFLIP HEX: 00000004 -CONSTANT: D3DPRESENT_FLIPRESTART HEX: 00000008 -CONSTANT: D3DPRESENT_VIDEO_RESTRICT_TO_MONITOR HEX: 00000010 -CONSTANT: D3DPRESENT_UPDATEOVERLAYONLY HEX: 00000020 -CONSTANT: D3DPRESENT_HIDEOVERLAY HEX: 00000040 -CONSTANT: D3DPRESENT_UPDATECOLORKEY HEX: 00000080 -CONSTANT: D3DPRESENT_FORCEIMMEDIATE HEX: 00000100 +CONSTANT: D3DPRESENT_DONOTFLIP 0x00000004 +CONSTANT: D3DPRESENT_FLIPRESTART 0x00000008 +CONSTANT: D3DPRESENT_VIDEO_RESTRICT_TO_MONITOR 0x00000010 +CONSTANT: D3DPRESENT_UPDATEOVERLAYONLY 0x00000020 +CONSTANT: D3DPRESENT_HIDEOVERLAY 0x00000040 +CONSTANT: D3DPRESENT_UPDATECOLORKEY 0x00000080 +CONSTANT: D3DPRESENT_FORCEIMMEDIATE 0x00000100 : D3D_OK ( -- n ) S_OK ; inline -CONSTANT: D3DERR_WRONGTEXTUREFORMAT HEX: 88760818 -CONSTANT: D3DERR_UNSUPPORTEDCOLOROPERATION HEX: 88760819 -CONSTANT: D3DERR_UNSUPPORTEDCOLORARG HEX: 8876081A -CONSTANT: D3DERR_UNSUPPORTEDALPHAOPERATION HEX: 8876081B -CONSTANT: D3DERR_UNSUPPORTEDALPHAARG HEX: 8876081C -CONSTANT: D3DERR_TOOMANYOPERATIONS HEX: 8876081D -CONSTANT: D3DERR_CONFLICTINGTEXTUREFILTER HEX: 8876081E -CONSTANT: D3DERR_UNSUPPORTEDFACTORVALUE HEX: 8876081F -CONSTANT: D3DERR_CONFLICTINGRENDERSTATE HEX: 88760820 -CONSTANT: D3DERR_UNSUPPORTEDTEXTUREFILTER HEX: 88760821 -CONSTANT: D3DERR_CONFLICTINGTEXTUREPALETTE HEX: 88760825 -CONSTANT: D3DERR_DRIVERINTERNALERROR HEX: 88760826 -CONSTANT: D3DERR_NOTFOUND HEX: 88760866 -CONSTANT: D3DERR_MOREDATA HEX: 88760867 -CONSTANT: D3DERR_DEVICELOST HEX: 88760868 -CONSTANT: D3DERR_DEVICENOTRESET HEX: 88760869 -CONSTANT: D3DERR_NOTAVAILABLE HEX: 8876086A -CONSTANT: D3DERR_OUTOFVIDEOMEMORY HEX: 8876017C -CONSTANT: D3DERR_INVALIDDEVICE HEX: 8876086B -CONSTANT: D3DERR_INVALIDCALL HEX: 8876086C -CONSTANT: D3DERR_DRIVERINVALIDCALL HEX: 8876086D -CONSTANT: D3DERR_WASSTILLDRAWING HEX: 8876021C -CONSTANT: D3DOK_NOAUTOGEN HEX: 0876086F -CONSTANT: D3DERR_DEVICEREMOVED HEX: 88760870 -CONSTANT: S_NOT_RESIDENT HEX: 08760875 -CONSTANT: S_RESIDENT_IN_SHARED_MEMORY HEX: 08760876 -CONSTANT: S_PRESENT_MODE_CHANGED HEX: 08760877 -CONSTANT: S_PRESENT_OCCLUDED HEX: 08760878 -CONSTANT: D3DERR_DEVICEHUNG HEX: 88760874 -CONSTANT: D3DERR_UNSUPPORTEDOVERLAY HEX: 8876087C -CONSTANT: D3DERR_UNSUPPORTEDOVERLAYFORMAT HEX: 8876087D -CONSTANT: D3DERR_CANNOTPROTECTCONTENT HEX: 8876087E -CONSTANT: D3DERR_UNSUPPORTEDCRYPTO HEX: 8876087F -CONSTANT: D3DERR_PRESENT_STATISTICS_DISJOINT HEX: 88760884 +CONSTANT: D3DERR_WRONGTEXTUREFORMAT 0x88760818 +CONSTANT: D3DERR_UNSUPPORTEDCOLOROPERATION 0x88760819 +CONSTANT: D3DERR_UNSUPPORTEDCOLORARG 0x8876081A +CONSTANT: D3DERR_UNSUPPORTEDALPHAOPERATION 0x8876081B +CONSTANT: D3DERR_UNSUPPORTEDALPHAARG 0x8876081C +CONSTANT: D3DERR_TOOMANYOPERATIONS 0x8876081D +CONSTANT: D3DERR_CONFLICTINGTEXTUREFILTER 0x8876081E +CONSTANT: D3DERR_UNSUPPORTEDFACTORVALUE 0x8876081F +CONSTANT: D3DERR_CONFLICTINGRENDERSTATE 0x88760820 +CONSTANT: D3DERR_UNSUPPORTEDTEXTUREFILTER 0x88760821 +CONSTANT: D3DERR_CONFLICTINGTEXTUREPALETTE 0x88760825 +CONSTANT: D3DERR_DRIVERINTERNALERROR 0x88760826 +CONSTANT: D3DERR_NOTFOUND 0x88760866 +CONSTANT: D3DERR_MOREDATA 0x88760867 +CONSTANT: D3DERR_DEVICELOST 0x88760868 +CONSTANT: D3DERR_DEVICENOTRESET 0x88760869 +CONSTANT: D3DERR_NOTAVAILABLE 0x8876086A +CONSTANT: D3DERR_OUTOFVIDEOMEMORY 0x8876017C +CONSTANT: D3DERR_INVALIDDEVICE 0x8876086B +CONSTANT: D3DERR_INVALIDCALL 0x8876086C +CONSTANT: D3DERR_DRIVERINVALIDCALL 0x8876086D +CONSTANT: D3DERR_WASSTILLDRAWING 0x8876021C +CONSTANT: D3DOK_NOAUTOGEN 0x0876086F +CONSTANT: D3DERR_DEVICEREMOVED 0x88760870 +CONSTANT: S_NOT_RESIDENT 0x08760875 +CONSTANT: S_RESIDENT_IN_SHARED_MEMORY 0x08760876 +CONSTANT: S_PRESENT_MODE_CHANGED 0x08760877 +CONSTANT: S_PRESENT_OCCLUDED 0x08760878 +CONSTANT: D3DERR_DEVICEHUNG 0x88760874 +CONSTANT: D3DERR_UNSUPPORTEDOVERLAY 0x8876087C +CONSTANT: D3DERR_UNSUPPORTEDOVERLAYFORMAT 0x8876087D +CONSTANT: D3DERR_CANNOTPROTECTCONTENT 0x8876087E +CONSTANT: D3DERR_UNSUPPORTEDCRYPTO 0x8876087F +CONSTANT: D3DERR_PRESENT_STATISTICS_DISJOINT 0x88760884 FUNCTION: HRESULT Direct3DCreate9Ex ( UINT SDKVersion, IDirect3D9Ex** out ) ; diff --git a/basis/windows/directx/d3d9caps/d3d9caps.factor b/basis/windows/directx/d3d9caps/d3d9caps.factor index 5da1961bd4..64f0a9b982 100644 --- a/basis/windows/directx/d3d9caps/d3d9caps.factor +++ b/basis/windows/directx/d3d9caps/d3d9caps.factor @@ -47,14 +47,14 @@ STRUCT: D3DOVERLAYCAPS { MaxOverlayDisplayWidth UINT } { MaxOverlayDisplayHeight UINT } ; -CONSTANT: D3DOVERLAYCAPS_FULLRANGERGB HEX: 00000001 -CONSTANT: D3DOVERLAYCAPS_LIMITEDRANGERGB HEX: 00000002 -CONSTANT: D3DOVERLAYCAPS_YCbCr_BT601 HEX: 00000004 -CONSTANT: D3DOVERLAYCAPS_YCbCr_BT709 HEX: 00000008 -CONSTANT: D3DOVERLAYCAPS_YCbCr_BT601_xvYCC HEX: 00000010 -CONSTANT: D3DOVERLAYCAPS_YCbCr_BT709_xvYCC HEX: 00000020 -CONSTANT: D3DOVERLAYCAPS_STRETCHX HEX: 00000040 -CONSTANT: D3DOVERLAYCAPS_STRETCHY HEX: 00000080 +CONSTANT: D3DOVERLAYCAPS_FULLRANGERGB 0x00000001 +CONSTANT: D3DOVERLAYCAPS_LIMITEDRANGERGB 0x00000002 +CONSTANT: D3DOVERLAYCAPS_YCbCr_BT601 0x00000004 +CONSTANT: D3DOVERLAYCAPS_YCbCr_BT709 0x00000008 +CONSTANT: D3DOVERLAYCAPS_YCbCr_BT601_xvYCC 0x00000010 +CONSTANT: D3DOVERLAYCAPS_YCbCr_BT709_xvYCC 0x00000020 +CONSTANT: D3DOVERLAYCAPS_STRETCHX 0x00000040 +CONSTANT: D3DOVERLAYCAPS_STRETCHY 0x00000080 STRUCT: D3DCONTENTPROTECTIONCAPS @@ -64,16 +64,16 @@ STRUCT: D3DCONTENTPROTECTIONCAPS { BlockAlignmentSize UINT } { ProtectedMemorySize ULONGLONG } ; -CONSTANT: D3DCPCAPS_SOFTWARE HEX: 00000001 -CONSTANT: D3DCPCAPS_HARDWARE HEX: 00000002 -CONSTANT: D3DCPCAPS_PROTECTIONALWAYSON HEX: 00000004 -CONSTANT: D3DCPCAPS_PARTIALDECRYPTION HEX: 00000008 -CONSTANT: D3DCPCAPS_CONTENTKEY HEX: 00000010 -CONSTANT: D3DCPCAPS_FRESHENSESSIONKEY HEX: 00000020 -CONSTANT: D3DCPCAPS_ENCRYPTEDREADBACK HEX: 00000040 -CONSTANT: D3DCPCAPS_ENCRYPTEDREADBACKKEY HEX: 00000080 -CONSTANT: D3DCPCAPS_SEQUENTIAL_CTR_IV HEX: 00000100 -CONSTANT: D3DCPCAPS_ENCRYPTSLICEDATAONLY HEX: 00000200 +CONSTANT: D3DCPCAPS_SOFTWARE 0x00000001 +CONSTANT: D3DCPCAPS_HARDWARE 0x00000002 +CONSTANT: D3DCPCAPS_PROTECTIONALWAYSON 0x00000004 +CONSTANT: D3DCPCAPS_PARTIALDECRYPTION 0x00000008 +CONSTANT: D3DCPCAPS_CONTENTKEY 0x00000010 +CONSTANT: D3DCPCAPS_FRESHENSESSIONKEY 0x00000020 +CONSTANT: D3DCPCAPS_ENCRYPTEDREADBACK 0x00000040 +CONSTANT: D3DCPCAPS_ENCRYPTEDREADBACKKEY 0x00000080 +CONSTANT: D3DCPCAPS_SEQUENTIAL_CTR_IV 0x00000100 +CONSTANT: D3DCPCAPS_ENCRYPTSLICEDATAONLY 0x00000200 STRUCT: D3DCAPS9 { DeviceType D3DDEVTYPE } @@ -146,241 +146,241 @@ STRUCT: D3DCAPS9 { MaxVertexShader30InstructionSlots DWORD } { MaxPixelShader30InstructionSlots DWORD } ; -CONSTANT: D3DCAPS_OVERLAY HEX: 00000800 -CONSTANT: D3DCAPS_READ_SCANLINE HEX: 00020000 - -CONSTANT: D3DCAPS2_FULLSCREENGAMMA HEX: 00020000 -CONSTANT: D3DCAPS2_CANCALIBRATEGAMMA HEX: 00100000 -CONSTANT: D3DCAPS2_RESERVED HEX: 02000000 -CONSTANT: D3DCAPS2_CANMANAGERESOURCE HEX: 10000000 -CONSTANT: D3DCAPS2_DYNAMICTEXTURES HEX: 20000000 -CONSTANT: D3DCAPS2_CANAUTOGENMIPMAP HEX: 40000000 - -CONSTANT: D3DCAPS2_CANSHARERESOURCE HEX: 80000000 - -CONSTANT: D3DCAPS3_RESERVED HEX: 8000001f - -CONSTANT: D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD HEX: 00000020 - -CONSTANT: D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION HEX: 00000080 - -CONSTANT: D3DCAPS3_COPY_TO_VIDMEM HEX: 00000100 -CONSTANT: D3DCAPS3_COPY_TO_SYSTEMMEM HEX: 00000200 -CONSTANT: D3DCAPS3_DXVAHD HEX: 00000400 - -CONSTANT: D3DPRESENT_INTERVAL_DEFAULT HEX: 00000000 -CONSTANT: D3DPRESENT_INTERVAL_ONE HEX: 00000001 -CONSTANT: D3DPRESENT_INTERVAL_TWO HEX: 00000002 -CONSTANT: D3DPRESENT_INTERVAL_THREE HEX: 00000004 -CONSTANT: D3DPRESENT_INTERVAL_FOUR HEX: 00000008 -CONSTANT: D3DPRESENT_INTERVAL_IMMEDIATE HEX: 80000000 - -CONSTANT: D3DCURSORCAPS_COLOR HEX: 00000001 -CONSTANT: D3DCURSORCAPS_LOWRES HEX: 00000002 - -CONSTANT: D3DDEVCAPS_EXECUTESYSTEMMEMORY HEX: 00000010 -CONSTANT: D3DDEVCAPS_EXECUTEVIDEOMEMORY HEX: 00000020 -CONSTANT: D3DDEVCAPS_TLVERTEXSYSTEMMEMORY HEX: 00000040 -CONSTANT: D3DDEVCAPS_TLVERTEXVIDEOMEMORY HEX: 00000080 -CONSTANT: D3DDEVCAPS_TEXTURESYSTEMMEMORY HEX: 00000100 -CONSTANT: D3DDEVCAPS_TEXTUREVIDEOMEMORY HEX: 00000200 -CONSTANT: D3DDEVCAPS_DRAWPRIMTLVERTEX HEX: 00000400 -CONSTANT: D3DDEVCAPS_CANRENDERAFTERFLIP HEX: 00000800 -CONSTANT: D3DDEVCAPS_TEXTURENONLOCALVIDMEM HEX: 00001000 -CONSTANT: D3DDEVCAPS_DRAWPRIMITIVES2 HEX: 00002000 -CONSTANT: D3DDEVCAPS_SEPARATETEXTUREMEMORIES HEX: 00004000 -CONSTANT: D3DDEVCAPS_DRAWPRIMITIVES2EX HEX: 00008000 -CONSTANT: D3DDEVCAPS_HWTRANSFORMANDLIGHT HEX: 00010000 -CONSTANT: D3DDEVCAPS_CANBLTSYSTONONLOCAL HEX: 00020000 -CONSTANT: D3DDEVCAPS_HWRASTERIZATION HEX: 00080000 -CONSTANT: D3DDEVCAPS_PUREDEVICE HEX: 00100000 -CONSTANT: D3DDEVCAPS_QUINTICRTPATCHES HEX: 00200000 -CONSTANT: D3DDEVCAPS_RTPATCHES HEX: 00400000 -CONSTANT: D3DDEVCAPS_RTPATCHHANDLEZERO HEX: 00800000 -CONSTANT: D3DDEVCAPS_NPATCHES HEX: 01000000 - -CONSTANT: D3DPMISCCAPS_MASKZ HEX: 00000002 -CONSTANT: D3DPMISCCAPS_CULLNONE HEX: 00000010 -CONSTANT: D3DPMISCCAPS_CULLCW HEX: 00000020 -CONSTANT: D3DPMISCCAPS_CULLCCW HEX: 00000040 -CONSTANT: D3DPMISCCAPS_COLORWRITEENABLE HEX: 00000080 -CONSTANT: D3DPMISCCAPS_CLIPPLANESCALEDPOINTS HEX: 00000100 -CONSTANT: D3DPMISCCAPS_CLIPTLVERTS HEX: 00000200 -CONSTANT: D3DPMISCCAPS_TSSARGTEMP HEX: 00000400 -CONSTANT: D3DPMISCCAPS_BLENDOP HEX: 00000800 -CONSTANT: D3DPMISCCAPS_NULLREFERENCE HEX: 00001000 -CONSTANT: D3DPMISCCAPS_INDEPENDENTWRITEMASKS HEX: 00004000 -CONSTANT: D3DPMISCCAPS_PERSTAGECONSTANT HEX: 00008000 -CONSTANT: D3DPMISCCAPS_FOGANDSPECULARALPHA HEX: 00010000 -CONSTANT: D3DPMISCCAPS_SEPARATEALPHABLEND HEX: 00020000 -CONSTANT: D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS HEX: 00040000 -CONSTANT: D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING HEX: 00080000 -CONSTANT: D3DPMISCCAPS_FOGVERTEXCLAMPED HEX: 00100000 - -CONSTANT: D3DPMISCCAPS_POSTBLENDSRGBCONVERT HEX: 00200000 - -CONSTANT: D3DLINECAPS_TEXTURE HEX: 00000001 -CONSTANT: D3DLINECAPS_ZTEST HEX: 00000002 -CONSTANT: D3DLINECAPS_BLEND HEX: 00000004 -CONSTANT: D3DLINECAPS_ALPHACMP HEX: 00000008 -CONSTANT: D3DLINECAPS_FOG HEX: 00000010 -CONSTANT: D3DLINECAPS_ANTIALIAS HEX: 00000020 - -CONSTANT: D3DPRASTERCAPS_DITHER HEX: 00000001 -CONSTANT: D3DPRASTERCAPS_ZTEST HEX: 00000010 -CONSTANT: D3DPRASTERCAPS_FOGVERTEX HEX: 00000080 -CONSTANT: D3DPRASTERCAPS_FOGTABLE HEX: 00000100 -CONSTANT: D3DPRASTERCAPS_MIPMAPLODBIAS HEX: 00002000 -CONSTANT: D3DPRASTERCAPS_ZBUFFERLESSHSR HEX: 00008000 -CONSTANT: D3DPRASTERCAPS_FOGRANGE HEX: 00010000 -CONSTANT: D3DPRASTERCAPS_ANISOTROPY HEX: 00020000 -CONSTANT: D3DPRASTERCAPS_WBUFFER HEX: 00040000 -CONSTANT: D3DPRASTERCAPS_WFOG HEX: 00100000 -CONSTANT: D3DPRASTERCAPS_ZFOG HEX: 00200000 -CONSTANT: D3DPRASTERCAPS_COLORPERSPECTIVE HEX: 00400000 -CONSTANT: D3DPRASTERCAPS_SCISSORTEST HEX: 01000000 -CONSTANT: D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS HEX: 02000000 -CONSTANT: D3DPRASTERCAPS_DEPTHBIAS HEX: 04000000 -CONSTANT: D3DPRASTERCAPS_MULTISAMPLE_TOGGLE HEX: 08000000 - -CONSTANT: D3DPCMPCAPS_NEVER HEX: 00000001 -CONSTANT: D3DPCMPCAPS_LESS HEX: 00000002 -CONSTANT: D3DPCMPCAPS_EQUAL HEX: 00000004 -CONSTANT: D3DPCMPCAPS_LESSEQUAL HEX: 00000008 -CONSTANT: D3DPCMPCAPS_GREATER HEX: 00000010 -CONSTANT: D3DPCMPCAPS_NOTEQUAL HEX: 00000020 -CONSTANT: D3DPCMPCAPS_GREATEREQUAL HEX: 00000040 -CONSTANT: D3DPCMPCAPS_ALWAYS HEX: 00000080 - -CONSTANT: D3DPBLENDCAPS_ZERO HEX: 00000001 -CONSTANT: D3DPBLENDCAPS_ONE HEX: 00000002 -CONSTANT: D3DPBLENDCAPS_SRCCOLOR HEX: 00000004 -CONSTANT: D3DPBLENDCAPS_INVSRCCOLOR HEX: 00000008 -CONSTANT: D3DPBLENDCAPS_SRCALPHA HEX: 00000010 -CONSTANT: D3DPBLENDCAPS_INVSRCALPHA HEX: 00000020 -CONSTANT: D3DPBLENDCAPS_DESTALPHA HEX: 00000040 -CONSTANT: D3DPBLENDCAPS_INVDESTALPHA HEX: 00000080 -CONSTANT: D3DPBLENDCAPS_DESTCOLOR HEX: 00000100 -CONSTANT: D3DPBLENDCAPS_INVDESTCOLOR HEX: 00000200 -CONSTANT: D3DPBLENDCAPS_SRCALPHASAT HEX: 00000400 -CONSTANT: D3DPBLENDCAPS_BOTHSRCALPHA HEX: 00000800 -CONSTANT: D3DPBLENDCAPS_BOTHINVSRCALPHA HEX: 00001000 -CONSTANT: D3DPBLENDCAPS_BLENDFACTOR HEX: 00002000 - -CONSTANT: D3DPBLENDCAPS_SRCCOLOR2 HEX: 00004000 -CONSTANT: D3DPBLENDCAPS_INVSRCCOLOR2 HEX: 00008000 - -CONSTANT: D3DPSHADECAPS_COLORGOURAUDRGB HEX: 00000008 -CONSTANT: D3DPSHADECAPS_SPECULARGOURAUDRGB HEX: 00000200 -CONSTANT: D3DPSHADECAPS_ALPHAGOURAUDBLEND HEX: 00004000 -CONSTANT: D3DPSHADECAPS_FOGGOURAUD HEX: 00080000 - -CONSTANT: D3DPTEXTURECAPS_PERSPECTIVE HEX: 00000001 -CONSTANT: D3DPTEXTURECAPS_POW2 HEX: 00000002 -CONSTANT: D3DPTEXTURECAPS_ALPHA HEX: 00000004 -CONSTANT: D3DPTEXTURECAPS_SQUAREONLY HEX: 00000020 -CONSTANT: D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE HEX: 00000040 -CONSTANT: D3DPTEXTURECAPS_ALPHAPALETTE HEX: 00000080 - -CONSTANT: D3DPTEXTURECAPS_NONPOW2CONDITIONAL HEX: 00000100 -CONSTANT: D3DPTEXTURECAPS_PROJECTED HEX: 00000400 -CONSTANT: D3DPTEXTURECAPS_CUBEMAP HEX: 00000800 -CONSTANT: D3DPTEXTURECAPS_VOLUMEMAP HEX: 00002000 -CONSTANT: D3DPTEXTURECAPS_MIPMAP HEX: 00004000 -CONSTANT: D3DPTEXTURECAPS_MIPVOLUMEMAP HEX: 00008000 -CONSTANT: D3DPTEXTURECAPS_MIPCUBEMAP HEX: 00010000 -CONSTANT: D3DPTEXTURECAPS_CUBEMAP_POW2 HEX: 00020000 -CONSTANT: D3DPTEXTURECAPS_VOLUMEMAP_POW2 HEX: 00040000 -CONSTANT: D3DPTEXTURECAPS_NOPROJECTEDBUMPENV HEX: 00200000 - -CONSTANT: D3DPTFILTERCAPS_MINFPOINT HEX: 00000100 -CONSTANT: D3DPTFILTERCAPS_MINFLINEAR HEX: 00000200 -CONSTANT: D3DPTFILTERCAPS_MINFANISOTROPIC HEX: 00000400 -CONSTANT: D3DPTFILTERCAPS_MINFPYRAMIDALQUAD HEX: 00000800 -CONSTANT: D3DPTFILTERCAPS_MINFGAUSSIANQUAD HEX: 00001000 -CONSTANT: D3DPTFILTERCAPS_MIPFPOINT HEX: 00010000 -CONSTANT: D3DPTFILTERCAPS_MIPFLINEAR HEX: 00020000 - -CONSTANT: D3DPTFILTERCAPS_CONVOLUTIONMONO HEX: 00040000 - -CONSTANT: D3DPTFILTERCAPS_MAGFPOINT HEX: 01000000 -CONSTANT: D3DPTFILTERCAPS_MAGFLINEAR HEX: 02000000 -CONSTANT: D3DPTFILTERCAPS_MAGFANISOTROPIC HEX: 04000000 -CONSTANT: D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD HEX: 08000000 -CONSTANT: D3DPTFILTERCAPS_MAGFGAUSSIANQUAD HEX: 10000000 - -CONSTANT: D3DPTADDRESSCAPS_WRAP HEX: 00000001 -CONSTANT: D3DPTADDRESSCAPS_MIRROR HEX: 00000002 -CONSTANT: D3DPTADDRESSCAPS_CLAMP HEX: 00000004 -CONSTANT: D3DPTADDRESSCAPS_BORDER HEX: 00000008 -CONSTANT: D3DPTADDRESSCAPS_INDEPENDENTUV HEX: 00000010 -CONSTANT: D3DPTADDRESSCAPS_MIRRORONCE HEX: 00000020 - -CONSTANT: D3DSTENCILCAPS_KEEP HEX: 00000001 -CONSTANT: D3DSTENCILCAPS_ZERO HEX: 00000002 -CONSTANT: D3DSTENCILCAPS_REPLACE HEX: 00000004 -CONSTANT: D3DSTENCILCAPS_INCRSAT HEX: 00000008 -CONSTANT: D3DSTENCILCAPS_DECRSAT HEX: 00000010 -CONSTANT: D3DSTENCILCAPS_INVERT HEX: 00000020 -CONSTANT: D3DSTENCILCAPS_INCR HEX: 00000040 -CONSTANT: D3DSTENCILCAPS_DECR HEX: 00000080 -CONSTANT: D3DSTENCILCAPS_TWOSIDED HEX: 00000100 - -CONSTANT: D3DTEXOPCAPS_DISABLE HEX: 00000001 -CONSTANT: D3DTEXOPCAPS_SELECTARG1 HEX: 00000002 -CONSTANT: D3DTEXOPCAPS_SELECTARG2 HEX: 00000004 -CONSTANT: D3DTEXOPCAPS_MODULATE HEX: 00000008 -CONSTANT: D3DTEXOPCAPS_MODULATE2X HEX: 00000010 -CONSTANT: D3DTEXOPCAPS_MODULATE4X HEX: 00000020 -CONSTANT: D3DTEXOPCAPS_ADD HEX: 00000040 -CONSTANT: D3DTEXOPCAPS_ADDSIGNED HEX: 00000080 -CONSTANT: D3DTEXOPCAPS_ADDSIGNED2X HEX: 00000100 -CONSTANT: D3DTEXOPCAPS_SUBTRACT HEX: 00000200 -CONSTANT: D3DTEXOPCAPS_ADDSMOOTH HEX: 00000400 -CONSTANT: D3DTEXOPCAPS_BLENDDIFFUSEALPHA HEX: 00000800 -CONSTANT: D3DTEXOPCAPS_BLENDTEXTUREALPHA HEX: 00001000 -CONSTANT: D3DTEXOPCAPS_BLENDFACTORALPHA HEX: 00002000 -CONSTANT: D3DTEXOPCAPS_BLENDTEXTUREALPHAPM HEX: 00004000 -CONSTANT: D3DTEXOPCAPS_BLENDCURRENTALPHA HEX: 00008000 -CONSTANT: D3DTEXOPCAPS_PREMODULATE HEX: 00010000 -CONSTANT: D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR HEX: 00020000 -CONSTANT: D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA HEX: 00040000 -CONSTANT: D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR HEX: 00080000 -CONSTANT: D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA HEX: 00100000 -CONSTANT: D3DTEXOPCAPS_BUMPENVMAP HEX: 00200000 -CONSTANT: D3DTEXOPCAPS_BUMPENVMAPLUMINANCE HEX: 00400000 -CONSTANT: D3DTEXOPCAPS_DOTPRODUCT3 HEX: 00800000 -CONSTANT: D3DTEXOPCAPS_MULTIPLYADD HEX: 01000000 -CONSTANT: D3DTEXOPCAPS_LERP HEX: 02000000 - -CONSTANT: D3DFVFCAPS_TEXCOORDCOUNTMASK HEX: 0000ffff -CONSTANT: D3DFVFCAPS_DONOTSTRIPELEMENTS HEX: 00080000 -CONSTANT: D3DFVFCAPS_PSIZE HEX: 00100000 - -CONSTANT: D3DVTXPCAPS_TEXGEN HEX: 00000001 -CONSTANT: D3DVTXPCAPS_MATERIALSOURCE7 HEX: 00000002 -CONSTANT: D3DVTXPCAPS_DIRECTIONALLIGHTS HEX: 00000008 -CONSTANT: D3DVTXPCAPS_POSITIONALLIGHTS HEX: 00000010 -CONSTANT: D3DVTXPCAPS_LOCALVIEWER HEX: 00000020 -CONSTANT: D3DVTXPCAPS_TWEENING HEX: 00000040 -CONSTANT: D3DVTXPCAPS_TEXGEN_SPHEREMAP HEX: 00000100 -CONSTANT: D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER HEX: 00000200 - -CONSTANT: D3DDEVCAPS2_STREAMOFFSET HEX: 00000001 -CONSTANT: D3DDEVCAPS2_DMAPNPATCH HEX: 00000002 -CONSTANT: D3DDEVCAPS2_ADAPTIVETESSRTPATCH HEX: 00000004 -CONSTANT: D3DDEVCAPS2_ADAPTIVETESSNPATCH HEX: 00000008 -CONSTANT: D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES HEX: 00000010 -CONSTANT: D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH HEX: 00000020 -CONSTANT: D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET HEX: 00000040 - -CONSTANT: D3DDTCAPS_UBYTE4 HEX: 00000001 -CONSTANT: D3DDTCAPS_UBYTE4N HEX: 00000002 -CONSTANT: D3DDTCAPS_SHORT2N HEX: 00000004 -CONSTANT: D3DDTCAPS_SHORT4N HEX: 00000008 -CONSTANT: D3DDTCAPS_USHORT2N HEX: 00000010 -CONSTANT: D3DDTCAPS_USHORT4N HEX: 00000020 -CONSTANT: D3DDTCAPS_UDEC3 HEX: 00000040 -CONSTANT: D3DDTCAPS_DEC3N HEX: 00000080 -CONSTANT: D3DDTCAPS_FLOAT16_2 HEX: 00000100 -CONSTANT: D3DDTCAPS_FLOAT16_4 HEX: 00000200 +CONSTANT: D3DCAPS_OVERLAY 0x00000800 +CONSTANT: D3DCAPS_READ_SCANLINE 0x00020000 + +CONSTANT: D3DCAPS2_FULLSCREENGAMMA 0x00020000 +CONSTANT: D3DCAPS2_CANCALIBRATEGAMMA 0x00100000 +CONSTANT: D3DCAPS2_RESERVED 0x02000000 +CONSTANT: D3DCAPS2_CANMANAGERESOURCE 0x10000000 +CONSTANT: D3DCAPS2_DYNAMICTEXTURES 0x20000000 +CONSTANT: D3DCAPS2_CANAUTOGENMIPMAP 0x40000000 + +CONSTANT: D3DCAPS2_CANSHARERESOURCE 0x80000000 + +CONSTANT: D3DCAPS3_RESERVED 0x8000001f + +CONSTANT: D3DCAPS3_ALPHA_FULLSCREEN_FLIP_OR_DISCARD 0x00000020 + +CONSTANT: D3DCAPS3_LINEAR_TO_SRGB_PRESENTATION 0x00000080 + +CONSTANT: D3DCAPS3_COPY_TO_VIDMEM 0x00000100 +CONSTANT: D3DCAPS3_COPY_TO_SYSTEMMEM 0x00000200 +CONSTANT: D3DCAPS3_DXVAHD 0x00000400 + +CONSTANT: D3DPRESENT_INTERVAL_DEFAULT 0x00000000 +CONSTANT: D3DPRESENT_INTERVAL_ONE 0x00000001 +CONSTANT: D3DPRESENT_INTERVAL_TWO 0x00000002 +CONSTANT: D3DPRESENT_INTERVAL_THREE 0x00000004 +CONSTANT: D3DPRESENT_INTERVAL_FOUR 0x00000008 +CONSTANT: D3DPRESENT_INTERVAL_IMMEDIATE 0x80000000 + +CONSTANT: D3DCURSORCAPS_COLOR 0x00000001 +CONSTANT: D3DCURSORCAPS_LOWRES 0x00000002 + +CONSTANT: D3DDEVCAPS_EXECUTESYSTEMMEMORY 0x00000010 +CONSTANT: D3DDEVCAPS_EXECUTEVIDEOMEMORY 0x00000020 +CONSTANT: D3DDEVCAPS_TLVERTEXSYSTEMMEMORY 0x00000040 +CONSTANT: D3DDEVCAPS_TLVERTEXVIDEOMEMORY 0x00000080 +CONSTANT: D3DDEVCAPS_TEXTURESYSTEMMEMORY 0x00000100 +CONSTANT: D3DDEVCAPS_TEXTUREVIDEOMEMORY 0x00000200 +CONSTANT: D3DDEVCAPS_DRAWPRIMTLVERTEX 0x00000400 +CONSTANT: D3DDEVCAPS_CANRENDERAFTERFLIP 0x00000800 +CONSTANT: D3DDEVCAPS_TEXTURENONLOCALVIDMEM 0x00001000 +CONSTANT: D3DDEVCAPS_DRAWPRIMITIVES2 0x00002000 +CONSTANT: D3DDEVCAPS_SEPARATETEXTUREMEMORIES 0x00004000 +CONSTANT: D3DDEVCAPS_DRAWPRIMITIVES2EX 0x00008000 +CONSTANT: D3DDEVCAPS_HWTRANSFORMANDLIGHT 0x00010000 +CONSTANT: D3DDEVCAPS_CANBLTSYSTONONLOCAL 0x00020000 +CONSTANT: D3DDEVCAPS_HWRASTERIZATION 0x00080000 +CONSTANT: D3DDEVCAPS_PUREDEVICE 0x00100000 +CONSTANT: D3DDEVCAPS_QUINTICRTPATCHES 0x00200000 +CONSTANT: D3DDEVCAPS_RTPATCHES 0x00400000 +CONSTANT: D3DDEVCAPS_RTPATCHHANDLEZERO 0x00800000 +CONSTANT: D3DDEVCAPS_NPATCHES 0x01000000 + +CONSTANT: D3DPMISCCAPS_MASKZ 0x00000002 +CONSTANT: D3DPMISCCAPS_CULLNONE 0x00000010 +CONSTANT: D3DPMISCCAPS_CULLCW 0x00000020 +CONSTANT: D3DPMISCCAPS_CULLCCW 0x00000040 +CONSTANT: D3DPMISCCAPS_COLORWRITEENABLE 0x00000080 +CONSTANT: D3DPMISCCAPS_CLIPPLANESCALEDPOINTS 0x00000100 +CONSTANT: D3DPMISCCAPS_CLIPTLVERTS 0x00000200 +CONSTANT: D3DPMISCCAPS_TSSARGTEMP 0x00000400 +CONSTANT: D3DPMISCCAPS_BLENDOP 0x00000800 +CONSTANT: D3DPMISCCAPS_NULLREFERENCE 0x00001000 +CONSTANT: D3DPMISCCAPS_INDEPENDENTWRITEMASKS 0x00004000 +CONSTANT: D3DPMISCCAPS_PERSTAGECONSTANT 0x00008000 +CONSTANT: D3DPMISCCAPS_FOGANDSPECULARALPHA 0x00010000 +CONSTANT: D3DPMISCCAPS_SEPARATEALPHABLEND 0x00020000 +CONSTANT: D3DPMISCCAPS_MRTINDEPENDENTBITDEPTHS 0x00040000 +CONSTANT: D3DPMISCCAPS_MRTPOSTPIXELSHADERBLENDING 0x00080000 +CONSTANT: D3DPMISCCAPS_FOGVERTEXCLAMPED 0x00100000 + +CONSTANT: D3DPMISCCAPS_POSTBLENDSRGBCONVERT 0x00200000 + +CONSTANT: D3DLINECAPS_TEXTURE 0x00000001 +CONSTANT: D3DLINECAPS_ZTEST 0x00000002 +CONSTANT: D3DLINECAPS_BLEND 0x00000004 +CONSTANT: D3DLINECAPS_ALPHACMP 0x00000008 +CONSTANT: D3DLINECAPS_FOG 0x00000010 +CONSTANT: D3DLINECAPS_ANTIALIAS 0x00000020 + +CONSTANT: D3DPRASTERCAPS_DITHER 0x00000001 +CONSTANT: D3DPRASTERCAPS_ZTEST 0x00000010 +CONSTANT: D3DPRASTERCAPS_FOGVERTEX 0x00000080 +CONSTANT: D3DPRASTERCAPS_FOGTABLE 0x00000100 +CONSTANT: D3DPRASTERCAPS_MIPMAPLODBIAS 0x00002000 +CONSTANT: D3DPRASTERCAPS_ZBUFFERLESSHSR 0x00008000 +CONSTANT: D3DPRASTERCAPS_FOGRANGE 0x00010000 +CONSTANT: D3DPRASTERCAPS_ANISOTROPY 0x00020000 +CONSTANT: D3DPRASTERCAPS_WBUFFER 0x00040000 +CONSTANT: D3DPRASTERCAPS_WFOG 0x00100000 +CONSTANT: D3DPRASTERCAPS_ZFOG 0x00200000 +CONSTANT: D3DPRASTERCAPS_COLORPERSPECTIVE 0x00400000 +CONSTANT: D3DPRASTERCAPS_SCISSORTEST 0x01000000 +CONSTANT: D3DPRASTERCAPS_SLOPESCALEDEPTHBIAS 0x02000000 +CONSTANT: D3DPRASTERCAPS_DEPTHBIAS 0x04000000 +CONSTANT: D3DPRASTERCAPS_MULTISAMPLE_TOGGLE 0x08000000 + +CONSTANT: D3DPCMPCAPS_NEVER 0x00000001 +CONSTANT: D3DPCMPCAPS_LESS 0x00000002 +CONSTANT: D3DPCMPCAPS_EQUAL 0x00000004 +CONSTANT: D3DPCMPCAPS_LESSEQUAL 0x00000008 +CONSTANT: D3DPCMPCAPS_GREATER 0x00000010 +CONSTANT: D3DPCMPCAPS_NOTEQUAL 0x00000020 +CONSTANT: D3DPCMPCAPS_GREATEREQUAL 0x00000040 +CONSTANT: D3DPCMPCAPS_ALWAYS 0x00000080 + +CONSTANT: D3DPBLENDCAPS_ZERO 0x00000001 +CONSTANT: D3DPBLENDCAPS_ONE 0x00000002 +CONSTANT: D3DPBLENDCAPS_SRCCOLOR 0x00000004 +CONSTANT: D3DPBLENDCAPS_INVSRCCOLOR 0x00000008 +CONSTANT: D3DPBLENDCAPS_SRCALPHA 0x00000010 +CONSTANT: D3DPBLENDCAPS_INVSRCALPHA 0x00000020 +CONSTANT: D3DPBLENDCAPS_DESTALPHA 0x00000040 +CONSTANT: D3DPBLENDCAPS_INVDESTALPHA 0x00000080 +CONSTANT: D3DPBLENDCAPS_DESTCOLOR 0x00000100 +CONSTANT: D3DPBLENDCAPS_INVDESTCOLOR 0x00000200 +CONSTANT: D3DPBLENDCAPS_SRCALPHASAT 0x00000400 +CONSTANT: D3DPBLENDCAPS_BOTHSRCALPHA 0x00000800 +CONSTANT: D3DPBLENDCAPS_BOTHINVSRCALPHA 0x00001000 +CONSTANT: D3DPBLENDCAPS_BLENDFACTOR 0x00002000 + +CONSTANT: D3DPBLENDCAPS_SRCCOLOR2 0x00004000 +CONSTANT: D3DPBLENDCAPS_INVSRCCOLOR2 0x00008000 + +CONSTANT: D3DPSHADECAPS_COLORGOURAUDRGB 0x00000008 +CONSTANT: D3DPSHADECAPS_SPECULARGOURAUDRGB 0x00000200 +CONSTANT: D3DPSHADECAPS_ALPHAGOURAUDBLEND 0x00004000 +CONSTANT: D3DPSHADECAPS_FOGGOURAUD 0x00080000 + +CONSTANT: D3DPTEXTURECAPS_PERSPECTIVE 0x00000001 +CONSTANT: D3DPTEXTURECAPS_POW2 0x00000002 +CONSTANT: D3DPTEXTURECAPS_ALPHA 0x00000004 +CONSTANT: D3DPTEXTURECAPS_SQUAREONLY 0x00000020 +CONSTANT: D3DPTEXTURECAPS_TEXREPEATNOTSCALEDBYSIZE 0x00000040 +CONSTANT: D3DPTEXTURECAPS_ALPHAPALETTE 0x00000080 + +CONSTANT: D3DPTEXTURECAPS_NONPOW2CONDITIONAL 0x00000100 +CONSTANT: D3DPTEXTURECAPS_PROJECTED 0x00000400 +CONSTANT: D3DPTEXTURECAPS_CUBEMAP 0x00000800 +CONSTANT: D3DPTEXTURECAPS_VOLUMEMAP 0x00002000 +CONSTANT: D3DPTEXTURECAPS_MIPMAP 0x00004000 +CONSTANT: D3DPTEXTURECAPS_MIPVOLUMEMAP 0x00008000 +CONSTANT: D3DPTEXTURECAPS_MIPCUBEMAP 0x00010000 +CONSTANT: D3DPTEXTURECAPS_CUBEMAP_POW2 0x00020000 +CONSTANT: D3DPTEXTURECAPS_VOLUMEMAP_POW2 0x00040000 +CONSTANT: D3DPTEXTURECAPS_NOPROJECTEDBUMPENV 0x00200000 + +CONSTANT: D3DPTFILTERCAPS_MINFPOINT 0x00000100 +CONSTANT: D3DPTFILTERCAPS_MINFLINEAR 0x00000200 +CONSTANT: D3DPTFILTERCAPS_MINFANISOTROPIC 0x00000400 +CONSTANT: D3DPTFILTERCAPS_MINFPYRAMIDALQUAD 0x00000800 +CONSTANT: D3DPTFILTERCAPS_MINFGAUSSIANQUAD 0x00001000 +CONSTANT: D3DPTFILTERCAPS_MIPFPOINT 0x00010000 +CONSTANT: D3DPTFILTERCAPS_MIPFLINEAR 0x00020000 + +CONSTANT: D3DPTFILTERCAPS_CONVOLUTIONMONO 0x00040000 + +CONSTANT: D3DPTFILTERCAPS_MAGFPOINT 0x01000000 +CONSTANT: D3DPTFILTERCAPS_MAGFLINEAR 0x02000000 +CONSTANT: D3DPTFILTERCAPS_MAGFANISOTROPIC 0x04000000 +CONSTANT: D3DPTFILTERCAPS_MAGFPYRAMIDALQUAD 0x08000000 +CONSTANT: D3DPTFILTERCAPS_MAGFGAUSSIANQUAD 0x10000000 + +CONSTANT: D3DPTADDRESSCAPS_WRAP 0x00000001 +CONSTANT: D3DPTADDRESSCAPS_MIRROR 0x00000002 +CONSTANT: D3DPTADDRESSCAPS_CLAMP 0x00000004 +CONSTANT: D3DPTADDRESSCAPS_BORDER 0x00000008 +CONSTANT: D3DPTADDRESSCAPS_INDEPENDENTUV 0x00000010 +CONSTANT: D3DPTADDRESSCAPS_MIRRORONCE 0x00000020 + +CONSTANT: D3DSTENCILCAPS_KEEP 0x00000001 +CONSTANT: D3DSTENCILCAPS_ZERO 0x00000002 +CONSTANT: D3DSTENCILCAPS_REPLACE 0x00000004 +CONSTANT: D3DSTENCILCAPS_INCRSAT 0x00000008 +CONSTANT: D3DSTENCILCAPS_DECRSAT 0x00000010 +CONSTANT: D3DSTENCILCAPS_INVERT 0x00000020 +CONSTANT: D3DSTENCILCAPS_INCR 0x00000040 +CONSTANT: D3DSTENCILCAPS_DECR 0x00000080 +CONSTANT: D3DSTENCILCAPS_TWOSIDED 0x00000100 + +CONSTANT: D3DTEXOPCAPS_DISABLE 0x00000001 +CONSTANT: D3DTEXOPCAPS_SELECTARG1 0x00000002 +CONSTANT: D3DTEXOPCAPS_SELECTARG2 0x00000004 +CONSTANT: D3DTEXOPCAPS_MODULATE 0x00000008 +CONSTANT: D3DTEXOPCAPS_MODULATE2X 0x00000010 +CONSTANT: D3DTEXOPCAPS_MODULATE4X 0x00000020 +CONSTANT: D3DTEXOPCAPS_ADD 0x00000040 +CONSTANT: D3DTEXOPCAPS_ADDSIGNED 0x00000080 +CONSTANT: D3DTEXOPCAPS_ADDSIGNED2X 0x00000100 +CONSTANT: D3DTEXOPCAPS_SUBTRACT 0x00000200 +CONSTANT: D3DTEXOPCAPS_ADDSMOOTH 0x00000400 +CONSTANT: D3DTEXOPCAPS_BLENDDIFFUSEALPHA 0x00000800 +CONSTANT: D3DTEXOPCAPS_BLENDTEXTUREALPHA 0x00001000 +CONSTANT: D3DTEXOPCAPS_BLENDFACTORALPHA 0x00002000 +CONSTANT: D3DTEXOPCAPS_BLENDTEXTUREALPHAPM 0x00004000 +CONSTANT: D3DTEXOPCAPS_BLENDCURRENTALPHA 0x00008000 +CONSTANT: D3DTEXOPCAPS_PREMODULATE 0x00010000 +CONSTANT: D3DTEXOPCAPS_MODULATEALPHA_ADDCOLOR 0x00020000 +CONSTANT: D3DTEXOPCAPS_MODULATECOLOR_ADDALPHA 0x00040000 +CONSTANT: D3DTEXOPCAPS_MODULATEINVALPHA_ADDCOLOR 0x00080000 +CONSTANT: D3DTEXOPCAPS_MODULATEINVCOLOR_ADDALPHA 0x00100000 +CONSTANT: D3DTEXOPCAPS_BUMPENVMAP 0x00200000 +CONSTANT: D3DTEXOPCAPS_BUMPENVMAPLUMINANCE 0x00400000 +CONSTANT: D3DTEXOPCAPS_DOTPRODUCT3 0x00800000 +CONSTANT: D3DTEXOPCAPS_MULTIPLYADD 0x01000000 +CONSTANT: D3DTEXOPCAPS_LERP 0x02000000 + +CONSTANT: D3DFVFCAPS_TEXCOORDCOUNTMASK 0x0000ffff +CONSTANT: D3DFVFCAPS_DONOTSTRIPELEMENTS 0x00080000 +CONSTANT: D3DFVFCAPS_PSIZE 0x00100000 + +CONSTANT: D3DVTXPCAPS_TEXGEN 0x00000001 +CONSTANT: D3DVTXPCAPS_MATERIALSOURCE7 0x00000002 +CONSTANT: D3DVTXPCAPS_DIRECTIONALLIGHTS 0x00000008 +CONSTANT: D3DVTXPCAPS_POSITIONALLIGHTS 0x00000010 +CONSTANT: D3DVTXPCAPS_LOCALVIEWER 0x00000020 +CONSTANT: D3DVTXPCAPS_TWEENING 0x00000040 +CONSTANT: D3DVTXPCAPS_TEXGEN_SPHEREMAP 0x00000100 +CONSTANT: D3DVTXPCAPS_NO_TEXGEN_NONLOCALVIEWER 0x00000200 + +CONSTANT: D3DDEVCAPS2_STREAMOFFSET 0x00000001 +CONSTANT: D3DDEVCAPS2_DMAPNPATCH 0x00000002 +CONSTANT: D3DDEVCAPS2_ADAPTIVETESSRTPATCH 0x00000004 +CONSTANT: D3DDEVCAPS2_ADAPTIVETESSNPATCH 0x00000008 +CONSTANT: D3DDEVCAPS2_CAN_STRETCHRECT_FROM_TEXTURES 0x00000010 +CONSTANT: D3DDEVCAPS2_PRESAMPLEDDMAPNPATCH 0x00000020 +CONSTANT: D3DDEVCAPS2_VERTEXELEMENTSCANSHARESTREAMOFFSET 0x00000040 + +CONSTANT: D3DDTCAPS_UBYTE4 0x00000001 +CONSTANT: D3DDTCAPS_UBYTE4N 0x00000002 +CONSTANT: D3DDTCAPS_SHORT2N 0x00000004 +CONSTANT: D3DDTCAPS_SHORT4N 0x00000008 +CONSTANT: D3DDTCAPS_USHORT2N 0x00000010 +CONSTANT: D3DDTCAPS_USHORT4N 0x00000020 +CONSTANT: D3DDTCAPS_UDEC3 0x00000040 +CONSTANT: D3DDTCAPS_DEC3N 0x00000080 +CONSTANT: D3DDTCAPS_FLOAT16_2 0x00000100 +CONSTANT: D3DDTCAPS_FLOAT16_4 0x00000200 diff --git a/basis/windows/directx/d3d9types/d3d9types.factor b/basis/windows/directx/d3d9types/d3d9types.factor index ff5953b3f4..fd16bd77ee 100644 --- a/basis/windows/directx/d3d9types/d3d9types.factor +++ b/basis/windows/directx/d3d9types/d3d9types.factor @@ -41,18 +41,18 @@ CONSTANT: D3DCLIPPLANE3 8 CONSTANT: D3DCLIPPLANE4 16 CONSTANT: D3DCLIPPLANE5 32 -CONSTANT: D3DCS_LEFT HEX: 00000001 -CONSTANT: D3DCS_RIGHT HEX: 00000002 -CONSTANT: D3DCS_TOP HEX: 00000004 -CONSTANT: D3DCS_BOTTOM HEX: 00000008 -CONSTANT: D3DCS_FRONT HEX: 00000010 -CONSTANT: D3DCS_BACK HEX: 00000020 -CONSTANT: D3DCS_PLANE0 HEX: 00000040 -CONSTANT: D3DCS_PLANE1 HEX: 00000080 -CONSTANT: D3DCS_PLANE2 HEX: 00000100 -CONSTANT: D3DCS_PLANE3 HEX: 00000200 -CONSTANT: D3DCS_PLANE4 HEX: 00000400 -CONSTANT: D3DCS_PLANE5 HEX: 00000800 +CONSTANT: D3DCS_LEFT 0x00000001 +CONSTANT: D3DCS_RIGHT 0x00000002 +CONSTANT: D3DCS_TOP 0x00000004 +CONSTANT: D3DCS_BOTTOM 0x00000008 +CONSTANT: D3DCS_FRONT 0x00000010 +CONSTANT: D3DCS_BACK 0x00000020 +CONSTANT: D3DCS_PLANE0 0x00000040 +CONSTANT: D3DCS_PLANE1 0x00000080 +CONSTANT: D3DCS_PLANE2 0x00000100 +CONSTANT: D3DCS_PLANE3 0x00000200 +CONSTANT: D3DCS_PLANE4 0x00000400 +CONSTANT: D3DCS_PLANE5 0x00000800 CONSTANT: D3DCS_ALL flags{ @@ -85,7 +85,7 @@ TYPEDEF: int D3DLIGHTTYPE CONSTANT: D3DLIGHT_POINT 1 CONSTANT: D3DLIGHT_SPOT 2 CONSTANT: D3DLIGHT_DIRECTIONAL 3 -CONSTANT: D3DLIGHT_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DLIGHT_FORCE_DWORD 0x7fffffff STRUCT: D3DLIGHT9 { Type D3DLIGHTTYPE } @@ -102,21 +102,21 @@ STRUCT: D3DLIGHT9 { Theta FLOAT } { Phi FLOAT } ; -CONSTANT: D3DCLEAR_TARGET HEX: 00000001 -CONSTANT: D3DCLEAR_ZBUFFER HEX: 00000002 -CONSTANT: D3DCLEAR_STENCIL HEX: 00000004 +CONSTANT: D3DCLEAR_TARGET 0x00000001 +CONSTANT: D3DCLEAR_ZBUFFER 0x00000002 +CONSTANT: D3DCLEAR_STENCIL 0x00000004 TYPEDEF: int D3DSHADEMODE CONSTANT: D3DSHADE_FLAT 1 CONSTANT: D3DSHADE_GOURAUD 2 CONSTANT: D3DSHADE_PHONG 3 -CONSTANT: D3DSHADE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSHADE_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DFILLMODE CONSTANT: D3DFILL_POINT 1 CONSTANT: D3DFILL_WIREFRAME 2 CONSTANT: D3DFILL_SOLID 3 -CONSTANT: D3DFILL_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DFILL_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DBLEND CONSTANT: D3DBLEND_ZERO 1 @@ -136,7 +136,7 @@ CONSTANT: D3DBLEND_BLENDFACTOR 14 CONSTANT: D3DBLEND_INVBLENDFACTOR 15 CONSTANT: D3DBLEND_SRCCOLOR2 16 CONSTANT: D3DBLEND_INVSRCCOLOR2 17 -CONSTANT: D3DBLEND_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DBLEND_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DBLENDOP CONSTANT: D3DBLENDOP_ADD 1 @@ -144,7 +144,7 @@ CONSTANT: D3DBLENDOP_SUBTRACT 2 CONSTANT: D3DBLENDOP_REVSUBTRACT 3 CONSTANT: D3DBLENDOP_MIN 4 CONSTANT: D3DBLENDOP_MAX 5 -CONSTANT: D3DBLENDOP_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DBLENDOP_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DTEXTUREADDRESS CONSTANT: D3DTADDRESS_WRAP 1 @@ -152,13 +152,13 @@ CONSTANT: D3DTADDRESS_MIRROR 2 CONSTANT: D3DTADDRESS_CLAMP 3 CONSTANT: D3DTADDRESS_BORDER 4 CONSTANT: D3DTADDRESS_MIRRORONCE 5 -CONSTANT: D3DTADDRESS_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DTADDRESS_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DCULL CONSTANT: D3DCULL_NONE 1 CONSTANT: D3DCULL_CW 2 CONSTANT: D3DCULL_CCW 3 -CONSTANT: D3DCULL_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DCULL_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DCMPFUNC CONSTANT: D3DCMP_NEVER 1 @@ -169,7 +169,7 @@ CONSTANT: D3DCMP_GREATER 5 CONSTANT: D3DCMP_NOTEQUAL 6 CONSTANT: D3DCMP_GREATEREQUAL 7 CONSTANT: D3DCMP_ALWAYS 8 -CONSTANT: D3DCMP_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DCMP_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DSTENCILOP CONSTANT: D3DSTENCILOP_KEEP 1 @@ -180,20 +180,20 @@ CONSTANT: D3DSTENCILOP_DECRSAT 5 CONSTANT: D3DSTENCILOP_INVERT 6 CONSTANT: D3DSTENCILOP_INCR 7 CONSTANT: D3DSTENCILOP_DECR 8 -CONSTANT: D3DSTENCILOP_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSTENCILOP_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DFOGMODE CONSTANT: D3DFOG_NONE 0 CONSTANT: D3DFOG_EXP 1 CONSTANT: D3DFOG_EXP2 2 CONSTANT: D3DFOG_LINEAR 3 -CONSTANT: D3DFOG_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DFOG_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DZBUFFERTYPE CONSTANT: D3DZB_FALSE 0 CONSTANT: D3DZB_TRUE 1 CONSTANT: D3DZB_USEW 2 -CONSTANT: D3DZB_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DZB_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DPRIMITIVETYPE CONSTANT: D3DPT_POINTLIST 1 @@ -202,7 +202,7 @@ CONSTANT: D3DPT_LINESTRIP 3 CONSTANT: D3DPT_TRIANGLELIST 4 CONSTANT: D3DPT_TRIANGLESTRIP 5 CONSTANT: D3DPT_TRIANGLEFAN 6 -CONSTANT: D3DPT_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DPT_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DTRANSFORMSTATETYPE CONSTANT: D3DTS_VIEW 2 @@ -215,7 +215,7 @@ CONSTANT: D3DTS_TEXTURE4 20 CONSTANT: D3DTS_TEXTURE5 21 CONSTANT: D3DTS_TEXTURE6 22 CONSTANT: D3DTS_TEXTURE7 23 -CONSTANT: D3DTS_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DTS_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DRENDERSTATETYPE CONSTANT: D3DRS_ZENABLE 7 @@ -321,7 +321,7 @@ CONSTANT: D3DRS_SEPARATEALPHABLENDENABLE 206 CONSTANT: D3DRS_SRCBLENDALPHA 207 CONSTANT: D3DRS_DESTBLENDALPHA 208 CONSTANT: D3DRS_BLENDOPALPHA 209 -CONSTANT: D3DRS_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DRS_FORCE_DWORD 0x7fffffff CONSTANT: D3D_MAX_SIMULTANEOUS_RENDERTARGETS 4 @@ -329,18 +329,18 @@ TYPEDEF: int D3DMATERIALCOLORSOURCE CONSTANT: D3DMCS_MATERIAL 0 CONSTANT: D3DMCS_COLOR1 1 CONSTANT: D3DMCS_COLOR2 2 -CONSTANT: D3DMCS_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DMCS_FORCE_DWORD 0x7fffffff CONSTANT: D3DRENDERSTATE_WRAPBIAS 128 -CONSTANT: D3DWRAP_U HEX: 00000001 -CONSTANT: D3DWRAP_V HEX: 00000002 -CONSTANT: D3DWRAP_W HEX: 00000004 +CONSTANT: D3DWRAP_U 0x00000001 +CONSTANT: D3DWRAP_V 0x00000002 +CONSTANT: D3DWRAP_W 0x00000004 -CONSTANT: D3DWRAPCOORD_0 HEX: 00000001 -CONSTANT: D3DWRAPCOORD_1 HEX: 00000002 -CONSTANT: D3DWRAPCOORD_2 HEX: 00000004 -CONSTANT: D3DWRAPCOORD_3 HEX: 00000008 +CONSTANT: D3DWRAPCOORD_0 0x00000001 +CONSTANT: D3DWRAPCOORD_1 0x00000002 +CONSTANT: D3DWRAPCOORD_2 0x00000004 +CONSTANT: D3DWRAPCOORD_3 0x00000008 CONSTANT: D3DCOLORWRITEENABLE_RED 1 CONSTANT: D3DCOLORWRITEENABLE_GREEN 2 @@ -366,7 +366,7 @@ CONSTANT: D3DTSS_COLORARG0 26 CONSTANT: D3DTSS_ALPHAARG0 27 CONSTANT: D3DTSS_RESULTARG 28 CONSTANT: D3DTSS_CONSTANT 32 -CONSTANT: D3DTSS_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DTSS_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DSAMPLERSTATETYPE CONSTANT: D3DSAMP_ADDRESSU 1 @@ -382,7 +382,7 @@ CONSTANT: D3DSAMP_MAXANISOTROPY 10 CONSTANT: D3DSAMP_SRGBTEXTURE 11 CONSTANT: D3DSAMP_ELEMENTINDEX 12 CONSTANT: D3DSAMP_DMAPOFFSET 13 -CONSTANT: D3DSAMP_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSAMP_FORCE_DWORD 0x7fffffff CONSTANT: D3DDMAPSAMPLER 256 @@ -391,11 +391,11 @@ CONSTANT: D3DVERTEXTEXTURESAMPLER1 258 CONSTANT: D3DVERTEXTEXTURESAMPLER2 259 CONSTANT: D3DVERTEXTEXTURESAMPLER3 260 -CONSTANT: D3DTSS_TCI_PASSTHRU HEX: 00000000 -CONSTANT: D3DTSS_TCI_CAMERASPACENORMAL HEX: 00010000 -CONSTANT: D3DTSS_TCI_CAMERASPACEPOSITION HEX: 00020000 -CONSTANT: D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR HEX: 00030000 -CONSTANT: D3DTSS_TCI_SPHEREMAP HEX: 00040000 +CONSTANT: D3DTSS_TCI_PASSTHRU 0x00000000 +CONSTANT: D3DTSS_TCI_CAMERASPACENORMAL 0x00010000 +CONSTANT: D3DTSS_TCI_CAMERASPACEPOSITION 0x00020000 +CONSTANT: D3DTSS_TCI_CAMERASPACEREFLECTIONVECTOR 0x00030000 +CONSTANT: D3DTSS_TCI_SPHEREMAP 0x00040000 TYPEDEF: int D3DTEXTUREOP CONSTANT: D3DTOP_DISABLE 1 @@ -424,18 +424,18 @@ CONSTANT: D3DTOP_BUMPENVMAPLUMINANCE 23 CONSTANT: D3DTOP_DOTPRODUCT3 24 CONSTANT: D3DTOP_MULTIPLYADD 25 CONSTANT: D3DTOP_LERP 26 -CONSTANT: D3DTOP_FORCE_DWORD HEX: 7fffffff - -CONSTANT: D3DTA_SELECTMASK HEX: 0000000f -CONSTANT: D3DTA_DIFFUSE HEX: 00000000 -CONSTANT: D3DTA_CURRENT HEX: 00000001 -CONSTANT: D3DTA_TEXTURE HEX: 00000002 -CONSTANT: D3DTA_TFACTOR HEX: 00000003 -CONSTANT: D3DTA_SPECULAR HEX: 00000004 -CONSTANT: D3DTA_TEMP HEX: 00000005 -CONSTANT: D3DTA_CONSTANT HEX: 00000006 -CONSTANT: D3DTA_COMPLEMENT HEX: 00000010 -CONSTANT: D3DTA_ALPHAREPLICATE HEX: 00000020 +CONSTANT: D3DTOP_FORCE_DWORD 0x7fffffff + +CONSTANT: D3DTA_SELECTMASK 0x0000000f +CONSTANT: D3DTA_DIFFUSE 0x00000000 +CONSTANT: D3DTA_CURRENT 0x00000001 +CONSTANT: D3DTA_TEXTURE 0x00000002 +CONSTANT: D3DTA_TFACTOR 0x00000003 +CONSTANT: D3DTA_SPECULAR 0x00000004 +CONSTANT: D3DTA_TEMP 0x00000005 +CONSTANT: D3DTA_CONSTANT 0x00000006 +CONSTANT: D3DTA_COMPLEMENT 0x00000010 +CONSTANT: D3DTA_ALPHAREPLICATE 0x00000020 TYPEDEF: int D3DTEXTUREFILTERTYPE CONSTANT: D3DTEXF_NONE 0 @@ -445,42 +445,42 @@ CONSTANT: D3DTEXF_ANISOTROPIC 3 CONSTANT: D3DTEXF_PYRAMIDALQUAD 6 CONSTANT: D3DTEXF_GAUSSIANQUAD 7 CONSTANT: D3DTEXF_CONVOLUTIONMONO 8 -CONSTANT: D3DTEXF_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DTEXF_FORCE_DWORD 0x7fffffff CONSTANT: D3DPV_DONOTCOPYDATA 1 -CONSTANT: D3DFVF_RESERVED0 HEX: 001 -CONSTANT: D3DFVF_POSITION_MASK HEX: 400E -CONSTANT: D3DFVF_XYZ HEX: 002 -CONSTANT: D3DFVF_XYZRHW HEX: 004 -CONSTANT: D3DFVF_XYZB1 HEX: 006 -CONSTANT: D3DFVF_XYZB2 HEX: 008 -CONSTANT: D3DFVF_XYZB3 HEX: 00a -CONSTANT: D3DFVF_XYZB4 HEX: 00c -CONSTANT: D3DFVF_XYZB5 HEX: 00e -CONSTANT: D3DFVF_XYZW HEX: 4002 - -CONSTANT: D3DFVF_NORMAL HEX: 010 -CONSTANT: D3DFVF_PSIZE HEX: 020 -CONSTANT: D3DFVF_DIFFUSE HEX: 040 -CONSTANT: D3DFVF_SPECULAR HEX: 080 - -CONSTANT: D3DFVF_TEXCOUNT_MASK HEX: f00 +CONSTANT: D3DFVF_RESERVED0 0x001 +CONSTANT: D3DFVF_POSITION_MASK 0x400E +CONSTANT: D3DFVF_XYZ 0x002 +CONSTANT: D3DFVF_XYZRHW 0x004 +CONSTANT: D3DFVF_XYZB1 0x006 +CONSTANT: D3DFVF_XYZB2 0x008 +CONSTANT: D3DFVF_XYZB3 0x00a +CONSTANT: D3DFVF_XYZB4 0x00c +CONSTANT: D3DFVF_XYZB5 0x00e +CONSTANT: D3DFVF_XYZW 0x4002 + +CONSTANT: D3DFVF_NORMAL 0x010 +CONSTANT: D3DFVF_PSIZE 0x020 +CONSTANT: D3DFVF_DIFFUSE 0x040 +CONSTANT: D3DFVF_SPECULAR 0x080 + +CONSTANT: D3DFVF_TEXCOUNT_MASK 0xf00 CONSTANT: D3DFVF_TEXCOUNT_SHIFT 8 -CONSTANT: D3DFVF_TEX0 HEX: 000 -CONSTANT: D3DFVF_TEX1 HEX: 100 -CONSTANT: D3DFVF_TEX2 HEX: 200 -CONSTANT: D3DFVF_TEX3 HEX: 300 -CONSTANT: D3DFVF_TEX4 HEX: 400 -CONSTANT: D3DFVF_TEX5 HEX: 500 -CONSTANT: D3DFVF_TEX6 HEX: 600 -CONSTANT: D3DFVF_TEX7 HEX: 700 -CONSTANT: D3DFVF_TEX8 HEX: 800 +CONSTANT: D3DFVF_TEX0 0x000 +CONSTANT: D3DFVF_TEX1 0x100 +CONSTANT: D3DFVF_TEX2 0x200 +CONSTANT: D3DFVF_TEX3 0x300 +CONSTANT: D3DFVF_TEX4 0x400 +CONSTANT: D3DFVF_TEX5 0x500 +CONSTANT: D3DFVF_TEX6 0x600 +CONSTANT: D3DFVF_TEX7 0x700 +CONSTANT: D3DFVF_TEX8 0x800 -CONSTANT: D3DFVF_LASTBETA_UBYTE4 HEX: 1000 -CONSTANT: D3DFVF_LASTBETA_D3DCOLOR HEX: 8000 +CONSTANT: D3DFVF_LASTBETA_UBYTE4 0x1000 +CONSTANT: D3DFVF_LASTBETA_D3DCOLOR 0x8000 -CONSTANT: D3DFVF_RESERVED2 HEX: 6000 +CONSTANT: D3DFVF_RESERVED2 0x6000 TYPEDEF: int D3DDECLUSAGE CONSTANT: D3DDECLUSAGE_POSITION 0 @@ -546,11 +546,11 @@ TYPEDEF: D3DVERTEXELEMENT9* LPD3DVERTEXELEMENT9 CONSTANT: D3DDP_MAXTEXCOORD 8 -CONSTANT: D3DSTREAMSOURCE_INDEXEDDATA HEX: 40000000 -CONSTANT: D3DSTREAMSOURCE_INSTANCEDATA HEX: 80000000 +CONSTANT: D3DSTREAMSOURCE_INDEXEDDATA 0x40000000 +CONSTANT: D3DSTREAMSOURCE_INSTANCEDATA 0x80000000 -CONSTANT: D3DSI_OPCODE_MASK HEX: 0000FFFF -CONSTANT: D3DSI_INSTLENGTH_MASK HEX: 0F000000 +CONSTANT: D3DSI_OPCODE_MASK 0x0000FFFF +CONSTANT: D3DSI_INSTLENGTH_MASK 0x0F000000 CONSTANT: D3DSI_INSTLENGTH_SHIFT 24 TYPEDEF: int D3DSHADER_INSTRUCTION_OPCODE_TYPE @@ -636,14 +636,14 @@ CONSTANT: D3DSIO_TEXLDD 93 CONSTANT: D3DSIO_SETP 94 CONSTANT: D3DSIO_TEXLDL 95 CONSTANT: D3DSIO_BREAKP 96 -CONSTANT: D3DSIO_PHASE HEX: FFFD -CONSTANT: D3DSIO_COMMENT HEX: FFFE -CONSTANT: D3DSIO_END HEX: FFFF -CONSTANT: D3DSIO_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSIO_PHASE 0xFFFD +CONSTANT: D3DSIO_COMMENT 0xFFFE +CONSTANT: D3DSIO_END 0xFFFF +CONSTANT: D3DSIO_FORCE_DWORD 0x7fffffff -CONSTANT: D3DSI_COISSUE HEX: 40000000 +CONSTANT: D3DSI_COISSUE 0x40000000 -CONSTANT: D3DSP_OPCODESPECIFICCONTROL_MASK HEX: 00ff0000 +CONSTANT: D3DSP_OPCODESPECIFICCONTROL_MASK 0x00ff0000 CONSTANT: D3DSP_OPCODESPECIFICCONTROL_SHIFT 16 : D3DSI_TEXLD_PROJECT ( -- n ) 1 D3DSP_OPCODESPECIFICCONTROL_SHIFT shift ; inline @@ -662,34 +662,34 @@ CONSTANT: D3DSPC_RESERVED1 7 CONSTANT: D3DSHADER_COMPARISON_SHIFT D3DSP_OPCODESPECIFICCONTROL_SHIFT : D3DSHADER_COMPARISON_MASK ( -- n ) 7 D3DSHADER_COMPARISON_SHIFT shift ; inline -CONSTANT: D3DSHADER_INSTRUCTION_PREDICATED HEX: 10000000 +CONSTANT: D3DSHADER_INSTRUCTION_PREDICATED 0x10000000 CONSTANT: D3DSP_DCL_USAGE_SHIFT 0 -CONSTANT: D3DSP_DCL_USAGE_MASK HEX: 0000000f +CONSTANT: D3DSP_DCL_USAGE_MASK 0x0000000f CONSTANT: D3DSP_DCL_USAGEINDEX_SHIFT 16 -CONSTANT: D3DSP_DCL_USAGEINDEX_MASK HEX: 000f0000 +CONSTANT: D3DSP_DCL_USAGEINDEX_MASK 0x000f0000 CONSTANT: D3DSP_TEXTURETYPE_SHIFT 27 -CONSTANT: D3DSP_TEXTURETYPE_MASK HEX: 78000000 +CONSTANT: D3DSP_TEXTURETYPE_MASK 0x78000000 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 : D3DSTT_VOLUME ( -- n ) 4 D3DSP_TEXTURETYPE_SHIFT shift ; inline -CONSTANT: D3DSTT_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSTT_FORCE_DWORD 0x7fffffff -CONSTANT: D3DSP_REGNUM_MASK HEX: 000007FF +CONSTANT: D3DSP_REGNUM_MASK 0x000007FF -CONSTANT: D3DSP_WRITEMASK_0 HEX: 00010000 -CONSTANT: D3DSP_WRITEMASK_1 HEX: 00020000 -CONSTANT: D3DSP_WRITEMASK_2 HEX: 00040000 -CONSTANT: D3DSP_WRITEMASK_3 HEX: 00080000 -CONSTANT: D3DSP_WRITEMASK_ALL HEX: 000F0000 +CONSTANT: D3DSP_WRITEMASK_0 0x00010000 +CONSTANT: D3DSP_WRITEMASK_1 0x00020000 +CONSTANT: D3DSP_WRITEMASK_2 0x00040000 +CONSTANT: D3DSP_WRITEMASK_3 0x00080000 +CONSTANT: D3DSP_WRITEMASK_ALL 0x000F0000 CONSTANT: D3DSP_DSTMOD_SHIFT 20 -CONSTANT: D3DSP_DSTMOD_MASK HEX: 00F00000 +CONSTANT: D3DSP_DSTMOD_MASK 0x00F00000 : D3DSPDM_NONE ( -- n ) 0 D3DSP_DSTMOD_SHIFT shift ; inline : D3DSPDM_SATURATE ( -- n ) 1 D3DSP_DSTMOD_SHIFT shift ; inline @@ -697,12 +697,12 @@ CONSTANT: D3DSP_DSTMOD_MASK HEX: 00F00000 : D3DSPDM_MSAMPCENTROID ( -- n ) 4 D3DSP_DSTMOD_SHIFT shift ; inline CONSTANT: D3DSP_DSTSHIFT_SHIFT 24 -CONSTANT: D3DSP_DSTSHIFT_MASK HEX: 0F000000 +CONSTANT: D3DSP_DSTSHIFT_MASK 0x0F000000 CONSTANT: D3DSP_REGTYPE_SHIFT 28 CONSTANT: D3DSP_REGTYPE_SHIFT2 8 -CONSTANT: D3DSP_REGTYPE_MASK HEX: 70000000 -CONSTANT: D3DSP_REGTYPE_MASK2 HEX: 00001800 +CONSTANT: D3DSP_REGTYPE_MASK 0x70000000 +CONSTANT: D3DSP_REGTYPE_MASK2 0x00001800 TYPEDEF: int D3DSHADER_PARAM_REGISTER_TYPE CONSTANT: D3DSPR_TEMP 0 @@ -727,7 +727,7 @@ CONSTANT: D3DSPR_TEMPFLOAT16 16 CONSTANT: D3DSPR_MISCTYPE 17 CONSTANT: D3DSPR_LABEL 18 CONSTANT: D3DSPR_PREDICATE 19 -CONSTANT: D3DSPR_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSPR_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DSHADER_MISCTYPE_OFFSETS CONSTANT: D3DSMO_POSITION 0 @@ -737,7 +737,7 @@ TYPEDEF: int D3DVS_RASTOUT_OFFSETS CONSTANT: D3DSRO_POSITION 0 CONSTANT: D3DSRO_FOG 1 CONSTANT: D3DSRO_POINT_SIZE 2 -CONSTANT: D3DSRO_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSRO_FORCE_DWORD 0x7fffffff CONSTANT: D3DVS_ADDRESSMODE_SHIFT 13 : D3DVS_ADDRESSMODE_MASK ( -- n ) 1 D3DVS_ADDRESSMODE_SHIFT shift ; inline @@ -745,7 +745,7 @@ CONSTANT: D3DVS_ADDRESSMODE_SHIFT 13 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 HEX: 7fffffff +CONSTANT: D3DVS_ADDRMODE_FORCE_DWORD 0x7fffffff CONSTANT: D3DSHADER_ADDRESSMODE_SHIFT 13 : D3DSHADER_ADDRESSMODE_MASK ( -- n ) 1 D3DSHADER_ADDRESSMODE_SHIFT shift ; inline @@ -753,10 +753,10 @@ CONSTANT: D3DSHADER_ADDRESSMODE_SHIFT 13 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 HEX: 7fffffff +CONSTANT: D3DSHADER_ADDRMODE_FORCE_DWORD 0x7fffffff CONSTANT: D3DVS_SWIZZLE_SHIFT 16 -CONSTANT: D3DVS_SWIZZLE_MASK HEX: 00FF0000 +CONSTANT: D3DVS_SWIZZLE_MASK 0x00FF0000 CONSTANT: D3DVS_X_X $[ 0 16 shift ] CONSTANT: D3DVS_X_Y $[ 1 16 shift ] @@ -781,9 +781,9 @@ CONSTANT: D3DVS_W_W $[ 3 16 6 + shift ] CONSTANT: D3DVS_NOSWIZZLE flags{ D3DVS_X_X D3DVS_Y_Y D3DVS_Z_Z D3DVS_W_W } CONSTANT: D3DSP_SWIZZLE_SHIFT 16 -CONSTANT: D3DSP_SWIZZLE_MASK HEX: 00FF0000 +CONSTANT: D3DSP_SWIZZLE_MASK 0x00FF0000 CONSTANT: D3DSP_SRCMOD_SHIFT 24 -CONSTANT: D3DSP_SRCMOD_MASK HEX: 0F000000 +CONSTANT: D3DSP_SRCMOD_MASK 0x0F000000 TYPEDEF: int D3DSHADER_PARAM_SRCMOD_TYPE CONSTANT: D3DSPSM_NONE $[ 0 24 shift ] @@ -800,47 +800,47 @@ CONSTANT: D3DSPSM_DW $[ 10 24 shift ] CONSTANT: D3DSPSM_ABS $[ 11 24 shift ] CONSTANT: D3DSPSM_ABSNEG $[ 12 24 shift ] CONSTANT: D3DSPSM_NOT $[ 13 24 shift ] -CONSTANT: D3DSPSM_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSPSM_FORCE_DWORD 0x7fffffff : D3DPS_VERSION ( major minor -- n ) - swap 8 shift bitor HEX: FFFF0000 bitor ; inline + swap 8 shift bitor 0xFFFF0000 bitor ; inline : D3DVS_VERSION ( major minor -- n ) - swap 8 shift bitor HEX: FFFF0000 bitor ; inline + swap 8 shift bitor 0xFFFF0000 bitor ; inline : D3DSHADER_VERSION_MAJOR ( version -- n ) - -8 shift HEX: FF bitand ; inline + -8 shift 0xFF bitand ; inline : D3DSHADER_VERSION_MINOR ( version -- n ) - HEX: FF bitand ; inline + 0xFF bitand ; inline CONSTANT: D3DSI_COMMENTSIZE_SHIFT 16 -CONSTANT: D3DSI_COMMENTSIZE_MASK HEX: 7FFF0000 +CONSTANT: D3DSI_COMMENTSIZE_MASK 0x7FFF0000 -CONSTANT: D3DPS_END() HEX: 0000FFFF -CONSTANT: D3DVS_END() HEX: 0000FFFF +CONSTANT: D3DPS_END() 0x0000FFFF +CONSTANT: D3DVS_END() 0x0000FFFF TYPEDEF: int D3DBASISTYPE CONSTANT: D3DBASIS_BEZIER 0 CONSTANT: D3DBASIS_BSPLINE 1 CONSTANT: D3DBASIS_CATMULL_ROM 2 -CONSTANT: D3DBASIS_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DBASIS_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DDEGREETYPE CONSTANT: D3DDEGREE_LINEAR 1 CONSTANT: D3DDEGREE_QUADRATIC 2 CONSTANT: D3DDEGREE_CUBIC 3 CONSTANT: D3DDEGREE_QUINTIC 5 -CONSTANT: D3DDEGREE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DDEGREE_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DPATCHEDGESTYLE CONSTANT: D3DPATCHEDGE_DISCRETE 0 CONSTANT: D3DPATCHEDGE_CONTINUOUS 1 -CONSTANT: D3DPATCHEDGE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DPATCHEDGE_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DSTATEBLOCKTYPE CONSTANT: D3DSBT_ALL 1 CONSTANT: D3DSBT_PIXELSTATE 2 CONSTANT: D3DSBT_VERTEXSTATE 3 -CONSTANT: D3DSBT_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSBT_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DVERTEXBLENDFLAGS CONSTANT: D3DVBF_DISABLE 0 @@ -849,7 +849,7 @@ CONSTANT: D3DVBF_2WEIGHTS 2 CONSTANT: D3DVBF_3WEIGHTS 3 CONSTANT: D3DVBF_TWEENING 255 CONSTANT: D3DVBF_0WEIGHTS 256 -CONSTANT: D3DVBF_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DVBF_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DTEXTURETRANSFORMFLAGS CONSTANT: D3DTTFF_DISABLE 0 @@ -858,7 +858,7 @@ CONSTANT: D3DTTFF_COUNT2 2 CONSTANT: D3DTTFF_COUNT3 3 CONSTANT: D3DTTFF_COUNT4 4 CONSTANT: D3DTTFF_PROJECTED 256 -CONSTANT: D3DTTFF_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DTTFF_FORCE_DWORD 0x7fffffff CONSTANT: D3DFVF_TEXTUREFORMAT2 0 CONSTANT: D3DFVF_TEXTUREFORMAT1 3 @@ -879,7 +879,7 @@ CONSTANT: D3DDEVTYPE_HAL 1 CONSTANT: D3DDEVTYPE_REF 2 CONSTANT: D3DDEVTYPE_SW 3 CONSTANT: D3DDEVTYPE_NULLREF 4 -CONSTANT: D3DDEVTYPE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DDEVTYPE_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DMULTISAMPLE_TYPE CONSTANT: D3DMULTISAMPLE_NONE 0 @@ -899,7 +899,7 @@ CONSTANT: D3DMULTISAMPLE_13_SAMPLES 13 CONSTANT: D3DMULTISAMPLE_14_SAMPLES 14 CONSTANT: D3DMULTISAMPLE_15_SAMPLES 15 CONSTANT: D3DMULTISAMPLE_16_SAMPLES 16 -CONSTANT: D3DMULTISAMPLE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DMULTISAMPLE_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DFORMAT CONSTANT: D3DFMT_UNKNOWN 0 @@ -931,15 +931,15 @@ CONSTANT: D3DFMT_X8L8V8U8 62 CONSTANT: D3DFMT_Q8W8V8U8 63 CONSTANT: D3DFMT_V16U16 64 CONSTANT: D3DFMT_A2W10V10U10 67 -CONSTANT: D3DFMT_UYVY HEX: 55595659 -CONSTANT: D3DFMT_R8G8_B8G8 HEX: 52474247 -CONSTANT: D3DFMT_YUY2 HEX: 59555932 -CONSTANT: D3DFMT_G8R8_G8B8 HEX: 47524742 -CONSTANT: D3DFMT_DXT1 HEX: 44585431 -CONSTANT: D3DFMT_DXT2 HEX: 44585432 -CONSTANT: D3DFMT_DXT3 HEX: 44585433 -CONSTANT: D3DFMT_DXT4 HEX: 44585434 -CONSTANT: D3DFMT_DXT5 HEX: 44585435 +CONSTANT: D3DFMT_UYVY 0x55595659 +CONSTANT: D3DFMT_R8G8_B8G8 0x52474247 +CONSTANT: D3DFMT_YUY2 0x59555932 +CONSTANT: D3DFMT_G8R8_G8B8 0x47524742 +CONSTANT: D3DFMT_DXT1 0x44585431 +CONSTANT: D3DFMT_DXT2 0x44585432 +CONSTANT: D3DFMT_DXT3 0x44585433 +CONSTANT: D3DFMT_DXT4 0x44585434 +CONSTANT: D3DFMT_DXT5 0x44585435 CONSTANT: D3DFMT_D16_LOCKABLE 70 CONSTANT: D3DFMT_D32 71 CONSTANT: D3DFMT_D15S1 73 @@ -956,7 +956,7 @@ CONSTANT: D3DFMT_VERTEXDATA 100 CONSTANT: D3DFMT_INDEX16 101 CONSTANT: D3DFMT_INDEX32 102 CONSTANT: D3DFMT_Q16W16V16U16 110 -CONSTANT: D3DFMT_MULTI2_ARGB8 HEX: 4d455431 +CONSTANT: D3DFMT_MULTI2_ARGB8 0x4d455431 CONSTANT: D3DFMT_R16F 111 CONSTANT: D3DFMT_G16R16F 112 CONSTANT: D3DFMT_A16B16G16R16F 113 @@ -967,7 +967,7 @@ CONSTANT: D3DFMT_CxV8U8 117 CONSTANT: D3DFMT_A1 118 CONSTANT: D3DFMT_A2B10G10R10_XR_BIAS 119 CONSTANT: D3DFMT_BINARYBUFFER 199 -CONSTANT: D3DFMT_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DFMT_FORCE_DWORD 0x7fffffff STRUCT: D3DDISPLAYMODE { Width UINT } @@ -987,16 +987,16 @@ CONSTANT: D3DSWAPEFFECT_FLIP 2 CONSTANT: D3DSWAPEFFECT_COPY 3 CONSTANT: D3DSWAPEFFECT_OVERLAY 4 CONSTANT: D3DSWAPEFFECT_FLIPEX 5 -CONSTANT: D3DSWAPEFFECT_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DSWAPEFFECT_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DPOOL CONSTANT: D3DPOOL_DEFAULT 0 CONSTANT: D3DPOOL_MANAGED 1 CONSTANT: D3DPOOL_SYSTEMMEM 2 CONSTANT: D3DPOOL_SCRATCH 3 -CONSTANT: D3DPOOL_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DPOOL_FORCE_DWORD 0x7fffffff -CONSTANT: D3DPRESENT_RATE_DEFAULT HEX: 00000000 +CONSTANT: D3DPRESENT_RATE_DEFAULT 0x00000000 STRUCT: D3DPRESENT_PARAMETERS { BackBufferWidth UINT } @@ -1014,18 +1014,18 @@ STRUCT: D3DPRESENT_PARAMETERS { FullScreen_RefreshRateInHz UINT } { PresentationInterval UINT } ; -CONSTANT: D3DPRESENTFLAG_LOCKABLE_BACKBUFFER HEX: 00000001 -CONSTANT: D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL HEX: 00000002 -CONSTANT: D3DPRESENTFLAG_DEVICECLIP HEX: 00000004 -CONSTANT: D3DPRESENTFLAG_VIDEO HEX: 00000010 +CONSTANT: D3DPRESENTFLAG_LOCKABLE_BACKBUFFER 0x00000001 +CONSTANT: D3DPRESENTFLAG_DISCARD_DEPTHSTENCIL 0x00000002 +CONSTANT: D3DPRESENTFLAG_DEVICECLIP 0x00000004 +CONSTANT: D3DPRESENTFLAG_VIDEO 0x00000010 -CONSTANT: D3DPRESENTFLAG_NOAUTOROTATE HEX: 00000020 -CONSTANT: D3DPRESENTFLAG_UNPRUNEDMODE HEX: 00000040 -CONSTANT: D3DPRESENTFLAG_OVERLAY_LIMITEDRGB HEX: 00000080 -CONSTANT: D3DPRESENTFLAG_OVERLAY_YCbCr_BT709 HEX: 00000100 -CONSTANT: D3DPRESENTFLAG_OVERLAY_YCbCr_xvYCC HEX: 00000200 -CONSTANT: D3DPRESENTFLAG_RESTRICTED_CONTENT HEX: 00000400 -CONSTANT: D3DPRESENTFLAG_RESTRICT_SHARED_RESOURCE_DRIVER HEX: 00000800 +CONSTANT: D3DPRESENTFLAG_NOAUTOROTATE 0x00000020 +CONSTANT: D3DPRESENTFLAG_UNPRUNEDMODE 0x00000040 +CONSTANT: D3DPRESENTFLAG_OVERLAY_LIMITEDRGB 0x00000080 +CONSTANT: D3DPRESENTFLAG_OVERLAY_YCbCr_BT709 0x00000100 +CONSTANT: D3DPRESENTFLAG_OVERLAY_YCbCr_xvYCC 0x00000200 +CONSTANT: D3DPRESENTFLAG_RESTRICTED_CONTENT 0x00000400 +CONSTANT: D3DPRESENTFLAG_RESTRICT_SHARED_RESOURCE_DRIVER 0x00000800 STRUCT: D3DGAMMARAMP { red WORD[256] } @@ -1036,7 +1036,7 @@ TYPEDEF: int D3DBACKBUFFER_TYPE CONSTANT: D3DBACKBUFFER_TYPE_MONO 0 CONSTANT: D3DBACKBUFFER_TYPE_LEFT 1 CONSTANT: D3DBACKBUFFER_TYPE_RIGHT 2 -CONSTANT: D3DBACKBUFFER_TYPE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DBACKBUFFER_TYPE_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DRESOURCETYPE CONSTANT: D3DRTYPE_SURFACE 1 @@ -1046,36 +1046,36 @@ CONSTANT: D3DRTYPE_VOLUMETEXTURE 4 CONSTANT: D3DRTYPE_CUBETEXTURE 5 CONSTANT: D3DRTYPE_VERTEXBUFFER 6 CONSTANT: D3DRTYPE_INDEXBUFFER 7 -CONSTANT: D3DRTYPE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DRTYPE_FORCE_DWORD 0x7fffffff -CONSTANT: D3DUSAGE_RENDERTARGET HEX: 00000001 -CONSTANT: D3DUSAGE_DEPTHSTENCIL HEX: 00000002 -CONSTANT: D3DUSAGE_DYNAMIC HEX: 00000200 +CONSTANT: D3DUSAGE_RENDERTARGET 0x00000001 +CONSTANT: D3DUSAGE_DEPTHSTENCIL 0x00000002 +CONSTANT: D3DUSAGE_DYNAMIC 0x00000200 -CONSTANT: D3DUSAGE_NONSECURE HEX: 00800000 +CONSTANT: D3DUSAGE_NONSECURE 0x00800000 -CONSTANT: D3DUSAGE_AUTOGENMIPMAP HEX: 00000400 -CONSTANT: D3DUSAGE_DMAP HEX: 00004000 +CONSTANT: D3DUSAGE_AUTOGENMIPMAP 0x00000400 +CONSTANT: D3DUSAGE_DMAP 0x00004000 -CONSTANT: D3DUSAGE_QUERY_LEGACYBUMPMAP HEX: 00008000 -CONSTANT: D3DUSAGE_QUERY_SRGBREAD HEX: 00010000 -CONSTANT: D3DUSAGE_QUERY_FILTER HEX: 00020000 -CONSTANT: D3DUSAGE_QUERY_SRGBWRITE HEX: 00040000 -CONSTANT: D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING HEX: 00080000 -CONSTANT: D3DUSAGE_QUERY_VERTEXTEXTURE HEX: 00100000 -CONSTANT: D3DUSAGE_QUERY_WRAPANDMIP HEX: 00200000 +CONSTANT: D3DUSAGE_QUERY_LEGACYBUMPMAP 0x00008000 +CONSTANT: D3DUSAGE_QUERY_SRGBREAD 0x00010000 +CONSTANT: D3DUSAGE_QUERY_FILTER 0x00020000 +CONSTANT: D3DUSAGE_QUERY_SRGBWRITE 0x00040000 +CONSTANT: D3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING 0x00080000 +CONSTANT: D3DUSAGE_QUERY_VERTEXTEXTURE 0x00100000 +CONSTANT: D3DUSAGE_QUERY_WRAPANDMIP 0x00200000 -CONSTANT: D3DUSAGE_WRITEONLY HEX: 00000008 -CONSTANT: D3DUSAGE_SOFTWAREPROCESSING HEX: 00000010 -CONSTANT: D3DUSAGE_DONOTCLIP HEX: 00000020 -CONSTANT: D3DUSAGE_POINTS HEX: 00000040 -CONSTANT: D3DUSAGE_RTPATCHES HEX: 00000080 -CONSTANT: D3DUSAGE_NPATCHES HEX: 00000100 +CONSTANT: D3DUSAGE_WRITEONLY 0x00000008 +CONSTANT: D3DUSAGE_SOFTWAREPROCESSING 0x00000010 +CONSTANT: D3DUSAGE_DONOTCLIP 0x00000020 +CONSTANT: D3DUSAGE_POINTS 0x00000040 +CONSTANT: D3DUSAGE_RTPATCHES 0x00000080 +CONSTANT: D3DUSAGE_NPATCHES 0x00000100 -CONSTANT: D3DUSAGE_TEXTAPI HEX: 10000000 -CONSTANT: D3DUSAGE_RESTRICTED_CONTENT HEX: 00000800 -CONSTANT: D3DUSAGE_RESTRICT_SHARED_RESOURCE HEX: 00002000 -CONSTANT: D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER HEX: 00001000 +CONSTANT: D3DUSAGE_TEXTAPI 0x10000000 +CONSTANT: D3DUSAGE_RESTRICTED_CONTENT 0x00000800 +CONSTANT: D3DUSAGE_RESTRICT_SHARED_RESOURCE 0x00002000 +CONSTANT: D3DUSAGE_RESTRICT_SHARED_RESOURCE_DRIVER 0x00001000 TYPEDEF: int D3DCUBEMAP_FACES CONSTANT: D3DCUBEMAP_FACE_POSITIVE_X 0 @@ -1084,15 +1084,15 @@ CONSTANT: D3DCUBEMAP_FACE_POSITIVE_Y 2 CONSTANT: D3DCUBEMAP_FACE_NEGATIVE_Y 3 CONSTANT: D3DCUBEMAP_FACE_POSITIVE_Z 4 CONSTANT: D3DCUBEMAP_FACE_NEGATIVE_Z 5 -CONSTANT: D3DCUBEMAP_FACE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DCUBEMAP_FACE_FORCE_DWORD 0x7fffffff -CONSTANT: D3DLOCK_READONLY HEX: 00000010 -CONSTANT: D3DLOCK_DISCARD HEX: 00002000 -CONSTANT: D3DLOCK_NOOVERWRITE HEX: 00001000 -CONSTANT: D3DLOCK_NOSYSLOCK HEX: 00000800 -CONSTANT: D3DLOCK_DONOTWAIT HEX: 00004000 +CONSTANT: D3DLOCK_READONLY 0x00000010 +CONSTANT: D3DLOCK_DISCARD 0x00002000 +CONSTANT: D3DLOCK_NOOVERWRITE 0x00001000 +CONSTANT: D3DLOCK_NOSYSLOCK 0x00000800 +CONSTANT: D3DLOCK_DONOTWAIT 0x00004000 -CONSTANT: D3DLOCK_NO_DIRTY_UPDATE HEX: 00008000 +CONSTANT: D3DLOCK_NO_DIRTY_UPDATE 0x00008000 STRUCT: D3DVERTEXBUFFER_DESC { Format D3DFORMAT } @@ -1186,7 +1186,7 @@ STRUCT: D3DRASTER_STATUS TYPEDEF: int D3DDEBUGMONITORTOKENS CONSTANT: D3DDMT_ENABLE 0 CONSTANT: D3DDMT_DISABLE 1 -CONSTANT: D3DDMT_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DDMT_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DQUERYTYPE CONSTANT: D3DQUERYTYPE_VCACHE 4 @@ -1279,7 +1279,7 @@ CONSTANT: D3DCOMPOSERECTS_COPY 1 CONSTANT: D3DCOMPOSERECTS_OR 2 CONSTANT: D3DCOMPOSERECTS_AND 3 CONSTANT: D3DCOMPOSERECTS_NEG 4 -CONSTANT: D3DCOMPOSERECTS_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DCOMPOSERECTS_FORCE_DWORD 0x7fffffff STRUCT: D3DCOMPOSERECTDESC { X USHORT } @@ -1293,7 +1293,7 @@ STRUCT: D3DCOMPOSERECTDESTINATION { X SHORT } { Y SHORT } ; -CONSTANT: D3DCOMPOSERECTS_MAXNUMRECTS HEX: FFFF +CONSTANT: D3DCOMPOSERECTS_MAXNUMRECTS 0xFFFF CONSTANT: D3DCONVOLUTIONMONO_MAXWIDTH 7 : D3DCONVOLUTIONMONO_MAXHEIGHT ( -- n ) D3DCONVOLUTIONMONO_MAXWIDTH ; inline CONSTANT: D3DFMT_A1_SURFACE_MAXWIDTH 8192 @@ -1330,11 +1330,11 @@ CONSTANT: D3DDISPLAYROTATION_90 2 CONSTANT: D3DDISPLAYROTATION_180 3 CONSTANT: D3DDISPLAYROTATION_270 4 -CONSTANT: D3D9_RESOURCE_PRIORITY_MINIMUM HEX: 28000000 -CONSTANT: D3D9_RESOURCE_PRIORITY_LOW HEX: 50000000 -CONSTANT: D3D9_RESOURCE_PRIORITY_NORMAL HEX: 78000000 -CONSTANT: D3D9_RESOURCE_PRIORITY_HIGH HEX: a0000000 -CONSTANT: D3D9_RESOURCE_PRIORITY_MAXIMUM HEX: c8000000 +CONSTANT: D3D9_RESOURCE_PRIORITY_MINIMUM 0x28000000 +CONSTANT: D3D9_RESOURCE_PRIORITY_LOW 0x50000000 +CONSTANT: D3D9_RESOURCE_PRIORITY_NORMAL 0x78000000 +CONSTANT: D3D9_RESOURCE_PRIORITY_HIGH 0xa0000000 +CONSTANT: D3D9_RESOURCE_PRIORITY_MAXIMUM 0xc8000000 CONSTANT: D3D_OMAC_SIZE 16 @@ -1431,17 +1431,17 @@ STRUCT: D3DAUTHENTICATEDCHANNEL_QUERYOUTPUTID_OUTPUT { OutputID UINT64 } ; TYPEDEF: int D3DBUSTYPE -CONSTANT: D3DBUSTYPE_OTHER HEX: 00000000 -CONSTANT: D3DBUSTYPE_PCI HEX: 00000001 -CONSTANT: D3DBUSTYPE_PCIX HEX: 00000002 -CONSTANT: D3DBUSTYPE_PCIEXPRESS HEX: 00000003 -CONSTANT: D3DBUSTYPE_AGP HEX: 00000004 -CONSTANT: D3DBUSIMPL_MODIFIER_INSIDE_OF_CHIPSET HEX: 00010000 -CONSTANT: D3DBUSIMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_CHIP HEX: 00020000 -CONSTANT: D3DBUSIMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_SOCKET HEX: 00030000 -CONSTANT: D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR HEX: 00040000 -CONSTANT: D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR_INSIDE_OF_NUAE HEX: 00050000 -CONSTANT: D3DBUSIMPL_MODIFIER_NON_STANDARD HEX: 80000000 +CONSTANT: D3DBUSTYPE_OTHER 0x00000000 +CONSTANT: D3DBUSTYPE_PCI 0x00000001 +CONSTANT: D3DBUSTYPE_PCIX 0x00000002 +CONSTANT: D3DBUSTYPE_PCIEXPRESS 0x00000003 +CONSTANT: D3DBUSTYPE_AGP 0x00000004 +CONSTANT: D3DBUSIMPL_MODIFIER_INSIDE_OF_CHIPSET 0x00010000 +CONSTANT: D3DBUSIMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_CHIP 0x00020000 +CONSTANT: D3DBUSIMPL_MODIFIER_TRACKS_ON_MOTHER_BOARD_TO_SOCKET 0x00030000 +CONSTANT: D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR 0x00040000 +CONSTANT: D3DBUSIMPL_MODIFIER_DAUGHTER_BOARD_CONNECTOR_INSIDE_OF_NUAE 0x00050000 +CONSTANT: D3DBUSIMPL_MODIFIER_NON_STANDARD 0x80000000 STRUCT: D3DAUTHENTICATEDCHANNEL_QUERYINFOBUSTYPE_OUTPUT { Output D3DAUTHENTICATEDCHANNEL_QUERY_OUTPUT } diff --git a/basis/windows/directx/d3dcommon/d3dcommon.factor b/basis/windows/directx/d3dcommon/d3dcommon.factor index 2e8b1efcbd..1acdf21ee5 100644 --- a/basis/windows/directx/d3dcommon/d3dcommon.factor +++ b/basis/windows/directx/d3dcommon/d3dcommon.factor @@ -9,10 +9,10 @@ CONSTANT: D3D_DRIVER_TYPE_SOFTWARE 4 CONSTANT: D3D_DRIVER_TYPE_WARP 5 TYPEDEF: int D3D_DRIVER_TYPE -CONSTANT: D3D_FEATURE_LEVEL_9_1 HEX: 9100 -CONSTANT: D3D_FEATURE_LEVEL_9_2 HEX: 9200 -CONSTANT: D3D_FEATURE_LEVEL_9_3 HEX: 9300 -CONSTANT: D3D_FEATURE_LEVEL_10_0 HEX: a000 -CONSTANT: D3D_FEATURE_LEVEL_10_1 HEX: a100 -CONSTANT: D3D_FEATURE_LEVEL_11_0 HEX: b000 +CONSTANT: D3D_FEATURE_LEVEL_9_1 0x9100 +CONSTANT: D3D_FEATURE_LEVEL_9_2 0x9200 +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 diff --git a/basis/windows/directx/d3dcompiler/d3dcompiler.factor b/basis/windows/directx/d3dcompiler/d3dcompiler.factor index 3d24128e9a..4f78e4e7f2 100644 --- a/basis/windows/directx/d3dcompiler/d3dcompiler.factor +++ b/basis/windows/directx/d3dcompiler/d3dcompiler.factor @@ -78,7 +78,7 @@ FUNCTION: HRESULT D3DGetInputAndOutputSignatureBlob ( CONSTANT: D3DCOMPILER_STRIP_REFLECTION_DATA 1 CONSTANT: D3DCOMPILER_STRIP_DEBUG_INFO 2 CONSTANT: D3DCOMPILER_STRIP_TEST_BLOBS 4 -CONSTANT: D3DCOMPILER_STRIP_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DCOMPILER_STRIP_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DCOMPILER_STRIP_FLAGS FUNCTION: HRESULT D3DStripShader ( diff --git a/basis/windows/directx/d3dx10/d3dx10.factor b/basis/windows/directx/d3dx10/d3dx10.factor index 3eda6f0a53..b29740530f 100644 --- a/basis/windows/directx/d3dx10/d3dx10.factor +++ b/basis/windows/directx/d3dx10/d3dx10.factor @@ -1,12 +1,12 @@ USING: ; IN: windows.directx.d3dx10 -CONSTANT: D3DX10_ERR_CANNOT_MODIFY_INDEX_BUFFER HEX: 88760B54 -CONSTANT: D3DX10_ERR_INVALID_MESH HEX: 88760B55 -CONSTANT: D3DX10_ERR_CANNOT_ATTR_SORT HEX: 88760B56 -CONSTANT: D3DX10_ERR_SKINNING_NOT_SUPPORTED HEX: 88760B57 -CONSTANT: D3DX10_ERR_TOO_MANY_INFLUENCES HEX: 88760B58 -CONSTANT: D3DX10_ERR_INVALID_DATA HEX: 88760B59 -CONSTANT: D3DX10_ERR_LOADED_MESH_HAS_NO_DATA HEX: 88760B5A -CONSTANT: D3DX10_ERR_DUPLICATE_NAMED_FRAGMENT HEX: 88760B5B -CONSTANT: D3DX10_ERR_CANNOT_REMOVE_LAST_ITEM HEX: 88760B5C +CONSTANT: D3DX10_ERR_CANNOT_MODIFY_INDEX_BUFFER 0x88760B54 +CONSTANT: D3DX10_ERR_INVALID_MESH 0x88760B55 +CONSTANT: D3DX10_ERR_CANNOT_ATTR_SORT 0x88760B56 +CONSTANT: D3DX10_ERR_SKINNING_NOT_SUPPORTED 0x88760B57 +CONSTANT: D3DX10_ERR_TOO_MANY_INFLUENCES 0x88760B58 +CONSTANT: D3DX10_ERR_INVALID_DATA 0x88760B59 +CONSTANT: D3DX10_ERR_LOADED_MESH_HAS_NO_DATA 0x88760B5A +CONSTANT: D3DX10_ERR_DUPLICATE_NAMED_FRAGMENT 0x88760B5B +CONSTANT: D3DX10_ERR_CANNOT_REMOVE_LAST_ITEM 0x88760B5C diff --git a/basis/windows/directx/d3dx10core/d3dx10core.factor b/basis/windows/directx/d3dx10core/d3dx10core.factor index 8c5b1fef28..d7ea9f185c 100644 --- a/basis/windows/directx/d3dx10core/d3dx10core.factor +++ b/basis/windows/directx/d3dx10core/d3dx10core.factor @@ -30,11 +30,11 @@ FUNCTION: HRESULT D3DX10GetFeatureLevel1 ( ID3D10Device* pDevice, ID3D10Device1* FUNCTION: HRESULT D3DX10CheckVersion ( UINT D3DSdkVersion, UINT D3DX10SdkVersion ) ; -CONSTANT: D3DX10_SPRITE_SORT_TEXTURE HEX: 01 -CONSTANT: D3DX10_SPRITE_SORT_DEPTH_BACK_TO_FRONT HEX: 02 -CONSTANT: D3DX10_SPRITE_SORT_DEPTH_FRONT_TO_BACK HEX: 04 -CONSTANT: D3DX10_SPRITE_SAVE_STATE HEX: 08 -CONSTANT: D3DX10_SPRITE_ADDREF_TEXTURES HEX: 10 +CONSTANT: D3DX10_SPRITE_SORT_TEXTURE 0x01 +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 STRUCT: D3DX10_SPRITE @@ -182,5 +182,5 @@ ALIAS: D3DX10CreateFontIndirect D3DX10CreateFontIndirectW FUNCTION: HRESULT D3DX10UnsetAllDeviceObjects ( ID3D10Device* pDevice ) ; -CONSTANT: D3DERR_INVALIDCALL HEX: 8876086C -CONSTANT: D3DERR_WASSTILLDRAWING HEX: 8876021C +CONSTANT: D3DERR_INVALIDCALL 0x8876086C +CONSTANT: D3DERR_WASSTILLDRAWING 0x8876021C diff --git a/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor b/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor index 5d61952041..88ef0d23f8 100644 --- a/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor +++ b/basis/windows/directx/d3dx10mesh/d3dx10mesh.factor @@ -19,11 +19,11 @@ STRUCT: D3DX10_ATTRIBUTE_RANGE TYPEDEF: D3DX10_ATTRIBUTE_RANGE* LPD3DX10_ATTRIBUTE_RANGE -CONSTANT: D3DX10_MESH_DISCARD_ATTRIBUTE_BUFFER HEX: 01 -CONSTANT: D3DX10_MESH_DISCARD_ATTRIBUTE_TABLE HEX: 02 -CONSTANT: D3DX10_MESH_DISCARD_POINTREPS HEX: 04 -CONSTANT: D3DX10_MESH_DISCARD_ADJACENCY HEX: 08 -CONSTANT: D3DX10_MESH_DISCARD_DEVICE_BUFFERS HEX: 10 +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 STRUCT: D3DX10_WELD_EPSILONS @@ -97,13 +97,13 @@ FUNCTION: HRESULT UINT Options, ID3DX10Mesh** ppMesh ) ; -CONSTANT: D3DX10_MESHOPT_COMPACT HEX: 01000000 -CONSTANT: D3DX10_MESHOPT_ATTR_SORT HEX: 02000000 -CONSTANT: D3DX10_MESHOPT_VERTEX_CACHE HEX: 04000000 -CONSTANT: D3DX10_MESHOPT_STRIP_REORDER HEX: 08000000 -CONSTANT: D3DX10_MESHOPT_IGNORE_VERTS HEX: 10000000 -CONSTANT: D3DX10_MESHOPT_DO_NOT_SPLIT HEX: 20000000 -CONSTANT: D3DX10_MESHOPT_DEVICE_INDEPENDENT HEX: 00400000 +CONSTANT: D3DX10_MESHOPT_COMPACT 0x01000000 +CONSTANT: D3DX10_MESHOPT_ATTR_SORT 0x02000000 +CONSTANT: D3DX10_MESHOPT_VERTEX_CACHE 0x04000000 +CONSTANT: D3DX10_MESHOPT_STRIP_REORDER 0x08000000 +CONSTANT: D3DX10_MESHOPT_IGNORE_VERTS 0x10000000 +CONSTANT: D3DX10_MESHOPT_DO_NOT_SPLIT 0x20000000 +CONSTANT: D3DX10_MESHOPT_DEVICE_INDEPENDENT 0x00400000 CONSTANT: D3DX10_SKININFO_NO_SCALING 0 CONSTANT: D3DX10_SKININFO_SCALE_TO_1 1 diff --git a/basis/windows/directx/d3dx10tex/d3dx10tex.factor b/basis/windows/directx/d3dx10tex/d3dx10tex.factor index 0a0689c171..fc748f3ec6 100644 --- a/basis/windows/directx/d3dx10tex/d3dx10tex.factor +++ b/basis/windows/directx/d3dx10tex/d3dx10tex.factor @@ -6,30 +6,30 @@ IN: windows.directx.d3dx10tex LIBRARY: d3dx10 -CONSTANT: D3DX10_FILTER_NONE HEX: 00000001 -CONSTANT: D3DX10_FILTER_POINT HEX: 00000002 -CONSTANT: D3DX10_FILTER_LINEAR HEX: 00000003 -CONSTANT: D3DX10_FILTER_TRIANGLE HEX: 00000004 -CONSTANT: D3DX10_FILTER_BOX HEX: 00000005 - -CONSTANT: D3DX10_FILTER_MIRROR_U HEX: 00010000 -CONSTANT: D3DX10_FILTER_MIRROR_V HEX: 00020000 -CONSTANT: D3DX10_FILTER_MIRROR_W HEX: 00040000 -CONSTANT: D3DX10_FILTER_MIRROR HEX: 00070000 - -CONSTANT: D3DX10_FILTER_DITHER HEX: 00080000 -CONSTANT: D3DX10_FILTER_DITHER_DIFFUSION HEX: 00100000 - -CONSTANT: D3DX10_FILTER_SRGB_IN HEX: 00200000 -CONSTANT: D3DX10_FILTER_SRGB_OUT HEX: 00400000 -CONSTANT: D3DX10_FILTER_SRGB HEX: 00600000 +CONSTANT: D3DX10_FILTER_NONE 0x00000001 +CONSTANT: D3DX10_FILTER_POINT 0x00000002 +CONSTANT: D3DX10_FILTER_LINEAR 0x00000003 +CONSTANT: D3DX10_FILTER_TRIANGLE 0x00000004 +CONSTANT: D3DX10_FILTER_BOX 0x00000005 + +CONSTANT: D3DX10_FILTER_MIRROR_U 0x00010000 +CONSTANT: D3DX10_FILTER_MIRROR_V 0x00020000 +CONSTANT: D3DX10_FILTER_MIRROR_W 0x00040000 +CONSTANT: D3DX10_FILTER_MIRROR 0x00070000 + +CONSTANT: D3DX10_FILTER_DITHER 0x00080000 +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 -CONSTANT: D3DX10_NORMALMAP_MIRROR_U HEX: 00010000 -CONSTANT: D3DX10_NORMALMAP_MIRROR_V HEX: 00020000 -CONSTANT: D3DX10_NORMALMAP_MIRROR HEX: 00030000 -CONSTANT: D3DX10_NORMALMAP_INVERTSIGN HEX: 00080000 -CONSTANT: D3DX10_NORMALMAP_COMPUTE_OCCLUSION HEX: 00100000 +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 CONSTANT: D3DX10_CHANNEL_RED 1 @@ -46,7 +46,7 @@ CONSTANT: D3DX10_IFF_DDS 4 CONSTANT: D3DX10_IFF_TIFF 10 CONSTANT: D3DX10_IFF_GIF 11 CONSTANT: D3DX10_IFF_WMP 12 -CONSTANT: D3DX10_IFF_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DX10_IFF_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DX10_IMAGE_FILE_FORMAT CONSTANT: D3DX10_STF_USEINPUTBLOB 1 diff --git a/basis/windows/directx/d3dx11/d3dx11.factor b/basis/windows/directx/d3dx11/d3dx11.factor index 63b1733002..56a704c16c 100644 --- a/basis/windows/directx/d3dx11/d3dx11.factor +++ b/basis/windows/directx/d3dx11/d3dx11.factor @@ -1,12 +1,12 @@ USING: ; IN: windows.directx.d3dx11 -CONSTANT: D3DX11_ERR_CANNOT_MODIFY_INDEX_BUFFER HEX: 88760B54 -CONSTANT: D3DX11_ERR_INVALID_MESH HEX: 88760B55 -CONSTANT: D3DX11_ERR_CANNOT_ATTR_SORT HEX: 88760B56 -CONSTANT: D3DX11_ERR_SKINNING_NOT_SUPPORTED HEX: 88760B57 -CONSTANT: D3DX11_ERR_TOO_MANY_INFLUENCES HEX: 88760B58 -CONSTANT: D3DX11_ERR_INVALID_DATA HEX: 88760B59 -CONSTANT: D3DX11_ERR_LOADED_MESH_HAS_NO_DATA HEX: 88760B5A -CONSTANT: D3DX11_ERR_DUPLICATE_NAMED_FRAGMENT HEX: 88760B5B -CONSTANT: D3DX11_ERR_CANNOT_REMOVE_LAST_ITEM HEX: 88760B5C +CONSTANT: D3DX11_ERR_CANNOT_MODIFY_INDEX_BUFFER 0x88760B54 +CONSTANT: D3DX11_ERR_INVALID_MESH 0x88760B55 +CONSTANT: D3DX11_ERR_CANNOT_ATTR_SORT 0x88760B56 +CONSTANT: D3DX11_ERR_SKINNING_NOT_SUPPORTED 0x88760B57 +CONSTANT: D3DX11_ERR_TOO_MANY_INFLUENCES 0x88760B58 +CONSTANT: D3DX11_ERR_INVALID_DATA 0x88760B59 +CONSTANT: D3DX11_ERR_LOADED_MESH_HAS_NO_DATA 0x88760B5A +CONSTANT: D3DX11_ERR_DUPLICATE_NAMED_FRAGMENT 0x88760B5B +CONSTANT: D3DX11_ERR_CANNOT_REMOVE_LAST_ITEM 0x88760B5C diff --git a/basis/windows/directx/d3dx11core/d3dx11core.factor b/basis/windows/directx/d3dx11core/d3dx11core.factor index 877b87b672..17e2368dd4 100644 --- a/basis/windows/directx/d3dx11core/d3dx11core.factor +++ b/basis/windows/directx/d3dx11core/d3dx11core.factor @@ -27,5 +27,5 @@ COM-INTERFACE: ID3DX11ThreadPump IUnknown {C93FECFA-6967-478a-ABBC-402D90621FCB} FUNCTION: HRESULT D3DX11CreateThreadPump ( UINT cIoThreads, UINT cProcThreads, ID3DX11ThreadPump** ppThreadPump ) ; FUNCTION: HRESULT D3DX11UnsetAllDeviceObjects ( ID3D11DeviceContext* pContext ) ; -CONSTANT: D3DERR_INVALIDCALL HEX: 8876086C -CONSTANT: D3DERR_WASSTILLDRAWING HEX: 8876021C +CONSTANT: D3DERR_INVALIDCALL 0x8876086C +CONSTANT: D3DERR_WASSTILLDRAWING 0x8876021C diff --git a/basis/windows/directx/d3dx11tex/d3dx11tex.factor b/basis/windows/directx/d3dx11tex/d3dx11tex.factor index 41f2338f33..281fa9d433 100644 --- a/basis/windows/directx/d3dx11tex/d3dx11tex.factor +++ b/basis/windows/directx/d3dx11tex/d3dx11tex.factor @@ -5,30 +5,30 @@ IN: windows.directx.d3dx11tex LIBRARY: d3dx11 -CONSTANT: D3DX11_FILTER_NONE HEX: 00000001 -CONSTANT: D3DX11_FILTER_POINT HEX: 00000002 -CONSTANT: D3DX11_FILTER_LINEAR HEX: 00000003 -CONSTANT: D3DX11_FILTER_TRIANGLE HEX: 00000004 -CONSTANT: D3DX11_FILTER_BOX HEX: 00000005 - -CONSTANT: D3DX11_FILTER_MIRROR_U HEX: 00010000 -CONSTANT: D3DX11_FILTER_MIRROR_V HEX: 00020000 -CONSTANT: D3DX11_FILTER_MIRROR_W HEX: 00040000 -CONSTANT: D3DX11_FILTER_MIRROR HEX: 00070000 - -CONSTANT: D3DX11_FILTER_DITHER HEX: 00080000 -CONSTANT: D3DX11_FILTER_DITHER_DIFFUSION HEX: 00100000 - -CONSTANT: D3DX11_FILTER_SRGB_IN HEX: 00200000 -CONSTANT: D3DX11_FILTER_SRGB_OUT HEX: 00400000 -CONSTANT: D3DX11_FILTER_SRGB HEX: 00600000 +CONSTANT: D3DX11_FILTER_NONE 0x00000001 +CONSTANT: D3DX11_FILTER_POINT 0x00000002 +CONSTANT: D3DX11_FILTER_LINEAR 0x00000003 +CONSTANT: D3DX11_FILTER_TRIANGLE 0x00000004 +CONSTANT: D3DX11_FILTER_BOX 0x00000005 + +CONSTANT: D3DX11_FILTER_MIRROR_U 0x00010000 +CONSTANT: D3DX11_FILTER_MIRROR_V 0x00020000 +CONSTANT: D3DX11_FILTER_MIRROR_W 0x00040000 +CONSTANT: D3DX11_FILTER_MIRROR 0x00070000 + +CONSTANT: D3DX11_FILTER_DITHER 0x00080000 +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 -CONSTANT: D3DX11_NORMALMAP_MIRROR_U HEX: 00010000 -CONSTANT: D3DX11_NORMALMAP_MIRROR_V HEX: 00020000 -CONSTANT: D3DX11_NORMALMAP_MIRROR HEX: 00030000 -CONSTANT: D3DX11_NORMALMAP_INVERTSIGN HEX: 00080000 -CONSTANT: D3DX11_NORMALMAP_COMPUTE_OCCLUSION HEX: 00100000 +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 CONSTANT: D3DX11_CHANNEL_RED 1 @@ -45,7 +45,7 @@ CONSTANT: D3DX11_IFF_DDS 4 CONSTANT: D3DX11_IFF_TIFF 10 CONSTANT: D3DX11_IFF_GIF 11 CONSTANT: D3DX11_IFF_WMP 12 -CONSTANT: D3DX11_IFF_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DX11_IFF_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DX11_IMAGE_FILE_FORMAT CONSTANT: D3DX11_STF_USEINPUTBLOB 1 diff --git a/basis/windows/directx/d3dx9/d3dx9.factor b/basis/windows/directx/d3dx9/d3dx9.factor index c2bccb207b..056993f7d5 100644 --- a/basis/windows/directx/d3dx9/d3dx9.factor +++ b/basis/windows/directx/d3dx9/d3dx9.factor @@ -1,12 +1,12 @@ USING: ; IN: windows.directx.d3dx9 -CONSTANT: D3DXERR_CANNOTMODIFYINDEXBUFFER HEX: 88760B55 -CONSTANT: D3DXERR_INVALIDMESH HEX: 88760B56 -CONSTANT: D3DXERR_CANNOTATTRSORT HEX: 88760B57 -CONSTANT: D3DXERR_SKINNINGNOTSUPPORTED HEX: 88760B58 -CONSTANT: D3DXERR_TOOMANYINFLUENCES HEX: 88760B59 -CONSTANT: D3DXERR_INVALIDDATA HEX: 88760B5A -CONSTANT: D3DXERR_LOADEDMESHASNODATA HEX: 88760B5B -CONSTANT: D3DXERR_DUPLICATENAMEDFRAGMENT HEX: 88760B5C -CONSTANT: D3DXERR_CANNOTREMOVELASTITEM HEX: 88760B5D +CONSTANT: D3DXERR_CANNOTMODIFYINDEXBUFFER 0x88760B55 +CONSTANT: D3DXERR_INVALIDMESH 0x88760B56 +CONSTANT: D3DXERR_CANNOTATTRSORT 0x88760B57 +CONSTANT: D3DXERR_SKINNINGNOTSUPPORTED 0x88760B58 +CONSTANT: D3DXERR_TOOMANYINFLUENCES 0x88760B59 +CONSTANT: D3DXERR_INVALIDDATA 0x88760B5A +CONSTANT: D3DXERR_LOADEDMESHASNODATA 0x88760B5B +CONSTANT: D3DXERR_DUPLICATENAMEDFRAGMENT 0x88760B5C +CONSTANT: D3DXERR_CANNOTREMOVELASTITEM 0x88760B5D diff --git a/basis/windows/directx/d3dx9anim/d3dx9anim.factor b/basis/windows/directx/d3dx9anim/d3dx9anim.factor index 34c1a55d6e..ec3f1711d8 100644 --- a/basis/windows/directx/d3dx9anim/d3dx9anim.factor +++ b/basis/windows/directx/d3dx9anim/d3dx9anim.factor @@ -11,7 +11,7 @@ TYPEDEF: int D3DXMESHDATATYPE CONSTANT: D3DXMESHTYPE_MESH 1 CONSTANT: D3DXMESHTYPE_PMESH 2 CONSTANT: D3DXMESHTYPE_PATCHMESH 3 -CONSTANT: D3DXMESHTYPE_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXMESHTYPE_FORCE_DWORD 0x7fffffff STRUCT: D3DXMESHDATA { Type D3DXMESHDATATYPE } @@ -85,7 +85,7 @@ COM-INTERFACE: ID3DXSaveUserData f {00000000-0000-0000-0000-000000000000} TYPEDEF: int D3DXCALLBACK_SEARCH_FLAGS CONSTANT: D3DXCALLBACK_SEARCH_EXCLUDING_INITIAL_POSITION 1 CONSTANT: D3DXCALLBACK_SEARCH_BEHIND_INITIAL_POSITION 2 -CONSTANT: D3DXCALLBACK_SEARCH_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXCALLBACK_SEARCH_FORCE_DWORD 0x7fffffff C-TYPE: ID3DXAnimationSet TYPEDEF: ID3DXAnimationSet* LPD3DXANIMATIONSET @@ -113,7 +113,7 @@ TYPEDEF: int D3DXPLAYBACK_TYPE CONSTANT: D3DXPLAY_LOOP 0 CONSTANT: D3DXPLAY_ONCE 1 CONSTANT: D3DXPLAY_PINGPONG 2 -CONSTANT: D3DXPLAY_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXPLAY_FORCE_DWORD 0x7fffffff STRUCT: D3DXKEY_VECTOR3 { Time FLOAT } @@ -132,7 +132,7 @@ TYPEDEF: D3DXKEY_CALLBACK* LPD3DXKEY_CALLBACK TYPEDEF: int D3DXCOMPRESSION_FLAGS CONSTANT: D3DXCOMPRESS_DEFAULT 0 -CONSTANT: D3DXCOMPRESS_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXCOMPRESS_FORCE_DWORD 0x7fffffff C-TYPE: ID3DXKeyframedAnimationSet TYPEDEF: ID3DXKeyframedAnimationSet* LPD3DXKEYFRAMEDANIMATIONSET @@ -188,7 +188,7 @@ COM-INTERFACE: ID3DXCompressedAnimationSet ID3DXAnimationSet {6CC2480D-3808-4739 TYPEDEF: int D3DXPRIORITY_TYPE CONSTANT: D3DXPRIORITY_LOW 0 CONSTANT: D3DXPRIORITY_HIGH 1 -CONSTANT: D3DXPRIORITY_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXPRIORITY_FORCE_DWORD 0x7fffffff STRUCT: D3DXTRACK_DESC { Priority D3DXPRIORITY_TYPE } @@ -204,12 +204,12 @@ CONSTANT: D3DXEVENT_TRACKWEIGHT 1 CONSTANT: D3DXEVENT_TRACKPOSITION 2 CONSTANT: D3DXEVENT_TRACKENABLE 3 CONSTANT: D3DXEVENT_PRIORITYBLEND 4 -CONSTANT: D3DXEVENT_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXEVENT_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DXTRANSITION_TYPE CONSTANT: D3DXTRANSITION_LINEAR 0 CONSTANT: D3DXTRANSITION_EASEINEASEOUT 1 -CONSTANT: D3DXTRANSITION_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXTRANSITION_FORCE_DWORD 0x7fffffff UNION-STRUCT: D3DXEVENT_DESC_UNION { Weight FLOAT } diff --git a/basis/windows/directx/d3dx9core/d3dx9core.factor b/basis/windows/directx/d3dx9core/d3dx9core.factor index 861dc46ef7..545fd60ed7 100644 --- a/basis/windows/directx/d3dx9core/d3dx9core.factor +++ b/basis/windows/directx/d3dx9core/d3dx9core.factor @@ -5,7 +5,7 @@ IN: windows.directx.d3dx9core LIBRARY: d3dx9 -CONSTANT: D3DX_VERSION HEX: 0902 +CONSTANT: D3DX_VERSION 0x0902 CONSTANT: D3DX_SDK_VERSION 42 FUNCTION: BOOL D3DXCheckVersion ( UINT D3DSdkVersion, UINT D3DXSdkVersion ) ; diff --git a/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor b/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor index d3a5a7e637..64dec9df7e 100644 --- a/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor +++ b/basis/windows/directx/d3dx9mesh/d3dx9mesh.factor @@ -10,31 +10,31 @@ TYPEDEF: int D3DXPATCHMESHTYPE CONSTANT: D3DXPATCHMESH_RECT 1 CONSTANT: D3DXPATCHMESH_TRI 2 CONSTANT: D3DXPATCHMESH_NPATCH 3 -CONSTANT: D3DXPATCHMESH_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXPATCHMESH_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DXMESH -CONSTANT: D3DXMESH_32BIT HEX: 001 -CONSTANT: D3DXMESH_DONOTCLIP HEX: 002 -CONSTANT: D3DXMESH_POINTS HEX: 004 -CONSTANT: D3DXMESH_RTPATCHES HEX: 008 -CONSTANT: D3DXMESH_NPATCHES HEX: 4000 -CONSTANT: D3DXMESH_VB_SYSTEMMEM HEX: 010 -CONSTANT: D3DXMESH_VB_MANAGED HEX: 020 -CONSTANT: D3DXMESH_VB_WRITEONLY HEX: 040 -CONSTANT: D3DXMESH_VB_DYNAMIC HEX: 080 -CONSTANT: D3DXMESH_VB_SOFTWAREPROCESSING HEX: 8000 -CONSTANT: D3DXMESH_IB_SYSTEMMEM HEX: 100 -CONSTANT: D3DXMESH_IB_MANAGED HEX: 200 -CONSTANT: D3DXMESH_IB_WRITEONLY HEX: 400 -CONSTANT: D3DXMESH_IB_DYNAMIC HEX: 800 -CONSTANT: D3DXMESH_IB_SOFTWAREPROCESSING HEX: 10000 -CONSTANT: D3DXMESH_VB_SHARE HEX: 1000 -CONSTANT: D3DXMESH_USEHWONLY HEX: 2000 -CONSTANT: D3DXMESH_SYSTEMMEM HEX: 110 -CONSTANT: D3DXMESH_MANAGED HEX: 220 -CONSTANT: D3DXMESH_WRITEONLY HEX: 440 -CONSTANT: D3DXMESH_DYNAMIC HEX: 880 -CONSTANT: D3DXMESH_SOFTWAREPROCESSING HEX: 18000 +CONSTANT: D3DXMESH_32BIT 0x001 +CONSTANT: D3DXMESH_DONOTCLIP 0x002 +CONSTANT: D3DXMESH_POINTS 0x004 +CONSTANT: D3DXMESH_RTPATCHES 0x008 +CONSTANT: D3DXMESH_NPATCHES 0x4000 +CONSTANT: D3DXMESH_VB_SYSTEMMEM 0x010 +CONSTANT: D3DXMESH_VB_MANAGED 0x020 +CONSTANT: D3DXMESH_VB_WRITEONLY 0x040 +CONSTANT: D3DXMESH_VB_DYNAMIC 0x080 +CONSTANT: D3DXMESH_VB_SOFTWAREPROCESSING 0x8000 +CONSTANT: D3DXMESH_IB_SYSTEMMEM 0x100 +CONSTANT: D3DXMESH_IB_MANAGED 0x200 +CONSTANT: D3DXMESH_IB_WRITEONLY 0x400 +CONSTANT: D3DXMESH_IB_DYNAMIC 0x800 +CONSTANT: D3DXMESH_IB_SOFTWAREPROCESSING 0x10000 +CONSTANT: D3DXMESH_VB_SHARE 0x1000 +CONSTANT: D3DXMESH_USEHWONLY 0x2000 +CONSTANT: D3DXMESH_SYSTEMMEM 0x110 +CONSTANT: D3DXMESH_MANAGED 0x220 +CONSTANT: D3DXMESH_WRITEONLY 0x440 +CONSTANT: D3DXMESH_DYNAMIC 0x880 +CONSTANT: D3DXMESH_SOFTWAREPROCESSING 0x18000 TYPEDEF: int D3DXPATCHMESH CONSTANT: D3DXPATCHMESH_DEFAULT 0 @@ -53,28 +53,28 @@ CONSTANT: D3DXCLEAN_SIMPLIFICATION 3 : MAX_FVF_DECL_SIZE ( -- n ) MAXD3DDECLLENGTH 1 + ; inline TYPEDEF: int D3DXTANGENT -CONSTANT: D3DXTANGENT_WRAP_U HEX: 01 -CONSTANT: D3DXTANGENT_WRAP_V HEX: 02 -CONSTANT: D3DXTANGENT_WRAP_UV HEX: 03 -CONSTANT: D3DXTANGENT_DONT_NORMALIZE_PARTIALS HEX: 04 -CONSTANT: D3DXTANGENT_DONT_ORTHOGONALIZE HEX: 08 -CONSTANT: D3DXTANGENT_ORTHOGONALIZE_FROM_V HEX: 010 -CONSTANT: D3DXTANGENT_ORTHOGONALIZE_FROM_U HEX: 020 -CONSTANT: D3DXTANGENT_WEIGHT_BY_AREA HEX: 040 -CONSTANT: D3DXTANGENT_WEIGHT_EQUAL HEX: 080 -CONSTANT: D3DXTANGENT_WIND_CW HEX: 0100 -CONSTANT: D3DXTANGENT_CALCULATE_NORMALS HEX: 0200 -CONSTANT: D3DXTANGENT_GENERATE_IN_PLACE HEX: 0400 +CONSTANT: D3DXTANGENT_WRAP_U 0x01 +CONSTANT: D3DXTANGENT_WRAP_V 0x02 +CONSTANT: D3DXTANGENT_WRAP_UV 0x03 +CONSTANT: D3DXTANGENT_DONT_NORMALIZE_PARTIALS 0x04 +CONSTANT: D3DXTANGENT_DONT_ORTHOGONALIZE 0x08 +CONSTANT: D3DXTANGENT_ORTHOGONALIZE_FROM_V 0x010 +CONSTANT: D3DXTANGENT_ORTHOGONALIZE_FROM_U 0x020 +CONSTANT: D3DXTANGENT_WEIGHT_BY_AREA 0x040 +CONSTANT: D3DXTANGENT_WEIGHT_EQUAL 0x080 +CONSTANT: D3DXTANGENT_WIND_CW 0x0100 +CONSTANT: D3DXTANGENT_CALCULATE_NORMALS 0x0200 +CONSTANT: D3DXTANGENT_GENERATE_IN_PLACE 0x0400 TYPEDEF: int D3DXIMT -CONSTANT: D3DXIMT_WRAP_U HEX: 01 -CONSTANT: D3DXIMT_WRAP_V HEX: 02 -CONSTANT: D3DXIMT_WRAP_UV HEX: 03 +CONSTANT: D3DXIMT_WRAP_U 0x01 +CONSTANT: D3DXIMT_WRAP_V 0x02 +CONSTANT: D3DXIMT_WRAP_UV 0x03 TYPEDEF: int D3DXUVATLAS -CONSTANT: D3DXUVATLAS_DEFAULT HEX: 00 -CONSTANT: D3DXUVATLAS_GEODESIC_FAST HEX: 01 -CONSTANT: D3DXUVATLAS_GEODESIC_QUALITY HEX: 02 +CONSTANT: D3DXUVATLAS_DEFAULT 0x00 +CONSTANT: D3DXUVATLAS_GEODESIC_FAST 0x01 +CONSTANT: D3DXUVATLAS_GEODESIC_QUALITY 0x02 C-TYPE: ID3DXBaseMesh TYPEDEF: ID3DXBaseMesh* LPD3DXBASEMESH @@ -107,10 +107,10 @@ STRUCT: D3DXMATERIAL TYPEDEF: D3DXMATERIAL* LPD3DXMATERIAL TYPEDEF: int D3DXEFFECTDEFAULTTYPE -CONSTANT: D3DXEDT_STRING HEX: 1 -CONSTANT: D3DXEDT_FLOATS HEX: 2 -CONSTANT: D3DXEDT_DWORD HEX: 3 -CONSTANT: D3DXEDT_FORCEDWORD HEX: 7fffffff +CONSTANT: D3DXEDT_STRING 0x1 +CONSTANT: D3DXEDT_FLOATS 0x2 +CONSTANT: D3DXEDT_DWORD 0x3 +CONSTANT: D3DXEDT_FORCEDWORD 0x7fffffff STRUCT: D3DXEFFECTDEFAULT { pParamName LPSTR } @@ -136,10 +136,10 @@ STRUCT: D3DXATTRIBUTEWEIGHTS { Binormal FLOAT } ; TYPEDEF: D3DXATTRIBUTEWEIGHTS* LPD3DXATTRIBUTEWEIGHTS -CONSTANT: D3DXWELDEPSILONS_WELDALL HEX: 1 -CONSTANT: D3DXWELDEPSILONS_WELDPARTIALMATCHES HEX: 2 -CONSTANT: D3DXWELDEPSILONS_DONOTREMOVEVERTICES HEX: 4 -CONSTANT: D3DXWELDEPSILONS_DONOTSPLIT HEX: 8 +CONSTANT: D3DXWELDEPSILONS_WELDALL 0x1 +CONSTANT: D3DXWELDEPSILONS_WELDPARTIALMATCHES 0x2 +CONSTANT: D3DXWELDEPSILONS_DONOTREMOVEVERTICES 0x4 +CONSTANT: D3DXWELDEPSILONS_DONOTSPLIT 0x8 STRUCT: D3DXWELDEPSILONS { Position FLOAT } @@ -232,13 +232,13 @@ COM-INTERFACE: ID3DXSPMesh IUnknown {667EA4C7-F1CD-4386-B523-7C0290B83CC5} HRESULT GetVertexAttributeWeights ( LPD3DXATTRIBUTEWEIGHTS pVertexAttributeWeights ) HRESULT GetVertexWeights ( FLOAT* pVertexWeights ) ; -CONSTANT: D3DXMESHOPT_COMPACT HEX: 01000000 -CONSTANT: D3DXMESHOPT_ATTRSORT HEX: 02000000 -CONSTANT: D3DXMESHOPT_VERTEXCACHE HEX: 04000000 -CONSTANT: D3DXMESHOPT_STRIPREORDER HEX: 08000000 -CONSTANT: D3DXMESHOPT_IGNOREVERTS HEX: 10000000 -CONSTANT: D3DXMESHOPT_DONOTSPLIT HEX: 20000000 -CONSTANT: D3DXMESHOPT_DEVICEINDEPENDENT HEX: 00400000 +CONSTANT: D3DXMESHOPT_COMPACT 0x01000000 +CONSTANT: D3DXMESHOPT_ATTRSORT 0x02000000 +CONSTANT: D3DXMESHOPT_VERTEXCACHE 0x04000000 +CONSTANT: D3DXMESHOPT_STRIPREORDER 0x08000000 +CONSTANT: D3DXMESHOPT_IGNOREVERTS 0x10000000 +CONSTANT: D3DXMESHOPT_DONOTSPLIT 0x20000000 +CONSTANT: D3DXMESHOPT_DEVICEINDEPENDENT 0x00400000 STRUCT: D3DXBONECOMBINATION { AttribId DWORD } @@ -900,7 +900,7 @@ FUNCTION: HRESULT TYPEDEF: int D3DXSHCOMPRESSQUALITYTYPE CONSTANT: D3DXSHCQUAL_FASTLOWQUALITY 1 CONSTANT: D3DXSHCQUAL_SLOWHIGHQUALITY 2 -CONSTANT: D3DXSHCQUAL_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXSHCQUAL_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DXSHGPUSIMOPT CONSTANT: D3DXSHGPUSIMOPT_SHADOWRES256 1 @@ -908,7 +908,7 @@ CONSTANT: D3DXSHGPUSIMOPT_SHADOWRES512 0 CONSTANT: D3DXSHGPUSIMOPT_SHADOWRES1024 2 CONSTANT: D3DXSHGPUSIMOPT_SHADOWRES2048 3 CONSTANT: D3DXSHGPUSIMOPT_HIGHQUALITY 4 -CONSTANT: D3DXSHGPUSIMOPT_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXSHGPUSIMOPT_FORCE_DWORD 0x7fffffff STRUCT: D3DXSHMATERIAL { Diffuse D3DCOLORVALUE } diff --git a/basis/windows/directx/d3dx9tex/d3dx9tex.factor b/basis/windows/directx/d3dx9tex/d3dx9tex.factor index ad3d9e12b4..e3dc53c985 100644 --- a/basis/windows/directx/d3dx9tex/d3dx9tex.factor +++ b/basis/windows/directx/d3dx9tex/d3dx9tex.factor @@ -24,7 +24,7 @@ LIBRARY: d3dx9 : D3DX_FILTER_SRGB_OUT ( -- n ) 2 21 shift ; inline : D3DX_FILTER_SRGB ( -- n ) 3 21 shift ; inline -CONSTANT: D3DX_SKIP_DDS_MIP_LEVELS_MASK HEX: 1F +CONSTANT: D3DX_SKIP_DDS_MIP_LEVELS_MASK 0x1F CONSTANT: D3DX_SKIP_DDS_MIP_LEVELS_SHIFT 26 : D3DX_NORMALMAP_MIRROR_U ( -- n ) 1 16 shift ; inline @@ -48,7 +48,7 @@ CONSTANT: D3DXIFF_PPM 5 CONSTANT: D3DXIFF_DIB 6 CONSTANT: D3DXIFF_HDR 7 CONSTANT: D3DXIFF_PFM 8 -CONSTANT: D3DXIFF_FORCE_DWORD HEX: 7fffffff +CONSTANT: D3DXIFF_FORCE_DWORD 0x7fffffff TYPEDEF: int D3DXIMAGE_FILEFORMAT TYPEDEF: void* LPD3DXFILL2D diff --git a/basis/windows/directx/d3dx9xof/d3dx9xof.factor b/basis/windows/directx/d3dx9xof/d3dx9xof.factor index c27848219f..be669a4eb8 100644 --- a/basis/windows/directx/d3dx9xof/d3dx9xof.factor +++ b/basis/windows/directx/d3dx9xof/d3dx9xof.factor @@ -91,21 +91,21 @@ COM-INTERFACE: ID3DXFileData IUnknown {cef08cfd-7b4f-4429-9624-2a690a933201} FUNCTION: HRESULT D3DXFileCreate ( ID3DXFile** lplpDirectXFile ) ; -CONSTANT: D3DXFERR_BADOBJECT HEX: 88760384 -CONSTANT: D3DXFERR_BADVALUE HEX: 88760385 -CONSTANT: D3DXFERR_BADTYPE HEX: 88760386 -CONSTANT: D3DXFERR_NOTFOUND HEX: 88760387 -CONSTANT: D3DXFERR_NOTDONEYET HEX: 88760388 -CONSTANT: D3DXFERR_FILENOTFOUND HEX: 88760389 -CONSTANT: D3DXFERR_RESOURCENOTFOUND HEX: 8876038A -CONSTANT: D3DXFERR_BADRESOURCE HEX: 8876038B -CONSTANT: D3DXFERR_BADFILETYPE HEX: 8876038C -CONSTANT: D3DXFERR_BADFILEVERSION HEX: 8876038D -CONSTANT: D3DXFERR_BADFILEFLOATSIZE HEX: 8876038E -CONSTANT: D3DXFERR_BADFILE HEX: 8876038F -CONSTANT: D3DXFERR_PARSEERROR HEX: 88760390 -CONSTANT: D3DXFERR_BADARRAYSIZE HEX: 88760391 -CONSTANT: D3DXFERR_BADDATAREFERENCE HEX: 88760392 -CONSTANT: D3DXFERR_NOMOREOBJECTS HEX: 88760393 -CONSTANT: D3DXFERR_NOMOREDATA HEX: 88760394 -CONSTANT: D3DXFERR_BADCACHEFILE HEX: 88760395 +CONSTANT: D3DXFERR_BADOBJECT 0x88760384 +CONSTANT: D3DXFERR_BADVALUE 0x88760385 +CONSTANT: D3DXFERR_BADTYPE 0x88760386 +CONSTANT: D3DXFERR_NOTFOUND 0x88760387 +CONSTANT: D3DXFERR_NOTDONEYET 0x88760388 +CONSTANT: D3DXFERR_FILENOTFOUND 0x88760389 +CONSTANT: D3DXFERR_RESOURCENOTFOUND 0x8876038A +CONSTANT: D3DXFERR_BADRESOURCE 0x8876038B +CONSTANT: D3DXFERR_BADFILETYPE 0x8876038C +CONSTANT: D3DXFERR_BADFILEVERSION 0x8876038D +CONSTANT: D3DXFERR_BADFILEFLOATSIZE 0x8876038E +CONSTANT: D3DXFERR_BADFILE 0x8876038F +CONSTANT: D3DXFERR_PARSEERROR 0x88760390 +CONSTANT: D3DXFERR_BADARRAYSIZE 0x88760391 +CONSTANT: D3DXFERR_BADDATAREFERENCE 0x88760392 +CONSTANT: D3DXFERR_NOMOREOBJECTS 0x88760393 +CONSTANT: D3DXFERR_NOMOREDATA 0x88760394 +CONSTANT: D3DXFERR_BADCACHEFILE 0x88760395 diff --git a/basis/windows/directx/dinput/dinput.factor b/basis/windows/directx/dinput/dinput.factor index 53b03e7888..44228f95c5 100644 --- a/basis/windows/directx/dinput/dinput.factor +++ b/basis/windows/directx/dinput/dinput.factor @@ -386,7 +386,7 @@ COM-INTERFACE: IDirectInput8W IUnknown {BF798031-483A-4DA2-AA99-5D64ED369700} FUNCTION: HRESULT DirectInput8Create ( HINSTANCE hinst, DWORD dwVersion, REFIID riidtlf, LPVOID* ppvOut, LPUNKNOWN punkOuter ) ; -CONSTANT: DIRECTINPUT_VERSION HEX: 0800 +CONSTANT: DIRECTINPUT_VERSION 0x0800 CONSTANT: DI8DEVCLASS_ALL 0 CONSTANT: DI8DEVCLASS_DEVICE 1 @@ -394,12 +394,12 @@ CONSTANT: DI8DEVCLASS_POINTER 2 CONSTANT: DI8DEVCLASS_KEYBOARD 3 CONSTANT: DI8DEVCLASS_GAMECTRL 4 -CONSTANT: DIEDFL_ALLDEVICES HEX: 00000000 -CONSTANT: DIEDFL_ATTACHEDONLY HEX: 00000001 -CONSTANT: DIEDFL_FORCEFEEDBACK HEX: 00000100 -CONSTANT: DIEDFL_INCLUDEALIASES HEX: 00010000 -CONSTANT: DIEDFL_INCLUDEPHANTOMS HEX: 00020000 -CONSTANT: DIEDFL_INCLUDEHIDDEN HEX: 00040000 +CONSTANT: DIEDFL_ALLDEVICES 0x00000000 +CONSTANT: DIEDFL_ATTACHEDONLY 0x00000001 +CONSTANT: DIEDFL_FORCEFEEDBACK 0x00000100 +CONSTANT: DIEDFL_INCLUDEALIASES 0x00010000 +CONSTANT: DIEDFL_INCLUDEPHANTOMS 0x00020000 +CONSTANT: DIEDFL_INCLUDEHIDDEN 0x00040000 CONSTANT: DIENUM_STOP 0 CONSTANT: DIENUM_CONTINUE 1 @@ -407,50 +407,50 @@ CONSTANT: DIENUM_CONTINUE 1 CONSTANT: DIDF_ABSAXIS 1 CONSTANT: DIDF_RELAXIS 2 -CONSTANT: DIDFT_ALL HEX: 00000000 +CONSTANT: DIDFT_ALL 0x00000000 -CONSTANT: DIDFT_RELAXIS HEX: 00000001 -CONSTANT: DIDFT_ABSAXIS HEX: 00000002 -CONSTANT: DIDFT_AXIS HEX: 00000003 +CONSTANT: DIDFT_RELAXIS 0x00000001 +CONSTANT: DIDFT_ABSAXIS 0x00000002 +CONSTANT: DIDFT_AXIS 0x00000003 -CONSTANT: DIDFT_PSHBUTTON HEX: 00000004 -CONSTANT: DIDFT_TGLBUTTON HEX: 00000008 -CONSTANT: DIDFT_BUTTON HEX: 0000000C +CONSTANT: DIDFT_PSHBUTTON 0x00000004 +CONSTANT: DIDFT_TGLBUTTON 0x00000008 +CONSTANT: DIDFT_BUTTON 0x0000000C -CONSTANT: DIDFT_POV HEX: 00000010 -CONSTANT: DIDFT_COLLECTION HEX: 00000040 -CONSTANT: DIDFT_NODATA HEX: 00000080 +CONSTANT: DIDFT_POV 0x00000010 +CONSTANT: DIDFT_COLLECTION 0x00000040 +CONSTANT: DIDFT_NODATA 0x00000080 -CONSTANT: DIDFT_ANYINSTANCE HEX: 00FFFF00 +CONSTANT: DIDFT_ANYINSTANCE 0x00FFFF00 ALIAS: DIDFT_INSTANCEMASK DIDFT_ANYINSTANCE : DIDFT_MAKEINSTANCE ( n -- instance ) 8 shift ; inline -: DIDFT_GETTYPE ( n -- type ) HEX: FF bitand ; inline -: DIDFT_GETINSTANCE ( n -- instance ) -8 shift HEX: FFFF bitand ; inline -CONSTANT: DIDFT_FFACTUATOR HEX: 01000000 -CONSTANT: DIDFT_FFEFFECTTRIGGER HEX: 02000000 -CONSTANT: DIDFT_OUTPUT HEX: 10000000 -CONSTANT: DIDFT_VENDORDEFINED HEX: 04000000 -CONSTANT: DIDFT_ALIAS HEX: 08000000 -CONSTANT: DIDFT_OPTIONAL HEX: 80000000 - -: DIDFT_ENUMCOLLECTION ( n -- instance ) 8 shift HEX: FFFF bitand ; inline -CONSTANT: DIDFT_NOCOLLECTION HEX: 00FFFF00 - -CONSTANT: DIDOI_FFACTUATOR HEX: 00000001 -CONSTANT: DIDOI_FFEFFECTTRIGGER HEX: 00000002 -CONSTANT: DIDOI_POLLED HEX: 00008000 -CONSTANT: DIDOI_ASPECTPOSITION HEX: 00000100 -CONSTANT: DIDOI_ASPECTVELOCITY HEX: 00000200 -CONSTANT: DIDOI_ASPECTACCEL HEX: 00000300 -CONSTANT: DIDOI_ASPECTFORCE HEX: 00000400 -CONSTANT: DIDOI_ASPECTMASK HEX: 00000F00 -CONSTANT: DIDOI_GUIDISUSAGE HEX: 00010000 - -CONSTANT: DISCL_EXCLUSIVE HEX: 00000001 -CONSTANT: DISCL_NONEXCLUSIVE HEX: 00000002 -CONSTANT: DISCL_FOREGROUND HEX: 00000004 -CONSTANT: DISCL_BACKGROUND HEX: 00000008 -CONSTANT: DISCL_NOWINKEY HEX: 00000010 +: DIDFT_GETTYPE ( n -- type ) 0xFF bitand ; inline +: DIDFT_GETINSTANCE ( n -- instance ) -8 shift 0xFFFF bitand ; inline +CONSTANT: DIDFT_FFACTUATOR 0x01000000 +CONSTANT: DIDFT_FFEFFECTTRIGGER 0x02000000 +CONSTANT: DIDFT_OUTPUT 0x10000000 +CONSTANT: DIDFT_VENDORDEFINED 0x04000000 +CONSTANT: DIDFT_ALIAS 0x08000000 +CONSTANT: DIDFT_OPTIONAL 0x80000000 + +: DIDFT_ENUMCOLLECTION ( n -- instance ) 8 shift 0xFFFF bitand ; inline +CONSTANT: DIDFT_NOCOLLECTION 0x00FFFF00 + +CONSTANT: DIDOI_FFACTUATOR 0x00000001 +CONSTANT: DIDOI_FFEFFECTTRIGGER 0x00000002 +CONSTANT: DIDOI_POLLED 0x00008000 +CONSTANT: DIDOI_ASPECTPOSITION 0x00000100 +CONSTANT: DIDOI_ASPECTVELOCITY 0x00000200 +CONSTANT: DIDOI_ASPECTACCEL 0x00000300 +CONSTANT: DIDOI_ASPECTFORCE 0x00000400 +CONSTANT: DIDOI_ASPECTMASK 0x00000F00 +CONSTANT: DIDOI_GUIDISUSAGE 0x00010000 + +CONSTANT: DISCL_EXCLUSIVE 0x00000001 +CONSTANT: DISCL_NONEXCLUSIVE 0x00000002 +CONSTANT: DISCL_FOREGROUND 0x00000004 +CONSTANT: DISCL_BACKGROUND 0x00000008 +CONSTANT: DISCL_NOWINKEY 0x00000010 CONSTANT: DIMOFS_X 0 CONSTANT: DIMOFS_Y 4 @@ -464,150 +464,150 @@ CONSTANT: DIMOFS_BUTTON5 17 CONSTANT: DIMOFS_BUTTON6 18 CONSTANT: DIMOFS_BUTTON7 19 -CONSTANT: DIK_ESCAPE HEX: 01 -CONSTANT: DIK_1 HEX: 02 -CONSTANT: DIK_2 HEX: 03 -CONSTANT: DIK_3 HEX: 04 -CONSTANT: DIK_4 HEX: 05 -CONSTANT: DIK_5 HEX: 06 -CONSTANT: DIK_6 HEX: 07 -CONSTANT: DIK_7 HEX: 08 -CONSTANT: DIK_8 HEX: 09 -CONSTANT: DIK_9 HEX: 0A -CONSTANT: DIK_0 HEX: 0B -CONSTANT: DIK_MINUS HEX: 0C -CONSTANT: DIK_EQUALS HEX: 0D -CONSTANT: DIK_BACK HEX: 0E -CONSTANT: DIK_TAB HEX: 0F -CONSTANT: DIK_Q HEX: 10 -CONSTANT: DIK_W HEX: 11 -CONSTANT: DIK_E HEX: 12 -CONSTANT: DIK_R HEX: 13 -CONSTANT: DIK_T HEX: 14 -CONSTANT: DIK_Y HEX: 15 -CONSTANT: DIK_U HEX: 16 -CONSTANT: DIK_I HEX: 17 -CONSTANT: DIK_O HEX: 18 -CONSTANT: DIK_P HEX: 19 -CONSTANT: DIK_LBRACKET HEX: 1A -CONSTANT: DIK_RBRACKET HEX: 1B -CONSTANT: DIK_RETURN HEX: 1C -CONSTANT: DIK_LCONTROL HEX: 1D -CONSTANT: DIK_A HEX: 1E -CONSTANT: DIK_S HEX: 1F -CONSTANT: DIK_D HEX: 20 -CONSTANT: DIK_F HEX: 21 -CONSTANT: DIK_G HEX: 22 -CONSTANT: DIK_H HEX: 23 -CONSTANT: DIK_J HEX: 24 -CONSTANT: DIK_K HEX: 25 -CONSTANT: DIK_L HEX: 26 -CONSTANT: DIK_SEMICOLON HEX: 27 -CONSTANT: DIK_APOSTROPHE HEX: 28 -CONSTANT: DIK_GRAVE HEX: 29 -CONSTANT: DIK_LSHIFT HEX: 2A -CONSTANT: DIK_BACKSLASH HEX: 2B -CONSTANT: DIK_Z HEX: 2C -CONSTANT: DIK_X HEX: 2D -CONSTANT: DIK_C HEX: 2E -CONSTANT: DIK_V HEX: 2F -CONSTANT: DIK_B HEX: 30 -CONSTANT: DIK_N HEX: 31 -CONSTANT: DIK_M HEX: 32 -CONSTANT: DIK_COMMA HEX: 33 -CONSTANT: DIK_PERIOD HEX: 34 -CONSTANT: DIK_SLASH HEX: 35 -CONSTANT: DIK_RSHIFT HEX: 36 -CONSTANT: DIK_MULTIPLY HEX: 37 -CONSTANT: DIK_LMENU HEX: 38 -CONSTANT: DIK_SPACE HEX: 39 -CONSTANT: DIK_CAPITAL HEX: 3A -CONSTANT: DIK_F1 HEX: 3B -CONSTANT: DIK_F2 HEX: 3C -CONSTANT: DIK_F3 HEX: 3D -CONSTANT: DIK_F4 HEX: 3E -CONSTANT: DIK_F5 HEX: 3F -CONSTANT: DIK_F6 HEX: 40 -CONSTANT: DIK_F7 HEX: 41 -CONSTANT: DIK_F8 HEX: 42 -CONSTANT: DIK_F9 HEX: 43 -CONSTANT: DIK_F10 HEX: 44 -CONSTANT: DIK_NUMLOCK HEX: 45 -CONSTANT: DIK_SCROLL HEX: 46 -CONSTANT: DIK_NUMPAD7 HEX: 47 -CONSTANT: DIK_NUMPAD8 HEX: 48 -CONSTANT: DIK_NUMPAD9 HEX: 49 -CONSTANT: DIK_SUBTRACT HEX: 4A -CONSTANT: DIK_NUMPAD4 HEX: 4B -CONSTANT: DIK_NUMPAD5 HEX: 4C -CONSTANT: DIK_NUMPAD6 HEX: 4D -CONSTANT: DIK_ADD HEX: 4E -CONSTANT: DIK_NUMPAD1 HEX: 4F -CONSTANT: DIK_NUMPAD2 HEX: 50 -CONSTANT: DIK_NUMPAD3 HEX: 51 -CONSTANT: DIK_NUMPAD0 HEX: 52 -CONSTANT: DIK_DECIMAL HEX: 53 -CONSTANT: DIK_OEM_102 HEX: 56 -CONSTANT: DIK_F11 HEX: 57 -CONSTANT: DIK_F12 HEX: 58 -CONSTANT: DIK_F13 HEX: 64 -CONSTANT: DIK_F14 HEX: 65 -CONSTANT: DIK_F15 HEX: 66 -CONSTANT: DIK_KANA HEX: 70 -CONSTANT: DIK_ABNT_C1 HEX: 73 -CONSTANT: DIK_CONVERT HEX: 79 -CONSTANT: DIK_NOCONVERT HEX: 7B -CONSTANT: DIK_YEN HEX: 7D -CONSTANT: DIK_ABNT_C2 HEX: 7E -CONSTANT: DIK_NUMPADEQUALS HEX: 8D -CONSTANT: DIK_PREVTRACK HEX: 90 -CONSTANT: DIK_AT HEX: 91 -CONSTANT: DIK_COLON HEX: 92 -CONSTANT: DIK_UNDERLINE HEX: 93 -CONSTANT: DIK_KANJI HEX: 94 -CONSTANT: DIK_STOP HEX: 95 -CONSTANT: DIK_AX HEX: 96 -CONSTANT: DIK_UNLABELED HEX: 97 -CONSTANT: DIK_NEXTTRACK HEX: 99 -CONSTANT: DIK_NUMPADENTER HEX: 9C -CONSTANT: DIK_RCONTROL HEX: 9D -CONSTANT: DIK_MUTE HEX: A0 -CONSTANT: DIK_CALCULATOR HEX: A1 -CONSTANT: DIK_PLAYPAUSE HEX: A2 -CONSTANT: DIK_MEDIASTOP HEX: A4 -CONSTANT: DIK_VOLUMEDOWN HEX: AE -CONSTANT: DIK_VOLUMEUP HEX: B0 -CONSTANT: DIK_WEBHOME HEX: B2 -CONSTANT: DIK_NUMPADCOMMA HEX: B3 -CONSTANT: DIK_DIVIDE HEX: B5 -CONSTANT: DIK_SYSRQ HEX: B7 -CONSTANT: DIK_RMENU HEX: B8 -CONSTANT: DIK_PAUSE HEX: C5 -CONSTANT: DIK_HOME HEX: C7 -CONSTANT: DIK_UP HEX: C8 -CONSTANT: DIK_PRIOR HEX: C9 -CONSTANT: DIK_LEFT HEX: CB -CONSTANT: DIK_RIGHT HEX: CD -CONSTANT: DIK_END HEX: CF -CONSTANT: DIK_DOWN HEX: D0 -CONSTANT: DIK_NEXT HEX: D1 -CONSTANT: DIK_INSERT HEX: D2 -CONSTANT: DIK_DELETE HEX: D3 -CONSTANT: DIK_LWIN HEX: DB -CONSTANT: DIK_RWIN HEX: DC -CONSTANT: DIK_APPS HEX: DD -CONSTANT: DIK_POWER HEX: DE -CONSTANT: DIK_SLEEP HEX: DF -CONSTANT: DIK_WAKE HEX: E3 -CONSTANT: DIK_WEBSEARCH HEX: E5 -CONSTANT: DIK_WEBFAVORITES HEX: E6 -CONSTANT: DIK_WEBREFRESH HEX: E7 -CONSTANT: DIK_WEBSTOP HEX: E8 -CONSTANT: DIK_WEBFORWARD HEX: E9 -CONSTANT: DIK_WEBBACK HEX: EA -CONSTANT: DIK_MYCOMPUTER HEX: EB -CONSTANT: DIK_MAIL HEX: EC -CONSTANT: DIK_MEDIASELECT HEX: ED +CONSTANT: DIK_ESCAPE 0x01 +CONSTANT: DIK_1 0x02 +CONSTANT: DIK_2 0x03 +CONSTANT: DIK_3 0x04 +CONSTANT: DIK_4 0x05 +CONSTANT: DIK_5 0x06 +CONSTANT: DIK_6 0x07 +CONSTANT: DIK_7 0x08 +CONSTANT: DIK_8 0x09 +CONSTANT: DIK_9 0x0A +CONSTANT: DIK_0 0x0B +CONSTANT: DIK_MINUS 0x0C +CONSTANT: DIK_EQUALS 0x0D +CONSTANT: DIK_BACK 0x0E +CONSTANT: DIK_TAB 0x0F +CONSTANT: DIK_Q 0x10 +CONSTANT: DIK_W 0x11 +CONSTANT: DIK_E 0x12 +CONSTANT: DIK_R 0x13 +CONSTANT: DIK_T 0x14 +CONSTANT: DIK_Y 0x15 +CONSTANT: DIK_U 0x16 +CONSTANT: DIK_I 0x17 +CONSTANT: DIK_O 0x18 +CONSTANT: DIK_P 0x19 +CONSTANT: DIK_LBRACKET 0x1A +CONSTANT: DIK_RBRACKET 0x1B +CONSTANT: DIK_RETURN 0x1C +CONSTANT: DIK_LCONTROL 0x1D +CONSTANT: DIK_A 0x1E +CONSTANT: DIK_S 0x1F +CONSTANT: DIK_D 0x20 +CONSTANT: DIK_F 0x21 +CONSTANT: DIK_G 0x22 +CONSTANT: DIK_H 0x23 +CONSTANT: DIK_J 0x24 +CONSTANT: DIK_K 0x25 +CONSTANT: DIK_L 0x26 +CONSTANT: DIK_SEMICOLON 0x27 +CONSTANT: DIK_APOSTROPHE 0x28 +CONSTANT: DIK_GRAVE 0x29 +CONSTANT: DIK_LSHIFT 0x2A +CONSTANT: DIK_BACKSLASH 0x2B +CONSTANT: DIK_Z 0x2C +CONSTANT: DIK_X 0x2D +CONSTANT: DIK_C 0x2E +CONSTANT: DIK_V 0x2F +CONSTANT: DIK_B 0x30 +CONSTANT: DIK_N 0x31 +CONSTANT: DIK_M 0x32 +CONSTANT: DIK_COMMA 0x33 +CONSTANT: DIK_PERIOD 0x34 +CONSTANT: DIK_SLASH 0x35 +CONSTANT: DIK_RSHIFT 0x36 +CONSTANT: DIK_MULTIPLY 0x37 +CONSTANT: DIK_LMENU 0x38 +CONSTANT: DIK_SPACE 0x39 +CONSTANT: DIK_CAPITAL 0x3A +CONSTANT: DIK_F1 0x3B +CONSTANT: DIK_F2 0x3C +CONSTANT: DIK_F3 0x3D +CONSTANT: DIK_F4 0x3E +CONSTANT: DIK_F5 0x3F +CONSTANT: DIK_F6 0x40 +CONSTANT: DIK_F7 0x41 +CONSTANT: DIK_F8 0x42 +CONSTANT: DIK_F9 0x43 +CONSTANT: DIK_F10 0x44 +CONSTANT: DIK_NUMLOCK 0x45 +CONSTANT: DIK_SCROLL 0x46 +CONSTANT: DIK_NUMPAD7 0x47 +CONSTANT: DIK_NUMPAD8 0x48 +CONSTANT: DIK_NUMPAD9 0x49 +CONSTANT: DIK_SUBTRACT 0x4A +CONSTANT: DIK_NUMPAD4 0x4B +CONSTANT: DIK_NUMPAD5 0x4C +CONSTANT: DIK_NUMPAD6 0x4D +CONSTANT: DIK_ADD 0x4E +CONSTANT: DIK_NUMPAD1 0x4F +CONSTANT: DIK_NUMPAD2 0x50 +CONSTANT: DIK_NUMPAD3 0x51 +CONSTANT: DIK_NUMPAD0 0x52 +CONSTANT: DIK_DECIMAL 0x53 +CONSTANT: DIK_OEM_102 0x56 +CONSTANT: DIK_F11 0x57 +CONSTANT: DIK_F12 0x58 +CONSTANT: DIK_F13 0x64 +CONSTANT: DIK_F14 0x65 +CONSTANT: DIK_F15 0x66 +CONSTANT: DIK_KANA 0x70 +CONSTANT: DIK_ABNT_C1 0x73 +CONSTANT: DIK_CONVERT 0x79 +CONSTANT: DIK_NOCONVERT 0x7B +CONSTANT: DIK_YEN 0x7D +CONSTANT: DIK_ABNT_C2 0x7E +CONSTANT: DIK_NUMPADEQUALS 0x8D +CONSTANT: DIK_PREVTRACK 0x90 +CONSTANT: DIK_AT 0x91 +CONSTANT: DIK_COLON 0x92 +CONSTANT: DIK_UNDERLINE 0x93 +CONSTANT: DIK_KANJI 0x94 +CONSTANT: DIK_STOP 0x95 +CONSTANT: DIK_AX 0x96 +CONSTANT: DIK_UNLABELED 0x97 +CONSTANT: DIK_NEXTTRACK 0x99 +CONSTANT: DIK_NUMPADENTER 0x9C +CONSTANT: DIK_RCONTROL 0x9D +CONSTANT: DIK_MUTE 0xA0 +CONSTANT: DIK_CALCULATOR 0xA1 +CONSTANT: DIK_PLAYPAUSE 0xA2 +CONSTANT: DIK_MEDIASTOP 0xA4 +CONSTANT: DIK_VOLUMEDOWN 0xAE +CONSTANT: DIK_VOLUMEUP 0xB0 +CONSTANT: DIK_WEBHOME 0xB2 +CONSTANT: DIK_NUMPADCOMMA 0xB3 +CONSTANT: DIK_DIVIDE 0xB5 +CONSTANT: DIK_SYSRQ 0xB7 +CONSTANT: DIK_RMENU 0xB8 +CONSTANT: DIK_PAUSE 0xC5 +CONSTANT: DIK_HOME 0xC7 +CONSTANT: DIK_UP 0xC8 +CONSTANT: DIK_PRIOR 0xC9 +CONSTANT: DIK_LEFT 0xCB +CONSTANT: DIK_RIGHT 0xCD +CONSTANT: DIK_END 0xCF +CONSTANT: DIK_DOWN 0xD0 +CONSTANT: DIK_NEXT 0xD1 +CONSTANT: DIK_INSERT 0xD2 +CONSTANT: DIK_DELETE 0xD3 +CONSTANT: DIK_LWIN 0xDB +CONSTANT: DIK_RWIN 0xDC +CONSTANT: DIK_APPS 0xDD +CONSTANT: DIK_POWER 0xDE +CONSTANT: DIK_SLEEP 0xDF +CONSTANT: DIK_WAKE 0xE3 +CONSTANT: DIK_WEBSEARCH 0xE5 +CONSTANT: DIK_WEBFAVORITES 0xE6 +CONSTANT: DIK_WEBREFRESH 0xE7 +CONSTANT: DIK_WEBSTOP 0xE8 +CONSTANT: DIK_WEBFORWARD 0xE9 +CONSTANT: DIK_WEBBACK 0xEA +CONSTANT: DIK_MYCOMPUTER 0xEB +CONSTANT: DIK_MAIL 0xEC +CONSTANT: DIK_MEDIASELECT 0xED ALIAS: DIK_BACKSPACE DIK_BACK ALIAS: DIK_NUMPADSTAR DIK_MULTIPLY @@ -627,23 +627,23 @@ ALIAS: DIK_PGDN DIK_NEXT ALIAS: DIK_CIRCUMFLEX DIK_PREVTRACK -CONSTANT: DI8DEVTYPE_DEVICE HEX: 11 -CONSTANT: DI8DEVTYPE_MOUSE HEX: 12 -CONSTANT: DI8DEVTYPE_KEYBOARD HEX: 13 -CONSTANT: DI8DEVTYPE_JOYSTICK HEX: 14 -CONSTANT: DI8DEVTYPE_GAMEPAD HEX: 15 -CONSTANT: DI8DEVTYPE_DRIVING HEX: 16 -CONSTANT: DI8DEVTYPE_FLIGHT HEX: 17 -CONSTANT: DI8DEVTYPE_1STPERSON HEX: 18 -CONSTANT: DI8DEVTYPE_DEVICECTRL HEX: 19 -CONSTANT: DI8DEVTYPE_SCREENPOINTER HEX: 1A -CONSTANT: DI8DEVTYPE_REMOTE HEX: 1B -CONSTANT: DI8DEVTYPE_SUPPLEMENTAL HEX: 1C - -: GET_DIDEVICE_TYPE ( dwType -- type ) HEX: FF bitand ; inline - -CONSTANT: DIPROPRANGE_NOMIN HEX: 80000000 -CONSTANT: DIPROPRANGE_NOMAX HEX: 7FFFFFFF +CONSTANT: DI8DEVTYPE_DEVICE 0x11 +CONSTANT: DI8DEVTYPE_MOUSE 0x12 +CONSTANT: DI8DEVTYPE_KEYBOARD 0x13 +CONSTANT: DI8DEVTYPE_JOYSTICK 0x14 +CONSTANT: DI8DEVTYPE_GAMEPAD 0x15 +CONSTANT: DI8DEVTYPE_DRIVING 0x16 +CONSTANT: DI8DEVTYPE_FLIGHT 0x17 +CONSTANT: DI8DEVTYPE_1STPERSON 0x18 +CONSTANT: DI8DEVTYPE_DEVICECTRL 0x19 +CONSTANT: DI8DEVTYPE_SCREENPOINTER 0x1A +CONSTANT: DI8DEVTYPE_REMOTE 0x1B +CONSTANT: DI8DEVTYPE_SUPPLEMENTAL 0x1C + +: GET_DIDEVICE_TYPE ( dwType -- type ) 0xFF bitand ; inline + +CONSTANT: DIPROPRANGE_NOMIN 0x80000000 +CONSTANT: DIPROPRANGE_NOMAX 0x7FFFFFFF CONSTANT: MAXCPOINTSNUM 8 CONSTANT: DIPH_DEVICE 0 diff --git a/basis/windows/directx/dwrite/dwrite.factor b/basis/windows/directx/dwrite/dwrite.factor index c226325704..49bff6611f 100755 --- a/basis/windows/directx/dwrite/dwrite.factor +++ b/basis/windows/directx/dwrite/dwrite.factor @@ -264,85 +264,85 @@ ENUM: DWRITE_TRIMMING_GRANULARITY DWRITE_TRIMMING_GRANULARITY_WORD ; TYPEDEF: int DWRITE_FONT_FEATURE_TAG -CONSTANT: DWRITE_FONT_FEATURE_TAG_ALTERNATIVE_FRACTIONS HEX: 63726661 -CONSTANT: DWRITE_FONT_FEATURE_TAG_PETITE_CAPITALS_FROM_CAPITALS HEX: 63703263 -CONSTANT: DWRITE_FONT_FEATURE_TAG_SMALL_CAPITALS_FROM_CAPITALS HEX: 63733263 -CONSTANT: DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES HEX: 746c6163 -CONSTANT: DWRITE_FONT_FEATURE_TAG_CASE_SENSITIVE_FORMS HEX: 65736163 -CONSTANT: DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION HEX: 706d6363 -CONSTANT: DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_LIGATURES HEX: 67696c63 -CONSTANT: DWRITE_FONT_FEATURE_TAG_CAPITAL_SPACING HEX: 70737063 -CONSTANT: DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_SWASH HEX: 68777363 -CONSTANT: DWRITE_FONT_FEATURE_TAG_CURSIVE_POSITIONING HEX: 73727563 -CONSTANT: DWRITE_FONT_FEATURE_TAG_DEFAULT HEX: 746c6664 -CONSTANT: DWRITE_FONT_FEATURE_TAG_DISCRETIONARY_LIGATURES HEX: 67696c64 -CONSTANT: DWRITE_FONT_FEATURE_TAG_EXPERT_FORMS HEX: 74707865 -CONSTANT: DWRITE_FONT_FEATURE_TAG_FRACTIONS HEX: 63617266 -CONSTANT: DWRITE_FONT_FEATURE_TAG_FULL_WIDTH HEX: 64697766 -CONSTANT: DWRITE_FONT_FEATURE_TAG_HALF_FORMS HEX: 666c6168 -CONSTANT: DWRITE_FONT_FEATURE_TAG_HALANT_FORMS HEX: 6e6c6168 -CONSTANT: DWRITE_FONT_FEATURE_TAG_ALTERNATE_HALF_WIDTH HEX: 746c6168 -CONSTANT: DWRITE_FONT_FEATURE_TAG_HISTORICAL_FORMS HEX: 74736968 -CONSTANT: DWRITE_FONT_FEATURE_TAG_HORIZONTAL_KANA_ALTERNATES HEX: 616e6b68 -CONSTANT: DWRITE_FONT_FEATURE_TAG_HISTORICAL_LIGATURES HEX: 67696c68 -CONSTANT: DWRITE_FONT_FEATURE_TAG_HALF_WIDTH HEX: 64697768 -CONSTANT: DWRITE_FONT_FEATURE_TAG_HOJO_KANJI_FORMS HEX: 6f6a6f68 -CONSTANT: DWRITE_FONT_FEATURE_TAG_JIS04_FORMS HEX: 3430706a -CONSTANT: DWRITE_FONT_FEATURE_TAG_JIS78_FORMS HEX: 3837706a -CONSTANT: DWRITE_FONT_FEATURE_TAG_JIS83_FORMS HEX: 3338706a -CONSTANT: DWRITE_FONT_FEATURE_TAG_JIS90_FORMS HEX: 3039706a -CONSTANT: DWRITE_FONT_FEATURE_TAG_KERNING HEX: 6e72656b -CONSTANT: DWRITE_FONT_FEATURE_TAG_STANDARD_LIGATURES HEX: 6167696c -CONSTANT: DWRITE_FONT_FEATURE_TAG_LINING_FIGURES HEX: 6d756e6c -CONSTANT: DWRITE_FONT_FEATURE_TAG_LOCALIZED_FORMS HEX: 6c636f6c -CONSTANT: DWRITE_FONT_FEATURE_TAG_MARK_POSITIONING HEX: 6b72616d -CONSTANT: DWRITE_FONT_FEATURE_TAG_MATHEMATICAL_GREEK HEX: 6b72676d -CONSTANT: DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING HEX: 6b6d6b6d -CONSTANT: DWRITE_FONT_FEATURE_TAG_ALTERNATE_ANNOTATION_FORMS HEX: 746c616e -CONSTANT: DWRITE_FONT_FEATURE_TAG_NLC_KANJI_FORMS HEX: 6b636c6e -CONSTANT: DWRITE_FONT_FEATURE_TAG_OLD_STYLE_FIGURES HEX: 6d756e6f -CONSTANT: DWRITE_FONT_FEATURE_TAG_ORDINALS HEX: 6e64726f -CONSTANT: DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_ALTERNATE_WIDTH HEX: 746c6170 -CONSTANT: DWRITE_FONT_FEATURE_TAG_PETITE_CAPITALS HEX: 70616370 -CONSTANT: DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_FIGURES HEX: 6d756e70 -CONSTANT: DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_WIDTHS HEX: 64697770 -CONSTANT: DWRITE_FONT_FEATURE_TAG_QUARTER_WIDTHS HEX: 64697771 -CONSTANT: DWRITE_FONT_FEATURE_TAG_REQUIRED_LIGATURES HEX: 67696c72 -CONSTANT: DWRITE_FONT_FEATURE_TAG_RUBY_NOTATION_FORMS HEX: 79627572 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_ALTERNATES HEX: 746c6173 -CONSTANT: DWRITE_FONT_FEATURE_TAG_SCIENTIFIC_INFERIORS HEX: 666e6973 -CONSTANT: DWRITE_FONT_FEATURE_TAG_SMALL_CAPITALS HEX: 70636d73 -CONSTANT: DWRITE_FONT_FEATURE_TAG_SIMPLIFIED_FORMS HEX: 6c706d73 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_1 HEX: 31307373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_2 HEX: 32307373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_3 HEX: 33307373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_4 HEX: 34307373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_5 HEX: 35307373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_6 HEX: 36307373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_7 HEX: 37307373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_8 HEX: 38307373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_9 HEX: 39307373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_10 HEX: 30317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_11 HEX: 31317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_12 HEX: 32317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_13 HEX: 33317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_14 HEX: 34317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_15 HEX: 35317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_16 HEX: 36317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_17 HEX: 37317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_18 HEX: 38317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_19 HEX: 39317373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_20 HEX: 30327373 -CONSTANT: DWRITE_FONT_FEATURE_TAG_SUBSCRIPT HEX: 73627573 -CONSTANT: DWRITE_FONT_FEATURE_TAG_SUPERSCRIPT HEX: 73707573 -CONSTANT: DWRITE_FONT_FEATURE_TAG_SWASH HEX: 68737773 -CONSTANT: DWRITE_FONT_FEATURE_TAG_TITLING HEX: 6c746974 -CONSTANT: DWRITE_FONT_FEATURE_TAG_TRADITIONAL_NAME_FORMS HEX: 6d616e74 -CONSTANT: DWRITE_FONT_FEATURE_TAG_TABULAR_FIGURES HEX: 6d756e74 -CONSTANT: DWRITE_FONT_FEATURE_TAG_TRADITIONAL_FORMS HEX: 64617274 -CONSTANT: DWRITE_FONT_FEATURE_TAG_THIRD_WIDTHS HEX: 64697774 -CONSTANT: DWRITE_FONT_FEATURE_TAG_UNICASE HEX: 63696e75 -CONSTANT: DWRITE_FONT_FEATURE_TAG_SLASHED_ZERO HEX: 6f72657a +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 +CONSTANT: DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_ALTERNATES 0x746c6163 +CONSTANT: DWRITE_FONT_FEATURE_TAG_CASE_SENSITIVE_FORMS 0x65736163 +CONSTANT: DWRITE_FONT_FEATURE_TAG_GLYPH_COMPOSITION_DECOMPOSITION 0x706d6363 +CONSTANT: DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_LIGATURES 0x67696c63 +CONSTANT: DWRITE_FONT_FEATURE_TAG_CAPITAL_SPACING 0x70737063 +CONSTANT: DWRITE_FONT_FEATURE_TAG_CONTEXTUAL_SWASH 0x68777363 +CONSTANT: DWRITE_FONT_FEATURE_TAG_CURSIVE_POSITIONING 0x73727563 +CONSTANT: DWRITE_FONT_FEATURE_TAG_DEFAULT 0x746c6664 +CONSTANT: DWRITE_FONT_FEATURE_TAG_DISCRETIONARY_LIGATURES 0x67696c64 +CONSTANT: DWRITE_FONT_FEATURE_TAG_EXPERT_FORMS 0x74707865 +CONSTANT: DWRITE_FONT_FEATURE_TAG_FRACTIONS 0x63617266 +CONSTANT: DWRITE_FONT_FEATURE_TAG_FULL_WIDTH 0x64697766 +CONSTANT: DWRITE_FONT_FEATURE_TAG_HALF_FORMS 0x666c6168 +CONSTANT: DWRITE_FONT_FEATURE_TAG_HALANT_FORMS 0x6e6c6168 +CONSTANT: DWRITE_FONT_FEATURE_TAG_ALTERNATE_HALF_WIDTH 0x746c6168 +CONSTANT: DWRITE_FONT_FEATURE_TAG_HISTORICAL_FORMS 0x74736968 +CONSTANT: DWRITE_FONT_FEATURE_TAG_HORIZONTAL_KANA_ALTERNATES 0x616e6b68 +CONSTANT: DWRITE_FONT_FEATURE_TAG_HISTORICAL_LIGATURES 0x67696c68 +CONSTANT: DWRITE_FONT_FEATURE_TAG_HALF_WIDTH 0x64697768 +CONSTANT: DWRITE_FONT_FEATURE_TAG_HOJO_KANJI_FORMS 0x6f6a6f68 +CONSTANT: DWRITE_FONT_FEATURE_TAG_JIS04_FORMS 0x3430706a +CONSTANT: DWRITE_FONT_FEATURE_TAG_JIS78_FORMS 0x3837706a +CONSTANT: DWRITE_FONT_FEATURE_TAG_JIS83_FORMS 0x3338706a +CONSTANT: DWRITE_FONT_FEATURE_TAG_JIS90_FORMS 0x3039706a +CONSTANT: DWRITE_FONT_FEATURE_TAG_KERNING 0x6e72656b +CONSTANT: DWRITE_FONT_FEATURE_TAG_STANDARD_LIGATURES 0x6167696c +CONSTANT: DWRITE_FONT_FEATURE_TAG_LINING_FIGURES 0x6d756e6c +CONSTANT: DWRITE_FONT_FEATURE_TAG_LOCALIZED_FORMS 0x6c636f6c +CONSTANT: DWRITE_FONT_FEATURE_TAG_MARK_POSITIONING 0x6b72616d +CONSTANT: DWRITE_FONT_FEATURE_TAG_MATHEMATICAL_GREEK 0x6b72676d +CONSTANT: DWRITE_FONT_FEATURE_TAG_MARK_TO_MARK_POSITIONING 0x6b6d6b6d +CONSTANT: DWRITE_FONT_FEATURE_TAG_ALTERNATE_ANNOTATION_FORMS 0x746c616e +CONSTANT: DWRITE_FONT_FEATURE_TAG_NLC_KANJI_FORMS 0x6b636c6e +CONSTANT: DWRITE_FONT_FEATURE_TAG_OLD_STYLE_FIGURES 0x6d756e6f +CONSTANT: DWRITE_FONT_FEATURE_TAG_ORDINALS 0x6e64726f +CONSTANT: DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_ALTERNATE_WIDTH 0x746c6170 +CONSTANT: DWRITE_FONT_FEATURE_TAG_PETITE_CAPITALS 0x70616370 +CONSTANT: DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_FIGURES 0x6d756e70 +CONSTANT: DWRITE_FONT_FEATURE_TAG_PROPORTIONAL_WIDTHS 0x64697770 +CONSTANT: DWRITE_FONT_FEATURE_TAG_QUARTER_WIDTHS 0x64697771 +CONSTANT: DWRITE_FONT_FEATURE_TAG_REQUIRED_LIGATURES 0x67696c72 +CONSTANT: DWRITE_FONT_FEATURE_TAG_RUBY_NOTATION_FORMS 0x79627572 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_ALTERNATES 0x746c6173 +CONSTANT: DWRITE_FONT_FEATURE_TAG_SCIENTIFIC_INFERIORS 0x666e6973 +CONSTANT: DWRITE_FONT_FEATURE_TAG_SMALL_CAPITALS 0x70636d73 +CONSTANT: DWRITE_FONT_FEATURE_TAG_SIMPLIFIED_FORMS 0x6c706d73 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_1 0x31307373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_2 0x32307373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_3 0x33307373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_4 0x34307373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_5 0x35307373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_6 0x36307373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_7 0x37307373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_8 0x38307373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_9 0x39307373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_10 0x30317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_11 0x31317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_12 0x32317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_13 0x33317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_14 0x34317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_15 0x35317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_16 0x36317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_17 0x37317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_18 0x38317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_19 0x39317373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_STYLISTIC_SET_20 0x30327373 +CONSTANT: DWRITE_FONT_FEATURE_TAG_SUBSCRIPT 0x73627573 +CONSTANT: DWRITE_FONT_FEATURE_TAG_SUPERSCRIPT 0x73707573 +CONSTANT: DWRITE_FONT_FEATURE_TAG_SWASH 0x68737773 +CONSTANT: DWRITE_FONT_FEATURE_TAG_TITLING 0x6c746974 +CONSTANT: DWRITE_FONT_FEATURE_TAG_TRADITIONAL_NAME_FORMS 0x6d616e74 +CONSTANT: DWRITE_FONT_FEATURE_TAG_TABULAR_FIGURES 0x6d756e74 +CONSTANT: DWRITE_FONT_FEATURE_TAG_TRADITIONAL_FORMS 0x64617274 +CONSTANT: DWRITE_FONT_FEATURE_TAG_THIRD_WIDTHS 0x64697774 +CONSTANT: DWRITE_FONT_FEATURE_TAG_UNICASE 0x63696e75 +CONSTANT: DWRITE_FONT_FEATURE_TAG_SLASHED_ZERO 0x6f72657a STRUCT: DWRITE_TEXT_RANGE { startPosition UINT32 } @@ -651,10 +651,10 @@ FUNCTION: HRESULT DWriteCreateFactory ( REFIID iid, IUnknown** factory ) ; -CONSTANT: DWRITE_E_FILEFORMAT HEX: 88985000 -CONSTANT: DWRITE_E_UNEXPECTED HEX: 88985001 -CONSTANT: DWRITE_E_NOFONT HEX: 88985002 -CONSTANT: DWRITE_E_FILENOTFOUND HEX: 88985003 -CONSTANT: DWRITE_E_FILEACCESS HEX: 88985004 -CONSTANT: DWRITE_E_FONTCOLLECTIONOBSOLETE HEX: 88985005 -CONSTANT: DWRITE_E_ALREADYREGISTERED HEX: 88985006 +CONSTANT: DWRITE_E_FILEFORMAT 0x88985000 +CONSTANT: DWRITE_E_UNEXPECTED 0x88985001 +CONSTANT: DWRITE_E_NOFONT 0x88985002 +CONSTANT: DWRITE_E_FILENOTFOUND 0x88985003 +CONSTANT: DWRITE_E_FILEACCESS 0x88985004 +CONSTANT: DWRITE_E_FONTCOLLECTIONOBSOLETE 0x88985005 +CONSTANT: DWRITE_E_ALREADYREGISTERED 0x88985006 diff --git a/basis/windows/directx/dxfile/dxfile.factor b/basis/windows/directx/dxfile/dxfile.factor index e549445eb6..a5fc03ab4e 100755 --- a/basis/windows/directx/dxfile/dxfile.factor +++ b/basis/windows/directx/dxfile/dxfile.factor @@ -93,30 +93,30 @@ COM-INTERFACE: IDirectXFileBinary IDirectXFileObject {3d82ab46-62da-11cf-ab39-00 CONSTANT: DXFILE_OK 0 -CONSTANT: DXFILEERR_BADOBJECT HEX: 88760352 -CONSTANT: DXFILEERR_BADVALUE HEX: 88760353 -CONSTANT: DXFILEERR_BADTYPE HEX: 88760354 -CONSTANT: DXFILEERR_BADSTREAMHANDLE HEX: 88760355 -CONSTANT: DXFILEERR_BADALLOC HEX: 88760356 -CONSTANT: DXFILEERR_NOTFOUND HEX: 88760357 -CONSTANT: DXFILEERR_NOTDONEYET HEX: 88760358 -CONSTANT: DXFILEERR_FILENOTFOUND HEX: 88760359 -CONSTANT: DXFILEERR_RESOURCENOTFOUND HEX: 8876035A -CONSTANT: DXFILEERR_URLNOTFOUND HEX: 8876035B -CONSTANT: DXFILEERR_BADRESOURCE HEX: 8876035C -CONSTANT: DXFILEERR_BADFILETYPE HEX: 8876035D -CONSTANT: DXFILEERR_BADFILEVERSION HEX: 8876035E -CONSTANT: DXFILEERR_BADFILEFLOATSIZE HEX: 8876035F -CONSTANT: DXFILEERR_BADFILECOMPRESSIONTYPE HEX: 88760360 -CONSTANT: DXFILEERR_BADFILE HEX: 88760361 -CONSTANT: DXFILEERR_PARSEERROR HEX: 88760362 -CONSTANT: DXFILEERR_NOTEMPLATE HEX: 88760363 -CONSTANT: DXFILEERR_BADARRAYSIZE HEX: 88760364 -CONSTANT: DXFILEERR_BADDATAREFERENCE HEX: 88760365 -CONSTANT: DXFILEERR_INTERNALERROR HEX: 88760366 -CONSTANT: DXFILEERR_NOMOREOBJECTS HEX: 88760367 -CONSTANT: DXFILEERR_BADINTRINSICS HEX: 88760368 -CONSTANT: DXFILEERR_NOMORESTREAMHANDLES HEX: 88760369 -CONSTANT: DXFILEERR_NOMOREDATA HEX: 8876036A -CONSTANT: DXFILEERR_BADCACHEFILE HEX: 8876036B -CONSTANT: DXFILEERR_NOINTERNET HEX: 8876036C +CONSTANT: DXFILEERR_BADOBJECT 0x88760352 +CONSTANT: DXFILEERR_BADVALUE 0x88760353 +CONSTANT: DXFILEERR_BADTYPE 0x88760354 +CONSTANT: DXFILEERR_BADSTREAMHANDLE 0x88760355 +CONSTANT: DXFILEERR_BADALLOC 0x88760356 +CONSTANT: DXFILEERR_NOTFOUND 0x88760357 +CONSTANT: DXFILEERR_NOTDONEYET 0x88760358 +CONSTANT: DXFILEERR_FILENOTFOUND 0x88760359 +CONSTANT: DXFILEERR_RESOURCENOTFOUND 0x8876035A +CONSTANT: DXFILEERR_URLNOTFOUND 0x8876035B +CONSTANT: DXFILEERR_BADRESOURCE 0x8876035C +CONSTANT: DXFILEERR_BADFILETYPE 0x8876035D +CONSTANT: DXFILEERR_BADFILEVERSION 0x8876035E +CONSTANT: DXFILEERR_BADFILEFLOATSIZE 0x8876035F +CONSTANT: DXFILEERR_BADFILECOMPRESSIONTYPE 0x88760360 +CONSTANT: DXFILEERR_BADFILE 0x88760361 +CONSTANT: DXFILEERR_PARSEERROR 0x88760362 +CONSTANT: DXFILEERR_NOTEMPLATE 0x88760363 +CONSTANT: DXFILEERR_BADARRAYSIZE 0x88760364 +CONSTANT: DXFILEERR_BADDATAREFERENCE 0x88760365 +CONSTANT: DXFILEERR_INTERNALERROR 0x88760366 +CONSTANT: DXFILEERR_NOMOREOBJECTS 0x88760367 +CONSTANT: DXFILEERR_BADINTRINSICS 0x88760368 +CONSTANT: DXFILEERR_NOMORESTREAMHANDLES 0x88760369 +CONSTANT: DXFILEERR_NOMOREDATA 0x8876036A +CONSTANT: DXFILEERR_BADCACHEFILE 0x8876036B +CONSTANT: DXFILEERR_NOINTERNET 0x8876036C diff --git a/basis/windows/directx/dxgi/dxgi.factor b/basis/windows/directx/dxgi/dxgi.factor index 58f6ab3d31..48c6eb1354 100644 --- a/basis/windows/directx/dxgi/dxgi.factor +++ b/basis/windows/directx/dxgi/dxgi.factor @@ -51,11 +51,11 @@ STRUCT: DXGI_OUTPUT_DESC STRUCT: DXGI_SHARED_RESOURCE { Handle HANDLE } ; -CONSTANT: DXGI_RESOURCE_PRIORITY_MINIMUM HEX: 28000000 -CONSTANT: DXGI_RESOURCE_PRIORITY_LOW HEX: 50000000 -CONSTANT: DXGI_RESOURCE_PRIORITY_NORMAL HEX: 78000000 -CONSTANT: DXGI_RESOURCE_PRIORITY_HIGH HEX: a0000000 -CONSTANT: DXGI_RESOURCE_PRIORITY_MAXIMUM HEX: c8000000 +CONSTANT: DXGI_RESOURCE_PRIORITY_MINIMUM 0x28000000 +CONSTANT: DXGI_RESOURCE_PRIORITY_LOW 0x50000000 +CONSTANT: DXGI_RESOURCE_PRIORITY_NORMAL 0x78000000 +CONSTANT: DXGI_RESOURCE_PRIORITY_HIGH 0xa0000000 +CONSTANT: DXGI_RESOURCE_PRIORITY_MAXIMUM 0xc8000000 CONSTANT: DXGI_RESIDENCY_FULLY_RESIDENT 1 CONSTANT: DXGI_RESIDENCY_RESIDENT_IN_SHARED_MEMORY 2 @@ -183,7 +183,7 @@ HRESULT GetGPUThreadPriority ( INT* pPriority ) ; CONSTANT: DXGI_ADAPTER_FLAG_NONE 0 CONSTANT: DXGI_ADAPTER_FLAG_REMOTE 1 -CONSTANT: DXGI_ADAPTER_FLAG_FORCE_DWORD HEX: ffffffff +CONSTANT: DXGI_ADAPTER_FLAG_FORCE_DWORD 0xffffffff TYPEDEF: int DXGI_ADAPTER_FLAG STRUCT: DXGI_ADAPTER_DESC1 diff --git a/basis/windows/directx/dxgiformat/dxgiformat.factor b/basis/windows/directx/dxgiformat/dxgiformat.factor index ab2c082cba..8438de151c 100644 --- a/basis/windows/directx/dxgiformat/dxgiformat.factor +++ b/basis/windows/directx/dxgiformat/dxgiformat.factor @@ -101,5 +101,5 @@ CONSTANT: DXGI_FORMAT_BC6H_SF16 96 CONSTANT: DXGI_FORMAT_BC7_TYPELESS 97 CONSTANT: DXGI_FORMAT_BC7_UNORM 98 CONSTANT: DXGI_FORMAT_BC7_UNORM_SRGB 99 -CONSTANT: DXGI_FORMAT_FORCE_UINT HEX: ffffffff +CONSTANT: DXGI_FORMAT_FORCE_UINT 0xffffffff TYPEDEF: int DXGI_FORMAT diff --git a/basis/windows/directx/dxgitype/dxgitype.factor b/basis/windows/directx/dxgitype/dxgitype.factor index d0eda4885c..cc4067c701 100644 --- a/basis/windows/directx/dxgitype/dxgitype.factor +++ b/basis/windows/directx/dxgitype/dxgitype.factor @@ -2,29 +2,29 @@ USING: alien.c-types alien.syntax classes.struct windows.directx.dxgiformat windows.types ; IN: windows.directx.dxgitype -CONSTANT: DXGI_STATUS_OCCLUDED HEX: 087a0001 -CONSTANT: DXGI_STATUS_CLIPPED HEX: 087a0002 -CONSTANT: DXGI_STATUS_NO_REDIRECTION HEX: 087a0004 -CONSTANT: DXGI_STATUS_NO_DESKTOP_ACCESS HEX: 087a0005 -CONSTANT: DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE HEX: 087a0006 -CONSTANT: DXGI_STATUS_MODE_CHANGED HEX: 087a0007 -CONSTANT: DXGI_STATUS_MODE_CHANGE_IN_PROGRESS HEX: 087a0008 +CONSTANT: DXGI_STATUS_OCCLUDED 0x087a0001 +CONSTANT: DXGI_STATUS_CLIPPED 0x087a0002 +CONSTANT: DXGI_STATUS_NO_REDIRECTION 0x087a0004 +CONSTANT: DXGI_STATUS_NO_DESKTOP_ACCESS 0x087a0005 +CONSTANT: DXGI_STATUS_GRAPHICS_VIDPN_SOURCE_IN_USE 0x087a0006 +CONSTANT: DXGI_STATUS_MODE_CHANGED 0x087a0007 +CONSTANT: DXGI_STATUS_MODE_CHANGE_IN_PROGRESS 0x087a0008 -CONSTANT: DXGI_ERROR_INVALID_CALL HEX: 887a0001 -CONSTANT: DXGI_ERROR_NOT_FOUND HEX: 887a0002 -CONSTANT: DXGI_ERROR_MORE_DATA HEX: 887a0003 -CONSTANT: DXGI_ERROR_UNSUPPORTED HEX: 887a0004 -CONSTANT: DXGI_ERROR_DEVICE_REMOVED HEX: 887a0005 -CONSTANT: DXGI_ERROR_DEVICE_HUNG HEX: 887a0006 -CONSTANT: DXGI_ERROR_DEVICE_RESET HEX: 887a0007 -CONSTANT: DXGI_ERROR_WAS_STILL_DRAWING HEX: 887a000a -CONSTANT: DXGI_ERROR_FRAME_STATISTICS_DISJOINT HEX: 887a000b -CONSTANT: DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE HEX: 887a000c -CONSTANT: DXGI_ERROR_DRIVER_INTERNAL_ERROR HEX: 887a0020 -CONSTANT: DXGI_ERROR_NONEXCLUSIVE HEX: 887a0021 -CONSTANT: DXGI_ERROR_NOT_CURRENTLY_AVAILABLE HEX: 887a0022 -CONSTANT: DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED HEX: 887a0023 -CONSTANT: DXGI_ERROR_REMOTE_OUTOFMEMORY HEX: 887a0024 +CONSTANT: DXGI_ERROR_INVALID_CALL 0x887a0001 +CONSTANT: DXGI_ERROR_NOT_FOUND 0x887a0002 +CONSTANT: DXGI_ERROR_MORE_DATA 0x887a0003 +CONSTANT: DXGI_ERROR_UNSUPPORTED 0x887a0004 +CONSTANT: DXGI_ERROR_DEVICE_REMOVED 0x887a0005 +CONSTANT: DXGI_ERROR_DEVICE_HUNG 0x887a0006 +CONSTANT: DXGI_ERROR_DEVICE_RESET 0x887a0007 +CONSTANT: DXGI_ERROR_WAS_STILL_DRAWING 0x887a000a +CONSTANT: DXGI_ERROR_FRAME_STATISTICS_DISJOINT 0x887a000b +CONSTANT: DXGI_ERROR_GRAPHICS_VIDPN_SOURCE_IN_USE 0x887a000c +CONSTANT: DXGI_ERROR_DRIVER_INTERNAL_ERROR 0x887a0020 +CONSTANT: DXGI_ERROR_NONEXCLUSIVE 0x887a0021 +CONSTANT: DXGI_ERROR_NOT_CURRENTLY_AVAILABLE 0x887a0022 +CONSTANT: DXGI_ERROR_REMOTE_CLIENT_DISCONNECTED 0x887a0023 +CONSTANT: DXGI_ERROR_REMOTE_OUTOFMEMORY 0x887a0024 STRUCT: DXGI_RGB { Red FLOAT } diff --git a/basis/windows/directx/x3daudio/x3daudio.factor b/basis/windows/directx/x3daudio/x3daudio.factor index 46781a256b..06f8fedeea 100644 --- a/basis/windows/directx/x3daudio/x3daudio.factor +++ b/basis/windows/directx/x3daudio/x3daudio.factor @@ -11,15 +11,15 @@ CONSTANT: X3DAUDIO_2PI 6.283185307 CONSTANT: X3DAUDIO_SPEED_OF_SOUND 343.5 -CONSTANT: X3DAUDIO_CALCULATE_MATRIX HEX: 00000001 -CONSTANT: X3DAUDIO_CALCULATE_DELAY HEX: 00000002 -CONSTANT: X3DAUDIO_CALCULATE_LPF_DIRECT HEX: 00000004 -CONSTANT: X3DAUDIO_CALCULATE_LPF_REVERB HEX: 00000008 -CONSTANT: X3DAUDIO_CALCULATE_REVERB HEX: 00000010 -CONSTANT: X3DAUDIO_CALCULATE_DOPPLER HEX: 00000020 -CONSTANT: X3DAUDIO_CALCULATE_EMITTER_ANGLE HEX: 00000040 -CONSTANT: X3DAUDIO_CALCULATE_ZEROCENTER HEX: 00010000 -CONSTANT: X3DAUDIO_CALCULATE_REDIRECT_TO_LFE HEX: 00020000 +CONSTANT: X3DAUDIO_CALCULATE_MATRIX 0x00000001 +CONSTANT: X3DAUDIO_CALCULATE_DELAY 0x00000002 +CONSTANT: X3DAUDIO_CALCULATE_LPF_DIRECT 0x00000004 +CONSTANT: X3DAUDIO_CALCULATE_LPF_REVERB 0x00000008 +CONSTANT: X3DAUDIO_CALCULATE_REVERB 0x00000010 +CONSTANT: X3DAUDIO_CALCULATE_DOPPLER 0x00000020 +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 diff --git a/basis/windows/directx/xact3/xact3.factor b/basis/windows/directx/xact3/xact3.factor index 12a890ff1e..a1f002a71a 100644 --- a/basis/windows/directx/xact3/xact3.factor +++ b/basis/windows/directx/xact3/xact3.factor @@ -26,8 +26,8 @@ TYPEDEF: BYTE XACTVARIATIONWEIGHT TYPEDEF: BYTE XACTPRIORITY TYPEDEF: BYTE XACTINSTANCELIMIT -CONSTANT: WAVE_FORMAT_IEEE_FLOAT HEX: 0003 -CONSTANT: WAVE_FORMAT_EXTENSIBLE HEX: FFFE +CONSTANT: WAVE_FORMAT_IEEE_FLOAT 0x0003 +CONSTANT: WAVE_FORMAT_EXTENSIBLE 0xFFFE STRUCT: WAVEFORMATEX { wFormatTag WORD } @@ -52,57 +52,57 @@ STRUCT: WAVEFORMATEXTENSIBLE { SubFormat GUID } ; TYPEDEF: WAVEFORMATEXTENSIBLE* PWAVEFORMATEXTENSIBLE -CONSTANT: XACTTIME_MIN HEX: 80000001 -CONSTANT: XACTTIME_MAX HEX: 7fffffff -CONSTANT: XACTTIME_INFINITE HEX: 7fffffff -CONSTANT: XACTINSTANCELIMIT_INFINITE HEX: ff -CONSTANT: XACTINSTANCELIMIT_MIN HEX: 00 -CONSTANT: XACTINSTANCELIMIT_MAX HEX: fe -CONSTANT: XACTINDEX_MIN HEX: 0 -CONSTANT: XACTINDEX_MAX HEX: fffe -CONSTANT: XACTINDEX_INVALID HEX: ffff -CONSTANT: XACTNOTIFICATIONTYPE_MIN HEX: 00 -CONSTANT: XACTNOTIFICATIONTYPE_MAX HEX: ff -CONSTANT: XACTVARIABLEINDEX_MIN HEX: 0000 -CONSTANT: XACTVARIABLEINDEX_MAX HEX: fffe -CONSTANT: XACTVARIABLEINDEX_INVALID HEX: ffff -CONSTANT: XACTCATEGORY_MIN HEX: 0 -CONSTANT: XACTCATEGORY_MAX HEX: fffe -CONSTANT: XACTCATEGORY_INVALID HEX: ffff +CONSTANT: XACTTIME_MIN 0x80000001 +CONSTANT: XACTTIME_MAX 0x7fffffff +CONSTANT: XACTTIME_INFINITE 0x7fffffff +CONSTANT: XACTINSTANCELIMIT_INFINITE 0xff +CONSTANT: XACTINSTANCELIMIT_MIN 0x00 +CONSTANT: XACTINSTANCELIMIT_MAX 0xfe +CONSTANT: XACTINDEX_MIN 0x0 +CONSTANT: XACTINDEX_MAX 0xfffe +CONSTANT: XACTINDEX_INVALID 0xffff +CONSTANT: XACTNOTIFICATIONTYPE_MIN 0x00 +CONSTANT: XACTNOTIFICATIONTYPE_MAX 0xff +CONSTANT: XACTVARIABLEINDEX_MIN 0x0000 +CONSTANT: XACTVARIABLEINDEX_MAX 0xfffe +CONSTANT: XACTVARIABLEINDEX_INVALID 0xffff +CONSTANT: XACTCATEGORY_MIN 0x0 +CONSTANT: XACTCATEGORY_MAX 0xfffe +CONSTANT: XACTCATEGORY_INVALID 0xffff CONSTANT: XACTCHANNEL_MIN 0 -CONSTANT: XACTCHANNEL_MAX HEX: FF +CONSTANT: XACTCHANNEL_MAX 0xFF CONSTANT: XACTPITCH_MIN -1200 CONSTANT: XACTPITCH_MAX 1200 CONSTANT: XACTPITCH_MIN_TOTAL -2400 CONSTANT: XACTPITCH_MAX_TOTAL 2400 CONSTANT: XACTVOLUME_MIN 0.0 CONSTANT: XACTVOLUME_MAX 16777216.0 -CONSTANT: XACTLOOPCOUNT_MIN HEX: 0 -CONSTANT: XACTLOOPCOUNT_MAX HEX: fe -CONSTANT: XACTLOOPCOUNT_INFINITE HEX: ff +CONSTANT: XACTLOOPCOUNT_MIN 0x0 +CONSTANT: XACTLOOPCOUNT_MAX 0xfe +CONSTANT: XACTLOOPCOUNT_INFINITE 0xff CONSTANT: XACTWAVEALIGNMENT_MIN 2048 -CONSTANT: XACT_CUE_NAME_LENGTH HEX: FF +CONSTANT: XACT_CUE_NAME_LENGTH 0xFF CONSTANT: XACT_CONTENT_VERSION 46 -CONSTANT: XACT_FLAG_STOP_RELEASE HEX: 00000000 -CONSTANT: XACT_FLAG_STOP_IMMEDIATE HEX: 00000001 +CONSTANT: XACT_FLAG_STOP_RELEASE 0x00000000 +CONSTANT: XACT_FLAG_STOP_IMMEDIATE 0x00000001 -CONSTANT: XACT_FLAG_MANAGEDATA HEX: 00000001 +CONSTANT: XACT_FLAG_MANAGEDATA 0x00000001 -CONSTANT: XACT_FLAG_BACKGROUND_MUSIC HEX: 00000002 -CONSTANT: XACT_FLAG_UNITS_MS HEX: 00000004 -CONSTANT: XACT_FLAG_UNITS_SAMPLES HEX: 00000008 +CONSTANT: XACT_FLAG_BACKGROUND_MUSIC 0x00000002 +CONSTANT: XACT_FLAG_UNITS_MS 0x00000004 +CONSTANT: XACT_FLAG_UNITS_SAMPLES 0x00000008 -CONSTANT: XACT_STATE_CREATED HEX: 00000001 -CONSTANT: XACT_STATE_PREPARING HEX: 00000002 -CONSTANT: XACT_STATE_PREPARED HEX: 00000004 -CONSTANT: XACT_STATE_PLAYING HEX: 00000008 -CONSTANT: XACT_STATE_STOPPING HEX: 00000010 -CONSTANT: XACT_STATE_STOPPED HEX: 00000020 -CONSTANT: XACT_STATE_PAUSED HEX: 00000040 -CONSTANT: XACT_STATE_INUSE HEX: 00000080 -CONSTANT: XACT_STATE_PREPAREFAILED HEX: 80000000 +CONSTANT: XACT_STATE_CREATED 0x00000001 +CONSTANT: XACT_STATE_PREPARING 0x00000002 +CONSTANT: XACT_STATE_PREPARED 0x00000004 +CONSTANT: XACT_STATE_PLAYING 0x00000008 +CONSTANT: XACT_STATE_STOPPING 0x00000010 +CONSTANT: XACT_STATE_STOPPED 0x00000020 +CONSTANT: XACT_STATE_PAUSED 0x00000040 +CONSTANT: XACT_STATE_INUSE 0x00000080 +CONSTANT: XACT_STATE_PREPAREFAILED 0x80000000 C-TYPE: XACT_READFILE_CB C-TYPE: XACT_GETOVERLAPPEDRESULT_CB @@ -117,8 +117,8 @@ TYPEDEF: XACT_FILEIO_CALLBACKS* PXACT_FILEIO_CALLBACKS C-TYPE: XACT_NOTIFICATION_CALLBACK -CONSTANT: XACT_RENDERER_ID_LENGTH HEX: ff -CONSTANT: XACT_RENDERER_NAME_LENGTH HEX: ff +CONSTANT: XACT_RENDERER_ID_LENGTH 0xff +CONSTANT: XACT_RENDERER_NAME_LENGTH 0xff STRUCT: XACT_RENDERER_DETAILS { rendererID WCHAR[255] } @@ -255,7 +255,7 @@ CONSTANT: XACTNOTIFICATIONTYPE_WAVEDESTROYED 16 CONSTANT: XACTNOTIFICATIONTYPE_WAVEBANKPREPARED 17 CONSTANT: XACTNOTIFICATIONTYPE_WAVEBANKSTREAMING_INVALIDCONTENT 18 -CONSTANT: XACT_FLAG_NOTIFICATION_PERSIST HEX: 01 +CONSTANT: XACT_FLAG_NOTIFICATION_PERSIST 0x01 STRUCT: XACT_NOTIFICATION_DESCRIPTION { type XACTNOTIFICATIONTYPE } @@ -327,8 +327,8 @@ STRUCT: XACT_NOTIFICATION { union XACT_NOTIFICATION_UNION } ; TYPEDEF: XACT_NOTIFICATION* LPXACT_NOTIFICATION -CONSTANT: XACT_FLAG_SOUNDBANK_STOP_IMMEDIATE HEX: 00000001 -CONSTANT: XACT_SOUNDBANKSTATE_INUSE HEX: 00000080 +CONSTANT: XACT_FLAG_SOUNDBANK_STOP_IMMEDIATE 0x00000001 +CONSTANT: XACT_SOUNDBANKSTATE_INUSE 0x00000080 COM-INTERFACE: IXACT3SoundBank f {00000000-0000-0000-0000-000000000000} XACTINDEX GetCueIndex ( PCSTR szFriendlyName ) @@ -340,9 +340,9 @@ COM-INTERFACE: IXACT3SoundBank f {00000000-0000-0000-0000-000000000000} HRESULT Destroy ( ) HRESULT GetState ( DWORD* pdwState ) ; -CONSTANT: XACT_WAVEBANKSTATE_INUSE HEX: 00000080 -CONSTANT: XACT_WAVEBANKSTATE_PREPARED HEX: 00000004 -CONSTANT: XACT_WAVEBANKSTATE_PREPAREFAILED HEX: 80000000 +CONSTANT: XACT_WAVEBANKSTATE_INUSE 0x00000080 +CONSTANT: XACT_WAVEBANKSTATE_PREPARED 0x00000004 +CONSTANT: XACT_WAVEBANKSTATE_PREPAREFAILED 0x80000000 COM-INTERFACE: IXACT3WaveBank f {00000000-0000-0000-0000-000000000000} HRESULT Destroy ( ) @@ -429,46 +429,46 @@ COM-INTERFACE: IXACT3Engine IUnknown {b1ee676a-d9cd-4d2a-89a8-fa53eb9e480b} CONSTANT: XACT_FLAG_API_AUDITION_MODE 1 CONSTANT: XACT_FLAG_API_DEBUG_MODE 2 -CONSTANT: XACTENGINE_E_OUTOFMEMORY HEX: 80070000 -CONSTANT: XACTENGINE_E_INVALIDARG HEX: 80070057 -CONSTANT: XACTENGINE_E_NOTIMPL HEX: 80004001 -CONSTANT: XACTENGINE_E_FAIL HEX: 80004005 - -CONSTANT: XACTENGINE_E_ALREADYINITIALIZED HEX: 8AC70001 -CONSTANT: XACTENGINE_E_NOTINITIALIZED HEX: 8AC70002 -CONSTANT: XACTENGINE_E_EXPIRED HEX: 8AC70003 -CONSTANT: XACTENGINE_E_NONOTIFICATIONCALLBACK HEX: 8AC70004 -CONSTANT: XACTENGINE_E_NOTIFICATIONREGISTERED HEX: 8AC70005 -CONSTANT: XACTENGINE_E_INVALIDUSAGE HEX: 8AC70006 -CONSTANT: XACTENGINE_E_INVALIDDATA HEX: 8AC70007 -CONSTANT: XACTENGINE_E_INSTANCELIMITFAILTOPLAY HEX: 8AC70008 -CONSTANT: XACTENGINE_E_NOGLOBALSETTINGS HEX: 8AC70009 -CONSTANT: XACTENGINE_E_INVALIDVARIABLEINDEX HEX: 8AC7000a -CONSTANT: XACTENGINE_E_INVALIDCATEGORY HEX: 8AC7000b -CONSTANT: XACTENGINE_E_INVALIDCUEINDEX HEX: 8AC7000c -CONSTANT: XACTENGINE_E_INVALIDWAVEINDEX HEX: 8AC7000d -CONSTANT: XACTENGINE_E_INVALIDTRACKINDEX HEX: 8AC7000e -CONSTANT: XACTENGINE_E_INVALIDSOUNDOFFSETORINDEX HEX: 8AC7000f -CONSTANT: XACTENGINE_E_READFILE HEX: 8AC70010 -CONSTANT: XACTENGINE_E_UNKNOWNEVENT HEX: 8AC70011 -CONSTANT: XACTENGINE_E_INCALLBACK HEX: 8AC70012 -CONSTANT: XACTENGINE_E_NOWAVEBANK HEX: 8AC70013 -CONSTANT: XACTENGINE_E_SELECTVARIATION HEX: 8AC70014 -CONSTANT: XACTENGINE_E_MULTIPLEAUDITIONENGINES HEX: 8AC70015 -CONSTANT: XACTENGINE_E_WAVEBANKNOTPREPARED HEX: 8AC70016 -CONSTANT: XACTENGINE_E_NORENDERER HEX: 8AC70017 -CONSTANT: XACTENGINE_E_INVALIDENTRYCOUNT HEX: 8AC70018 -CONSTANT: XACTENGINE_E_SEEKTIMEBEYONDCUEEND HEX: 8AC70019 -CONSTANT: XACTENGINE_E_SEEKTIMEBEYONDWAVEEND HEX: 8AC7001a -CONSTANT: XACTENGINE_E_NOFRIENDLYNAMES HEX: 8AC7001b - -CONSTANT: XACTENGINE_E_AUDITION_WRITEFILE HEX: 8AC70101 -CONSTANT: XACTENGINE_E_AUDITION_NOSOUNDBANK HEX: 8AC70102 -CONSTANT: XACTENGINE_E_AUDITION_INVALIDRPCINDEX HEX: 8AC70103 -CONSTANT: XACTENGINE_E_AUDITION_MISSINGDATA HEX: 8AC70104 -CONSTANT: XACTENGINE_E_AUDITION_UNKNOWNCOMMAND HEX: 8AC70105 -CONSTANT: XACTENGINE_E_AUDITION_INVALIDDSPINDEX HEX: 8AC70106 -CONSTANT: XACTENGINE_E_AUDITION_MISSINGWAVE HEX: 8AC70107 -CONSTANT: XACTENGINE_E_AUDITION_CREATEDIRECTORYFAILED HEX: 8AC70108 -CONSTANT: XACTENGINE_E_AUDITION_INVALIDSESSION HEX: 8AC70109 +CONSTANT: XACTENGINE_E_OUTOFMEMORY 0x80070000 +CONSTANT: XACTENGINE_E_INVALIDARG 0x80070057 +CONSTANT: XACTENGINE_E_NOTIMPL 0x80004001 +CONSTANT: XACTENGINE_E_FAIL 0x80004005 + +CONSTANT: XACTENGINE_E_ALREADYINITIALIZED 0x8AC70001 +CONSTANT: XACTENGINE_E_NOTINITIALIZED 0x8AC70002 +CONSTANT: XACTENGINE_E_EXPIRED 0x8AC70003 +CONSTANT: XACTENGINE_E_NONOTIFICATIONCALLBACK 0x8AC70004 +CONSTANT: XACTENGINE_E_NOTIFICATIONREGISTERED 0x8AC70005 +CONSTANT: XACTENGINE_E_INVALIDUSAGE 0x8AC70006 +CONSTANT: XACTENGINE_E_INVALIDDATA 0x8AC70007 +CONSTANT: XACTENGINE_E_INSTANCELIMITFAILTOPLAY 0x8AC70008 +CONSTANT: XACTENGINE_E_NOGLOBALSETTINGS 0x8AC70009 +CONSTANT: XACTENGINE_E_INVALIDVARIABLEINDEX 0x8AC7000a +CONSTANT: XACTENGINE_E_INVALIDCATEGORY 0x8AC7000b +CONSTANT: XACTENGINE_E_INVALIDCUEINDEX 0x8AC7000c +CONSTANT: XACTENGINE_E_INVALIDWAVEINDEX 0x8AC7000d +CONSTANT: XACTENGINE_E_INVALIDTRACKINDEX 0x8AC7000e +CONSTANT: XACTENGINE_E_INVALIDSOUNDOFFSETORINDEX 0x8AC7000f +CONSTANT: XACTENGINE_E_READFILE 0x8AC70010 +CONSTANT: XACTENGINE_E_UNKNOWNEVENT 0x8AC70011 +CONSTANT: XACTENGINE_E_INCALLBACK 0x8AC70012 +CONSTANT: XACTENGINE_E_NOWAVEBANK 0x8AC70013 +CONSTANT: XACTENGINE_E_SELECTVARIATION 0x8AC70014 +CONSTANT: XACTENGINE_E_MULTIPLEAUDITIONENGINES 0x8AC70015 +CONSTANT: XACTENGINE_E_WAVEBANKNOTPREPARED 0x8AC70016 +CONSTANT: XACTENGINE_E_NORENDERER 0x8AC70017 +CONSTANT: XACTENGINE_E_INVALIDENTRYCOUNT 0x8AC70018 +CONSTANT: XACTENGINE_E_SEEKTIMEBEYONDCUEEND 0x8AC70019 +CONSTANT: XACTENGINE_E_SEEKTIMEBEYONDWAVEEND 0x8AC7001a +CONSTANT: XACTENGINE_E_NOFRIENDLYNAMES 0x8AC7001b + +CONSTANT: XACTENGINE_E_AUDITION_WRITEFILE 0x8AC70101 +CONSTANT: XACTENGINE_E_AUDITION_NOSOUNDBANK 0x8AC70102 +CONSTANT: XACTENGINE_E_AUDITION_INVALIDRPCINDEX 0x8AC70103 +CONSTANT: XACTENGINE_E_AUDITION_MISSINGDATA 0x8AC70104 +CONSTANT: XACTENGINE_E_AUDITION_UNKNOWNCOMMAND 0x8AC70105 +CONSTANT: XACTENGINE_E_AUDITION_INVALIDDSPINDEX 0x8AC70106 +CONSTANT: XACTENGINE_E_AUDITION_MISSINGWAVE 0x8AC70107 +CONSTANT: XACTENGINE_E_AUDITION_CREATEDIRECTORYFAILED 0x8AC70108 +CONSTANT: XACTENGINE_E_AUDITION_INVALIDSESSION 0x8AC70109 diff --git a/basis/windows/directx/xapo/xapo.factor b/basis/windows/directx/xapo/xapo.factor index 2f61ade8f5..391852ca03 100644 --- a/basis/windows/directx/xapo/xapo.factor +++ b/basis/windows/directx/xapo/xapo.factor @@ -11,17 +11,17 @@ CONSTANT: XAPO_MAX_FRAMERATE 200000 CONSTANT: XAPO_REGISTRATION_STRING_LENGTH 256 -CONSTANT: XAPO_FLAG_CHANNELS_MUST_MATCH HEX: 00000001 +CONSTANT: XAPO_FLAG_CHANNELS_MUST_MATCH 0x00000001 -CONSTANT: XAPO_FLAG_FRAMERATE_MUST_MATCH HEX: 00000002 +CONSTANT: XAPO_FLAG_FRAMERATE_MUST_MATCH 0x00000002 -CONSTANT: XAPO_FLAG_BITSPERSAMPLE_MUST_MATCH HEX: 00000004 +CONSTANT: XAPO_FLAG_BITSPERSAMPLE_MUST_MATCH 0x00000004 -CONSTANT: XAPO_FLAG_BUFFERCOUNT_MUST_MATCH HEX: 00000008 +CONSTANT: XAPO_FLAG_BUFFERCOUNT_MUST_MATCH 0x00000008 -CONSTANT: XAPO_FLAG_INPLACE_REQUIRED HEX: 00000020 +CONSTANT: XAPO_FLAG_INPLACE_REQUIRED 0x00000020 -CONSTANT: XAPO_FLAG_INPLACE_SUPPORTED HEX: 00000010 +CONSTANT: XAPO_FLAG_INPLACE_SUPPORTED 0x00000010 STRUCT: XAPO_REGISTRATION_PROPERTIES { clsid GUID } diff --git a/basis/windows/directx/xaudio2/xaudio2.factor b/basis/windows/directx/xaudio2/xaudio2.factor index e28ce3af87..74f0db8b38 100644 --- a/basis/windows/directx/xaudio2/xaudio2.factor +++ b/basis/windows/directx/xaudio2/xaudio2.factor @@ -5,7 +5,7 @@ IN: windows.directx.xaudio2 LIBRARY: xaudio2 -CONSTANT: XAUDIO2_MAX_BUFFER_BYTES HEX: 80000000 +CONSTANT: XAUDIO2_MAX_BUFFER_BYTES 0x80000000 CONSTANT: XAUDIO2_MAX_QUEUED_BUFFERS 64 CONSTANT: XAUDIO2_MAX_BUFFERS_SYSTEM 2 CONSTANT: XAUDIO2_MAX_AUDIO_CHANNELS 64 @@ -25,21 +25,21 @@ CONSTANT: XAUDIO2_MAX_RATIO_TIMES_RATE_XMA_MULTICHANNEL 300000 CONSTANT: XAUDIO2_COMMIT_NOW 0 CONSTANT: XAUDIO2_COMMIT_ALL 0 -CONSTANT: XAUDIO2_INVALID_OPSET HEX: ffffffff +CONSTANT: XAUDIO2_INVALID_OPSET 0xffffffff CONSTANT: XAUDIO2_NO_LOOP_REGION 0 CONSTANT: XAUDIO2_LOOP_INFINITE 255 CONSTANT: XAUDIO2_DEFAULT_CHANNELS 0 CONSTANT: XAUDIO2_DEFAULT_SAMPLERATE 0 -CONSTANT: XAUDIO2_DEBUG_ENGINE HEX: 0001 -CONSTANT: XAUDIO2_VOICE_NOPITCH HEX: 0002 -CONSTANT: XAUDIO2_VOICE_NOSRC HEX: 0004 -CONSTANT: XAUDIO2_VOICE_USEFILTER HEX: 0008 -CONSTANT: XAUDIO2_VOICE_MUSIC HEX: 0010 -CONSTANT: XAUDIO2_PLAY_TAILS HEX: 0020 -CONSTANT: XAUDIO2_END_OF_STREAM HEX: 0040 -CONSTANT: XAUDIO2_SEND_USEFILTER HEX: 0080 +CONSTANT: XAUDIO2_DEBUG_ENGINE 0x0001 +CONSTANT: XAUDIO2_VOICE_NOPITCH 0x0002 +CONSTANT: XAUDIO2_VOICE_NOSRC 0x0004 +CONSTANT: XAUDIO2_VOICE_USEFILTER 0x0008 +CONSTANT: XAUDIO2_VOICE_MUSIC 0x0010 +CONSTANT: XAUDIO2_PLAY_TAILS 0x0020 +CONSTANT: XAUDIO2_END_OF_STREAM 0x0040 +CONSTANT: XAUDIO2_SEND_USEFILTER 0x0080 CONSTANT: XAUDIO2_DEFAULT_FILTER_TYPE 0 @@ -52,55 +52,55 @@ CONSTANT: XAUDIO2_QUANTUM_DENOMINATOR 100 : XAUDIO2_QUANTUM_MS ( -- z ) XAUDIO2_QUANTUM_DENOMINATOR 1000.0 XAUDIO2_QUANTUM_NUMERATOR * / ; inline -CONSTANT: XAUDIO2_E_INVALID_CALL HEX: 88960001 -CONSTANT: XAUDIO2_E_XMA_DECODER_ERROR HEX: 88960002 -CONSTANT: XAUDIO2_E_XAPO_CREATION_FAILED HEX: 88960003 -CONSTANT: XAUDIO2_E_DEVICE_INVALIDATED HEX: 88960004 - -CONSTANT: Processor1 HEX: 00000001 -CONSTANT: Processor2 HEX: 00000002 -CONSTANT: Processor3 HEX: 00000004 -CONSTANT: Processor4 HEX: 00000008 -CONSTANT: Processor5 HEX: 00000010 -CONSTANT: Processor6 HEX: 00000020 -CONSTANT: Processor7 HEX: 00000040 -CONSTANT: Processor8 HEX: 00000080 -CONSTANT: Processor9 HEX: 00000100 -CONSTANT: Processor10 HEX: 00000200 -CONSTANT: Processor11 HEX: 00000400 -CONSTANT: Processor12 HEX: 00000800 -CONSTANT: Processor13 HEX: 00001000 -CONSTANT: Processor14 HEX: 00002000 -CONSTANT: Processor15 HEX: 00004000 -CONSTANT: Processor16 HEX: 00008000 -CONSTANT: Processor17 HEX: 00010000 -CONSTANT: Processor18 HEX: 00020000 -CONSTANT: Processor19 HEX: 00040000 -CONSTANT: Processor20 HEX: 00080000 -CONSTANT: Processor21 HEX: 00100000 -CONSTANT: Processor22 HEX: 00200000 -CONSTANT: Processor23 HEX: 00400000 -CONSTANT: Processor24 HEX: 00800000 -CONSTANT: Processor25 HEX: 01000000 -CONSTANT: Processor26 HEX: 02000000 -CONSTANT: Processor27 HEX: 04000000 -CONSTANT: Processor28 HEX: 08000000 -CONSTANT: Processor29 HEX: 10000000 -CONSTANT: Processor30 HEX: 20000000 -CONSTANT: Processor31 HEX: 40000000 -CONSTANT: Processor32 HEX: 80000000 -CONSTANT: XAUDIO2_ANY_PROCESSOR HEX: ffffffff -CONSTANT: XAUDIO2_DEFAULT_PROCESSOR HEX: ffffffff +CONSTANT: XAUDIO2_E_INVALID_CALL 0x88960001 +CONSTANT: XAUDIO2_E_XMA_DECODER_ERROR 0x88960002 +CONSTANT: XAUDIO2_E_XAPO_CREATION_FAILED 0x88960003 +CONSTANT: XAUDIO2_E_DEVICE_INVALIDATED 0x88960004 + +CONSTANT: Processor1 0x00000001 +CONSTANT: Processor2 0x00000002 +CONSTANT: Processor3 0x00000004 +CONSTANT: Processor4 0x00000008 +CONSTANT: Processor5 0x00000010 +CONSTANT: Processor6 0x00000020 +CONSTANT: Processor7 0x00000040 +CONSTANT: Processor8 0x00000080 +CONSTANT: Processor9 0x00000100 +CONSTANT: Processor10 0x00000200 +CONSTANT: Processor11 0x00000400 +CONSTANT: Processor12 0x00000800 +CONSTANT: Processor13 0x00001000 +CONSTANT: Processor14 0x00002000 +CONSTANT: Processor15 0x00004000 +CONSTANT: Processor16 0x00008000 +CONSTANT: Processor17 0x00010000 +CONSTANT: Processor18 0x00020000 +CONSTANT: Processor19 0x00040000 +CONSTANT: Processor20 0x00080000 +CONSTANT: Processor21 0x00100000 +CONSTANT: Processor22 0x00200000 +CONSTANT: Processor23 0x00400000 +CONSTANT: Processor24 0x00800000 +CONSTANT: Processor25 0x01000000 +CONSTANT: Processor26 0x02000000 +CONSTANT: Processor27 0x04000000 +CONSTANT: Processor28 0x08000000 +CONSTANT: Processor29 0x10000000 +CONSTANT: Processor30 0x20000000 +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 -CONSTANT: NotDefaultDevice HEX: 0 -CONSTANT: DefaultConsoleDevice HEX: 1 -CONSTANT: DefaultMultimediaDevice HEX: 2 -CONSTANT: DefaultCommunicationsDevice HEX: 4 -CONSTANT: DefaultGameDevice HEX: 8 -CONSTANT: GlobalDefaultDevice HEX: f -CONSTANT: InvalidDeviceRole HEX: 0 +CONSTANT: NotDefaultDevice 0x0 +CONSTANT: DefaultConsoleDevice 0x1 +CONSTANT: DefaultMultimediaDevice 0x2 +CONSTANT: DefaultCommunicationsDevice 0x4 +CONSTANT: DefaultGameDevice 0x8 +CONSTANT: GlobalDefaultDevice 0xf +CONSTANT: InvalidDeviceRole 0x0 TYPEDEF: int XAUDIO2_DEVICE_ROLE STRUCT: XAUDIO2_DEVICE_DETAILS @@ -189,16 +189,16 @@ STRUCT: XAUDIO2_DEBUG_CONFIGURATION { LogFunctionName BOOL } { LogTiming BOOL } ; -CONSTANT: XAUDIO2_LOG_ERRORS HEX: 0001 -CONSTANT: XAUDIO2_LOG_WARNINGS HEX: 0002 -CONSTANT: XAUDIO2_LOG_INFO HEX: 0004 -CONSTANT: XAUDIO2_LOG_DETAIL HEX: 0008 -CONSTANT: XAUDIO2_LOG_API_CALLS HEX: 0010 -CONSTANT: XAUDIO2_LOG_FUNC_CALLS HEX: 0020 -CONSTANT: XAUDIO2_LOG_TIMING HEX: 0040 -CONSTANT: XAUDIO2_LOG_LOCKS HEX: 0080 -CONSTANT: XAUDIO2_LOG_MEMORY HEX: 0100 -CONSTANT: XAUDIO2_LOG_STREAMING HEX: 1000 +CONSTANT: XAUDIO2_LOG_ERRORS 0x0001 +CONSTANT: XAUDIO2_LOG_WARNINGS 0x0002 +CONSTANT: XAUDIO2_LOG_INFO 0x0004 +CONSTANT: XAUDIO2_LOG_DETAIL 0x0008 +CONSTANT: XAUDIO2_LOG_API_CALLS 0x0010 +CONSTANT: XAUDIO2_LOG_FUNC_CALLS 0x0020 +CONSTANT: XAUDIO2_LOG_TIMING 0x0040 +CONSTANT: XAUDIO2_LOG_LOCKS 0x0080 +CONSTANT: XAUDIO2_LOG_MEMORY 0x0100 +CONSTANT: XAUDIO2_LOG_STREAMING 0x1000 C-TYPE: IXAudio2EngineCallback C-TYPE: IXAudio2VoiceCallback diff --git a/basis/windows/directx/xinput/xinput.factor b/basis/windows/directx/xinput/xinput.factor index b274374033..28525aa5b4 100755 --- a/basis/windows/directx/xinput/xinput.factor +++ b/basis/windows/directx/xinput/xinput.factor @@ -15,20 +15,20 @@ CONSTANT: XINPUT_DEVSUBTYPE_DRUM_KIT 8 CONSTANT: XINPUT_CAPS_VOICE_SUPPORTED 4 -CONSTANT: XINPUT_GAMEPAD_DPAD_UP HEX: 0001 -CONSTANT: XINPUT_GAMEPAD_DPAD_DOWN HEX: 0002 -CONSTANT: XINPUT_GAMEPAD_DPAD_LEFT HEX: 0004 -CONSTANT: XINPUT_GAMEPAD_DPAD_RIGHT HEX: 0008 -CONSTANT: XINPUT_GAMEPAD_START HEX: 0010 -CONSTANT: XINPUT_GAMEPAD_BACK HEX: 0020 -CONSTANT: XINPUT_GAMEPAD_LEFT_THUMB HEX: 0040 -CONSTANT: XINPUT_GAMEPAD_RIGHT_THUMB HEX: 0080 -CONSTANT: XINPUT_GAMEPAD_LEFT_SHOULDER HEX: 0100 -CONSTANT: XINPUT_GAMEPAD_RIGHT_SHOULDER HEX: 0200 -CONSTANT: XINPUT_GAMEPAD_A HEX: 1000 -CONSTANT: XINPUT_GAMEPAD_B HEX: 2000 -CONSTANT: XINPUT_GAMEPAD_X HEX: 4000 -CONSTANT: XINPUT_GAMEPAD_Y HEX: 8000 +CONSTANT: XINPUT_GAMEPAD_DPAD_UP 0x0001 +CONSTANT: XINPUT_GAMEPAD_DPAD_DOWN 0x0002 +CONSTANT: XINPUT_GAMEPAD_DPAD_LEFT 0x0004 +CONSTANT: XINPUT_GAMEPAD_DPAD_RIGHT 0x0008 +CONSTANT: XINPUT_GAMEPAD_START 0x0010 +CONSTANT: XINPUT_GAMEPAD_BACK 0x0020 +CONSTANT: XINPUT_GAMEPAD_LEFT_THUMB 0x0040 +CONSTANT: XINPUT_GAMEPAD_RIGHT_THUMB 0x0080 +CONSTANT: XINPUT_GAMEPAD_LEFT_SHOULDER 0x0100 +CONSTANT: XINPUT_GAMEPAD_RIGHT_SHOULDER 0x0200 +CONSTANT: XINPUT_GAMEPAD_A 0x1000 +CONSTANT: XINPUT_GAMEPAD_B 0x2000 +CONSTANT: XINPUT_GAMEPAD_X 0x4000 +CONSTANT: XINPUT_GAMEPAD_Y 0x8000 CONSTANT: XINPUT_GAMEPAD_LEFT_THUMB_DEADZONE 7849 CONSTANT: XINPUT_GAMEPAD_RIGHT_THUMB_DEADZONE 8689 @@ -38,47 +38,47 @@ CONSTANT: XINPUT_FLAG_GAMEPAD 1 CONSTANT: XUSER_MAX_COUNT 4 -CONSTANT: XUSER_INDEX_ANY HEX: 000000FF - -CONSTANT: VK_PAD_A HEX: 5800 -CONSTANT: VK_PAD_B HEX: 5801 -CONSTANT: VK_PAD_X HEX: 5802 -CONSTANT: VK_PAD_Y HEX: 5803 -CONSTANT: VK_PAD_RSHOULDER HEX: 5804 -CONSTANT: VK_PAD_LSHOULDER HEX: 5805 -CONSTANT: VK_PAD_LTRIGGER HEX: 5806 -CONSTANT: VK_PAD_RTRIGGER HEX: 5807 - -CONSTANT: VK_PAD_DPAD_UP HEX: 5810 -CONSTANT: VK_PAD_DPAD_DOWN HEX: 5811 -CONSTANT: VK_PAD_DPAD_LEFT HEX: 5812 -CONSTANT: VK_PAD_DPAD_RIGHT HEX: 5813 -CONSTANT: VK_PAD_START HEX: 5814 -CONSTANT: VK_PAD_BACK HEX: 5815 -CONSTANT: VK_PAD_LTHUMB_PRESS HEX: 5816 -CONSTANT: VK_PAD_RTHUMB_PRESS HEX: 5817 - -CONSTANT: VK_PAD_LTHUMB_UP HEX: 5820 -CONSTANT: VK_PAD_LTHUMB_DOWN HEX: 5821 -CONSTANT: VK_PAD_LTHUMB_RIGHT HEX: 5822 -CONSTANT: VK_PAD_LTHUMB_LEFT HEX: 5823 -CONSTANT: VK_PAD_LTHUMB_UPLEFT HEX: 5824 -CONSTANT: VK_PAD_LTHUMB_UPRIGHT HEX: 5825 -CONSTANT: VK_PAD_LTHUMB_DOWNRIGHT HEX: 5826 -CONSTANT: VK_PAD_LTHUMB_DOWNLEFT HEX: 5827 - -CONSTANT: VK_PAD_RTHUMB_UP HEX: 5830 -CONSTANT: VK_PAD_RTHUMB_DOWN HEX: 5831 -CONSTANT: VK_PAD_RTHUMB_RIGHT HEX: 5832 -CONSTANT: VK_PAD_RTHUMB_LEFT HEX: 5833 -CONSTANT: VK_PAD_RTHUMB_UPLEFT HEX: 5834 -CONSTANT: VK_PAD_RTHUMB_UPRIGHT HEX: 5835 -CONSTANT: VK_PAD_RTHUMB_DOWNRIGHT HEX: 5836 -CONSTANT: VK_PAD_RTHUMB_DOWNLEFT HEX: 5837 - -CONSTANT: XINPUT_KEYSTROKE_KEYDOWN HEX: 0001 -CONSTANT: XINPUT_KEYSTROKE_KEYUP HEX: 0002 -CONSTANT: XINPUT_KEYSTROKE_REPEAT HEX: 0004 +CONSTANT: XUSER_INDEX_ANY 0x000000FF + +CONSTANT: VK_PAD_A 0x5800 +CONSTANT: VK_PAD_B 0x5801 +CONSTANT: VK_PAD_X 0x5802 +CONSTANT: VK_PAD_Y 0x5803 +CONSTANT: VK_PAD_RSHOULDER 0x5804 +CONSTANT: VK_PAD_LSHOULDER 0x5805 +CONSTANT: VK_PAD_LTRIGGER 0x5806 +CONSTANT: VK_PAD_RTRIGGER 0x5807 + +CONSTANT: VK_PAD_DPAD_UP 0x5810 +CONSTANT: VK_PAD_DPAD_DOWN 0x5811 +CONSTANT: VK_PAD_DPAD_LEFT 0x5812 +CONSTANT: VK_PAD_DPAD_RIGHT 0x5813 +CONSTANT: VK_PAD_START 0x5814 +CONSTANT: VK_PAD_BACK 0x5815 +CONSTANT: VK_PAD_LTHUMB_PRESS 0x5816 +CONSTANT: VK_PAD_RTHUMB_PRESS 0x5817 + +CONSTANT: VK_PAD_LTHUMB_UP 0x5820 +CONSTANT: VK_PAD_LTHUMB_DOWN 0x5821 +CONSTANT: VK_PAD_LTHUMB_RIGHT 0x5822 +CONSTANT: VK_PAD_LTHUMB_LEFT 0x5823 +CONSTANT: VK_PAD_LTHUMB_UPLEFT 0x5824 +CONSTANT: VK_PAD_LTHUMB_UPRIGHT 0x5825 +CONSTANT: VK_PAD_LTHUMB_DOWNRIGHT 0x5826 +CONSTANT: VK_PAD_LTHUMB_DOWNLEFT 0x5827 + +CONSTANT: VK_PAD_RTHUMB_UP 0x5830 +CONSTANT: VK_PAD_RTHUMB_DOWN 0x5831 +CONSTANT: VK_PAD_RTHUMB_RIGHT 0x5832 +CONSTANT: VK_PAD_RTHUMB_LEFT 0x5833 +CONSTANT: VK_PAD_RTHUMB_UPLEFT 0x5834 +CONSTANT: VK_PAD_RTHUMB_UPRIGHT 0x5835 +CONSTANT: VK_PAD_RTHUMB_DOWNRIGHT 0x5836 +CONSTANT: VK_PAD_RTHUMB_DOWNLEFT 0x5837 + +CONSTANT: XINPUT_KEYSTROKE_KEYDOWN 0x0001 +CONSTANT: XINPUT_KEYSTROKE_KEYUP 0x0002 +CONSTANT: XINPUT_KEYSTROKE_REPEAT 0x0004 STRUCT: XINPUT_GAMEPAD { wButtons WORD } diff --git a/basis/windows/dwmapi/dwmapi.factor b/basis/windows/dwmapi/dwmapi.factor index 0da98eaf14..1a01293917 100755 --- a/basis/windows/dwmapi/dwmapi.factor +++ b/basis/windows/dwmapi/dwmapi.factor @@ -30,7 +30,7 @@ FUNCTION: HRESULT DwmExtendFrameIntoClientArea ( HWND hWnd, MARGINS* pMarInset ) FUNCTION: HRESULT DwmEnableBlurBehindWindow ( HWND hWnd, DWM_BLURBEHIND* pBlurBehind ) ; FUNCTION: HRESULT DwmIsCompositionEnabled ( BOOL* pfEnabled ) ; -CONSTANT: WM_DWMCOMPOSITIONCHANGED HEX: 31E +CONSTANT: WM_DWMCOMPOSITIONCHANGED 0x31E : composition-enabled? ( -- ? ) windows-major 6 >= diff --git a/basis/windows/errors/errors.factor b/basis/windows/errors/errors.factor index e13c245f1e..6d8f0e2907 100755 --- a/basis/windows/errors/errors.factor +++ b/basis/windows/errors/errors.factor @@ -6,11 +6,11 @@ math.parser ; SPECIALIZED-ARRAY: TCHAR IN: windows.errors -CONSTANT: APPLICATION_ERROR_MASK HEX: 20000000 -CONSTANT: ERROR_SEVERITY_SUCCESS HEX: 00000000 -CONSTANT: ERROR_SEVERITY_INFORMATIONAL HEX: 40000000 -CONSTANT: ERROR_SEVERITY_WARNING HEX: 80000000 -CONSTANT: ERROR_SEVERITY_ERROR HEX: C0000000 +CONSTANT: APPLICATION_ERROR_MASK 0x20000000 +CONSTANT: ERROR_SEVERITY_SUCCESS 0x00000000 +CONSTANT: ERROR_SEVERITY_INFORMATIONAL 0x40000000 +CONSTANT: ERROR_SEVERITY_WARNING 0x80000000 +CONSTANT: ERROR_SEVERITY_ERROR 0xC0000000 CONSTANT: ERROR_SUCCESS 0 CONSTANT: ERROR_INVALID_FUNCTION 1 @@ -693,13 +693,13 @@ CONSTANT: SUBLANG_NEUTRAL 0 CONSTANT: LANG_NEUTRAL 0 CONSTANT: SUBLANG_DEFAULT 1 -CONSTANT: FORMAT_MESSAGE_ALLOCATE_BUFFER HEX: 00000100 -CONSTANT: FORMAT_MESSAGE_IGNORE_INSERTS HEX: 00000200 -CONSTANT: FORMAT_MESSAGE_FROM_STRING HEX: 00000400 -CONSTANT: FORMAT_MESSAGE_FROM_HMODULE HEX: 00000800 -CONSTANT: FORMAT_MESSAGE_FROM_SYSTEM HEX: 00001000 -CONSTANT: FORMAT_MESSAGE_ARGUMENT_ARRAY HEX: 00002000 -CONSTANT: FORMAT_MESSAGE_MAX_WIDTH_MASK HEX: 000000FF +CONSTANT: FORMAT_MESSAGE_ALLOCATE_BUFFER 0x00000100 +CONSTANT: FORMAT_MESSAGE_IGNORE_INSERTS 0x00000200 +CONSTANT: FORMAT_MESSAGE_FROM_STRING 0x00000400 +CONSTANT: FORMAT_MESSAGE_FROM_HMODULE 0x00000800 +CONSTANT: FORMAT_MESSAGE_FROM_SYSTEM 0x00001000 +CONSTANT: FORMAT_MESSAGE_ARGUMENT_ARRAY 0x00002000 +CONSTANT: FORMAT_MESSAGE_MAX_WIDTH_MASK 0x000000FF : make-lang-id ( lang1 lang2 -- n ) 10 shift bitor ; inline @@ -715,7 +715,7 @@ CONSTANT: FORMAT_MESSAGE_MAX_WIDTH_MASK HEX: 000000FF 32768 [ TCHAR ] [ ] bi f pick [ FormatMessage ] dip swap zero? - [ drop "Unknown error 0x" id HEX: ffff,ffff bitand >hex append ] + [ drop "Unknown error 0x" id 0xffff,ffff bitand >hex append ] [ utf16n alien>string [ blank? ] trim ] if ; : win32-error-string ( -- str ) diff --git a/basis/windows/gdi32/gdi32.factor b/basis/windows/gdi32/gdi32.factor index 93784ea370..5711ffbee2 100644 --- a/basis/windows/gdi32/gdi32.factor +++ b/basis/windows/gdi32/gdi32.factor @@ -148,77 +148,77 @@ CONSTANT: EMR_GLSRECORD 102 CONSTANT: EMR_GLSBOUNDEDRECORD 103 CONSTANT: EMR_PIXELFORMAT 104 CONSTANT: ENHMETA_SIGNATURE 1179469088 -CONSTANT: EPS_SIGNATURE HEX: 46535045 -CONSTANT: FR_PRIVATE HEX: 10 -CONSTANT: FR_NOT_ENUM HEX: 20 -CONSTANT: META_SETBKCOLOR HEX: 201 -CONSTANT: META_SETBKMODE HEX: 102 -CONSTANT: META_SETMAPMODE HEX: 103 -CONSTANT: META_SETROP2 HEX: 104 -CONSTANT: META_SETRELABS HEX: 105 -CONSTANT: META_SETPOLYFILLMODE HEX: 106 -CONSTANT: META_SETSTRETCHBLTMODE HEX: 107 -CONSTANT: META_SETTEXTCHAREXTRA HEX: 108 -CONSTANT: META_SETTEXTCOLOR HEX: 209 -CONSTANT: META_SETTEXTJUSTIFICATION HEX: 20A -CONSTANT: META_SETWINDOWORG HEX: 20B -CONSTANT: META_SETWINDOWEXT HEX: 20C -CONSTANT: META_SETVIEWPORTORG HEX: 20D -CONSTANT: META_SETVIEWPORTEXT HEX: 20E -CONSTANT: META_OFFSETWINDOWORG HEX: 20F -CONSTANT: META_SCALEWINDOWEXT HEX: 410 -CONSTANT: META_OFFSETVIEWPORTORG HEX: 211 -CONSTANT: META_SCALEVIEWPORTEXT HEX: 412 -CONSTANT: META_LINETO HEX: 213 -CONSTANT: META_MOVETO HEX: 214 -CONSTANT: META_EXCLUDECLIPRECT HEX: 415 -CONSTANT: META_INTERSECTCLIPRECT HEX: 416 -CONSTANT: META_ARC HEX: 817 -CONSTANT: META_ELLIPSE HEX: 418 -CONSTANT: META_FLOODFILL HEX: 419 -CONSTANT: META_PIE HEX: 81A -CONSTANT: META_RECTANGLE HEX: 41B -CONSTANT: META_ROUNDRECT HEX: 61C -CONSTANT: META_PATBLT HEX: 61D -CONSTANT: META_SAVEDC HEX: 1E -CONSTANT: META_SETPIXEL HEX: 41F -CONSTANT: META_OFFSETCLIPRGN HEX: 220 -CONSTANT: META_TEXTOUT HEX: 521 -CONSTANT: META_BITBLT HEX: 922 -CONSTANT: META_STRETCHBLT HEX: b23 -CONSTANT: META_POLYGON HEX: 324 -CONSTANT: META_POLYLINE HEX: 325 -CONSTANT: META_ESCAPE HEX: 626 -CONSTANT: META_RESTOREDC HEX: 127 -CONSTANT: META_FILLREGION HEX: 228 -CONSTANT: META_FRAMEREGION HEX: 429 -CONSTANT: META_INVERTREGION HEX: 12A -CONSTANT: META_PAINTREGION HEX: 12B -CONSTANT: META_SELECTCLIPREGION HEX: 12C -CONSTANT: META_SELECTOBJECT HEX: 12D -CONSTANT: META_SETTEXTALIGN HEX: 12E -CONSTANT: META_CHORD HEX: 830 -CONSTANT: META_SETMAPPERFLAGS HEX: 231 -CONSTANT: META_EXTTEXTOUT HEX: a32 -CONSTANT: META_SETDIBTODEV HEX: d33 -CONSTANT: META_SELECTPALETTE HEX: 234 -CONSTANT: META_REALIZEPALETTE HEX: 35 -CONSTANT: META_ANIMATEPALETTE HEX: 436 -CONSTANT: META_SETPALENTRIES HEX: 37 -CONSTANT: META_POLYPOLYGON HEX: 538 -CONSTANT: META_RESIZEPALETTE HEX: 139 -CONSTANT: META_DIBBITBLT HEX: 940 -CONSTANT: META_DIBSTRETCHBLT HEX: b41 -CONSTANT: META_DIBCREATEPATTERNBRUSH HEX: 142 -CONSTANT: META_STRETCHDIB HEX: f43 -CONSTANT: META_EXTFLOODFILL HEX: 548 -CONSTANT: META_DELETEOBJECT HEX: 1f0 -CONSTANT: META_CREATEPALETTE HEX: f7 -CONSTANT: META_CREATEPATTERNBRUSH HEX: 1F9 -CONSTANT: META_CREATEPENINDIRECT HEX: 2FA -CONSTANT: META_CREATEFONTINDIRECT HEX: 2FB -CONSTANT: META_CREATEBRUSHINDIRECT HEX: 2FC -CONSTANT: META_CREATEREGION HEX: 6FF +CONSTANT: EPS_SIGNATURE 0x46535045 +CONSTANT: FR_PRIVATE 0x10 +CONSTANT: FR_NOT_ENUM 0x20 +CONSTANT: META_SETBKCOLOR 0x201 +CONSTANT: META_SETBKMODE 0x102 +CONSTANT: META_SETMAPMODE 0x103 +CONSTANT: META_SETROP2 0x104 +CONSTANT: META_SETRELABS 0x105 +CONSTANT: META_SETPOLYFILLMODE 0x106 +CONSTANT: META_SETSTRETCHBLTMODE 0x107 +CONSTANT: META_SETTEXTCHAREXTRA 0x108 +CONSTANT: META_SETTEXTCOLOR 0x209 +CONSTANT: META_SETTEXTJUSTIFICATION 0x20A +CONSTANT: META_SETWINDOWORG 0x20B +CONSTANT: META_SETWINDOWEXT 0x20C +CONSTANT: META_SETVIEWPORTORG 0x20D +CONSTANT: META_SETVIEWPORTEXT 0x20E +CONSTANT: META_OFFSETWINDOWORG 0x20F +CONSTANT: META_SCALEWINDOWEXT 0x410 +CONSTANT: META_OFFSETVIEWPORTORG 0x211 +CONSTANT: META_SCALEVIEWPORTEXT 0x412 +CONSTANT: META_LINETO 0x213 +CONSTANT: META_MOVETO 0x214 +CONSTANT: META_EXCLUDECLIPRECT 0x415 +CONSTANT: META_INTERSECTCLIPRECT 0x416 +CONSTANT: META_ARC 0x817 +CONSTANT: META_ELLIPSE 0x418 +CONSTANT: META_FLOODFILL 0x419 +CONSTANT: META_PIE 0x81A +CONSTANT: META_RECTANGLE 0x41B +CONSTANT: META_ROUNDRECT 0x61C +CONSTANT: META_PATBLT 0x61D +CONSTANT: META_SAVEDC 0x1E +CONSTANT: META_SETPIXEL 0x41F +CONSTANT: META_OFFSETCLIPRGN 0x220 +CONSTANT: META_TEXTOUT 0x521 +CONSTANT: META_BITBLT 0x922 +CONSTANT: META_STRETCHBLT 0xb23 +CONSTANT: META_POLYGON 0x324 +CONSTANT: META_POLYLINE 0x325 +CONSTANT: META_ESCAPE 0x626 +CONSTANT: META_RESTOREDC 0x127 +CONSTANT: META_FILLREGION 0x228 +CONSTANT: META_FRAMEREGION 0x429 +CONSTANT: META_INVERTREGION 0x12A +CONSTANT: META_PAINTREGION 0x12B +CONSTANT: META_SELECTCLIPREGION 0x12C +CONSTANT: META_SELECTOBJECT 0x12D +CONSTANT: META_SETTEXTALIGN 0x12E +CONSTANT: META_CHORD 0x830 +CONSTANT: META_SETMAPPERFLAGS 0x231 +CONSTANT: META_EXTTEXTOUT 0xa32 +CONSTANT: META_SETDIBTODEV 0xd33 +CONSTANT: META_SELECTPALETTE 0x234 +CONSTANT: META_REALIZEPALETTE 0x35 +CONSTANT: META_ANIMATEPALETTE 0x436 +CONSTANT: META_SETPALENTRIES 0x37 +CONSTANT: META_POLYPOLYGON 0x538 +CONSTANT: META_RESIZEPALETTE 0x139 +CONSTANT: META_DIBBITBLT 0x940 +CONSTANT: META_DIBSTRETCHBLT 0xb41 +CONSTANT: META_DIBCREATEPATTERNBRUSH 0x142 +CONSTANT: META_STRETCHDIB 0xf43 +CONSTANT: META_EXTFLOODFILL 0x548 +CONSTANT: META_DELETEOBJECT 0x1f0 +CONSTANT: META_CREATEPALETTE 0xf7 +CONSTANT: META_CREATEPATTERNBRUSH 0x1F9 +CONSTANT: META_CREATEPENINDIRECT 0x2FA +CONSTANT: META_CREATEFONTINDIRECT 0x2FB +CONSTANT: META_CREATEBRUSHINDIRECT 0x2FC +CONSTANT: META_CREATEREGION 0x6FF CONSTANT: ELF_VENDOR_SIZE 4 CONSTANT: ELF_VERSION 0 CONSTANT: ELF_CULTURE_LATIN 0 @@ -236,36 +236,36 @@ CONSTANT: PFD_SUPPORT_OPENGL 32 CONSTANT: PFD_SUPPORT_DIRECTDRAW 8192 CONSTANT: PFD_GENERIC_FORMAT 64 CONSTANT: PFD_NEED_PALETTE 128 -CONSTANT: PFD_NEED_SYSTEM_PALETTE HEX: 00000100 -CONSTANT: PFD_SWAP_EXCHANGE HEX: 00000200 -CONSTANT: PFD_SWAP_COPY HEX: 00000400 -CONSTANT: PFD_SWAP_LAYER_BUFFERS HEX: 00000800 -CONSTANT: PFD_GENERIC_ACCELERATED HEX: 00001000 -CONSTANT: PFD_DEPTH_DONTCARE HEX: 20000000 -CONSTANT: PFD_DOUBLEBUFFER_DONTCARE HEX: 40000000 -CONSTANT: PFD_STEREO_DONTCARE HEX: 80000000 +CONSTANT: PFD_NEED_SYSTEM_PALETTE 0x00000100 +CONSTANT: PFD_SWAP_EXCHANGE 0x00000200 +CONSTANT: PFD_SWAP_COPY 0x00000400 +CONSTANT: PFD_SWAP_LAYER_BUFFERS 0x00000800 +CONSTANT: PFD_GENERIC_ACCELERATED 0x00001000 +CONSTANT: PFD_DEPTH_DONTCARE 0x20000000 +CONSTANT: PFD_DOUBLEBUFFER_DONTCARE 0x40000000 +CONSTANT: PFD_STEREO_DONTCARE 0x80000000 CONSTANT: SP_ERROR -1 CONSTANT: SP_OUTOFDISK -4 CONSTANT: SP_OUTOFMEMORY -5 CONSTANT: SP_USERABORT -3 CONSTANT: SP_APPABORT -2 -CONSTANT: BLACKNESS HEX: 00000042 -CONSTANT: NOTSRCERASE HEX: 001100A6 -CONSTANT: NOTSRCCOPY HEX: 00330008 -CONSTANT: SRCERASE HEX: 00440328 -CONSTANT: DSTINVERT HEX: 00550009 -CONSTANT: PATINVERT HEX: 005A0049 -CONSTANT: SRCINVERT HEX: 00660046 -CONSTANT: SRCAND HEX: 008800C6 -CONSTANT: MERGEPAINT HEX: 00BB0226 -CONSTANT: MERGECOPY HEX: 00C000CA -CONSTANT: SRCCOPY HEX: 00CC0020 -CONSTANT: SRCPAINT HEX: 00EE0086 -CONSTANT: PATCOPY HEX: 00F00021 -CONSTANT: PATPAINT HEX: 00FB0A09 -CONSTANT: WHITENESS HEX: 00FF0062 -CONSTANT: CAPTUREBLT HEX: 40000000 -CONSTANT: NOMIRRORBITMAP HEX: 80000000 +CONSTANT: BLACKNESS 0x00000042 +CONSTANT: NOTSRCERASE 0x001100A6 +CONSTANT: NOTSRCCOPY 0x00330008 +CONSTANT: SRCERASE 0x00440328 +CONSTANT: DSTINVERT 0x00550009 +CONSTANT: PATINVERT 0x005A0049 +CONSTANT: SRCINVERT 0x00660046 +CONSTANT: SRCAND 0x008800C6 +CONSTANT: MERGEPAINT 0x00BB0226 +CONSTANT: MERGECOPY 0x00C000CA +CONSTANT: SRCCOPY 0x00CC0020 +CONSTANT: SRCPAINT 0x00EE0086 +CONSTANT: PATCOPY 0x00F00021 +CONSTANT: PATPAINT 0x00FB0A09 +CONSTANT: WHITENESS 0x00FF0062 +CONSTANT: CAPTUREBLT 0x40000000 +CONSTANT: NOMIRRORBITMAP 0x80000000 CONSTANT: R2_BLACK 1 CONSTANT: R2_COPYPEN 13 CONSTANT: R2_MASKNOTPEN 3 @@ -477,13 +477,13 @@ CONSTANT: FS_TURKISH 16 CONSTANT: FS_HEBREW 32 CONSTANT: FS_ARABIC 64 CONSTANT: FS_BALTIC 128 -CONSTANT: FS_THAI HEX: 10000 -CONSTANT: FS_JISJAPAN HEX: 20000 -CONSTANT: FS_CHINESESIMP HEX: 40000 -CONSTANT: FS_WANSUNG HEX: 80000 -CONSTANT: FS_CHINESETRAD HEX: 100000 -CONSTANT: FS_JOHAB HEX: 200000 -CONSTANT: FS_SYMBOL HEX: 80000000 +CONSTANT: FS_THAI 0x10000 +CONSTANT: FS_JISJAPAN 0x20000 +CONSTANT: FS_CHINESESIMP 0x40000 +CONSTANT: FS_WANSUNG 0x80000 +CONSTANT: FS_CHINESETRAD 0x100000 +CONSTANT: FS_JOHAB 0x200000 +CONSTANT: FS_SYMBOL 0x80000000 CONSTANT: HS_BDIAGONAL 3 CONSTANT: HS_CROSS 4 CONSTANT: HS_DIAGCROSS 5 @@ -560,14 +560,14 @@ CONSTANT: DCBA_FACEDOWNLEFT 258 CONSTANT: DCBA_FACEDOWNRIGHT 259 CONSTANT: FLOODFILLBORDER 0 CONSTANT: FLOODFILLSURFACE 1 -CONSTANT: ETO_CLIPPED HEX: 0004 -CONSTANT: ETO_GLYPH_INDEX HEX: 0010 -CONSTANT: ETO_OPAQUE HEX: 0002 -CONSTANT: ETO_NUMERICSLATIN HEX: 0800 -CONSTANT: ETO_NUMERICSLOCAL HEX: 0400 -CONSTANT: ETO_RTLREADING HEX: 0080 -CONSTANT: ETO_IGNORELANGUAGE HEX: 1000 -CONSTANT: ETO_PDY HEX: 2000 +CONSTANT: ETO_CLIPPED 0x0004 +CONSTANT: ETO_GLYPH_INDEX 0x0010 +CONSTANT: ETO_OPAQUE 0x0002 +CONSTANT: ETO_NUMERICSLATIN 0x0800 +CONSTANT: ETO_NUMERICSLOCAL 0x0400 +CONSTANT: ETO_RTLREADING 0x0080 +CONSTANT: ETO_IGNORELANGUAGE 0x1000 +CONSTANT: ETO_PDY 0x2000 CONSTANT: GDICOMMENT_WINDOWS_METAFILE -2147483647 CONSTANT: GDICOMMENT_BEGINGROUP 2 CONSTANT: GDICOMMENT_ENDGROUP 3 @@ -589,8 +589,8 @@ CONSTANT: GCPCLASS_PREBOUNDLTR 128 CONSTANT: GCPCLASS_PREBOUNDRTL 64 CONSTANT: GCPCLASS_POSTBOUNDLTR 32 CONSTANT: GCPCLASS_POSTBOUNDRTL 16 -CONSTANT: GCPGLYPH_LINKBEFORE HEX: 8000 -CONSTANT: GCPGLYPH_LINKAFTER HEX: 4000 +CONSTANT: GCPGLYPH_LINKBEFORE 0x8000 +CONSTANT: GCPGLYPH_LINKAFTER 0x4000 CONSTANT: DCB_DISABLE 8 CONSTANT: DCB_ENABLE 4 CONSTANT: DCB_RESET 1 @@ -651,17 +651,17 @@ CONSTANT: DESKTOPHORZRES 118 CONSTANT: DESKTOPVERTRES 117 CONSTANT: BLTALIGNMENT 119 CONSTANT: SHADEBLENDCAPS 120 -CONSTANT: SB_NONE HEX: 00 -CONSTANT: SB_CONST_ALPHA HEX: 01 -CONSTANT: SB_PIXEL_ALPHA HEX: 02 -CONSTANT: SB_PREMULT_ALPHA HEX: 04 -CONSTANT: SB_GRAD_RECT HEX: 10 -CONSTANT: SB_GRAD_TRI HEX: 20 +CONSTANT: SB_NONE 0x00 +CONSTANT: SB_CONST_ALPHA 0x01 +CONSTANT: SB_PIXEL_ALPHA 0x02 +CONSTANT: SB_PREMULT_ALPHA 0x04 +CONSTANT: SB_GRAD_RECT 0x10 +CONSTANT: SB_GRAD_TRI 0x20 CONSTANT: COLORMGMTCAPS 121 -CONSTANT: CM_NONE HEX: 00 -CONSTANT: CM_DEVICE_ICM HEX: 01 -CONSTANT: CM_GAMMA_RAMP HEX: 02 -CONSTANT: CM_CMYK_COLOR HEX: 04 +CONSTANT: CM_NONE 0x00 +CONSTANT: CM_DEVICE_ICM 0x01 +CONSTANT: CM_GAMMA_RAMP 0x02 +CONSTANT: CM_CMYK_COLOR 0x04 CONSTANT: RASTERCAPS 38 CONSTANT: RC_BITBLT 1 CONSTANT: RC_BITMAP64 8 @@ -693,11 +693,11 @@ CONSTANT: LC_INTERIORS 128 CONSTANT: POLYGONALCAPS 32 CONSTANT: RC_BANDING 2 CONSTANT: RC_BIGFONT 1024 -CONSTANT: RC_DEVBITS HEX: 8000 +CONSTANT: RC_DEVBITS 0x8000 CONSTANT: RC_GDI20_OUTPUT 16 CONSTANT: RC_GDI20_STATE 32 CONSTANT: RC_NONE 0 -CONSTANT: RC_OP_DX_OUTPUT HEX: 4000 +CONSTANT: RC_OP_DX_OUTPUT 0x4000 CONSTANT: RC_PALETTE 256 CONSTANT: RC_SAVEBITMAP 64 CONSTANT: RC_SCALING 4 @@ -732,25 +732,25 @@ CONSTANT: TC_VA_ABLE 16384 CONSTANT: TC_RESERVED 32768 CONSTANT: TC_SCROLLBLT 65536 CONSTANT: GCP_DBCS 1 -CONSTANT: GCP_ERROR HEX: 8000 -CONSTANT: GCP_CLASSIN HEX: 80000 +CONSTANT: GCP_ERROR 0x8000 +CONSTANT: GCP_CLASSIN 0x80000 CONSTANT: GCP_DIACRITIC 256 -CONSTANT: GCP_DISPLAYZWG HEX: 400000 +CONSTANT: GCP_DISPLAYZWG 0x400000 CONSTANT: GCP_GLYPHSHAPE 16 -CONSTANT: GCP_JUSTIFY HEX: 10000 -CONSTANT: GCP_JUSTIFYIN HEX: 200000 +CONSTANT: GCP_JUSTIFY 0x10000 +CONSTANT: GCP_JUSTIFYIN 0x200000 CONSTANT: GCP_KASHIDA 1024 CONSTANT: GCP_LIGATE 32 -CONSTANT: GCP_MAXEXTENT HEX: 100000 -CONSTANT: GCP_NEUTRALOVERRIDE HEX: 2000000 -CONSTANT: GCP_NUMERICOVERRIDE HEX: 1000000 -CONSTANT: GCP_NUMERICSLATIN HEX: 4000000 -CONSTANT: GCP_NUMERICSLOCAL HEX: 8000000 +CONSTANT: GCP_MAXEXTENT 0x100000 +CONSTANT: GCP_NEUTRALOVERRIDE 0x2000000 +CONSTANT: GCP_NUMERICOVERRIDE 0x1000000 +CONSTANT: GCP_NUMERICSLATIN 0x4000000 +CONSTANT: GCP_NUMERICSLOCAL 0x8000000 CONSTANT: GCP_REORDER 2 -CONSTANT: GCP_SYMSWAPOFF HEX: 800000 +CONSTANT: GCP_SYMSWAPOFF 0x800000 CONSTANT: GCP_USEKERNING 8 -CONSTANT: FLI_GLYPHS HEX: 40000 -CONSTANT: FLI_MASK HEX: 103b +CONSTANT: FLI_GLYPHS 0x40000 +CONSTANT: FLI_MASK 0x103b CONSTANT: GGO_METRICS 0 CONSTANT: GGO_BITMAP 1 CONSTANT: GGO_NATIVE 2 @@ -776,9 +776,9 @@ CONSTANT: RELATIVE 2 CONSTANT: PC_EXPLICIT 2 CONSTANT: PC_NOCOLLAPSE 4 CONSTANT: PC_RESERVED 1 -CONSTANT: CLR_NONE HEX: ffffffff +CONSTANT: CLR_NONE 0xffffffff ALIAS: CLR_INVALID CLR_NONE -CONSTANT: CLR_DEFAULT HEX: ff000000 +CONSTANT: CLR_DEFAULT 0xff000000 CONSTANT: PT_MOVETO 6 CONSTANT: PT_LINETO 2 CONSTANT: PT_BEZIERTO 4 @@ -925,7 +925,7 @@ CONSTANT: QDI_SETDIBITS 1 CONSTANT: QDI_GETDIBITS 2 CONSTANT: QDI_DIBTOSCREEN 4 CONSTANT: QDI_STRETCHDIB 8 -CONSTANT: SP_NOTREPORTED HEX: 4000 +CONSTANT: SP_NOTREPORTED 0x4000 CONSTANT: PR_JOBSTATUS 0 CONSTANT: ASPECT_FILTERING 1 CONSTANT: BS_SOLID 0 @@ -1113,42 +1113,42 @@ ALIAS: DM_IN_BUFFER DM_MODIFY ALIAS: DM_IN_PROMPT DM_PROMPT ALIAS: DM_OUT_BUFFER DM_COPY ALIAS: DM_OUT_DEFAULT DM_UPDATE -CONSTANT: DM_ORIENTATION HEX: 00000001 -CONSTANT: DM_PAPERSIZE HEX: 00000002 -CONSTANT: DM_PAPERLENGTH HEX: 00000004 -CONSTANT: DM_PAPERWIDTH HEX: 00000008 -CONSTANT: DM_SCALE HEX: 00000010 -CONSTANT: DM_POSITION HEX: 00000020 -CONSTANT: DM_COPIES HEX: 00000100 -CONSTANT: DM_DEFAULTSOURCE HEX: 00000200 -CONSTANT: DM_PRINTQUALITY HEX: 00000400 -CONSTANT: DM_COLOR HEX: 00000800 -CONSTANT: DM_DUPLEX HEX: 00001000 -CONSTANT: DM_YRESOLUTION HEX: 00002000 -CONSTANT: DM_TTOPTION HEX: 00004000 -CONSTANT: DM_COLLATE HEX: 00008000 -CONSTANT: DM_FORMNAME HEX: 00010000 -CONSTANT: DM_LOGPIXELS HEX: 00020000 -CONSTANT: DM_BITSPERPEL HEX: 00040000 -CONSTANT: DM_PELSWIDTH HEX: 00080000 -CONSTANT: DM_PELSHEIGHT HEX: 00100000 -CONSTANT: DM_DISPLAYFLAGS HEX: 00200000 -CONSTANT: DM_DISPLAYFREQUENCY HEX: 00400000 -CONSTANT: DM_ICMMETHOD HEX: 00800000 -CONSTANT: DM_ICMINTENT HEX: 01000000 -CONSTANT: DM_MEDIATYPE HEX: 02000000 -CONSTANT: DM_DITHERTYPE HEX: 04000000 -CONSTANT: DM_PANNINGWIDTH HEX: 08000000 -CONSTANT: DM_PANNINGHEIGHT HEX: 10000000 -CONSTANT: DM_DISPLAYFIXEDOUTPUT HEX: 20000000 -CONSTANT: DM_DISPLAYORIENTATION HEX: 00000080 -CONSTANT: DMDO_DEFAULT HEX: 00000000 -CONSTANT: DMDO_90 HEX: 00000001 -CONSTANT: DMDO_180 HEX: 00000002 -CONSTANT: DMDO_270 HEX: 00000003 -CONSTANT: DMDFO_DEFAULT HEX: 00000000 -CONSTANT: DMDFO_STRETCH HEX: 00000001 -CONSTANT: DMDFO_CENTER HEX: 00000002 +CONSTANT: DM_ORIENTATION 0x00000001 +CONSTANT: DM_PAPERSIZE 0x00000002 +CONSTANT: DM_PAPERLENGTH 0x00000004 +CONSTANT: DM_PAPERWIDTH 0x00000008 +CONSTANT: DM_SCALE 0x00000010 +CONSTANT: DM_POSITION 0x00000020 +CONSTANT: DM_COPIES 0x00000100 +CONSTANT: DM_DEFAULTSOURCE 0x00000200 +CONSTANT: DM_PRINTQUALITY 0x00000400 +CONSTANT: DM_COLOR 0x00000800 +CONSTANT: DM_DUPLEX 0x00001000 +CONSTANT: DM_YRESOLUTION 0x00002000 +CONSTANT: DM_TTOPTION 0x00004000 +CONSTANT: DM_COLLATE 0x00008000 +CONSTANT: DM_FORMNAME 0x00010000 +CONSTANT: DM_LOGPIXELS 0x00020000 +CONSTANT: DM_BITSPERPEL 0x00040000 +CONSTANT: DM_PELSWIDTH 0x00080000 +CONSTANT: DM_PELSHEIGHT 0x00100000 +CONSTANT: DM_DISPLAYFLAGS 0x00200000 +CONSTANT: DM_DISPLAYFREQUENCY 0x00400000 +CONSTANT: DM_ICMMETHOD 0x00800000 +CONSTANT: DM_ICMINTENT 0x01000000 +CONSTANT: DM_MEDIATYPE 0x02000000 +CONSTANT: DM_DITHERTYPE 0x04000000 +CONSTANT: DM_PANNINGWIDTH 0x08000000 +CONSTANT: DM_PANNINGHEIGHT 0x10000000 +CONSTANT: DM_DISPLAYFIXEDOUTPUT 0x20000000 +CONSTANT: DM_DISPLAYORIENTATION 0x00000080 +CONSTANT: DMDO_DEFAULT 0x00000000 +CONSTANT: DMDO_90 0x00000001 +CONSTANT: DMDO_180 0x00000002 +CONSTANT: DMDO_270 0x00000003 +CONSTANT: DMDFO_DEFAULT 0x00000000 +CONSTANT: DMDFO_STRETCH 0x00000001 +CONSTANT: DMDFO_CENTER 0x00000002 CONSTANT: DMICMMETHOD_NONE 1 CONSTANT: DMICMMETHOD_SYSTEM 2 CONSTANT: DMICMMETHOD_DRIVER 3 @@ -1173,7 +1173,7 @@ CONSTANT: DMDITHER_RESERVED8 8 CONSTANT: DMDITHER_RESERVED9 9 CONSTANT: DMDITHER_GRAYSCALE 10 CONSTANT: DMDITHER_USER 256 -CONSTANT: GDI_ERROR HEX: FFFFFFFF +CONSTANT: GDI_ERROR 0xFFFFFFFF : HGDI_ERROR ( -- alien ) GDI_ERROR ; inline CONSTANT: TMPF_FIXED_PITCH 1 CONSTANT: TMPF_VECTOR 2 @@ -1187,7 +1187,7 @@ CONSTANT: TT_PRIM_LINE 1 CONSTANT: TT_PRIM_QSPLINE 2 CONSTANT: TT_PRIM_CSPLINE 3 CONSTANT: FONTMAPPER_MAX 10 -CONSTANT: ENHMETA_STOCK_OBJECT HEX: 80000000 +CONSTANT: ENHMETA_STOCK_OBJECT 0x80000000 CONSTANT: WGL_FONT_LINES 0 CONSTANT: WGL_FONT_POLYGONS 1 CONSTANT: LPD_DOUBLEBUFFER 1 @@ -1219,53 +1219,53 @@ CONSTANT: WGL_SWAP_OVERLAY13 8192 CONSTANT: WGL_SWAP_OVERLAY14 16384 CONSTANT: WGL_SWAP_OVERLAY15 32768 CONSTANT: WGL_SWAP_UNDERLAY1 65536 -CONSTANT: WGL_SWAP_UNDERLAY2 HEX: 20000 -CONSTANT: WGL_SWAP_UNDERLAY3 HEX: 40000 -CONSTANT: WGL_SWAP_UNDERLAY4 HEX: 80000 -CONSTANT: WGL_SWAP_UNDERLAY5 HEX: 100000 -CONSTANT: WGL_SWAP_UNDERLAY6 HEX: 200000 -CONSTANT: WGL_SWAP_UNDERLAY7 HEX: 400000 -CONSTANT: WGL_SWAP_UNDERLAY8 HEX: 800000 -CONSTANT: WGL_SWAP_UNDERLAY9 HEX: 1000000 -CONSTANT: WGL_SWAP_UNDERLAY10 HEX: 2000000 -CONSTANT: WGL_SWAP_UNDERLAY11 HEX: 4000000 -CONSTANT: WGL_SWAP_UNDERLAY12 HEX: 8000000 -CONSTANT: WGL_SWAP_UNDERLAY13 HEX: 10000000 -CONSTANT: WGL_SWAP_UNDERLAY14 HEX: 20000000 -CONSTANT: WGL_SWAP_UNDERLAY15 HEX: 40000000 -CONSTANT: AC_SRC_OVER HEX: 00 -CONSTANT: AC_SRC_ALPHA HEX: 01 -CONSTANT: AC_SRC_NO_PREMULT_ALPHA HEX: 01 -CONSTANT: AC_SRC_NO_ALPHA HEX: 02 -CONSTANT: AC_DST_NO_PREMULT_ALPHA HEX: 10 -CONSTANT: AC_DST_NO_ALPHA HEX: 20 +CONSTANT: WGL_SWAP_UNDERLAY2 0x20000 +CONSTANT: WGL_SWAP_UNDERLAY3 0x40000 +CONSTANT: WGL_SWAP_UNDERLAY4 0x80000 +CONSTANT: WGL_SWAP_UNDERLAY5 0x100000 +CONSTANT: WGL_SWAP_UNDERLAY6 0x200000 +CONSTANT: WGL_SWAP_UNDERLAY7 0x400000 +CONSTANT: WGL_SWAP_UNDERLAY8 0x800000 +CONSTANT: WGL_SWAP_UNDERLAY9 0x1000000 +CONSTANT: WGL_SWAP_UNDERLAY10 0x2000000 +CONSTANT: WGL_SWAP_UNDERLAY11 0x4000000 +CONSTANT: WGL_SWAP_UNDERLAY12 0x8000000 +CONSTANT: WGL_SWAP_UNDERLAY13 0x10000000 +CONSTANT: WGL_SWAP_UNDERLAY14 0x20000000 +CONSTANT: WGL_SWAP_UNDERLAY15 0x40000000 +CONSTANT: AC_SRC_OVER 0x00 +CONSTANT: AC_SRC_ALPHA 0x01 +CONSTANT: AC_SRC_NO_PREMULT_ALPHA 0x01 +CONSTANT: AC_SRC_NO_ALPHA 0x02 +CONSTANT: AC_DST_NO_PREMULT_ALPHA 0x10 +CONSTANT: AC_DST_NO_ALPHA 0x20 CONSTANT: LAYOUT_RTL 1 CONSTANT: LAYOUT_BITMAPORIENTATIONPRESERVED 8 -CONSTANT: CS_ENABLE HEX: 00000001 -CONSTANT: CS_DISABLE HEX: 00000002 -CONSTANT: CS_DELETE_TRANSFORM HEX: 00000003 -CONSTANT: GRADIENT_FILL_RECT_H HEX: 00 -CONSTANT: GRADIENT_FILL_RECT_V HEX: 01 -CONSTANT: GRADIENT_FILL_TRIANGLE HEX: 02 -CONSTANT: GRADIENT_FILL_OP_FLAG HEX: ff -CONSTANT: COLORMATCHTOTARGET_EMBEDED HEX: 00000001 -CONSTANT: CREATECOLORSPACE_EMBEDED HEX: 00000001 -CONSTANT: SETICMPROFILE_EMBEDED HEX: 00000001 +CONSTANT: CS_ENABLE 0x00000001 +CONSTANT: CS_DISABLE 0x00000002 +CONSTANT: CS_DELETE_TRANSFORM 0x00000003 +CONSTANT: GRADIENT_FILL_RECT_H 0x00 +CONSTANT: GRADIENT_FILL_RECT_V 0x01 +CONSTANT: GRADIENT_FILL_TRIANGLE 0x02 +CONSTANT: GRADIENT_FILL_OP_FLAG 0xff +CONSTANT: COLORMATCHTOTARGET_EMBEDED 0x00000001 +CONSTANT: CREATECOLORSPACE_EMBEDED 0x00000001 +CONSTANT: SETICMPROFILE_EMBEDED 0x00000001 -CONSTANT: DISPLAY_DEVICE_ATTACHED_TO_DESKTOP HEX: 00000001 -CONSTANT: DISPLAY_DEVICE_MULTI_DRIVER HEX: 00000002 -CONSTANT: DISPLAY_DEVICE_PRIMARY_DEVICE HEX: 00000004 -CONSTANT: DISPLAY_DEVICE_MIRRORING_DRIVER HEX: 00000008 -CONSTANT: DISPLAY_DEVICE_VGA_COMPATIBLE HEX: 00000010 -CONSTANT: DISPLAY_DEVICE_REMOVABLE HEX: 00000020 -CONSTANT: DISPLAY_DEVICE_MODESPRUNED HEX: 08000000 +CONSTANT: DISPLAY_DEVICE_ATTACHED_TO_DESKTOP 0x00000001 +CONSTANT: DISPLAY_DEVICE_MULTI_DRIVER 0x00000002 +CONSTANT: DISPLAY_DEVICE_PRIMARY_DEVICE 0x00000004 +CONSTANT: DISPLAY_DEVICE_MIRRORING_DRIVER 0x00000008 +CONSTANT: DISPLAY_DEVICE_VGA_COMPATIBLE 0x00000010 +CONSTANT: DISPLAY_DEVICE_REMOVABLE 0x00000020 +CONSTANT: DISPLAY_DEVICE_MODESPRUNED 0x08000000 -CONSTANT: NTM_NONNEGATIVE_AC HEX: 00010000 -CONSTANT: NTM_PS_OPENTYPE HEX: 00020000 -CONSTANT: NTM_TT_OPENTYPE HEX: 00040000 -CONSTANT: NTM_MULTIPLEMASTER HEX: 00080000 -CONSTANT: NTM_TYPE1 HEX: 00100000 -CONSTANT: NTM_DSIG HEX: 00200000 +CONSTANT: NTM_NONNEGATIVE_AC 0x00010000 +CONSTANT: NTM_PS_OPENTYPE 0x00020000 +CONSTANT: NTM_TT_OPENTYPE 0x00040000 +CONSTANT: NTM_MULTIPLEMASTER 0x00080000 +CONSTANT: NTM_TYPE1 0x00100000 +CONSTANT: NTM_DSIG 0x00200000 CONSTANT: GGI_MARK_NONEXISTING_GLYPHS 1 diff --git a/basis/windows/gdiplus/gdiplus.factor b/basis/windows/gdiplus/gdiplus.factor index 6978381b70..998b700fa7 100644 --- a/basis/windows/gdiplus/gdiplus.factor +++ b/basis/windows/gdiplus/gdiplus.factor @@ -95,19 +95,19 @@ ENUM: GpFillMode { FillModeWinding 1 } ; ENUM: GpLineCap - { LineCapFlat HEX: 00 } - { LineCapSquare HEX: 01 } - { LineCapRound HEX: 02 } - { LineCapTriangle HEX: 03 } + { LineCapFlat 0x00 } + { LineCapSquare 0x01 } + { LineCapRound 0x02 } + { LineCapTriangle 0x03 } - { LineCapNoAnchor HEX: 10 } - { LineCapSquareAnchor HEX: 11 } - { LineCapRoundAnchor HEX: 12 } - { LineCapDiamondAnchor HEX: 13 } - { LineCapArrowAnchor HEX: 14 } + { LineCapNoAnchor 0x10 } + { LineCapSquareAnchor 0x11 } + { LineCapRoundAnchor 0x12 } + { LineCapDiamondAnchor 0x13 } + { LineCapArrowAnchor 0x14 } - { LineCapCustom HEX: ff } - { LineCapAnchorMask HEX: f0 } ; + { LineCapCustom 0xff } + { LineCapAnchorMask 0xf0 } ; ENUM: PathPointType { PathPointTypeStart 0 } @@ -254,15 +254,15 @@ ENUM: StringDigitSubstitute { StringDigitSubstituteTraditional 3 } ; ENUM: StringFormatFlags - { StringFormatFlagsDirectionRightToLeft HEX: 00000001 } - { StringFormatFlagsDirectionVertical HEX: 00000002 } - { StringFormatFlagsNoFitBlackBox HEX: 00000004 } - { StringFormatFlagsDisplayFormatControl HEX: 00000020 } - { StringFormatFlagsNoFontFallback HEX: 00000400 } - { StringFormatFlagsMeasureTrailingSpaces HEX: 00000800 } - { StringFormatFlagsNoWrap HEX: 00001000 } - { StringFormatFlagsLineLimit HEX: 00002000 } - { StringFormatFlagsNoClip HEX: 00004000 } ; + { StringFormatFlagsDirectionRightToLeft 0x00000001 } + { StringFormatFlagsDirectionVertical 0x00000002 } + { StringFormatFlagsNoFitBlackBox 0x00000004 } + { StringFormatFlagsDisplayFormatControl 0x00000020 } + { StringFormatFlagsNoFontFallback 0x00000400 } + { StringFormatFlagsMeasureTrailingSpaces 0x00000800 } + { StringFormatFlagsNoWrap 0x00001000 } + { StringFormatFlagsLineLimit 0x00002000 } + { StringFormatFlagsNoClip 0x00004000 } ; ENUM: StringTrimming { StringTrimmingNone 0 } @@ -303,19 +303,19 @@ ENUM: ImageCodecFlags ENUM: ImageFlags { ImageFlagsNone 0 } - { ImageFlagsScalable HEX: 0001 } - { ImageFlagsHasAlpha HEX: 0002 } - { ImageFlagsHasTranslucent HEX: 0004 } - { ImageFlagsPartiallyScalable HEX: 0008 } - { ImageFlagsColorSpaceRGB HEX: 0010 } - { ImageFlagsColorSpaceCMYK HEX: 0020 } - { ImageFlagsColorSpaceGRAY HEX: 0040 } - { ImageFlagsColorSpaceYCBCR HEX: 0080 } - { ImageFlagsColorSpaceYCCK HEX: 0100 } - { ImageFlagsHasRealDPI HEX: 1000 } - { ImageFlagsHasRealPixelSize HEX: 2000 } - { ImageFlagsReadOnly HEX: 00010000 } - { ImageFlagsCaching HEX: 00020000 } ; + { ImageFlagsScalable 0x0001 } + { ImageFlagsHasAlpha 0x0002 } + { ImageFlagsHasTranslucent 0x0004 } + { ImageFlagsPartiallyScalable 0x0008 } + { ImageFlagsColorSpaceRGB 0x0010 } + { ImageFlagsColorSpaceCMYK 0x0020 } + { ImageFlagsColorSpaceGRAY 0x0040 } + { ImageFlagsColorSpaceYCBCR 0x0080 } + { ImageFlagsColorSpaceYCCK 0x0100 } + { ImageFlagsHasRealDPI 0x1000 } + { ImageFlagsHasRealPixelSize 0x2000 } + { ImageFlagsReadOnly 0x00010000 } + { ImageFlagsCaching 0x00020000 } ; ENUM: CombineMode CombineModeReplace @@ -435,12 +435,12 @@ TYPEDEF: INT PixelFormat [ ] [ 8 shift ] [ ] tri* bitor bitor ; inline PRIVATE> -CONSTANT: PixelFormatIndexed HEX: 00010000 -CONSTANT: PixelFormatGDI HEX: 00020000 -CONSTANT: PixelFormatAlpha HEX: 00040000 -CONSTANT: PixelFormatPAlpha HEX: 00080000 -CONSTANT: PixelFormatExtended HEX: 00100000 -CONSTANT: PixelFormatCanonical HEX: 00200000 +CONSTANT: PixelFormatIndexed 0x00010000 +CONSTANT: PixelFormatGDI 0x00020000 +CONSTANT: PixelFormatAlpha 0x00040000 +CONSTANT: PixelFormatPAlpha 0x00080000 +CONSTANT: PixelFormatExtended 0x00100000 +CONSTANT: PixelFormatCanonical 0x00200000 CONSTANT: PixelFormatUndefined 0 CONSTANT: PixelFormatDontCare 0 @@ -651,238 +651,238 @@ CONSTANT: PropertyTagTypeUndefined 7 CONSTANT: PropertyTagTypeSLONG 9 CONSTANT: PropertyTagTypeSRational 10 -CONSTANT: PropertyTagExifIFD HEX: 8769 -CONSTANT: PropertyTagGpsIFD HEX: 8825 - -CONSTANT: PropertyTagNewSubfileType HEX: 00FE -CONSTANT: PropertyTagSubfileType HEX: 00FF -CONSTANT: PropertyTagImageWidth HEX: 0100 -CONSTANT: PropertyTagImageHeight HEX: 0101 -CONSTANT: PropertyTagBitsPerSample HEX: 0102 -CONSTANT: PropertyTagCompression HEX: 0103 -CONSTANT: PropertyTagPhotometricInterp HEX: 0106 -CONSTANT: PropertyTagThreshHolding HEX: 0107 -CONSTANT: PropertyTagCellWidth HEX: 0108 -CONSTANT: PropertyTagCellHeight HEX: 0109 -CONSTANT: PropertyTagFillOrder HEX: 010A -CONSTANT: PropertyTagDocumentName HEX: 010D -CONSTANT: PropertyTagImageDescription HEX: 010E -CONSTANT: PropertyTagEquipMake HEX: 010F -CONSTANT: PropertyTagEquipModel HEX: 0110 -CONSTANT: PropertyTagStripOffsets HEX: 0111 -CONSTANT: PropertyTagOrientation HEX: 0112 -CONSTANT: PropertyTagSamplesPerPixel HEX: 0115 -CONSTANT: PropertyTagRowsPerStrip HEX: 0116 -CONSTANT: PropertyTagStripBytesCount HEX: 0117 -CONSTANT: PropertyTagMinSampleValue HEX: 0118 -CONSTANT: PropertyTagMaxSampleValue HEX: 0119 -CONSTANT: PropertyTagXResolution HEX: 011A -CONSTANT: PropertyTagYResolution HEX: 011B -CONSTANT: PropertyTagPlanarConfig HEX: 011C -CONSTANT: PropertyTagPageName HEX: 011D -CONSTANT: PropertyTagXPosition HEX: 011E -CONSTANT: PropertyTagYPosition HEX: 011F -CONSTANT: PropertyTagFreeOffset HEX: 0120 -CONSTANT: PropertyTagFreeByteCounts HEX: 0121 -CONSTANT: PropertyTagGrayResponseUnit HEX: 0122 -CONSTANT: PropertyTagGrayResponseCurve HEX: 0123 -CONSTANT: PropertyTagT4Option HEX: 0124 -CONSTANT: PropertyTagT6Option HEX: 0125 -CONSTANT: PropertyTagResolutionUnit HEX: 0128 -CONSTANT: PropertyTagPageNumber HEX: 0129 -CONSTANT: PropertyTagTransferFuncition HEX: 012D -CONSTANT: PropertyTagSoftwareUsed HEX: 0131 -CONSTANT: PropertyTagDateTime HEX: 0132 -CONSTANT: PropertyTagArtist HEX: 013B -CONSTANT: PropertyTagHostComputer HEX: 013C -CONSTANT: PropertyTagPredictor HEX: 013D -CONSTANT: PropertyTagWhitePoint HEX: 013E -CONSTANT: PropertyTagPrimaryChromaticities HEX: 013F -CONSTANT: PropertyTagColorMap HEX: 0140 -CONSTANT: PropertyTagHalftoneHints HEX: 0141 -CONSTANT: PropertyTagTileWidth HEX: 0142 -CONSTANT: PropertyTagTileLength HEX: 0143 -CONSTANT: PropertyTagTileOffset HEX: 0144 -CONSTANT: PropertyTagTileByteCounts HEX: 0145 -CONSTANT: PropertyTagInkSet HEX: 014C -CONSTANT: PropertyTagInkNames HEX: 014D -CONSTANT: PropertyTagNumberOfInks HEX: 014E -CONSTANT: PropertyTagDotRange HEX: 0150 -CONSTANT: PropertyTagTargetPrinter HEX: 0151 -CONSTANT: PropertyTagExtraSamples HEX: 0152 -CONSTANT: PropertyTagSampleFormat HEX: 0153 -CONSTANT: PropertyTagSMinSampleValue HEX: 0154 -CONSTANT: PropertyTagSMaxSampleValue HEX: 0155 -CONSTANT: PropertyTagTransferRange HEX: 0156 - -CONSTANT: PropertyTagJPEGProc HEX: 0200 -CONSTANT: PropertyTagJPEGInterFormat HEX: 0201 -CONSTANT: PropertyTagJPEGInterLength HEX: 0202 -CONSTANT: PropertyTagJPEGRestartInterval HEX: 0203 -CONSTANT: PropertyTagJPEGLosslessPredictors HEX: 0205 -CONSTANT: PropertyTagJPEGPointTransforms HEX: 0206 -CONSTANT: PropertyTagJPEGQTables HEX: 0207 -CONSTANT: PropertyTagJPEGDCTables HEX: 0208 -CONSTANT: PropertyTagJPEGACTables HEX: 0209 - -CONSTANT: PropertyTagYCbCrCoefficients HEX: 0211 -CONSTANT: PropertyTagYCbCrSubsampling HEX: 0212 -CONSTANT: PropertyTagYCbCrPositioning HEX: 0213 -CONSTANT: PropertyTagREFBlackWhite HEX: 0214 - -CONSTANT: PropertyTagICCProfile HEX: 8773 - -CONSTANT: PropertyTagGamma HEX: 0301 -CONSTANT: PropertyTagICCProfileDescriptor HEX: 0302 -CONSTANT: PropertyTagSRGBRenderingIntent HEX: 0303 - -CONSTANT: PropertyTagImageTitle HEX: 0320 -CONSTANT: PropertyTagCopyright HEX: 8298 - -CONSTANT: PropertyTagResolutionXUnit HEX: 5001 -CONSTANT: PropertyTagResolutionYUnit HEX: 5002 -CONSTANT: PropertyTagResolutionXLengthUnit HEX: 5003 -CONSTANT: PropertyTagResolutionYLengthUnit HEX: 5004 -CONSTANT: PropertyTagPrintFlags HEX: 5005 -CONSTANT: PropertyTagPrintFlagsVersion HEX: 5006 -CONSTANT: PropertyTagPrintFlagsCrop HEX: 5007 -CONSTANT: PropertyTagPrintFlagsBleedWidth HEX: 5008 -CONSTANT: PropertyTagPrintFlagsBleedWidthScale HEX: 5009 -CONSTANT: PropertyTagHalftoneLPI HEX: 500A -CONSTANT: PropertyTagHalftoneLPIUnit HEX: 500B -CONSTANT: PropertyTagHalftoneDegree HEX: 500C -CONSTANT: PropertyTagHalftoneShape HEX: 500D -CONSTANT: PropertyTagHalftoneMisc HEX: 500E -CONSTANT: PropertyTagHalftoneScreen HEX: 500F -CONSTANT: PropertyTagJPEGQuality HEX: 5010 -CONSTANT: PropertyTagGridSize HEX: 5011 -CONSTANT: PropertyTagThumbnailFormat HEX: 5012 -CONSTANT: PropertyTagThumbnailWidth HEX: 5013 -CONSTANT: PropertyTagThumbnailHeight HEX: 5014 -CONSTANT: PropertyTagThumbnailColorDepth HEX: 5015 -CONSTANT: PropertyTagThumbnailPlanes HEX: 5016 -CONSTANT: PropertyTagThumbnailRawBytes HEX: 5017 -CONSTANT: PropertyTagThumbnailSize HEX: 5018 -CONSTANT: PropertyTagThumbnailCompressedSize HEX: 5019 -CONSTANT: PropertyTagColorTransferFunction HEX: 501A -CONSTANT: PropertyTagThumbnailData HEX: 501B - -CONSTANT: PropertyTagThumbnailImageWidth HEX: 5020 -CONSTANT: PropertyTagThumbnailImageHeight HEX: 5021 -CONSTANT: PropertyTagThumbnailBitsPerSample HEX: 5022 -CONSTANT: PropertyTagThumbnailCompression HEX: 5023 -CONSTANT: PropertyTagThumbnailPhotometricInterp HEX: 5024 -CONSTANT: PropertyTagThumbnailImageDescription HEX: 5025 -CONSTANT: PropertyTagThumbnailEquipMake HEX: 5026 -CONSTANT: PropertyTagThumbnailEquipModel HEX: 5027 -CONSTANT: PropertyTagThumbnailStripOffsets HEX: 5028 -CONSTANT: PropertyTagThumbnailOrientation HEX: 5029 -CONSTANT: PropertyTagThumbnailSamplesPerPixel HEX: 502A -CONSTANT: PropertyTagThumbnailRowsPerStrip HEX: 502B -CONSTANT: PropertyTagThumbnailStripBytesCount HEX: 502C -CONSTANT: PropertyTagThumbnailResolutionX HEX: 502D -CONSTANT: PropertyTagThumbnailResolutionY HEX: 502E -CONSTANT: PropertyTagThumbnailPlanarConfig HEX: 502F -CONSTANT: PropertyTagThumbnailResolutionUnit HEX: 5030 -CONSTANT: PropertyTagThumbnailTransferFunction HEX: 5031 -CONSTANT: PropertyTagThumbnailSoftwareUsed HEX: 5032 -CONSTANT: PropertyTagThumbnailDateTime HEX: 5033 -CONSTANT: PropertyTagThumbnailArtist HEX: 5034 -CONSTANT: PropertyTagThumbnailWhitePoint HEX: 5035 -CONSTANT: PropertyTagThumbnailPrimaryChromaticities HEX: 5036 -CONSTANT: PropertyTagThumbnailYCbCrCoefficients HEX: 5037 -CONSTANT: PropertyTagThumbnailYCbCrSubsampling HEX: 5038 -CONSTANT: PropertyTagThumbnailYCbCrPositioning HEX: 5039 -CONSTANT: PropertyTagThumbnailRefBlackWhite HEX: 503A -CONSTANT: PropertyTagThumbnailCopyRight HEX: 503B - -CONSTANT: PropertyTagLuminanceTable HEX: 5090 -CONSTANT: PropertyTagChrominanceTable HEX: 5091 - -CONSTANT: PropertyTagFrameDelay HEX: 5100 -CONSTANT: PropertyTagLoopCount HEX: 5101 - -CONSTANT: PropertyTagPixelUnit HEX: 5110 -CONSTANT: PropertyTagPixelPerUnitX HEX: 5111 -CONSTANT: PropertyTagPixelPerUnitY HEX: 5112 -CONSTANT: PropertyTagPaletteHistogram HEX: 5113 - -CONSTANT: PropertyTagExifExposureTime HEX: 829A -CONSTANT: PropertyTagExifFNumber HEX: 829D - -CONSTANT: PropertyTagExifExposureProg HEX: 8822 -CONSTANT: PropertyTagExifSpectralSense HEX: 8824 -CONSTANT: PropertyTagExifISOSpeed HEX: 8827 -CONSTANT: PropertyTagExifOECF HEX: 8828 - -CONSTANT: PropertyTagExifVer HEX: 9000 -CONSTANT: PropertyTagExifDTOrig HEX: 9003 -CONSTANT: PropertyTagExifDTDigitized HEX: 9004 - -CONSTANT: PropertyTagExifCompConfig HEX: 9101 -CONSTANT: PropertyTagExifCompBPP HEX: 9102 - -CONSTANT: PropertyTagExifShutterSpeed HEX: 9201 -CONSTANT: PropertyTagExifAperture HEX: 9202 -CONSTANT: PropertyTagExifBrightness HEX: 9203 -CONSTANT: PropertyTagExifExposureBias HEX: 9204 -CONSTANT: PropertyTagExifMaxAperture HEX: 9205 -CONSTANT: PropertyTagExifSubjectDist HEX: 9206 -CONSTANT: PropertyTagExifMeteringMode HEX: 9207 -CONSTANT: PropertyTagExifLightSource HEX: 9208 -CONSTANT: PropertyTagExifFlash HEX: 9209 -CONSTANT: PropertyTagExifFocalLength HEX: 920A -CONSTANT: PropertyTagExifMakerNote HEX: 927C -CONSTANT: PropertyTagExifUserComment HEX: 9286 -CONSTANT: PropertyTagExifDTSubsec HEX: 9290 -CONSTANT: PropertyTagExifDTOrigSS HEX: 9291 -CONSTANT: PropertyTagExifDTDigSS HEX: 9292 - -CONSTANT: PropertyTagExifFPXVer HEX: A000 -CONSTANT: PropertyTagExifColorSpace HEX: A001 -CONSTANT: PropertyTagExifPixXDim HEX: A002 -CONSTANT: PropertyTagExifPixYDim HEX: A003 -CONSTANT: PropertyTagExifRelatedWav HEX: A004 -CONSTANT: PropertyTagExifInterop HEX: A005 -CONSTANT: PropertyTagExifFlashEnergy HEX: A20B -CONSTANT: PropertyTagExifSpatialFR HEX: A20C -CONSTANT: PropertyTagExifFocalXRes HEX: A20E -CONSTANT: PropertyTagExifFocalYRes HEX: A20F -CONSTANT: PropertyTagExifFocalResUnit HEX: A210 -CONSTANT: PropertyTagExifSubjectLoc HEX: A214 -CONSTANT: PropertyTagExifExposureIndex HEX: A215 -CONSTANT: PropertyTagExifSensingMethod HEX: A217 -CONSTANT: PropertyTagExifFileSource HEX: A300 -CONSTANT: PropertyTagExifSceneType HEX: A301 -CONSTANT: PropertyTagExifCfaPattern HEX: A302 - -CONSTANT: PropertyTagGpsVer HEX: 0000 -CONSTANT: PropertyTagGpsLatitudeRef HEX: 0001 -CONSTANT: PropertyTagGpsLatitude HEX: 0002 -CONSTANT: PropertyTagGpsLongitudeRef HEX: 0003 -CONSTANT: PropertyTagGpsLongitude HEX: 0004 -CONSTANT: PropertyTagGpsAltitudeRef HEX: 0005 -CONSTANT: PropertyTagGpsAltitude HEX: 0006 -CONSTANT: PropertyTagGpsGpsTime HEX: 0007 -CONSTANT: PropertyTagGpsGpsSatellites HEX: 0008 -CONSTANT: PropertyTagGpsGpsStatus HEX: 0009 -CONSTANT: PropertyTagGpsGpsMeasureMode HEX: 000A -CONSTANT: PropertyTagGpsGpsDop HEX: 000B -CONSTANT: PropertyTagGpsSpeedRef HEX: 000C -CONSTANT: PropertyTagGpsSpeed HEX: 000D -CONSTANT: PropertyTagGpsTrackRef HEX: 000E -CONSTANT: PropertyTagGpsTrack HEX: 000F -CONSTANT: PropertyTagGpsImgDirRef HEX: 0010 -CONSTANT: PropertyTagGpsImgDir HEX: 0011 -CONSTANT: PropertyTagGpsMapDatum HEX: 0012 -CONSTANT: PropertyTagGpsDestLatRef HEX: 0013 -CONSTANT: PropertyTagGpsDestLat HEX: 0014 -CONSTANT: PropertyTagGpsDestLongRef HEX: 0015 -CONSTANT: PropertyTagGpsDestLong HEX: 0016 -CONSTANT: PropertyTagGpsDestBearRef HEX: 0017 -CONSTANT: PropertyTagGpsDestBear HEX: 0018 -CONSTANT: PropertyTagGpsDestDistRef HEX: 0019 -CONSTANT: PropertyTagGpsDestDist HEX: 001A +CONSTANT: PropertyTagExifIFD 0x8769 +CONSTANT: PropertyTagGpsIFD 0x8825 + +CONSTANT: PropertyTagNewSubfileType 0x00FE +CONSTANT: PropertyTagSubfileType 0x00FF +CONSTANT: PropertyTagImageWidth 0x0100 +CONSTANT: PropertyTagImageHeight 0x0101 +CONSTANT: PropertyTagBitsPerSample 0x0102 +CONSTANT: PropertyTagCompression 0x0103 +CONSTANT: PropertyTagPhotometricInterp 0x0106 +CONSTANT: PropertyTagThreshHolding 0x0107 +CONSTANT: PropertyTagCellWidth 0x0108 +CONSTANT: PropertyTagCellHeight 0x0109 +CONSTANT: PropertyTagFillOrder 0x010A +CONSTANT: PropertyTagDocumentName 0x010D +CONSTANT: PropertyTagImageDescription 0x010E +CONSTANT: PropertyTagEquipMake 0x010F +CONSTANT: PropertyTagEquipModel 0x0110 +CONSTANT: PropertyTagStripOffsets 0x0111 +CONSTANT: PropertyTagOrientation 0x0112 +CONSTANT: PropertyTagSamplesPerPixel 0x0115 +CONSTANT: PropertyTagRowsPerStrip 0x0116 +CONSTANT: PropertyTagStripBytesCount 0x0117 +CONSTANT: PropertyTagMinSampleValue 0x0118 +CONSTANT: PropertyTagMaxSampleValue 0x0119 +CONSTANT: PropertyTagXResolution 0x011A +CONSTANT: PropertyTagYResolution 0x011B +CONSTANT: PropertyTagPlanarConfig 0x011C +CONSTANT: PropertyTagPageName 0x011D +CONSTANT: PropertyTagXPosition 0x011E +CONSTANT: PropertyTagYPosition 0x011F +CONSTANT: PropertyTagFreeOffset 0x0120 +CONSTANT: PropertyTagFreeByteCounts 0x0121 +CONSTANT: PropertyTagGrayResponseUnit 0x0122 +CONSTANT: PropertyTagGrayResponseCurve 0x0123 +CONSTANT: PropertyTagT4Option 0x0124 +CONSTANT: PropertyTagT6Option 0x0125 +CONSTANT: PropertyTagResolutionUnit 0x0128 +CONSTANT: PropertyTagPageNumber 0x0129 +CONSTANT: PropertyTagTransferFuncition 0x012D +CONSTANT: PropertyTagSoftwareUsed 0x0131 +CONSTANT: PropertyTagDateTime 0x0132 +CONSTANT: PropertyTagArtist 0x013B +CONSTANT: PropertyTagHostComputer 0x013C +CONSTANT: PropertyTagPredictor 0x013D +CONSTANT: PropertyTagWhitePoint 0x013E +CONSTANT: PropertyTagPrimaryChromaticities 0x013F +CONSTANT: PropertyTagColorMap 0x0140 +CONSTANT: PropertyTagHalftoneHints 0x0141 +CONSTANT: PropertyTagTileWidth 0x0142 +CONSTANT: PropertyTagTileLength 0x0143 +CONSTANT: PropertyTagTileOffset 0x0144 +CONSTANT: PropertyTagTileByteCounts 0x0145 +CONSTANT: PropertyTagInkSet 0x014C +CONSTANT: PropertyTagInkNames 0x014D +CONSTANT: PropertyTagNumberOfInks 0x014E +CONSTANT: PropertyTagDotRange 0x0150 +CONSTANT: PropertyTagTargetPrinter 0x0151 +CONSTANT: PropertyTagExtraSamples 0x0152 +CONSTANT: PropertyTagSampleFormat 0x0153 +CONSTANT: PropertyTagSMinSampleValue 0x0154 +CONSTANT: PropertyTagSMaxSampleValue 0x0155 +CONSTANT: PropertyTagTransferRange 0x0156 + +CONSTANT: PropertyTagJPEGProc 0x0200 +CONSTANT: PropertyTagJPEGInterFormat 0x0201 +CONSTANT: PropertyTagJPEGInterLength 0x0202 +CONSTANT: PropertyTagJPEGRestartInterval 0x0203 +CONSTANT: PropertyTagJPEGLosslessPredictors 0x0205 +CONSTANT: PropertyTagJPEGPointTransforms 0x0206 +CONSTANT: PropertyTagJPEGQTables 0x0207 +CONSTANT: PropertyTagJPEGDCTables 0x0208 +CONSTANT: PropertyTagJPEGACTables 0x0209 + +CONSTANT: PropertyTagYCbCrCoefficients 0x0211 +CONSTANT: PropertyTagYCbCrSubsampling 0x0212 +CONSTANT: PropertyTagYCbCrPositioning 0x0213 +CONSTANT: PropertyTagREFBlackWhite 0x0214 + +CONSTANT: PropertyTagICCProfile 0x8773 + +CONSTANT: PropertyTagGamma 0x0301 +CONSTANT: PropertyTagICCProfileDescriptor 0x0302 +CONSTANT: PropertyTagSRGBRenderingIntent 0x0303 + +CONSTANT: PropertyTagImageTitle 0x0320 +CONSTANT: PropertyTagCopyright 0x8298 + +CONSTANT: PropertyTagResolutionXUnit 0x5001 +CONSTANT: PropertyTagResolutionYUnit 0x5002 +CONSTANT: PropertyTagResolutionXLengthUnit 0x5003 +CONSTANT: PropertyTagResolutionYLengthUnit 0x5004 +CONSTANT: PropertyTagPrintFlags 0x5005 +CONSTANT: PropertyTagPrintFlagsVersion 0x5006 +CONSTANT: PropertyTagPrintFlagsCrop 0x5007 +CONSTANT: PropertyTagPrintFlagsBleedWidth 0x5008 +CONSTANT: PropertyTagPrintFlagsBleedWidthScale 0x5009 +CONSTANT: PropertyTagHalftoneLPI 0x500A +CONSTANT: PropertyTagHalftoneLPIUnit 0x500B +CONSTANT: PropertyTagHalftoneDegree 0x500C +CONSTANT: PropertyTagHalftoneShape 0x500D +CONSTANT: PropertyTagHalftoneMisc 0x500E +CONSTANT: PropertyTagHalftoneScreen 0x500F +CONSTANT: PropertyTagJPEGQuality 0x5010 +CONSTANT: PropertyTagGridSize 0x5011 +CONSTANT: PropertyTagThumbnailFormat 0x5012 +CONSTANT: PropertyTagThumbnailWidth 0x5013 +CONSTANT: PropertyTagThumbnailHeight 0x5014 +CONSTANT: PropertyTagThumbnailColorDepth 0x5015 +CONSTANT: PropertyTagThumbnailPlanes 0x5016 +CONSTANT: PropertyTagThumbnailRawBytes 0x5017 +CONSTANT: PropertyTagThumbnailSize 0x5018 +CONSTANT: PropertyTagThumbnailCompressedSize 0x5019 +CONSTANT: PropertyTagColorTransferFunction 0x501A +CONSTANT: PropertyTagThumbnailData 0x501B + +CONSTANT: PropertyTagThumbnailImageWidth 0x5020 +CONSTANT: PropertyTagThumbnailImageHeight 0x5021 +CONSTANT: PropertyTagThumbnailBitsPerSample 0x5022 +CONSTANT: PropertyTagThumbnailCompression 0x5023 +CONSTANT: PropertyTagThumbnailPhotometricInterp 0x5024 +CONSTANT: PropertyTagThumbnailImageDescription 0x5025 +CONSTANT: PropertyTagThumbnailEquipMake 0x5026 +CONSTANT: PropertyTagThumbnailEquipModel 0x5027 +CONSTANT: PropertyTagThumbnailStripOffsets 0x5028 +CONSTANT: PropertyTagThumbnailOrientation 0x5029 +CONSTANT: PropertyTagThumbnailSamplesPerPixel 0x502A +CONSTANT: PropertyTagThumbnailRowsPerStrip 0x502B +CONSTANT: PropertyTagThumbnailStripBytesCount 0x502C +CONSTANT: PropertyTagThumbnailResolutionX 0x502D +CONSTANT: PropertyTagThumbnailResolutionY 0x502E +CONSTANT: PropertyTagThumbnailPlanarConfig 0x502F +CONSTANT: PropertyTagThumbnailResolutionUnit 0x5030 +CONSTANT: PropertyTagThumbnailTransferFunction 0x5031 +CONSTANT: PropertyTagThumbnailSoftwareUsed 0x5032 +CONSTANT: PropertyTagThumbnailDateTime 0x5033 +CONSTANT: PropertyTagThumbnailArtist 0x5034 +CONSTANT: PropertyTagThumbnailWhitePoint 0x5035 +CONSTANT: PropertyTagThumbnailPrimaryChromaticities 0x5036 +CONSTANT: PropertyTagThumbnailYCbCrCoefficients 0x5037 +CONSTANT: PropertyTagThumbnailYCbCrSubsampling 0x5038 +CONSTANT: PropertyTagThumbnailYCbCrPositioning 0x5039 +CONSTANT: PropertyTagThumbnailRefBlackWhite 0x503A +CONSTANT: PropertyTagThumbnailCopyRight 0x503B + +CONSTANT: PropertyTagLuminanceTable 0x5090 +CONSTANT: PropertyTagChrominanceTable 0x5091 + +CONSTANT: PropertyTagFrameDelay 0x5100 +CONSTANT: PropertyTagLoopCount 0x5101 + +CONSTANT: PropertyTagPixelUnit 0x5110 +CONSTANT: PropertyTagPixelPerUnitX 0x5111 +CONSTANT: PropertyTagPixelPerUnitY 0x5112 +CONSTANT: PropertyTagPaletteHistogram 0x5113 + +CONSTANT: PropertyTagExifExposureTime 0x829A +CONSTANT: PropertyTagExifFNumber 0x829D + +CONSTANT: PropertyTagExifExposureProg 0x8822 +CONSTANT: PropertyTagExifSpectralSense 0x8824 +CONSTANT: PropertyTagExifISOSpeed 0x8827 +CONSTANT: PropertyTagExifOECF 0x8828 + +CONSTANT: PropertyTagExifVer 0x9000 +CONSTANT: PropertyTagExifDTOrig 0x9003 +CONSTANT: PropertyTagExifDTDigitized 0x9004 + +CONSTANT: PropertyTagExifCompConfig 0x9101 +CONSTANT: PropertyTagExifCompBPP 0x9102 + +CONSTANT: PropertyTagExifShutterSpeed 0x9201 +CONSTANT: PropertyTagExifAperture 0x9202 +CONSTANT: PropertyTagExifBrightness 0x9203 +CONSTANT: PropertyTagExifExposureBias 0x9204 +CONSTANT: PropertyTagExifMaxAperture 0x9205 +CONSTANT: PropertyTagExifSubjectDist 0x9206 +CONSTANT: PropertyTagExifMeteringMode 0x9207 +CONSTANT: PropertyTagExifLightSource 0x9208 +CONSTANT: PropertyTagExifFlash 0x9209 +CONSTANT: PropertyTagExifFocalLength 0x920A +CONSTANT: PropertyTagExifMakerNote 0x927C +CONSTANT: PropertyTagExifUserComment 0x9286 +CONSTANT: PropertyTagExifDTSubsec 0x9290 +CONSTANT: PropertyTagExifDTOrigSS 0x9291 +CONSTANT: PropertyTagExifDTDigSS 0x9292 + +CONSTANT: PropertyTagExifFPXVer 0xA000 +CONSTANT: PropertyTagExifColorSpace 0xA001 +CONSTANT: PropertyTagExifPixXDim 0xA002 +CONSTANT: PropertyTagExifPixYDim 0xA003 +CONSTANT: PropertyTagExifRelatedWav 0xA004 +CONSTANT: PropertyTagExifInterop 0xA005 +CONSTANT: PropertyTagExifFlashEnergy 0xA20B +CONSTANT: PropertyTagExifSpatialFR 0xA20C +CONSTANT: PropertyTagExifFocalXRes 0xA20E +CONSTANT: PropertyTagExifFocalYRes 0xA20F +CONSTANT: PropertyTagExifFocalResUnit 0xA210 +CONSTANT: PropertyTagExifSubjectLoc 0xA214 +CONSTANT: PropertyTagExifExposureIndex 0xA215 +CONSTANT: PropertyTagExifSensingMethod 0xA217 +CONSTANT: PropertyTagExifFileSource 0xA300 +CONSTANT: PropertyTagExifSceneType 0xA301 +CONSTANT: PropertyTagExifCfaPattern 0xA302 + +CONSTANT: PropertyTagGpsVer 0x0000 +CONSTANT: PropertyTagGpsLatitudeRef 0x0001 +CONSTANT: PropertyTagGpsLatitude 0x0002 +CONSTANT: PropertyTagGpsLongitudeRef 0x0003 +CONSTANT: PropertyTagGpsLongitude 0x0004 +CONSTANT: PropertyTagGpsAltitudeRef 0x0005 +CONSTANT: PropertyTagGpsAltitude 0x0006 +CONSTANT: PropertyTagGpsGpsTime 0x0007 +CONSTANT: PropertyTagGpsGpsSatellites 0x0008 +CONSTANT: PropertyTagGpsGpsStatus 0x0009 +CONSTANT: PropertyTagGpsGpsMeasureMode 0x000A +CONSTANT: PropertyTagGpsGpsDop 0x000B +CONSTANT: PropertyTagGpsSpeedRef 0x000C +CONSTANT: PropertyTagGpsSpeed 0x000D +CONSTANT: PropertyTagGpsTrackRef 0x000E +CONSTANT: PropertyTagGpsTrack 0x000F +CONSTANT: PropertyTagGpsImgDirRef 0x0010 +CONSTANT: PropertyTagGpsImgDir 0x0011 +CONSTANT: PropertyTagGpsMapDatum 0x0012 +CONSTANT: PropertyTagGpsDestLatRef 0x0013 +CONSTANT: PropertyTagGpsDestLat 0x0014 +CONSTANT: PropertyTagGpsDestLongRef 0x0015 +CONSTANT: PropertyTagGpsDestLong 0x0016 +CONSTANT: PropertyTagGpsDestBearRef 0x0017 +CONSTANT: PropertyTagGpsDestBear 0x0018 +CONSTANT: PropertyTagGpsDestDistRef 0x0019 +CONSTANT: PropertyTagGpsDestDist 0x001A ENUM: ColorChannelFlags ColorChannelFlagsC diff --git a/basis/windows/kernel32/kernel32.factor b/basis/windows/kernel32/kernel32.factor index 0ab4e5ef97..8cb41106fc 100644 --- a/basis/windows/kernel32/kernel32.factor +++ b/basis/windows/kernel32/kernel32.factor @@ -6,16 +6,16 @@ IN: windows.kernel32 CONSTANT: MAX_PATH 260 -CONSTANT: GHND HEX: 40 +CONSTANT: GHND 0x40 CONSTANT: GMEM_FIXED 0 CONSTANT: GMEM_MOVEABLE 2 -CONSTANT: GMEM_ZEROINIT HEX: 40 -CONSTANT: GPTR HEX: 40 +CONSTANT: GMEM_ZEROINIT 0x40 +CONSTANT: GPTR 0x40 -CONSTANT: GENERIC_READ HEX: 80000000 -CONSTANT: GENERIC_WRITE HEX: 40000000 -CONSTANT: GENERIC_EXECUTE HEX: 20000000 -CONSTANT: GENERIC_ALL HEX: 10000000 +CONSTANT: GENERIC_READ 0x80000000 +CONSTANT: GENERIC_WRITE 0x40000000 +CONSTANT: GENERIC_EXECUTE 0x20000000 +CONSTANT: GENERIC_ALL 0x10000000 CONSTANT: CREATE_NEW 1 CONSTANT: CREATE_ALWAYS 2 @@ -23,66 +23,66 @@ CONSTANT: OPEN_EXISTING 3 CONSTANT: OPEN_ALWAYS 4 CONSTANT: TRUNCATE_EXISTING 5 -CONSTANT: FILE_LIST_DIRECTORY HEX: 00000001 -CONSTANT: FILE_READ_DAT HEX: 00000001 -CONSTANT: FILE_ADD_FILE HEX: 00000002 -CONSTANT: FILE_WRITE_DATA HEX: 00000002 -CONSTANT: FILE_ADD_SUBDIRECTORY HEX: 00000004 -CONSTANT: FILE_APPEND_DATA HEX: 00000004 -CONSTANT: FILE_CREATE_PIPE_INSTANCE HEX: 00000004 -CONSTANT: FILE_READ_EA HEX: 00000008 -CONSTANT: FILE_READ_PROPERTIES HEX: 00000008 -CONSTANT: FILE_WRITE_EA HEX: 00000010 -CONSTANT: FILE_WRITE_PROPERTIES HEX: 00000010 -CONSTANT: FILE_EXECUTE HEX: 00000020 -CONSTANT: FILE_TRAVERSE HEX: 00000020 -CONSTANT: FILE_DELETE_CHILD HEX: 00000040 -CONSTANT: FILE_READ_ATTRIBUTES HEX: 00000080 -CONSTANT: FILE_WRITE_ATTRIBUTES HEX: 00000100 +CONSTANT: FILE_LIST_DIRECTORY 0x00000001 +CONSTANT: FILE_READ_DAT 0x00000001 +CONSTANT: FILE_ADD_FILE 0x00000002 +CONSTANT: FILE_WRITE_DATA 0x00000002 +CONSTANT: FILE_ADD_SUBDIRECTORY 0x00000004 +CONSTANT: FILE_APPEND_DATA 0x00000004 +CONSTANT: FILE_CREATE_PIPE_INSTANCE 0x00000004 +CONSTANT: FILE_READ_EA 0x00000008 +CONSTANT: FILE_READ_PROPERTIES 0x00000008 +CONSTANT: FILE_WRITE_EA 0x00000010 +CONSTANT: FILE_WRITE_PROPERTIES 0x00000010 +CONSTANT: FILE_EXECUTE 0x00000020 +CONSTANT: FILE_TRAVERSE 0x00000020 +CONSTANT: FILE_DELETE_CHILD 0x00000040 +CONSTANT: FILE_READ_ATTRIBUTES 0x00000080 +CONSTANT: FILE_WRITE_ATTRIBUTES 0x00000100 CONSTANT: FILE_SHARE_READ 1 CONSTANT: FILE_SHARE_WRITE 2 CONSTANT: FILE_SHARE_DELETE 4 CONSTANT: FILE_SHARE_VALID_FLAGS 7 -CONSTANT: FILE_FLAG_WRITE_THROUGH HEX: 80000000 -CONSTANT: FILE_FLAG_OVERLAPPED HEX: 40000000 -CONSTANT: FILE_FLAG_NO_BUFFERING HEX: 20000000 -CONSTANT: FILE_FLAG_RANDOM_ACCESS HEX: 10000000 -CONSTANT: FILE_FLAG_SEQUENTIAL_SCAN HEX: 08000000 -CONSTANT: FILE_FLAG_DELETE_ON_CLOSE HEX: 04000000 -CONSTANT: FILE_FLAG_BACKUP_SEMANTICS HEX: 02000000 -CONSTANT: FILE_FLAG_POSIX_SEMANTICS HEX: 01000000 -CONSTANT: FILE_FLAG_OPEN_REPARSE_POINT HEX: 00200000 -CONSTANT: FILE_FLAG_OPEN_NO_RECALL HEX: 00100000 -CONSTANT: FILE_FLAG_FIRST_PIPE_INSTANCE HEX: 00080000 - -CONSTANT: FILE_ATTRIBUTE_READONLY HEX: 00000001 -CONSTANT: FILE_ATTRIBUTE_HIDDEN HEX: 00000002 -CONSTANT: FILE_ATTRIBUTE_SYSTEM HEX: 00000004 -CONSTANT: FILE_ATTRIBUTE_DIRECTORY HEX: 00000010 -CONSTANT: FILE_ATTRIBUTE_ARCHIVE HEX: 00000020 -CONSTANT: FILE_ATTRIBUTE_DEVICE HEX: 00000040 -CONSTANT: FILE_ATTRIBUTE_NORMAL HEX: 00000080 -CONSTANT: FILE_ATTRIBUTE_TEMPORARY HEX: 00000100 -CONSTANT: FILE_ATTRIBUTE_SPARSE_FILE HEX: 00000200 -CONSTANT: FILE_ATTRIBUTE_REPARSE_POINT HEX: 00000400 -CONSTANT: FILE_ATTRIBUTE_COMPRESSED HEX: 00000800 -CONSTANT: FILE_ATTRIBUTE_OFFLINE HEX: 00001000 -CONSTANT: FILE_ATTRIBUTE_NOT_CONTENT_INDEXED HEX: 00002000 -CONSTANT: FILE_ATTRIBUTE_ENCRYPTED HEX: 00004000 - -CONSTANT: FILE_NOTIFY_CHANGE_FILE HEX: 001 -CONSTANT: FILE_NOTIFY_CHANGE_DIR_NAME HEX: 002 -CONSTANT: FILE_NOTIFY_CHANGE_ATTRIBUTES HEX: 004 -CONSTANT: FILE_NOTIFY_CHANGE_SIZE HEX: 008 -CONSTANT: FILE_NOTIFY_CHANGE_LAST_WRITE HEX: 010 -CONSTANT: FILE_NOTIFY_CHANGE_LAST_ACCESS HEX: 020 -CONSTANT: FILE_NOTIFY_CHANGE_CREATION HEX: 040 -CONSTANT: FILE_NOTIFY_CHANGE_EA HEX: 080 -CONSTANT: FILE_NOTIFY_CHANGE_SECURITY HEX: 100 -CONSTANT: FILE_NOTIFY_CHANGE_FILE_NAME HEX: 200 -CONSTANT: FILE_NOTIFY_CHANGE_ALL HEX: 3ff +CONSTANT: FILE_FLAG_WRITE_THROUGH 0x80000000 +CONSTANT: FILE_FLAG_OVERLAPPED 0x40000000 +CONSTANT: FILE_FLAG_NO_BUFFERING 0x20000000 +CONSTANT: FILE_FLAG_RANDOM_ACCESS 0x10000000 +CONSTANT: FILE_FLAG_SEQUENTIAL_SCAN 0x08000000 +CONSTANT: FILE_FLAG_DELETE_ON_CLOSE 0x04000000 +CONSTANT: FILE_FLAG_BACKUP_SEMANTICS 0x02000000 +CONSTANT: FILE_FLAG_POSIX_SEMANTICS 0x01000000 +CONSTANT: FILE_FLAG_OPEN_REPARSE_POINT 0x00200000 +CONSTANT: FILE_FLAG_OPEN_NO_RECALL 0x00100000 +CONSTANT: FILE_FLAG_FIRST_PIPE_INSTANCE 0x00080000 + +CONSTANT: FILE_ATTRIBUTE_READONLY 0x00000001 +CONSTANT: FILE_ATTRIBUTE_HIDDEN 0x00000002 +CONSTANT: FILE_ATTRIBUTE_SYSTEM 0x00000004 +CONSTANT: FILE_ATTRIBUTE_DIRECTORY 0x00000010 +CONSTANT: FILE_ATTRIBUTE_ARCHIVE 0x00000020 +CONSTANT: FILE_ATTRIBUTE_DEVICE 0x00000040 +CONSTANT: FILE_ATTRIBUTE_NORMAL 0x00000080 +CONSTANT: FILE_ATTRIBUTE_TEMPORARY 0x00000100 +CONSTANT: FILE_ATTRIBUTE_SPARSE_FILE 0x00000200 +CONSTANT: FILE_ATTRIBUTE_REPARSE_POINT 0x00000400 +CONSTANT: FILE_ATTRIBUTE_COMPRESSED 0x00000800 +CONSTANT: FILE_ATTRIBUTE_OFFLINE 0x00001000 +CONSTANT: FILE_ATTRIBUTE_NOT_CONTENT_INDEXED 0x00002000 +CONSTANT: FILE_ATTRIBUTE_ENCRYPTED 0x00004000 + +CONSTANT: FILE_NOTIFY_CHANGE_FILE 0x001 +CONSTANT: FILE_NOTIFY_CHANGE_DIR_NAME 0x002 +CONSTANT: FILE_NOTIFY_CHANGE_ATTRIBUTES 0x004 +CONSTANT: FILE_NOTIFY_CHANGE_SIZE 0x008 +CONSTANT: FILE_NOTIFY_CHANGE_LAST_WRITE 0x010 +CONSTANT: FILE_NOTIFY_CHANGE_LAST_ACCESS 0x020 +CONSTANT: FILE_NOTIFY_CHANGE_CREATION 0x040 +CONSTANT: FILE_NOTIFY_CHANGE_EA 0x080 +CONSTANT: FILE_NOTIFY_CHANGE_SECURITY 0x100 +CONSTANT: FILE_NOTIFY_CHANGE_FILE_NAME 0x200 +CONSTANT: FILE_NOTIFY_CHANGE_ALL 0x3ff CONSTANT: FILE_ACTION_ADDED 1 CONSTANT: FILE_ACTION_REMOVED 2 @@ -105,8 +105,8 @@ CONSTANT: STD_OUTPUT_HANDLE -11 CONSTANT: STD_ERROR_HANDLE -12 : INVALID_HANDLE_VALUE ( -- alien ) -1 ; inline -CONSTANT: INVALID_FILE_SIZE HEX: FFFFFFFF -CONSTANT: INVALID_SET_FILE_POINTER HEX: ffffffff +CONSTANT: INVALID_FILE_SIZE 0xFFFFFFFF +CONSTANT: INVALID_SET_FILE_POINTER 0xffffffff CONSTANT: FILE_BEGIN 0 CONSTANT: FILE_CURRENT 1 @@ -129,19 +129,19 @@ CONSTANT: OF_PROMPT 8192 CONSTANT: OF_REOPEN 32768 CONSTANT: OF_VERIFY 1024 -CONSTANT: INFINITE HEX: FFFFFFFF +CONSTANT: INFINITE 0xFFFFFFFF ! From C:\cygwin\usr\include\w32api\winbase.h CONSTANT: FILE_TYPE_UNKNOWN 0 CONSTANT: FILE_TYPE_DISK 1 CONSTANT: FILE_TYPE_CHAR 2 CONSTANT: FILE_TYPE_PIPE 3 -CONSTANT: FILE_TYPE_REMOTE HEX: 8000 +CONSTANT: FILE_TYPE_REMOTE 0x8000 CONSTANT: TIME_ZONE_ID_UNKNOWN 0 CONSTANT: TIME_ZONE_ID_STANDARD 1 CONSTANT: TIME_ZONE_ID_DAYLIGHT 2 -CONSTANT: TIME_ZONE_ID_INVALID HEX: FFFFFFFF +CONSTANT: TIME_ZONE_ID_INVALID 0xFFFFFFFF CONSTANT: PF_XMMI64_INSTRUCTIONS_AVAILABLE 10 CONSTANT: PF_SSE3_INSTRUCTIONS_AVAILABLE 13 @@ -149,48 +149,48 @@ CONSTANT: PF_SSE3_INSTRUCTIONS_AVAILABLE 13 CONSTANT: MAX_COMPUTERNAME_LENGTH 15 CONSTANT: UNLEN 256 -CONSTANT: PROCESS_TERMINATE HEX: 1 -CONSTANT: PROCESS_CREATE_THREAD HEX: 2 -CONSTANT: PROCESS_VM_OPERATION HEX: 8 -CONSTANT: PROCESS_VM_READ HEX: 10 -CONSTANT: PROCESS_VM_WRITE HEX: 20 -CONSTANT: PROCESS_DUP_HANDLE HEX: 40 -CONSTANT: PROCESS_CREATE_PROCESS HEX: 80 -CONSTANT: PROCESS_SET_QUOTA HEX: 100 -CONSTANT: PROCESS_SET_INFORMATION HEX: 200 -CONSTANT: PROCESS_QUERY_INFORMATION HEX: 400 +CONSTANT: PROCESS_TERMINATE 0x1 +CONSTANT: PROCESS_CREATE_THREAD 0x2 +CONSTANT: PROCESS_VM_OPERATION 0x8 +CONSTANT: PROCESS_VM_READ 0x10 +CONSTANT: PROCESS_VM_WRITE 0x20 +CONSTANT: PROCESS_DUP_HANDLE 0x40 +CONSTANT: PROCESS_CREATE_PROCESS 0x80 +CONSTANT: PROCESS_SET_QUOTA 0x100 +CONSTANT: PROCESS_SET_INFORMATION 0x200 +CONSTANT: PROCESS_QUERY_INFORMATION 0x400 -CONSTANT: MEM_COMMIT HEX: 1000 -CONSTANT: MEM_RELEASE HEX: 8000 +CONSTANT: MEM_COMMIT 0x1000 +CONSTANT: MEM_RELEASE 0x8000 CONSTANT: PAGE_NOACCESS 1 CONSTANT: PAGE_READONLY 2 CONSTANT: PAGE_READWRITE 4 CONSTANT: PAGE_WRITECOPY 8 -CONSTANT: PAGE_EXECUTE HEX: 10 -CONSTANT: PAGE_EXECUTE_READ HEX: 20 -CONSTANT: PAGE_EXECUTE_READWRITE HEX: 40 -CONSTANT: PAGE_EXECUTE_WRITECOPY HEX: 80 -CONSTANT: PAGE_GUARD HEX: 100 -CONSTANT: PAGE_NOCACHE HEX: 200 - -CONSTANT: SEC_BASED HEX: 00200000 -CONSTANT: SEC_NO_CHANGE HEX: 00400000 -CONSTANT: SEC_FILE HEX: 00800000 -CONSTANT: SEC_IMAGE HEX: 01000000 -CONSTANT: SEC_VLM HEX: 02000000 -CONSTANT: SEC_RESERVE HEX: 04000000 -CONSTANT: SEC_COMMIT HEX: 08000000 -CONSTANT: SEC_NOCACHE HEX: 10000000 +CONSTANT: PAGE_EXECUTE 0x10 +CONSTANT: PAGE_EXECUTE_READ 0x20 +CONSTANT: PAGE_EXECUTE_READWRITE 0x40 +CONSTANT: PAGE_EXECUTE_WRITECOPY 0x80 +CONSTANT: PAGE_GUARD 0x100 +CONSTANT: PAGE_NOCACHE 0x200 + +CONSTANT: SEC_BASED 0x00200000 +CONSTANT: SEC_NO_CHANGE 0x00400000 +CONSTANT: SEC_FILE 0x00800000 +CONSTANT: SEC_IMAGE 0x01000000 +CONSTANT: SEC_VLM 0x02000000 +CONSTANT: SEC_RESERVE 0x04000000 +CONSTANT: SEC_COMMIT 0x08000000 +CONSTANT: SEC_NOCACHE 0x10000000 ALIAS: MEM_IMAGE SEC_IMAGE -CONSTANT: FILE_MAP_ALL_ACCESS HEX: f001f +CONSTANT: FILE_MAP_ALL_ACCESS 0xf001f CONSTANT: FILE_MAP_READ 4 CONSTANT: FILE_MAP_WRITE 2 CONSTANT: FILE_MAP_COPY 1 -CONSTANT: THREAD_MODE_BACKGROUND_BEGIN HEX: 10000 -CONSTANT: THREAD_MODE_BACKGROUND_END HEX: 20000 +CONSTANT: THREAD_MODE_BACKGROUND_BEGIN 0x10000 +CONSTANT: THREAD_MODE_BACKGROUND_END 0x20000 CONSTANT: THREAD_PRIORITY_ABOVE_NORMAL 1 CONSTANT: THREAD_PRIORITY_BELOW_NORMAL -1 CONSTANT: THREAD_PRIORITY_HIGHEST 2 @@ -349,57 +349,57 @@ STRUCT: GUID fDummy2 :17; */ -CONSTANT: SP_SERIALCOMM HEX: 1 -CONSTANT: BAUD_075 HEX: 1 -CONSTANT: BAUD_110 HEX: 2 -CONSTANT: BAUD_134_5 HEX: 4 -CONSTANT: BAUD_150 HEX: 8 -CONSTANT: BAUD_300 HEX: 10 -CONSTANT: BAUD_600 HEX: 20 -CONSTANT: BAUD_1200 HEX: 40 -CONSTANT: BAUD_1800 HEX: 80 -CONSTANT: BAUD_2400 HEX: 100 -CONSTANT: BAUD_4800 HEX: 200 -CONSTANT: BAUD_7200 HEX: 400 -CONSTANT: BAUD_9600 HEX: 800 -CONSTANT: BAUD_14400 HEX: 1000 -CONSTANT: BAUD_19200 HEX: 2000 -CONSTANT: BAUD_38400 HEX: 4000 -CONSTANT: BAUD_56K HEX: 8000 -CONSTANT: BAUD_57600 HEX: 40000 -CONSTANT: BAUD_115200 HEX: 20000 -CONSTANT: BAUD_128K HEX: 10000 -CONSTANT: BAUD_USER HEX: 10000000 -CONSTANT: PST_FAX HEX: 21 -CONSTANT: PST_LAT HEX: 101 -CONSTANT: PST_MODEM HEX: 6 -CONSTANT: PST_NETWORK_BRIDGE HEX: 100 -CONSTANT: PST_PARALLELPORT HEX: 2 -CONSTANT: PST_RS232 HEX: 1 -CONSTANT: PST_RS422 HEX: 3 -CONSTANT: PST_RS423 HEX: 4 -CONSTANT: PST_RS449 HEX: 5 -CONSTANT: PST_SCANNER HEX: 22 -CONSTANT: PST_TCPIP_TELNET HEX: 102 +CONSTANT: SP_SERIALCOMM 0x1 +CONSTANT: BAUD_075 0x1 +CONSTANT: BAUD_110 0x2 +CONSTANT: BAUD_134_5 0x4 +CONSTANT: BAUD_150 0x8 +CONSTANT: BAUD_300 0x10 +CONSTANT: BAUD_600 0x20 +CONSTANT: BAUD_1200 0x40 +CONSTANT: BAUD_1800 0x80 +CONSTANT: BAUD_2400 0x100 +CONSTANT: BAUD_4800 0x200 +CONSTANT: BAUD_7200 0x400 +CONSTANT: BAUD_9600 0x800 +CONSTANT: BAUD_14400 0x1000 +CONSTANT: BAUD_19200 0x2000 +CONSTANT: BAUD_38400 0x4000 +CONSTANT: BAUD_56K 0x8000 +CONSTANT: BAUD_57600 0x40000 +CONSTANT: BAUD_115200 0x20000 +CONSTANT: BAUD_128K 0x10000 +CONSTANT: BAUD_USER 0x10000000 +CONSTANT: PST_FAX 0x21 +CONSTANT: PST_LAT 0x101 +CONSTANT: PST_MODEM 0x6 +CONSTANT: PST_NETWORK_BRIDGE 0x100 +CONSTANT: PST_PARALLELPORT 0x2 +CONSTANT: PST_RS232 0x1 +CONSTANT: PST_RS422 0x3 +CONSTANT: PST_RS423 0x4 +CONSTANT: PST_RS449 0x5 +CONSTANT: PST_SCANNER 0x22 +CONSTANT: PST_TCPIP_TELNET 0x102 CONSTANT: PST_UNSPECIFIED 0 -CONSTANT: PST_X25 HEX: 103 -CONSTANT: PCF_16BITMODE HEX: 200 -CONSTANT: PCF_DTRDSR HEX: 1 -CONSTANT: PCF_INTTIMEOUTS HEX: 80 -CONSTANT: PCF_PARITY_CHECK HEX: 8 -CONSTANT: PCF_RLSD HEX: 4 -CONSTANT: PCF_RTSCTS HEX: 2 -CONSTANT: PCF_SETXCHAR HEX: 20 -CONSTANT: PCF_SPECIALCHARS HEX: 100 -CONSTANT: PCF_TOTALTIMEOUTS HEX: 40 -CONSTANT: PCF_XONXOFF HEX: 10 -CONSTANT: SP_BAUD HEX: 2 -CONSTANT: SP_DATABITS HEX: 4 -CONSTANT: SP_HANDSHAKING HEX: 10 -CONSTANT: SP_PARITY HEX: 1 -CONSTANT: SP_PARITY_CHECK HEX: 20 -CONSTANT: SP_RLSD HEX: 40 -CONSTANT: SP_STOPBITS HEX: 8 +CONSTANT: PST_X25 0x103 +CONSTANT: PCF_16BITMODE 0x200 +CONSTANT: PCF_DTRDSR 0x1 +CONSTANT: PCF_INTTIMEOUTS 0x80 +CONSTANT: PCF_PARITY_CHECK 0x8 +CONSTANT: PCF_RLSD 0x4 +CONSTANT: PCF_RTSCTS 0x2 +CONSTANT: PCF_SETXCHAR 0x20 +CONSTANT: PCF_SPECIALCHARS 0x100 +CONSTANT: PCF_TOTALTIMEOUTS 0x40 +CONSTANT: PCF_XONXOFF 0x10 +CONSTANT: SP_BAUD 0x2 +CONSTANT: SP_DATABITS 0x4 +CONSTANT: SP_HANDSHAKING 0x10 +CONSTANT: SP_PARITY 0x1 +CONSTANT: SP_PARITY_CHECK 0x20 +CONSTANT: SP_RLSD 0x40 +CONSTANT: SP_STOPBITS 0x8 CONSTANT: DATABITS_5 1 CONSTANT: DATABITS_6 2 CONSTANT: DATABITS_7 4 @@ -414,7 +414,7 @@ CONSTANT: PARITY_ODD 512 CONSTANT: PARITY_EVEN 1024 CONSTANT: PARITY_MARK 2048 CONSTANT: PARITY_SPACE 4096 -CONSTANT: COMMPROP_INITIALIZED HEX: e73cf52e +CONSTANT: COMMPROP_INITIALIZED 0xe73cf52e CONSTANT: CBR_110 110 CONSTANT: CBR_300 300 @@ -448,81 +448,81 @@ CONSTANT: ONE5STOPBITS 1 CONSTANT: TWOSTOPBITS 2 ! Flowcontrol bit mask in DCB -CONSTANT: FM_fBinary HEX: 1 -CONSTANT: FM_fParity HEX: 2 -CONSTANT: FM_fOutxCtsFlow HEX: 4 -CONSTANT: FM_fOutxDsrFlow HEX: 8 -CONSTANT: FM_fDtrControl HEX: 30 -CONSTANT: FM_fDsrSensitivity HEX: 40 -CONSTANT: FM_fTXContinueOnXoff HEX: 80 -CONSTANT: FM_fOutX HEX: 100 -CONSTANT: FM_fInX HEX: 200 -CONSTANT: FM_fErrorChar HEX: 400 -CONSTANT: FM_fNull HEX: 800 -CONSTANT: FM_fRtsControl HEX: 3000 -CONSTANT: FM_fAbortOnError HEX: 4000 -CONSTANT: FM_fDummy2 HEX: ffff8000 - -CONSTANT: BM_fCtsHold HEX: 1 -CONSTANT: BM_fDsrHold HEX: 2 -CONSTANT: BM_fRlsdHold HEX: 4 -CONSTANT: BM_fXoffHold HEX: 8 -CONSTANT: BM_fXoffSent HEX: 10 -CONSTANT: BM_fEof HEX: 20 -CONSTANT: BM_fTxim HEX: 40 -CONSTANT: BM_AllBits HEX: 7f +CONSTANT: FM_fBinary 0x1 +CONSTANT: FM_fParity 0x2 +CONSTANT: FM_fOutxCtsFlow 0x4 +CONSTANT: FM_fOutxDsrFlow 0x8 +CONSTANT: FM_fDtrControl 0x30 +CONSTANT: FM_fDsrSensitivity 0x40 +CONSTANT: FM_fTXContinueOnXoff 0x80 +CONSTANT: FM_fOutX 0x100 +CONSTANT: FM_fInX 0x200 +CONSTANT: FM_fErrorChar 0x400 +CONSTANT: FM_fNull 0x800 +CONSTANT: FM_fRtsControl 0x3000 +CONSTANT: FM_fAbortOnError 0x4000 +CONSTANT: FM_fDummy2 0xffff8000 + +CONSTANT: BM_fCtsHold 0x1 +CONSTANT: BM_fDsrHold 0x2 +CONSTANT: BM_fRlsdHold 0x4 +CONSTANT: BM_fXoffHold 0x8 +CONSTANT: BM_fXoffSent 0x10 +CONSTANT: BM_fEof 0x20 +CONSTANT: BM_fTxim 0x40 +CONSTANT: BM_AllBits 0x7f ! PurgeComm bit mask -CONSTANT: PURGE_TXABORT HEX: 1 -CONSTANT: PURGE_RXABORT HEX: 2 -CONSTANT: PURGE_TXCLEAR HEX: 4 -CONSTANT: PURGE_RXCLEAR HEX: 8 +CONSTANT: PURGE_TXABORT 0x1 +CONSTANT: PURGE_RXABORT 0x2 +CONSTANT: PURGE_TXCLEAR 0x4 +CONSTANT: PURGE_RXCLEAR 0x8 ! GetCommModemStatus bit mask -CONSTANT: MS_CTS_ON HEX: 10 -CONSTANT: MS_DSR_ON HEX: 20 -CONSTANT: MS_RING_ON HEX: 40 -CONSTANT: MS_RLSD_ON HEX: 80 +CONSTANT: MS_CTS_ON 0x10 +CONSTANT: MS_DSR_ON 0x20 +CONSTANT: MS_RING_ON 0x40 +CONSTANT: MS_RLSD_ON 0x80 ! EscapeCommFunction operations -CONSTANT: SETXOFF HEX: 1 -CONSTANT: SETXON HEX: 2 -CONSTANT: SETRTS HEX: 3 -CONSTANT: CLRRTS HEX: 4 -CONSTANT: SETDTR HEX: 5 -CONSTANT: CLRDTR HEX: 6 -CONSTANT: SETBREAK HEX: 8 -CONSTANT: CLRBREAK HEX: 9 +CONSTANT: SETXOFF 0x1 +CONSTANT: SETXON 0x2 +CONSTANT: SETRTS 0x3 +CONSTANT: CLRRTS 0x4 +CONSTANT: SETDTR 0x5 +CONSTANT: CLRDTR 0x6 +CONSTANT: SETBREAK 0x8 +CONSTANT: CLRBREAK 0x9 ! ClearCommError bit mask -CONSTANT: CE_RXOVER HEX: 1 -CONSTANT: CE_OVERRUN HEX: 2 -CONSTANT: CE_RXPARITY HEX: 4 -CONSTANT: CE_FRAME HEX: 8 -CONSTANT: CE_BREAK HEX: 10 -CONSTANT: CE_TXFULL HEX: 100 +CONSTANT: CE_RXOVER 0x1 +CONSTANT: CE_OVERRUN 0x2 +CONSTANT: CE_RXPARITY 0x4 +CONSTANT: CE_FRAME 0x8 +CONSTANT: CE_BREAK 0x10 +CONSTANT: CE_TXFULL 0x100 ! LPT only -CONSTANT: CE_PTO HEX: 200 -CONSTANT: CE_IOE HEX: 400 -CONSTANT: CE_DNS HEX: 800 -CONSTANT: CE_OOP HEX: 1000 +CONSTANT: CE_PTO 0x200 +CONSTANT: CE_IOE 0x400 +CONSTANT: CE_DNS 0x800 +CONSTANT: CE_OOP 0x1000 ! LPT only -CONSTANT: CE_MODE HEX: 8000 +CONSTANT: CE_MODE 0x8000 ! GetCommMask bits -CONSTANT: EV_RXCHAR HEX: 1 -CONSTANT: EV_RXFLAG HEX: 2 -CONSTANT: EV_TXEMPTY HEX: 4 -CONSTANT: EV_CTS HEX: 8 -CONSTANT: EV_DSR HEX: 10 -CONSTANT: EV_RLSD HEX: 20 -CONSTANT: EV_BREAK HEX: 40 -CONSTANT: EV_ERR HEX: 80 -CONSTANT: EV_RING HEX: 100 -CONSTANT: EV_PERR HEX: 200 -CONSTANT: EV_RX80FULL HEX: 400 -CONSTANT: EV_EVENT1 HEX: 800 -CONSTANT: EV_EVENT2 HEX: 1000 +CONSTANT: EV_RXCHAR 0x1 +CONSTANT: EV_RXFLAG 0x2 +CONSTANT: EV_TXEMPTY 0x4 +CONSTANT: EV_CTS 0x8 +CONSTANT: EV_DSR 0x10 +CONSTANT: EV_RLSD 0x20 +CONSTANT: EV_BREAK 0x40 +CONSTANT: EV_ERR 0x80 +CONSTANT: EV_RING 0x100 +CONSTANT: EV_PERR 0x200 +CONSTANT: EV_RX80FULL 0x400 +CONSTANT: EV_EVENT1 0x800 +CONSTANT: EV_EVENT2 0x1000 STRUCT: DCB { DCBlength DWORD } @@ -606,44 +606,44 @@ CONSTANT: SE_MANAGE_VOLUME_NAME "SeManageVolumePrivilege" CONSTANT: SE_IMPERSONATE_NAME "SeImpersonatePrivilege" CONSTANT: SE_CREATE_GLOBAL_NAME "SeCreateGlobalPrivilege" -CONSTANT: SE_GROUP_MANDATORY HEX: 00000001 -CONSTANT: SE_GROUP_ENABLED_BY_DEFAULT HEX: 00000002 -CONSTANT: SE_GROUP_ENABLED HEX: 00000004 -CONSTANT: SE_GROUP_OWNER HEX: 00000008 -CONSTANT: SE_GROUP_USE_FOR_DENY_ONLY HEX: 00000010 -CONSTANT: SE_GROUP_LOGON_ID HEX: C0000000 -CONSTANT: SE_GROUP_RESOURCE HEX: 20000000 +CONSTANT: SE_GROUP_MANDATORY 0x00000001 +CONSTANT: SE_GROUP_ENABLED_BY_DEFAULT 0x00000002 +CONSTANT: SE_GROUP_ENABLED 0x00000004 +CONSTANT: SE_GROUP_OWNER 0x00000008 +CONSTANT: SE_GROUP_USE_FOR_DENY_ONLY 0x00000010 +CONSTANT: SE_GROUP_LOGON_ID 0xC0000000 +CONSTANT: SE_GROUP_RESOURCE 0x20000000 -CONSTANT: SE_PRIVILEGE_ENABLED_BY_DEFAULT HEX: 00000001 -CONSTANT: SE_PRIVILEGE_ENABLED HEX: 00000002 -CONSTANT: SE_PRIVILEGE_REMOVE HEX: 00000004 -CONSTANT: SE_PRIVILEGE_USED_FOR_ACCESS HEX: 80000000 +CONSTANT: SE_PRIVILEGE_ENABLED_BY_DEFAULT 0x00000001 +CONSTANT: SE_PRIVILEGE_ENABLED 0x00000002 +CONSTANT: SE_PRIVILEGE_REMOVE 0x00000004 +CONSTANT: SE_PRIVILEGE_USED_FOR_ACCESS 0x80000000 CONSTANT: PRIVILEGE_SET_ALL_NECESSARY 1 -CONSTANT: SE_OWNER_DEFAULTED HEX: 00000001 -CONSTANT: SE_GROUP_DEFAULTED HEX: 00000002 -CONSTANT: SE_DACL_PRESENT HEX: 00000004 -CONSTANT: SE_DACL_DEFAULTED HEX: 00000008 -CONSTANT: SE_SACL_PRESENT HEX: 00000010 -CONSTANT: SE_SACL_DEFAULTED HEX: 00000020 -CONSTANT: SE_DACL_AUTO_INHERIT_REQ HEX: 00000100 -CONSTANT: SE_SACL_AUTO_INHERIT_REQ HEX: 00000200 -CONSTANT: SE_DACL_AUTO_INHERITED HEX: 00000400 -CONSTANT: SE_SACL_AUTO_INHERITED HEX: 00000800 -CONSTANT: SE_DACL_PROTECTED HEX: 00001000 -CONSTANT: SE_SACL_PROTECTED HEX: 00002000 -CONSTANT: SE_SELF_RELATIVE HEX: 00008000 +CONSTANT: SE_OWNER_DEFAULTED 0x00000001 +CONSTANT: SE_GROUP_DEFAULTED 0x00000002 +CONSTANT: SE_DACL_PRESENT 0x00000004 +CONSTANT: SE_DACL_DEFAULTED 0x00000008 +CONSTANT: SE_SACL_PRESENT 0x00000010 +CONSTANT: SE_SACL_DEFAULTED 0x00000020 +CONSTANT: SE_DACL_AUTO_INHERIT_REQ 0x00000100 +CONSTANT: SE_SACL_AUTO_INHERIT_REQ 0x00000200 +CONSTANT: SE_DACL_AUTO_INHERITED 0x00000400 +CONSTANT: SE_SACL_AUTO_INHERITED 0x00000800 +CONSTANT: SE_DACL_PROTECTED 0x00001000 +CONSTANT: SE_SACL_PROTECTED 0x00002000 +CONSTANT: SE_SELF_RELATIVE 0x00008000 CONSTANT: ANYSIZE_ARRAY 1 CONSTANT: MAXIMUM_WAIT_OBJECTS 64 -CONSTANT: MAXIMUM_SUSPEND_COUNT HEX: 7f +CONSTANT: MAXIMUM_SUSPEND_COUNT 0x7f CONSTANT: WAIT_OBJECT_0 0 CONSTANT: WAIT_ABANDONED_0 128 CONSTANT: WAIT_TIMEOUT 258 -CONSTANT: WAIT_IO_COMPLETION HEX: c0 -CONSTANT: WAIT_FAILED HEX: ffffffff +CONSTANT: WAIT_IO_COMPLETION 0xc0 +CONSTANT: WAIT_FAILED 0xffffffff STRUCT: LUID { LowPart DWORD } @@ -733,16 +733,16 @@ STRUCT: SECURITY_ATTRIBUTES CONSTANT: HANDLE_FLAG_INHERIT 1 CONSTANT: HANDLE_FLAG_PROTECT_FROM_CLOSE 2 -CONSTANT: STARTF_USESHOWWINDOW HEX: 00000001 -CONSTANT: STARTF_USESIZE HEX: 00000002 -CONSTANT: STARTF_USEPOSITION HEX: 00000004 -CONSTANT: STARTF_USECOUNTCHARS HEX: 00000008 -CONSTANT: STARTF_USEFILLATTRIBUTE HEX: 00000010 -CONSTANT: STARTF_RUNFULLSCREEN HEX: 00000020 -CONSTANT: STARTF_FORCEONFEEDBACK HEX: 00000040 -CONSTANT: STARTF_FORCEOFFFEEDBACK HEX: 00000080 -CONSTANT: STARTF_USESTDHANDLES HEX: 00000100 -CONSTANT: STARTF_USEHOTKEY HEX: 00000200 +CONSTANT: STARTF_USESHOWWINDOW 0x00000001 +CONSTANT: STARTF_USESIZE 0x00000002 +CONSTANT: STARTF_USEPOSITION 0x00000004 +CONSTANT: STARTF_USECOUNTCHARS 0x00000008 +CONSTANT: STARTF_USEFILLATTRIBUTE 0x00000010 +CONSTANT: STARTF_RUNFULLSCREEN 0x00000020 +CONSTANT: STARTF_FORCEONFEEDBACK 0x00000040 +CONSTANT: STARTF_FORCEOFFFEEDBACK 0x00000080 +CONSTANT: STARTF_USESTDHANDLES 0x00000100 +CONSTANT: STARTF_USEHOTKEY 0x00000200 CONSTANT: PIPE_ACCESS_INBOUND 1 CONSTANT: PIPE_ACCESS_OUTBOUND 2 @@ -759,36 +759,36 @@ CONSTANT: PIPE_NOWAIT 1 CONSTANT: PIPE_UNLIMITED_INSTANCES 255 -CONSTANT: EXCEPTION_NONCONTINUABLE HEX: 1 -CONSTANT: STATUS_GUARD_PAGE_VIOLATION HEX: 80000001 -CONSTANT: STATUS_DATATYPE_MISALIGNMENT HEX: 80000002 -CONSTANT: STATUS_BREAKPOINT HEX: 80000003 -CONSTANT: STATUS_SINGLE_STEP HEX: 80000004 -CONSTANT: STATUS_ACCESS_VIOLATION HEX: C0000005 -CONSTANT: STATUS_IN_PAGE_ERROR HEX: C0000006 -CONSTANT: STATUS_INVALID_HANDLE HEX: C0000008 -CONSTANT: STATUS_NO_MEMORY HEX: C0000017 -CONSTANT: STATUS_ILLEGAL_INSTRUCTION HEX: C000001D -CONSTANT: STATUS_NONCONTINUABLE_EXCEPTION HEX: C0000025 -CONSTANT: STATUS_INVALID_DISPOSITION HEX: C0000026 -CONSTANT: STATUS_ARRAY_BOUNDS_EXCEEDED HEX: C000008C -CONSTANT: STATUS_FLOAT_DENORMAL_OPERAND HEX: C000008D -CONSTANT: STATUS_FLOAT_DIVIDE_BY_ZERO HEX: C000008E -CONSTANT: STATUS_FLOAT_INEXACT_RESULT HEX: C000008F -CONSTANT: STATUS_FLOAT_INVALID_OPERATION HEX: C0000090 -CONSTANT: STATUS_FLOAT_OVERFLOW HEX: C0000091 -CONSTANT: STATUS_FLOAT_STACK_CHECK HEX: C0000092 -CONSTANT: STATUS_FLOAT_UNDERFLOW HEX: C0000093 -CONSTANT: STATUS_INTEGER_DIVIDE_BY_ZERO HEX: C0000094 -CONSTANT: STATUS_INTEGER_OVERFLOW HEX: C0000095 -CONSTANT: STATUS_PRIVILEGED_INSTRUCTION HEX: C0000096 -CONSTANT: STATUS_STACK_OVERFLOW HEX: C00000FD -CONSTANT: STATUS_CONTROL_C_EXIT HEX: C000013A -CONSTANT: STATUS_FLOAT_MULTIPLE_FAULTS HEX: C00002B4 -CONSTANT: STATUS_FLOAT_MULTIPLE_TRAPS HEX: C00002B5 +CONSTANT: EXCEPTION_NONCONTINUABLE 0x1 +CONSTANT: STATUS_GUARD_PAGE_VIOLATION 0x80000001 +CONSTANT: STATUS_DATATYPE_MISALIGNMENT 0x80000002 +CONSTANT: STATUS_BREAKPOINT 0x80000003 +CONSTANT: STATUS_SINGLE_STEP 0x80000004 +CONSTANT: STATUS_ACCESS_VIOLATION 0xC0000005 +CONSTANT: STATUS_IN_PAGE_ERROR 0xC0000006 +CONSTANT: STATUS_INVALID_HANDLE 0xC0000008 +CONSTANT: STATUS_NO_MEMORY 0xC0000017 +CONSTANT: STATUS_ILLEGAL_INSTRUCTION 0xC000001D +CONSTANT: STATUS_NONCONTINUABLE_EXCEPTION 0xC0000025 +CONSTANT: STATUS_INVALID_DISPOSITION 0xC0000026 +CONSTANT: STATUS_ARRAY_BOUNDS_EXCEEDED 0xC000008C +CONSTANT: STATUS_FLOAT_DENORMAL_OPERAND 0xC000008D +CONSTANT: STATUS_FLOAT_DIVIDE_BY_ZERO 0xC000008E +CONSTANT: STATUS_FLOAT_INEXACT_RESULT 0xC000008F +CONSTANT: STATUS_FLOAT_INVALID_OPERATION 0xC0000090 +CONSTANT: STATUS_FLOAT_OVERFLOW 0xC0000091 +CONSTANT: STATUS_FLOAT_STACK_CHECK 0xC0000092 +CONSTANT: STATUS_FLOAT_UNDERFLOW 0xC0000093 +CONSTANT: STATUS_INTEGER_DIVIDE_BY_ZERO 0xC0000094 +CONSTANT: STATUS_INTEGER_OVERFLOW 0xC0000095 +CONSTANT: STATUS_PRIVILEGED_INSTRUCTION 0xC0000096 +CONSTANT: STATUS_STACK_OVERFLOW 0xC00000FD +CONSTANT: STATUS_CONTROL_C_EXIT 0xC000013A +CONSTANT: STATUS_FLOAT_MULTIPLE_FAULTS 0xC00002B4 +CONSTANT: STATUS_FLOAT_MULTIPLE_TRAPS 0xC00002B5 ! Resource IDs -: MAKEINTRESOURCE ( int -- resource ) HEX: ffff bitand ; inline +: MAKEINTRESOURCE ( int -- resource ) 0xffff bitand ; inline : RT_CURSOR ( -- id ) 1 MAKEINTRESOURCE ; inline : RT_BITMAP ( -- id ) 2 MAKEINTRESOURCE ; inline @@ -935,29 +935,29 @@ ALIAS: CreateNamedPipe CreateNamedPipeW ! FUNCTION: CreateNlsSecurityDescriptor FUNCTION: BOOL CreatePipe ( PHANDLE hReadPipe, PHANDLE hWritePipe, LPSECURITY_ATTRIBUTES lpPipeAttributes, DWORD nSize ) ; -CONSTANT: DEBUG_PROCESS HEX: 00000001 -CONSTANT: DEBUG_ONLY_THIS_PROCESS HEX: 00000002 -CONSTANT: CREATE_SUSPENDED HEX: 00000004 -CONSTANT: DETACHED_PROCESS HEX: 00000008 -CONSTANT: CREATE_NEW_CONSOLE HEX: 00000010 -CONSTANT: NORMAL_PRIORITY_CLASS HEX: 00000020 -CONSTANT: IDLE_PRIORITY_CLASS HEX: 00000040 -CONSTANT: HIGH_PRIORITY_CLASS HEX: 00000080 -CONSTANT: REALTIME_PRIORITY_CLASS HEX: 00000100 -CONSTANT: CREATE_NEW_PROCESS_GROUP HEX: 00000200 -CONSTANT: CREATE_UNICODE_ENVIRONMENT HEX: 00000400 -CONSTANT: CREATE_SEPARATE_WOW_VDM HEX: 00000800 -CONSTANT: CREATE_SHARED_WOW_VDM HEX: 00001000 -CONSTANT: CREATE_FORCEDOS HEX: 00002000 -CONSTANT: BELOW_NORMAL_PRIORITY_CLASS HEX: 00004000 -CONSTANT: ABOVE_NORMAL_PRIORITY_CLASS HEX: 00008000 -CONSTANT: CREATE_BREAKAWAY_FROM_JOB HEX: 01000000 -CONSTANT: CREATE_WITH_USERPROFILE HEX: 02000000 -CONSTANT: CREATE_DEFAULT_ERROR_MODE HEX: 04000000 -CONSTANT: CREATE_NO_WINDOW HEX: 08000000 -CONSTANT: PROFILE_USER HEX: 10000000 -CONSTANT: PROFILE_KERNEL HEX: 20000000 -CONSTANT: PROFILE_SERVER HEX: 40000000 +CONSTANT: DEBUG_PROCESS 0x00000001 +CONSTANT: DEBUG_ONLY_THIS_PROCESS 0x00000002 +CONSTANT: CREATE_SUSPENDED 0x00000004 +CONSTANT: DETACHED_PROCESS 0x00000008 +CONSTANT: CREATE_NEW_CONSOLE 0x00000010 +CONSTANT: NORMAL_PRIORITY_CLASS 0x00000020 +CONSTANT: IDLE_PRIORITY_CLASS 0x00000040 +CONSTANT: HIGH_PRIORITY_CLASS 0x00000080 +CONSTANT: REALTIME_PRIORITY_CLASS 0x00000100 +CONSTANT: CREATE_NEW_PROCESS_GROUP 0x00000200 +CONSTANT: CREATE_UNICODE_ENVIRONMENT 0x00000400 +CONSTANT: CREATE_SEPARATE_WOW_VDM 0x00000800 +CONSTANT: CREATE_SHARED_WOW_VDM 0x00001000 +CONSTANT: CREATE_FORCEDOS 0x00002000 +CONSTANT: BELOW_NORMAL_PRIORITY_CLASS 0x00004000 +CONSTANT: ABOVE_NORMAL_PRIORITY_CLASS 0x00008000 +CONSTANT: CREATE_BREAKAWAY_FROM_JOB 0x01000000 +CONSTANT: CREATE_WITH_USERPROFILE 0x02000000 +CONSTANT: CREATE_DEFAULT_ERROR_MODE 0x04000000 +CONSTANT: CREATE_NO_WINDOW 0x08000000 +CONSTANT: PROFILE_USER 0x10000000 +CONSTANT: PROFILE_KERNEL 0x20000000 +CONSTANT: PROFILE_SERVER 0x40000000 FUNCTION: BOOL CreateProcessW ( LPCTSTR lpApplicationname, LPTSTR lpCommandLine, diff --git a/basis/windows/messages/messages.factor b/basis/windows/messages/messages.factor index 6fc400d841..b9c8fe9fd8 100644 --- a/basis/windows/messages/messages.factor +++ b/basis/windows/messages/messages.factor @@ -14,392 +14,392 @@ windows-messages set-global : windows-message-name ( n -- name ) windows-messages get at "unknown message" or ; -CONSTANT: WM_NULL HEX: 0000 -CONSTANT: WM_CREATE HEX: 0001 -CONSTANT: WM_DESTROY HEX: 0002 -CONSTANT: WM_MOVE HEX: 0003 -CONSTANT: WM_SIZE HEX: 0005 -CONSTANT: WM_ACTIVATE HEX: 0006 -CONSTANT: WM_SETFOCUS HEX: 0007 -CONSTANT: WM_KILLFOCUS HEX: 0008 -CONSTANT: WM_ENABLE HEX: 000A -CONSTANT: WM_SETREDRAW HEX: 000B -CONSTANT: WM_SETTEXT HEX: 000C -CONSTANT: WM_GETTEXT HEX: 000D -CONSTANT: WM_GETTEXTLENGTH HEX: 000E -CONSTANT: WM_PAINT HEX: 000F -CONSTANT: WM_CLOSE HEX: 0010 -CONSTANT: WM_QUERYENDSESSION HEX: 0011 -CONSTANT: WM_QUERYOPEN HEX: 0013 -CONSTANT: WM_ENDSESSION HEX: 0016 -CONSTANT: WM_QUIT HEX: 0012 -CONSTANT: WM_ERASEBKGND HEX: 0014 -CONSTANT: WM_SYSCOLORCHANGE HEX: 0015 -CONSTANT: WM_SHOWWINDOW HEX: 0018 -CONSTANT: WM_WININICHANGE HEX: 001A -CONSTANT: WM_SETTINGCHANGE HEX: 001A -CONSTANT: WM_DEVMODECHANGE HEX: 001B -CONSTANT: WM_ACTIVATEAPP HEX: 001C -CONSTANT: WM_FONTCHANGE HEX: 001D -CONSTANT: WM_TIMECHANGE HEX: 001E -CONSTANT: WM_CANCELMODE HEX: 001F -CONSTANT: WM_SETCURSOR HEX: 0020 -CONSTANT: WM_MOUSEACTIVATE HEX: 0021 -CONSTANT: WM_CHILDACTIVATE HEX: 0022 -CONSTANT: WM_QUEUESYNC HEX: 0023 -CONSTANT: WM_GETMINMAXINFO HEX: 0024 -CONSTANT: WM_PAINTICON HEX: 0026 -CONSTANT: WM_ICONERASEBKGND HEX: 0027 -CONSTANT: WM_NEXTDLGCTL HEX: 0028 -CONSTANT: WM_SPOOLERSTATUS HEX: 002A -CONSTANT: WM_DRAWITEM HEX: 002B -CONSTANT: WM_MEASUREITEM HEX: 002C -CONSTANT: WM_DELETEITEM HEX: 002D -CONSTANT: WM_VKEYTOITEM HEX: 002E -CONSTANT: WM_CHARTOITEM HEX: 002F -CONSTANT: WM_SETFONT HEX: 0030 -CONSTANT: WM_GETFONT HEX: 0031 -CONSTANT: WM_SETHOTKEY HEX: 0032 -CONSTANT: WM_GETHOTKEY HEX: 0033 -CONSTANT: WM_QUERYDRAGICON HEX: 0037 -CONSTANT: WM_COMPAREITEM HEX: 0039 -CONSTANT: WM_GETOBJECT HEX: 003D -CONSTANT: WM_COMPACTING HEX: 0041 -CONSTANT: WM_COMMNOTIFY HEX: 0044 -CONSTANT: WM_WINDOWPOSCHANGING HEX: 0046 -CONSTANT: WM_WINDOWPOSCHANGED HEX: 0047 -CONSTANT: WM_POWER HEX: 0048 -CONSTANT: WM_COPYDATA HEX: 004A -CONSTANT: WM_CANCELJOURNAL HEX: 004B -CONSTANT: WM_NOTIFY HEX: 004E -CONSTANT: WM_INPUTLANGCHANGEREQUEST HEX: 0050 -CONSTANT: WM_INPUTLANGCHANGE HEX: 0051 -CONSTANT: WM_TCARD HEX: 0052 -CONSTANT: WM_HELP HEX: 0053 -CONSTANT: WM_USERCHANGED HEX: 0054 -CONSTANT: WM_NOTIFYFORMAT HEX: 0055 -CONSTANT: WM_CONTEXTMENU HEX: 007B -CONSTANT: WM_STYLECHANGING HEX: 007C -CONSTANT: WM_STYLECHANGED HEX: 007D -CONSTANT: WM_DISPLAYCHANGE HEX: 007E -CONSTANT: WM_GETICON HEX: 007F -CONSTANT: WM_SETICON HEX: 0080 -CONSTANT: WM_NCCREATE HEX: 0081 -CONSTANT: WM_NCDESTROY HEX: 0082 -CONSTANT: WM_NCCALCSIZE HEX: 0083 -CONSTANT: WM_NCHITTEST HEX: 0084 -CONSTANT: WM_NCPAINT HEX: 0085 -CONSTANT: WM_NCACTIVATE HEX: 0086 -CONSTANT: WM_GETDLGCODE HEX: 0087 -CONSTANT: WM_SYNCPAINT HEX: 0088 -CONSTANT: WM_NCMOUSEMOVE HEX: 00A0 -CONSTANT: WM_NCLBUTTONDOWN HEX: 00A1 -CONSTANT: WM_NCLBUTTONUP HEX: 00A2 -CONSTANT: WM_NCLBUTTONDBLCLK HEX: 00A3 -CONSTANT: WM_NCRBUTTONDOWN HEX: 00A4 -CONSTANT: WM_NCRBUTTONUP HEX: 00A5 -CONSTANT: WM_NCRBUTTONDBLCLK HEX: 00A6 -CONSTANT: WM_NCMBUTTONDOWN HEX: 00A7 -CONSTANT: WM_NCMBUTTONUP HEX: 00A8 -CONSTANT: WM_NCMBUTTONDBLCLK HEX: 00A9 -CONSTANT: WM_NCXBUTTONDOWN HEX: 00AB -CONSTANT: WM_NCXBUTTONUP HEX: 00AC -CONSTANT: WM_NCXBUTTONDBLCLK HEX: 00AD -CONSTANT: WM_NCUAHDRAWCAPTION HEX: 00AE ! undocumented -CONSTANT: WM_NCUAHDRAWFRAME HEX: 00AF ! undocumented -CONSTANT: WM_INPUT HEX: 00FF -CONSTANT: WM_KEYFIRST HEX: 0100 -CONSTANT: WM_KEYDOWN HEX: 0100 -CONSTANT: WM_KEYUP HEX: 0101 -CONSTANT: WM_CHAR HEX: 0102 -CONSTANT: WM_DEADCHAR HEX: 0103 -CONSTANT: WM_SYSKEYDOWN HEX: 0104 -CONSTANT: WM_SYSKEYUP HEX: 0105 -CONSTANT: WM_SYSCHAR HEX: 0106 -CONSTANT: WM_SYSDEADCHAR HEX: 0107 -CONSTANT: WM_UNICHAR HEX: 0109 -CONSTANT: WM_KEYLAST_NT501 HEX: 0109 -CONSTANT: UNICODE_NOCHAR HEX: FFFF -CONSTANT: WM_KEYLAST_PRE501 HEX: 0108 -CONSTANT: WM_IME_STARTCOMPOSITION HEX: 010D -CONSTANT: WM_IME_ENDCOMPOSITION HEX: 010E -CONSTANT: WM_IME_COMPOSITION HEX: 010F -CONSTANT: WM_IME_KEYLAST HEX: 010F -CONSTANT: WM_INITDIALOG HEX: 0110 -CONSTANT: WM_COMMAND HEX: 0111 -CONSTANT: WM_SYSCOMMAND HEX: 0112 -CONSTANT: WM_TIMER HEX: 0113 -CONSTANT: WM_HSCROLL HEX: 0114 -CONSTANT: WM_VSCROLL HEX: 0115 -CONSTANT: WM_INITMENU HEX: 0116 -CONSTANT: WM_INITMENUPOPUP HEX: 0117 -CONSTANT: WM_MENUSELECT HEX: 011F -CONSTANT: WM_MENUCHAR HEX: 0120 -CONSTANT: WM_ENTERIDLE HEX: 0121 -CONSTANT: WM_MENURBUTTONUP HEX: 0122 -CONSTANT: WM_MENUDRAG HEX: 0123 -CONSTANT: WM_MENUGETOBJECT HEX: 0124 -CONSTANT: WM_UNINITMENUPOPUP HEX: 0125 -CONSTANT: WM_MENUCOMMAND HEX: 0126 -CONSTANT: WM_CHANGEUISTATE HEX: 0127 -CONSTANT: WM_UPDATEUISTATE HEX: 0128 -CONSTANT: WM_QUERYUISTATE HEX: 0129 -CONSTANT: WM_CTLCOLORMSGBOX HEX: 0132 -CONSTANT: WM_CTLCOLOREDIT HEX: 0133 -CONSTANT: WM_CTLCOLORLISTBOX HEX: 0134 -CONSTANT: WM_CTLCOLORBTN HEX: 0135 -CONSTANT: WM_CTLCOLORDLG HEX: 0136 -CONSTANT: WM_CTLCOLORSCROLLBAR HEX: 0137 -CONSTANT: WM_CTLCOLORSTATIC HEX: 0138 -CONSTANT: WM_MOUSEFIRST HEX: 0200 -CONSTANT: WM_MOUSEMOVE HEX: 0200 -CONSTANT: WM_LBUTTONDOWN HEX: 0201 -CONSTANT: WM_LBUTTONUP HEX: 0202 -CONSTANT: WM_LBUTTONDBLCLK HEX: 0203 -CONSTANT: WM_RBUTTONDOWN HEX: 0204 -CONSTANT: WM_RBUTTONUP HEX: 0205 -CONSTANT: WM_RBUTTONDBLCLK HEX: 0206 -CONSTANT: WM_MBUTTONDOWN HEX: 0207 -CONSTANT: WM_MBUTTONUP HEX: 0208 -CONSTANT: WM_MBUTTONDBLCLK HEX: 0209 -CONSTANT: WM_MOUSEWHEEL HEX: 020A -CONSTANT: WM_XBUTTONDOWN HEX: 020B -CONSTANT: WM_XBUTTONUP HEX: 020C -CONSTANT: WM_XBUTTONDBLCLK HEX: 020D -CONSTANT: WM_MOUSELAST_5 HEX: 020D -CONSTANT: WM_MOUSELAST_4 HEX: 020A -CONSTANT: WM_MOUSELAST_PRE_4 HEX: 0209 -CONSTANT: WM_PARENTNOTIFY HEX: 0210 -CONSTANT: WM_ENTERMENULOOP HEX: 0211 -CONSTANT: WM_EXITMENULOOP HEX: 0212 -CONSTANT: WM_NEXTMENU HEX: 0213 -CONSTANT: WM_SIZING HEX: 0214 -CONSTANT: WM_CAPTURECHANGED HEX: 0215 -CONSTANT: WM_MOVING HEX: 0216 -CONSTANT: WM_POWERBROADCAST HEX: 0218 -CONSTANT: WM_DEVICECHANGE HEX: 0219 -CONSTANT: WM_MDICREATE HEX: 0220 -CONSTANT: WM_MDIDESTROY HEX: 0221 -CONSTANT: WM_MDIACTIVATE HEX: 0222 -CONSTANT: WM_MDIRESTORE HEX: 0223 -CONSTANT: WM_MDINEXT HEX: 0224 -CONSTANT: WM_MDIMAXIMIZE HEX: 0225 -CONSTANT: WM_MDITILE HEX: 0226 -CONSTANT: WM_MDICASCADE HEX: 0227 -CONSTANT: WM_MDIICONARRANGE HEX: 0228 -CONSTANT: WM_MDIGETACTIVE HEX: 0229 -CONSTANT: WM_MDISETMENU HEX: 0230 -CONSTANT: WM_ENTERSIZEMOVE HEX: 0231 -CONSTANT: WM_EXITSIZEMOVE HEX: 0232 -CONSTANT: WM_DROPFILES HEX: 0233 -CONSTANT: WM_MDIREFRESHMENU HEX: 0234 -CONSTANT: WM_IME_SETCONTEXT HEX: 0281 -CONSTANT: WM_IME_NOTIFY HEX: 0282 -CONSTANT: WM_IME_CONTROL HEX: 0283 -CONSTANT: WM_IME_COMPOSITIONFULL HEX: 0284 -CONSTANT: WM_IME_SELECT HEX: 0285 -CONSTANT: WM_IME_CHAR HEX: 0286 -CONSTANT: WM_IME_REQUEST HEX: 0288 -CONSTANT: WM_IME_KEYDOWN HEX: 0290 -CONSTANT: WM_IME_KEYUP HEX: 0291 -CONSTANT: WM_MOUSEHOVER HEX: 02A1 -CONSTANT: WM_MOUSELEAVE HEX: 02A3 -CONSTANT: WM_NCMOUSEHOVER HEX: 02A0 -CONSTANT: WM_NCMOUSELEAVE HEX: 02A2 -CONSTANT: WM_WTSSESSION_CHANGE HEX: 02B1 -CONSTANT: WM_TABLET_FIRST HEX: 02c0 -CONSTANT: WM_TABLET_LAST HEX: 02df -CONSTANT: WM_CUT HEX: 0300 -CONSTANT: WM_COPY HEX: 0301 -CONSTANT: WM_PASTE HEX: 0302 -CONSTANT: WM_CLEAR HEX: 0303 -CONSTANT: WM_UNDO HEX: 0304 -CONSTANT: WM_RENDERFORMAT HEX: 0305 -CONSTANT: WM_RENDERALLFORMATS HEX: 0306 -CONSTANT: WM_DESTROYCLIPBOARD HEX: 0307 -CONSTANT: WM_DRAWCLIPBOARD HEX: 0308 -CONSTANT: WM_PAINTCLIPBOARD HEX: 0309 -CONSTANT: WM_VSCROLLCLIPBOARD HEX: 030A -CONSTANT: WM_SIZECLIPBOARD HEX: 030B -CONSTANT: WM_ASKCBFORMATNAME HEX: 030C -CONSTANT: WM_CHANGECBCHAIN HEX: 030D -CONSTANT: WM_HSCROLLCLIPBOARD HEX: 030E -CONSTANT: WM_QUERYNEWPALETTE HEX: 030F -CONSTANT: WM_PALETTEISCHANGING HEX: 0310 -CONSTANT: WM_PALETTECHANGED HEX: 0311 -CONSTANT: WM_HOTKEY HEX: 0312 -CONSTANT: WM_PRINT HEX: 0317 -CONSTANT: WM_PRINTCLIENT HEX: 0318 -CONSTANT: WM_APPCOMMAND HEX: 0319 -CONSTANT: WM_THEMECHANGED HEX: 031A -CONSTANT: WM_HANDHELDFIRST HEX: 0358 -CONSTANT: WM_HANDHELDLAST HEX: 035F -CONSTANT: WM_AFXFIRST HEX: 0360 -CONSTANT: WM_AFXLAST HEX: 037F -CONSTANT: WM_PENWINFIRST HEX: 0380 -CONSTANT: WM_PENWINLAST HEX: 038F -CONSTANT: WM_APP HEX: 8000 -CONSTANT: WM_USER HEX: 0400 -CONSTANT: EM_GETSEL HEX: 00B0 -CONSTANT: EM_SETSEL HEX: 00B1 -CONSTANT: EM_GETRECT HEX: 00B2 -CONSTANT: EM_SETRECT HEX: 00B3 -CONSTANT: EM_SETRECTNP HEX: 00B4 -CONSTANT: EM_SCROLL HEX: 00B5 -CONSTANT: EM_LINESCROLL HEX: 00B6 -CONSTANT: EM_SCROLLCARET HEX: 00B7 -CONSTANT: EM_GETMODIFY HEX: 00B8 -CONSTANT: EM_SETMODIFY HEX: 00B9 -CONSTANT: EM_GETLINECOUNT HEX: 00BA -CONSTANT: EM_LINEINDEX HEX: 00BB -CONSTANT: EM_SETHANDLE HEX: 00BC -CONSTANT: EM_GETHANDLE HEX: 00BD -CONSTANT: EM_GETTHUMB HEX: 00BE -CONSTANT: EM_LINELENGTH HEX: 00C1 -CONSTANT: EM_REPLACESEL HEX: 00C2 -CONSTANT: EM_GETLINE HEX: 00C4 -CONSTANT: EM_LIMITTEXT HEX: 00C5 -CONSTANT: EM_CANUNDO HEX: 00C6 -CONSTANT: EM_UNDO HEX: 00C7 -CONSTANT: EM_FMTLINES HEX: 00C8 -CONSTANT: EM_LINEFROMCHAR HEX: 00C9 -CONSTANT: EM_SETTABSTOPS HEX: 00CB -CONSTANT: EM_SETPASSWORDCHAR HEX: 00CC -CONSTANT: EM_EMPTYUNDOBUFFER HEX: 00CD -CONSTANT: EM_GETFIRSTVISIBLELINE HEX: 00CE -CONSTANT: EM_SETREADONLY HEX: 00CF -CONSTANT: EM_SETWORDBREAKPROC HEX: 00D0 -CONSTANT: EM_GETWORDBREAKPROC HEX: 00D1 -CONSTANT: EM_GETPASSWORDCHAR HEX: 00D2 -CONSTANT: EM_SETMARGINS HEX: 00D3 -CONSTANT: EM_GETMARGINS HEX: 00D4 +CONSTANT: WM_NULL 0x0000 +CONSTANT: WM_CREATE 0x0001 +CONSTANT: WM_DESTROY 0x0002 +CONSTANT: WM_MOVE 0x0003 +CONSTANT: WM_SIZE 0x0005 +CONSTANT: WM_ACTIVATE 0x0006 +CONSTANT: WM_SETFOCUS 0x0007 +CONSTANT: WM_KILLFOCUS 0x0008 +CONSTANT: WM_ENABLE 0x000A +CONSTANT: WM_SETREDRAW 0x000B +CONSTANT: WM_SETTEXT 0x000C +CONSTANT: WM_GETTEXT 0x000D +CONSTANT: WM_GETTEXTLENGTH 0x000E +CONSTANT: WM_PAINT 0x000F +CONSTANT: WM_CLOSE 0x0010 +CONSTANT: WM_QUERYENDSESSION 0x0011 +CONSTANT: WM_QUERYOPEN 0x0013 +CONSTANT: WM_ENDSESSION 0x0016 +CONSTANT: WM_QUIT 0x0012 +CONSTANT: WM_ERASEBKGND 0x0014 +CONSTANT: WM_SYSCOLORCHANGE 0x0015 +CONSTANT: WM_SHOWWINDOW 0x0018 +CONSTANT: WM_WININICHANGE 0x001A +CONSTANT: WM_SETTINGCHANGE 0x001A +CONSTANT: WM_DEVMODECHANGE 0x001B +CONSTANT: WM_ACTIVATEAPP 0x001C +CONSTANT: WM_FONTCHANGE 0x001D +CONSTANT: WM_TIMECHANGE 0x001E +CONSTANT: WM_CANCELMODE 0x001F +CONSTANT: WM_SETCURSOR 0x0020 +CONSTANT: WM_MOUSEACTIVATE 0x0021 +CONSTANT: WM_CHILDACTIVATE 0x0022 +CONSTANT: WM_QUEUESYNC 0x0023 +CONSTANT: WM_GETMINMAXINFO 0x0024 +CONSTANT: WM_PAINTICON 0x0026 +CONSTANT: WM_ICONERASEBKGND 0x0027 +CONSTANT: WM_NEXTDLGCTL 0x0028 +CONSTANT: WM_SPOOLERSTATUS 0x002A +CONSTANT: WM_DRAWITEM 0x002B +CONSTANT: WM_MEASUREITEM 0x002C +CONSTANT: WM_DELETEITEM 0x002D +CONSTANT: WM_VKEYTOITEM 0x002E +CONSTANT: WM_CHARTOITEM 0x002F +CONSTANT: WM_SETFONT 0x0030 +CONSTANT: WM_GETFONT 0x0031 +CONSTANT: WM_SETHOTKEY 0x0032 +CONSTANT: WM_GETHOTKEY 0x0033 +CONSTANT: WM_QUERYDRAGICON 0x0037 +CONSTANT: WM_COMPAREITEM 0x0039 +CONSTANT: WM_GETOBJECT 0x003D +CONSTANT: WM_COMPACTING 0x0041 +CONSTANT: WM_COMMNOTIFY 0x0044 +CONSTANT: WM_WINDOWPOSCHANGING 0x0046 +CONSTANT: WM_WINDOWPOSCHANGED 0x0047 +CONSTANT: WM_POWER 0x0048 +CONSTANT: WM_COPYDATA 0x004A +CONSTANT: WM_CANCELJOURNAL 0x004B +CONSTANT: WM_NOTIFY 0x004E +CONSTANT: WM_INPUTLANGCHANGEREQUEST 0x0050 +CONSTANT: WM_INPUTLANGCHANGE 0x0051 +CONSTANT: WM_TCARD 0x0052 +CONSTANT: WM_HELP 0x0053 +CONSTANT: WM_USERCHANGED 0x0054 +CONSTANT: WM_NOTIFYFORMAT 0x0055 +CONSTANT: WM_CONTEXTMENU 0x007B +CONSTANT: WM_STYLECHANGING 0x007C +CONSTANT: WM_STYLECHANGED 0x007D +CONSTANT: WM_DISPLAYCHANGE 0x007E +CONSTANT: WM_GETICON 0x007F +CONSTANT: WM_SETICON 0x0080 +CONSTANT: WM_NCCREATE 0x0081 +CONSTANT: WM_NCDESTROY 0x0082 +CONSTANT: WM_NCCALCSIZE 0x0083 +CONSTANT: WM_NCHITTEST 0x0084 +CONSTANT: WM_NCPAINT 0x0085 +CONSTANT: WM_NCACTIVATE 0x0086 +CONSTANT: WM_GETDLGCODE 0x0087 +CONSTANT: WM_SYNCPAINT 0x0088 +CONSTANT: WM_NCMOUSEMOVE 0x00A0 +CONSTANT: WM_NCLBUTTONDOWN 0x00A1 +CONSTANT: WM_NCLBUTTONUP 0x00A2 +CONSTANT: WM_NCLBUTTONDBLCLK 0x00A3 +CONSTANT: WM_NCRBUTTONDOWN 0x00A4 +CONSTANT: WM_NCRBUTTONUP 0x00A5 +CONSTANT: WM_NCRBUTTONDBLCLK 0x00A6 +CONSTANT: WM_NCMBUTTONDOWN 0x00A7 +CONSTANT: WM_NCMBUTTONUP 0x00A8 +CONSTANT: WM_NCMBUTTONDBLCLK 0x00A9 +CONSTANT: WM_NCXBUTTONDOWN 0x00AB +CONSTANT: WM_NCXBUTTONUP 0x00AC +CONSTANT: WM_NCXBUTTONDBLCLK 0x00AD +CONSTANT: WM_NCUAHDRAWCAPTION 0x00AE ! undocumented +CONSTANT: WM_NCUAHDRAWFRAME 0x00AF ! undocumented +CONSTANT: WM_INPUT 0x00FF +CONSTANT: WM_KEYFIRST 0x0100 +CONSTANT: WM_KEYDOWN 0x0100 +CONSTANT: WM_KEYUP 0x0101 +CONSTANT: WM_CHAR 0x0102 +CONSTANT: WM_DEADCHAR 0x0103 +CONSTANT: WM_SYSKEYDOWN 0x0104 +CONSTANT: WM_SYSKEYUP 0x0105 +CONSTANT: WM_SYSCHAR 0x0106 +CONSTANT: WM_SYSDEADCHAR 0x0107 +CONSTANT: WM_UNICHAR 0x0109 +CONSTANT: WM_KEYLAST_NT501 0x0109 +CONSTANT: UNICODE_NOCHAR 0xFFFF +CONSTANT: WM_KEYLAST_PRE501 0x0108 +CONSTANT: WM_IME_STARTCOMPOSITION 0x010D +CONSTANT: WM_IME_ENDCOMPOSITION 0x010E +CONSTANT: WM_IME_COMPOSITION 0x010F +CONSTANT: WM_IME_KEYLAST 0x010F +CONSTANT: WM_INITDIALOG 0x0110 +CONSTANT: WM_COMMAND 0x0111 +CONSTANT: WM_SYSCOMMAND 0x0112 +CONSTANT: WM_TIMER 0x0113 +CONSTANT: WM_HSCROLL 0x0114 +CONSTANT: WM_VSCROLL 0x0115 +CONSTANT: WM_INITMENU 0x0116 +CONSTANT: WM_INITMENUPOPUP 0x0117 +CONSTANT: WM_MENUSELECT 0x011F +CONSTANT: WM_MENUCHAR 0x0120 +CONSTANT: WM_ENTERIDLE 0x0121 +CONSTANT: WM_MENURBUTTONUP 0x0122 +CONSTANT: WM_MENUDRAG 0x0123 +CONSTANT: WM_MENUGETOBJECT 0x0124 +CONSTANT: WM_UNINITMENUPOPUP 0x0125 +CONSTANT: WM_MENUCOMMAND 0x0126 +CONSTANT: WM_CHANGEUISTATE 0x0127 +CONSTANT: WM_UPDATEUISTATE 0x0128 +CONSTANT: WM_QUERYUISTATE 0x0129 +CONSTANT: WM_CTLCOLORMSGBOX 0x0132 +CONSTANT: WM_CTLCOLOREDIT 0x0133 +CONSTANT: WM_CTLCOLORLISTBOX 0x0134 +CONSTANT: WM_CTLCOLORBTN 0x0135 +CONSTANT: WM_CTLCOLORDLG 0x0136 +CONSTANT: WM_CTLCOLORSCROLLBAR 0x0137 +CONSTANT: WM_CTLCOLORSTATIC 0x0138 +CONSTANT: WM_MOUSEFIRST 0x0200 +CONSTANT: WM_MOUSEMOVE 0x0200 +CONSTANT: WM_LBUTTONDOWN 0x0201 +CONSTANT: WM_LBUTTONUP 0x0202 +CONSTANT: WM_LBUTTONDBLCLK 0x0203 +CONSTANT: WM_RBUTTONDOWN 0x0204 +CONSTANT: WM_RBUTTONUP 0x0205 +CONSTANT: WM_RBUTTONDBLCLK 0x0206 +CONSTANT: WM_MBUTTONDOWN 0x0207 +CONSTANT: WM_MBUTTONUP 0x0208 +CONSTANT: WM_MBUTTONDBLCLK 0x0209 +CONSTANT: WM_MOUSEWHEEL 0x020A +CONSTANT: WM_XBUTTONDOWN 0x020B +CONSTANT: WM_XBUTTONUP 0x020C +CONSTANT: WM_XBUTTONDBLCLK 0x020D +CONSTANT: WM_MOUSELAST_5 0x020D +CONSTANT: WM_MOUSELAST_4 0x020A +CONSTANT: WM_MOUSELAST_PRE_4 0x0209 +CONSTANT: WM_PARENTNOTIFY 0x0210 +CONSTANT: WM_ENTERMENULOOP 0x0211 +CONSTANT: WM_EXITMENULOOP 0x0212 +CONSTANT: WM_NEXTMENU 0x0213 +CONSTANT: WM_SIZING 0x0214 +CONSTANT: WM_CAPTURECHANGED 0x0215 +CONSTANT: WM_MOVING 0x0216 +CONSTANT: WM_POWERBROADCAST 0x0218 +CONSTANT: WM_DEVICECHANGE 0x0219 +CONSTANT: WM_MDICREATE 0x0220 +CONSTANT: WM_MDIDESTROY 0x0221 +CONSTANT: WM_MDIACTIVATE 0x0222 +CONSTANT: WM_MDIRESTORE 0x0223 +CONSTANT: WM_MDINEXT 0x0224 +CONSTANT: WM_MDIMAXIMIZE 0x0225 +CONSTANT: WM_MDITILE 0x0226 +CONSTANT: WM_MDICASCADE 0x0227 +CONSTANT: WM_MDIICONARRANGE 0x0228 +CONSTANT: WM_MDIGETACTIVE 0x0229 +CONSTANT: WM_MDISETMENU 0x0230 +CONSTANT: WM_ENTERSIZEMOVE 0x0231 +CONSTANT: WM_EXITSIZEMOVE 0x0232 +CONSTANT: WM_DROPFILES 0x0233 +CONSTANT: WM_MDIREFRESHMENU 0x0234 +CONSTANT: WM_IME_SETCONTEXT 0x0281 +CONSTANT: WM_IME_NOTIFY 0x0282 +CONSTANT: WM_IME_CONTROL 0x0283 +CONSTANT: WM_IME_COMPOSITIONFULL 0x0284 +CONSTANT: WM_IME_SELECT 0x0285 +CONSTANT: WM_IME_CHAR 0x0286 +CONSTANT: WM_IME_REQUEST 0x0288 +CONSTANT: WM_IME_KEYDOWN 0x0290 +CONSTANT: WM_IME_KEYUP 0x0291 +CONSTANT: WM_MOUSEHOVER 0x02A1 +CONSTANT: WM_MOUSELEAVE 0x02A3 +CONSTANT: WM_NCMOUSEHOVER 0x02A0 +CONSTANT: WM_NCMOUSELEAVE 0x02A2 +CONSTANT: WM_WTSSESSION_CHANGE 0x02B1 +CONSTANT: WM_TABLET_FIRST 0x02c0 +CONSTANT: WM_TABLET_LAST 0x02df +CONSTANT: WM_CUT 0x0300 +CONSTANT: WM_COPY 0x0301 +CONSTANT: WM_PASTE 0x0302 +CONSTANT: WM_CLEAR 0x0303 +CONSTANT: WM_UNDO 0x0304 +CONSTANT: WM_RENDERFORMAT 0x0305 +CONSTANT: WM_RENDERALLFORMATS 0x0306 +CONSTANT: WM_DESTROYCLIPBOARD 0x0307 +CONSTANT: WM_DRAWCLIPBOARD 0x0308 +CONSTANT: WM_PAINTCLIPBOARD 0x0309 +CONSTANT: WM_VSCROLLCLIPBOARD 0x030A +CONSTANT: WM_SIZECLIPBOARD 0x030B +CONSTANT: WM_ASKCBFORMATNAME 0x030C +CONSTANT: WM_CHANGECBCHAIN 0x030D +CONSTANT: WM_HSCROLLCLIPBOARD 0x030E +CONSTANT: WM_QUERYNEWPALETTE 0x030F +CONSTANT: WM_PALETTEISCHANGING 0x0310 +CONSTANT: WM_PALETTECHANGED 0x0311 +CONSTANT: WM_HOTKEY 0x0312 +CONSTANT: WM_PRINT 0x0317 +CONSTANT: WM_PRINTCLIENT 0x0318 +CONSTANT: WM_APPCOMMAND 0x0319 +CONSTANT: WM_THEMECHANGED 0x031A +CONSTANT: WM_HANDHELDFIRST 0x0358 +CONSTANT: WM_HANDHELDLAST 0x035F +CONSTANT: WM_AFXFIRST 0x0360 +CONSTANT: WM_AFXLAST 0x037F +CONSTANT: WM_PENWINFIRST 0x0380 +CONSTANT: WM_PENWINLAST 0x038F +CONSTANT: WM_APP 0x8000 +CONSTANT: WM_USER 0x0400 +CONSTANT: EM_GETSEL 0x00B0 +CONSTANT: EM_SETSEL 0x00B1 +CONSTANT: EM_GETRECT 0x00B2 +CONSTANT: EM_SETRECT 0x00B3 +CONSTANT: EM_SETRECTNP 0x00B4 +CONSTANT: EM_SCROLL 0x00B5 +CONSTANT: EM_LINESCROLL 0x00B6 +CONSTANT: EM_SCROLLCARET 0x00B7 +CONSTANT: EM_GETMODIFY 0x00B8 +CONSTANT: EM_SETMODIFY 0x00B9 +CONSTANT: EM_GETLINECOUNT 0x00BA +CONSTANT: EM_LINEINDEX 0x00BB +CONSTANT: EM_SETHANDLE 0x00BC +CONSTANT: EM_GETHANDLE 0x00BD +CONSTANT: EM_GETTHUMB 0x00BE +CONSTANT: EM_LINELENGTH 0x00C1 +CONSTANT: EM_REPLACESEL 0x00C2 +CONSTANT: EM_GETLINE 0x00C4 +CONSTANT: EM_LIMITTEXT 0x00C5 +CONSTANT: EM_CANUNDO 0x00C6 +CONSTANT: EM_UNDO 0x00C7 +CONSTANT: EM_FMTLINES 0x00C8 +CONSTANT: EM_LINEFROMCHAR 0x00C9 +CONSTANT: EM_SETTABSTOPS 0x00CB +CONSTANT: EM_SETPASSWORDCHAR 0x00CC +CONSTANT: EM_EMPTYUNDOBUFFER 0x00CD +CONSTANT: EM_GETFIRSTVISIBLELINE 0x00CE +CONSTANT: EM_SETREADONLY 0x00CF +CONSTANT: EM_SETWORDBREAKPROC 0x00D0 +CONSTANT: EM_GETWORDBREAKPROC 0x00D1 +CONSTANT: EM_GETPASSWORDCHAR 0x00D2 +CONSTANT: EM_SETMARGINS 0x00D3 +CONSTANT: EM_GETMARGINS 0x00D4 ALIAS: EM_SETLIMITTEXT EM_LIMITTEXT -CONSTANT: EM_GETLIMITTEXT HEX: 00D5 -CONSTANT: EM_POSFROMCHAR HEX: 00D6 -CONSTANT: EM_CHARFROMPOS HEX: 00D7 -CONSTANT: EM_SETIMESTATUS HEX: 00D8 -CONSTANT: EM_GETIMESTATUS HEX: 00D9 -CONSTANT: BM_GETCHECK HEX: 00F0 -CONSTANT: BM_SETCHECK HEX: 00F1 -CONSTANT: BM_GETSTATE HEX: 00F2 -CONSTANT: BM_SETSTATE HEX: 00F3 -CONSTANT: BM_SETSTYLE HEX: 00F4 -CONSTANT: BM_CLICK HEX: 00F5 -CONSTANT: BM_GETIMAGE HEX: 00F6 -CONSTANT: BM_SETIMAGE HEX: 00F7 -CONSTANT: STM_SETICON HEX: 0170 -CONSTANT: STM_GETICON HEX: 0171 -CONSTANT: STM_SETIMAGE HEX: 0172 -CONSTANT: STM_GETIMAGE HEX: 0173 -CONSTANT: STM_MSGMAX HEX: 0174 +CONSTANT: EM_GETLIMITTEXT 0x00D5 +CONSTANT: EM_POSFROMCHAR 0x00D6 +CONSTANT: EM_CHARFROMPOS 0x00D7 +CONSTANT: EM_SETIMESTATUS 0x00D8 +CONSTANT: EM_GETIMESTATUS 0x00D9 +CONSTANT: BM_GETCHECK 0x00F0 +CONSTANT: BM_SETCHECK 0x00F1 +CONSTANT: BM_GETSTATE 0x00F2 +CONSTANT: BM_SETSTATE 0x00F3 +CONSTANT: BM_SETSTYLE 0x00F4 +CONSTANT: BM_CLICK 0x00F5 +CONSTANT: BM_GETIMAGE 0x00F6 +CONSTANT: BM_SETIMAGE 0x00F7 +CONSTANT: STM_SETICON 0x0170 +CONSTANT: STM_GETICON 0x0171 +CONSTANT: STM_SETIMAGE 0x0172 +CONSTANT: STM_GETIMAGE 0x0173 +CONSTANT: STM_MSGMAX 0x0174 CONSTANT: DM_GETDEFID WM_USER : DM_SETDEFID ( -- n ) WM_USER 1 + ; inline : DM_REPOSITION ( -- n ) WM_USER 2 + ; inline -CONSTANT: LB_ADDSTRING HEX: 0180 -CONSTANT: LB_INSERTSTRING HEX: 0181 -CONSTANT: LB_DELETESTRING HEX: 0182 -CONSTANT: LB_SELITEMRANGEEX HEX: 0183 -CONSTANT: LB_RESETCONTENT HEX: 0184 -CONSTANT: LB_SETSEL HEX: 0185 -CONSTANT: LB_SETCURSEL HEX: 0186 -CONSTANT: LB_GETSEL HEX: 0187 -CONSTANT: LB_GETCURSEL HEX: 0188 -CONSTANT: LB_GETTEXT HEX: 0189 -CONSTANT: LB_GETTEXTLEN HEX: 018A -CONSTANT: LB_GETCOUNT HEX: 018B -CONSTANT: LB_SELECTSTRING HEX: 018C -CONSTANT: LB_DIR HEX: 018D -CONSTANT: LB_GETTOPINDEX HEX: 018E -CONSTANT: LB_FINDSTRING HEX: 018F -CONSTANT: LB_GETSELCOUNT HEX: 0190 -CONSTANT: LB_GETSELITEMS HEX: 0191 -CONSTANT: LB_SETTABSTOPS HEX: 0192 -CONSTANT: LB_GETHORIZONTALEXTENT HEX: 0193 -CONSTANT: LB_SETHORIZONTALEXTENT HEX: 0194 -CONSTANT: LB_SETCOLUMNWIDTH HEX: 0195 -CONSTANT: LB_ADDFILE HEX: 0196 -CONSTANT: LB_SETTOPINDEX HEX: 0197 -CONSTANT: LB_GETITEMRECT HEX: 0198 -CONSTANT: LB_GETITEMDATA HEX: 0199 -CONSTANT: LB_SETITEMDATA HEX: 019A -CONSTANT: LB_SELITEMRANGE HEX: 019B -CONSTANT: LB_SETANCHORINDEX HEX: 019C -CONSTANT: LB_GETANCHORINDEX HEX: 019D -CONSTANT: LB_SETCARETINDEX HEX: 019E -CONSTANT: LB_GETCARETINDEX HEX: 019F -CONSTANT: LB_SETITEMHEIGHT HEX: 01A0 -CONSTANT: LB_GETITEMHEIGHT HEX: 01A1 -CONSTANT: LB_FINDSTRINGEXACT HEX: 01A2 -CONSTANT: LB_SETLOCALE HEX: 01A5 -CONSTANT: LB_GETLOCALE HEX: 01A6 -CONSTANT: LB_SETCOUNT HEX: 01A7 -CONSTANT: LB_INITSTORAGE HEX: 01A8 -CONSTANT: LB_ITEMFROMPOINT HEX: 01A9 -CONSTANT: LB_MULTIPLEADDSTRING HEX: 01B1 -CONSTANT: LB_GETLISTBOXINFO HEX: 01B2 -CONSTANT: LB_MSGMAX_501 HEX: 01B3 -CONSTANT: LB_MSGMAX_WCE4 HEX: 01B1 -CONSTANT: LB_MSGMAX_4 HEX: 01B0 -CONSTANT: LB_MSGMAX_PRE4 HEX: 01A8 -CONSTANT: CB_GETEDITSEL HEX: 0140 -CONSTANT: CB_LIMITTEXT HEX: 0141 -CONSTANT: CB_SETEDITSEL HEX: 0142 -CONSTANT: CB_ADDSTRING HEX: 0143 -CONSTANT: CB_DELETESTRING HEX: 0144 -CONSTANT: CB_DIR HEX: 0145 -CONSTANT: CB_GETCOUNT HEX: 0146 -CONSTANT: CB_GETCURSEL HEX: 0147 -CONSTANT: CB_GETLBTEXT HEX: 0148 -CONSTANT: CB_GETLBTEXTLEN HEX: 0149 -CONSTANT: CB_INSERTSTRING HEX: 014A -CONSTANT: CB_RESETCONTENT HEX: 014B -CONSTANT: CB_FINDSTRING HEX: 014C -CONSTANT: CB_SELECTSTRING HEX: 014D -CONSTANT: CB_SETCURSEL HEX: 014E -CONSTANT: CB_SHOWDROPDOWN HEX: 014F -CONSTANT: CB_GETITEMDATA HEX: 0150 -CONSTANT: CB_SETITEMDATA HEX: 0151 -CONSTANT: CB_GETDROPPEDCONTROLRECT HEX: 0152 -CONSTANT: CB_SETITEMHEIGHT HEX: 0153 -CONSTANT: CB_GETITEMHEIGHT HEX: 0154 -CONSTANT: CB_SETEXTENDEDUI HEX: 0155 -CONSTANT: CB_GETEXTENDEDUI HEX: 0156 -CONSTANT: CB_GETDROPPEDSTATE HEX: 0157 -CONSTANT: CB_FINDSTRINGEXACT HEX: 0158 -CONSTANT: CB_SETLOCALE HEX: 0159 -CONSTANT: CB_GETLOCALE HEX: 015A -CONSTANT: CB_GETTOPINDEX HEX: 015B -CONSTANT: CB_SETTOPINDEX HEX: 015C -CONSTANT: CB_GETHORIZONTALEXTENT HEX: 015d -CONSTANT: CB_SETHORIZONTALEXTENT HEX: 015e -CONSTANT: CB_GETDROPPEDWIDTH HEX: 015f -CONSTANT: CB_SETDROPPEDWIDTH HEX: 0160 -CONSTANT: CB_INITSTORAGE HEX: 0161 -CONSTANT: CB_MULTIPLEADDSTRING HEX: 0163 -CONSTANT: CB_GETCOMBOBOXINFO HEX: 0164 -CONSTANT: CB_MSGMAX_501 HEX: 0165 -CONSTANT: CB_MSGMAX_WCE400 HEX: 0163 -CONSTANT: CB_MSGMAX_400 HEX: 0162 -CONSTANT: CB_MSGMAX_PRE400 HEX: 015B -CONSTANT: SBM_SETPOS HEX: 00E0 -CONSTANT: SBM_GETPOS HEX: 00E1 -CONSTANT: SBM_SETRANGE HEX: 00E2 -CONSTANT: SBM_SETRANGEREDRAW HEX: 00E6 -CONSTANT: SBM_GETRANGE HEX: 00E3 -CONSTANT: SBM_ENABLE_ARROWS HEX: 00E4 -CONSTANT: SBM_SETSCROLLINFO HEX: 00E9 -CONSTANT: SBM_GETSCROLLINFO HEX: 00EA -CONSTANT: SBM_GETSCROLLBARINFO HEX: 00EB -CONSTANT: LVM_FIRST HEX: 1000 ! ListView messages -CONSTANT: TV_FIRST HEX: 1100 ! TreeView messages -CONSTANT: HDM_FIRST HEX: 1200 ! Header messages -CONSTANT: TCM_FIRST HEX: 1300 ! Tab control messages -CONSTANT: PGM_FIRST HEX: 1400 ! Pager control messages -CONSTANT: ECM_FIRST HEX: 1500 ! Edit control messages -CONSTANT: BCM_FIRST HEX: 1600 ! Button control messages -CONSTANT: CBM_FIRST HEX: 1700 ! Combobox control messages -CONSTANT: CCM_FIRST HEX: 2000 ! Common control shared messages -: CCM_LAST ( -- n ) CCM_FIRST HEX: 0200 + ; inline +CONSTANT: LB_ADDSTRING 0x0180 +CONSTANT: LB_INSERTSTRING 0x0181 +CONSTANT: LB_DELETESTRING 0x0182 +CONSTANT: LB_SELITEMRANGEEX 0x0183 +CONSTANT: LB_RESETCONTENT 0x0184 +CONSTANT: LB_SETSEL 0x0185 +CONSTANT: LB_SETCURSEL 0x0186 +CONSTANT: LB_GETSEL 0x0187 +CONSTANT: LB_GETCURSEL 0x0188 +CONSTANT: LB_GETTEXT 0x0189 +CONSTANT: LB_GETTEXTLEN 0x018A +CONSTANT: LB_GETCOUNT 0x018B +CONSTANT: LB_SELECTSTRING 0x018C +CONSTANT: LB_DIR 0x018D +CONSTANT: LB_GETTOPINDEX 0x018E +CONSTANT: LB_FINDSTRING 0x018F +CONSTANT: LB_GETSELCOUNT 0x0190 +CONSTANT: LB_GETSELITEMS 0x0191 +CONSTANT: LB_SETTABSTOPS 0x0192 +CONSTANT: LB_GETHORIZONTALEXTENT 0x0193 +CONSTANT: LB_SETHORIZONTALEXTENT 0x0194 +CONSTANT: LB_SETCOLUMNWIDTH 0x0195 +CONSTANT: LB_ADDFILE 0x0196 +CONSTANT: LB_SETTOPINDEX 0x0197 +CONSTANT: LB_GETITEMRECT 0x0198 +CONSTANT: LB_GETITEMDATA 0x0199 +CONSTANT: LB_SETITEMDATA 0x019A +CONSTANT: LB_SELITEMRANGE 0x019B +CONSTANT: LB_SETANCHORINDEX 0x019C +CONSTANT: LB_GETANCHORINDEX 0x019D +CONSTANT: LB_SETCARETINDEX 0x019E +CONSTANT: LB_GETCARETINDEX 0x019F +CONSTANT: LB_SETITEMHEIGHT 0x01A0 +CONSTANT: LB_GETITEMHEIGHT 0x01A1 +CONSTANT: LB_FINDSTRINGEXACT 0x01A2 +CONSTANT: LB_SETLOCALE 0x01A5 +CONSTANT: LB_GETLOCALE 0x01A6 +CONSTANT: LB_SETCOUNT 0x01A7 +CONSTANT: LB_INITSTORAGE 0x01A8 +CONSTANT: LB_ITEMFROMPOINT 0x01A9 +CONSTANT: LB_MULTIPLEADDSTRING 0x01B1 +CONSTANT: LB_GETLISTBOXINFO 0x01B2 +CONSTANT: LB_MSGMAX_501 0x01B3 +CONSTANT: LB_MSGMAX_WCE4 0x01B1 +CONSTANT: LB_MSGMAX_4 0x01B0 +CONSTANT: LB_MSGMAX_PRE4 0x01A8 +CONSTANT: CB_GETEDITSEL 0x0140 +CONSTANT: CB_LIMITTEXT 0x0141 +CONSTANT: CB_SETEDITSEL 0x0142 +CONSTANT: CB_ADDSTRING 0x0143 +CONSTANT: CB_DELETESTRING 0x0144 +CONSTANT: CB_DIR 0x0145 +CONSTANT: CB_GETCOUNT 0x0146 +CONSTANT: CB_GETCURSEL 0x0147 +CONSTANT: CB_GETLBTEXT 0x0148 +CONSTANT: CB_GETLBTEXTLEN 0x0149 +CONSTANT: CB_INSERTSTRING 0x014A +CONSTANT: CB_RESETCONTENT 0x014B +CONSTANT: CB_FINDSTRING 0x014C +CONSTANT: CB_SELECTSTRING 0x014D +CONSTANT: CB_SETCURSEL 0x014E +CONSTANT: CB_SHOWDROPDOWN 0x014F +CONSTANT: CB_GETITEMDATA 0x0150 +CONSTANT: CB_SETITEMDATA 0x0151 +CONSTANT: CB_GETDROPPEDCONTROLRECT 0x0152 +CONSTANT: CB_SETITEMHEIGHT 0x0153 +CONSTANT: CB_GETITEMHEIGHT 0x0154 +CONSTANT: CB_SETEXTENDEDUI 0x0155 +CONSTANT: CB_GETEXTENDEDUI 0x0156 +CONSTANT: CB_GETDROPPEDSTATE 0x0157 +CONSTANT: CB_FINDSTRINGEXACT 0x0158 +CONSTANT: CB_SETLOCALE 0x0159 +CONSTANT: CB_GETLOCALE 0x015A +CONSTANT: CB_GETTOPINDEX 0x015B +CONSTANT: CB_SETTOPINDEX 0x015C +CONSTANT: CB_GETHORIZONTALEXTENT 0x015d +CONSTANT: CB_SETHORIZONTALEXTENT 0x015e +CONSTANT: CB_GETDROPPEDWIDTH 0x015f +CONSTANT: CB_SETDROPPEDWIDTH 0x0160 +CONSTANT: CB_INITSTORAGE 0x0161 +CONSTANT: CB_MULTIPLEADDSTRING 0x0163 +CONSTANT: CB_GETCOMBOBOXINFO 0x0164 +CONSTANT: CB_MSGMAX_501 0x0165 +CONSTANT: CB_MSGMAX_WCE400 0x0163 +CONSTANT: CB_MSGMAX_400 0x0162 +CONSTANT: CB_MSGMAX_PRE400 0x015B +CONSTANT: SBM_SETPOS 0x00E0 +CONSTANT: SBM_GETPOS 0x00E1 +CONSTANT: SBM_SETRANGE 0x00E2 +CONSTANT: SBM_SETRANGEREDRAW 0x00E6 +CONSTANT: SBM_GETRANGE 0x00E3 +CONSTANT: SBM_ENABLE_ARROWS 0x00E4 +CONSTANT: SBM_SETSCROLLINFO 0x00E9 +CONSTANT: SBM_GETSCROLLINFO 0x00EA +CONSTANT: SBM_GETSCROLLBARINFO 0x00EB +CONSTANT: LVM_FIRST 0x1000 ! ListView messages +CONSTANT: TV_FIRST 0x1100 ! TreeView messages +CONSTANT: HDM_FIRST 0x1200 ! Header messages +CONSTANT: TCM_FIRST 0x1300 ! Tab control messages +CONSTANT: PGM_FIRST 0x1400 ! Pager control messages +CONSTANT: ECM_FIRST 0x1500 ! Edit control messages +CONSTANT: BCM_FIRST 0x1600 ! Button control messages +CONSTANT: CBM_FIRST 0x1700 ! Combobox control messages +CONSTANT: CCM_FIRST 0x2000 ! Common control shared messages +: CCM_LAST ( -- n ) CCM_FIRST 0x0200 + ; inline : CCM_SETBKCOLOR ( -- n ) CCM_FIRST 1 + ; inline : CCM_SETCOLORSCHEME ( -- n ) CCM_FIRST 2 + ; inline : CCM_GETCOLORSCHEME ( -- n ) CCM_FIRST 3 + ; inline @@ -409,8 +409,8 @@ CONSTANT: CCM_FIRST HEX: 2000 ! Common control shared messages : CCM_SETVERSION ( -- n ) CCM_FIRST 7 + ; inline : CCM_GETVERSION ( -- n ) CCM_FIRST 8 + ; inline : CCM_SETNOTIFYWINDOW ( -- n ) CCM_FIRST 9 + ; inline -: CCM_SETWINDOWTHEME ( -- n ) CCM_FIRST HEX: b + ; inline -: CCM_DPISCALE ( -- n ) CCM_FIRST HEX: c + ; inline +: CCM_SETWINDOWTHEME ( -- n ) CCM_FIRST 0xb + ; inline +: CCM_DPISCALE ( -- n ) CCM_FIRST 0xc + ; inline : HDM_GETITEMCOUNT ( -- n ) HDM_FIRST 0 + ; inline : HDM_INSERTITEMA ( -- n ) HDM_FIRST 1 + ; inline : HDM_INSERTITEMW ( -- n ) HDM_FIRST 10 + ; inline @@ -641,7 +641,7 @@ ALIAS: TTM_SETWINDOWTHEME CCM_SETWINDOWTHEME CONSTANT: SB_SETUNICODEFORMAT CCM_SETUNICODEFORMAT CONSTANT: SB_GETUNICODEFORMAT CCM_GETUNICODEFORMAT ALIAS: SB_SETBKCOLOR CCM_SETBKCOLOR -CONSTANT: SB_SIMPLEID HEX: 00ff +CONSTANT: SB_SIMPLEID 0x00ff ALIAS: TBM_GETPOS WM_USER : TBM_GETRANGEMIN ( -- n ) WM_USER 1 + ; inline : TBM_GETRANGEMAX ( -- n ) WM_USER 2 + ; inline @@ -937,7 +937,7 @@ ALIAS: TCM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT : ACM_OPENW ( -- n ) WM_USER 103 + ; inline : ACM_PLAY ( -- n ) WM_USER 101 + ; inline : ACM_STOP ( -- n ) WM_USER 102 + ; inline -CONSTANT: MCM_FIRST HEX: 1000 +CONSTANT: MCM_FIRST 0x1000 : MCM_GETCURSEL ( -- n ) MCM_FIRST 1 + ; inline : MCM_SETCURSEL ( -- n ) MCM_FIRST 2 + ; inline : MCM_GETMAXSELCOUNT ( -- n ) MCM_FIRST 3 + ; inline @@ -961,7 +961,7 @@ CONSTANT: MCM_FIRST HEX: 1000 : MCM_GETMAXTODAYWIDTH ( -- n ) MCM_FIRST 21 + ; inline ALIAS: MCM_SETUNICODEFORMAT CCM_SETUNICODEFORMAT ALIAS: MCM_GETUNICODEFORMAT CCM_GETUNICODEFORMAT -CONSTANT: DTM_FIRST HEX: 1000 +CONSTANT: DTM_FIRST 0x1000 : DTM_GETSYSTEMTIME ( -- n ) DTM_FIRST 1 + ; inline : DTM_SETSYSTEMTIME ( -- n ) DTM_FIRST 2 + ; inline : DTM_GETRANGE ( -- n ) DTM_FIRST 3 + ; inline @@ -997,10 +997,10 @@ CONSTANT: PGM_GETDROPTARGET CCM_GETDROPTARGET : EM_HIDEBALLOONTIP ( -- n ) ECM_FIRST 4 + ; inline : CB_SETMINVISIBLE ( -- n ) CBM_FIRST 1 + ; inline : CB_GETMINVISIBLE ( -- n ) CBM_FIRST 2 + ; inline -: LM_HITTEST ( -- n ) WM_USER HEX: 0300 + ; inline -: LM_GETIDEALHEIGHT ( -- n ) WM_USER HEX: 0301 + ; inline -: LM_SETITEM ( -- n ) WM_USER HEX: 0302 + ; inline -: LM_GETITEM ( -- n ) WM_USER HEX: 0303 + ; inline +: LM_HITTEST ( -- n ) WM_USER 0x0300 + ; inline +: LM_GETIDEALHEIGHT ( -- n ) WM_USER 0x0301 + ; inline +: LM_SETITEM ( -- n ) WM_USER 0x0302 + ; inline +: LM_GETITEM ( -- n ) WM_USER 0x0303 + ; inline @@ -1008,22 +1008,22 @@ CONSTANT: WA_INACTIVE 0 CONSTANT: WA_ACTIVE 1 CONSTANT: WA_CLICKACTIVE 2 -CONSTANT: SC_SIZE HEX: f000 -CONSTANT: SC_MOVE HEX: f010 -CONSTANT: SC_MINIMIZE HEX: f020 -CONSTANT: SC_MAXIMIZE HEX: f030 -CONSTANT: SC_NEXTWINDOW HEX: f040 -CONSTANT: SC_PREVWINDOW HEX: f050 -CONSTANT: SC_CLOSE HEX: f060 -CONSTANT: SC_VSCROLL HEX: f070 -CONSTANT: SC_HSCROLL HEX: f080 -CONSTANT: SC_MOUSEMENU HEX: f090 -CONSTANT: SC_KEYMENU HEX: f100 -CONSTANT: SC_ARRANGE HEX: f110 -CONSTANT: SC_RESTORE HEX: f120 -CONSTANT: SC_TASKLIST HEX: f130 -CONSTANT: SC_SCREENSAVE HEX: f140 -CONSTANT: SC_HOTKEY HEX: f150 +CONSTANT: SC_SIZE 0xf000 +CONSTANT: SC_MOVE 0xf010 +CONSTANT: SC_MINIMIZE 0xf020 +CONSTANT: SC_MAXIMIZE 0xf030 +CONSTANT: SC_NEXTWINDOW 0xf040 +CONSTANT: SC_PREVWINDOW 0xf050 +CONSTANT: SC_CLOSE 0xf060 +CONSTANT: SC_VSCROLL 0xf070 +CONSTANT: SC_HSCROLL 0xf080 +CONSTANT: SC_MOUSEMENU 0xf090 +CONSTANT: SC_KEYMENU 0xf100 +CONSTANT: SC_ARRANGE 0xf110 +CONSTANT: SC_RESTORE 0xf120 +CONSTANT: SC_TASKLIST 0xf130 +CONSTANT: SC_SCREENSAVE 0xf140 +CONSTANT: SC_HOTKEY 0xf150 CONSTANT: APPCOMMAND_BROWSER_BACKWARD 1 CONSTANT: APPCOMMAND_BROWSER_FORWARD 2 @@ -1080,7 +1080,7 @@ CONSTANT: APPCOMMAND_MEDIA_CHANNEL_DOWN 52 CONSTANT: APPCOMMAND_DELETE 53 CONSTANT: APPCOMMAND_DWM_FLIP3D 54 -CONSTANT: FAPPCOMMAND_MOUSE HEX: 8000 -CONSTANT: FAPPCOMMAND_KEY HEX: 0000 -CONSTANT: FAPPCOMMAND_OEM HEX: 1000 -CONSTANT: FAPPCOMMAND_MASK HEX: F000 +CONSTANT: FAPPCOMMAND_MOUSE 0x8000 +CONSTANT: FAPPCOMMAND_KEY 0x0000 +CONSTANT: FAPPCOMMAND_OEM 0x1000 +CONSTANT: FAPPCOMMAND_MASK 0xF000 diff --git a/basis/windows/ole32/ole32.factor b/basis/windows/ole32/ole32.factor index 8b0a2406c7..5603a1cc23 100644 --- a/basis/windows/ole32/ole32.factor +++ b/basis/windows/ole32/ole32.factor @@ -27,16 +27,16 @@ FUNCTION: HRESULT CLSIDFromString ( LPOLESTR lpsz, REFGUID out_rguid ) ; CONSTANT: S_OK 0 CONSTANT: S_FALSE 1 -CONSTANT: E_NOINTERFACE HEX: 80004002 -CONSTANT: E_FAIL HEX: 80004005 -CONSTANT: E_INVALIDARG HEX: 80070057 +CONSTANT: E_NOINTERFACE 0x80004002 +CONSTANT: E_FAIL 0x80004005 +CONSTANT: E_INVALIDARG 0x80070057 -CONSTANT: MK_ALT HEX: 20 +CONSTANT: MK_ALT 0x20 CONSTANT: DROPEFFECT_NONE 0 CONSTANT: DROPEFFECT_COPY 1 CONSTANT: DROPEFFECT_MOVE 2 CONSTANT: DROPEFFECT_LINK 4 -CONSTANT: DROPEFFECT_SCROLL HEX: 80000000 +CONSTANT: DROPEFFECT_SCROLL 0x80000000 CONSTANT: DD_DEFSCROLLINSET 11 CONSTANT: DD_DEFSCROLLDELAY 50 CONSTANT: DD_DEFSCROLLINTERVAL 50 @@ -61,11 +61,11 @@ CONSTANT: CF_HDROP 15 CONSTANT: CF_LOCALE 16 CONSTANT: CF_MAX 17 -CONSTANT: CF_OWNERDISPLAY HEX: 0080 -CONSTANT: CF_DSPTEXT HEX: 0081 -CONSTANT: CF_DSPBITMAP HEX: 0082 -CONSTANT: CF_DSPMETAFILEPICT HEX: 0083 -CONSTANT: CF_DSPENHMETAFILE HEX: 008E +CONSTANT: CF_OWNERDISPLAY 0x0080 +CONSTANT: CF_DSPTEXT 0x0081 +CONSTANT: CF_DSPBITMAP 0x0082 +CONSTANT: CF_DSPMETAFILEPICT 0x0083 +CONSTANT: CF_DSPENHMETAFILE 0x008E CONSTANT: DVASPECT_CONTENT 1 CONSTANT: DVASPECT_THUMBNAIL 2 @@ -115,7 +115,7 @@ FUNCTION: HRESULT OleInitialize ( void* reserved ) ; FUNCTION: HRESULT CoInitializeEx ( void* reserved, DWORD dwCoInit ) ; : succeeded? ( hresult -- ? ) - 0 HEX: 7FFFFFFF between? ; + 0 0x7FFFFFFF between? ; TUPLE: ole32-error code message ; diff --git a/basis/windows/opengl32/opengl32.factor b/basis/windows/opengl32/opengl32.factor index 32e067a200..642b834060 100644 --- a/basis/windows/opengl32/opengl32.factor +++ b/basis/windows/opengl32/opengl32.factor @@ -9,37 +9,37 @@ CONSTANT: LPD_TYPE_RGBA 0 CONSTANT: LPD_TYPE_COLORINDEX 1 ! wglSwapLayerBuffers flags -CONSTANT: WGL_SWAP_MAIN_PLANE HEX: 00000001 -CONSTANT: WGL_SWAP_OVERLAY1 HEX: 00000002 -CONSTANT: WGL_SWAP_OVERLAY2 HEX: 00000004 -CONSTANT: WGL_SWAP_OVERLAY3 HEX: 00000008 -CONSTANT: WGL_SWAP_OVERLAY4 HEX: 00000010 -CONSTANT: WGL_SWAP_OVERLAY5 HEX: 00000020 -CONSTANT: WGL_SWAP_OVERLAY6 HEX: 00000040 -CONSTANT: WGL_SWAP_OVERLAY7 HEX: 00000080 -CONSTANT: WGL_SWAP_OVERLAY8 HEX: 00000100 -CONSTANT: WGL_SWAP_OVERLAY9 HEX: 00000200 -CONSTANT: WGL_SWAP_OVERLAY10 HEX: 00000400 -CONSTANT: WGL_SWAP_OVERLAY11 HEX: 00000800 -CONSTANT: WGL_SWAP_OVERLAY12 HEX: 00001000 -CONSTANT: WGL_SWAP_OVERLAY13 HEX: 00002000 -CONSTANT: WGL_SWAP_OVERLAY14 HEX: 00004000 -CONSTANT: WGL_SWAP_OVERLAY15 HEX: 00008000 -CONSTANT: WGL_SWAP_UNDERLAY1 HEX: 00010000 -CONSTANT: WGL_SWAP_UNDERLAY2 HEX: 00020000 -CONSTANT: WGL_SWAP_UNDERLAY3 HEX: 00040000 -CONSTANT: WGL_SWAP_UNDERLAY4 HEX: 00080000 -CONSTANT: WGL_SWAP_UNDERLAY5 HEX: 00100000 -CONSTANT: WGL_SWAP_UNDERLAY6 HEX: 00200000 -CONSTANT: WGL_SWAP_UNDERLAY7 HEX: 00400000 -CONSTANT: WGL_SWAP_UNDERLAY8 HEX: 00800000 -CONSTANT: WGL_SWAP_UNDERLAY9 HEX: 01000000 -CONSTANT: WGL_SWAP_UNDERLAY10 HEX: 02000000 -CONSTANT: WGL_SWAP_UNDERLAY11 HEX: 04000000 -CONSTANT: WGL_SWAP_UNDERLAY12 HEX: 08000000 -CONSTANT: WGL_SWAP_UNDERLAY13 HEX: 10000000 -CONSTANT: WGL_SWAP_UNDERLAY14 HEX: 20000000 -CONSTANT: WGL_SWAP_UNDERLAY15 HEX: 40000000 +CONSTANT: WGL_SWAP_MAIN_PLANE 0x00000001 +CONSTANT: WGL_SWAP_OVERLAY1 0x00000002 +CONSTANT: WGL_SWAP_OVERLAY2 0x00000004 +CONSTANT: WGL_SWAP_OVERLAY3 0x00000008 +CONSTANT: WGL_SWAP_OVERLAY4 0x00000010 +CONSTANT: WGL_SWAP_OVERLAY5 0x00000020 +CONSTANT: WGL_SWAP_OVERLAY6 0x00000040 +CONSTANT: WGL_SWAP_OVERLAY7 0x00000080 +CONSTANT: WGL_SWAP_OVERLAY8 0x00000100 +CONSTANT: WGL_SWAP_OVERLAY9 0x00000200 +CONSTANT: WGL_SWAP_OVERLAY10 0x00000400 +CONSTANT: WGL_SWAP_OVERLAY11 0x00000800 +CONSTANT: WGL_SWAP_OVERLAY12 0x00001000 +CONSTANT: WGL_SWAP_OVERLAY13 0x00002000 +CONSTANT: WGL_SWAP_OVERLAY14 0x00004000 +CONSTANT: WGL_SWAP_OVERLAY15 0x00008000 +CONSTANT: WGL_SWAP_UNDERLAY1 0x00010000 +CONSTANT: WGL_SWAP_UNDERLAY2 0x00020000 +CONSTANT: WGL_SWAP_UNDERLAY3 0x00040000 +CONSTANT: WGL_SWAP_UNDERLAY4 0x00080000 +CONSTANT: WGL_SWAP_UNDERLAY5 0x00100000 +CONSTANT: WGL_SWAP_UNDERLAY6 0x00200000 +CONSTANT: WGL_SWAP_UNDERLAY7 0x00400000 +CONSTANT: WGL_SWAP_UNDERLAY8 0x00800000 +CONSTANT: WGL_SWAP_UNDERLAY9 0x01000000 +CONSTANT: WGL_SWAP_UNDERLAY10 0x02000000 +CONSTANT: WGL_SWAP_UNDERLAY11 0x04000000 +CONSTANT: WGL_SWAP_UNDERLAY12 0x08000000 +CONSTANT: WGL_SWAP_UNDERLAY13 0x10000000 +CONSTANT: WGL_SWAP_UNDERLAY14 0x20000000 +CONSTANT: WGL_SWAP_UNDERLAY15 0x40000000 LIBRARY: gl @@ -61,58 +61,58 @@ GL-FUNCTION: c-string wglGetExtensionsStringARB { } ( HDC hDC ) ; ! WGL_ARB_pixel_format extension -CONSTANT: WGL_NUMBER_PIXEL_FORMATS_ARB HEX: 2000 -CONSTANT: WGL_DRAW_TO_WINDOW_ARB HEX: 2001 -CONSTANT: WGL_DRAW_TO_BITMAP_ARB HEX: 2002 -CONSTANT: WGL_ACCELERATION_ARB HEX: 2003 -CONSTANT: WGL_NEED_PALETTE_ARB HEX: 2004 -CONSTANT: WGL_NEED_SYSTEM_PALETTE_ARB HEX: 2005 -CONSTANT: WGL_SWAP_LAYER_BUFFERS_ARB HEX: 2006 -CONSTANT: WGL_SWAP_METHOD_ARB HEX: 2007 -CONSTANT: WGL_NUMBER_OVERLAYS_ARB HEX: 2008 -CONSTANT: WGL_NUMBER_UNDERLAYS_ARB HEX: 2009 -CONSTANT: WGL_TRANSPARENT_ARB HEX: 200A -CONSTANT: WGL_TRANSPARENT_RED_VALUE_ARB HEX: 2037 -CONSTANT: WGL_TRANSPARENT_GREEN_VALUE_ARB HEX: 2038 -CONSTANT: WGL_TRANSPARENT_BLUE_VALUE_ARB HEX: 2039 -CONSTANT: WGL_TRANSPARENT_ALPHA_VALUE_ARB HEX: 203A -CONSTANT: WGL_TRANSPARENT_INDEX_VALUE_ARB HEX: 203B -CONSTANT: WGL_SHARE_DEPTH_ARB HEX: 200C -CONSTANT: WGL_SHARE_STENCIL_ARB HEX: 200D -CONSTANT: WGL_SHARE_ACCUM_ARB HEX: 200E -CONSTANT: WGL_SUPPORT_GDI_ARB HEX: 200F -CONSTANT: WGL_SUPPORT_OPENGL_ARB HEX: 2010 -CONSTANT: WGL_DOUBLE_BUFFER_ARB HEX: 2011 -CONSTANT: WGL_STEREO_ARB HEX: 2012 -CONSTANT: WGL_PIXEL_TYPE_ARB HEX: 2013 -CONSTANT: WGL_COLOR_BITS_ARB HEX: 2014 -CONSTANT: WGL_RED_BITS_ARB HEX: 2015 -CONSTANT: WGL_RED_SHIFT_ARB HEX: 2016 -CONSTANT: WGL_GREEN_BITS_ARB HEX: 2017 -CONSTANT: WGL_GREEN_SHIFT_ARB HEX: 2018 -CONSTANT: WGL_BLUE_BITS_ARB HEX: 2019 -CONSTANT: WGL_BLUE_SHIFT_ARB HEX: 201A -CONSTANT: WGL_ALPHA_BITS_ARB HEX: 201B -CONSTANT: WGL_ALPHA_SHIFT_ARB HEX: 201C -CONSTANT: WGL_ACCUM_BITS_ARB HEX: 201D -CONSTANT: WGL_ACCUM_RED_BITS_ARB HEX: 201E -CONSTANT: WGL_ACCUM_GREEN_BITS_ARB HEX: 201F -CONSTANT: WGL_ACCUM_BLUE_BITS_ARB HEX: 2020 -CONSTANT: WGL_ACCUM_ALPHA_BITS_ARB HEX: 2021 -CONSTANT: WGL_DEPTH_BITS_ARB HEX: 2022 -CONSTANT: WGL_STENCIL_BITS_ARB HEX: 2023 -CONSTANT: WGL_AUX_BUFFERS_ARB HEX: 2024 - -CONSTANT: WGL_NO_ACCELERATION_ARB HEX: 2025 -CONSTANT: WGL_GENERIC_ACCELERATION_ARB HEX: 2026 -CONSTANT: WGL_FULL_ACCELERATION_ARB HEX: 2027 - -CONSTANT: WGL_SWAP_EXCHANGE_ARB HEX: 2028 -CONSTANT: WGL_SWAP_COPY_ARB HEX: 2029 -CONSTANT: WGL_SWAP_UNDEFINED_ARB HEX: 202A - -CONSTANT: WGL_TYPE_RGBA_ARB HEX: 202B -CONSTANT: WGL_TYPE_COLORINDEX_ARB HEX: 202C +CONSTANT: WGL_NUMBER_PIXEL_FORMATS_ARB 0x2000 +CONSTANT: WGL_DRAW_TO_WINDOW_ARB 0x2001 +CONSTANT: WGL_DRAW_TO_BITMAP_ARB 0x2002 +CONSTANT: WGL_ACCELERATION_ARB 0x2003 +CONSTANT: WGL_NEED_PALETTE_ARB 0x2004 +CONSTANT: WGL_NEED_SYSTEM_PALETTE_ARB 0x2005 +CONSTANT: WGL_SWAP_LAYER_BUFFERS_ARB 0x2006 +CONSTANT: WGL_SWAP_METHOD_ARB 0x2007 +CONSTANT: WGL_NUMBER_OVERLAYS_ARB 0x2008 +CONSTANT: WGL_NUMBER_UNDERLAYS_ARB 0x2009 +CONSTANT: WGL_TRANSPARENT_ARB 0x200A +CONSTANT: WGL_TRANSPARENT_RED_VALUE_ARB 0x2037 +CONSTANT: WGL_TRANSPARENT_GREEN_VALUE_ARB 0x2038 +CONSTANT: WGL_TRANSPARENT_BLUE_VALUE_ARB 0x2039 +CONSTANT: WGL_TRANSPARENT_ALPHA_VALUE_ARB 0x203A +CONSTANT: WGL_TRANSPARENT_INDEX_VALUE_ARB 0x203B +CONSTANT: WGL_SHARE_DEPTH_ARB 0x200C +CONSTANT: WGL_SHARE_STENCIL_ARB 0x200D +CONSTANT: WGL_SHARE_ACCUM_ARB 0x200E +CONSTANT: WGL_SUPPORT_GDI_ARB 0x200F +CONSTANT: WGL_SUPPORT_OPENGL_ARB 0x2010 +CONSTANT: WGL_DOUBLE_BUFFER_ARB 0x2011 +CONSTANT: WGL_STEREO_ARB 0x2012 +CONSTANT: WGL_PIXEL_TYPE_ARB 0x2013 +CONSTANT: WGL_COLOR_BITS_ARB 0x2014 +CONSTANT: WGL_RED_BITS_ARB 0x2015 +CONSTANT: WGL_RED_SHIFT_ARB 0x2016 +CONSTANT: WGL_GREEN_BITS_ARB 0x2017 +CONSTANT: WGL_GREEN_SHIFT_ARB 0x2018 +CONSTANT: WGL_BLUE_BITS_ARB 0x2019 +CONSTANT: WGL_BLUE_SHIFT_ARB 0x201A +CONSTANT: WGL_ALPHA_BITS_ARB 0x201B +CONSTANT: WGL_ALPHA_SHIFT_ARB 0x201C +CONSTANT: WGL_ACCUM_BITS_ARB 0x201D +CONSTANT: WGL_ACCUM_RED_BITS_ARB 0x201E +CONSTANT: WGL_ACCUM_GREEN_BITS_ARB 0x201F +CONSTANT: WGL_ACCUM_BLUE_BITS_ARB 0x2020 +CONSTANT: WGL_ACCUM_ALPHA_BITS_ARB 0x2021 +CONSTANT: WGL_DEPTH_BITS_ARB 0x2022 +CONSTANT: WGL_STENCIL_BITS_ARB 0x2023 +CONSTANT: WGL_AUX_BUFFERS_ARB 0x2024 + +CONSTANT: WGL_NO_ACCELERATION_ARB 0x2025 +CONSTANT: WGL_GENERIC_ACCELERATION_ARB 0x2026 +CONSTANT: WGL_FULL_ACCELERATION_ARB 0x2027 + +CONSTANT: WGL_SWAP_EXCHANGE_ARB 0x2028 +CONSTANT: WGL_SWAP_COPY_ARB 0x2029 +CONSTANT: WGL_SWAP_UNDEFINED_ARB 0x202A + +CONSTANT: WGL_TYPE_RGBA_ARB 0x202B +CONSTANT: WGL_TYPE_COLORINDEX_ARB 0x202C GL-FUNCTION: BOOL wglGetPixelFormatAttribivARB { } ( HDC hdc, @@ -143,12 +143,12 @@ GL-FUNCTION: BOOL wglChoosePixelFormatARB { } ( ! WGL_ARB_multisample extension -CONSTANT: WGL_SAMPLE_BUFFERS_ARB HEX: 2041 -CONSTANT: WGL_SAMPLES_ARB HEX: 2042 +CONSTANT: WGL_SAMPLE_BUFFERS_ARB 0x2041 +CONSTANT: WGL_SAMPLES_ARB 0x2042 ! WGL_ARB_pixel_format_float extension -CONSTANT: WGL_TYPE_RGBA_FLOAT_ARB HEX: 21A0 +CONSTANT: WGL_TYPE_RGBA_FLOAT_ARB 0x21A0 ! wgl extensions querying diff --git a/basis/windows/shell32/shell32.factor b/basis/windows/shell32/shell32.factor index f3db3bc4af..4f83de503f 100644 --- a/basis/windows/shell32/shell32.factor +++ b/basis/windows/shell32/shell32.factor @@ -8,70 +8,70 @@ windows.ole32 windows specialized-arrays ; SPECIALIZED-ARRAY: ushort IN: windows.shell32 -CONSTANT: CSIDL_DESKTOP HEX: 00 -CONSTANT: CSIDL_INTERNET HEX: 01 -CONSTANT: CSIDL_PROGRAMS HEX: 02 -CONSTANT: CSIDL_CONTROLS HEX: 03 -CONSTANT: CSIDL_PRINTERS HEX: 04 -CONSTANT: CSIDL_PERSONAL HEX: 05 -CONSTANT: CSIDL_FAVORITES HEX: 06 -CONSTANT: CSIDL_STARTUP HEX: 07 -CONSTANT: CSIDL_RECENT HEX: 08 -CONSTANT: CSIDL_SENDTO HEX: 09 -CONSTANT: CSIDL_BITBUCKET HEX: 0a -CONSTANT: CSIDL_STARTMENU HEX: 0b -CONSTANT: CSIDL_MYDOCUMENTS HEX: 0c -CONSTANT: CSIDL_MYMUSIC HEX: 0d -CONSTANT: CSIDL_MYVIDEO HEX: 0e -CONSTANT: CSIDL_DESKTOPDIRECTORY HEX: 10 -CONSTANT: CSIDL_DRIVES HEX: 11 -CONSTANT: CSIDL_NETWORK HEX: 12 -CONSTANT: CSIDL_NETHOOD HEX: 13 -CONSTANT: CSIDL_FONTS HEX: 14 -CONSTANT: CSIDL_TEMPLATES HEX: 15 -CONSTANT: CSIDL_COMMON_STARTMENU HEX: 16 -CONSTANT: CSIDL_COMMON_PROGRAMS HEX: 17 -CONSTANT: CSIDL_COMMON_STARTUP HEX: 18 -CONSTANT: CSIDL_COMMON_DESKTOPDIRECTORY HEX: 19 -CONSTANT: CSIDL_APPDATA HEX: 1a -CONSTANT: CSIDL_PRINTHOOD HEX: 1b -CONSTANT: CSIDL_LOCAL_APPDATA HEX: 1c -CONSTANT: CSIDL_ALTSTARTUP HEX: 1d -CONSTANT: CSIDL_COMMON_ALTSTARTUP HEX: 1e -CONSTANT: CSIDL_COMMON_FAVORITES HEX: 1f -CONSTANT: CSIDL_INTERNET_CACHE HEX: 20 -CONSTANT: CSIDL_COOKIES HEX: 21 -CONSTANT: CSIDL_HISTORY HEX: 22 -CONSTANT: CSIDL_COMMON_APPDATA HEX: 23 -CONSTANT: CSIDL_WINDOWS HEX: 24 -CONSTANT: CSIDL_SYSTEM HEX: 25 -CONSTANT: CSIDL_PROGRAM_FILES HEX: 26 -CONSTANT: CSIDL_MYPICTURES HEX: 27 -CONSTANT: CSIDL_PROFILE HEX: 28 -CONSTANT: CSIDL_SYSTEMX86 HEX: 29 -CONSTANT: CSIDL_PROGRAM_FILESX86 HEX: 2a -CONSTANT: CSIDL_PROGRAM_FILES_COMMON HEX: 2b -CONSTANT: CSIDL_PROGRAM_FILES_COMMONX86 HEX: 2c -CONSTANT: CSIDL_COMMON_TEMPLATES HEX: 2d -CONSTANT: CSIDL_COMMON_DOCUMENTS HEX: 2e -CONSTANT: CSIDL_COMMON_ADMINTOOLS HEX: 2f -CONSTANT: CSIDL_ADMINTOOLS HEX: 30 -CONSTANT: CSIDL_CONNECTIONS HEX: 31 -CONSTANT: CSIDL_COMMON_MUSIC HEX: 35 -CONSTANT: CSIDL_COMMON_PICTURES HEX: 36 -CONSTANT: CSIDL_COMMON_VIDEO HEX: 37 -CONSTANT: CSIDL_RESOURCES HEX: 38 -CONSTANT: CSIDL_RESOURCES_LOCALIZED HEX: 39 -CONSTANT: CSIDL_COMMON_OEM_LINKS HEX: 3a -CONSTANT: CSIDL_CDBURN_AREA HEX: 3b -CONSTANT: CSIDL_COMPUTERSNEARME HEX: 3d -CONSTANT: CSIDL_PROFILES HEX: 3e -CONSTANT: CSIDL_FOLDER_MASK HEX: ff -CONSTANT: CSIDL_FLAG_PER_USER_INIT HEX: 800 -CONSTANT: CSIDL_FLAG_NO_ALIAS HEX: 1000 -CONSTANT: CSIDL_FLAG_DONT_VERIFY HEX: 4000 -CONSTANT: CSIDL_FLAG_CREATE HEX: 8000 -CONSTANT: CSIDL_FLAG_MASK HEX: ff00 +CONSTANT: CSIDL_DESKTOP 0x00 +CONSTANT: CSIDL_INTERNET 0x01 +CONSTANT: CSIDL_PROGRAMS 0x02 +CONSTANT: CSIDL_CONTROLS 0x03 +CONSTANT: CSIDL_PRINTERS 0x04 +CONSTANT: CSIDL_PERSONAL 0x05 +CONSTANT: CSIDL_FAVORITES 0x06 +CONSTANT: CSIDL_STARTUP 0x07 +CONSTANT: CSIDL_RECENT 0x08 +CONSTANT: CSIDL_SENDTO 0x09 +CONSTANT: CSIDL_BITBUCKET 0x0a +CONSTANT: CSIDL_STARTMENU 0x0b +CONSTANT: CSIDL_MYDOCUMENTS 0x0c +CONSTANT: CSIDL_MYMUSIC 0x0d +CONSTANT: CSIDL_MYVIDEO 0x0e +CONSTANT: CSIDL_DESKTOPDIRECTORY 0x10 +CONSTANT: CSIDL_DRIVES 0x11 +CONSTANT: CSIDL_NETWORK 0x12 +CONSTANT: CSIDL_NETHOOD 0x13 +CONSTANT: CSIDL_FONTS 0x14 +CONSTANT: CSIDL_TEMPLATES 0x15 +CONSTANT: CSIDL_COMMON_STARTMENU 0x16 +CONSTANT: CSIDL_COMMON_PROGRAMS 0x17 +CONSTANT: CSIDL_COMMON_STARTUP 0x18 +CONSTANT: CSIDL_COMMON_DESKTOPDIRECTORY 0x19 +CONSTANT: CSIDL_APPDATA 0x1a +CONSTANT: CSIDL_PRINTHOOD 0x1b +CONSTANT: CSIDL_LOCAL_APPDATA 0x1c +CONSTANT: CSIDL_ALTSTARTUP 0x1d +CONSTANT: CSIDL_COMMON_ALTSTARTUP 0x1e +CONSTANT: CSIDL_COMMON_FAVORITES 0x1f +CONSTANT: CSIDL_INTERNET_CACHE 0x20 +CONSTANT: CSIDL_COOKIES 0x21 +CONSTANT: CSIDL_HISTORY 0x22 +CONSTANT: CSIDL_COMMON_APPDATA 0x23 +CONSTANT: CSIDL_WINDOWS 0x24 +CONSTANT: CSIDL_SYSTEM 0x25 +CONSTANT: CSIDL_PROGRAM_FILES 0x26 +CONSTANT: CSIDL_MYPICTURES 0x27 +CONSTANT: CSIDL_PROFILE 0x28 +CONSTANT: CSIDL_SYSTEMX86 0x29 +CONSTANT: CSIDL_PROGRAM_FILESX86 0x2a +CONSTANT: CSIDL_PROGRAM_FILES_COMMON 0x2b +CONSTANT: CSIDL_PROGRAM_FILES_COMMONX86 0x2c +CONSTANT: CSIDL_COMMON_TEMPLATES 0x2d +CONSTANT: CSIDL_COMMON_DOCUMENTS 0x2e +CONSTANT: CSIDL_COMMON_ADMINTOOLS 0x2f +CONSTANT: CSIDL_ADMINTOOLS 0x30 +CONSTANT: CSIDL_CONNECTIONS 0x31 +CONSTANT: CSIDL_COMMON_MUSIC 0x35 +CONSTANT: CSIDL_COMMON_PICTURES 0x36 +CONSTANT: CSIDL_COMMON_VIDEO 0x37 +CONSTANT: CSIDL_RESOURCES 0x38 +CONSTANT: CSIDL_RESOURCES_LOCALIZED 0x39 +CONSTANT: CSIDL_COMMON_OEM_LINKS 0x3a +CONSTANT: CSIDL_CDBURN_AREA 0x3b +CONSTANT: CSIDL_COMPUTERSNEARME 0x3d +CONSTANT: CSIDL_PROFILES 0x3e +CONSTANT: CSIDL_FOLDER_MASK 0xff +CONSTANT: CSIDL_FLAG_PER_USER_INIT 0x800 +CONSTANT: CSIDL_FLAG_NO_ALIAS 0x1000 +CONSTANT: CSIDL_FLAG_DONT_VERIFY 0x4000 +CONSTANT: CSIDL_FLAG_CREATE 0x8000 +CONSTANT: CSIDL_FLAG_MASK 0xff00 CONSTANT: ERROR_FILE_NOT_FOUND 2 @@ -131,38 +131,38 @@ TYPEDEF: DWORD SHCONTF CONSTANT: SHGDN_NORMAL 0 CONSTANT: SHGDN_INFOLDER 1 -CONSTANT: SHGDN_FOREDITING HEX: 1000 -CONSTANT: SHGDN_INCLUDE_NONFILESYS HEX: 2000 -CONSTANT: SHGDN_FORADDRESSBAR HEX: 4000 -CONSTANT: SHGDN_FORPARSING HEX: 8000 +CONSTANT: SHGDN_FOREDITING 0x1000 +CONSTANT: SHGDN_INCLUDE_NONFILESYS 0x2000 +CONSTANT: SHGDN_FORADDRESSBAR 0x4000 +CONSTANT: SHGDN_FORPARSING 0x8000 TYPEDEF: DWORD SHGDNF ALIAS: SFGAO_CANCOPY DROPEFFECT_COPY ALIAS: SFGAO_CANMOVE DROPEFFECT_MOVE ALIAS: SFGAO_CANLINK DROPEFFECT_LINK -CONSTANT: SFGAO_CANRENAME HEX: 00000010 -CONSTANT: SFGAO_CANDELETE HEX: 00000020 -CONSTANT: SFGAO_HASPROPSHEET HEX: 00000040 -CONSTANT: SFGAO_DROPTARGET HEX: 00000100 -CONSTANT: SFGAO_CAPABILITYMASK HEX: 00000177 -CONSTANT: SFGAO_LINK HEX: 00010000 -CONSTANT: SFGAO_SHARE HEX: 00020000 -CONSTANT: SFGAO_READONLY HEX: 00040000 -CONSTANT: SFGAO_GHOSTED HEX: 00080000 -CONSTANT: SFGAO_HIDDEN HEX: 00080000 -CONSTANT: SFGAO_DISPLAYATTRMASK HEX: 000F0000 -CONSTANT: SFGAO_FILESYSANCESTOR HEX: 10000000 -CONSTANT: SFGAO_FOLDER HEX: 20000000 -CONSTANT: SFGAO_FILESYSTEM HEX: 40000000 -CONSTANT: SFGAO_HASSUBFOLDER HEX: 80000000 -CONSTANT: SFGAO_CONTENTSMASK HEX: 80000000 -CONSTANT: SFGAO_VALIDATE HEX: 01000000 -CONSTANT: SFGAO_REMOVABLE HEX: 02000000 -CONSTANT: SFGAO_COMPRESSED HEX: 04000000 -CONSTANT: SFGAO_BROWSABLE HEX: 08000000 -CONSTANT: SFGAO_NONENUMERATED HEX: 00100000 -CONSTANT: SFGAO_NEWCONTENT HEX: 00200000 +CONSTANT: SFGAO_CANRENAME 0x00000010 +CONSTANT: SFGAO_CANDELETE 0x00000020 +CONSTANT: SFGAO_HASPROPSHEET 0x00000040 +CONSTANT: SFGAO_DROPTARGET 0x00000100 +CONSTANT: SFGAO_CAPABILITYMASK 0x00000177 +CONSTANT: SFGAO_LINK 0x00010000 +CONSTANT: SFGAO_SHARE 0x00020000 +CONSTANT: SFGAO_READONLY 0x00040000 +CONSTANT: SFGAO_GHOSTED 0x00080000 +CONSTANT: SFGAO_HIDDEN 0x00080000 +CONSTANT: SFGAO_DISPLAYATTRMASK 0x000F0000 +CONSTANT: SFGAO_FILESYSANCESTOR 0x10000000 +CONSTANT: SFGAO_FOLDER 0x20000000 +CONSTANT: SFGAO_FILESYSTEM 0x40000000 +CONSTANT: SFGAO_HASSUBFOLDER 0x80000000 +CONSTANT: SFGAO_CONTENTSMASK 0x80000000 +CONSTANT: SFGAO_VALIDATE 0x01000000 +CONSTANT: SFGAO_REMOVABLE 0x02000000 +CONSTANT: SFGAO_COMPRESSED 0x04000000 +CONSTANT: SFGAO_BROWSABLE 0x08000000 +CONSTANT: SFGAO_NONENUMERATED 0x00100000 +CONSTANT: SFGAO_NEWCONTENT 0x00200000 TYPEDEF: ULONG SFGAOF diff --git a/basis/windows/types/types.factor b/basis/windows/types/types.factor index 3490e8083d..f7a9db1b81 100644 --- a/basis/windows/types/types.factor +++ b/basis/windows/types/types.factor @@ -368,9 +368,9 @@ TYPEDEF: DWORD* LPCOLORREF : RGB ( r g b -- COLORREF ) { 16 8 0 } bitfield ; inline : >RGB< ( COLORREF -- r g b ) - [ HEX: ff bitand ] - [ -8 shift HEX: ff bitand ] - [ -16 shift HEX: ff bitand ] tri ; + [ 0xff bitand ] + [ -8 shift 0xff bitand ] + [ -16 shift 0xff bitand ] tri ; : color>RGB ( color -- COLORREF ) >rgba-components drop [ 255 * >integer ] tri@ RGB ; diff --git a/basis/windows/user32/user32.factor b/basis/windows/user32/user32.factor index 54d31bb12b..c46d3e35ca 100644 --- a/basis/windows/user32/user32.factor +++ b/basis/windows/user32/user32.factor @@ -9,28 +9,28 @@ IN: windows.user32 CONSTANT: HKL_PREV 0 CONSTANT: HKL_NEXT 1 -CONSTANT: CW_USEDEFAULT HEX: 80000000 - -CONSTANT: WS_OVERLAPPED HEX: 00000000 -CONSTANT: WS_POPUP HEX: 80000000 -CONSTANT: WS_CHILD HEX: 40000000 -CONSTANT: WS_MINIMIZE HEX: 20000000 -CONSTANT: WS_VISIBLE HEX: 10000000 -CONSTANT: WS_DISABLED HEX: 08000000 -CONSTANT: WS_CLIPSIBLINGS HEX: 04000000 -CONSTANT: WS_CLIPCHILDREN HEX: 02000000 -CONSTANT: WS_MAXIMIZE HEX: 01000000 -CONSTANT: WS_CAPTION HEX: 00C00000 -CONSTANT: WS_BORDER HEX: 00800000 -CONSTANT: WS_DLGFRAME HEX: 00400000 -CONSTANT: WS_VSCROLL HEX: 00200000 -CONSTANT: WS_HSCROLL HEX: 00100000 -CONSTANT: WS_SYSMENU HEX: 00080000 -CONSTANT: WS_THICKFRAME HEX: 00040000 -CONSTANT: WS_GROUP HEX: 00020000 -CONSTANT: WS_TABSTOP HEX: 00010000 -CONSTANT: WS_MINIMIZEBOX HEX: 00020000 -CONSTANT: WS_MAXIMIZEBOX HEX: 00010000 +CONSTANT: CW_USEDEFAULT 0x80000000 + +CONSTANT: WS_OVERLAPPED 0x00000000 +CONSTANT: WS_POPUP 0x80000000 +CONSTANT: WS_CHILD 0x40000000 +CONSTANT: WS_MINIMIZE 0x20000000 +CONSTANT: WS_VISIBLE 0x10000000 +CONSTANT: WS_DISABLED 0x08000000 +CONSTANT: WS_CLIPSIBLINGS 0x04000000 +CONSTANT: WS_CLIPCHILDREN 0x02000000 +CONSTANT: WS_MAXIMIZE 0x01000000 +CONSTANT: WS_CAPTION 0x00C00000 +CONSTANT: WS_BORDER 0x00800000 +CONSTANT: WS_DLGFRAME 0x00400000 +CONSTANT: WS_VSCROLL 0x00200000 +CONSTANT: WS_HSCROLL 0x00100000 +CONSTANT: WS_SYSMENU 0x00080000 +CONSTANT: WS_THICKFRAME 0x00040000 +CONSTANT: WS_GROUP 0x00020000 +CONSTANT: WS_TABSTOP 0x00010000 +CONSTANT: WS_MINIMIZEBOX 0x00020000 +CONSTANT: WS_MAXIMIZEBOX 0x00010000 ! Common window styles CONSTANT: WS_OVERLAPPEDWINDOW @@ -54,26 +54,26 @@ ALIAS: WS_TILEDWINDOW WS_OVERLAPPEDWINDOW ! Extended window styles -CONSTANT: WS_EX_DLGMODALFRAME HEX: 00000001 -CONSTANT: WS_EX_NOPARENTNOTIFY HEX: 00000004 -CONSTANT: WS_EX_TOPMOST HEX: 00000008 -CONSTANT: WS_EX_ACCEPTFILES HEX: 00000010 -CONSTANT: WS_EX_TRANSPARENT HEX: 00000020 -CONSTANT: WS_EX_MDICHILD HEX: 00000040 -CONSTANT: WS_EX_TOOLWINDOW HEX: 00000080 -CONSTANT: WS_EX_WINDOWEDGE HEX: 00000100 -CONSTANT: WS_EX_CLIENTEDGE HEX: 00000200 -CONSTANT: WS_EX_CONTEXTHELP HEX: 00000400 - -CONSTANT: WS_EX_RIGHT HEX: 00001000 -CONSTANT: WS_EX_LEFT HEX: 00000000 -CONSTANT: WS_EX_RTLREADING HEX: 00002000 -CONSTANT: WS_EX_LTRREADING HEX: 00000000 -CONSTANT: WS_EX_LEFTSCROLLBAR HEX: 00004000 -CONSTANT: WS_EX_RIGHTSCROLLBAR HEX: 00000000 -CONSTANT: WS_EX_CONTROLPARENT HEX: 00010000 -CONSTANT: WS_EX_STATICEDGE HEX: 00020000 -CONSTANT: WS_EX_APPWINDOW HEX: 00040000 +CONSTANT: WS_EX_DLGMODALFRAME 0x00000001 +CONSTANT: WS_EX_NOPARENTNOTIFY 0x00000004 +CONSTANT: WS_EX_TOPMOST 0x00000008 +CONSTANT: WS_EX_ACCEPTFILES 0x00000010 +CONSTANT: WS_EX_TRANSPARENT 0x00000020 +CONSTANT: WS_EX_MDICHILD 0x00000040 +CONSTANT: WS_EX_TOOLWINDOW 0x00000080 +CONSTANT: WS_EX_WINDOWEDGE 0x00000100 +CONSTANT: WS_EX_CLIENTEDGE 0x00000200 +CONSTANT: WS_EX_CONTEXTHELP 0x00000400 + +CONSTANT: WS_EX_RIGHT 0x00001000 +CONSTANT: WS_EX_LEFT 0x00000000 +CONSTANT: WS_EX_RTLREADING 0x00002000 +CONSTANT: WS_EX_LTRREADING 0x00000000 +CONSTANT: WS_EX_LEFTSCROLLBAR 0x00004000 +CONSTANT: WS_EX_RIGHTSCROLLBAR 0x00000000 +CONSTANT: WS_EX_CONTROLPARENT 0x00010000 +CONSTANT: WS_EX_STATICEDGE 0x00020000 +CONSTANT: WS_EX_APPWINDOW 0x00040000 CONSTANT: WS_EX_OVERLAPPEDWINDOW flags{ WS_EX_WINDOWEDGE WS_EX_CLIENTEDGE } @@ -81,17 +81,17 @@ CONSTANT: WS_EX_OVERLAPPEDWINDOW CONSTANT: WS_EX_PALETTEWINDOW flags{ WS_EX_WINDOWEDGE WS_EX_TOOLWINDOW WS_EX_TOPMOST } -CONSTANT: CS_VREDRAW HEX: 0001 -CONSTANT: CS_HREDRAW HEX: 0002 -CONSTANT: CS_DBLCLKS HEX: 0008 -CONSTANT: CS_OWNDC HEX: 0020 -CONSTANT: CS_CLASSDC HEX: 0040 -CONSTANT: CS_PARENTDC HEX: 0080 -CONSTANT: CS_NOCLOSE HEX: 0200 -CONSTANT: CS_SAVEBITS HEX: 0800 -CONSTANT: CS_BYTEALIGNCLIENT HEX: 1000 -CONSTANT: CS_BYTEALIGNWINDOW HEX: 2000 -CONSTANT: CS_GLOBALCLASS HEX: 4000 +CONSTANT: CS_VREDRAW 0x0001 +CONSTANT: CS_HREDRAW 0x0002 +CONSTANT: CS_DBLCLKS 0x0008 +CONSTANT: CS_OWNDC 0x0020 +CONSTANT: CS_CLASSDC 0x0040 +CONSTANT: CS_PARENTDC 0x0080 +CONSTANT: CS_NOCLOSE 0x0200 +CONSTANT: CS_SAVEBITS 0x0800 +CONSTANT: CS_BYTEALIGNCLIENT 0x1000 +CONSTANT: CS_BYTEALIGNWINDOW 0x2000 +CONSTANT: CS_GLOBALCLASS 0x4000 CONSTANT: COLOR_SCROLLBAR 0 CONSTANT: COLOR_BACKGROUND 1 @@ -189,72 +189,72 @@ CONSTANT: CF_LOCALE 16 CONSTANT: CF_DIBV5 17 CONSTANT: CF_MAX 18 -CONSTANT: CF_OWNERDISPLAY HEX: 0080 -CONSTANT: CF_DSPTEXT HEX: 0081 -CONSTANT: CF_DSPBITMAP HEX: 0082 -CONSTANT: CF_DSPMETAFILEPICT HEX: 0083 -CONSTANT: CF_DSPENHMETAFILE HEX: 008E +CONSTANT: CF_OWNERDISPLAY 0x0080 +CONSTANT: CF_DSPTEXT 0x0081 +CONSTANT: CF_DSPBITMAP 0x0082 +CONSTANT: CF_DSPMETAFILEPICT 0x0083 +CONSTANT: CF_DSPENHMETAFILE 0x008E ! "Private" formats don't get GlobalFree()'d -CONSTANT: CF_PRIVATEFIRST HEX: 200 -CONSTANT: CF_PRIVATELAST HEX: 2FF +CONSTANT: CF_PRIVATEFIRST 0x200 +CONSTANT: CF_PRIVATELAST 0x2FF ! "GDIOBJ" formats do get DeleteObject()'d -CONSTANT: CF_GDIOBJFIRST HEX: 300 -CONSTANT: CF_GDIOBJLAST HEX: 3FF +CONSTANT: CF_GDIOBJFIRST 0x300 +CONSTANT: CF_GDIOBJLAST 0x3FF ! Virtual Keys, Standard Set -CONSTANT: VK_LBUTTON HEX: 01 -CONSTANT: VK_RBUTTON HEX: 02 -CONSTANT: VK_CANCEL HEX: 03 -CONSTANT: VK_MBUTTON HEX: 04 ! NOT contiguous with L & RBUTTON -CONSTANT: VK_XBUTTON1 HEX: 05 ! NOT contiguous with L & RBUTTON -CONSTANT: VK_XBUTTON2 HEX: 06 ! NOT contiguous with L & RBUTTON +CONSTANT: VK_LBUTTON 0x01 +CONSTANT: VK_RBUTTON 0x02 +CONSTANT: VK_CANCEL 0x03 +CONSTANT: VK_MBUTTON 0x04 ! NOT contiguous with L & RBUTTON +CONSTANT: VK_XBUTTON1 0x05 ! NOT contiguous with L & RBUTTON +CONSTANT: VK_XBUTTON2 0x06 ! NOT contiguous with L & RBUTTON ! 0x07 : unassigned -CONSTANT: VK_BACK HEX: 08 -CONSTANT: VK_TAB HEX: 09 +CONSTANT: VK_BACK 0x08 +CONSTANT: VK_TAB 0x09 ! 0x0A - 0x0B : reserved -CONSTANT: VK_CLEAR HEX: 0C -CONSTANT: VK_RETURN HEX: 0D - -CONSTANT: VK_SHIFT HEX: 10 -CONSTANT: VK_CONTROL HEX: 11 -CONSTANT: VK_MENU HEX: 12 -CONSTANT: VK_PAUSE HEX: 13 -CONSTANT: VK_CAPITAL HEX: 14 - -CONSTANT: VK_KANA HEX: 15 -CONSTANT: VK_HANGEUL HEX: 15 ! old name - here for compatibility -CONSTANT: VK_HANGUL HEX: 15 -CONSTANT: VK_JUNJA HEX: 17 -CONSTANT: VK_FINAL HEX: 18 -CONSTANT: VK_HANJA HEX: 19 -CONSTANT: VK_KANJI HEX: 19 - -CONSTANT: VK_ESCAPE HEX: 1B - -CONSTANT: VK_CONVERT HEX: 1C -CONSTANT: VK_NONCONVERT HEX: 1D -CONSTANT: VK_ACCEPT HEX: 1E -CONSTANT: VK_MODECHANGE HEX: 1F - -CONSTANT: VK_SPACE HEX: 20 -CONSTANT: VK_PRIOR HEX: 21 -CONSTANT: VK_NEXT HEX: 22 -CONSTANT: VK_END HEX: 23 -CONSTANT: VK_HOME HEX: 24 -CONSTANT: VK_LEFT HEX: 25 -CONSTANT: VK_UP HEX: 26 -CONSTANT: VK_RIGHT HEX: 27 -CONSTANT: VK_DOWN HEX: 28 -CONSTANT: VK_SELECT HEX: 29 -CONSTANT: VK_PRINT HEX: 2A -CONSTANT: VK_EXECUTE HEX: 2B -CONSTANT: VK_SNAPSHOT HEX: 2C -CONSTANT: VK_INSERT HEX: 2D -CONSTANT: VK_DELETE HEX: 2E -CONSTANT: VK_HELP HEX: 2F +CONSTANT: VK_CLEAR 0x0C +CONSTANT: VK_RETURN 0x0D + +CONSTANT: VK_SHIFT 0x10 +CONSTANT: VK_CONTROL 0x11 +CONSTANT: VK_MENU 0x12 +CONSTANT: VK_PAUSE 0x13 +CONSTANT: VK_CAPITAL 0x14 + +CONSTANT: VK_KANA 0x15 +CONSTANT: VK_HANGEUL 0x15 ! old name - here for compatibility +CONSTANT: VK_HANGUL 0x15 +CONSTANT: VK_JUNJA 0x17 +CONSTANT: VK_FINAL 0x18 +CONSTANT: VK_HANJA 0x19 +CONSTANT: VK_KANJI 0x19 + +CONSTANT: VK_ESCAPE 0x1B + +CONSTANT: VK_CONVERT 0x1C +CONSTANT: VK_NONCONVERT 0x1D +CONSTANT: VK_ACCEPT 0x1E +CONSTANT: VK_MODECHANGE 0x1F + +CONSTANT: VK_SPACE 0x20 +CONSTANT: VK_PRIOR 0x21 +CONSTANT: VK_NEXT 0x22 +CONSTANT: VK_END 0x23 +CONSTANT: VK_HOME 0x24 +CONSTANT: VK_LEFT 0x25 +CONSTANT: VK_UP 0x26 +CONSTANT: VK_RIGHT 0x27 +CONSTANT: VK_DOWN 0x28 +CONSTANT: VK_SELECT 0x29 +CONSTANT: VK_PRINT 0x2A +CONSTANT: VK_EXECUTE 0x2B +CONSTANT: VK_SNAPSHOT 0x2C +CONSTANT: VK_INSERT 0x2D +CONSTANT: VK_DELETE 0x2E +CONSTANT: VK_HELP 0x2F CONSTANT: VK_0 CHAR: 0 CONSTANT: VK_1 CHAR: 1 @@ -294,172 +294,172 @@ CONSTANT: VK_X CHAR: X CONSTANT: VK_Y CHAR: Y CONSTANT: VK_Z CHAR: Z -CONSTANT: VK_LWIN HEX: 5B -CONSTANT: VK_RWIN HEX: 5C -CONSTANT: VK_APPS HEX: 5D +CONSTANT: VK_LWIN 0x5B +CONSTANT: VK_RWIN 0x5C +CONSTANT: VK_APPS 0x5D ! 0x5E : reserved -CONSTANT: VK_SLEEP HEX: 5F - -CONSTANT: VK_NUMPAD0 HEX: 60 -CONSTANT: VK_NUMPAD1 HEX: 61 -CONSTANT: VK_NUMPAD2 HEX: 62 -CONSTANT: VK_NUMPAD3 HEX: 63 -CONSTANT: VK_NUMPAD4 HEX: 64 -CONSTANT: VK_NUMPAD5 HEX: 65 -CONSTANT: VK_NUMPAD6 HEX: 66 -CONSTANT: VK_NUMPAD7 HEX: 67 -CONSTANT: VK_NUMPAD8 HEX: 68 -CONSTANT: VK_NUMPAD9 HEX: 69 -CONSTANT: VK_MULTIPLY HEX: 6A -CONSTANT: VK_ADD HEX: 6B -CONSTANT: VK_SEPARATOR HEX: 6C -CONSTANT: VK_SUBTRACT HEX: 6D -CONSTANT: VK_DECIMAL HEX: 6E -CONSTANT: VK_DIVIDE HEX: 6F -CONSTANT: VK_F1 HEX: 70 -CONSTANT: VK_F2 HEX: 71 -CONSTANT: VK_F3 HEX: 72 -CONSTANT: VK_F4 HEX: 73 -CONSTANT: VK_F5 HEX: 74 -CONSTANT: VK_F6 HEX: 75 -CONSTANT: VK_F7 HEX: 76 -CONSTANT: VK_F8 HEX: 77 -CONSTANT: VK_F9 HEX: 78 -CONSTANT: VK_F10 HEX: 79 -CONSTANT: VK_F11 HEX: 7A -CONSTANT: VK_F12 HEX: 7B -CONSTANT: VK_F13 HEX: 7C -CONSTANT: VK_F14 HEX: 7D -CONSTANT: VK_F15 HEX: 7E -CONSTANT: VK_F16 HEX: 7F -CONSTANT: VK_F17 HEX: 80 -CONSTANT: VK_F18 HEX: 81 -CONSTANT: VK_F19 HEX: 82 -CONSTANT: VK_F20 HEX: 83 -CONSTANT: VK_F21 HEX: 84 -CONSTANT: VK_F22 HEX: 85 -CONSTANT: VK_F23 HEX: 86 -CONSTANT: VK_F24 HEX: 87 +CONSTANT: VK_SLEEP 0x5F + +CONSTANT: VK_NUMPAD0 0x60 +CONSTANT: VK_NUMPAD1 0x61 +CONSTANT: VK_NUMPAD2 0x62 +CONSTANT: VK_NUMPAD3 0x63 +CONSTANT: VK_NUMPAD4 0x64 +CONSTANT: VK_NUMPAD5 0x65 +CONSTANT: VK_NUMPAD6 0x66 +CONSTANT: VK_NUMPAD7 0x67 +CONSTANT: VK_NUMPAD8 0x68 +CONSTANT: VK_NUMPAD9 0x69 +CONSTANT: VK_MULTIPLY 0x6A +CONSTANT: VK_ADD 0x6B +CONSTANT: VK_SEPARATOR 0x6C +CONSTANT: VK_SUBTRACT 0x6D +CONSTANT: VK_DECIMAL 0x6E +CONSTANT: VK_DIVIDE 0x6F +CONSTANT: VK_F1 0x70 +CONSTANT: VK_F2 0x71 +CONSTANT: VK_F3 0x72 +CONSTANT: VK_F4 0x73 +CONSTANT: VK_F5 0x74 +CONSTANT: VK_F6 0x75 +CONSTANT: VK_F7 0x76 +CONSTANT: VK_F8 0x77 +CONSTANT: VK_F9 0x78 +CONSTANT: VK_F10 0x79 +CONSTANT: VK_F11 0x7A +CONSTANT: VK_F12 0x7B +CONSTANT: VK_F13 0x7C +CONSTANT: VK_F14 0x7D +CONSTANT: VK_F15 0x7E +CONSTANT: VK_F16 0x7F +CONSTANT: VK_F17 0x80 +CONSTANT: VK_F18 0x81 +CONSTANT: VK_F19 0x82 +CONSTANT: VK_F20 0x83 +CONSTANT: VK_F21 0x84 +CONSTANT: VK_F22 0x85 +CONSTANT: VK_F23 0x86 +CONSTANT: VK_F24 0x87 ! 0x88 - 0x8F : unassigned -CONSTANT: VK_NUMLOCK HEX: 90 -CONSTANT: VK_SCROLL HEX: 91 +CONSTANT: VK_NUMLOCK 0x90 +CONSTANT: VK_SCROLL 0x91 ! NEC PC-9800 kbd definitions -CONSTANT: VK_OEM_NEC_EQUAL HEX: 92 ! '=' key on numpad +CONSTANT: VK_OEM_NEC_EQUAL 0x92 ! '=' key on numpad ! Fujitsu/OASYS kbd definitions -CONSTANT: VK_OEM_FJ_JISHO HEX: 92 ! 'Dictionary' key -CONSTANT: VK_OEM_FJ_MASSHOU HEX: 93 ! 'Unregister word' key -CONSTANT: VK_OEM_FJ_TOUROKU HEX: 94 ! 'Register word' key -CONSTANT: VK_OEM_FJ_LOYA HEX: 95 ! 'Left OYAYUBI' key -CONSTANT: VK_OEM_FJ_ROYA HEX: 96 ! 'Right OYAYUBI' key +CONSTANT: VK_OEM_FJ_JISHO 0x92 ! 'Dictionary' key +CONSTANT: VK_OEM_FJ_MASSHOU 0x93 ! 'Unregister word' key +CONSTANT: VK_OEM_FJ_TOUROKU 0x94 ! 'Register word' key +CONSTANT: VK_OEM_FJ_LOYA 0x95 ! 'Left OYAYUBI' key +CONSTANT: VK_OEM_FJ_ROYA 0x96 ! 'Right OYAYUBI' key ! 0x97 - 0x9F : unassigned ! VK_L* & VK_R* - left and right Alt, Ctrl and Shift virtual keys. ! Used only as parameters to GetAsyncKeyState() and GetKeyState(). ! No other API or message will distinguish left and right keys in this way. -CONSTANT: VK_LSHIFT HEX: A0 -CONSTANT: VK_RSHIFT HEX: A1 -CONSTANT: VK_LCONTROL HEX: A2 -CONSTANT: VK_RCONTROL HEX: A3 -CONSTANT: VK_LMENU HEX: A4 -CONSTANT: VK_RMENU HEX: A5 - -CONSTANT: VK_BROWSER_BACK HEX: A6 -CONSTANT: VK_BROWSER_FORWARD HEX: A7 -CONSTANT: VK_BROWSER_REFRESH HEX: A8 -CONSTANT: VK_BROWSER_STOP HEX: A9 -CONSTANT: VK_BROWSER_SEARCH HEX: AA -CONSTANT: VK_BROWSER_FAVORITES HEX: AB -CONSTANT: VK_BROWSER_HOME HEX: AC - -CONSTANT: VK_VOLUME_MUTE HEX: AD -CONSTANT: VK_VOLUME_DOWN HEX: AE -CONSTANT: VK_VOLUME_UP HEX: AF -CONSTANT: VK_MEDIA_NEXT_TRACK HEX: B0 -CONSTANT: VK_MEDIA_PREV_TRACK HEX: B1 -CONSTANT: VK_MEDIA_STOP HEX: B2 -CONSTANT: VK_MEDIA_PLAY_PAUSE HEX: B3 -CONSTANT: VK_LAUNCH_MAIL HEX: B4 -CONSTANT: VK_LAUNCH_MEDIA_SELECT HEX: B5 -CONSTANT: VK_LAUNCH_APP1 HEX: B6 -CONSTANT: VK_LAUNCH_APP2 HEX: B7 +CONSTANT: VK_LSHIFT 0xA0 +CONSTANT: VK_RSHIFT 0xA1 +CONSTANT: VK_LCONTROL 0xA2 +CONSTANT: VK_RCONTROL 0xA3 +CONSTANT: VK_LMENU 0xA4 +CONSTANT: VK_RMENU 0xA5 + +CONSTANT: VK_BROWSER_BACK 0xA6 +CONSTANT: VK_BROWSER_FORWARD 0xA7 +CONSTANT: VK_BROWSER_REFRESH 0xA8 +CONSTANT: VK_BROWSER_STOP 0xA9 +CONSTANT: VK_BROWSER_SEARCH 0xAA +CONSTANT: VK_BROWSER_FAVORITES 0xAB +CONSTANT: VK_BROWSER_HOME 0xAC + +CONSTANT: VK_VOLUME_MUTE 0xAD +CONSTANT: VK_VOLUME_DOWN 0xAE +CONSTANT: VK_VOLUME_UP 0xAF +CONSTANT: VK_MEDIA_NEXT_TRACK 0xB0 +CONSTANT: VK_MEDIA_PREV_TRACK 0xB1 +CONSTANT: VK_MEDIA_STOP 0xB2 +CONSTANT: VK_MEDIA_PLAY_PAUSE 0xB3 +CONSTANT: VK_LAUNCH_MAIL 0xB4 +CONSTANT: VK_LAUNCH_MEDIA_SELECT 0xB5 +CONSTANT: VK_LAUNCH_APP1 0xB6 +CONSTANT: VK_LAUNCH_APP2 0xB7 ! 0xB8 - 0xB9 : reserved -CONSTANT: VK_OEM_1 HEX: BA ! ';:' for US -CONSTANT: VK_OEM_PLUS HEX: BB ! '+' any country -CONSTANT: VK_OEM_COMMA HEX: BC ! ',' any country -CONSTANT: VK_OEM_MINUS HEX: BD ! '-' any country -CONSTANT: VK_OEM_PERIOD HEX: BE ! '.' any country -CONSTANT: VK_OEM_2 HEX: BF ! '/?' for US -CONSTANT: VK_OEM_3 HEX: C0 ! '`~' for US +CONSTANT: VK_OEM_1 0xBA ! ';:' for US +CONSTANT: VK_OEM_PLUS 0xBB ! '+' any country +CONSTANT: VK_OEM_COMMA 0xBC ! ',' any country +CONSTANT: VK_OEM_MINUS 0xBD ! '-' any country +CONSTANT: VK_OEM_PERIOD 0xBE ! '.' any country +CONSTANT: VK_OEM_2 0xBF ! '/?' for US +CONSTANT: VK_OEM_3 0xC0 ! '`~' for US ! 0xC1 - 0xD7 : reserved ! 0xD8 - 0xDA : unassigned -CONSTANT: VK_OEM_4 HEX: DB ! '[{' for US -CONSTANT: VK_OEM_5 HEX: DC ! '\|' for US -CONSTANT: VK_OEM_6 HEX: DD ! ']}' for US -CONSTANT: VK_OEM_7 HEX: DE ! ''"' for US -CONSTANT: VK_OEM_8 HEX: DF +CONSTANT: VK_OEM_4 0xDB ! '[{' for US +CONSTANT: VK_OEM_5 0xDC ! '\|' for US +CONSTANT: VK_OEM_6 0xDD ! ']}' for US +CONSTANT: VK_OEM_7 0xDE ! ''"' for US +CONSTANT: VK_OEM_8 0xDF ! 0xE0 : reserved ! Various extended or enhanced keyboards -CONSTANT: VK_OEM_AX HEX: E1 ! 'AX' key on Japanese AX kbd -CONSTANT: VK_OEM_102 HEX: E2 ! "<>" or "\|" on RT 102-key kbd. -CONSTANT: VK_ICO_HELP HEX: E3 ! Help key on ICO -CONSTANT: VK_ICO_00 HEX: E4 ! 00 key on ICO +CONSTANT: VK_OEM_AX 0xE1 ! 'AX' key on Japanese AX kbd +CONSTANT: VK_OEM_102 0xE2 ! "<>" or "\|" on RT 102-key kbd. +CONSTANT: VK_ICO_HELP 0xE3 ! Help key on ICO +CONSTANT: VK_ICO_00 0xE4 ! 00 key on ICO -CONSTANT: VK_PROCESSKEY HEX: E5 +CONSTANT: VK_PROCESSKEY 0xE5 -CONSTANT: VK_ICO_CLEAR HEX: E6 +CONSTANT: VK_ICO_CLEAR 0xE6 -CONSTANT: VK_PACKET HEX: E7 +CONSTANT: VK_PACKET 0xE7 ! 0xE8 : unassigned ! Nokia/Ericsson definitions -CONSTANT: VK_OEM_RESET HEX: E9 -CONSTANT: VK_OEM_JUMP HEX: EA -CONSTANT: VK_OEM_PA1 HEX: EB -CONSTANT: VK_OEM_PA2 HEX: EC -CONSTANT: VK_OEM_PA3 HEX: ED -CONSTANT: VK_OEM_WSCTRL HEX: EE -CONSTANT: VK_OEM_CUSEL HEX: EF -CONSTANT: VK_OEM_ATTN HEX: F0 -CONSTANT: VK_OEM_FINISH HEX: F1 -CONSTANT: VK_OEM_COPY HEX: F2 -CONSTANT: VK_OEM_AUTO HEX: F3 -CONSTANT: VK_OEM_ENLW HEX: F4 -CONSTANT: VK_OEM_BACKTAB HEX: F5 - -CONSTANT: VK_ATTN HEX: F6 -CONSTANT: VK_CRSEL HEX: F7 -CONSTANT: VK_EXSEL HEX: F8 -CONSTANT: VK_EREOF HEX: F9 -CONSTANT: VK_PLAY HEX: FA -CONSTANT: VK_ZOOM HEX: FB -CONSTANT: VK_NONAME HEX: FC -CONSTANT: VK_PA1 HEX: FD -CONSTANT: VK_OEM_CLEAR HEX: FE +CONSTANT: VK_OEM_RESET 0xE9 +CONSTANT: VK_OEM_JUMP 0xEA +CONSTANT: VK_OEM_PA1 0xEB +CONSTANT: VK_OEM_PA2 0xEC +CONSTANT: VK_OEM_PA3 0xED +CONSTANT: VK_OEM_WSCTRL 0xEE +CONSTANT: VK_OEM_CUSEL 0xEF +CONSTANT: VK_OEM_ATTN 0xF0 +CONSTANT: VK_OEM_FINISH 0xF1 +CONSTANT: VK_OEM_COPY 0xF2 +CONSTANT: VK_OEM_AUTO 0xF3 +CONSTANT: VK_OEM_ENLW 0xF4 +CONSTANT: VK_OEM_BACKTAB 0xF5 + +CONSTANT: VK_ATTN 0xF6 +CONSTANT: VK_CRSEL 0xF7 +CONSTANT: VK_EXSEL 0xF8 +CONSTANT: VK_EREOF 0xF9 +CONSTANT: VK_PLAY 0xFA +CONSTANT: VK_ZOOM 0xFB +CONSTANT: VK_NONAME 0xFC +CONSTANT: VK_PA1 0xFD +CONSTANT: VK_OEM_CLEAR 0xFE ! 0xFF : reserved ! Key State Masks for Mouse Messages -CONSTANT: MK_LBUTTON HEX: 0001 -CONSTANT: MK_RBUTTON HEX: 0002 -CONSTANT: MK_SHIFT HEX: 0004 -CONSTANT: MK_CONTROL HEX: 0008 -CONSTANT: MK_MBUTTON HEX: 0010 -CONSTANT: MK_XBUTTON1 HEX: 0020 -CONSTANT: MK_XBUTTON2 HEX: 0040 +CONSTANT: MK_LBUTTON 0x0001 +CONSTANT: MK_RBUTTON 0x0002 +CONSTANT: MK_SHIFT 0x0004 +CONSTANT: MK_CONTROL 0x0008 +CONSTANT: MK_MBUTTON 0x0010 +CONSTANT: MK_XBUTTON1 0x0020 +CONSTANT: MK_XBUTTON2 0x0040 ! Some fields are not defined for win64 ! Window field offsets for GetWindowLong() @@ -499,11 +499,11 @@ CONSTANT: GCLP_HMODULE -16 CONSTANT: GCLP_WNDPROC -24 CONSTANT: GCLP_HICONSM -34 -CONSTANT: MB_ICONASTERISK HEX: 00000040 -CONSTANT: MB_ICONEXCLAMATION HEX: 00000030 -CONSTANT: MB_ICONHAND HEX: 00000010 -CONSTANT: MB_ICONQUESTION HEX: 00000020 -CONSTANT: MB_OK HEX: 00000000 +CONSTANT: MB_ICONASTERISK 0x00000040 +CONSTANT: MB_ICONEXCLAMATION 0x00000030 +CONSTANT: MB_ICONHAND 0x00000010 +CONSTANT: MB_ICONQUESTION 0x00000020 +CONSTANT: MB_OK 0x00000000 ALIAS: FVIRTKEY TRUE CONSTANT: FNOINVERT 2 @@ -520,9 +520,9 @@ CONSTANT: MAPVK_VK_TO_VSC_EX 3 CONSTANT: TME_HOVER 1 CONSTANT: TME_LEAVE 2 CONSTANT: TME_NONCLIENT 16 -CONSTANT: TME_QUERY HEX: 40000000 -CONSTANT: TME_CANCEL HEX: 80000000 -CONSTANT: HOVER_DEFAULT HEX: ffffffff +CONSTANT: TME_QUERY 0x40000000 +CONSTANT: TME_CANCEL 0x80000000 +CONSTANT: HOVER_DEFAULT 0xffffffff STRUCT: TRACKMOUSEEVENT { cbSize DWORD } { dwFlags DWORD } @@ -530,8 +530,8 @@ STRUCT: TRACKMOUSEEVENT { dwHoverTime DWORD } ; TYPEDEF: TRACKMOUSEEVENT* LPTRACKMOUSEEVENT -CONSTANT: DBT_DEVICEARRIVAL HEX: 8000 -CONSTANT: DBT_DEVICEREMOVECOMPLETE HEX: 8004 +CONSTANT: DBT_DEVICEARRIVAL 0x8000 +CONSTANT: DBT_DEVICEREMOVECOMPLETE 0x8004 CONSTANT: DBT_DEVTYP_DEVICEINTERFACE 5 @@ -584,28 +584,28 @@ ALIAS: SWP_NOREPOSITION SWP_NOOWNERZORDER CONSTANT: SWP_DEFERERASE 8192 CONSTANT: SWP_ASYNCWINDOWPOS 16384 -CONSTANT: MF_ENABLED HEX: 0000 -CONSTANT: MF_GRAYED HEX: 0001 -CONSTANT: MF_DISABLED HEX: 0002 -CONSTANT: MF_STRING HEX: 0000 -CONSTANT: MF_BITMAP HEX: 0004 -CONSTANT: MF_UNCHECKED HEX: 0000 -CONSTANT: MF_CHECKED HEX: 0008 -CONSTANT: MF_POPUP HEX: 0010 -CONSTANT: MF_MENUBARBREAK HEX: 0020 -CONSTANT: MF_MENUBREAK HEX: 0040 -CONSTANT: MF_UNHILITE HEX: 0000 -CONSTANT: MF_HILITE HEX: 0080 -CONSTANT: MF_OWNERDRAW HEX: 0100 -CONSTANT: MF_USECHECKBITMAPS HEX: 0200 -CONSTANT: MF_BYCOMMAND HEX: 0000 -CONSTANT: MF_BYPOSITION HEX: 0400 -CONSTANT: MF_SEPARATOR HEX: 0800 -CONSTANT: MF_DEFAULT HEX: 1000 -CONSTANT: MF_SYSMENU HEX: 2000 -CONSTANT: MF_HELP HEX: 4000 -CONSTANT: MF_RIGHTJUSTIFY HEX: 4000 -CONSTANT: MF_MOUSESELECT HEX: 8000 +CONSTANT: MF_ENABLED 0x0000 +CONSTANT: MF_GRAYED 0x0001 +CONSTANT: MF_DISABLED 0x0002 +CONSTANT: MF_STRING 0x0000 +CONSTANT: MF_BITMAP 0x0004 +CONSTANT: MF_UNCHECKED 0x0000 +CONSTANT: MF_CHECKED 0x0008 +CONSTANT: MF_POPUP 0x0010 +CONSTANT: MF_MENUBARBREAK 0x0020 +CONSTANT: MF_MENUBREAK 0x0040 +CONSTANT: MF_UNHILITE 0x0000 +CONSTANT: MF_HILITE 0x0080 +CONSTANT: MF_OWNERDRAW 0x0100 +CONSTANT: MF_USECHECKBITMAPS 0x0200 +CONSTANT: MF_BYCOMMAND 0x0000 +CONSTANT: MF_BYPOSITION 0x0400 +CONSTANT: MF_SEPARATOR 0x0800 +CONSTANT: MF_DEFAULT 0x1000 +CONSTANT: MF_SYSMENU 0x2000 +CONSTANT: MF_HELP 0x4000 +CONSTANT: MF_RIGHTJUSTIFY 0x4000 +CONSTANT: MF_MOUSESELECT 0x8000 CONSTANT: SPI_GETBEEP 1 CONSTANT: SPI_SETBEEP 2 @@ -722,28 +722,28 @@ CONSTANT: SPI_GETMOUSESPEED 112 CONSTANT: SPI_SETMOUSESPEED 113 CONSTANT: SPI_GETSCREENSAVERRUNNING 114 -CONSTANT: SPI_GETACTIVEWINDOWTRACKING HEX: 1000 -CONSTANT: SPI_SETACTIVEWINDOWTRACKING HEX: 1001 -CONSTANT: SPI_GETMENUANIMATION HEX: 1002 -CONSTANT: SPI_SETMENUANIMATION HEX: 1003 -CONSTANT: SPI_GETCOMBOBOXANIMATION HEX: 1004 -CONSTANT: SPI_SETCOMBOBOXANIMATION HEX: 1005 -CONSTANT: SPI_GETLISTBOXSMOOTHSCROLLING HEX: 1006 -CONSTANT: SPI_SETLISTBOXSMOOTHSCROLLING HEX: 1007 -CONSTANT: SPI_GETGRADIENTCAPTIONS HEX: 1008 -CONSTANT: SPI_SETGRADIENTCAPTIONS HEX: 1009 -CONSTANT: SPI_GETMENUUNDERLINES HEX: 100A -CONSTANT: SPI_SETMENUUNDERLINES HEX: 100B -CONSTANT: SPI_GETACTIVEWNDTRKZORDER HEX: 100C -CONSTANT: SPI_SETACTIVEWNDTRKZORDER HEX: 100D -CONSTANT: SPI_GETHOTTRACKING HEX: 100E -CONSTANT: SPI_SETHOTTRACKING HEX: 100F -CONSTANT: SPI_GETFOREGROUNDLOCKTIMEOUT HEX: 2000 -CONSTANT: SPI_SETFOREGROUNDLOCKTIMEOUT HEX: 2001 -CONSTANT: SPI_GETACTIVEWNDTRKTIMEOUT HEX: 2002 -CONSTANT: SPI_SETACTIVEWNDTRKTIMEOUT HEX: 2003 -CONSTANT: SPI_GETFOREGROUNDFLASHCOUNT HEX: 2004 -CONSTANT: SPI_SETFOREGROUNDFLASHCOUNT HEX: 2005 +CONSTANT: SPI_GETACTIVEWINDOWTRACKING 0x1000 +CONSTANT: SPI_SETACTIVEWINDOWTRACKING 0x1001 +CONSTANT: SPI_GETMENUANIMATION 0x1002 +CONSTANT: SPI_SETMENUANIMATION 0x1003 +CONSTANT: SPI_GETCOMBOBOXANIMATION 0x1004 +CONSTANT: SPI_SETCOMBOBOXANIMATION 0x1005 +CONSTANT: SPI_GETLISTBOXSMOOTHSCROLLING 0x1006 +CONSTANT: SPI_SETLISTBOXSMOOTHSCROLLING 0x1007 +CONSTANT: SPI_GETGRADIENTCAPTIONS 0x1008 +CONSTANT: SPI_SETGRADIENTCAPTIONS 0x1009 +CONSTANT: SPI_GETMENUUNDERLINES 0x100A +CONSTANT: SPI_SETMENUUNDERLINES 0x100B +CONSTANT: SPI_GETACTIVEWNDTRKZORDER 0x100C +CONSTANT: SPI_SETACTIVEWNDTRKZORDER 0x100D +CONSTANT: SPI_GETHOTTRACKING 0x100E +CONSTANT: SPI_SETHOTTRACKING 0x100F +CONSTANT: SPI_GETFOREGROUNDLOCKTIMEOUT 0x2000 +CONSTANT: SPI_SETFOREGROUNDLOCKTIMEOUT 0x2001 +CONSTANT: SPI_GETACTIVEWNDTRKTIMEOUT 0x2002 +CONSTANT: SPI_SETACTIVEWNDTRKTIMEOUT 0x2003 +CONSTANT: SPI_GETFOREGROUNDFLASHCOUNT 0x2004 +CONSTANT: SPI_SETFOREGROUNDFLASHCOUNT 0x2005 ! SystemParamInfo Flags CONSTANT: SPIF_UPDATEINIFILE 1 @@ -752,7 +752,7 @@ ALIAS: SPIF_SENDCHANGE SPIF_SENDWININICHANGE TYPEDEF: HANDLE HRAWINPUT -: GET_RAWINPUT_CODE_WPARAM ( wParam -- n ) HEX: ff bitand ; inline +: GET_RAWINPUT_CODE_WPARAM ( wParam -- n ) 0xff bitand ; inline CONSTANT: RIM_INPUT 0 CONSTANT: RIM_INPUTSINK 1 @@ -785,12 +785,12 @@ STRUCT: RAWMOUSE TYPEDEF: RAWMOUSE* PRAWMOUSE TYPEDEF: RAWMOUSE* LPRAWMOUSE -CONSTANT: RI_MOUSE_LEFT_BUTTON_DOWN HEX: 0001 -CONSTANT: RI_MOUSE_LEFT_BUTTON_UP HEX: 0002 -CONSTANT: RI_MOUSE_RIGHT_BUTTON_DOWN HEX: 0004 -CONSTANT: RI_MOUSE_RIGHT_BUTTON_UP HEX: 0008 -CONSTANT: RI_MOUSE_MIDDLE_BUTTON_DOWN HEX: 0010 -CONSTANT: RI_MOUSE_MIDDLE_BUTTON_UP HEX: 0020 +CONSTANT: RI_MOUSE_LEFT_BUTTON_DOWN 0x0001 +CONSTANT: RI_MOUSE_LEFT_BUTTON_UP 0x0002 +CONSTANT: RI_MOUSE_RIGHT_BUTTON_DOWN 0x0004 +CONSTANT: RI_MOUSE_RIGHT_BUTTON_UP 0x0008 +CONSTANT: RI_MOUSE_MIDDLE_BUTTON_DOWN 0x0010 +CONSTANT: RI_MOUSE_MIDDLE_BUTTON_UP 0x0020 : RI_MOUSE_BUTTON_1_DOWN ( -- n ) RI_MOUSE_LEFT_BUTTON_DOWN ; inline : RI_MOUSE_BUTTON_1_UP ( -- n ) RI_MOUSE_LEFT_BUTTON_UP ; inline @@ -799,17 +799,17 @@ CONSTANT: RI_MOUSE_MIDDLE_BUTTON_UP HEX: 0020 : RI_MOUSE_BUTTON_3_DOWN ( -- n ) RI_MOUSE_MIDDLE_BUTTON_DOWN ; inline : RI_MOUSE_BUTTON_3_UP ( -- n ) RI_MOUSE_MIDDLE_BUTTON_UP ; inline -CONSTANT: RI_MOUSE_BUTTON_4_DOWN HEX: 0040 -CONSTANT: RI_MOUSE_BUTTON_4_UP HEX: 0080 -CONSTANT: RI_MOUSE_BUTTON_5_DOWN HEX: 0100 -CONSTANT: RI_MOUSE_BUTTON_5_UP HEX: 0200 -CONSTANT: RI_MOUSE_WHEEL HEX: 0400 +CONSTANT: RI_MOUSE_BUTTON_4_DOWN 0x0040 +CONSTANT: RI_MOUSE_BUTTON_4_UP 0x0080 +CONSTANT: RI_MOUSE_BUTTON_5_DOWN 0x0100 +CONSTANT: RI_MOUSE_BUTTON_5_UP 0x0200 +CONSTANT: RI_MOUSE_WHEEL 0x0400 CONSTANT: MOUSE_MOVE_RELATIVE 0 CONSTANT: MOUSE_MOVE_ABSOLUTE 1 -CONSTANT: MOUSE_VIRTUAL_DESKTOP HEX: 02 -CONSTANT: MOUSE_ATTRIBUTES_CHANGED HEX: 04 -CONSTANT: MOUSE_MOVE_NOCOALESCE HEX: 08 +CONSTANT: MOUSE_VIRTUAL_DESKTOP 0x02 +CONSTANT: MOUSE_ATTRIBUTES_CHANGED 0x04 +CONSTANT: MOUSE_MOVE_NOCOALESCE 0x08 STRUCT: RAWKEYBOARD { MakeCode USHORT } @@ -821,14 +821,14 @@ STRUCT: RAWKEYBOARD TYPEDEF: RAWKEYBOARD* PRAWKEYBOARD TYPEDEF: RAWKEYBOARD* LPRAWKEYBOARD -CONSTANT: KEYBOARD_OVERRUN_MAKE_CODE HEX: FF +CONSTANT: KEYBOARD_OVERRUN_MAKE_CODE 0xFF CONSTANT: RI_KEY_MAKE 0 CONSTANT: RI_KEY_BREAK 1 CONSTANT: RI_KEY_E0 2 CONSTANT: RI_KEY_E1 4 CONSTANT: RI_KEY_TERMSRV_SET_LED 8 -CONSTANT: RI_KEY_TERMSRV_SHADOW HEX: 10 +CONSTANT: RI_KEY_TERMSRV_SHADOW 0x10 STRUCT: RAWHID { dwSizeHid DWORD } @@ -852,11 +852,11 @@ TYPEDEF: RAWINPUT* LPRAWINPUT : NEXTRAWINPUTBLOCK ( struct -- next-struct ) dup header>> dwSize>> swap RAWINPUT_ALIGN RAWINPUT memory>struct ; inline -CONSTANT: RID_INPUT HEX: 10000003 -CONSTANT: RID_HEADER HEX: 10000005 -CONSTANT: RIDI_PREPARSEDDATA HEX: 20000005 -CONSTANT: RIDI_DEVICENAME HEX: 20000007 -CONSTANT: RIDI_DEVICEINFO HEX: 2000000b +CONSTANT: RID_INPUT 0x10000003 +CONSTANT: RID_HEADER 0x10000005 +CONSTANT: RIDI_PREPARSEDDATA 0x20000005 +CONSTANT: RIDI_DEVICENAME 0x20000007 +CONSTANT: RIDI_DEVICEINFO 0x2000000b STRUCT: RID_DEVICE_INFO_MOUSE { dwId DWORD } @@ -902,24 +902,24 @@ TYPEDEF: RAWINPUTDEVICE* PRAWINPUTDEVICE TYPEDEF: RAWINPUTDEVICE* LPRAWINPUTDEVICE TYPEDEF: RAWINPUTDEVICE* PCRAWINPUTDEVICE -CONSTANT: RIDEV_REMOVE HEX: 00000001 -CONSTANT: RIDEV_EXCLUDE HEX: 00000010 -CONSTANT: RIDEV_PAGEONLY HEX: 00000020 -CONSTANT: RIDEV_NOLEGACY HEX: 00000030 -CONSTANT: RIDEV_INPUTSINK HEX: 00000100 -CONSTANT: RIDEV_CAPTUREMOUSE HEX: 00000200 -CONSTANT: RIDEV_NOHOTKEYS HEX: 00000200 -CONSTANT: RIDEV_APPKEYS HEX: 00000400 -CONSTANT: RIDEV_EXINPUTSINK HEX: 00001000 -CONSTANT: RIDEV_DEVNOTIFY HEX: 00002000 -CONSTANT: RIDEV_EXMODEMASK HEX: 000000F0 +CONSTANT: RIDEV_REMOVE 0x00000001 +CONSTANT: RIDEV_EXCLUDE 0x00000010 +CONSTANT: RIDEV_PAGEONLY 0x00000020 +CONSTANT: RIDEV_NOLEGACY 0x00000030 +CONSTANT: RIDEV_INPUTSINK 0x00000100 +CONSTANT: RIDEV_CAPTUREMOUSE 0x00000200 +CONSTANT: RIDEV_NOHOTKEYS 0x00000200 +CONSTANT: RIDEV_APPKEYS 0x00000400 +CONSTANT: RIDEV_EXINPUTSINK 0x00001000 +CONSTANT: RIDEV_DEVNOTIFY 0x00002000 +CONSTANT: RIDEV_EXMODEMASK 0x000000F0 : RIDEV_EXMODE ( mode -- x ) RIDEV_EXMODEMASK bitand ; inline CONSTANT: GIDC_ARRIVAL 1 CONSTANT: GIDC_REMOVAL 2 -: GET_DEVICE_CHANGE_WPARAM ( wParam -- x ) HEX: ffff bitand ; inline +: GET_DEVICE_CHANGE_WPARAM ( wParam -- x ) 0xffff bitand ; inline STRUCT: RAWINPUTDEVICELIST { hDevice HANDLE } @@ -928,14 +928,14 @@ TYPEDEF: RAWINPUTDEVICELIST* PRAWINPUTDEVICELIST CONSTANT: CCHFORMNAME 32 -CONSTANT: CDS_UPDATEREGISTRY HEX: 00000001 -CONSTANT: CDS_TEST HEX: 00000002 -CONSTANT: CDS_FULLSCREEN HEX: 00000004 -CONSTANT: CDS_GLOBAL HEX: 00000008 -CONSTANT: CDS_SET_PRIMARY HEX: 00000010 -CONSTANT: CDS_RESET HEX: 40000000 -CONSTANT: CDS_SETRECT HEX: 20000000 -CONSTANT: CDS_NORESET HEX: 10000000 +CONSTANT: CDS_UPDATEREGISTRY 0x00000001 +CONSTANT: CDS_TEST 0x00000002 +CONSTANT: CDS_FULLSCREEN 0x00000004 +CONSTANT: CDS_GLOBAL 0x00000008 +CONSTANT: CDS_SET_PRIMARY 0x00000010 +CONSTANT: CDS_RESET 0x40000000 +CONSTANT: CDS_SETRECT 0x20000000 +CONSTANT: CDS_NORESET 0x10000000 CONSTANT: DISP_CHANGE_SUCCESSFUL 0 CONSTANT: DISP_CHANGE_RESTART 1 diff --git a/basis/windows/usp10/usp10.factor b/basis/windows/usp10/usp10.factor index 7a103a91b4..e77a8cdacf 100644 --- a/basis/windows/usp10/usp10.factor +++ b/basis/windows/usp10/usp10.factor @@ -216,27 +216,27 @@ FUNCTION: HRESULT ScriptCacheGetHeight ( long* tmHeight ) ; -CONSTANT: SSA_PASSWORD HEX: 00000001 -CONSTANT: SSA_TAB HEX: 00000002 -CONSTANT: SSA_CLIP HEX: 00000004 -CONSTANT: SSA_FIT HEX: 00000008 -CONSTANT: SSA_DZWG HEX: 00000010 -CONSTANT: SSA_FALLBACK HEX: 00000020 -CONSTANT: SSA_BREAK HEX: 00000040 -CONSTANT: SSA_GLYPHS HEX: 00000080 -CONSTANT: SSA_RTL HEX: 00000100 -CONSTANT: SSA_GCP HEX: 00000200 -CONSTANT: SSA_HOTKEY HEX: 00000400 -CONSTANT: SSA_METAFILE HEX: 00000800 -CONSTANT: SSA_LINK HEX: 00001000 -CONSTANT: SSA_HIDEHOTKEY HEX: 00002000 -CONSTANT: SSA_HOTKEYONLY HEX: 00002400 -CONSTANT: SSA_FULLMEASURE HEX: 04000000 -CONSTANT: SSA_LPKANSIFALLBACK HEX: 08000000 -CONSTANT: SSA_PIDX HEX: 10000000 -CONSTANT: SSA_LAYOUTRTL HEX: 20000000 -CONSTANT: SSA_DONTGLYPH HEX: 40000000 -CONSTANT: SSA_NOKASHIDA HEX: 80000000 +CONSTANT: SSA_PASSWORD 0x00000001 +CONSTANT: SSA_TAB 0x00000002 +CONSTANT: SSA_CLIP 0x00000004 +CONSTANT: SSA_FIT 0x00000008 +CONSTANT: SSA_DZWG 0x00000010 +CONSTANT: SSA_FALLBACK 0x00000020 +CONSTANT: SSA_BREAK 0x00000040 +CONSTANT: SSA_GLYPHS 0x00000080 +CONSTANT: SSA_RTL 0x00000100 +CONSTANT: SSA_GCP 0x00000200 +CONSTANT: SSA_HOTKEY 0x00000400 +CONSTANT: SSA_METAFILE 0x00000800 +CONSTANT: SSA_LINK 0x00001000 +CONSTANT: SSA_HIDEHOTKEY 0x00002000 +CONSTANT: SSA_HOTKEYONLY 0x00002400 +CONSTANT: SSA_FULLMEASURE 0x04000000 +CONSTANT: SSA_LPKANSIFALLBACK 0x08000000 +CONSTANT: SSA_PIDX 0x10000000 +CONSTANT: SSA_LAYOUTRTL 0x20000000 +CONSTANT: SSA_DONTGLYPH 0x40000000 +CONSTANT: SSA_NOKASHIDA 0x80000000 STRUCT: SCRIPT_TABDEF { cTabStops int } diff --git a/basis/windows/winsock/winsock.factor b/basis/windows/winsock/winsock.factor index 384f18caef..3441569624 100644 --- a/basis/windows/winsock/winsock.factor +++ b/basis/windows/winsock/winsock.factor @@ -10,7 +10,7 @@ IN: windows.winsock TYPEDEF: int* SOCKET : ( -- byte-array ) - HEX: 190 ; + 0x190 ; CONSTANT: SOCK_STREAM 1 CONSTANT: SOCK_DGRAM 2 @@ -18,27 +18,27 @@ CONSTANT: SOCK_RAW 3 CONSTANT: SOCK_RDM 4 CONSTANT: SOCK_SEQPACKET 5 -CONSTANT: SO_DEBUG HEX: 1 -CONSTANT: SO_ACCEPTCONN HEX: 2 -CONSTANT: SO_REUSEADDR HEX: 4 -CONSTANT: SO_KEEPALIVE HEX: 8 -CONSTANT: SO_DONTROUTE HEX: 10 -CONSTANT: SO_BROADCAST HEX: 20 -CONSTANT: SO_USELOOPBACK HEX: 40 -CONSTANT: SO_LINGER HEX: 80 -CONSTANT: SO_OOBINLINE HEX: 100 +CONSTANT: SO_DEBUG 0x1 +CONSTANT: SO_ACCEPTCONN 0x2 +CONSTANT: SO_REUSEADDR 0x4 +CONSTANT: SO_KEEPALIVE 0x8 +CONSTANT: SO_DONTROUTE 0x10 +CONSTANT: SO_BROADCAST 0x20 +CONSTANT: SO_USELOOPBACK 0x40 +CONSTANT: SO_LINGER 0x80 +CONSTANT: SO_OOBINLINE 0x100 : SO_DONTLINGER ( -- n ) SO_LINGER bitnot ; inline -CONSTANT: SO_SNDBUF HEX: 1001 -CONSTANT: SO_RCVBUF HEX: 1002 -CONSTANT: SO_SNDLOWAT HEX: 1003 -CONSTANT: SO_RCVLOWAT HEX: 1004 -CONSTANT: SO_SNDTIMEO HEX: 1005 -CONSTANT: SO_RCVTIMEO HEX: 1006 -CONSTANT: SO_ERROR HEX: 1007 -CONSTANT: SO_TYPE HEX: 1008 +CONSTANT: SO_SNDBUF 0x1001 +CONSTANT: SO_RCVBUF 0x1002 +CONSTANT: SO_SNDLOWAT 0x1003 +CONSTANT: SO_RCVLOWAT 0x1004 +CONSTANT: SO_SNDTIMEO 0x1005 +CONSTANT: SO_RCVTIMEO 0x1006 +CONSTANT: SO_ERROR 0x1007 +CONSTANT: SO_TYPE 0x1008 -CONSTANT: TCP_NODELAY HEX: 1 +CONSTANT: TCP_NODELAY 0x1 CONSTANT: AF_UNSPEC 0 CONSTANT: AF_UNIX 1 @@ -102,7 +102,7 @@ CONSTANT: SD_RECV 0 CONSTANT: SD_SEND 1 CONSTANT: SD_BOTH 2 -CONSTANT: SOL_SOCKET HEX: ffff +CONSTANT: SOL_SOCKET 0xffff C-TYPE: sockaddr @@ -450,7 +450,7 @@ ERROR: winsock-exception n string ; SOCKET_ERROR = [ winsock-error ] when ; : init-winsock ( -- ) - HEX: 0202 WSAStartup winsock-return-check ; + 0x0202 WSAStartup winsock-return-check ; : shutdown-winsock ( -- ) WSACleanup winsock-return-check ; diff --git a/basis/x11/glx/glx.factor b/basis/x11/glx/glx.factor index d095853913..67af4ede49 100644 --- a/basis/x11/glx/glx.factor +++ b/basis/x11/glx/glx.factor @@ -90,8 +90,8 @@ CONSTANT: GLX_SAMPLE_BUFFERS 100000 CONSTANT: GLX_SAMPLES 100001 ! GLX_ARB_fbconfig_float -CONSTANT: GLX_RGBA_FLOAT_TYPE HEX: 20B9 -CONSTANT: GLX_RGBA_FLOAT_BIT HEX: 0004 +CONSTANT: GLX_RGBA_FLOAT_TYPE 0x20B9 +CONSTANT: GLX_RGBA_FLOAT_BIT 0x0004 ! GLX Events ! (also skipped for now. only has GLXPbufferClobberEvent, the rest is handled by xlib methinks) diff --git a/basis/x11/xlib/xlib.factor b/basis/x11/xlib/xlib.factor index 33293746c5..70e2a449af 100644 --- a/basis/x11/xlib/xlib.factor +++ b/basis/x11/xlib/xlib.factor @@ -333,22 +333,22 @@ X-FUNCTION: Colormap XCreateColormap ( Display* display, Window w, Visual* visua : GCDashList ( -- n ) 21 2^ ; inline : GCArcMode ( -- n ) 22 2^ ; inline -CONSTANT: GXclear HEX: 0 -CONSTANT: GXand HEX: 1 -CONSTANT: GXandReverse HEX: 2 -CONSTANT: GXcopy HEX: 3 -CONSTANT: GXandInverted HEX: 4 -CONSTANT: GXnoop HEX: 5 -CONSTANT: GXxor HEX: 6 -CONSTANT: GXor HEX: 7 -CONSTANT: GXnor HEX: 8 -CONSTANT: GXequiv HEX: 9 -CONSTANT: GXinvert HEX: a -CONSTANT: GXorReverse HEX: b -CONSTANT: GXcopyInverted HEX: c -CONSTANT: GXorInverted HEX: d -CONSTANT: GXnand HEX: e -CONSTANT: GXset HEX: f +CONSTANT: GXclear 0x0 +CONSTANT: GXand 0x1 +CONSTANT: GXandReverse 0x2 +CONSTANT: GXcopy 0x3 +CONSTANT: GXandInverted 0x4 +CONSTANT: GXnoop 0x5 +CONSTANT: GXxor 0x6 +CONSTANT: GXor 0x7 +CONSTANT: GXnor 0x8 +CONSTANT: GXequiv 0x9 +CONSTANT: GXinvert 0xa +CONSTANT: GXorReverse 0xb +CONSTANT: GXcopyInverted 0xc +CONSTANT: GXorInverted 0xd +CONSTANT: GXnand 0xe +CONSTANT: GXset 0xf STRUCT: XGCValues { function int } @@ -1211,17 +1211,17 @@ X-FUNCTION: int XLookupString ( ! 16.7 Determining the Appropriate Visual Type -CONSTANT: VisualNoMask HEX: 0 -CONSTANT: VisualIDMask HEX: 1 -CONSTANT: VisualScreenMask HEX: 2 -CONSTANT: VisualDepthMask HEX: 4 -CONSTANT: VisualClassMask HEX: 8 -CONSTANT: VisualRedMaskMask HEX: 10 -CONSTANT: VisualGreenMaskMask HEX: 20 -CONSTANT: VisualBlueMaskMask HEX: 40 -CONSTANT: VisualColormapSizeMask HEX: 80 -CONSTANT: VisualBitsPerRGBMask HEX: 100 -CONSTANT: VisualAllMask HEX: 1FF +CONSTANT: VisualNoMask 0x0 +CONSTANT: VisualIDMask 0x1 +CONSTANT: VisualScreenMask 0x2 +CONSTANT: VisualDepthMask 0x4 +CONSTANT: VisualClassMask 0x8 +CONSTANT: VisualRedMaskMask 0x10 +CONSTANT: VisualGreenMaskMask 0x20 +CONSTANT: VisualBlueMaskMask 0x40 +CONSTANT: VisualColormapSizeMask 0x80 +CONSTANT: VisualBitsPerRGBMask 0x100 +CONSTANT: VisualAllMask 0x1FF STRUCT: XVisualInfo { visual Visual* } @@ -1351,15 +1351,15 @@ X-FUNCTION: int XBell ( Display* display, int percent ) ; ! !!! INPUT METHODS -CONSTANT: XIMPreeditArea HEX: 0001 -CONSTANT: XIMPreeditCallbacks HEX: 0002 -CONSTANT: XIMPreeditPosition HEX: 0004 -CONSTANT: XIMPreeditNothing HEX: 0008 -CONSTANT: XIMPreeditNone HEX: 0010 -CONSTANT: XIMStatusArea HEX: 0100 -CONSTANT: XIMStatusCallbacks HEX: 0200 -CONSTANT: XIMStatusNothing HEX: 0400 -CONSTANT: XIMStatusNone HEX: 0800 +CONSTANT: XIMPreeditArea 0x0001 +CONSTANT: XIMPreeditCallbacks 0x0002 +CONSTANT: XIMPreeditPosition 0x0004 +CONSTANT: XIMPreeditNothing 0x0008 +CONSTANT: XIMPreeditNone 0x0010 +CONSTANT: XIMStatusArea 0x0100 +CONSTANT: XIMStatusCallbacks 0x0200 +CONSTANT: XIMStatusNothing 0x0400 +CONSTANT: XIMStatusNone 0x0800 CONSTANT: XNVaNestedList "XNVaNestedList" CONSTANT: XNQueryInputStyle "queryInputStyle" diff --git a/basis/xml/autoencoding/autoencoding.factor b/basis/xml/autoencoding/autoencoding.factor index 1057463d4f..ed9b341c52 100644 --- a/basis/xml/autoencoding/autoencoding.factor +++ b/basis/xml/autoencoding/autoencoding.factor @@ -77,9 +77,9 @@ IN: xml.autoencoding get-char { { CHAR: < [ start< ] } { 0 [ start-utf16be ] } - { HEX: EF [ skip-utf8-bom ] } - { HEX: FF [ skip-utf16le-bom ] } - { HEX: FE [ skip-utf16be-bom ] } + { 0xEF [ skip-utf8-bom ] } + { 0xFF [ skip-utf16le-bom ] } + { 0xFE [ skip-utf16be-bom ] } [ drop utf8 decode-stream check f ] } case ; diff --git a/basis/xml/char-classes/char-classes.factor b/basis/xml/char-classes/char-classes.factor index 77c9db3c1d..a117b3cec8 100644 --- a/basis/xml/char-classes/char-classes.factor +++ b/basis/xml/char-classes/char-classes.factor @@ -6,7 +6,7 @@ IN: xml.char-classes CATEGORY: 1.0name-start Ll Lu Lo Lt Nl | { - [ HEX: 2BB HEX: 2C1 between? ] + [ 0x2BB 0x2C1 between? ] [ "\u000559\u0006E5\u0006E6_:" member? ] } 1|| ; @@ -37,19 +37,19 @@ HINTS: name-char? { object fixnum } ; ! 1.0: ! #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] { - [ HEX: 20 HEX: D7FF between? ] + [ 0x20 0xD7FF between? ] [ "\t\r\n" member? ] - [ HEX: E000 HEX: FFFD between? ] - [ HEX: 10000 HEX: 10FFFF between? ] + [ 0xE000 0xFFFD between? ] + [ 0x10000 0x10FFFF between? ] } 1|| ; inline : 1.1-text? ( char -- ? ) ! 1.1: ! [#x1-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF] { - [ HEX: 1 HEX: D7FF between? ] - [ HEX: E000 HEX: FFFD between? ] - [ HEX: 10000 HEX: 10FFFF between? ] + [ 0x1 0xD7FF between? ] + [ 0xE000 0xFFFD between? ] + [ 0x10000 0x10FFFF between? ] } 1|| ; inline PRIVATE> diff --git a/core/alien/alien-tests.factor b/core/alien/alien-tests.factor index 1009081236..075a672bbd 100644 --- a/core/alien/alien-tests.factor +++ b/core/alien/alien-tests.factor @@ -43,20 +43,20 @@ IN: alien.tests ] unit-test cell 8 = [ - [ HEX: 123412341234 ] [ + [ 0x123412341234 ] [ 8 - HEX: 123412341234 over 0 set-alien-signed-8 + 0x123412341234 over 0 set-alien-signed-8 0 alien-signed-8 ] unit-test - [ HEX: 123412341234 ] [ + [ 0x123412341234 ] [ 8 - HEX: 123412341234 over 0 set-alien-signed-cell + 0x123412341234 over 0 set-alien-signed-cell 0 alien-signed-cell ] unit-test ] when -[ "ALIEN: 1234" ] [ HEX: 1234 unparse ] unit-test +[ "ALIEN: 1234" ] [ 0x1234 unparse ] unit-test [ ] [ 0 B{ 1 2 3 } drop ] unit-test diff --git a/core/bootstrap/layouts/layouts.factor b/core/bootstrap/layouts/layouts.factor index 61bff38201..e139faa505 100644 --- a/core/bootstrap/layouts/layouts.factor +++ b/core/bootstrap/layouts/layouts.factor @@ -7,7 +7,7 @@ kernel.private ; 16 data-alignment set -BIN: 1111 tag-mask set +0b1111 tag-mask set 4 tag-bits set 14 num-types set diff --git a/core/checksums/crc32/crc32-tests.factor b/core/checksums/crc32/crc32-tests.factor index 6fe4b995ee..a725e0479a 100644 --- a/core/checksums/crc32/crc32-tests.factor +++ b/core/checksums/crc32/crc32-tests.factor @@ -2,5 +2,5 @@ USING: checksums checksums.crc32 kernel math tools.test namespaces ; [ B{ 0 0 0 0 } ] [ "" crc32 checksum-bytes ] unit-test -[ B{ HEX: cb HEX: f4 HEX: 39 HEX: 26 } ] [ "123456789" crc32 checksum-bytes ] unit-test +[ B{ 0xcb 0xf4 0x39 0x26 } ] [ "123456789" crc32 checksum-bytes ] unit-test diff --git a/core/checksums/crc32/crc32.factor b/core/checksums/crc32/crc32.factor index e937cf5910..415317c813 100644 --- a/core/checksums/crc32/crc32.factor +++ b/core/checksums/crc32/crc32.factor @@ -5,7 +5,7 @@ words io io.binary io.files quotations definitions checksums ; IN: checksums.crc32 -CONSTANT: crc32-polynomial HEX: edb88320 +CONSTANT: crc32-polynomial 0xedb88320 CONSTANT: crc32-table V{ } @@ -25,7 +25,7 @@ SINGLETON: crc32 INSTANCE: crc32 checksum : init-crc32 ( input checksum -- x y input ) - drop [ HEX: ffffffff dup ] dip ; inline + drop [ 0xffffffff dup ] dip ; inline : finish-crc32 ( x y -- bytes ) bitxor 4 >be ; inline diff --git a/core/hashtables/hashtables.factor b/core/hashtables/hashtables.factor index 4977e3df83..7d0f4b85ff 100644 --- a/core/hashtables/hashtables.factor +++ b/core/hashtables/hashtables.factor @@ -178,7 +178,7 @@ M: hashtable assoc-like ! magic number is 2^29/phi instead of 2^32/phi ! due to max fixnum value on 32-bit machines : hash-combine ( obj oldhash -- newhash ) - [ hashcode HEX: 13c6ef37 + ] dip + [ hashcode 0x13c6ef37 + ] dip [ 6 shift ] [ -2 shift ] bi + + ; INSTANCE: hashtable assoc diff --git a/core/io/binary/binary-docs.factor b/core/io/binary/binary-docs.factor index 443de70132..250f4e2880 100644 --- a/core/io/binary/binary-docs.factor +++ b/core/io/binary/binary-docs.factor @@ -6,7 +6,7 @@ ARTICLE: "stream-binary" "Working with binary data" $nl "There are two ways to order the bytes making up an integer; " { $emphasis "little endian" } " byte order outputs the least significant byte first, and the most significant byte last, whereas " { $emphasis "big endian" } " is the other way around." $nl -"Consider the hexadecimal integer " { $snippet "HEX: cafebabe" } ". Little endian byte order yields the following sequence of bytes:" +"Consider the hexadecimal integer " { $snippet "0xcafebabe" } ". Little endian byte order yields the following sequence of bytes:" { $table { "Byte:" "1" "2" "3" "4" } { "Value:" { $snippet "be" } { $snippet "ba" } { $snippet "fe" } { $snippet "ca" } } diff --git a/core/io/binary/binary-tests.factor b/core/io/binary/binary-tests.factor index fc94c1a7ff..8ed3a627d9 100644 --- a/core/io/binary/binary-tests.factor +++ b/core/io/binary/binary-tests.factor @@ -1,31 +1,31 @@ USING: io.binary tools.test classes math ; IN: io.binary.tests -[ HEX: 03020100 ] [ B{ 0 1 2 3 } le> ] unit-test -[ HEX: 00010203 ] [ B{ 0 1 2 3 } be> ] unit-test +[ 0x03020100 ] [ B{ 0 1 2 3 } le> ] unit-test +[ 0x00010203 ] [ B{ 0 1 2 3 } be> ] unit-test -[ HEX: 332211 ] [ - B{ HEX: 11 HEX: 22 HEX: 33 } le> +[ 0x332211 ] [ + B{ 0x11 0x22 0x33 } le> ] unit-test -[ HEX: 7a2c793b2ff08554 ] [ - B{ HEX: 54 HEX: 85 HEX: f0 HEX: 2f HEX: 3b HEX: 79 HEX: 2c HEX: 7a } le> +[ 0x7a2c793b2ff08554 ] [ + B{ 0x54 0x85 0xf0 0x2f 0x3b 0x79 0x2c 0x7a } le> ] unit-test -[ HEX: 988a259c3433f237 ] [ - B{ HEX: 37 HEX: f2 HEX: 33 HEX: 34 HEX: 9c HEX: 25 HEX: 8a HEX: 98 } le> +[ 0x988a259c3433f237 ] [ + B{ 0x37 0xf2 0x33 0x34 0x9c 0x25 0x8a 0x98 } le> ] unit-test -[ B{ 0 0 4 HEX: d2 } ] [ 1234 4 >be ] unit-test -[ B{ 0 0 0 0 0 0 4 HEX: d2 } ] [ 1234 8 >be ] unit-test -[ B{ HEX: d2 4 0 0 } ] [ 1234 4 >le ] unit-test -[ B{ HEX: d2 4 0 0 0 0 0 0 } ] [ 1234 8 >le ] unit-test +[ B{ 0 0 4 0xd2 } ] [ 1234 4 >be ] unit-test +[ B{ 0 0 0 0 0 0 4 0xd2 } ] [ 1234 8 >be ] unit-test +[ B{ 0xd2 4 0 0 } ] [ 1234 4 >le ] unit-test +[ B{ 0xd2 4 0 0 0 0 0 0 } ] [ 1234 8 >le ] unit-test [ 1234 ] [ 1234 4 >be be> ] unit-test [ 1234 ] [ 1234 4 >le le> ] unit-test [ fixnum ] [ B{ 0 0 0 0 0 0 0 0 0 0 } be> class-of ] unit-test -[ HEX: 56780000 HEX: 12340000 ] [ HEX: 1234000056780000 d>w/w ] unit-test -[ HEX: 5678 HEX: 1234 ] [ HEX: 12345678 w>h/h ] unit-test -[ HEX: 34 HEX: 12 ] [ HEX: 1234 h>b/b ] unit-test +[ 0x56780000 0x12340000 ] [ 0x1234000056780000 d>w/w ] unit-test +[ 0x5678 0x1234 ] [ 0x12345678 w>h/h ] unit-test +[ 0x34 0x12 ] [ 0x1234 h>b/b ] unit-test diff --git a/core/io/binary/binary.factor b/core/io/binary/binary.factor index 5d416400e6..793fe0686a 100644 --- a/core/io/binary/binary.factor +++ b/core/io/binary/binary.factor @@ -6,7 +6,7 @@ IN: io.binary : le> ( seq -- x ) dup length iota 0 [ 8 * shift + ] 2reduce ; : be> ( seq -- x ) 0 [ [ 8 shift ] dip + ] reduce ; -: mask-byte ( x -- y ) HEX: ff bitand ; inline +: mask-byte ( x -- y ) 0xff bitand ; inline : nth-byte ( x n -- b ) -8 * shift mask-byte ; inline @@ -14,12 +14,12 @@ IN: io.binary : >be ( x n -- byte-array ) >le reverse! ; : d>w/w ( d -- w1 w2 ) - [ HEX: ffffffff bitand ] - [ -32 shift HEX: ffffffff bitand ] bi ; + [ 0xffffffff bitand ] + [ -32 shift 0xffffffff bitand ] bi ; : w>h/h ( w -- h1 h2 ) - [ HEX: ffff bitand ] - [ -16 shift HEX: ffff bitand ] bi ; + [ 0xffff bitand ] + [ -16 shift 0xffff bitand ] bi ; : h>b/b ( h -- b1 b2 ) [ mask-byte ] diff --git a/core/io/encodings/encodings.factor b/core/io/encodings/encodings.factor index 1a6df8898e..aa5d3af93e 100644 --- a/core/io/encodings/encodings.factor +++ b/core/io/encodings/encodings.factor @@ -23,7 +23,7 @@ M: object encode-string [ encode-char ] 2curry each ; inline GENERIC: ( stream encoding -- newstream ) -CONSTANT: replacement-char HEX: fffd +CONSTANT: replacement-char 0xfffd TUPLE: decoder { stream read-only } { code read-only } { cr boolean } ; INSTANCE: decoder input-stream diff --git a/core/io/encodings/utf16/utf16-tests.factor b/core/io/encodings/utf16/utf16-tests.factor index 2a5ac39ef7..a461787ef3 100644 --- a/core/io/encodings/utf16/utf16-tests.factor +++ b/core/io/encodings/utf16/utf16-tests.factor @@ -6,23 +6,23 @@ io.encodings.string alien.c-types alien.strings accessors classes ; IN: io.encodings.utf16.tests [ { CHAR: x } ] [ B{ 0 CHAR: x } utf16be decode >array ] unit-test -[ { HEX: 1D11E } ] [ B{ HEX: D8 HEX: 34 HEX: DD HEX: 1E } utf16be decode >array ] unit-test -[ { CHAR: replacement-character } ] [ B{ BIN: 11011111 CHAR: q } utf16be decode >array ] unit-test -[ { CHAR: replacement-character } ] [ B{ BIN: 11011011 CHAR: x BIN: 11011011 CHAR: x } utf16be decode >array ] unit-test +[ { 0x1D11E } ] [ B{ 0xD8 0x34 0xDD 0x1E } utf16be decode >array ] unit-test +[ { CHAR: replacement-character } ] [ B{ 0b11011111 CHAR: q } utf16be decode >array ] unit-test +[ { CHAR: replacement-character } ] [ B{ 0b11011011 CHAR: x 0b11011011 CHAR: x } utf16be decode >array ] unit-test -[ { 0 120 216 52 221 30 } ] [ { CHAR: x HEX: 1d11e } >string utf16be encode >array ] unit-test +[ { 0 120 216 52 221 30 } ] [ { CHAR: x 0x1d11e } >string utf16be encode >array ] unit-test [ { CHAR: x } ] [ B{ CHAR: x 0 } utf16le decode >array ] unit-test -[ { 119070 } ] [ B{ HEX: 34 HEX: D8 HEX: 1E HEX: DD } >string utf16le decode >array ] unit-test -[ { CHAR: replacement-character } ] [ { 0 BIN: 11011111 } >string utf16le decode >array ] unit-test -[ { CHAR: replacement-character } ] [ { 0 BIN: 11011011 0 0 } >string utf16le decode >array ] unit-test +[ { 119070 } ] [ B{ 0x34 0xD8 0x1E 0xDD } >string utf16le decode >array ] unit-test +[ { CHAR: replacement-character } ] [ { 0 0b11011111 } >string utf16le decode >array ] unit-test +[ { CHAR: replacement-character } ] [ { 0 0b11011011 0 0 } >string utf16le decode >array ] unit-test -[ { 120 0 52 216 30 221 } ] [ { CHAR: x HEX: 1d11e } >string utf16le encode >array ] unit-test +[ { 120 0 52 216 30 221 } ] [ { CHAR: x 0x1d11e } >string utf16le encode >array ] unit-test -[ { CHAR: x } ] [ B{ HEX: ff HEX: fe CHAR: x 0 } utf16 decode >array ] unit-test -[ { CHAR: x } ] [ B{ HEX: fe HEX: ff 0 CHAR: x } utf16 decode >array ] unit-test +[ { CHAR: x } ] [ B{ 0xff 0xfe CHAR: x 0 } utf16 decode >array ] unit-test +[ { CHAR: x } ] [ B{ 0xfe 0xff 0 CHAR: x } utf16 decode >array ] unit-test -[ { HEX: ff HEX: fe 120 0 52 216 30 221 } ] [ { CHAR: x HEX: 1d11e } >string utf16 encode >array ] unit-test +[ { 0xff 0xfe 120 0 52 216 30 221 } ] [ { CHAR: x 0x1d11e } >string utf16 encode >array ] unit-test ! test ascii encoding path diff --git a/core/io/encodings/utf16/utf16.factor b/core/io/encodings/utf16/utf16.factor index 845271292d..ccdac29173 100644 --- a/core/io/encodings/utf16/utf16.factor +++ b/core/io/encodings/utf16/utf16.factor @@ -25,9 +25,9 @@ ERROR: missing-bom ; : quad-be ( stream byte -- stream char ) double-be over stream-read1 [ - dup -2 shift BIN: 110111 number= [ - [ 2 shift ] dip BIN: 11 bitand bitor - over stream-read1 swap append-nums HEX: 10000 + + dup -2 shift 0b110111 number= [ + [ 2 shift ] dip 0b11 bitand bitor + over stream-read1 swap append-nums 0x10000 + ] [ 2drop dup stream-read1 drop replacement-char ] if ] when* ; @@ -35,9 +35,9 @@ ERROR: missing-bom ; dup stream-read1 drop replacement-char ; : begin-utf16be ( stream byte -- stream char ) - dup -3 shift BIN: 11011 number= [ - dup BIN: 00000100 bitand zero? - [ BIN: 11 bitand quad-be ] + dup -3 shift 0b11011 number= [ + dup 0b00000100 bitand zero? + [ 0b11 bitand quad-be ] [ drop ignore ] if ] [ double-be ] if ; @@ -48,14 +48,14 @@ M: utf16be decode-char : quad-le ( stream ch -- stream char ) over stream-read1 swap 10 shift bitor - over stream-read1 dup -2 shift BIN: 110111 = [ - BIN: 11 bitand append-nums HEX: 10000 + + over stream-read1 dup -2 shift 0b110111 = [ + 0b11 bitand append-nums 0x10000 + ] [ 2drop replacement-char ] if ; : double-le ( stream byte1 byte2 -- stream char ) - dup -3 shift BIN: 11011 = [ - dup BIN: 100 bitand 0 number= - [ BIN: 11 bitand 8 shift bitor quad-le ] + dup -3 shift 0b11011 = [ + dup 0b100 bitand 0 number= + [ 0b11 bitand 8 shift bitor quad-le ] [ 2drop replacement-char ] if ] [ append-nums ] if ; @@ -69,19 +69,19 @@ M: utf16le decode-char : encode-first ( char -- byte1 byte2 ) -10 shift - [ -8 shift BIN: 11011000 bitor ] [ HEX: FF bitand ] bi ; inline + [ -8 shift 0b11011000 bitor ] [ 0xFF bitand ] bi ; inline : encode-second ( char -- byte3 byte4 ) - BIN: 1111111111 bitand - [ -8 shift BIN: 11011100 bitor ] [ BIN: 11111111 bitand ] bi ; inline + 0b1111111111 bitand + [ -8 shift 0b11011100 bitor ] [ 0b11111111 bitand ] bi ; inline : stream-write2 ( char1 char2 stream -- ) [ B{ } 2sequence ] dip stream-write ; inline ! [ stream-write1 ] curry bi@ ; inline : char>utf16be ( char stream -- ) - over HEX: FFFF > [ - [ HEX: 10000 - ] dip + over 0xFFFF > [ + [ 0x10000 - ] dip [ [ encode-first ] dip stream-write2 ] [ [ encode-second ] dip stream-write2 ] 2bi ] [ [ h>b/b swap ] dip stream-write2 ] if ; inline @@ -90,8 +90,8 @@ M: utf16be encode-char ( char stream encoding -- ) drop char>utf16be ; : char>utf16le ( char stream -- ) - over HEX: FFFF > [ - [ HEX: 10000 - ] dip + over 0xFFFF > [ + [ 0x10000 - ] dip [ [ encode-first swap ] dip stream-write2 ] [ [ encode-second swap ] dip stream-write2 ] 2bi ] [ [ h>b/b ] dip stream-write2 ] if ; inline @@ -133,9 +133,9 @@ M: utf16be guess-decoded-length drop 2 /i ; inline ! UTF-16 -CONSTANT: bom-le B{ HEX: ff HEX: fe } +CONSTANT: bom-le B{ 0xff 0xfe } -CONSTANT: bom-be B{ HEX: fe HEX: ff } +CONSTANT: bom-be B{ 0xfe 0xff } : bom>le/be ( bom -- le/be ) dup bom-le sequence= [ drop utf16le ] [ diff --git a/core/io/encodings/utf8/utf8-tests.factor b/core/io/encodings/utf8/utf8-tests.factor index 7f6c7e9876..f3e444e777 100644 --- a/core/io/encodings/utf8/utf8-tests.factor +++ b/core/io/encodings/utf8/utf8-tests.factor @@ -8,18 +8,18 @@ IN: io.encodings.utf8.tests : encode-utf8-w/stream ( array -- newarray ) >string utf8 encode >array ; -[ { CHAR: replacement-character } ] [ { BIN: 11110,101 BIN: 10,111111 BIN: 10,000000 BIN: 11111111 } decode-utf8-w/stream ] unit-test +[ { CHAR: replacement-character } ] [ { 0b11110,101 0b10,111111 0b10,000000 0b11111111 } decode-utf8-w/stream ] unit-test [ "x" ] [ "x" decode-utf8-w/stream >string ] unit-test -[ { BIN: 11111000000 } ] [ { BIN: 110,11111 BIN: 10,000000 } decode-utf8-w/stream >array ] unit-test +[ { 0b11111000000 } ] [ { 0b110,11111 0b10,000000 } decode-utf8-w/stream >array ] unit-test -[ { CHAR: replacement-character } ] [ { BIN: 10000000 } decode-utf8-w/stream ] unit-test +[ { CHAR: replacement-character } ] [ { 0b10000000 } decode-utf8-w/stream ] unit-test -[ { BIN: 1111000000111111 } ] [ { BIN: 1110,1111 BIN: 10,000000 BIN: 10,111111 } decode-utf8-w/stream >array ] unit-test +[ { 0b1111000000111111 } ] [ { 0b1110,1111 0b10,000000 0b10,111111 } decode-utf8-w/stream >array ] unit-test -[ { BIN: 11110,101 BIN: 10,111111 BIN: 10,000000 BIN: 10,111111 BIN: 1110,1111 BIN: 10,000000 BIN: 10,111111 BIN: 110,11111 BIN: 10,000000 CHAR: x } ] -[ { BIN: 101111111000000111111 BIN: 1111000000111111 BIN: 11111000000 CHAR: x } encode-utf8-w/stream ] unit-test +[ { 0b11110,101 0b10,111111 0b10,000000 0b10,111111 0b1110,1111 0b10,000000 0b10,111111 0b110,11111 0b10,000000 CHAR: x } ] +[ { 0b101111111000000111111 0b1111000000111111 0b11111000000 CHAR: x } encode-utf8-w/stream ] unit-test [ 3 ] [ 1 "日本語" >utf8-index ] unit-test [ 3 ] [ 9 "日本語" utf8-index> ] unit-test @@ -28,16 +28,16 @@ IN: io.encodings.utf8.tests [ V{ } ] [ 100000 iota [ [ code-point-length ] [ 1string utf8 encode length ] bi = not ] filter ] unit-test -[ { CHAR: replacement-character } ] [ { BIN: 110,00000 BIN: 10,000000 } decode-utf8-w/stream ] unit-test -[ { CHAR: replacement-character } ] [ { BIN: 110,00001 BIN: 10,111111 } decode-utf8-w/stream ] unit-test -[ { HEX: 80 } ] [ { BIN: 110,00010 BIN: 10,000000 } decode-utf8-w/stream ] unit-test +[ { CHAR: replacement-character } ] [ { 0b110,00000 0b10,000000 } decode-utf8-w/stream ] unit-test +[ { CHAR: replacement-character } ] [ { 0b110,00001 0b10,111111 } decode-utf8-w/stream ] unit-test +[ { 0x80 } ] [ { 0b110,00010 0b10,000000 } decode-utf8-w/stream ] unit-test -[ { CHAR: replacement-character } ] [ { BIN: 1110,0000 BIN: 10,000000 BIN: 10,000000 } decode-utf8-w/stream ] unit-test -[ { CHAR: replacement-character } ] [ { BIN: 1110,0000 BIN: 10,011111 BIN: 10,111111 } decode-utf8-w/stream ] unit-test -[ { HEX: 800 } ] [ { BIN: 1110,0000 BIN: 10,100000 BIN: 10,000000 } decode-utf8-w/stream ] unit-test +[ { CHAR: replacement-character } ] [ { 0b1110,0000 0b10,000000 0b10,000000 } decode-utf8-w/stream ] unit-test +[ { CHAR: replacement-character } ] [ { 0b1110,0000 0b10,011111 0b10,111111 } decode-utf8-w/stream ] unit-test +[ { 0x800 } ] [ { 0b1110,0000 0b10,100000 0b10,000000 } decode-utf8-w/stream ] unit-test -[ { CHAR: replacement-character } ] [ { BIN: 11110,000 BIN: 10,000000 BIN: 10,000000 BIN: 10,000000 } decode-utf8-w/stream ] unit-test -[ { CHAR: replacement-character } ] [ { BIN: 11110,000 BIN: 10,001111 BIN: 10,111111 BIN: 10,111111 } decode-utf8-w/stream ] unit-test -[ { CHAR: replacement-character } ] [ { BIN: 11110,100 BIN: 10,010000 BIN: 10,000000 BIN: 10,000000 } decode-utf8-w/stream ] unit-test -[ { HEX: 10000 } ] [ { BIN: 11110,000 BIN: 10,010000 BIN: 10,000000 BIN: 10,000000 } decode-utf8-w/stream ] unit-test -[ { HEX: 10FFFF } ] [ { BIN: 11110,100 BIN: 10,001111 BIN: 10,111111 BIN: 10,111111 } decode-utf8-w/stream ] unit-test +[ { CHAR: replacement-character } ] [ { 0b11110,000 0b10,000000 0b10,000000 0b10,000000 } decode-utf8-w/stream ] unit-test +[ { CHAR: replacement-character } ] [ { 0b11110,000 0b10,001111 0b10,111111 0b10,111111 } decode-utf8-w/stream ] unit-test +[ { CHAR: replacement-character } ] [ { 0b11110,100 0b10,010000 0b10,000000 0b10,000000 } decode-utf8-w/stream ] unit-test +[ { 0x10000 } ] [ { 0b11110,000 0b10,010000 0b10,000000 0b10,000000 } decode-utf8-w/stream ] unit-test +[ { 0x10FFFF } ] [ { 0b11110,100 0b10,001111 0b10,111111 0b10,111111 } decode-utf8-w/stream ] unit-test diff --git a/core/io/encodings/utf8/utf8.factor b/core/io/encodings/utf8/utf8.factor index 44850c0ab8..c01ee89e9e 100644 --- a/core/io/encodings/utf8/utf8.factor +++ b/core/io/encodings/utf8/utf8.factor @@ -12,11 +12,11 @@ SINGLETON: utf8 [ { - { [ dup -5 shift BIN: 110 = ] [ double ] } - { [ dup -4 shift BIN: 1110 = ] [ triple ] } - { [ dup -3 shift BIN: 11110 = ] [ quadruple ] } + { [ dup -5 shift 0b110 = ] [ double ] } + { [ dup -4 shift 0b1110 = ] [ triple ] } + { [ dup -3 shift 0b11110 = ] [ quadruple ] } [ drop replacement-char ] } cond ] when ; inline @@ -57,22 +57,22 @@ M: utf8 decode-char ! Encoding UTF-8 : encoded ( stream char -- ) - BIN: 111111 bitand BIN: 10000000 bitor swap stream-write1 ; inline + 0b111111 bitand 0b10000000 bitor swap stream-write1 ; inline : char>utf8 ( char stream -- ) over 127 <= [ stream-write1 ] [ swap { { [ dup -11 shift zero? ] [ - 2dup -6 shift BIN: 11000000 bitor swap stream-write1 + 2dup -6 shift 0b11000000 bitor swap stream-write1 encoded ] } { [ dup -16 shift zero? ] [ - 2dup -12 shift BIN: 11100000 bitor swap stream-write1 + 2dup -12 shift 0b11100000 bitor swap stream-write1 2dup -6 shift encoded encoded ] } [ - 2dup -18 shift BIN: 11110000 bitor swap stream-write1 + 2dup -18 shift 0b11110000 bitor swap stream-write1 2dup -12 shift encoded 2dup -6 shift encoded encoded diff --git a/core/io/streams/byte-array/byte-array-tests.factor b/core/io/streams/byte-array/byte-array-tests.factor index 2dd86d97cf..046f4b8b0d 100644 --- a/core/io/streams/byte-array/byte-array-tests.factor +++ b/core/io/streams/byte-array/byte-array-tests.factor @@ -19,9 +19,9 @@ IN: io.streams.byte-array.tests [ B{ 1 2 3 4 5 6 } ] [ binary [ B{ 1 2 3 } write B{ 4 5 6 } write ] with-byte-writer ] unit-test [ B{ 1 2 3 } ] [ { 1 2 3 } binary [ 3 read ] with-byte-reader ] unit-test -[ B{ BIN: 11110101 BIN: 10111111 BIN: 10000000 BIN: 10111111 BIN: 11101111 BIN: 10000000 BIN: 10111111 BIN: 11011111 BIN: 10000000 CHAR: x } ] -[ { BIN: 101111111000000111111 BIN: 1111000000111111 BIN: 11111000000 CHAR: x } >string utf8 [ write ] with-byte-writer ] unit-test -[ { BIN: 1111111000000111111 } t ] [ { BIN: 11110001 BIN: 10111111 BIN: 10000000 BIN: 10111111 } utf8 stream-contents dup >array swap string? ] unit-test +[ B{ 0b11110101 0b10111111 0b10000000 0b10111111 0b11101111 0b10000000 0b10111111 0b11011111 0b10000000 CHAR: x } ] +[ { 0b101111111000000111111 0b1111000000111111 0b11111000000 CHAR: x } >string utf8 [ write ] with-byte-writer ] unit-test +[ { 0b1111111000000111111 } t ] [ { 0b11110001 0b10111111 0b10000000 0b10111111 } utf8 stream-contents dup >array swap string? ] unit-test [ B{ 121 120 } 0 ] [ B{ 0 121 120 0 0 0 0 0 0 } binary diff --git a/core/math/floats/floats-tests.factor b/core/math/floats/floats-tests.factor index 3893e0cc9f..ae72aba67f 100644 --- a/core/math/floats/floats-tests.factor +++ b/core/math/floats/floats-tests.factor @@ -43,11 +43,11 @@ IN: math.floats.tests [ t ] [ pi double>bits bits>double pi = ] unit-test [ t ] [ e double>bits bits>double e = ] unit-test -[ BIN: 11111111111000000000000000000000000000000000000000000000000000 ] +[ 0b11111111111000000000000000000000000000000000000000000000000000 ] [ 1.5 double>bits ] unit-test [ 1.5 ] -[ BIN: 11111111111000000000000000000000000000000000000000000000000000 bits>double ] +[ 0b11111111111000000000000000000000000000000000000000000000000000 bits>double ] unit-test [ 2.0 ] [ 1.0 1 + ] unit-test diff --git a/core/math/floats/floats.factor b/core/math/floats/floats.factor index 9c8efbfbb1..b441276a88 100644 --- a/core/math/floats/floats.factor +++ b/core/math/floats/floats.factor @@ -39,7 +39,7 @@ M: float /i float/f >integer ; inline M: real abs dup 0 < [ neg ] when ; inline M: float fp-special? - double>bits -52 shift HEX: 7ff [ bitand ] keep = ; inline + double>bits -52 shift 0x7ff [ bitand ] keep = ; inline M: float fp-nan-payload double>bits 52 2^ 1 - bitand ; inline diff --git a/core/math/integers/integers-tests.factor b/core/math/integers/integers-tests.factor index c0f7a76d0a..b477b00a2f 100644 --- a/core/math/integers/integers-tests.factor +++ b/core/math/integers/integers-tests.factor @@ -34,22 +34,22 @@ IN: math.integers.tests [ -10000000001981284352 ] [ -10000000000000000000 - HEX: -100000000 bitand + -0x100000000 bitand ] unit-test [ 9999999997686317056 ] [ 10000000000000000000 - HEX: -100000000 bitand + -0x100000000 bitand ] unit-test [ 4294967296 ] [ -10000000000000000000 - HEX: 100000000 bitand + 0x100000000 bitand ] unit-test [ 0 ] [ 10000000000000000000 - HEX: 100000000 bitand + 0x100000000 bitand ] unit-test [ -1 ] [ -1 >bignum >fixnum ] unit-test @@ -68,29 +68,29 @@ unit-test [ 8 ] [ 257 >bignum log2 ] unit-test [ 0 ] [ 1 >bignum log2 ] unit-test -[ t ] [ BIN: 1101 0 bit? ] unit-test -[ f ] [ BIN: 1101 1 bit? ] unit-test -[ t ] [ BIN: 1101 2 bit? ] unit-test -[ t ] [ BIN: 1101 3 bit? ] unit-test -[ f ] [ BIN: 1101 4 bit? ] unit-test - -[ t ] [ BIN: 1101 >bignum 0 bit? ] unit-test -[ f ] [ BIN: 1101 >bignum 1 bit? ] unit-test -[ t ] [ BIN: 1101 >bignum 2 bit? ] unit-test -[ t ] [ BIN: 1101 >bignum 3 bit? ] unit-test -[ f ] [ BIN: 1101 >bignum 4 bit? ] unit-test - -[ t ] [ BIN: -1101 0 bit? ] unit-test -[ t ] [ BIN: -1101 1 bit? ] unit-test -[ f ] [ BIN: -1101 2 bit? ] unit-test -[ f ] [ BIN: -1101 3 bit? ] unit-test -[ t ] [ BIN: -1101 4 bit? ] unit-test - -[ t ] [ BIN: -1101 >bignum 0 bit? ] unit-test -[ t ] [ BIN: -1101 >bignum 1 bit? ] unit-test -[ f ] [ BIN: -1101 >bignum 2 bit? ] unit-test -[ f ] [ BIN: -1101 >bignum 3 bit? ] unit-test -[ t ] [ BIN: -1101 >bignum 4 bit? ] unit-test +[ t ] [ 0b1101 0 bit? ] unit-test +[ f ] [ 0b1101 1 bit? ] unit-test +[ t ] [ 0b1101 2 bit? ] unit-test +[ t ] [ 0b1101 3 bit? ] unit-test +[ f ] [ 0b1101 4 bit? ] unit-test + +[ t ] [ 0b1101 >bignum 0 bit? ] unit-test +[ f ] [ 0b1101 >bignum 1 bit? ] unit-test +[ t ] [ 0b1101 >bignum 2 bit? ] unit-test +[ t ] [ 0b1101 >bignum 3 bit? ] unit-test +[ f ] [ 0b1101 >bignum 4 bit? ] unit-test + +[ t ] [ -0b1101 0 bit? ] unit-test +[ t ] [ -0b1101 1 bit? ] unit-test +[ f ] [ -0b1101 2 bit? ] unit-test +[ f ] [ -0b1101 3 bit? ] unit-test +[ t ] [ -0b1101 4 bit? ] unit-test + +[ t ] [ -0b1101 >bignum 0 bit? ] unit-test +[ t ] [ -0b1101 >bignum 1 bit? ] unit-test +[ f ] [ -0b1101 >bignum 2 bit? ] unit-test +[ f ] [ -0b1101 >bignum 3 bit? ] unit-test +[ t ] [ -0b1101 >bignum 4 bit? ] unit-test [ t ] [ 1067811677921310779 >bignum 59 bit? ] unit-test @@ -199,7 +199,7 @@ unit-test [ -1. ] [ 2000 2^ neg 2000 2^ 1 + ratio>float ] unit-test [ 0.4 ] [ 6 15 ratio>float ] unit-test -[ HEX: 3fe553522d230931 ] +[ 0x3fe553522d230931 ] [ 61967020039 92984792073 ratio>float double>bits ] unit-test : random-integer ( -- n ) @@ -217,14 +217,14 @@ unit-test ] unit-test ! Ensure that /f is accurate for fixnums > 2^53 on 64-bit platforms -[ HEX: 1.758bec11492f9p-54 ] [ 1 12345678901234567 /f ] unit-test -[ HEX: -1.758bec11492f9p-54 ] [ 1 -12345678901234567 /f ] unit-test +[ 0x1.758bec11492f9p-54 ] [ 1 12345678901234567 /f ] unit-test +[ -0x1.758bec11492f9p-54 ] [ 1 -12345678901234567 /f ] unit-test ! Ensure that /f rounds to nearest and not to zero -[ HEX: 1.0p55 ] [ HEX: 7f,ffff,ffff,ffff >bignum 1 /f ] unit-test -[ HEX: 1.0p55 ] [ HEX: -7f,ffff,ffff,ffff >bignum -1 /f ] unit-test -[ HEX: -1.0p55 ] [ HEX: -7f,ffff,ffff,ffff >bignum 1 /f ] unit-test -[ HEX: -1.0p55 ] [ HEX: 7f,ffff,ffff,ffff >bignum -1 /f ] unit-test +[ 0x1.0p55 ] [ 0x7f,ffff,ffff,ffff >bignum 1 /f ] unit-test +[ 0x1.0p55 ] [ -0x7f,ffff,ffff,ffff >bignum -1 /f ] unit-test +[ -0x1.0p55 ] [ -0x7f,ffff,ffff,ffff >bignum 1 /f ] unit-test +[ -0x1.0p55 ] [ 0x7f,ffff,ffff,ffff >bignum -1 /f ] unit-test [ 17 ] [ 17 >bignum 5 max ] unit-test [ 5 ] [ 17 >bignum 5 min ] unit-test diff --git a/core/math/integers/integers.factor b/core/math/integers/integers.factor index 940ffa65ac..3cab1dd4e8 100644 --- a/core/math/integers/integers.factor +++ b/core/math/integers/integers.factor @@ -153,7 +153,7 @@ M: bignum (log2) bignum-log2 ; inline M: bignum /f ( m n -- f ) { bignum bignum } declare bignum/f ; -CONSTANT: bignum/f-threshold HEX: 20,0000,0000,0000 +CONSTANT: bignum/f-threshold 0x20,0000,0000,0000 : fixnum/f ( m n -- m/n ) [ >float ] bi@ float/f ; inline diff --git a/core/math/math-docs.factor b/core/math/math-docs.factor index 44420951fb..a3d252495d 100644 --- a/core/math/math-docs.factor +++ b/core/math/math-docs.factor @@ -147,8 +147,8 @@ HELP: bitand { $values { "x" integer } { "y" integer } { "z" integer } } { $description "Outputs a new integer where each bit is set if and only if the corresponding bit is set in both inputs." } { $examples - { $example "USING: math prettyprint ;" "BIN: 101 BIN: 10 bitand .b" "0" } - { $example "USING: math prettyprint ;" "BIN: 110 BIN: 10 bitand .b" "10" } + { $example "USING: math prettyprint ;" "0b101 0b10 bitand .b" "0" } + { $example "USING: math prettyprint ;" "0b110 0b10 bitand .b" "10" } } { $notes "This word implements bitwise and, so applying it to booleans will throw an error. Boolean and is the " { $link and } " word." } ; @@ -156,8 +156,8 @@ HELP: bitor { $values { "x" integer } { "y" integer } { "z" integer } } { $description "Outputs a new integer where each bit is set if and only if the corresponding bit is set in at least one of the inputs." } { $examples - { $example "USING: math prettyprint ;" "BIN: 101 BIN: 10 bitor .b" "111" } - { $example "USING: math prettyprint ;" "BIN: 110 BIN: 10 bitor .b" "110" } + { $example "USING: math prettyprint ;" "0b101 0b10 bitor .b" "111" } + { $example "USING: math prettyprint ;" "0b110 0b10 bitor .b" "110" } } { $notes "This word implements bitwise inclusive or, so applying it to booleans will throw an error. Boolean inclusive or is the " { $link and } " word." } ; @@ -165,15 +165,15 @@ HELP: bitxor { $values { "x" integer } { "y" integer } { "z" integer } } { $description "Outputs a new integer where each bit is set if and only if the corresponding bit is set in exactly one of the inputs." } { $examples - { $example "USING: math prettyprint ;" "BIN: 101 BIN: 10 bitxor .b" "111" } - { $example "USING: math prettyprint ;" "BIN: 110 BIN: 10 bitxor .b" "100" } + { $example "USING: math prettyprint ;" "0b101 0b10 bitxor .b" "111" } + { $example "USING: math prettyprint ;" "0b110 0b10 bitxor .b" "100" } } { $notes "This word implements bitwise exclusive or, so applying it to booleans will throw an error. Boolean exclusive or is the " { $link xor } " word." } ; HELP: shift { $values { "x" integer } { "n" integer } { "y" integer } } { $description "Shifts " { $snippet "x" } " to the left by " { $snippet "n" } " bits if " { $snippet "n" } " is positive, or " { $snippet "-n" } " bits to the right if " { $snippet "n" } " is negative. A left shift of a fixnum may overflow, yielding a bignum. A right shift may result in bits “falling off” the right hand side and being discarded." } -{ $examples { $example "USING: math prettyprint ;" "BIN: 101 5 shift .b" "10100000" } { $example "USING: math prettyprint ;" "BIN: 11111 -2 shift .b" "111" } } ; +{ $examples { $example "USING: math prettyprint ;" "0b101 5 shift .b" "10100000" } { $example "USING: math prettyprint ;" "0b11111 -2 shift .b" "111" } } ; HELP: bitnot { $values { "x" integer } { "y" integer } } @@ -185,7 +185,7 @@ $nl HELP: bit? { $values { "x" integer } { "n" integer } { "?" "a boolean" } } { $description "Tests if the " { $snippet "n" } "th bit of " { $snippet "x" } " is set." } -{ $examples { $example "USING: math prettyprint ;" "BIN: 101 2 bit? ." "t" } } ; +{ $examples { $example "USING: math prettyprint ;" "0b101 2 bit? ." "t" } } ; HELP: log2 { $values { "x" "a positive integer" } { "n" integer } } diff --git a/core/math/math-tests.factor b/core/math/math-tests.factor index 5d0e4a8465..8ed5495106 100644 --- a/core/math/math-tests.factor +++ b/core/math/math-tests.factor @@ -15,9 +15,9 @@ IN: math.tests [ t ] [ 1 fp-nan? ] unit-test ! [ t ] [ 1 fp-snan? ] unit-test ! [ f ] [ 1 fp-qnan? ] unit-test -[ t ] [ HEX: 8000000000001 fp-nan? ] unit-test -[ f ] [ HEX: 8000000000001 fp-snan? ] unit-test -[ t ] [ HEX: 8000000000001 fp-qnan? ] unit-test +[ t ] [ 0x8000000000001 fp-nan? ] unit-test +[ f ] [ 0x8000000000001 fp-snan? ] unit-test +[ t ] [ 0x8000000000001 fp-qnan? ] unit-test [ t ] [ 1/0. fp-infinity? ] unit-test [ t ] [ -1/0. fp-infinity? ] unit-test diff --git a/core/math/math.factor b/core/math/math.factor index 83400a7858..81e488cb19 100644 --- a/core/math/math.factor +++ b/core/math/math.factor @@ -109,7 +109,7 @@ M: object fp-snan? drop f ; inline M: object fp-infinity? drop f ; inline : ( payload -- nan ) - HEX: 7ff0000000000000 bitor bits>double ; inline + 0x7ff0000000000000 bitor bits>double ; inline GENERIC: next-float ( m -- n ) GENERIC: prev-float ( m -- n ) diff --git a/core/math/parser/parser-tests.factor b/core/math/parser/parser-tests.factor index 339c091a0c..7194f1b427 100644 --- a/core/math/parser/parser-tests.factor +++ b/core/math/parser/parser-tests.factor @@ -94,12 +94,12 @@ unit-test [ 100.0 ] [ "1e2" string>number ] unit-test [ 100.0 ] [ "1e+2" string>number ] unit-test -[ HEX: 1e2 ] [ "1e2" hex> ] unit-test +[ 0x1e2 ] [ "1e2" hex> ] unit-test -[ HEX: 1.999999999999ap-3 ] [ "0.2" string>number ] unit-test -[ HEX: 1.3333333333333p0 ] [ "1.2" string>number ] unit-test -[ HEX: 1.5555555555555p0 ] [ "1.333,333,333,333,333,333" string>number ] unit-test -[ HEX: 1.aaaaaaaaaaaabp0 ] [ "1.666,666,666,666,666,666" string>number ] unit-test +[ 0x1.999999999999ap-3 ] [ "0.2" string>number ] unit-test +[ 0x1.3333333333333p0 ] [ "1.2" string>number ] unit-test +[ 0x1.5555555555555p0 ] [ "1.333,333,333,333,333,333" string>number ] unit-test +[ 0x1.aaaaaaaaaaaabp0 ] [ "1.666,666,666,666,666,666" string>number ] unit-test [ "100.0" ] [ "1.0e2" string>number number>string ] diff --git a/core/strings/strings-tests.factor b/core/strings/strings-tests.factor index 28e5398bfe..3334ef0066 100644 --- a/core/strings/strings-tests.factor +++ b/core/strings/strings-tests.factor @@ -63,23 +63,23 @@ unit-test ! Make sure 24-bit strings work "hello world" "s" set -[ ] [ HEX: 1234 1 "s" get set-nth ] unit-test -[ HEX: 1234 ] [ 1 "s" get nth ] unit-test +[ ] [ 0x1234 1 "s" get set-nth ] unit-test +[ 0x1234 ] [ 1 "s" get nth ] unit-test -[ ] [ HEX: 4321 3 "s" get set-nth ] unit-test -[ HEX: 4321 ] [ 3 "s" get nth ] unit-test +[ ] [ 0x4321 3 "s" get set-nth ] unit-test +[ 0x4321 ] [ 3 "s" get nth ] unit-test -[ ] [ HEX: 654321 5 "s" get set-nth ] unit-test -[ HEX: 654321 ] [ 5 "s" get nth ] unit-test +[ ] [ 0x654321 5 "s" get set-nth ] unit-test +[ 0x654321 ] [ 5 "s" get nth ] unit-test [ { CHAR: h - HEX: 1234 + 0x1234 CHAR: l - HEX: 4321 + 0x4321 CHAR: o - HEX: 654321 + 0x654321 CHAR: w CHAR: o CHAR: r @@ -91,7 +91,7 @@ unit-test ] unit-test ! Make sure string initialization works -[ HEX: 123456 ] [ 100 HEX: 123456 first ] unit-test +[ 0x123456 ] [ 100 0x123456 first ] unit-test ! Make sure we clear aux vector when storing octets [ "\u123456hi" ] [ "ih\u123456" clone reverse! ] unit-test @@ -128,8 +128,8 @@ unit-test ] unit-test "X" "s" set -[ ] [ HEX: 100,0000 0 "s" get set-nth ] unit-test +[ ] [ 0x100,0000 0 "s" get set-nth ] unit-test [ 0 ] [ 0 "s" get nth ] unit-test [ ] [ -1 0 "s" get set-nth ] unit-test -[ HEX: 7fffff ] [ 0 "s" get nth ] unit-test +[ 0x7fffff ] [ 0 "s" get nth ] unit-test diff --git a/core/strings/strings.factor b/core/strings/strings.factor index 61f41257f2..1f266e2e47 100644 --- a/core/strings/strings.factor +++ b/core/strings/strings.factor @@ -20,7 +20,7 @@ IN: strings aux>> { byte-array } declare swap 1 fixnum-shift-fast ; inline : small-char? ( ch -- ? ) - dup 0 fixnum>= [ HEX: 7f fixnum<= ] [ drop f ] if ; inline + dup 0 fixnum>= [ 0x7f fixnum<= ] [ drop f ] if ; inline : string-nth ( n string -- ch ) 2dup string-nth-fast dup small-char? @@ -33,7 +33,7 @@ IN: strings dup aux>> [ dup length 2 * (byte-array) >>aux ] unless ; inline : set-string-nth-slow ( ch n string -- ) - [ [ HEX: 80 fixnum-bitor ] 2dip set-string-nth-fast ] + [ [ 0x80 fixnum-bitor ] 2dip set-string-nth-fast ] [ ensure-aux [ -7 fixnum-shift-fast 1 fixnum-bitxor ] 2dip diff --git a/core/syntax/syntax-docs.factor b/core/syntax/syntax-docs.factor index 72245d2796..5a3e237ab3 100644 --- a/core/syntax/syntax-docs.factor +++ b/core/syntax/syntax-docs.factor @@ -105,15 +105,15 @@ ARTICLE: "syntax-floats" "Float syntax" { $subsections POSTPONE: NAN: } "Hexadecimal float literals are also supported. These consist of a hexadecimal literal with a decimal point and an optional base-two exponent expressed as a decimal number after " { $snippet "p" } " or " { $snippet "P" } ":" { $example - "8.0 HEX: 1.0p3 = ." + "8.0 0x1.0p3 = ." "t" } { $example - "1024.0 HEX: 1.0P10 = ." + "1024.0 0x1.0P10 = ." "t" } { $example - "10.125 HEX: 1.44p3 = ." + "10.125 0x1.44p3 = ." "t" } "The normalized hex form " { $snippet "HEX: ±1.MMMMMMMMMMMMMp±EEEE" } " allows any floating-point number to be specified precisely. The values of MMMMMMMMMMMMM and EEEE map directly to the mantissa and exponent fields of IEEE 754 representation." @@ -478,7 +478,7 @@ HELP: CONSTANT: { $syntax "CONSTANT: word value" } { $values { "word" word } { "value" object } } { $description "Creates a word which pushes a value on the stack." } -{ $examples { $code "CONSTANT: magic 1" "CONSTANT: science HEX: ff0f" } } ; +{ $examples { $code "CONSTANT: magic 1" "CONSTANT: science 0xff0f" } } ; { define-constant POSTPONE: CONSTANT: } related-words @@ -663,21 +663,21 @@ HELP: HEX: { $values { "N" "hexadecimal digit (0-9, a-f, A-F)" } { "pEEE" "decimal exponent value" } } { $description "Adds an integer or floating-point value read from a hexadecimal literal to the parse tree." } { $examples - { $example "USE: prettyprint" "HEX: ff ." "255" } - { $example "USE: prettyprint" "HEX: 1.8p5 ." "48.0" } + { $example "USE: prettyprint" "0xff ." "255" } + { $example "USE: prettyprint" "0x1.8p5 ." "48.0" } } ; HELP: OCT: { $syntax "OCT: integer" } { $values { "integer" "octal digits (0-7)" } } { $description "Adds an integer read from an octal literal to the parse tree." } -{ $examples { $example "USE: prettyprint" "OCT: 31337 ." "13023" } } ; +{ $examples { $example "USE: prettyprint" "0o31337 ." "13023" } } ; HELP: BIN: { $syntax "BIN: integer" } { $values { "integer" "binary digits (0 and 1)" } } { $description "Adds an integer read from an binary literal to the parse tree." } -{ $examples { $example "USE: prettyprint" "BIN: 100 ." "4" } } ; +{ $examples { $example "USE: prettyprint" "0b100 ." "4" } } ; HELP: NAN: { $syntax "NAN: payload" } diff --git a/extra/asn1/asn1.factor b/extra/asn1/asn1.factor index 1fb5757695..f43b189eae 100644 --- a/extra/asn1/asn1.factor +++ b/extra/asn1/asn1.factor @@ -11,7 +11,7 @@ IN: asn1 : (>128-ber) ( n -- ) dup 0 > [ - [ HEX: 7f bitand HEX: 80 bitor , ] keep -7 shift + [ 0x7f bitand 0x80 bitor , ] keep -7 shift (>128-ber) ] [ drop @@ -21,7 +21,7 @@ PRIVATE> : >128-ber ( n -- str ) [ - [ HEX: 7f bitand , ] keep -7 shift + [ 0x7f bitand , ] keep -7 shift (>128-ber) ] { } make reverse ; @@ -84,7 +84,7 @@ TUPLE: element syntax id tag tagclass encoding contentlength newobj objtype ; elements get tagclass<< ; : set-encoding ( -- ) - get-id HEX: 20 bitand + get-id 0x20 bitand zero? "primitive" "constructed" ? elements get encoding<< ; @@ -164,7 +164,7 @@ M: fixnum >ber ( n -- byte-array ) 1array "C" pack-be ] [ 1array "I" pack-be 0 swap remove dup length - HEX: 80 + 1array "C" pack-be prepend + 0x80 + 1array "C" pack-be prepend ] if ; ! ========================================================= @@ -207,10 +207,10 @@ M: string >ber ( str -- byte-array ) >byte-array append ; : >ber-application-string ( n str -- byte-array ) - [ HEX: 40 + set-tag ] dip >ber ; + [ 0x40 + set-tag ] dip >ber ; : >ber-contextspecific-string ( n str -- byte-array ) - [ HEX: 80 + set-tag ] dip >ber ; + [ 0x80 + set-tag ] dip >ber ; ! ========================================================= ! Array @@ -221,16 +221,16 @@ M: string >ber ( str -- byte-array ) swapd append swap [ number>string ] map "" join >array append ; M: array >ber ( array -- byte-array ) - HEX: 30 >ber-seq-internal ; + 0x30 >ber-seq-internal ; : >ber-set ( array -- byte-array ) - HEX: 31 >ber-seq-internal ; + 0x31 >ber-seq-internal ; : >ber-sequence ( array -- byte-array ) - HEX: 30 >ber-seq-internal ; + 0x30 >ber-seq-internal ; : >ber-appsequence ( array -- byte-array ) - HEX: 60 >ber-seq-internal ; + 0x60 >ber-seq-internal ; : >ber-contextspecific-array ( array -- byte-array ) - HEX: A0 >ber-seq-internal ; + 0xA0 >ber-seq-internal ; diff --git a/extra/balloon-bomber/balloon-bomber.factor b/extra/balloon-bomber/balloon-bomber.factor index c52c029c7c..0e079e79f0 100644 --- a/extra/balloon-bomber/balloon-bomber.factor +++ b/extra/balloon-bomber/balloon-bomber.factor @@ -17,11 +17,11 @@ TUPLE: balloon-bomber < space-invaders ; balloon-bomber new cpu-init ; CONSTANT: rom-info { - { HEX: 0000 "ballbomb/tn01" } - { HEX: 0800 "ballbomb/tn02" } - { HEX: 1000 "ballbomb/tn03" } - { HEX: 1800 "ballbomb/tn04" } - { HEX: 4000 "ballbomb/tn05-1" } + { 0x0000 "ballbomb/tn01" } + { 0x0800 "ballbomb/tn02" } + { 0x1000 "ballbomb/tn03" } + { 0x1800 "ballbomb/tn04" } + { 0x4000 "ballbomb/tn05-1" } } : run-balloon ( -- ) diff --git a/extra/benchmark/mt/mt.factor b/extra/benchmark/mt/mt.factor index b2f907ba68..13f0ad4069 100644 --- a/extra/benchmark/mt/mt.factor +++ b/extra/benchmark/mt/mt.factor @@ -4,7 +4,7 @@ USING: fry kernel math random random.mersenne-twister ; IN: benchmark.mt : mt-benchmark ( n -- ) - >fixnum HEX: 533d '[ _ random-32* drop ] times ; + >fixnum 0x533d '[ _ random-32* drop ] times ; : mt-main ( -- ) 10000000 mt-benchmark ; diff --git a/extra/benchmark/sfmt/sfmt.factor b/extra/benchmark/sfmt/sfmt.factor index e9c69303bd..b13f093497 100644 --- a/extra/benchmark/sfmt/sfmt.factor +++ b/extra/benchmark/sfmt/sfmt.factor @@ -4,7 +4,7 @@ USING: fry kernel math random random.sfmt ; IN: benchmark.sfmt : sfmt-benchmark ( n -- ) - >fixnum HEX: 533d '[ _ random-32* drop ] times ; + >fixnum 0x533d '[ _ random-32* drop ] times ; : sfmt-main ( -- ) 10000000 sfmt-benchmark ; diff --git a/extra/bson/constants/constants.factor b/extra/bson/constants/constants.factor index b2b260615f..359a393516 100644 --- a/extra/bson/constants/constants.factor +++ b/extra/bson/constants/constants.factor @@ -13,8 +13,8 @@ TUPLE: oid { a initial: 0 } { b initial: 0 } ; : ( -- oid ) oid new now timestamp>micros >>a - 8 random-bits 16 shift HEX: FF0000 mask - 16 random-bits HEX: FFFF mask + 8 random-bits 16 shift 0xFF0000 mask + 16 random-bits 0xFFFF mask bitor >>b ; TUPLE: dbref ref id db ; @@ -58,31 +58,31 @@ CONSTANT: MDB_OID_FIELD "_id" CONSTANT: MDB_META_FIELD "_mfd" CONSTANT: T_EOO 0 -CONSTANT: T_Double HEX: 1 -CONSTANT: T_String HEX: 2 -CONSTANT: T_Object HEX: 3 -CONSTANT: T_Array HEX: 4 -CONSTANT: T_Binary HEX: 5 -CONSTANT: T_Undefined HEX: 6 -CONSTANT: T_OID HEX: 7 -CONSTANT: T_Boolean HEX: 8 -CONSTANT: T_Date HEX: 9 -CONSTANT: T_NULL HEX: A -CONSTANT: T_Regexp HEX: B -CONSTANT: T_DBRef HEX: C -CONSTANT: T_Code HEX: D -CONSTANT: T_Symbol HEX: E -CONSTANT: T_ScopedCode HEX: F -CONSTANT: T_Integer HEX: 10 -CONSTANT: T_Timestamp HEX: 11 -CONSTANT: T_Integer64 HEX: 12 -CONSTANT: T_MinKey HEX: FF -CONSTANT: T_MaxKey HEX: 7F - -CONSTANT: T_Binary_Default HEX: 0 -CONSTANT: T_Binary_Function HEX: 1 -CONSTANT: T_Binary_Bytes_Deprecated HEX: 2 -CONSTANT: T_Binary_UUID HEX: 3 -CONSTANT: T_Binary_MD5 HEX: 5 -CONSTANT: T_Binary_Custom HEX: 80 +CONSTANT: T_Double 0x1 +CONSTANT: T_String 0x2 +CONSTANT: T_Object 0x3 +CONSTANT: T_Array 0x4 +CONSTANT: T_Binary 0x5 +CONSTANT: T_Undefined 0x6 +CONSTANT: T_OID 0x7 +CONSTANT: T_Boolean 0x8 +CONSTANT: T_Date 0x9 +CONSTANT: T_NULL 0xA +CONSTANT: T_Regexp 0xB +CONSTANT: T_DBRef 0xC +CONSTANT: T_Code 0xD +CONSTANT: T_Symbol 0xE +CONSTANT: T_ScopedCode 0xF +CONSTANT: T_Integer 0x10 +CONSTANT: T_Timestamp 0x11 +CONSTANT: T_Integer64 0x12 +CONSTANT: T_MinKey 0xFF +CONSTANT: T_MaxKey 0x7F + +CONSTANT: T_Binary_Default 0x0 +CONSTANT: T_Binary_Function 0x1 +CONSTANT: T_Binary_Bytes_Deprecated 0x2 +CONSTANT: T_Binary_UUID 0x3 +CONSTANT: T_Binary_MD5 0x5 +CONSTANT: T_Binary_Custom 0x80 diff --git a/extra/chipmunk/ffi/ffi.factor b/extra/chipmunk/ffi/ffi.factor index 9608453a2f..788da22a42 100644 --- a/extra/chipmunk/ffi/ffi.factor +++ b/extra/chipmunk/ffi/ffi.factor @@ -32,7 +32,7 @@ TYPEDEF: uint cpLayers TYPEDEF: uint cpGroup CONSTANT: CP_NO_GROUP 0 -CONSTANT: CP_ALL_LAYERS HEX: ffffffff +CONSTANT: CP_ALL_LAYERS 0xffffffff ! cpVect.h TYPED: cpv ( x y -- v: cpVect ) diff --git a/extra/cpu/8080/emulator/emulator-docs.factor b/extra/cpu/8080/emulator/emulator-docs.factor index 438b5cf268..3f7ddbc595 100644 --- a/extra/cpu/8080/emulator/emulator-docs.factor +++ b/extra/cpu/8080/emulator/emulator-docs.factor @@ -23,7 +23,7 @@ HELP: load-rom* " variable. An exception is thrown if this variable is not set." } { $examples - { $code "{ { HEX: 0000 \"invaders.rom\" } } load-rom*" } + { $code "{ { 0x0000 \"invaders.rom\" } } load-rom*" } } { $see-also load-rom } ; diff --git a/extra/cpu/8080/emulator/emulator.factor b/extra/cpu/8080/emulator/emulator.factor index f828486690..756569481c 100644 --- a/extra/cpu/8080/emulator/emulator.factor +++ b/extra/cpu/8080/emulator/emulator.factor @@ -48,16 +48,16 @@ M: cpu write-port ( value port cpu -- ) #! an 8-bit value. 3drop ; -CONSTANT: carry-flag HEX: 01 -CONSTANT: parity-flag HEX: 04 -CONSTANT: half-carry-flag HEX: 10 -CONSTANT: interrupt-flag HEX: 20 -CONSTANT: zero-flag HEX: 40 -CONSTANT: sign-flag HEX: 80 +CONSTANT: carry-flag 0x01 +CONSTANT: parity-flag 0x04 +CONSTANT: half-carry-flag 0x10 +CONSTANT: interrupt-flag 0x20 +CONSTANT: zero-flag 0x40 +CONSTANT: sign-flag 0x80 : >word< ( word -- byte byte ) #! Explode a word into its two 8 bit values. - dup HEX: FF bitand swap -8 shift HEX: FF bitand swap ; + dup 0xFF bitand swap -8 shift 0xFF bitand swap ; : af>> ( cpu -- word ) #! Return the 16-bit pseudo register AF. @@ -133,10 +133,10 @@ CONSTANT: sign-flag HEX: 80 #! Read one byte from memory at the specified address. #! The address is 16-bit, but if a value greater than #! 0xFFFF is provided then return a default value. - over HEX: FFFF <= [ + over 0xFFFF <= [ ram>> nth ] [ - 2drop HEX: FF + 2drop 0xFF ] if ; : read-word ( addr cpu -- word ) @@ -162,7 +162,7 @@ CONSTANT: sign-flag HEX: 80 : write-byte ( value addr cpu -- ) #! Write a byte to the specified memory address. - over dup HEX: 2000 < swap HEX: FFFF > or [ + over dup 0x2000 < swap 0xFFFF > or [ 3drop ] [ 3dup ram>> set-nth @@ -218,30 +218,30 @@ CONSTANT: sign-flag HEX: 80 swap cpu-f-bitor= ; : clear-flag ( cpu flag -- ) - bitnot HEX: FF bitand swap cpu-f-bitand= ; + bitnot 0xFF bitand swap cpu-f-bitand= ; : update-zero-flag ( result cpu -- ) #! If the result of an instruction has the value 0, this #! flag is set, otherwise it is reset. - swap HEX: FF bitand 0 = [ zero-flag set-flag ] [ zero-flag clear-flag ] if ; + swap 0xFF bitand 0 = [ zero-flag set-flag ] [ zero-flag clear-flag ] if ; : update-sign-flag ( result cpu -- ) #! If the most significant bit of the result #! has the value 1 then the flag is set, otherwise #! it is reset. - swap HEX: 80 bitand 0 = [ sign-flag clear-flag ] [ sign-flag set-flag ] if ; + swap 0x80 bitand 0 = [ sign-flag clear-flag ] [ sign-flag set-flag ] if ; : update-parity-flag ( result cpu -- ) #! If the modulo 2 sum of the bits of the result #! is 0, (ie. if the result has even parity) this flag #! is set, otherwise it is reset. - swap HEX: FF bitand 2 mod 0 = [ parity-flag set-flag ] [ parity-flag clear-flag ] if ; + swap 0xFF bitand 2 mod 0 = [ parity-flag set-flag ] [ parity-flag clear-flag ] if ; : update-carry-flag ( result cpu -- ) #! If the instruction resulted in a carry (from addition) #! or a borrow (from subtraction or a comparison) out of the #! higher order bit, this flag is set, otherwise it is reset. - swap dup HEX: 100 >= swap 0 < or [ carry-flag set-flag ] [ carry-flag clear-flag ] if ; + swap dup 0x100 >= swap 0 < or [ carry-flag set-flag ] [ carry-flag clear-flag ] if ; : update-half-carry-flag ( original change-by result cpu -- ) #! If the instruction caused a carry out of bit 3 and into bit 4 of the @@ -249,7 +249,7 @@ CONSTANT: sign-flag HEX: 80 #! The 'original' is the original value of the register being changed. #! 'change-by' is the amount it is being added or decremented by. #! 'result' is the result of that change. - [ bitxor bitxor HEX: 10 bitand 0 = not ] dip + [ bitxor bitxor 0x10 bitand 0 = not ] dip swap [ half-carry-flag set-flag ] [ half-carry-flag clear-flag ] if ; : update-flags ( result cpu -- ) @@ -268,7 +268,7 @@ CONSTANT: sign-flag HEX: 80 [ 2dup + ] dip [ update-flags ] 2keep [ update-half-carry-flag ] 2keep - drop HEX: FF bitand ; + drop 0xFF bitand ; : add-carry ( change-by result cpu -- change-by result ) #! Add the effect of the carry flag to the result @@ -280,7 +280,7 @@ CONSTANT: sign-flag HEX: 80 [ add-carry ] keep [ update-flags ] 2keep [ update-half-carry-flag ] 2keep - drop HEX: FF bitand ; + drop 0xFF bitand ; : sub-carry ( change-by result cpu -- change-by result ) #! Subtract the effect of the carry flag from the result @@ -291,7 +291,7 @@ CONSTANT: sign-flag HEX: 80 [ 2dup - ] dip [ update-flags ] 2keep [ update-half-carry-flag ] 2keep - drop HEX: FF bitand ; + drop 0xFF bitand ; : sub-byte-with-carry ( lhs rhs cpu -- result ) #! Subtract rhs from lhs and take carry into account @@ -299,7 +299,7 @@ CONSTANT: sign-flag HEX: 80 [ sub-carry ] keep [ update-flags ] 2keep [ update-half-carry-flag ] 2keep - drop HEX: FF bitand ; + drop 0xFF bitand ; : inc-byte ( byte cpu -- result ) #! Increment byte by one. Note that carry flag is not affected @@ -307,7 +307,7 @@ CONSTANT: sign-flag HEX: 80 [ 1 2dup + ] dip [ update-flags-no-carry ] 2keep [ update-half-carry-flag ] 2keep - drop HEX: FF bitand ; + drop 0xFF bitand ; : dec-byte ( byte cpu -- result ) #! Decrement byte by one. Note that carry flag is not affected @@ -315,25 +315,25 @@ CONSTANT: sign-flag HEX: 80 [ 1 2dup - ] dip [ update-flags-no-carry ] 2keep [ update-half-carry-flag ] 2keep - drop HEX: FF bitand ; + drop 0xFF bitand ; : inc-word ( w cpu -- w ) #! Increment word by one. Note that no flags are modified. - drop 1 + HEX: FFFF bitand ; + drop 1 + 0xFFFF bitand ; : dec-word ( w cpu -- w ) #! Decrement word by one. Note that no flags are modified. - drop 1 - HEX: FFFF bitand ; + drop 1 - 0xFFFF bitand ; : add-word ( lhs rhs cpu -- result ) #! Add rhs to lhs. Note that only the carry flag is modified #! and only if there is a carry out of the double precision add. - [ + ] dip over HEX: FFFF > [ carry-flag set-flag ] [ drop ] if HEX: FFFF bitand ; + [ + ] dip over 0xFFFF > [ carry-flag set-flag ] [ drop ] if 0xFFFF bitand ; : bit3or ( lhs rhs -- 0|1 ) #! bitor bit 3 of the two numbers on the stack - BIN: 00001000 bitand -3 shift [ - BIN: 00001000 bitand -3 shift + 0b00001000 bitand -3 shift [ + 0b00001000 bitand -3 shift ] dip bitor ; @@ -344,19 +344,19 @@ CONSTANT: sign-flag HEX: 80 [ bitand ] dip [ update-flags ] 2keep [ carry-flag clear-flag ] keep rot 0 = [ half-carry-flag set-flag ] [ half-carry-flag clear-flag ] if - HEX: FF bitand ; + 0xFF bitand ; : xor-byte ( lhs rhs cpu -- result ) #! Logically xor rhs to lhs. The carry and half-carry flags are cleared. [ bitxor ] dip [ update-flags ] 2keep [ half-carry-flag carry-flag bitor clear-flag ] keep - drop HEX: FF bitand ; + drop 0xFF bitand ; : or-byte ( lhs rhs cpu -- result ) #! Logically or rhs to lhs. The carry and half-carry flags are cleared. [ bitor ] dip [ update-flags ] 2keep [ half-carry-flag carry-flag bitor clear-flag ] keep - drop HEX: FF bitand ; + drop 0xFF bitand ; : decrement-sp ( n cpu -- ) #! Decrement the stackpointer by n. @@ -393,7 +393,7 @@ CONSTANT: sign-flag HEX: 80 : call-sub ( addr cpu -- ) #! Call the address as a subroutine. dup push-pc - [ HEX: FFFF bitand ] dip pc<< ; + [ 0xFFFF bitand ] dip pc<< ; : ret-from-sub ( cpu -- ) [ pop-pc ] keep pc<< ; @@ -445,10 +445,10 @@ M: cpu reset ( cpu -- ) 0 >>a 0 >>f 0 >>pc - HEX: F000 >>sp - HEX: FFFF 0 >>ram + 0xF000 >>sp + 0xFFFF 0 >>ram f >>halted? - HEX: 10 >>last-interrupt + 0x10 >>last-interrupt 0 >>cycles drop ; @@ -515,10 +515,10 @@ SYMBOL: rom-root 2drop ] [ [ [ 16667 - ] dip cycles<< ] keep - dup last-interrupt>> HEX: 10 = [ - HEX: 08 over last-interrupt<< HEX: 08 swap interrupt + dup last-interrupt>> 0x10 = [ + 0x08 over last-interrupt<< 0x08 swap interrupt ] [ - HEX: 10 over last-interrupt<< HEX: 10 swap interrupt + 0x10 over last-interrupt<< 0x10 swap interrupt ] if ] if ; @@ -613,7 +613,7 @@ SYMBOLS: $1 $2 $3 $4 ; : (emulate-CALL) ( cpu -- ) #! 205 - CALL nn - [ next-word HEX: FFFF bitand ] keep ! addr cpu + [ next-word 0xFFFF bitand ] keep ! addr cpu [ sp>> 2 - dup ] keep ! addr sp sp cpu [ sp<< ] keep ! addr sp cpu [ pc>> ] keep ! addr sp pc cpu @@ -627,7 +627,7 @@ SYMBOLS: $1 $2 $3 $4 ; #! order bit position. Only the carry flag is affected. [ a>> -7 shift ] keep over 0 = [ dup carry-flag clear-flag ] [ dup carry-flag set-flag ] if - [ a>> 1 shift HEX: FF bitand ] keep + [ a>> 1 shift 0xFF bitand ] keep [ bitor ] dip a<< ; : (emulate-RRCA) ( cpu -- ) @@ -658,7 +658,7 @@ SYMBOLS: $1 $2 $3 $4 ; #! bit is set to the carry flag and the carry flag is #! set to the value shifd out of the low order bit. #! Only the carry flag is affected. - [ carry-flag swap flag-set? [ BIN: 10000000 ] [ 0 ] if ] keep + [ carry-flag swap flag-set? [ 0b10000000 ] [ 0 ] if ] keep [ a>> 254 bitand -1 shift ] keep dup a>> 1 bitand 0 = [ dup carry-flag clear-flag ] [ dup carry-flag set-flag ] if [ bitor ] dip a<< ; @@ -667,7 +667,7 @@ SYMBOLS: $1 $2 $3 $4 ; #! The contents of the accumulator are complemented #! (zero bits become one, one bits becomes zero). #! No flags are affected. - HEX: FF swap cpu-a-bitxor= ; + 0xFF swap cpu-a-bitxor= ; : (emulate-DAA) ( cpu -- ) #! The eight bit number in the accumulator is @@ -675,18 +675,18 @@ SYMBOLS: $1 $2 $3 $4 ; #! digits. [ dup half-carry-flag swap flag-set? swap - a>> BIN: 1111 bitand 9 > or [ 6 ] [ 0 ] if + a>> 0b1111 bitand 9 > or [ 6 ] [ 0 ] if ] keep [ a>> + ] keep [ update-flags ] 2keep - [ swap HEX: FF bitand swap a<< ] keep + [ swap 0xFF bitand swap a<< ] keep [ dup carry-flag swap flag-set? swap - a>> -4 shift BIN: 1111 bitand 9 > or [ 96 ] [ 0 ] if + a>> -4 shift 0b1111 bitand 9 > or [ 96 ] [ 0 ] if ] keep [ a>> + ] keep [ update-flags ] 2keep - swap HEX: FF bitand swap a<< ; + swap 0xFF bitand swap a<< ; : patterns ( -- hashtable ) #! table of code quotation patterns for each type of instruction. @@ -695,12 +695,12 @@ SYMBOLS: $1 $2 $3 $4 ; { "RET-NN" [ ret-from-sub ] } { "RST-0" [ 0 swap (emulate-RST) ] } { "RST-8" [ 8 swap (emulate-RST) ] } - { "RST-10H" [ HEX: 10 swap (emulate-RST) ] } - { "RST-18H" [ HEX: 18 swap (emulate-RST) ] } - { "RST-20H" [ HEX: 20 swap (emulate-RST) ] } - { "RST-28H" [ HEX: 28 swap (emulate-RST) ] } - { "RST-30H" [ HEX: 30 swap (emulate-RST) ] } - { "RST-38H" [ HEX: 38 swap (emulate-RST) ] } + { "RST-10H" [ 0x10 swap (emulate-RST) ] } + { "RST-18H" [ 0x18 swap (emulate-RST) ] } + { "RST-20H" [ 0x20 swap (emulate-RST) ] } + { "RST-28H" [ 0x28 swap (emulate-RST) ] } + { "RST-30H" [ 0x30 swap (emulate-RST) ] } + { "RST-38H" [ 0x38 swap (emulate-RST) ] } { "RET-F|FF" [ dup $1 [ 6 over inc-cycles ret-from-sub ] [ drop ] if ] } { "CP-N" [ [ a>> ] keep [ next-byte ] keep sub-byte drop ] } { "CP-R" [ [ a>> ] keep [ $1 ] keep sub-byte drop ] } diff --git a/extra/cpu/8080/test/test.factor b/extra/cpu/8080/test/test.factor index 2fcb9434b7..a7b1624bda 100644 --- a/extra/cpu/8080/test/test.factor +++ b/extra/cpu/8080/test/test.factor @@ -19,7 +19,7 @@ IN: cpu.8080.test [ read-instruction ] keep ! n cpu over get-cycles over inc-cycles [ swap instructions nth call( cpu -- ) ] keep - [ pc>> HEX: FFFF bitand ] keep + [ pc>> 0xFFFF bitand ] keep [ pc<< ] keep process-interrupts ; @@ -28,10 +28,10 @@ IN: cpu.8080.test : invaders ( -- seq ) { - { HEX: 0000 "invaders/invaders.h" } - { HEX: 0800 "invaders/invaders.g" } - { HEX: 1000 "invaders/invaders.f" } - { HEX: 1800 "invaders/invaders.e" } + { 0x0000 "invaders/invaders.h" } + { 0x0800 "invaders/invaders.g" } + { 0x1000 "invaders/invaders.f" } + { 0x1800 "invaders/invaders.e" } } ; : test-cpu ( -- cpu ) @@ -54,7 +54,7 @@ IN: cpu.8080.test "1" print 224 [ 32 [ - over 32 * over + HEX: 2400 + ! cpu h w addr + over 32 * over + 0x2400 + ! cpu h w addr [ pick ] dip swap ram>> nth [ [ " 0 0 0" write diff --git a/extra/cpu/arm/assembler/assembler-tests.factor b/extra/cpu/arm/assembler/assembler-tests.factor index 3164fc197a..796f898bac 100644 --- a/extra/cpu/arm/assembler/assembler-tests.factor +++ b/extra/cpu/arm/assembler/assembler-tests.factor @@ -5,42 +5,42 @@ FROM: cpu.arm.assembler => B ; : test-opcode ( expect quot -- ) [ { } make first ] curry unit-test ; -[ HEX: ea000000 ] [ 0 B ] test-opcode -[ HEX: eb000000 ] [ 0 BL ] test-opcode -! [ HEX: e12fff30 ] [ R0 BLX ] test-opcode - -[ HEX: e24cc004 ] [ IP IP 4 SUB ] test-opcode -[ HEX: e24cb004 ] [ FP IP 4 SUB ] test-opcode -[ HEX: e087e3ac ] [ LR R7 IP 7 ADD ] test-opcode -[ HEX: e08c0109 ] [ R0 IP R9 2 ADD ] test-opcode -[ HEX: 02850004 ] [ R0 R5 4 EQ ADD ] test-opcode -[ HEX: 00000000 ] [ R0 R0 R0 EQ AND ] test-opcode - -[ HEX: e1a0c00c ] [ IP IP MOV ] test-opcode -[ HEX: e1a0c00d ] [ IP SP MOV ] test-opcode -[ HEX: e3a03003 ] [ R3 3 MOV ] test-opcode -[ HEX: e1a00003 ] [ R0 R3 MOV ] test-opcode -[ HEX: e1e01c80 ] [ R1 R0 25 MVN ] test-opcode -[ HEX: e1e00ca1 ] [ R0 R1 25 MVN ] test-opcode -[ HEX: 11a021ac ] [ R2 IP 3 NE MOV ] test-opcode - -[ HEX: e3530007 ] [ R3 7 CMP ] test-opcode - -[ HEX: e008049a ] [ R8 SL R4 MUL ] test-opcode - -[ HEX: e5151004 ] [ R1 R5 4 <-> LDR ] test-opcode -[ HEX: e41c2004 ] [ R2 IP 4 <-!> LDR ] test-opcode -[ HEX: e50e2004 ] [ R2 LR 4 <-> STR ] test-opcode - -[ HEX: e7910002 ] [ R0 R1 R2 <+> LDR ] test-opcode -[ HEX: e7910102 ] [ R0 R1 R2 2 <+> LDR ] test-opcode - -[ HEX: e1d310bc ] [ R1 R3 12 <+> LDRH ] test-opcode -[ HEX: e1d310fc ] [ R1 R3 12 <+> LDRSH ] test-opcode -[ HEX: e1d310dc ] [ R1 R3 12 <+> LDRSB ] test-opcode -[ HEX: e1c310bc ] [ R1 R3 12 <+> STRH ] test-opcode -[ HEX: e19310b4 ] [ R1 R3 R4 <+> LDRH ] test-opcode -[ HEX: e1f310fc ] [ R1 R3 12 LDRSH ] test-opcode -[ HEX: e1b310d4 ] [ R1 R3 R4 LDRSB ] test-opcode -[ HEX: e0c317bb ] [ R1 R3 123 <+!> STRH ] test-opcode -[ HEX: e08310b4 ] [ R1 R3 R4 <+!> STRH ] test-opcode +[ 0xea000000 ] [ 0 B ] test-opcode +[ 0xeb000000 ] [ 0 BL ] test-opcode +! [ 0xe12fff30 ] [ R0 BLX ] test-opcode + +[ 0xe24cc004 ] [ IP IP 4 SUB ] test-opcode +[ 0xe24cb004 ] [ FP IP 4 SUB ] test-opcode +[ 0xe087e3ac ] [ LR R7 IP 7 ADD ] test-opcode +[ 0xe08c0109 ] [ R0 IP R9 2 ADD ] test-opcode +[ 0x02850004 ] [ R0 R5 4 EQ ADD ] test-opcode +[ 0x00000000 ] [ R0 R0 R0 EQ AND ] test-opcode + +[ 0xe1a0c00c ] [ IP IP MOV ] test-opcode +[ 0xe1a0c00d ] [ IP SP MOV ] test-opcode +[ 0xe3a03003 ] [ R3 3 MOV ] test-opcode +[ 0xe1a00003 ] [ R0 R3 MOV ] test-opcode +[ 0xe1e01c80 ] [ R1 R0 25 MVN ] test-opcode +[ 0xe1e00ca1 ] [ R0 R1 25 MVN ] test-opcode +[ 0x11a021ac ] [ R2 IP 3 NE MOV ] test-opcode + +[ 0xe3530007 ] [ R3 7 CMP ] test-opcode + +[ 0xe008049a ] [ R8 SL R4 MUL ] test-opcode + +[ 0xe5151004 ] [ R1 R5 4 <-> LDR ] test-opcode +[ 0xe41c2004 ] [ R2 IP 4 <-!> LDR ] test-opcode +[ 0xe50e2004 ] [ R2 LR 4 <-> STR ] test-opcode + +[ 0xe7910002 ] [ R0 R1 R2 <+> LDR ] test-opcode +[ 0xe7910102 ] [ R0 R1 R2 2 <+> LDR ] test-opcode + +[ 0xe1d310bc ] [ R1 R3 12 <+> LDRH ] test-opcode +[ 0xe1d310fc ] [ R1 R3 12 <+> LDRSH ] test-opcode +[ 0xe1d310dc ] [ R1 R3 12 <+> LDRSB ] test-opcode +[ 0xe1c310bc ] [ R1 R3 12 <+> STRH ] test-opcode +[ 0xe19310b4 ] [ R1 R3 R4 <+> LDRH ] test-opcode +[ 0xe1f310fc ] [ R1 R3 12 LDRSH ] test-opcode +[ 0xe1b310d4 ] [ R1 R3 R4 LDRSB ] test-opcode +[ 0xe0c317bb ] [ R1 R3 123 <+!> STRH ] test-opcode +[ 0xe08310b4 ] [ R1 R3 R4 <+!> STRH ] test-opcode diff --git a/extra/cpu/arm/assembler/assembler.factor b/extra/cpu/arm/assembler/assembler.factor index 1ef5692b65..432a2e3924 100644 --- a/extra/cpu/arm/assembler/assembler.factor +++ b/extra/cpu/arm/assembler/assembler.factor @@ -57,25 +57,25 @@ SYMBOL: cond-code cond-code set ; : CC> ( -- n ) - #! Default value is BIN: 1110 AL (= always) - cond-code [ f ] change BIN: 1110 or ; - -: EQ ( -- ) BIN: 0000 >CC ; -: NE ( -- ) BIN: 0001 >CC ; -: CS ( -- ) BIN: 0010 >CC ; -: CC ( -- ) BIN: 0011 >CC ; -: LO ( -- ) BIN: 0100 >CC ; -: PL ( -- ) BIN: 0101 >CC ; -: VS ( -- ) BIN: 0110 >CC ; -: VC ( -- ) BIN: 0111 >CC ; -: HI ( -- ) BIN: 1000 >CC ; -: LS ( -- ) BIN: 1001 >CC ; -: GE ( -- ) BIN: 1010 >CC ; -: LT ( -- ) BIN: 1011 >CC ; -: GT ( -- ) BIN: 1100 >CC ; -: LE ( -- ) BIN: 1101 >CC ; -: AL ( -- ) BIN: 1110 >CC ; -: NV ( -- ) BIN: 1111 >CC ; + #! Default value is 0b1110 AL (= always) + cond-code [ f ] change 0b1110 or ; + +: EQ ( -- ) 0b0000 >CC ; +: NE ( -- ) 0b0001 >CC ; +: CS ( -- ) 0b0010 >CC ; +: CC ( -- ) 0b0011 >CC ; +: LO ( -- ) 0b0100 >CC ; +: PL ( -- ) 0b0101 >CC ; +: VS ( -- ) 0b0110 >CC ; +: VC ( -- ) 0b0111 >CC ; +: HI ( -- ) 0b1000 >CC ; +: LS ( -- ) 0b1001 >CC ; +: GE ( -- ) 0b1010 >CC ; +: LT ( -- ) 0b1011 >CC ; +: GT ( -- ) 0b1100 >CC ; +: LE ( -- ) 0b1101 >CC ; +: AL ( -- ) 0b1110 >CC ; +: NV ( -- ) 0b1111 >CC ; -: ( Rm shift-imm/Rs -- shifter-op ) BIN: 00 ; -: ( Rm shift-imm/Rs -- shifter-op ) BIN: 01 ; -: ( Rm shift-imm/Rs -- shifter-op ) BIN: 10 ; -: ( Rm shift-imm/Rs -- shifter-op ) BIN: 11 ; +: ( Rm shift-imm/Rs -- shifter-op ) 0b00 ; +: ( Rm shift-imm/Rs -- shifter-op ) 0b01 ; +: ( Rm shift-imm/Rs -- shifter-op ) 0b10 ; +: ( Rm shift-imm/Rs -- shifter-op ) 0b11 ; : ( Rm -- shifter-op ) 0 ; M: register shifter-op 0 shifter-op ; @@ -164,19 +164,19 @@ M: integer shifter-op 0 shifter-op ; PRIVATE> -: AND ( Rd Rn shifter-op -- ) BIN: 0000 addr1 ; -: EOR ( Rd Rn shifter-op -- ) BIN: 0001 addr1 ; -: SUB ( Rd Rn shifter-op -- ) BIN: 0010 addr1 ; -: RSB ( Rd Rn shifter-op -- ) BIN: 0011 addr1 ; -: ADD ( Rd Rn shifter-op -- ) BIN: 0100 addr1 ; -: ADC ( Rd Rn shifter-op -- ) BIN: 0101 addr1 ; -: SBC ( Rd Rn shifter-op -- ) BIN: 0110 addr1 ; -: RSC ( Rd Rn shifter-op -- ) BIN: 0111 addr1 ; -: ORR ( Rd Rn shifter-op -- ) BIN: 1100 addr1 ; -: BIC ( Rd Rn shifter-op -- ) BIN: 1110 addr1 ; +: AND ( Rd Rn shifter-op -- ) 0b0000 addr1 ; +: EOR ( Rd Rn shifter-op -- ) 0b0001 addr1 ; +: SUB ( Rd Rn shifter-op -- ) 0b0010 addr1 ; +: RSB ( Rd Rn shifter-op -- ) 0b0011 addr1 ; +: ADD ( Rd Rn shifter-op -- ) 0b0100 addr1 ; +: ADC ( Rd Rn shifter-op -- ) 0b0101 addr1 ; +: SBC ( Rd Rn shifter-op -- ) 0b0110 addr1 ; +: RSC ( Rd Rn shifter-op -- ) 0b0111 addr1 ; +: ORR ( Rd Rn shifter-op -- ) 0b1100 addr1 ; +: BIC ( Rd Rn shifter-op -- ) 0b1110 addr1 ; -: MOV ( Rd shifter-op -- ) [ f ] dip BIN: 1101 addr1 ; -: MVN ( Rd shifter-op -- ) [ f ] dip BIN: 1111 addr1 ; +: MOV ( Rd shifter-op -- ) [ f ] dip 0b1101 addr1 ; +: MVN ( Rd shifter-op -- ) [ f ] dip 0b1111 addr1 ; ! These always update the condition code flags PRIVATE> -: TST ( Rn shifter-op -- ) BIN: 1000 (CMP) ; -: TEQ ( Rn shifter-op -- ) BIN: 1001 (CMP) ; -: CMP ( Rn shifter-op -- ) BIN: 1010 (CMP) ; -: CMN ( Rn shifter-op -- ) BIN: 1011 (CMP) ; +: TST ( Rn shifter-op -- ) 0b1000 (CMP) ; +: TEQ ( Rn shifter-op -- ) 0b1001 (CMP) ; +: CMP ( Rn shifter-op -- ) 0b1010 (CMP) ; +: CMN ( Rn shifter-op -- ) 0b1011 (CMP) ; ! Multiply instructions { 1 24 } { 1 22 } { 1 21 } - { BIN: 111 16 } - { BIN: 1111 8 } + { 0b111 16 } + { 0b1111 8 } { 1 4 } { register 0 } { register 12 } @@ -300,9 +300,9 @@ M: register (BX) ( Rm l -- ) { { 1 24 } { 1 21 } - { BIN: 1111 16 } - { BIN: 1111 12 } - { BIN: 1111 8 } + { 0b1111 16 } + { 0b1111 12 } + { 0b1111 8 } 5 { 1 4 } { register 0 } @@ -319,7 +319,7 @@ PRIVATE> GENERIC: addressing-mode-3 ( addressing-mode -- n ) -: b>n/n ( b -- n n ) [ -4 shift ] [ HEX: f bitand ] bi ; +: b>n/n ( b -- n n ) [ -4 shift ] [ 0xf bitand ] bi ; M: addressing addressing-mode-3 { [ p>> ] [ u>> ] [ w>> ] [ base>> addressing-mode-3 ] } cleave diff --git a/extra/crypto/aes/aes-tests.factor b/extra/crypto/aes/aes-tests.factor index c76ee8cb14..b1fda38f25 100644 --- a/extra/crypto/aes/aes-tests.factor +++ b/extra/crypto/aes/aes-tests.factor @@ -4,341 +4,341 @@ USING: kernel sequences grouping tools.test crypto.aes ; IN: crypto.aes.tests [ { - HEX: 00 HEX: 01 HEX: 02 HEX: 04 HEX: 08 HEX: 10 - HEX: 20 HEX: 40 HEX: 80 HEX: 1b HEX: 36 + 0x00 0x01 0x02 0x04 0x08 0x10 + 0x20 0x40 0x80 0x1b 0x36 } ] [ rcon ] unit-test [ { - HEX: 63 HEX: 7c HEX: 77 HEX: 7b HEX: f2 HEX: 6b HEX: 6f HEX: c5 - HEX: 30 HEX: 01 HEX: 67 HEX: 2b HEX: fe HEX: d7 HEX: ab HEX: 76 - HEX: ca HEX: 82 HEX: c9 HEX: 7d HEX: fa HEX: 59 HEX: 47 HEX: f0 - HEX: ad HEX: d4 HEX: a2 HEX: af HEX: 9c HEX: a4 HEX: 72 HEX: c0 - HEX: b7 HEX: fd HEX: 93 HEX: 26 HEX: 36 HEX: 3f HEX: f7 HEX: cc - HEX: 34 HEX: a5 HEX: e5 HEX: f1 HEX: 71 HEX: d8 HEX: 31 HEX: 15 - HEX: 04 HEX: c7 HEX: 23 HEX: c3 HEX: 18 HEX: 96 HEX: 05 HEX: 9a - HEX: 07 HEX: 12 HEX: 80 HEX: e2 HEX: eb HEX: 27 HEX: b2 HEX: 75 - HEX: 09 HEX: 83 HEX: 2c HEX: 1a HEX: 1b HEX: 6e HEX: 5a HEX: a0 - HEX: 52 HEX: 3b HEX: d6 HEX: b3 HEX: 29 HEX: e3 HEX: 2f HEX: 84 - HEX: 53 HEX: d1 HEX: 00 HEX: ed HEX: 20 HEX: fc HEX: b1 HEX: 5b - HEX: 6a HEX: cb HEX: be HEX: 39 HEX: 4a HEX: 4c HEX: 58 HEX: cf - HEX: d0 HEX: ef HEX: aa HEX: fb HEX: 43 HEX: 4d HEX: 33 HEX: 85 - HEX: 45 HEX: f9 HEX: 02 HEX: 7f HEX: 50 HEX: 3c HEX: 9f HEX: a8 - HEX: 51 HEX: a3 HEX: 40 HEX: 8f HEX: 92 HEX: 9d HEX: 38 HEX: f5 - HEX: bc HEX: b6 HEX: da HEX: 21 HEX: 10 HEX: ff HEX: f3 HEX: d2 - HEX: cd HEX: 0c HEX: 13 HEX: ec HEX: 5f HEX: 97 HEX: 44 HEX: 17 - HEX: c4 HEX: a7 HEX: 7e HEX: 3d HEX: 64 HEX: 5d HEX: 19 HEX: 73 - HEX: 60 HEX: 81 HEX: 4f HEX: dc HEX: 22 HEX: 2a HEX: 90 HEX: 88 - HEX: 46 HEX: ee HEX: b8 HEX: 14 HEX: de HEX: 5e HEX: 0b HEX: db - HEX: e0 HEX: 32 HEX: 3a HEX: 0a HEX: 49 HEX: 06 HEX: 24 HEX: 5c - HEX: c2 HEX: d3 HEX: ac HEX: 62 HEX: 91 HEX: 95 HEX: e4 HEX: 79 - HEX: e7 HEX: c8 HEX: 37 HEX: 6d HEX: 8d HEX: d5 HEX: 4e HEX: a9 - HEX: 6c HEX: 56 HEX: f4 HEX: ea HEX: 65 HEX: 7a HEX: ae HEX: 08 - HEX: ba HEX: 78 HEX: 25 HEX: 2e HEX: 1c HEX: a6 HEX: b4 HEX: c6 - HEX: e8 HEX: dd HEX: 74 HEX: 1f HEX: 4b HEX: bd HEX: 8b HEX: 8a - HEX: 70 HEX: 3e HEX: b5 HEX: 66 HEX: 48 HEX: 03 HEX: f6 HEX: 0e - HEX: 61 HEX: 35 HEX: 57 HEX: b9 HEX: 86 HEX: c1 HEX: 1d HEX: 9e - HEX: e1 HEX: f8 HEX: 98 HEX: 11 HEX: 69 HEX: d9 HEX: 8e HEX: 94 - HEX: 9b HEX: 1e HEX: 87 HEX: e9 HEX: ce HEX: 55 HEX: 28 HEX: df - HEX: 8c HEX: a1 HEX: 89 HEX: 0d HEX: bf HEX: e6 HEX: 42 HEX: 68 - HEX: 41 HEX: 99 HEX: 2d HEX: 0f HEX: b0 HEX: 54 HEX: bb HEX: 16 + 0x63 0x7c 0x77 0x7b 0xf2 0x6b 0x6f 0xc5 + 0x30 0x01 0x67 0x2b 0xfe 0xd7 0xab 0x76 + 0xca 0x82 0xc9 0x7d 0xfa 0x59 0x47 0xf0 + 0xad 0xd4 0xa2 0xaf 0x9c 0xa4 0x72 0xc0 + 0xb7 0xfd 0x93 0x26 0x36 0x3f 0xf7 0xcc + 0x34 0xa5 0xe5 0xf1 0x71 0xd8 0x31 0x15 + 0x04 0xc7 0x23 0xc3 0x18 0x96 0x05 0x9a + 0x07 0x12 0x80 0xe2 0xeb 0x27 0xb2 0x75 + 0x09 0x83 0x2c 0x1a 0x1b 0x6e 0x5a 0xa0 + 0x52 0x3b 0xd6 0xb3 0x29 0xe3 0x2f 0x84 + 0x53 0xd1 0x00 0xed 0x20 0xfc 0xb1 0x5b + 0x6a 0xcb 0xbe 0x39 0x4a 0x4c 0x58 0xcf + 0xd0 0xef 0xaa 0xfb 0x43 0x4d 0x33 0x85 + 0x45 0xf9 0x02 0x7f 0x50 0x3c 0x9f 0xa8 + 0x51 0xa3 0x40 0x8f 0x92 0x9d 0x38 0xf5 + 0xbc 0xb6 0xda 0x21 0x10 0xff 0xf3 0xd2 + 0xcd 0x0c 0x13 0xec 0x5f 0x97 0x44 0x17 + 0xc4 0xa7 0x7e 0x3d 0x64 0x5d 0x19 0x73 + 0x60 0x81 0x4f 0xdc 0x22 0x2a 0x90 0x88 + 0x46 0xee 0xb8 0x14 0xde 0x5e 0x0b 0xdb + 0xe0 0x32 0x3a 0x0a 0x49 0x06 0x24 0x5c + 0xc2 0xd3 0xac 0x62 0x91 0x95 0xe4 0x79 + 0xe7 0xc8 0x37 0x6d 0x8d 0xd5 0x4e 0xa9 + 0x6c 0x56 0xf4 0xea 0x65 0x7a 0xae 0x08 + 0xba 0x78 0x25 0x2e 0x1c 0xa6 0xb4 0xc6 + 0xe8 0xdd 0x74 0x1f 0x4b 0xbd 0x8b 0x8a + 0x70 0x3e 0xb5 0x66 0x48 0x03 0xf6 0x0e + 0x61 0x35 0x57 0xb9 0x86 0xc1 0x1d 0x9e + 0xe1 0xf8 0x98 0x11 0x69 0xd9 0x8e 0x94 + 0x9b 0x1e 0x87 0xe9 0xce 0x55 0x28 0xdf + 0x8c 0xa1 0x89 0x0d 0xbf 0xe6 0x42 0x68 + 0x41 0x99 0x2d 0x0f 0xb0 0x54 0xbb 0x16 } ] [ sbox ] unit-test [ { - HEX: 52 HEX: 09 HEX: 6a HEX: d5 HEX: 30 HEX: 36 HEX: a5 HEX: 38 - HEX: bf HEX: 40 HEX: a3 HEX: 9e HEX: 81 HEX: f3 HEX: d7 HEX: fb - HEX: 7c HEX: e3 HEX: 39 HEX: 82 HEX: 9b HEX: 2f HEX: ff HEX: 87 - HEX: 34 HEX: 8e HEX: 43 HEX: 44 HEX: c4 HEX: de HEX: e9 HEX: cb - HEX: 54 HEX: 7b HEX: 94 HEX: 32 HEX: a6 HEX: c2 HEX: 23 HEX: 3d - HEX: ee HEX: 4c HEX: 95 HEX: 0b HEX: 42 HEX: fa HEX: c3 HEX: 4e - HEX: 08 HEX: 2e HEX: a1 HEX: 66 HEX: 28 HEX: d9 HEX: 24 HEX: b2 - HEX: 76 HEX: 5b HEX: a2 HEX: 49 HEX: 6d HEX: 8b HEX: d1 HEX: 25 - HEX: 72 HEX: f8 HEX: f6 HEX: 64 HEX: 86 HEX: 68 HEX: 98 HEX: 16 - HEX: d4 HEX: a4 HEX: 5c HEX: cc HEX: 5d HEX: 65 HEX: b6 HEX: 92 - HEX: 6c HEX: 70 HEX: 48 HEX: 50 HEX: fd HEX: ed HEX: b9 HEX: da - HEX: 5e HEX: 15 HEX: 46 HEX: 57 HEX: a7 HEX: 8d HEX: 9d HEX: 84 - HEX: 90 HEX: d8 HEX: ab HEX: 00 HEX: 8c HEX: bc HEX: d3 HEX: 0a - HEX: f7 HEX: e4 HEX: 58 HEX: 05 HEX: b8 HEX: b3 HEX: 45 HEX: 06 - HEX: d0 HEX: 2c HEX: 1e HEX: 8f HEX: ca HEX: 3f HEX: 0f HEX: 02 - HEX: c1 HEX: af HEX: bd HEX: 03 HEX: 01 HEX: 13 HEX: 8a HEX: 6b - HEX: 3a HEX: 91 HEX: 11 HEX: 41 HEX: 4f HEX: 67 HEX: dc HEX: ea - HEX: 97 HEX: f2 HEX: cf HEX: ce HEX: f0 HEX: b4 HEX: e6 HEX: 73 - HEX: 96 HEX: ac HEX: 74 HEX: 22 HEX: e7 HEX: ad HEX: 35 HEX: 85 - HEX: e2 HEX: f9 HEX: 37 HEX: e8 HEX: 1c HEX: 75 HEX: df HEX: 6e - HEX: 47 HEX: f1 HEX: 1a HEX: 71 HEX: 1d HEX: 29 HEX: c5 HEX: 89 - HEX: 6f HEX: b7 HEX: 62 HEX: 0e HEX: aa HEX: 18 HEX: be HEX: 1b - HEX: fc HEX: 56 HEX: 3e HEX: 4b HEX: c6 HEX: d2 HEX: 79 HEX: 20 - HEX: 9a HEX: db HEX: c0 HEX: fe HEX: 78 HEX: cd HEX: 5a HEX: f4 - HEX: 1f HEX: dd HEX: a8 HEX: 33 HEX: 88 HEX: 07 HEX: c7 HEX: 31 - HEX: b1 HEX: 12 HEX: 10 HEX: 59 HEX: 27 HEX: 80 HEX: ec HEX: 5f - HEX: 60 HEX: 51 HEX: 7f HEX: a9 HEX: 19 HEX: b5 HEX: 4a HEX: 0d - HEX: 2d HEX: e5 HEX: 7a HEX: 9f HEX: 93 HEX: c9 HEX: 9c HEX: ef - HEX: a0 HEX: e0 HEX: 3b HEX: 4d HEX: ae HEX: 2a HEX: f5 HEX: b0 - HEX: c8 HEX: eb HEX: bb HEX: 3c HEX: 83 HEX: 53 HEX: 99 HEX: 61 - HEX: 17 HEX: 2b HEX: 04 HEX: 7e HEX: ba HEX: 77 HEX: d6 HEX: 26 - HEX: e1 HEX: 69 HEX: 14 HEX: 63 HEX: 55 HEX: 21 HEX: 0c HEX: 7d + 0x52 0x09 0x6a 0xd5 0x30 0x36 0xa5 0x38 + 0xbf 0x40 0xa3 0x9e 0x81 0xf3 0xd7 0xfb + 0x7c 0xe3 0x39 0x82 0x9b 0x2f 0xff 0x87 + 0x34 0x8e 0x43 0x44 0xc4 0xde 0xe9 0xcb + 0x54 0x7b 0x94 0x32 0xa6 0xc2 0x23 0x3d + 0xee 0x4c 0x95 0x0b 0x42 0xfa 0xc3 0x4e + 0x08 0x2e 0xa1 0x66 0x28 0xd9 0x24 0xb2 + 0x76 0x5b 0xa2 0x49 0x6d 0x8b 0xd1 0x25 + 0x72 0xf8 0xf6 0x64 0x86 0x68 0x98 0x16 + 0xd4 0xa4 0x5c 0xcc 0x5d 0x65 0xb6 0x92 + 0x6c 0x70 0x48 0x50 0xfd 0xed 0xb9 0xda + 0x5e 0x15 0x46 0x57 0xa7 0x8d 0x9d 0x84 + 0x90 0xd8 0xab 0x00 0x8c 0xbc 0xd3 0x0a + 0xf7 0xe4 0x58 0x05 0xb8 0xb3 0x45 0x06 + 0xd0 0x2c 0x1e 0x8f 0xca 0x3f 0x0f 0x02 + 0xc1 0xaf 0xbd 0x03 0x01 0x13 0x8a 0x6b + 0x3a 0x91 0x11 0x41 0x4f 0x67 0xdc 0xea + 0x97 0xf2 0xcf 0xce 0xf0 0xb4 0xe6 0x73 + 0x96 0xac 0x74 0x22 0xe7 0xad 0x35 0x85 + 0xe2 0xf9 0x37 0xe8 0x1c 0x75 0xdf 0x6e + 0x47 0xf1 0x1a 0x71 0x1d 0x29 0xc5 0x89 + 0x6f 0xb7 0x62 0x0e 0xaa 0x18 0xbe 0x1b + 0xfc 0x56 0x3e 0x4b 0xc6 0xd2 0x79 0x20 + 0x9a 0xdb 0xc0 0xfe 0x78 0xcd 0x5a 0xf4 + 0x1f 0xdd 0xa8 0x33 0x88 0x07 0xc7 0x31 + 0xb1 0x12 0x10 0x59 0x27 0x80 0xec 0x5f + 0x60 0x51 0x7f 0xa9 0x19 0xb5 0x4a 0x0d + 0x2d 0xe5 0x7a 0x9f 0x93 0xc9 0x9c 0xef + 0xa0 0xe0 0x3b 0x4d 0xae 0x2a 0xf5 0xb0 + 0xc8 0xeb 0xbb 0x3c 0x83 0x53 0x99 0x61 + 0x17 0x2b 0x04 0x7e 0xba 0x77 0xd6 0x26 + 0xe1 0x69 0x14 0x63 0x55 0x21 0x0c 0x7d } ] [ inv-sbox ] unit-test [ { - HEX: 50a7f451 HEX: 5365417e HEX: c3a4171a HEX: 965e273a HEX: cb6bab3b HEX: f1459d1f HEX: ab58faac HEX: 9303e34b - HEX: 55fa3020 HEX: f66d76ad HEX: 9176cc88 HEX: 254c02f5 HEX: fcd7e54f HEX: d7cb2ac5 HEX: 80443526 HEX: 8fa362b5 - HEX: 495ab1de HEX: 671bba25 HEX: 980eea45 HEX: e1c0fe5d HEX: 02752fc3 HEX: 12f04c81 HEX: a397468d HEX: c6f9d36b - HEX: e75f8f03 HEX: 959c9215 HEX: eb7a6dbf HEX: da595295 HEX: 2d83bed4 HEX: d3217458 HEX: 2969e049 HEX: 44c8c98e - HEX: 6a89c275 HEX: 78798ef4 HEX: 6b3e5899 HEX: dd71b927 HEX: b64fe1be HEX: 17ad88f0 HEX: 66ac20c9 HEX: b43ace7d - HEX: 184adf63 HEX: 82311ae5 HEX: 60335197 HEX: 457f5362 HEX: e07764b1 HEX: 84ae6bbb HEX: 1ca081fe HEX: 942b08f9 - HEX: 58684870 HEX: 19fd458f HEX: 876cde94 HEX: b7f87b52 HEX: 23d373ab HEX: e2024b72 HEX: 578f1fe3 HEX: 2aab5566 - HEX: 0728ebb2 HEX: 03c2b52f HEX: 9a7bc586 HEX: a50837d3 HEX: f2872830 HEX: b2a5bf23 HEX: ba6a0302 HEX: 5c8216ed - HEX: 2b1ccf8a HEX: 92b479a7 HEX: f0f207f3 HEX: a1e2694e HEX: cdf4da65 HEX: d5be0506 HEX: 1f6234d1 HEX: 8afea6c4 - HEX: 9d532e34 HEX: a055f3a2 HEX: 32e18a05 HEX: 75ebf6a4 HEX: 39ec830b HEX: aaef6040 HEX: 069f715e HEX: 51106ebd - HEX: f98a213e HEX: 3d06dd96 HEX: ae053edd HEX: 46bde64d HEX: b58d5491 HEX: 055dc471 HEX: 6fd40604 HEX: ff155060 - HEX: 24fb9819 HEX: 97e9bdd6 HEX: cc434089 HEX: 779ed967 HEX: bd42e8b0 HEX: 888b8907 HEX: 385b19e7 HEX: dbeec879 - HEX: 470a7ca1 HEX: e90f427c HEX: c91e84f8 HEX: 00000000 HEX: 83868009 HEX: 48ed2b32 HEX: ac70111e HEX: 4e725a6c - HEX: fbff0efd HEX: 5638850f HEX: 1ed5ae3d HEX: 27392d36 HEX: 64d90f0a HEX: 21a65c68 HEX: d1545b9b HEX: 3a2e3624 - HEX: b1670a0c HEX: 0fe75793 HEX: d296eeb4 HEX: 9e919b1b HEX: 4fc5c080 HEX: a220dc61 HEX: 694b775a HEX: 161a121c - HEX: 0aba93e2 HEX: e52aa0c0 HEX: 43e0223c HEX: 1d171b12 HEX: 0b0d090e HEX: adc78bf2 HEX: b9a8b62d HEX: c8a91e14 - HEX: 8519f157 HEX: 4c0775af HEX: bbdd99ee HEX: fd607fa3 HEX: 9f2601f7 HEX: bcf5725c HEX: c53b6644 HEX: 347efb5b - HEX: 7629438b HEX: dcc623cb HEX: 68fcedb6 HEX: 63f1e4b8 HEX: cadc31d7 HEX: 10856342 HEX: 40229713 HEX: 2011c684 - HEX: 7d244a85 HEX: f83dbbd2 HEX: 1132f9ae HEX: 6da129c7 HEX: 4b2f9e1d HEX: f330b2dc HEX: ec52860d HEX: d0e3c177 - HEX: 6c16b32b HEX: 99b970a9 HEX: fa489411 HEX: 2264e947 HEX: c48cfca8 HEX: 1a3ff0a0 HEX: d82c7d56 HEX: ef903322 - HEX: c74e4987 HEX: c1d138d9 HEX: fea2ca8c HEX: 360bd498 HEX: cf81f5a6 HEX: 28de7aa5 HEX: 268eb7da HEX: a4bfad3f - HEX: e49d3a2c HEX: 0d927850 HEX: 9bcc5f6a HEX: 62467e54 HEX: c2138df6 HEX: e8b8d890 HEX: 5ef7392e HEX: f5afc382 - HEX: be805d9f HEX: 7c93d069 HEX: a92dd56f HEX: b31225cf HEX: 3b99acc8 HEX: a77d1810 HEX: 6e639ce8 HEX: 7bbb3bdb - HEX: 097826cd HEX: f418596e HEX: 01b79aec HEX: a89a4f83 HEX: 656e95e6 HEX: 7ee6ffaa HEX: 08cfbc21 HEX: e6e815ef - HEX: d99be7ba HEX: ce366f4a HEX: d4099fea HEX: d67cb029 HEX: afb2a431 HEX: 31233f2a HEX: 3094a5c6 HEX: c066a235 - HEX: 37bc4e74 HEX: a6ca82fc HEX: b0d090e0 HEX: 15d8a733 HEX: 4a9804f1 HEX: f7daec41 HEX: 0e50cd7f HEX: 2ff69117 - HEX: 8dd64d76 HEX: 4db0ef43 HEX: 544daacc HEX: df0496e4 HEX: e3b5d19e HEX: 1b886a4c HEX: b81f2cc1 HEX: 7f516546 - HEX: 04ea5e9d HEX: 5d358c01 HEX: 737487fa HEX: 2e410bfb HEX: 5a1d67b3 HEX: 52d2db92 HEX: 335610e9 HEX: 1347d66d - HEX: 8c61d79a HEX: 7a0ca137 HEX: 8e14f859 HEX: 893c13eb HEX: ee27a9ce HEX: 35c961b7 HEX: ede51ce1 HEX: 3cb1477a - HEX: 59dfd29c HEX: 3f73f255 HEX: 79ce1418 HEX: bf37c773 HEX: eacdf753 HEX: 5baafd5f HEX: 146f3ddf HEX: 86db4478 - HEX: 81f3afca HEX: 3ec468b9 HEX: 2c342438 HEX: 5f40a3c2 HEX: 72c31d16 HEX: 0c25e2bc HEX: 8b493c28 HEX: 41950dff - HEX: 7101a839 HEX: deb30c08 HEX: 9ce4b4d8 HEX: 90c15664 HEX: 6184cb7b HEX: 70b632d5 HEX: 745c6c48 HEX: 4257b8d0 - HEX: a7f45150 HEX: 65417e53 HEX: a4171ac3 HEX: 5e273a96 HEX: 6bab3bcb HEX: 459d1ff1 HEX: 58faacab HEX: 03e34b93 - HEX: fa302055 HEX: 6d76adf6 HEX: 76cc8891 HEX: 4c02f525 HEX: d7e54ffc HEX: cb2ac5d7 HEX: 44352680 HEX: a362b58f - HEX: 5ab1de49 HEX: 1bba2567 HEX: 0eea4598 HEX: c0fe5de1 HEX: 752fc302 HEX: f04c8112 HEX: 97468da3 HEX: f9d36bc6 - HEX: 5f8f03e7 HEX: 9c921595 HEX: 7a6dbfeb HEX: 595295da HEX: 83bed42d HEX: 217458d3 HEX: 69e04929 HEX: c8c98e44 - HEX: 89c2756a HEX: 798ef478 HEX: 3e58996b HEX: 71b927dd HEX: 4fe1beb6 HEX: ad88f017 HEX: ac20c966 HEX: 3ace7db4 - HEX: 4adf6318 HEX: 311ae582 HEX: 33519760 HEX: 7f536245 HEX: 7764b1e0 HEX: ae6bbb84 HEX: a081fe1c HEX: 2b08f994 - HEX: 68487058 HEX: fd458f19 HEX: 6cde9487 HEX: f87b52b7 HEX: d373ab23 HEX: 024b72e2 HEX: 8f1fe357 HEX: ab55662a - HEX: 28ebb207 HEX: c2b52f03 HEX: 7bc5869a HEX: 0837d3a5 HEX: 872830f2 HEX: a5bf23b2 HEX: 6a0302ba HEX: 8216ed5c - HEX: 1ccf8a2b HEX: b479a792 HEX: f207f3f0 HEX: e2694ea1 HEX: f4da65cd HEX: be0506d5 HEX: 6234d11f HEX: fea6c48a - HEX: 532e349d HEX: 55f3a2a0 HEX: e18a0532 HEX: ebf6a475 HEX: ec830b39 HEX: ef6040aa HEX: 9f715e06 HEX: 106ebd51 - HEX: 8a213ef9 HEX: 06dd963d HEX: 053eddae HEX: bde64d46 HEX: 8d5491b5 HEX: 5dc47105 HEX: d406046f HEX: 155060ff - HEX: fb981924 HEX: e9bdd697 HEX: 434089cc HEX: 9ed96777 HEX: 42e8b0bd HEX: 8b890788 HEX: 5b19e738 HEX: eec879db - HEX: 0a7ca147 HEX: 0f427ce9 HEX: 1e84f8c9 HEX: 00000000 HEX: 86800983 HEX: ed2b3248 HEX: 70111eac HEX: 725a6c4e - HEX: ff0efdfb HEX: 38850f56 HEX: d5ae3d1e HEX: 392d3627 HEX: d90f0a64 HEX: a65c6821 HEX: 545b9bd1 HEX: 2e36243a - HEX: 670a0cb1 HEX: e757930f HEX: 96eeb4d2 HEX: 919b1b9e HEX: c5c0804f HEX: 20dc61a2 HEX: 4b775a69 HEX: 1a121c16 - HEX: ba93e20a HEX: 2aa0c0e5 HEX: e0223c43 HEX: 171b121d HEX: 0d090e0b HEX: c78bf2ad HEX: a8b62db9 HEX: a91e14c8 - HEX: 19f15785 HEX: 0775af4c HEX: dd99eebb HEX: 607fa3fd HEX: 2601f79f HEX: f5725cbc HEX: 3b6644c5 HEX: 7efb5b34 - HEX: 29438b76 HEX: c623cbdc HEX: fcedb668 HEX: f1e4b863 HEX: dc31d7ca HEX: 85634210 HEX: 22971340 HEX: 11c68420 - HEX: 244a857d HEX: 3dbbd2f8 HEX: 32f9ae11 HEX: a129c76d HEX: 2f9e1d4b HEX: 30b2dcf3 HEX: 52860dec HEX: e3c177d0 - HEX: 16b32b6c HEX: b970a999 HEX: 489411fa HEX: 64e94722 HEX: 8cfca8c4 HEX: 3ff0a01a HEX: 2c7d56d8 HEX: 903322ef - HEX: 4e4987c7 HEX: d138d9c1 HEX: a2ca8cfe HEX: 0bd49836 HEX: 81f5a6cf HEX: de7aa528 HEX: 8eb7da26 HEX: bfad3fa4 - HEX: 9d3a2ce4 HEX: 9278500d HEX: cc5f6a9b HEX: 467e5462 HEX: 138df6c2 HEX: b8d890e8 HEX: f7392e5e HEX: afc382f5 - HEX: 805d9fbe HEX: 93d0697c HEX: 2dd56fa9 HEX: 1225cfb3 HEX: 99acc83b HEX: 7d1810a7 HEX: 639ce86e HEX: bb3bdb7b - HEX: 7826cd09 HEX: 18596ef4 HEX: b79aec01 HEX: 9a4f83a8 HEX: 6e95e665 HEX: e6ffaa7e HEX: cfbc2108 HEX: e815efe6 - HEX: 9be7bad9 HEX: 366f4ace HEX: 099fead4 HEX: 7cb029d6 HEX: b2a431af HEX: 233f2a31 HEX: 94a5c630 HEX: 66a235c0 - HEX: bc4e7437 HEX: ca82fca6 HEX: d090e0b0 HEX: d8a73315 HEX: 9804f14a HEX: daec41f7 HEX: 50cd7f0e HEX: f691172f - HEX: d64d768d HEX: b0ef434d HEX: 4daacc54 HEX: 0496e4df HEX: b5d19ee3 HEX: 886a4c1b HEX: 1f2cc1b8 HEX: 5165467f - HEX: ea5e9d04 HEX: 358c015d HEX: 7487fa73 HEX: 410bfb2e HEX: 1d67b35a HEX: d2db9252 HEX: 5610e933 HEX: 47d66d13 - HEX: 61d79a8c HEX: 0ca1377a HEX: 14f8598e HEX: 3c13eb89 HEX: 27a9ceee HEX: c961b735 HEX: e51ce1ed HEX: b1477a3c - HEX: dfd29c59 HEX: 73f2553f HEX: ce141879 HEX: 37c773bf HEX: cdf753ea HEX: aafd5f5b HEX: 6f3ddf14 HEX: db447886 - HEX: f3afca81 HEX: c468b93e HEX: 3424382c HEX: 40a3c25f HEX: c31d1672 HEX: 25e2bc0c HEX: 493c288b HEX: 950dff41 - HEX: 01a83971 HEX: b30c08de HEX: e4b4d89c HEX: c1566490 HEX: 84cb7b61 HEX: b632d570 HEX: 5c6c4874 HEX: 57b8d042 - HEX: f45150a7 HEX: 417e5365 HEX: 171ac3a4 HEX: 273a965e HEX: ab3bcb6b HEX: 9d1ff145 HEX: faacab58 HEX: e34b9303 - HEX: 302055fa HEX: 76adf66d HEX: cc889176 HEX: 02f5254c HEX: e54ffcd7 HEX: 2ac5d7cb HEX: 35268044 HEX: 62b58fa3 - HEX: b1de495a HEX: ba25671b HEX: ea45980e HEX: fe5de1c0 HEX: 2fc30275 HEX: 4c8112f0 HEX: 468da397 HEX: d36bc6f9 - HEX: 8f03e75f HEX: 9215959c HEX: 6dbfeb7a HEX: 5295da59 HEX: bed42d83 HEX: 7458d321 HEX: e0492969 HEX: c98e44c8 - HEX: c2756a89 HEX: 8ef47879 HEX: 58996b3e HEX: b927dd71 HEX: e1beb64f HEX: 88f017ad HEX: 20c966ac HEX: ce7db43a - HEX: df63184a HEX: 1ae58231 HEX: 51976033 HEX: 5362457f HEX: 64b1e077 HEX: 6bbb84ae HEX: 81fe1ca0 HEX: 08f9942b - HEX: 48705868 HEX: 458f19fd HEX: de94876c HEX: 7b52b7f8 HEX: 73ab23d3 HEX: 4b72e202 HEX: 1fe3578f HEX: 55662aab - HEX: ebb20728 HEX: b52f03c2 HEX: c5869a7b HEX: 37d3a508 HEX: 2830f287 HEX: bf23b2a5 HEX: 0302ba6a HEX: 16ed5c82 - HEX: cf8a2b1c HEX: 79a792b4 HEX: 07f3f0f2 HEX: 694ea1e2 HEX: da65cdf4 HEX: 0506d5be HEX: 34d11f62 HEX: a6c48afe - HEX: 2e349d53 HEX: f3a2a055 HEX: 8a0532e1 HEX: f6a475eb HEX: 830b39ec HEX: 6040aaef HEX: 715e069f HEX: 6ebd5110 - HEX: 213ef98a HEX: dd963d06 HEX: 3eddae05 HEX: e64d46bd HEX: 5491b58d HEX: c471055d HEX: 06046fd4 HEX: 5060ff15 - HEX: 981924fb HEX: bdd697e9 HEX: 4089cc43 HEX: d967779e HEX: e8b0bd42 HEX: 8907888b HEX: 19e7385b HEX: c879dbee - HEX: 7ca1470a HEX: 427ce90f HEX: 84f8c91e HEX: 00000000 HEX: 80098386 HEX: 2b3248ed HEX: 111eac70 HEX: 5a6c4e72 - HEX: 0efdfbff HEX: 850f5638 HEX: ae3d1ed5 HEX: 2d362739 HEX: 0f0a64d9 HEX: 5c6821a6 HEX: 5b9bd154 HEX: 36243a2e - HEX: 0a0cb167 HEX: 57930fe7 HEX: eeb4d296 HEX: 9b1b9e91 HEX: c0804fc5 HEX: dc61a220 HEX: 775a694b HEX: 121c161a - HEX: 93e20aba HEX: a0c0e52a HEX: 223c43e0 HEX: 1b121d17 HEX: 090e0b0d HEX: 8bf2adc7 HEX: b62db9a8 HEX: 1e14c8a9 - HEX: f1578519 HEX: 75af4c07 HEX: 99eebbdd HEX: 7fa3fd60 HEX: 01f79f26 HEX: 725cbcf5 HEX: 6644c53b HEX: fb5b347e - HEX: 438b7629 HEX: 23cbdcc6 HEX: edb668fc HEX: e4b863f1 HEX: 31d7cadc HEX: 63421085 HEX: 97134022 HEX: c6842011 - HEX: 4a857d24 HEX: bbd2f83d HEX: f9ae1132 HEX: 29c76da1 HEX: 9e1d4b2f HEX: b2dcf330 HEX: 860dec52 HEX: c177d0e3 - HEX: b32b6c16 HEX: 70a999b9 HEX: 9411fa48 HEX: e9472264 HEX: fca8c48c HEX: f0a01a3f HEX: 7d56d82c HEX: 3322ef90 - HEX: 4987c74e HEX: 38d9c1d1 HEX: ca8cfea2 HEX: d498360b HEX: f5a6cf81 HEX: 7aa528de HEX: b7da268e HEX: ad3fa4bf - HEX: 3a2ce49d HEX: 78500d92 HEX: 5f6a9bcc HEX: 7e546246 HEX: 8df6c213 HEX: d890e8b8 HEX: 392e5ef7 HEX: c382f5af - HEX: 5d9fbe80 HEX: d0697c93 HEX: d56fa92d HEX: 25cfb312 HEX: acc83b99 HEX: 1810a77d HEX: 9ce86e63 HEX: 3bdb7bbb - HEX: 26cd0978 HEX: 596ef418 HEX: 9aec01b7 HEX: 4f83a89a HEX: 95e6656e HEX: ffaa7ee6 HEX: bc2108cf HEX: 15efe6e8 - HEX: e7bad99b HEX: 6f4ace36 HEX: 9fead409 HEX: b029d67c HEX: a431afb2 HEX: 3f2a3123 HEX: a5c63094 HEX: a235c066 - HEX: 4e7437bc HEX: 82fca6ca HEX: 90e0b0d0 HEX: a73315d8 HEX: 04f14a98 HEX: ec41f7da HEX: cd7f0e50 HEX: 91172ff6 - HEX: 4d768dd6 HEX: ef434db0 HEX: aacc544d HEX: 96e4df04 HEX: d19ee3b5 HEX: 6a4c1b88 HEX: 2cc1b81f HEX: 65467f51 - HEX: 5e9d04ea HEX: 8c015d35 HEX: 87fa7374 HEX: 0bfb2e41 HEX: 67b35a1d HEX: db9252d2 HEX: 10e93356 HEX: d66d1347 - HEX: d79a8c61 HEX: a1377a0c HEX: f8598e14 HEX: 13eb893c HEX: a9ceee27 HEX: 61b735c9 HEX: 1ce1ede5 HEX: 477a3cb1 - HEX: d29c59df HEX: f2553f73 HEX: 141879ce HEX: c773bf37 HEX: f753eacd HEX: fd5f5baa HEX: 3ddf146f HEX: 447886db - HEX: afca81f3 HEX: 68b93ec4 HEX: 24382c34 HEX: a3c25f40 HEX: 1d1672c3 HEX: e2bc0c25 HEX: 3c288b49 HEX: 0dff4195 - HEX: a8397101 HEX: 0c08deb3 HEX: b4d89ce4 HEX: 566490c1 HEX: cb7b6184 HEX: 32d570b6 HEX: 6c48745c HEX: b8d04257 - HEX: 5150a7f4 HEX: 7e536541 HEX: 1ac3a417 HEX: 3a965e27 HEX: 3bcb6bab HEX: 1ff1459d HEX: acab58fa HEX: 4b9303e3 - HEX: 2055fa30 HEX: adf66d76 HEX: 889176cc HEX: f5254c02 HEX: 4ffcd7e5 HEX: c5d7cb2a HEX: 26804435 HEX: b58fa362 - HEX: de495ab1 HEX: 25671bba HEX: 45980eea HEX: 5de1c0fe HEX: c302752f HEX: 8112f04c HEX: 8da39746 HEX: 6bc6f9d3 - HEX: 03e75f8f HEX: 15959c92 HEX: bfeb7a6d HEX: 95da5952 HEX: d42d83be HEX: 58d32174 HEX: 492969e0 HEX: 8e44c8c9 - HEX: 756a89c2 HEX: f478798e HEX: 996b3e58 HEX: 27dd71b9 HEX: beb64fe1 HEX: f017ad88 HEX: c966ac20 HEX: 7db43ace - HEX: 63184adf HEX: e582311a HEX: 97603351 HEX: 62457f53 HEX: b1e07764 HEX: bb84ae6b HEX: fe1ca081 HEX: f9942b08 - HEX: 70586848 HEX: 8f19fd45 HEX: 94876cde HEX: 52b7f87b HEX: ab23d373 HEX: 72e2024b HEX: e3578f1f HEX: 662aab55 - HEX: b20728eb HEX: 2f03c2b5 HEX: 869a7bc5 HEX: d3a50837 HEX: 30f28728 HEX: 23b2a5bf HEX: 02ba6a03 HEX: ed5c8216 - HEX: 8a2b1ccf HEX: a792b479 HEX: f3f0f207 HEX: 4ea1e269 HEX: 65cdf4da HEX: 06d5be05 HEX: d11f6234 HEX: c48afea6 - HEX: 349d532e HEX: a2a055f3 HEX: 0532e18a HEX: a475ebf6 HEX: 0b39ec83 HEX: 40aaef60 HEX: 5e069f71 HEX: bd51106e - HEX: 3ef98a21 HEX: 963d06dd HEX: ddae053e HEX: 4d46bde6 HEX: 91b58d54 HEX: 71055dc4 HEX: 046fd406 HEX: 60ff1550 - HEX: 1924fb98 HEX: d697e9bd HEX: 89cc4340 HEX: 67779ed9 HEX: b0bd42e8 HEX: 07888b89 HEX: e7385b19 HEX: 79dbeec8 - HEX: a1470a7c HEX: 7ce90f42 HEX: f8c91e84 HEX: 00000000 HEX: 09838680 HEX: 3248ed2b HEX: 1eac7011 HEX: 6c4e725a - HEX: fdfbff0e HEX: 0f563885 HEX: 3d1ed5ae HEX: 3627392d HEX: 0a64d90f HEX: 6821a65c HEX: 9bd1545b HEX: 243a2e36 - HEX: 0cb1670a HEX: 930fe757 HEX: b4d296ee HEX: 1b9e919b HEX: 804fc5c0 HEX: 61a220dc HEX: 5a694b77 HEX: 1c161a12 - HEX: e20aba93 HEX: c0e52aa0 HEX: 3c43e022 HEX: 121d171b HEX: 0e0b0d09 HEX: f2adc78b HEX: 2db9a8b6 HEX: 14c8a91e - HEX: 578519f1 HEX: af4c0775 HEX: eebbdd99 HEX: a3fd607f HEX: f79f2601 HEX: 5cbcf572 HEX: 44c53b66 HEX: 5b347efb - HEX: 8b762943 HEX: cbdcc623 HEX: b668fced HEX: b863f1e4 HEX: d7cadc31 HEX: 42108563 HEX: 13402297 HEX: 842011c6 - HEX: 857d244a HEX: d2f83dbb HEX: ae1132f9 HEX: c76da129 HEX: 1d4b2f9e HEX: dcf330b2 HEX: 0dec5286 HEX: 77d0e3c1 - HEX: 2b6c16b3 HEX: a999b970 HEX: 11fa4894 HEX: 472264e9 HEX: a8c48cfc HEX: a01a3ff0 HEX: 56d82c7d HEX: 22ef9033 - HEX: 87c74e49 HEX: d9c1d138 HEX: 8cfea2ca HEX: 98360bd4 HEX: a6cf81f5 HEX: a528de7a HEX: da268eb7 HEX: 3fa4bfad - HEX: 2ce49d3a HEX: 500d9278 HEX: 6a9bcc5f HEX: 5462467e HEX: f6c2138d HEX: 90e8b8d8 HEX: 2e5ef739 HEX: 82f5afc3 - HEX: 9fbe805d HEX: 697c93d0 HEX: 6fa92dd5 HEX: cfb31225 HEX: c83b99ac HEX: 10a77d18 HEX: e86e639c HEX: db7bbb3b - HEX: cd097826 HEX: 6ef41859 HEX: ec01b79a HEX: 83a89a4f HEX: e6656e95 HEX: aa7ee6ff HEX: 2108cfbc HEX: efe6e815 - HEX: bad99be7 HEX: 4ace366f HEX: ead4099f HEX: 29d67cb0 HEX: 31afb2a4 HEX: 2a31233f HEX: c63094a5 HEX: 35c066a2 - HEX: 7437bc4e HEX: fca6ca82 HEX: e0b0d090 HEX: 3315d8a7 HEX: f14a9804 HEX: 41f7daec HEX: 7f0e50cd HEX: 172ff691 - HEX: 768dd64d HEX: 434db0ef HEX: cc544daa HEX: e4df0496 HEX: 9ee3b5d1 HEX: 4c1b886a HEX: c1b81f2c HEX: 467f5165 - HEX: 9d04ea5e HEX: 015d358c HEX: fa737487 HEX: fb2e410b HEX: b35a1d67 HEX: 9252d2db HEX: e9335610 HEX: 6d1347d6 - HEX: 9a8c61d7 HEX: 377a0ca1 HEX: 598e14f8 HEX: eb893c13 HEX: ceee27a9 HEX: b735c961 HEX: e1ede51c HEX: 7a3cb147 - HEX: 9c59dfd2 HEX: 553f73f2 HEX: 1879ce14 HEX: 73bf37c7 HEX: 53eacdf7 HEX: 5f5baafd HEX: df146f3d HEX: 7886db44 - HEX: ca81f3af HEX: b93ec468 HEX: 382c3424 HEX: c25f40a3 HEX: 1672c31d HEX: bc0c25e2 HEX: 288b493c HEX: ff41950d - HEX: 397101a8 HEX: 08deb30c HEX: d89ce4b4 HEX: 6490c156 HEX: 7b6184cb HEX: d570b632 HEX: 48745c6c HEX: d04257b8 + 0x50a7f451 0x5365417e 0xc3a4171a 0x965e273a 0xcb6bab3b 0xf1459d1f 0xab58faac 0x9303e34b + 0x55fa3020 0xf66d76ad 0x9176cc88 0x254c02f5 0xfcd7e54f 0xd7cb2ac5 0x80443526 0x8fa362b5 + 0x495ab1de 0x671bba25 0x980eea45 0xe1c0fe5d 0x02752fc3 0x12f04c81 0xa397468d 0xc6f9d36b + 0xe75f8f03 0x959c9215 0xeb7a6dbf 0xda595295 0x2d83bed4 0xd3217458 0x2969e049 0x44c8c98e + 0x6a89c275 0x78798ef4 0x6b3e5899 0xdd71b927 0xb64fe1be 0x17ad88f0 0x66ac20c9 0xb43ace7d + 0x184adf63 0x82311ae5 0x60335197 0x457f5362 0xe07764b1 0x84ae6bbb 0x1ca081fe 0x942b08f9 + 0x58684870 0x19fd458f 0x876cde94 0xb7f87b52 0x23d373ab 0xe2024b72 0x578f1fe3 0x2aab5566 + 0x0728ebb2 0x03c2b52f 0x9a7bc586 0xa50837d3 0xf2872830 0xb2a5bf23 0xba6a0302 0x5c8216ed + 0x2b1ccf8a 0x92b479a7 0xf0f207f3 0xa1e2694e 0xcdf4da65 0xd5be0506 0x1f6234d1 0x8afea6c4 + 0x9d532e34 0xa055f3a2 0x32e18a05 0x75ebf6a4 0x39ec830b 0xaaef6040 0x069f715e 0x51106ebd + 0xf98a213e 0x3d06dd96 0xae053edd 0x46bde64d 0xb58d5491 0x055dc471 0x6fd40604 0xff155060 + 0x24fb9819 0x97e9bdd6 0xcc434089 0x779ed967 0xbd42e8b0 0x888b8907 0x385b19e7 0xdbeec879 + 0x470a7ca1 0xe90f427c 0xc91e84f8 0x00000000 0x83868009 0x48ed2b32 0xac70111e 0x4e725a6c + 0xfbff0efd 0x5638850f 0x1ed5ae3d 0x27392d36 0x64d90f0a 0x21a65c68 0xd1545b9b 0x3a2e3624 + 0xb1670a0c 0x0fe75793 0xd296eeb4 0x9e919b1b 0x4fc5c080 0xa220dc61 0x694b775a 0x161a121c + 0x0aba93e2 0xe52aa0c0 0x43e0223c 0x1d171b12 0x0b0d090e 0xadc78bf2 0xb9a8b62d 0xc8a91e14 + 0x8519f157 0x4c0775af 0xbbdd99ee 0xfd607fa3 0x9f2601f7 0xbcf5725c 0xc53b6644 0x347efb5b + 0x7629438b 0xdcc623cb 0x68fcedb6 0x63f1e4b8 0xcadc31d7 0x10856342 0x40229713 0x2011c684 + 0x7d244a85 0xf83dbbd2 0x1132f9ae 0x6da129c7 0x4b2f9e1d 0xf330b2dc 0xec52860d 0xd0e3c177 + 0x6c16b32b 0x99b970a9 0xfa489411 0x2264e947 0xc48cfca8 0x1a3ff0a0 0xd82c7d56 0xef903322 + 0xc74e4987 0xc1d138d9 0xfea2ca8c 0x360bd498 0xcf81f5a6 0x28de7aa5 0x268eb7da 0xa4bfad3f + 0xe49d3a2c 0x0d927850 0x9bcc5f6a 0x62467e54 0xc2138df6 0xe8b8d890 0x5ef7392e 0xf5afc382 + 0xbe805d9f 0x7c93d069 0xa92dd56f 0xb31225cf 0x3b99acc8 0xa77d1810 0x6e639ce8 0x7bbb3bdb + 0x097826cd 0xf418596e 0x01b79aec 0xa89a4f83 0x656e95e6 0x7ee6ffaa 0x08cfbc21 0xe6e815ef + 0xd99be7ba 0xce366f4a 0xd4099fea 0xd67cb029 0xafb2a431 0x31233f2a 0x3094a5c6 0xc066a235 + 0x37bc4e74 0xa6ca82fc 0xb0d090e0 0x15d8a733 0x4a9804f1 0xf7daec41 0x0e50cd7f 0x2ff69117 + 0x8dd64d76 0x4db0ef43 0x544daacc 0xdf0496e4 0xe3b5d19e 0x1b886a4c 0xb81f2cc1 0x7f516546 + 0x04ea5e9d 0x5d358c01 0x737487fa 0x2e410bfb 0x5a1d67b3 0x52d2db92 0x335610e9 0x1347d66d + 0x8c61d79a 0x7a0ca137 0x8e14f859 0x893c13eb 0xee27a9ce 0x35c961b7 0xede51ce1 0x3cb1477a + 0x59dfd29c 0x3f73f255 0x79ce1418 0xbf37c773 0xeacdf753 0x5baafd5f 0x146f3ddf 0x86db4478 + 0x81f3afca 0x3ec468b9 0x2c342438 0x5f40a3c2 0x72c31d16 0x0c25e2bc 0x8b493c28 0x41950dff + 0x7101a839 0xdeb30c08 0x9ce4b4d8 0x90c15664 0x6184cb7b 0x70b632d5 0x745c6c48 0x4257b8d0 + 0xa7f45150 0x65417e53 0xa4171ac3 0x5e273a96 0x6bab3bcb 0x459d1ff1 0x58faacab 0x03e34b93 + 0xfa302055 0x6d76adf6 0x76cc8891 0x4c02f525 0xd7e54ffc 0xcb2ac5d7 0x44352680 0xa362b58f + 0x5ab1de49 0x1bba2567 0x0eea4598 0xc0fe5de1 0x752fc302 0xf04c8112 0x97468da3 0xf9d36bc6 + 0x5f8f03e7 0x9c921595 0x7a6dbfeb 0x595295da 0x83bed42d 0x217458d3 0x69e04929 0xc8c98e44 + 0x89c2756a 0x798ef478 0x3e58996b 0x71b927dd 0x4fe1beb6 0xad88f017 0xac20c966 0x3ace7db4 + 0x4adf6318 0x311ae582 0x33519760 0x7f536245 0x7764b1e0 0xae6bbb84 0xa081fe1c 0x2b08f994 + 0x68487058 0xfd458f19 0x6cde9487 0xf87b52b7 0xd373ab23 0x024b72e2 0x8f1fe357 0xab55662a + 0x28ebb207 0xc2b52f03 0x7bc5869a 0x0837d3a5 0x872830f2 0xa5bf23b2 0x6a0302ba 0x8216ed5c + 0x1ccf8a2b 0xb479a792 0xf207f3f0 0xe2694ea1 0xf4da65cd 0xbe0506d5 0x6234d11f 0xfea6c48a + 0x532e349d 0x55f3a2a0 0xe18a0532 0xebf6a475 0xec830b39 0xef6040aa 0x9f715e06 0x106ebd51 + 0x8a213ef9 0x06dd963d 0x053eddae 0xbde64d46 0x8d5491b5 0x5dc47105 0xd406046f 0x155060ff + 0xfb981924 0xe9bdd697 0x434089cc 0x9ed96777 0x42e8b0bd 0x8b890788 0x5b19e738 0xeec879db + 0x0a7ca147 0x0f427ce9 0x1e84f8c9 0x00000000 0x86800983 0xed2b3248 0x70111eac 0x725a6c4e + 0xff0efdfb 0x38850f56 0xd5ae3d1e 0x392d3627 0xd90f0a64 0xa65c6821 0x545b9bd1 0x2e36243a + 0x670a0cb1 0xe757930f 0x96eeb4d2 0x919b1b9e 0xc5c0804f 0x20dc61a2 0x4b775a69 0x1a121c16 + 0xba93e20a 0x2aa0c0e5 0xe0223c43 0x171b121d 0x0d090e0b 0xc78bf2ad 0xa8b62db9 0xa91e14c8 + 0x19f15785 0x0775af4c 0xdd99eebb 0x607fa3fd 0x2601f79f 0xf5725cbc 0x3b6644c5 0x7efb5b34 + 0x29438b76 0xc623cbdc 0xfcedb668 0xf1e4b863 0xdc31d7ca 0x85634210 0x22971340 0x11c68420 + 0x244a857d 0x3dbbd2f8 0x32f9ae11 0xa129c76d 0x2f9e1d4b 0x30b2dcf3 0x52860dec 0xe3c177d0 + 0x16b32b6c 0xb970a999 0x489411fa 0x64e94722 0x8cfca8c4 0x3ff0a01a 0x2c7d56d8 0x903322ef + 0x4e4987c7 0xd138d9c1 0xa2ca8cfe 0x0bd49836 0x81f5a6cf 0xde7aa528 0x8eb7da26 0xbfad3fa4 + 0x9d3a2ce4 0x9278500d 0xcc5f6a9b 0x467e5462 0x138df6c2 0xb8d890e8 0xf7392e5e 0xafc382f5 + 0x805d9fbe 0x93d0697c 0x2dd56fa9 0x1225cfb3 0x99acc83b 0x7d1810a7 0x639ce86e 0xbb3bdb7b + 0x7826cd09 0x18596ef4 0xb79aec01 0x9a4f83a8 0x6e95e665 0xe6ffaa7e 0xcfbc2108 0xe815efe6 + 0x9be7bad9 0x366f4ace 0x099fead4 0x7cb029d6 0xb2a431af 0x233f2a31 0x94a5c630 0x66a235c0 + 0xbc4e7437 0xca82fca6 0xd090e0b0 0xd8a73315 0x9804f14a 0xdaec41f7 0x50cd7f0e 0xf691172f + 0xd64d768d 0xb0ef434d 0x4daacc54 0x0496e4df 0xb5d19ee3 0x886a4c1b 0x1f2cc1b8 0x5165467f + 0xea5e9d04 0x358c015d 0x7487fa73 0x410bfb2e 0x1d67b35a 0xd2db9252 0x5610e933 0x47d66d13 + 0x61d79a8c 0x0ca1377a 0x14f8598e 0x3c13eb89 0x27a9ceee 0xc961b735 0xe51ce1ed 0xb1477a3c + 0xdfd29c59 0x73f2553f 0xce141879 0x37c773bf 0xcdf753ea 0xaafd5f5b 0x6f3ddf14 0xdb447886 + 0xf3afca81 0xc468b93e 0x3424382c 0x40a3c25f 0xc31d1672 0x25e2bc0c 0x493c288b 0x950dff41 + 0x01a83971 0xb30c08de 0xe4b4d89c 0xc1566490 0x84cb7b61 0xb632d570 0x5c6c4874 0x57b8d042 + 0xf45150a7 0x417e5365 0x171ac3a4 0x273a965e 0xab3bcb6b 0x9d1ff145 0xfaacab58 0xe34b9303 + 0x302055fa 0x76adf66d 0xcc889176 0x02f5254c 0xe54ffcd7 0x2ac5d7cb 0x35268044 0x62b58fa3 + 0xb1de495a 0xba25671b 0xea45980e 0xfe5de1c0 0x2fc30275 0x4c8112f0 0x468da397 0xd36bc6f9 + 0x8f03e75f 0x9215959c 0x6dbfeb7a 0x5295da59 0xbed42d83 0x7458d321 0xe0492969 0xc98e44c8 + 0xc2756a89 0x8ef47879 0x58996b3e 0xb927dd71 0xe1beb64f 0x88f017ad 0x20c966ac 0xce7db43a + 0xdf63184a 0x1ae58231 0x51976033 0x5362457f 0x64b1e077 0x6bbb84ae 0x81fe1ca0 0x08f9942b + 0x48705868 0x458f19fd 0xde94876c 0x7b52b7f8 0x73ab23d3 0x4b72e202 0x1fe3578f 0x55662aab + 0xebb20728 0xb52f03c2 0xc5869a7b 0x37d3a508 0x2830f287 0xbf23b2a5 0x0302ba6a 0x16ed5c82 + 0xcf8a2b1c 0x79a792b4 0x07f3f0f2 0x694ea1e2 0xda65cdf4 0x0506d5be 0x34d11f62 0xa6c48afe + 0x2e349d53 0xf3a2a055 0x8a0532e1 0xf6a475eb 0x830b39ec 0x6040aaef 0x715e069f 0x6ebd5110 + 0x213ef98a 0xdd963d06 0x3eddae05 0xe64d46bd 0x5491b58d 0xc471055d 0x06046fd4 0x5060ff15 + 0x981924fb 0xbdd697e9 0x4089cc43 0xd967779e 0xe8b0bd42 0x8907888b 0x19e7385b 0xc879dbee + 0x7ca1470a 0x427ce90f 0x84f8c91e 0x00000000 0x80098386 0x2b3248ed 0x111eac70 0x5a6c4e72 + 0x0efdfbff 0x850f5638 0xae3d1ed5 0x2d362739 0x0f0a64d9 0x5c6821a6 0x5b9bd154 0x36243a2e + 0x0a0cb167 0x57930fe7 0xeeb4d296 0x9b1b9e91 0xc0804fc5 0xdc61a220 0x775a694b 0x121c161a + 0x93e20aba 0xa0c0e52a 0x223c43e0 0x1b121d17 0x090e0b0d 0x8bf2adc7 0xb62db9a8 0x1e14c8a9 + 0xf1578519 0x75af4c07 0x99eebbdd 0x7fa3fd60 0x01f79f26 0x725cbcf5 0x6644c53b 0xfb5b347e + 0x438b7629 0x23cbdcc6 0xedb668fc 0xe4b863f1 0x31d7cadc 0x63421085 0x97134022 0xc6842011 + 0x4a857d24 0xbbd2f83d 0xf9ae1132 0x29c76da1 0x9e1d4b2f 0xb2dcf330 0x860dec52 0xc177d0e3 + 0xb32b6c16 0x70a999b9 0x9411fa48 0xe9472264 0xfca8c48c 0xf0a01a3f 0x7d56d82c 0x3322ef90 + 0x4987c74e 0x38d9c1d1 0xca8cfea2 0xd498360b 0xf5a6cf81 0x7aa528de 0xb7da268e 0xad3fa4bf + 0x3a2ce49d 0x78500d92 0x5f6a9bcc 0x7e546246 0x8df6c213 0xd890e8b8 0x392e5ef7 0xc382f5af + 0x5d9fbe80 0xd0697c93 0xd56fa92d 0x25cfb312 0xacc83b99 0x1810a77d 0x9ce86e63 0x3bdb7bbb + 0x26cd0978 0x596ef418 0x9aec01b7 0x4f83a89a 0x95e6656e 0xffaa7ee6 0xbc2108cf 0x15efe6e8 + 0xe7bad99b 0x6f4ace36 0x9fead409 0xb029d67c 0xa431afb2 0x3f2a3123 0xa5c63094 0xa235c066 + 0x4e7437bc 0x82fca6ca 0x90e0b0d0 0xa73315d8 0x04f14a98 0xec41f7da 0xcd7f0e50 0x91172ff6 + 0x4d768dd6 0xef434db0 0xaacc544d 0x96e4df04 0xd19ee3b5 0x6a4c1b88 0x2cc1b81f 0x65467f51 + 0x5e9d04ea 0x8c015d35 0x87fa7374 0x0bfb2e41 0x67b35a1d 0xdb9252d2 0x10e93356 0xd66d1347 + 0xd79a8c61 0xa1377a0c 0xf8598e14 0x13eb893c 0xa9ceee27 0x61b735c9 0x1ce1ede5 0x477a3cb1 + 0xd29c59df 0xf2553f73 0x141879ce 0xc773bf37 0xf753eacd 0xfd5f5baa 0x3ddf146f 0x447886db + 0xafca81f3 0x68b93ec4 0x24382c34 0xa3c25f40 0x1d1672c3 0xe2bc0c25 0x3c288b49 0x0dff4195 + 0xa8397101 0x0c08deb3 0xb4d89ce4 0x566490c1 0xcb7b6184 0x32d570b6 0x6c48745c 0xb8d04257 + 0x5150a7f4 0x7e536541 0x1ac3a417 0x3a965e27 0x3bcb6bab 0x1ff1459d 0xacab58fa 0x4b9303e3 + 0x2055fa30 0xadf66d76 0x889176cc 0xf5254c02 0x4ffcd7e5 0xc5d7cb2a 0x26804435 0xb58fa362 + 0xde495ab1 0x25671bba 0x45980eea 0x5de1c0fe 0xc302752f 0x8112f04c 0x8da39746 0x6bc6f9d3 + 0x03e75f8f 0x15959c92 0xbfeb7a6d 0x95da5952 0xd42d83be 0x58d32174 0x492969e0 0x8e44c8c9 + 0x756a89c2 0xf478798e 0x996b3e58 0x27dd71b9 0xbeb64fe1 0xf017ad88 0xc966ac20 0x7db43ace + 0x63184adf 0xe582311a 0x97603351 0x62457f53 0xb1e07764 0xbb84ae6b 0xfe1ca081 0xf9942b08 + 0x70586848 0x8f19fd45 0x94876cde 0x52b7f87b 0xab23d373 0x72e2024b 0xe3578f1f 0x662aab55 + 0xb20728eb 0x2f03c2b5 0x869a7bc5 0xd3a50837 0x30f28728 0x23b2a5bf 0x02ba6a03 0xed5c8216 + 0x8a2b1ccf 0xa792b479 0xf3f0f207 0x4ea1e269 0x65cdf4da 0x06d5be05 0xd11f6234 0xc48afea6 + 0x349d532e 0xa2a055f3 0x0532e18a 0xa475ebf6 0x0b39ec83 0x40aaef60 0x5e069f71 0xbd51106e + 0x3ef98a21 0x963d06dd 0xddae053e 0x4d46bde6 0x91b58d54 0x71055dc4 0x046fd406 0x60ff1550 + 0x1924fb98 0xd697e9bd 0x89cc4340 0x67779ed9 0xb0bd42e8 0x07888b89 0xe7385b19 0x79dbeec8 + 0xa1470a7c 0x7ce90f42 0xf8c91e84 0x00000000 0x09838680 0x3248ed2b 0x1eac7011 0x6c4e725a + 0xfdfbff0e 0x0f563885 0x3d1ed5ae 0x3627392d 0x0a64d90f 0x6821a65c 0x9bd1545b 0x243a2e36 + 0x0cb1670a 0x930fe757 0xb4d296ee 0x1b9e919b 0x804fc5c0 0x61a220dc 0x5a694b77 0x1c161a12 + 0xe20aba93 0xc0e52aa0 0x3c43e022 0x121d171b 0x0e0b0d09 0xf2adc78b 0x2db9a8b6 0x14c8a91e + 0x578519f1 0xaf4c0775 0xeebbdd99 0xa3fd607f 0xf79f2601 0x5cbcf572 0x44c53b66 0x5b347efb + 0x8b762943 0xcbdcc623 0xb668fced 0xb863f1e4 0xd7cadc31 0x42108563 0x13402297 0x842011c6 + 0x857d244a 0xd2f83dbb 0xae1132f9 0xc76da129 0x1d4b2f9e 0xdcf330b2 0x0dec5286 0x77d0e3c1 + 0x2b6c16b3 0xa999b970 0x11fa4894 0x472264e9 0xa8c48cfc 0xa01a3ff0 0x56d82c7d 0x22ef9033 + 0x87c74e49 0xd9c1d138 0x8cfea2ca 0x98360bd4 0xa6cf81f5 0xa528de7a 0xda268eb7 0x3fa4bfad + 0x2ce49d3a 0x500d9278 0x6a9bcc5f 0x5462467e 0xf6c2138d 0x90e8b8d8 0x2e5ef739 0x82f5afc3 + 0x9fbe805d 0x697c93d0 0x6fa92dd5 0xcfb31225 0xc83b99ac 0x10a77d18 0xe86e639c 0xdb7bbb3b + 0xcd097826 0x6ef41859 0xec01b79a 0x83a89a4f 0xe6656e95 0xaa7ee6ff 0x2108cfbc 0xefe6e815 + 0xbad99be7 0x4ace366f 0xead4099f 0x29d67cb0 0x31afb2a4 0x2a31233f 0xc63094a5 0x35c066a2 + 0x7437bc4e 0xfca6ca82 0xe0b0d090 0x3315d8a7 0xf14a9804 0x41f7daec 0x7f0e50cd 0x172ff691 + 0x768dd64d 0x434db0ef 0xcc544daa 0xe4df0496 0x9ee3b5d1 0x4c1b886a 0xc1b81f2c 0x467f5165 + 0x9d04ea5e 0x015d358c 0xfa737487 0xfb2e410b 0xb35a1d67 0x9252d2db 0xe9335610 0x6d1347d6 + 0x9a8c61d7 0x377a0ca1 0x598e14f8 0xeb893c13 0xceee27a9 0xb735c961 0xe1ede51c 0x7a3cb147 + 0x9c59dfd2 0x553f73f2 0x1879ce14 0x73bf37c7 0x53eacdf7 0x5f5baafd 0xdf146f3d 0x7886db44 + 0xca81f3af 0xb93ec468 0x382c3424 0xc25f40a3 0x1672c31d 0xbc0c25e2 0x288b493c 0xff41950d + 0x397101a8 0x08deb30c 0xd89ce4b4 0x6490c156 0x7b6184cb 0xd570b632 0x48745c6c 0xd04257b8 } ] [ d-table ] unit-test [ { -HEX: a56363c6 HEX: 847c7cf8 HEX: 997777ee HEX: 8d7b7bf6 HEX: 0df2f2ff HEX: bd6b6bd6 HEX: b16f6fde HEX: 54c5c591 -HEX: 50303060 HEX: 03010102 HEX: a96767ce HEX: 7d2b2b56 HEX: 19fefee7 HEX: 62d7d7b5 HEX: e6abab4d HEX: 9a7676ec -HEX: 45caca8f HEX: 9d82821f HEX: 40c9c989 HEX: 877d7dfa HEX: 15fafaef HEX: eb5959b2 HEX: c947478e HEX: 0bf0f0fb -HEX: ecadad41 HEX: 67d4d4b3 HEX: fda2a25f HEX: eaafaf45 HEX: bf9c9c23 HEX: f7a4a453 HEX: 967272e4 HEX: 5bc0c09b -HEX: c2b7b775 HEX: 1cfdfde1 HEX: ae93933d HEX: 6a26264c HEX: 5a36366c HEX: 413f3f7e HEX: 02f7f7f5 HEX: 4fcccc83 -HEX: 5c343468 HEX: f4a5a551 HEX: 34e5e5d1 HEX: 08f1f1f9 HEX: 937171e2 HEX: 73d8d8ab HEX: 53313162 HEX: 3f15152a -HEX: 0c040408 HEX: 52c7c795 HEX: 65232346 HEX: 5ec3c39d HEX: 28181830 HEX: a1969637 HEX: 0f05050a HEX: b59a9a2f -HEX: 0907070e HEX: 36121224 HEX: 9b80801b HEX: 3de2e2df HEX: 26ebebcd HEX: 6927274e HEX: cdb2b27f HEX: 9f7575ea -HEX: 1b090912 HEX: 9e83831d HEX: 742c2c58 HEX: 2e1a1a34 HEX: 2d1b1b36 HEX: b26e6edc HEX: ee5a5ab4 HEX: fba0a05b -HEX: f65252a4 HEX: 4d3b3b76 HEX: 61d6d6b7 HEX: ceb3b37d HEX: 7b292952 HEX: 3ee3e3dd HEX: 712f2f5e HEX: 97848413 -HEX: f55353a6 HEX: 68d1d1b9 HEX: 00000000 HEX: 2cededc1 HEX: 60202040 HEX: 1ffcfce3 HEX: c8b1b179 HEX: ed5b5bb6 -HEX: be6a6ad4 HEX: 46cbcb8d HEX: d9bebe67 HEX: 4b393972 HEX: de4a4a94 HEX: d44c4c98 HEX: e85858b0 HEX: 4acfcf85 -HEX: 6bd0d0bb HEX: 2aefefc5 HEX: e5aaaa4f HEX: 16fbfbed HEX: c5434386 HEX: d74d4d9a HEX: 55333366 HEX: 94858511 -HEX: cf45458a HEX: 10f9f9e9 HEX: 06020204 HEX: 817f7ffe HEX: f05050a0 HEX: 443c3c78 HEX: ba9f9f25 HEX: e3a8a84b -HEX: f35151a2 HEX: fea3a35d HEX: c0404080 HEX: 8a8f8f05 HEX: ad92923f HEX: bc9d9d21 HEX: 48383870 HEX: 04f5f5f1 -HEX: dfbcbc63 HEX: c1b6b677 HEX: 75dadaaf HEX: 63212142 HEX: 30101020 HEX: 1affffe5 HEX: 0ef3f3fd HEX: 6dd2d2bf -HEX: 4ccdcd81 HEX: 140c0c18 HEX: 35131326 HEX: 2fececc3 HEX: e15f5fbe HEX: a2979735 HEX: cc444488 HEX: 3917172e -HEX: 57c4c493 HEX: f2a7a755 HEX: 827e7efc HEX: 473d3d7a HEX: ac6464c8 HEX: e75d5dba HEX: 2b191932 HEX: 957373e6 -HEX: a06060c0 HEX: 98818119 HEX: d14f4f9e HEX: 7fdcdca3 HEX: 66222244 HEX: 7e2a2a54 HEX: ab90903b HEX: 8388880b -HEX: ca46468c HEX: 29eeeec7 HEX: d3b8b86b HEX: 3c141428 HEX: 79dedea7 HEX: e25e5ebc HEX: 1d0b0b16 HEX: 76dbdbad -HEX: 3be0e0db HEX: 56323264 HEX: 4e3a3a74 HEX: 1e0a0a14 HEX: db494992 HEX: 0a06060c HEX: 6c242448 HEX: e45c5cb8 -HEX: 5dc2c29f HEX: 6ed3d3bd HEX: efacac43 HEX: a66262c4 HEX: a8919139 HEX: a4959531 HEX: 37e4e4d3 HEX: 8b7979f2 -HEX: 32e7e7d5 HEX: 43c8c88b HEX: 5937376e HEX: b76d6dda HEX: 8c8d8d01 HEX: 64d5d5b1 HEX: d24e4e9c HEX: e0a9a949 -HEX: b46c6cd8 HEX: fa5656ac HEX: 07f4f4f3 HEX: 25eaeacf HEX: af6565ca HEX: 8e7a7af4 HEX: e9aeae47 HEX: 18080810 -HEX: d5baba6f HEX: 887878f0 HEX: 6f25254a HEX: 722e2e5c HEX: 241c1c38 HEX: f1a6a657 HEX: c7b4b473 HEX: 51c6c697 -HEX: 23e8e8cb HEX: 7cdddda1 HEX: 9c7474e8 HEX: 211f1f3e HEX: dd4b4b96 HEX: dcbdbd61 HEX: 868b8b0d HEX: 858a8a0f -HEX: 907070e0 HEX: 423e3e7c HEX: c4b5b571 HEX: aa6666cc HEX: d8484890 HEX: 05030306 HEX: 01f6f6f7 HEX: 120e0e1c -HEX: a36161c2 HEX: 5f35356a HEX: f95757ae HEX: d0b9b969 HEX: 91868617 HEX: 58c1c199 HEX: 271d1d3a HEX: b99e9e27 -HEX: 38e1e1d9 HEX: 13f8f8eb HEX: b398982b HEX: 33111122 HEX: bb6969d2 HEX: 70d9d9a9 HEX: 898e8e07 HEX: a7949433 -HEX: b69b9b2d HEX: 221e1e3c HEX: 92878715 HEX: 20e9e9c9 HEX: 49cece87 HEX: ff5555aa HEX: 78282850 HEX: 7adfdfa5 -HEX: 8f8c8c03 HEX: f8a1a159 HEX: 80898909 HEX: 170d0d1a HEX: dabfbf65 HEX: 31e6e6d7 HEX: c6424284 HEX: b86868d0 -HEX: c3414182 HEX: b0999929 HEX: 772d2d5a HEX: 110f0f1e HEX: cbb0b07b HEX: fc5454a8 HEX: d6bbbb6d HEX: 3a16162c -HEX: 6363c6a5 HEX: 7c7cf884 HEX: 7777ee99 HEX: 7b7bf68d HEX: f2f2ff0d HEX: 6b6bd6bd HEX: 6f6fdeb1 HEX: c5c59154 -HEX: 30306050 HEX: 01010203 HEX: 6767cea9 HEX: 2b2b567d HEX: fefee719 HEX: d7d7b562 HEX: abab4de6 HEX: 7676ec9a -HEX: caca8f45 HEX: 82821f9d HEX: c9c98940 HEX: 7d7dfa87 HEX: fafaef15 HEX: 5959b2eb HEX: 47478ec9 HEX: f0f0fb0b -HEX: adad41ec HEX: d4d4b367 HEX: a2a25ffd HEX: afaf45ea HEX: 9c9c23bf HEX: a4a453f7 HEX: 7272e496 HEX: c0c09b5b -HEX: b7b775c2 HEX: fdfde11c HEX: 93933dae HEX: 26264c6a HEX: 36366c5a HEX: 3f3f7e41 HEX: f7f7f502 HEX: cccc834f -HEX: 3434685c HEX: a5a551f4 HEX: e5e5d134 HEX: f1f1f908 HEX: 7171e293 HEX: d8d8ab73 HEX: 31316253 HEX: 15152a3f -HEX: 0404080c HEX: c7c79552 HEX: 23234665 HEX: c3c39d5e HEX: 18183028 HEX: 969637a1 HEX: 05050a0f HEX: 9a9a2fb5 -HEX: 07070e09 HEX: 12122436 HEX: 80801b9b HEX: e2e2df3d HEX: ebebcd26 HEX: 27274e69 HEX: b2b27fcd HEX: 7575ea9f -HEX: 0909121b HEX: 83831d9e HEX: 2c2c5874 HEX: 1a1a342e HEX: 1b1b362d HEX: 6e6edcb2 HEX: 5a5ab4ee HEX: a0a05bfb -HEX: 5252a4f6 HEX: 3b3b764d HEX: d6d6b761 HEX: b3b37dce HEX: 2929527b HEX: e3e3dd3e HEX: 2f2f5e71 HEX: 84841397 -HEX: 5353a6f5 HEX: d1d1b968 HEX: 00000000 HEX: ededc12c HEX: 20204060 HEX: fcfce31f HEX: b1b179c8 HEX: 5b5bb6ed -HEX: 6a6ad4be HEX: cbcb8d46 HEX: bebe67d9 HEX: 3939724b HEX: 4a4a94de HEX: 4c4c98d4 HEX: 5858b0e8 HEX: cfcf854a -HEX: d0d0bb6b HEX: efefc52a HEX: aaaa4fe5 HEX: fbfbed16 HEX: 434386c5 HEX: 4d4d9ad7 HEX: 33336655 HEX: 85851194 -HEX: 45458acf HEX: f9f9e910 HEX: 02020406 HEX: 7f7ffe81 HEX: 5050a0f0 HEX: 3c3c7844 HEX: 9f9f25ba HEX: a8a84be3 -HEX: 5151a2f3 HEX: a3a35dfe HEX: 404080c0 HEX: 8f8f058a HEX: 92923fad HEX: 9d9d21bc HEX: 38387048 HEX: f5f5f104 -HEX: bcbc63df HEX: b6b677c1 HEX: dadaaf75 HEX: 21214263 HEX: 10102030 HEX: ffffe51a HEX: f3f3fd0e HEX: d2d2bf6d -HEX: cdcd814c HEX: 0c0c1814 HEX: 13132635 HEX: ececc32f HEX: 5f5fbee1 HEX: 979735a2 HEX: 444488cc HEX: 17172e39 -HEX: c4c49357 HEX: a7a755f2 HEX: 7e7efc82 HEX: 3d3d7a47 HEX: 6464c8ac HEX: 5d5dbae7 HEX: 1919322b HEX: 7373e695 -HEX: 6060c0a0 HEX: 81811998 HEX: 4f4f9ed1 HEX: dcdca37f HEX: 22224466 HEX: 2a2a547e HEX: 90903bab HEX: 88880b83 -HEX: 46468cca HEX: eeeec729 HEX: b8b86bd3 HEX: 1414283c HEX: dedea779 HEX: 5e5ebce2 HEX: 0b0b161d HEX: dbdbad76 -HEX: e0e0db3b HEX: 32326456 HEX: 3a3a744e HEX: 0a0a141e HEX: 494992db HEX: 06060c0a HEX: 2424486c HEX: 5c5cb8e4 -HEX: c2c29f5d HEX: d3d3bd6e HEX: acac43ef HEX: 6262c4a6 HEX: 919139a8 HEX: 959531a4 HEX: e4e4d337 HEX: 7979f28b -HEX: e7e7d532 HEX: c8c88b43 HEX: 37376e59 HEX: 6d6ddab7 HEX: 8d8d018c HEX: d5d5b164 HEX: 4e4e9cd2 HEX: a9a949e0 -HEX: 6c6cd8b4 HEX: 5656acfa HEX: f4f4f307 HEX: eaeacf25 HEX: 6565caaf HEX: 7a7af48e HEX: aeae47e9 HEX: 08081018 -HEX: baba6fd5 HEX: 7878f088 HEX: 25254a6f HEX: 2e2e5c72 HEX: 1c1c3824 HEX: a6a657f1 HEX: b4b473c7 HEX: c6c69751 -HEX: e8e8cb23 HEX: dddda17c HEX: 7474e89c HEX: 1f1f3e21 HEX: 4b4b96dd HEX: bdbd61dc HEX: 8b8b0d86 HEX: 8a8a0f85 -HEX: 7070e090 HEX: 3e3e7c42 HEX: b5b571c4 HEX: 6666ccaa HEX: 484890d8 HEX: 03030605 HEX: f6f6f701 HEX: 0e0e1c12 -HEX: 6161c2a3 HEX: 35356a5f HEX: 5757aef9 HEX: b9b969d0 HEX: 86861791 HEX: c1c19958 HEX: 1d1d3a27 HEX: 9e9e27b9 -HEX: e1e1d938 HEX: f8f8eb13 HEX: 98982bb3 HEX: 11112233 HEX: 6969d2bb HEX: d9d9a970 HEX: 8e8e0789 HEX: 949433a7 -HEX: 9b9b2db6 HEX: 1e1e3c22 HEX: 87871592 HEX: e9e9c920 HEX: cece8749 HEX: 5555aaff HEX: 28285078 HEX: dfdfa57a -HEX: 8c8c038f HEX: a1a159f8 HEX: 89890980 HEX: 0d0d1a17 HEX: bfbf65da HEX: e6e6d731 HEX: 424284c6 HEX: 6868d0b8 -HEX: 414182c3 HEX: 999929b0 HEX: 2d2d5a77 HEX: 0f0f1e11 HEX: b0b07bcb HEX: 5454a8fc HEX: bbbb6dd6 HEX: 16162c3a -HEX: 63c6a563 HEX: 7cf8847c HEX: 77ee9977 HEX: 7bf68d7b HEX: f2ff0df2 HEX: 6bd6bd6b HEX: 6fdeb16f HEX: c59154c5 -HEX: 30605030 HEX: 01020301 HEX: 67cea967 HEX: 2b567d2b HEX: fee719fe HEX: d7b562d7 HEX: ab4de6ab HEX: 76ec9a76 -HEX: ca8f45ca HEX: 821f9d82 HEX: c98940c9 HEX: 7dfa877d HEX: faef15fa HEX: 59b2eb59 HEX: 478ec947 HEX: f0fb0bf0 -HEX: ad41ecad HEX: d4b367d4 HEX: a25ffda2 HEX: af45eaaf HEX: 9c23bf9c HEX: a453f7a4 HEX: 72e49672 HEX: c09b5bc0 -HEX: b775c2b7 HEX: fde11cfd HEX: 933dae93 HEX: 264c6a26 HEX: 366c5a36 HEX: 3f7e413f HEX: f7f502f7 HEX: cc834fcc -HEX: 34685c34 HEX: a551f4a5 HEX: e5d134e5 HEX: f1f908f1 HEX: 71e29371 HEX: d8ab73d8 HEX: 31625331 HEX: 152a3f15 -HEX: 04080c04 HEX: c79552c7 HEX: 23466523 HEX: c39d5ec3 HEX: 18302818 HEX: 9637a196 HEX: 050a0f05 HEX: 9a2fb59a -HEX: 070e0907 HEX: 12243612 HEX: 801b9b80 HEX: e2df3de2 HEX: ebcd26eb HEX: 274e6927 HEX: b27fcdb2 HEX: 75ea9f75 -HEX: 09121b09 HEX: 831d9e83 HEX: 2c58742c HEX: 1a342e1a HEX: 1b362d1b HEX: 6edcb26e HEX: 5ab4ee5a HEX: a05bfba0 -HEX: 52a4f652 HEX: 3b764d3b HEX: d6b761d6 HEX: b37dceb3 HEX: 29527b29 HEX: e3dd3ee3 HEX: 2f5e712f HEX: 84139784 -HEX: 53a6f553 HEX: d1b968d1 HEX: 00000000 HEX: edc12ced HEX: 20406020 HEX: fce31ffc HEX: b179c8b1 HEX: 5bb6ed5b -HEX: 6ad4be6a HEX: cb8d46cb HEX: be67d9be HEX: 39724b39 HEX: 4a94de4a HEX: 4c98d44c HEX: 58b0e858 HEX: cf854acf -HEX: d0bb6bd0 HEX: efc52aef HEX: aa4fe5aa HEX: fbed16fb HEX: 4386c543 HEX: 4d9ad74d HEX: 33665533 HEX: 85119485 -HEX: 458acf45 HEX: f9e910f9 HEX: 02040602 HEX: 7ffe817f HEX: 50a0f050 HEX: 3c78443c HEX: 9f25ba9f HEX: a84be3a8 -HEX: 51a2f351 HEX: a35dfea3 HEX: 4080c040 HEX: 8f058a8f HEX: 923fad92 HEX: 9d21bc9d HEX: 38704838 HEX: f5f104f5 -HEX: bc63dfbc HEX: b677c1b6 HEX: daaf75da HEX: 21426321 HEX: 10203010 HEX: ffe51aff HEX: f3fd0ef3 HEX: d2bf6dd2 -HEX: cd814ccd HEX: 0c18140c HEX: 13263513 HEX: ecc32fec HEX: 5fbee15f HEX: 9735a297 HEX: 4488cc44 HEX: 172e3917 -HEX: c49357c4 HEX: a755f2a7 HEX: 7efc827e HEX: 3d7a473d HEX: 64c8ac64 HEX: 5dbae75d HEX: 19322b19 HEX: 73e69573 -HEX: 60c0a060 HEX: 81199881 HEX: 4f9ed14f HEX: dca37fdc HEX: 22446622 HEX: 2a547e2a HEX: 903bab90 HEX: 880b8388 -HEX: 468cca46 HEX: eec729ee HEX: b86bd3b8 HEX: 14283c14 HEX: dea779de HEX: 5ebce25e HEX: 0b161d0b HEX: dbad76db -HEX: e0db3be0 HEX: 32645632 HEX: 3a744e3a HEX: 0a141e0a HEX: 4992db49 HEX: 060c0a06 HEX: 24486c24 HEX: 5cb8e45c -HEX: c29f5dc2 HEX: d3bd6ed3 HEX: ac43efac HEX: 62c4a662 HEX: 9139a891 HEX: 9531a495 HEX: e4d337e4 HEX: 79f28b79 -HEX: e7d532e7 HEX: c88b43c8 HEX: 376e5937 HEX: 6ddab76d HEX: 8d018c8d HEX: d5b164d5 HEX: 4e9cd24e HEX: a949e0a9 -HEX: 6cd8b46c HEX: 56acfa56 HEX: f4f307f4 HEX: eacf25ea HEX: 65caaf65 HEX: 7af48e7a HEX: ae47e9ae HEX: 08101808 -HEX: ba6fd5ba HEX: 78f08878 HEX: 254a6f25 HEX: 2e5c722e HEX: 1c38241c HEX: a657f1a6 HEX: b473c7b4 HEX: c69751c6 -HEX: e8cb23e8 HEX: dda17cdd HEX: 74e89c74 HEX: 1f3e211f HEX: 4b96dd4b HEX: bd61dcbd HEX: 8b0d868b HEX: 8a0f858a -HEX: 70e09070 HEX: 3e7c423e HEX: b571c4b5 HEX: 66ccaa66 HEX: 4890d848 HEX: 03060503 HEX: f6f701f6 HEX: 0e1c120e -HEX: 61c2a361 HEX: 356a5f35 HEX: 57aef957 HEX: b969d0b9 HEX: 86179186 HEX: c19958c1 HEX: 1d3a271d HEX: 9e27b99e -HEX: e1d938e1 HEX: f8eb13f8 HEX: 982bb398 HEX: 11223311 HEX: 69d2bb69 HEX: d9a970d9 HEX: 8e07898e HEX: 9433a794 -HEX: 9b2db69b HEX: 1e3c221e HEX: 87159287 HEX: e9c920e9 HEX: ce8749ce HEX: 55aaff55 HEX: 28507828 HEX: dfa57adf -HEX: 8c038f8c HEX: a159f8a1 HEX: 89098089 HEX: 0d1a170d HEX: bf65dabf HEX: e6d731e6 HEX: 4284c642 HEX: 68d0b868 -HEX: 4182c341 HEX: 9929b099 HEX: 2d5a772d HEX: 0f1e110f HEX: b07bcbb0 HEX: 54a8fc54 HEX: bb6dd6bb HEX: 162c3a16 -HEX: c6a56363 HEX: f8847c7c HEX: ee997777 HEX: f68d7b7b HEX: ff0df2f2 HEX: d6bd6b6b HEX: deb16f6f HEX: 9154c5c5 -HEX: 60503030 HEX: 02030101 HEX: cea96767 HEX: 567d2b2b HEX: e719fefe HEX: b562d7d7 HEX: 4de6abab HEX: ec9a7676 -HEX: 8f45caca HEX: 1f9d8282 HEX: 8940c9c9 HEX: fa877d7d HEX: ef15fafa HEX: b2eb5959 HEX: 8ec94747 HEX: fb0bf0f0 -HEX: 41ecadad HEX: b367d4d4 HEX: 5ffda2a2 HEX: 45eaafaf HEX: 23bf9c9c HEX: 53f7a4a4 HEX: e4967272 HEX: 9b5bc0c0 -HEX: 75c2b7b7 HEX: e11cfdfd HEX: 3dae9393 HEX: 4c6a2626 HEX: 6c5a3636 HEX: 7e413f3f HEX: f502f7f7 HEX: 834fcccc -HEX: 685c3434 HEX: 51f4a5a5 HEX: d134e5e5 HEX: f908f1f1 HEX: e2937171 HEX: ab73d8d8 HEX: 62533131 HEX: 2a3f1515 -HEX: 080c0404 HEX: 9552c7c7 HEX: 46652323 HEX: 9d5ec3c3 HEX: 30281818 HEX: 37a19696 HEX: 0a0f0505 HEX: 2fb59a9a -HEX: 0e090707 HEX: 24361212 HEX: 1b9b8080 HEX: df3de2e2 HEX: cd26ebeb HEX: 4e692727 HEX: 7fcdb2b2 HEX: ea9f7575 -HEX: 121b0909 HEX: 1d9e8383 HEX: 58742c2c HEX: 342e1a1a HEX: 362d1b1b HEX: dcb26e6e HEX: b4ee5a5a HEX: 5bfba0a0 -HEX: a4f65252 HEX: 764d3b3b HEX: b761d6d6 HEX: 7dceb3b3 HEX: 527b2929 HEX: dd3ee3e3 HEX: 5e712f2f HEX: 13978484 -HEX: a6f55353 HEX: b968d1d1 HEX: 00000000 HEX: c12ceded HEX: 40602020 HEX: e31ffcfc HEX: 79c8b1b1 HEX: b6ed5b5b -HEX: d4be6a6a HEX: 8d46cbcb HEX: 67d9bebe HEX: 724b3939 HEX: 94de4a4a HEX: 98d44c4c HEX: b0e85858 HEX: 854acfcf -HEX: bb6bd0d0 HEX: c52aefef HEX: 4fe5aaaa HEX: ed16fbfb HEX: 86c54343 HEX: 9ad74d4d HEX: 66553333 HEX: 11948585 -HEX: 8acf4545 HEX: e910f9f9 HEX: 04060202 HEX: fe817f7f HEX: a0f05050 HEX: 78443c3c HEX: 25ba9f9f HEX: 4be3a8a8 -HEX: a2f35151 HEX: 5dfea3a3 HEX: 80c04040 HEX: 058a8f8f HEX: 3fad9292 HEX: 21bc9d9d HEX: 70483838 HEX: f104f5f5 -HEX: 63dfbcbc HEX: 77c1b6b6 HEX: af75dada HEX: 42632121 HEX: 20301010 HEX: e51affff HEX: fd0ef3f3 HEX: bf6dd2d2 -HEX: 814ccdcd HEX: 18140c0c HEX: 26351313 HEX: c32fecec HEX: bee15f5f HEX: 35a29797 HEX: 88cc4444 HEX: 2e391717 -HEX: 9357c4c4 HEX: 55f2a7a7 HEX: fc827e7e HEX: 7a473d3d HEX: c8ac6464 HEX: bae75d5d HEX: 322b1919 HEX: e6957373 -HEX: c0a06060 HEX: 19988181 HEX: 9ed14f4f HEX: a37fdcdc HEX: 44662222 HEX: 547e2a2a HEX: 3bab9090 HEX: 0b838888 -HEX: 8cca4646 HEX: c729eeee HEX: 6bd3b8b8 HEX: 283c1414 HEX: a779dede HEX: bce25e5e HEX: 161d0b0b HEX: ad76dbdb -HEX: db3be0e0 HEX: 64563232 HEX: 744e3a3a HEX: 141e0a0a HEX: 92db4949 HEX: 0c0a0606 HEX: 486c2424 HEX: b8e45c5c -HEX: 9f5dc2c2 HEX: bd6ed3d3 HEX: 43efacac HEX: c4a66262 HEX: 39a89191 HEX: 31a49595 HEX: d337e4e4 HEX: f28b7979 -HEX: d532e7e7 HEX: 8b43c8c8 HEX: 6e593737 HEX: dab76d6d HEX: 018c8d8d HEX: b164d5d5 HEX: 9cd24e4e HEX: 49e0a9a9 -HEX: d8b46c6c HEX: acfa5656 HEX: f307f4f4 HEX: cf25eaea HEX: caaf6565 HEX: f48e7a7a HEX: 47e9aeae HEX: 10180808 -HEX: 6fd5baba HEX: f0887878 HEX: 4a6f2525 HEX: 5c722e2e HEX: 38241c1c HEX: 57f1a6a6 HEX: 73c7b4b4 HEX: 9751c6c6 -HEX: cb23e8e8 HEX: a17cdddd HEX: e89c7474 HEX: 3e211f1f HEX: 96dd4b4b HEX: 61dcbdbd HEX: 0d868b8b HEX: 0f858a8a -HEX: e0907070 HEX: 7c423e3e HEX: 71c4b5b5 HEX: ccaa6666 HEX: 90d84848 HEX: 06050303 HEX: f701f6f6 HEX: 1c120e0e -HEX: c2a36161 HEX: 6a5f3535 HEX: aef95757 HEX: 69d0b9b9 HEX: 17918686 HEX: 9958c1c1 HEX: 3a271d1d HEX: 27b99e9e -HEX: d938e1e1 HEX: eb13f8f8 HEX: 2bb39898 HEX: 22331111 HEX: d2bb6969 HEX: a970d9d9 HEX: 07898e8e HEX: 33a79494 -HEX: 2db69b9b HEX: 3c221e1e HEX: 15928787 HEX: c920e9e9 HEX: 8749cece HEX: aaff5555 HEX: 50782828 HEX: a57adfdf -HEX: 038f8c8c HEX: 59f8a1a1 HEX: 09808989 HEX: 1a170d0d HEX: 65dabfbf HEX: d731e6e6 HEX: 84c64242 HEX: d0b86868 -HEX: 82c34141 HEX: 29b09999 HEX: 5a772d2d HEX: 1e110f0f HEX: 7bcbb0b0 HEX: a8fc5454 HEX: 6dd6bbbb HEX: 2c3a1616 +0xa56363c6 0x847c7cf8 0x997777ee 0x8d7b7bf6 0x0df2f2ff 0xbd6b6bd6 0xb16f6fde 0x54c5c591 +0x50303060 0x03010102 0xa96767ce 0x7d2b2b56 0x19fefee7 0x62d7d7b5 0xe6abab4d 0x9a7676ec +0x45caca8f 0x9d82821f 0x40c9c989 0x877d7dfa 0x15fafaef 0xeb5959b2 0xc947478e 0x0bf0f0fb +0xecadad41 0x67d4d4b3 0xfda2a25f 0xeaafaf45 0xbf9c9c23 0xf7a4a453 0x967272e4 0x5bc0c09b +0xc2b7b775 0x1cfdfde1 0xae93933d 0x6a26264c 0x5a36366c 0x413f3f7e 0x02f7f7f5 0x4fcccc83 +0x5c343468 0xf4a5a551 0x34e5e5d1 0x08f1f1f9 0x937171e2 0x73d8d8ab 0x53313162 0x3f15152a +0x0c040408 0x52c7c795 0x65232346 0x5ec3c39d 0x28181830 0xa1969637 0x0f05050a 0xb59a9a2f +0x0907070e 0x36121224 0x9b80801b 0x3de2e2df 0x26ebebcd 0x6927274e 0xcdb2b27f 0x9f7575ea +0x1b090912 0x9e83831d 0x742c2c58 0x2e1a1a34 0x2d1b1b36 0xb26e6edc 0xee5a5ab4 0xfba0a05b +0xf65252a4 0x4d3b3b76 0x61d6d6b7 0xceb3b37d 0x7b292952 0x3ee3e3dd 0x712f2f5e 0x97848413 +0xf55353a6 0x68d1d1b9 0x00000000 0x2cededc1 0x60202040 0x1ffcfce3 0xc8b1b179 0xed5b5bb6 +0xbe6a6ad4 0x46cbcb8d 0xd9bebe67 0x4b393972 0xde4a4a94 0xd44c4c98 0xe85858b0 0x4acfcf85 +0x6bd0d0bb 0x2aefefc5 0xe5aaaa4f 0x16fbfbed 0xc5434386 0xd74d4d9a 0x55333366 0x94858511 +0xcf45458a 0x10f9f9e9 0x06020204 0x817f7ffe 0xf05050a0 0x443c3c78 0xba9f9f25 0xe3a8a84b +0xf35151a2 0xfea3a35d 0xc0404080 0x8a8f8f05 0xad92923f 0xbc9d9d21 0x48383870 0x04f5f5f1 +0xdfbcbc63 0xc1b6b677 0x75dadaaf 0x63212142 0x30101020 0x1affffe5 0x0ef3f3fd 0x6dd2d2bf +0x4ccdcd81 0x140c0c18 0x35131326 0x2fececc3 0xe15f5fbe 0xa2979735 0xcc444488 0x3917172e +0x57c4c493 0xf2a7a755 0x827e7efc 0x473d3d7a 0xac6464c8 0xe75d5dba 0x2b191932 0x957373e6 +0xa06060c0 0x98818119 0xd14f4f9e 0x7fdcdca3 0x66222244 0x7e2a2a54 0xab90903b 0x8388880b +0xca46468c 0x29eeeec7 0xd3b8b86b 0x3c141428 0x79dedea7 0xe25e5ebc 0x1d0b0b16 0x76dbdbad +0x3be0e0db 0x56323264 0x4e3a3a74 0x1e0a0a14 0xdb494992 0x0a06060c 0x6c242448 0xe45c5cb8 +0x5dc2c29f 0x6ed3d3bd 0xefacac43 0xa66262c4 0xa8919139 0xa4959531 0x37e4e4d3 0x8b7979f2 +0x32e7e7d5 0x43c8c88b 0x5937376e 0xb76d6dda 0x8c8d8d01 0x64d5d5b1 0xd24e4e9c 0xe0a9a949 +0xb46c6cd8 0xfa5656ac 0x07f4f4f3 0x25eaeacf 0xaf6565ca 0x8e7a7af4 0xe9aeae47 0x18080810 +0xd5baba6f 0x887878f0 0x6f25254a 0x722e2e5c 0x241c1c38 0xf1a6a657 0xc7b4b473 0x51c6c697 +0x23e8e8cb 0x7cdddda1 0x9c7474e8 0x211f1f3e 0xdd4b4b96 0xdcbdbd61 0x868b8b0d 0x858a8a0f +0x907070e0 0x423e3e7c 0xc4b5b571 0xaa6666cc 0xd8484890 0x05030306 0x01f6f6f7 0x120e0e1c +0xa36161c2 0x5f35356a 0xf95757ae 0xd0b9b969 0x91868617 0x58c1c199 0x271d1d3a 0xb99e9e27 +0x38e1e1d9 0x13f8f8eb 0xb398982b 0x33111122 0xbb6969d2 0x70d9d9a9 0x898e8e07 0xa7949433 +0xb69b9b2d 0x221e1e3c 0x92878715 0x20e9e9c9 0x49cece87 0xff5555aa 0x78282850 0x7adfdfa5 +0x8f8c8c03 0xf8a1a159 0x80898909 0x170d0d1a 0xdabfbf65 0x31e6e6d7 0xc6424284 0xb86868d0 +0xc3414182 0xb0999929 0x772d2d5a 0x110f0f1e 0xcbb0b07b 0xfc5454a8 0xd6bbbb6d 0x3a16162c +0x6363c6a5 0x7c7cf884 0x7777ee99 0x7b7bf68d 0xf2f2ff0d 0x6b6bd6bd 0x6f6fdeb1 0xc5c59154 +0x30306050 0x01010203 0x6767cea9 0x2b2b567d 0xfefee719 0xd7d7b562 0xabab4de6 0x7676ec9a +0xcaca8f45 0x82821f9d 0xc9c98940 0x7d7dfa87 0xfafaef15 0x5959b2eb 0x47478ec9 0xf0f0fb0b +0xadad41ec 0xd4d4b367 0xa2a25ffd 0xafaf45ea 0x9c9c23bf 0xa4a453f7 0x7272e496 0xc0c09b5b +0xb7b775c2 0xfdfde11c 0x93933dae 0x26264c6a 0x36366c5a 0x3f3f7e41 0xf7f7f502 0xcccc834f +0x3434685c 0xa5a551f4 0xe5e5d134 0xf1f1f908 0x7171e293 0xd8d8ab73 0x31316253 0x15152a3f +0x0404080c 0xc7c79552 0x23234665 0xc3c39d5e 0x18183028 0x969637a1 0x05050a0f 0x9a9a2fb5 +0x07070e09 0x12122436 0x80801b9b 0xe2e2df3d 0xebebcd26 0x27274e69 0xb2b27fcd 0x7575ea9f +0x0909121b 0x83831d9e 0x2c2c5874 0x1a1a342e 0x1b1b362d 0x6e6edcb2 0x5a5ab4ee 0xa0a05bfb +0x5252a4f6 0x3b3b764d 0xd6d6b761 0xb3b37dce 0x2929527b 0xe3e3dd3e 0x2f2f5e71 0x84841397 +0x5353a6f5 0xd1d1b968 0x00000000 0xededc12c 0x20204060 0xfcfce31f 0xb1b179c8 0x5b5bb6ed +0x6a6ad4be 0xcbcb8d46 0xbebe67d9 0x3939724b 0x4a4a94de 0x4c4c98d4 0x5858b0e8 0xcfcf854a +0xd0d0bb6b 0xefefc52a 0xaaaa4fe5 0xfbfbed16 0x434386c5 0x4d4d9ad7 0x33336655 0x85851194 +0x45458acf 0xf9f9e910 0x02020406 0x7f7ffe81 0x5050a0f0 0x3c3c7844 0x9f9f25ba 0xa8a84be3 +0x5151a2f3 0xa3a35dfe 0x404080c0 0x8f8f058a 0x92923fad 0x9d9d21bc 0x38387048 0xf5f5f104 +0xbcbc63df 0xb6b677c1 0xdadaaf75 0x21214263 0x10102030 0xffffe51a 0xf3f3fd0e 0xd2d2bf6d +0xcdcd814c 0x0c0c1814 0x13132635 0xececc32f 0x5f5fbee1 0x979735a2 0x444488cc 0x17172e39 +0xc4c49357 0xa7a755f2 0x7e7efc82 0x3d3d7a47 0x6464c8ac 0x5d5dbae7 0x1919322b 0x7373e695 +0x6060c0a0 0x81811998 0x4f4f9ed1 0xdcdca37f 0x22224466 0x2a2a547e 0x90903bab 0x88880b83 +0x46468cca 0xeeeec729 0xb8b86bd3 0x1414283c 0xdedea779 0x5e5ebce2 0x0b0b161d 0xdbdbad76 +0xe0e0db3b 0x32326456 0x3a3a744e 0x0a0a141e 0x494992db 0x06060c0a 0x2424486c 0x5c5cb8e4 +0xc2c29f5d 0xd3d3bd6e 0xacac43ef 0x6262c4a6 0x919139a8 0x959531a4 0xe4e4d337 0x7979f28b +0xe7e7d532 0xc8c88b43 0x37376e59 0x6d6ddab7 0x8d8d018c 0xd5d5b164 0x4e4e9cd2 0xa9a949e0 +0x6c6cd8b4 0x5656acfa 0xf4f4f307 0xeaeacf25 0x6565caaf 0x7a7af48e 0xaeae47e9 0x08081018 +0xbaba6fd5 0x7878f088 0x25254a6f 0x2e2e5c72 0x1c1c3824 0xa6a657f1 0xb4b473c7 0xc6c69751 +0xe8e8cb23 0xdddda17c 0x7474e89c 0x1f1f3e21 0x4b4b96dd 0xbdbd61dc 0x8b8b0d86 0x8a8a0f85 +0x7070e090 0x3e3e7c42 0xb5b571c4 0x6666ccaa 0x484890d8 0x03030605 0xf6f6f701 0x0e0e1c12 +0x6161c2a3 0x35356a5f 0x5757aef9 0xb9b969d0 0x86861791 0xc1c19958 0x1d1d3a27 0x9e9e27b9 +0xe1e1d938 0xf8f8eb13 0x98982bb3 0x11112233 0x6969d2bb 0xd9d9a970 0x8e8e0789 0x949433a7 +0x9b9b2db6 0x1e1e3c22 0x87871592 0xe9e9c920 0xcece8749 0x5555aaff 0x28285078 0xdfdfa57a +0x8c8c038f 0xa1a159f8 0x89890980 0x0d0d1a17 0xbfbf65da 0xe6e6d731 0x424284c6 0x6868d0b8 +0x414182c3 0x999929b0 0x2d2d5a77 0x0f0f1e11 0xb0b07bcb 0x5454a8fc 0xbbbb6dd6 0x16162c3a +0x63c6a563 0x7cf8847c 0x77ee9977 0x7bf68d7b 0xf2ff0df2 0x6bd6bd6b 0x6fdeb16f 0xc59154c5 +0x30605030 0x01020301 0x67cea967 0x2b567d2b 0xfee719fe 0xd7b562d7 0xab4de6ab 0x76ec9a76 +0xca8f45ca 0x821f9d82 0xc98940c9 0x7dfa877d 0xfaef15fa 0x59b2eb59 0x478ec947 0xf0fb0bf0 +0xad41ecad 0xd4b367d4 0xa25ffda2 0xaf45eaaf 0x9c23bf9c 0xa453f7a4 0x72e49672 0xc09b5bc0 +0xb775c2b7 0xfde11cfd 0x933dae93 0x264c6a26 0x366c5a36 0x3f7e413f 0xf7f502f7 0xcc834fcc +0x34685c34 0xa551f4a5 0xe5d134e5 0xf1f908f1 0x71e29371 0xd8ab73d8 0x31625331 0x152a3f15 +0x04080c04 0xc79552c7 0x23466523 0xc39d5ec3 0x18302818 0x9637a196 0x050a0f05 0x9a2fb59a +0x070e0907 0x12243612 0x801b9b80 0xe2df3de2 0xebcd26eb 0x274e6927 0xb27fcdb2 0x75ea9f75 +0x09121b09 0x831d9e83 0x2c58742c 0x1a342e1a 0x1b362d1b 0x6edcb26e 0x5ab4ee5a 0xa05bfba0 +0x52a4f652 0x3b764d3b 0xd6b761d6 0xb37dceb3 0x29527b29 0xe3dd3ee3 0x2f5e712f 0x84139784 +0x53a6f553 0xd1b968d1 0x00000000 0xedc12ced 0x20406020 0xfce31ffc 0xb179c8b1 0x5bb6ed5b +0x6ad4be6a 0xcb8d46cb 0xbe67d9be 0x39724b39 0x4a94de4a 0x4c98d44c 0x58b0e858 0xcf854acf +0xd0bb6bd0 0xefc52aef 0xaa4fe5aa 0xfbed16fb 0x4386c543 0x4d9ad74d 0x33665533 0x85119485 +0x458acf45 0xf9e910f9 0x02040602 0x7ffe817f 0x50a0f050 0x3c78443c 0x9f25ba9f 0xa84be3a8 +0x51a2f351 0xa35dfea3 0x4080c040 0x8f058a8f 0x923fad92 0x9d21bc9d 0x38704838 0xf5f104f5 +0xbc63dfbc 0xb677c1b6 0xdaaf75da 0x21426321 0x10203010 0xffe51aff 0xf3fd0ef3 0xd2bf6dd2 +0xcd814ccd 0x0c18140c 0x13263513 0xecc32fec 0x5fbee15f 0x9735a297 0x4488cc44 0x172e3917 +0xc49357c4 0xa755f2a7 0x7efc827e 0x3d7a473d 0x64c8ac64 0x5dbae75d 0x19322b19 0x73e69573 +0x60c0a060 0x81199881 0x4f9ed14f 0xdca37fdc 0x22446622 0x2a547e2a 0x903bab90 0x880b8388 +0x468cca46 0xeec729ee 0xb86bd3b8 0x14283c14 0xdea779de 0x5ebce25e 0x0b161d0b 0xdbad76db +0xe0db3be0 0x32645632 0x3a744e3a 0x0a141e0a 0x4992db49 0x060c0a06 0x24486c24 0x5cb8e45c +0xc29f5dc2 0xd3bd6ed3 0xac43efac 0x62c4a662 0x9139a891 0x9531a495 0xe4d337e4 0x79f28b79 +0xe7d532e7 0xc88b43c8 0x376e5937 0x6ddab76d 0x8d018c8d 0xd5b164d5 0x4e9cd24e 0xa949e0a9 +0x6cd8b46c 0x56acfa56 0xf4f307f4 0xeacf25ea 0x65caaf65 0x7af48e7a 0xae47e9ae 0x08101808 +0xba6fd5ba 0x78f08878 0x254a6f25 0x2e5c722e 0x1c38241c 0xa657f1a6 0xb473c7b4 0xc69751c6 +0xe8cb23e8 0xdda17cdd 0x74e89c74 0x1f3e211f 0x4b96dd4b 0xbd61dcbd 0x8b0d868b 0x8a0f858a +0x70e09070 0x3e7c423e 0xb571c4b5 0x66ccaa66 0x4890d848 0x03060503 0xf6f701f6 0x0e1c120e +0x61c2a361 0x356a5f35 0x57aef957 0xb969d0b9 0x86179186 0xc19958c1 0x1d3a271d 0x9e27b99e +0xe1d938e1 0xf8eb13f8 0x982bb398 0x11223311 0x69d2bb69 0xd9a970d9 0x8e07898e 0x9433a794 +0x9b2db69b 0x1e3c221e 0x87159287 0xe9c920e9 0xce8749ce 0x55aaff55 0x28507828 0xdfa57adf +0x8c038f8c 0xa159f8a1 0x89098089 0x0d1a170d 0xbf65dabf 0xe6d731e6 0x4284c642 0x68d0b868 +0x4182c341 0x9929b099 0x2d5a772d 0x0f1e110f 0xb07bcbb0 0x54a8fc54 0xbb6dd6bb 0x162c3a16 +0xc6a56363 0xf8847c7c 0xee997777 0xf68d7b7b 0xff0df2f2 0xd6bd6b6b 0xdeb16f6f 0x9154c5c5 +0x60503030 0x02030101 0xcea96767 0x567d2b2b 0xe719fefe 0xb562d7d7 0x4de6abab 0xec9a7676 +0x8f45caca 0x1f9d8282 0x8940c9c9 0xfa877d7d 0xef15fafa 0xb2eb5959 0x8ec94747 0xfb0bf0f0 +0x41ecadad 0xb367d4d4 0x5ffda2a2 0x45eaafaf 0x23bf9c9c 0x53f7a4a4 0xe4967272 0x9b5bc0c0 +0x75c2b7b7 0xe11cfdfd 0x3dae9393 0x4c6a2626 0x6c5a3636 0x7e413f3f 0xf502f7f7 0x834fcccc +0x685c3434 0x51f4a5a5 0xd134e5e5 0xf908f1f1 0xe2937171 0xab73d8d8 0x62533131 0x2a3f1515 +0x080c0404 0x9552c7c7 0x46652323 0x9d5ec3c3 0x30281818 0x37a19696 0x0a0f0505 0x2fb59a9a +0x0e090707 0x24361212 0x1b9b8080 0xdf3de2e2 0xcd26ebeb 0x4e692727 0x7fcdb2b2 0xea9f7575 +0x121b0909 0x1d9e8383 0x58742c2c 0x342e1a1a 0x362d1b1b 0xdcb26e6e 0xb4ee5a5a 0x5bfba0a0 +0xa4f65252 0x764d3b3b 0xb761d6d6 0x7dceb3b3 0x527b2929 0xdd3ee3e3 0x5e712f2f 0x13978484 +0xa6f55353 0xb968d1d1 0x00000000 0xc12ceded 0x40602020 0xe31ffcfc 0x79c8b1b1 0xb6ed5b5b +0xd4be6a6a 0x8d46cbcb 0x67d9bebe 0x724b3939 0x94de4a4a 0x98d44c4c 0xb0e85858 0x854acfcf +0xbb6bd0d0 0xc52aefef 0x4fe5aaaa 0xed16fbfb 0x86c54343 0x9ad74d4d 0x66553333 0x11948585 +0x8acf4545 0xe910f9f9 0x04060202 0xfe817f7f 0xa0f05050 0x78443c3c 0x25ba9f9f 0x4be3a8a8 +0xa2f35151 0x5dfea3a3 0x80c04040 0x058a8f8f 0x3fad9292 0x21bc9d9d 0x70483838 0xf104f5f5 +0x63dfbcbc 0x77c1b6b6 0xaf75dada 0x42632121 0x20301010 0xe51affff 0xfd0ef3f3 0xbf6dd2d2 +0x814ccdcd 0x18140c0c 0x26351313 0xc32fecec 0xbee15f5f 0x35a29797 0x88cc4444 0x2e391717 +0x9357c4c4 0x55f2a7a7 0xfc827e7e 0x7a473d3d 0xc8ac6464 0xbae75d5d 0x322b1919 0xe6957373 +0xc0a06060 0x19988181 0x9ed14f4f 0xa37fdcdc 0x44662222 0x547e2a2a 0x3bab9090 0x0b838888 +0x8cca4646 0xc729eeee 0x6bd3b8b8 0x283c1414 0xa779dede 0xbce25e5e 0x161d0b0b 0xad76dbdb +0xdb3be0e0 0x64563232 0x744e3a3a 0x141e0a0a 0x92db4949 0x0c0a0606 0x486c2424 0xb8e45c5c +0x9f5dc2c2 0xbd6ed3d3 0x43efacac 0xc4a66262 0x39a89191 0x31a49595 0xd337e4e4 0xf28b7979 +0xd532e7e7 0x8b43c8c8 0x6e593737 0xdab76d6d 0x018c8d8d 0xb164d5d5 0x9cd24e4e 0x49e0a9a9 +0xd8b46c6c 0xacfa5656 0xf307f4f4 0xcf25eaea 0xcaaf6565 0xf48e7a7a 0x47e9aeae 0x10180808 +0x6fd5baba 0xf0887878 0x4a6f2525 0x5c722e2e 0x38241c1c 0x57f1a6a6 0x73c7b4b4 0x9751c6c6 +0xcb23e8e8 0xa17cdddd 0xe89c7474 0x3e211f1f 0x96dd4b4b 0x61dcbdbd 0x0d868b8b 0x0f858a8a +0xe0907070 0x7c423e3e 0x71c4b5b5 0xccaa6666 0x90d84848 0x06050303 0xf701f6f6 0x1c120e0e +0xc2a36161 0x6a5f3535 0xaef95757 0x69d0b9b9 0x17918686 0x9958c1c1 0x3a271d1d 0x27b99e9e +0xd938e1e1 0xeb13f8f8 0x2bb39898 0x22331111 0xd2bb6969 0xa970d9d9 0x07898e8e 0x33a79494 +0x2db69b9b 0x3c221e1e 0x15928787 0xc920e9e9 0x8749cece 0xaaff5555 0x50782828 0xa57adfdf +0x038f8c8c 0x59f8a1a1 0x09808989 0x1a170d0d 0x65dabfbf 0xd731e6e6 0x84c64242 0xd0b86868 +0x82c34141 0x29b09999 0x5a772d2d 0x1e110f0f 0x7bcbb0b0 0xa8fc5454 0x6dd6bbbb 0x2c3a1616 } ] [ t-table ] unit-test diff --git a/extra/crypto/aes/aes.factor b/extra/crypto/aes/aes.factor index 4891eab690..a1e6e470d5 100644 --- a/extra/crypto/aes/aes.factor +++ b/extra/crypto/aes/aes.factor @@ -8,38 +8,38 @@ CONSTANT: AES_BLOCK_SIZE 16 : sbox ( -- array ) { - HEX: 63 HEX: 7c HEX: 77 HEX: 7b HEX: f2 HEX: 6b HEX: 6f HEX: c5 - HEX: 30 HEX: 01 HEX: 67 HEX: 2b HEX: fe HEX: d7 HEX: ab HEX: 76 - HEX: ca HEX: 82 HEX: c9 HEX: 7d HEX: fa HEX: 59 HEX: 47 HEX: f0 - HEX: ad HEX: d4 HEX: a2 HEX: af HEX: 9c HEX: a4 HEX: 72 HEX: c0 - HEX: b7 HEX: fd HEX: 93 HEX: 26 HEX: 36 HEX: 3f HEX: f7 HEX: cc - HEX: 34 HEX: a5 HEX: e5 HEX: f1 HEX: 71 HEX: d8 HEX: 31 HEX: 15 - HEX: 04 HEX: c7 HEX: 23 HEX: c3 HEX: 18 HEX: 96 HEX: 05 HEX: 9a - HEX: 07 HEX: 12 HEX: 80 HEX: e2 HEX: eb HEX: 27 HEX: b2 HEX: 75 - HEX: 09 HEX: 83 HEX: 2c HEX: 1a HEX: 1b HEX: 6e HEX: 5a HEX: a0 - HEX: 52 HEX: 3b HEX: d6 HEX: b3 HEX: 29 HEX: e3 HEX: 2f HEX: 84 - HEX: 53 HEX: d1 HEX: 00 HEX: ed HEX: 20 HEX: fc HEX: b1 HEX: 5b - HEX: 6a HEX: cb HEX: be HEX: 39 HEX: 4a HEX: 4c HEX: 58 HEX: cf - HEX: d0 HEX: ef HEX: aa HEX: fb HEX: 43 HEX: 4d HEX: 33 HEX: 85 - HEX: 45 HEX: f9 HEX: 02 HEX: 7f HEX: 50 HEX: 3c HEX: 9f HEX: a8 - HEX: 51 HEX: a3 HEX: 40 HEX: 8f HEX: 92 HEX: 9d HEX: 38 HEX: f5 - HEX: bc HEX: b6 HEX: da HEX: 21 HEX: 10 HEX: ff HEX: f3 HEX: d2 - HEX: cd HEX: 0c HEX: 13 HEX: ec HEX: 5f HEX: 97 HEX: 44 HEX: 17 - HEX: c4 HEX: a7 HEX: 7e HEX: 3d HEX: 64 HEX: 5d HEX: 19 HEX: 73 - HEX: 60 HEX: 81 HEX: 4f HEX: dc HEX: 22 HEX: 2a HEX: 90 HEX: 88 - HEX: 46 HEX: ee HEX: b8 HEX: 14 HEX: de HEX: 5e HEX: 0b HEX: db - HEX: e0 HEX: 32 HEX: 3a HEX: 0a HEX: 49 HEX: 06 HEX: 24 HEX: 5c - HEX: c2 HEX: d3 HEX: ac HEX: 62 HEX: 91 HEX: 95 HEX: e4 HEX: 79 - HEX: e7 HEX: c8 HEX: 37 HEX: 6d HEX: 8d HEX: d5 HEX: 4e HEX: a9 - HEX: 6c HEX: 56 HEX: f4 HEX: ea HEX: 65 HEX: 7a HEX: ae HEX: 08 - HEX: ba HEX: 78 HEX: 25 HEX: 2e HEX: 1c HEX: a6 HEX: b4 HEX: c6 - HEX: e8 HEX: dd HEX: 74 HEX: 1f HEX: 4b HEX: bd HEX: 8b HEX: 8a - HEX: 70 HEX: 3e HEX: b5 HEX: 66 HEX: 48 HEX: 03 HEX: f6 HEX: 0e - HEX: 61 HEX: 35 HEX: 57 HEX: b9 HEX: 86 HEX: c1 HEX: 1d HEX: 9e - HEX: e1 HEX: f8 HEX: 98 HEX: 11 HEX: 69 HEX: d9 HEX: 8e HEX: 94 - HEX: 9b HEX: 1e HEX: 87 HEX: e9 HEX: ce HEX: 55 HEX: 28 HEX: df - HEX: 8c HEX: a1 HEX: 89 HEX: 0d HEX: bf HEX: e6 HEX: 42 HEX: 68 - HEX: 41 HEX: 99 HEX: 2d HEX: 0f HEX: b0 HEX: 54 HEX: bb HEX: 16 + 0x63 0x7c 0x77 0x7b 0xf2 0x6b 0x6f 0xc5 + 0x30 0x01 0x67 0x2b 0xfe 0xd7 0xab 0x76 + 0xca 0x82 0xc9 0x7d 0xfa 0x59 0x47 0xf0 + 0xad 0xd4 0xa2 0xaf 0x9c 0xa4 0x72 0xc0 + 0xb7 0xfd 0x93 0x26 0x36 0x3f 0xf7 0xcc + 0x34 0xa5 0xe5 0xf1 0x71 0xd8 0x31 0x15 + 0x04 0xc7 0x23 0xc3 0x18 0x96 0x05 0x9a + 0x07 0x12 0x80 0xe2 0xeb 0x27 0xb2 0x75 + 0x09 0x83 0x2c 0x1a 0x1b 0x6e 0x5a 0xa0 + 0x52 0x3b 0xd6 0xb3 0x29 0xe3 0x2f 0x84 + 0x53 0xd1 0x00 0xed 0x20 0xfc 0xb1 0x5b + 0x6a 0xcb 0xbe 0x39 0x4a 0x4c 0x58 0xcf + 0xd0 0xef 0xaa 0xfb 0x43 0x4d 0x33 0x85 + 0x45 0xf9 0x02 0x7f 0x50 0x3c 0x9f 0xa8 + 0x51 0xa3 0x40 0x8f 0x92 0x9d 0x38 0xf5 + 0xbc 0xb6 0xda 0x21 0x10 0xff 0xf3 0xd2 + 0xcd 0x0c 0x13 0xec 0x5f 0x97 0x44 0x17 + 0xc4 0xa7 0x7e 0x3d 0x64 0x5d 0x19 0x73 + 0x60 0x81 0x4f 0xdc 0x22 0x2a 0x90 0x88 + 0x46 0xee 0xb8 0x14 0xde 0x5e 0x0b 0xdb + 0xe0 0x32 0x3a 0x0a 0x49 0x06 0x24 0x5c + 0xc2 0xd3 0xac 0x62 0x91 0x95 0xe4 0x79 + 0xe7 0xc8 0x37 0x6d 0x8d 0xd5 0x4e 0xa9 + 0x6c 0x56 0xf4 0xea 0x65 0x7a 0xae 0x08 + 0xba 0x78 0x25 0x2e 0x1c 0xa6 0xb4 0xc6 + 0xe8 0xdd 0x74 0x1f 0x4b 0xbd 0x8b 0x8a + 0x70 0x3e 0xb5 0x66 0x48 0x03 0xf6 0x0e + 0x61 0x35 0x57 0xb9 0x86 0xc1 0x1d 0x9e + 0xe1 0xf8 0x98 0x11 0x69 0xd9 0x8e 0x94 + 0x9b 0x1e 0x87 0xe9 0xce 0x55 0x28 0xdf + 0x8c 0xa1 0x89 0x0d 0xbf 0xe6 0x42 0x68 + 0x41 0x99 0x2d 0x0f 0xb0 0x54 0xbb 0x16 } ; : inv-sbox ( -- array ) @@ -48,13 +48,13 @@ CONSTANT: AES_BLOCK_SIZE 16 : rcon ( -- array ) { - HEX: 00 HEX: 01 HEX: 02 HEX: 04 HEX: 08 HEX: 10 - HEX: 20 HEX: 40 HEX: 80 HEX: 1b HEX: 36 + 0x00 0x01 0x02 0x04 0x08 0x10 + 0x20 0x40 0x80 0x1b 0x36 } ; : xtime ( x -- x' ) [ 1 shift ] - [ HEX: 80 bitand 0 = 0 HEX: 1b ? ] bi bitxor 8 bits ; + [ 0x80 bitand 0 = 0 0x1b ? ] bi bitxor 8 bits ; : ui32 ( a0 a1 a2 a3 -- a ) [ 8 shift ] [ 16 shift ] [ 24 shift ] tri* @@ -66,9 +66,9 @@ CONSTANT: AES_BLOCK_SIZE 16 a1 a2 bitxor :> a3 a2 a1 a1 a3 ui32 i T set-nth - a3 a2 a1 a1 ui32 i HEX: 100 + T set-nth - a1 a3 a2 a1 ui32 i HEX: 200 + T set-nth - a1 a1 a3 a2 ui32 i HEX: 300 + T set-nth ; + a3 a2 a1 a1 ui32 i 0x100 + T set-nth + a1 a3 a2 a1 ui32 i 0x200 + T set-nth + a1 a1 a3 a2 ui32 i 0x300 + T set-nth ; MEMO:: t-table ( -- array ) 1024 0 @@ -85,9 +85,9 @@ MEMO:: t-table ( -- array ) a8 a4 a2 bitxor bitxor :> ae ae a9 ad ab ui32 i D set-nth - ab ae a9 ad ui32 i HEX: 100 + D set-nth - ad ab ae a9 ui32 i HEX: 200 + D set-nth - a9 ad ab ae ui32 i HEX: 300 + D set-nth ; + ab ae a9 ad ui32 i 0x100 + D set-nth + ad ab ae a9 ui32 i 0x200 + D set-nth + a9 ad ab ae ui32 i 0x300 + D set-nth ; MEMO:: d-table ( -- array ) 1024 0 diff --git a/extra/crypto/barrett/barrett-tests.factor b/extra/crypto/barrett/barrett-tests.factor index 13dae69dce..d8e75aa854 100644 --- a/extra/crypto/barrett/barrett-tests.factor +++ b/extra/crypto/barrett/barrett-tests.factor @@ -3,5 +3,5 @@ USING: crypto.barrett kernel math namespaces tools.test ; IN: crypto.barrett.tests -[ HEX: 1f63edfb7e838622c7412eafaf0439cf0cdf3aae8bdd09e2de69b509a53883a83560d5ce50ea039e4 ] [ HEX: 827c67f31b2b46afa49ed95d7f7a3011e5875f7052d4c55437ce726d3c6ce0dc9c445fda63b6dc4e 16 barrett-mu ] unit-test +[ 0x1f63edfb7e838622c7412eafaf0439cf0cdf3aae8bdd09e2de69b509a53883a83560d5ce50ea039e4 ] [ 0x827c67f31b2b46afa49ed95d7f7a3011e5875f7052d4c55437ce726d3c6ce0dc9c445fda63b6dc4e 16 barrett-mu ] unit-test diff --git a/extra/ctags/etags/etags.factor b/extra/ctags/etags/etags.factor index 615b38daf6..b8177653ae 100644 --- a/extra/ctags/etags/etags.factor +++ b/extra/ctags/etags/etags.factor @@ -37,7 +37,7 @@ IN: ctags.etags : etag ( lines seq -- str ) [ dup first present % - 1 HEX: 7f % + 1 0x7f % second dup number>string % 1 CHAR: , % 1 - lines>bytes number>string % @@ -55,7 +55,7 @@ IN: ctags.etags : etag-header ( vec1 n resource -- vec2 ) normalize-path (etag-header) prefix - 1 HEX: 0c prefix ; + 1 0x0c prefix ; : etag-strings ( alist -- seq ) { } swap [ diff --git a/extra/cuda/ffi/ffi.factor b/extra/cuda/ffi/ffi.factor index a7d5f9d81f..4a7db0f474 100644 --- a/extra/cuda/ffi/ffi.factor +++ b/extra/cuda/ffi/ffi.factor @@ -48,21 +48,21 @@ ENUM: CUctx_flags { CU_CTX_BLOCKING_SYNC 4 } { CU_CTX_MAP_HOST 8 } { CU_CTX_LMEM_RESIZE_TO_MAX 16 } - { CU_CTX_FLAGS_MASK HEX: 1f } ; + { CU_CTX_FLAGS_MASK 0x1f } ; ENUM: CUevent_flags { CU_EVENT_DEFAULT 0 } { CU_EVENT_BLOCKING_SYNC 1 } ; ENUM: CUarray_format - { CU_AD_FORMAT_UNSIGNED_INT8 HEX: 01 } - { CU_AD_FORMAT_UNSIGNED_INT16 HEX: 02 } - { CU_AD_FORMAT_UNSIGNED_INT32 HEX: 03 } - { CU_AD_FORMAT_SIGNED_INT8 HEX: 08 } - { CU_AD_FORMAT_SIGNED_INT16 HEX: 09 } - { CU_AD_FORMAT_SIGNED_INT32 HEX: 0a } - { CU_AD_FORMAT_HALF HEX: 10 } - { CU_AD_FORMAT_FLOAT HEX: 20 } ; + { CU_AD_FORMAT_UNSIGNED_INT8 0x01 } + { CU_AD_FORMAT_UNSIGNED_INT16 0x02 } + { CU_AD_FORMAT_UNSIGNED_INT32 0x03 } + { CU_AD_FORMAT_SIGNED_INT8 0x08 } + { CU_AD_FORMAT_SIGNED_INT16 0x09 } + { CU_AD_FORMAT_SIGNED_INT32 0x0a } + { CU_AD_FORMAT_HALF 0x10 } + { CU_AD_FORMAT_FLOAT 0x20 } ; ENUM: CUaddress_mode { CU_TR_ADDRESS_MODE_WRAP 0 } @@ -133,14 +133,14 @@ ENUM: CUfunction_attribute CU_FUNC_ATTRIBUTE_MAX ; ENUM: CUfunc_cache - { CU_FUNC_CACHE_PREFER_NONE HEX: 00 } - { CU_FUNC_CACHE_PREFER_SHARED HEX: 01 } - { CU_FUNC_CACHE_PREFER_L1 HEX: 02 } ; + { CU_FUNC_CACHE_PREFER_NONE 0x00 } + { CU_FUNC_CACHE_PREFER_SHARED 0x01 } + { CU_FUNC_CACHE_PREFER_L1 0x02 } ; ENUM: CUmemorytype - { CU_MEMORYTYPE_HOST HEX: 01 } - { CU_MEMORYTYPE_DEVICE HEX: 02 } - { CU_MEMORYTYPE_ARRAY HEX: 03 } ; + { CU_MEMORYTYPE_HOST 0x01 } + { CU_MEMORYTYPE_DEVICE 0x02 } + { CU_MEMORYTYPE_ARRAY 0x03 } ; ENUM: CUcomputemode { CU_COMPUTEMODE_DEFAULT 0 } @@ -175,17 +175,17 @@ ENUM: CUgraphicsRegisterFlags { CU_GRAPHICS_REGISTER_FLAGS_NONE 0 } ; ENUM: CUgraphicsMapResourceFlags - { CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE HEX: 00 } - { CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY HEX: 01 } - { CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD HEX: 02 } ; + { CU_GRAPHICS_MAP_RESOURCE_FLAGS_NONE 0x00 } + { CU_GRAPHICS_MAP_RESOURCE_FLAGS_READ_ONLY 0x01 } + { CU_GRAPHICS_MAP_RESOURCE_FLAGS_WRITE_DISCARD 0x02 } ; ENUM: CUarray_cubemap_face - { CU_CUBEMAP_FACE_POSITIVE_X HEX: 00 } - { CU_CUBEMAP_FACE_NEGATIVE_X HEX: 01 } - { CU_CUBEMAP_FACE_POSITIVE_Y HEX: 02 } - { CU_CUBEMAP_FACE_NEGATIVE_Y HEX: 03 } - { CU_CUBEMAP_FACE_POSITIVE_Z HEX: 04 } - { CU_CUBEMAP_FACE_NEGATIVE_Z HEX: 05 } ; + { CU_CUBEMAP_FACE_POSITIVE_X 0x00 } + { CU_CUBEMAP_FACE_NEGATIVE_X 0x01 } + { CU_CUBEMAP_FACE_POSITIVE_Y 0x02 } + { CU_CUBEMAP_FACE_NEGATIVE_Y 0x03 } + { CU_CUBEMAP_FACE_POSITIVE_Z 0x04 } + { CU_CUBEMAP_FACE_NEGATIVE_Z 0x05 } ; ENUM: CUresult { CUDA_SUCCESS 0 } @@ -230,9 +230,9 @@ ENUM: CUresult { CUDA_ERROR_UNKNOWN 999 } ; -CONSTANT: CU_MEMHOSTALLOC_PORTABLE HEX: 01 -CONSTANT: CU_MEMHOSTALLOC_DEVICEMAP HEX: 02 -CONSTANT: CU_MEMHOSTALLOC_WRITECOMBINED HEX: 04 +CONSTANT: CU_MEMHOSTALLOC_PORTABLE 0x01 +CONSTANT: CU_MEMHOSTALLOC_DEVICEMAP 0x02 +CONSTANT: CU_MEMHOSTALLOC_WRITECOMBINED 0x04 STRUCT: CUDA_MEMCPY2D { srcXInBytes uint } @@ -293,10 +293,10 @@ STRUCT: CUDA_ARRAY3D_DESCRIPTOR { NumChannels uint } { Flags uint } ; -CONSTANT: CUDA_ARRAY3D_2DARRAY HEX: 01 -CONSTANT: CU_TRSA_OVERRIDE_FORMAT HEX: 01 -CONSTANT: CU_TRSF_READ_AS_INTEGER HEX: 01 -CONSTANT: CU_TRSF_NORMALIZED_COORDINATES HEX: 02 +CONSTANT: CUDA_ARRAY3D_2DARRAY 0x01 +CONSTANT: CU_TRSA_OVERRIDE_FORMAT 0x01 +CONSTANT: CU_TRSF_READ_AS_INTEGER 0x01 +CONSTANT: CU_TRSF_NORMALIZED_COORDINATES 0x02 CONSTANT: CU_PARAM_TR_DEFAULT -1 FUNCTION: CUresult cuInit ( uint Flags ) ; diff --git a/extra/curses/curses.factor b/extra/curses/curses.factor index ec488aba50..dc1edfc333 100644 --- a/extra/curses/curses.factor +++ b/extra/curses/curses.factor @@ -41,101 +41,101 @@ CONSTANT: A_RIGHT 268435456 CONSTANT: A_TOP 536870912 CONSTANT: A_VERTICAL 1073741824 -CONSTANT: KEY_CODE_YES OCT: 400 /* A wchar_t contains a key code */ -CONSTANT: KEY_MIN OCT: 401 /* Minimum curses key */ -CONSTANT: KEY_BREAK OCT: 401 /* Break key (unreliable) */ -CONSTANT: KEY_SRESET OCT: 530 /* Soft (partial) reset (unreliable) */ -CONSTANT: KEY_RESET OCT: 531 /* Reset or hard reset (unreliable) */ -CONSTANT: KEY_DOWN OCT: 402 /* down-arrow key */ -CONSTANT: KEY_UP OCT: 403 /* up-arrow key */ -CONSTANT: KEY_LEFT OCT: 404 /* left-arrow key */ -CONSTANT: KEY_RIGHT OCT: 405 /* right-arrow key */ -CONSTANT: KEY_HOME OCT: 406 /* home key */ -CONSTANT: KEY_BACKSPACE OCT: 407 /* backspace key */ -CONSTANT: KEY_DL OCT: 510 /* delete-line key */ -CONSTANT: KEY_IL OCT: 511 /* insert-line key */ -CONSTANT: KEY_DC OCT: 512 /* delete-character key */ -CONSTANT: KEY_IC OCT: 513 /* insert-character key */ -CONSTANT: KEY_EIC OCT: 514 /* sent by rmir or smir in insert mode */ -CONSTANT: KEY_CLEAR OCT: 515 /* clear-screen or erase key */ -CONSTANT: KEY_EOS OCT: 516 /* clear-to-end-of-screen key */ -CONSTANT: KEY_EOL OCT: 517 /* clear-to-end-of-line key */ -CONSTANT: KEY_SF OCT: 520 /* scroll-forward key */ -CONSTANT: KEY_SR OCT: 521 /* scroll-backward key */ -CONSTANT: KEY_NPAGE OCT: 522 /* next-page key */ -CONSTANT: KEY_PPAGE OCT: 523 /* previous-page key */ -CONSTANT: KEY_STAB OCT: 524 /* set-tab key */ -CONSTANT: KEY_CTAB OCT: 525 /* clear-tab key */ -CONSTANT: KEY_CATAB OCT: 526 /* clear-all-tabs key */ -CONSTANT: KEY_ENTER OCT: 527 /* enter/send key */ -CONSTANT: KEY_PRINT OCT: 532 /* print key */ -CONSTANT: KEY_LL OCT: 533 /* lower-left key (home down) */ -CONSTANT: KEY_A1 OCT: 534 /* upper left of keypad */ -CONSTANT: KEY_A3 OCT: 535 /* upper right of keypad */ -CONSTANT: KEY_B2 OCT: 536 /* center of keypad */ -CONSTANT: KEY_C1 OCT: 537 /* lower left of keypad */ -CONSTANT: KEY_C3 OCT: 540 /* lower right of keypad */ -CONSTANT: KEY_BTAB OCT: 541 /* back-tab key */ -CONSTANT: KEY_BEG OCT: 542 /* begin key */ -CONSTANT: KEY_CANCEL OCT: 543 /* cancel key */ -CONSTANT: KEY_CLOSE OCT: 544 /* close key */ -CONSTANT: KEY_COMMAND OCT: 545 /* command key */ -CONSTANT: KEY_COPY OCT: 546 /* copy key */ -CONSTANT: KEY_CREATE OCT: 547 /* create key */ -CONSTANT: KEY_END OCT: 550 /* end key */ -CONSTANT: KEY_EXIT OCT: 551 /* exit key */ -CONSTANT: KEY_FIND OCT: 552 /* find key */ -CONSTANT: KEY_HELP OCT: 553 /* help key */ -CONSTANT: KEY_MARK OCT: 554 /* mark key */ -CONSTANT: KEY_MESSAGE OCT: 555 /* message key */ -CONSTANT: KEY_MOVE OCT: 556 /* move key */ -CONSTANT: KEY_NEXT OCT: 557 /* next key */ -CONSTANT: KEY_OPEN OCT: 560 /* open key */ -CONSTANT: KEY_OPTIONS OCT: 561 /* options key */ -CONSTANT: KEY_PREVIOUS OCT: 562 /* previous key */ -CONSTANT: KEY_REDO OCT: 563 /* redo key */ -CONSTANT: KEY_REFERENCE OCT: 564 /* reference key */ -CONSTANT: KEY_REFRESH OCT: 565 /* refresh key */ -CONSTANT: KEY_REPLACE OCT: 566 /* replace key */ -CONSTANT: KEY_RESTART OCT: 567 /* restart key */ -CONSTANT: KEY_RESUME OCT: 570 /* resume key */ -CONSTANT: KEY_SAVE OCT: 571 /* save key */ -CONSTANT: KEY_SBEG OCT: 572 /* shifted begin key */ -CONSTANT: KEY_SCANCEL OCT: 573 /* shifted cancel key */ -CONSTANT: KEY_SCOMMAND OCT: 574 /* shifted command key */ -CONSTANT: KEY_SCOPY OCT: 575 /* shifted copy key */ -CONSTANT: KEY_SCREATE OCT: 576 /* shifted create key */ -CONSTANT: KEY_SDC OCT: 577 /* shifted delete-character key */ -CONSTANT: KEY_SDL OCT: 600 /* shifted delete-line key */ -CONSTANT: KEY_SELECT OCT: 601 /* select key */ -CONSTANT: KEY_SEND OCT: 602 /* shifted end key */ -CONSTANT: KEY_SEOL OCT: 603 /* shifted clear-to-end-of-line key */ -CONSTANT: KEY_SEXIT OCT: 604 /* shifted exit key */ -CONSTANT: KEY_SFIND OCT: 605 /* shifted find key */ -CONSTANT: KEY_SHELP OCT: 606 /* shifted help key */ -CONSTANT: KEY_SHOME OCT: 607 /* shifted home key */ -CONSTANT: KEY_SIC OCT: 610 /* shifted insert-character key */ -CONSTANT: KEY_SLEFT OCT: 611 /* shifted left-arrow key */ -CONSTANT: KEY_SMESSAGE OCT: 612 /* shifted message key */ -CONSTANT: KEY_SMOVE OCT: 613 /* shifted move key */ -CONSTANT: KEY_SNEXT OCT: 614 /* shifted next key */ -CONSTANT: KEY_SOPTIONS OCT: 615 /* shifted options key */ -CONSTANT: KEY_SPREVIOUS OCT: 616 /* shifted previous key */ -CONSTANT: KEY_SPRINT OCT: 617 /* shifted print key */ -CONSTANT: KEY_SREDO OCT: 620 /* shifted redo key */ -CONSTANT: KEY_SREPLACE OCT: 621 /* shifted replace key */ -CONSTANT: KEY_SRIGHT OCT: 622 /* shifted right-arrow key */ -CONSTANT: KEY_SRSUME OCT: 623 /* shifted resume key */ -CONSTANT: KEY_SSAVE OCT: 624 /* shifted save key */ -CONSTANT: KEY_SSUSPEND OCT: 625 /* shifted suspend key */ -CONSTANT: KEY_SUNDO OCT: 626 /* shifted undo key */ -CONSTANT: KEY_SUSPEND OCT: 627 /* suspend key */ -CONSTANT: KEY_UNDO OCT: 630 /* undo key */ -CONSTANT: KEY_MOUSE OCT: 631 /* Mouse event has occurred */ -CONSTANT: KEY_RESIZE OCT: 632 /* Terminal resize event */ -CONSTANT: KEY_EVENT OCT: 633 /* We were interrupted by an event */ -CONSTANT: KEY_MAX OCT: 777 /* Maximum key value is 0633 */ -CONSTANT: KEY_F0 OCT: 410 /* Function keys. Space for 64 */ +CONSTANT: KEY_CODE_YES 0o400 /* A wchar_t contains a key code */ +CONSTANT: KEY_MIN 0o401 /* Minimum curses key */ +CONSTANT: KEY_BREAK 0o401 /* Break key (unreliable) */ +CONSTANT: KEY_SRESET 0o530 /* Soft (partial) reset (unreliable) */ +CONSTANT: KEY_RESET 0o531 /* Reset or hard reset (unreliable) */ +CONSTANT: KEY_DOWN 0o402 /* down-arrow key */ +CONSTANT: KEY_UP 0o403 /* up-arrow key */ +CONSTANT: KEY_LEFT 0o404 /* left-arrow key */ +CONSTANT: KEY_RIGHT 0o405 /* right-arrow key */ +CONSTANT: KEY_HOME 0o406 /* home key */ +CONSTANT: KEY_BACKSPACE 0o407 /* backspace key */ +CONSTANT: KEY_DL 0o510 /* delete-line key */ +CONSTANT: KEY_IL 0o511 /* insert-line key */ +CONSTANT: KEY_DC 0o512 /* delete-character key */ +CONSTANT: KEY_IC 0o513 /* insert-character key */ +CONSTANT: KEY_EIC 0o514 /* sent by rmir or smir in insert mode */ +CONSTANT: KEY_CLEAR 0o515 /* clear-screen or erase key */ +CONSTANT: KEY_EOS 0o516 /* clear-to-end-of-screen key */ +CONSTANT: KEY_EOL 0o517 /* clear-to-end-of-line key */ +CONSTANT: KEY_SF 0o520 /* scroll-forward key */ +CONSTANT: KEY_SR 0o521 /* scroll-backward key */ +CONSTANT: KEY_NPAGE 0o522 /* next-page key */ +CONSTANT: KEY_PPAGE 0o523 /* previous-page key */ +CONSTANT: KEY_STAB 0o524 /* set-tab key */ +CONSTANT: KEY_CTAB 0o525 /* clear-tab key */ +CONSTANT: KEY_CATAB 0o526 /* clear-all-tabs key */ +CONSTANT: KEY_ENTER 0o527 /* enter/send key */ +CONSTANT: KEY_PRINT 0o532 /* print key */ +CONSTANT: KEY_LL 0o533 /* lower-left key (home down) */ +CONSTANT: KEY_A1 0o534 /* upper left of keypad */ +CONSTANT: KEY_A3 0o535 /* upper right of keypad */ +CONSTANT: KEY_B2 0o536 /* center of keypad */ +CONSTANT: KEY_C1 0o537 /* lower left of keypad */ +CONSTANT: KEY_C3 0o540 /* lower right of keypad */ +CONSTANT: KEY_BTAB 0o541 /* back-tab key */ +CONSTANT: KEY_BEG 0o542 /* begin key */ +CONSTANT: KEY_CANCEL 0o543 /* cancel key */ +CONSTANT: KEY_CLOSE 0o544 /* close key */ +CONSTANT: KEY_COMMAND 0o545 /* command key */ +CONSTANT: KEY_COPY 0o546 /* copy key */ +CONSTANT: KEY_CREATE 0o547 /* create key */ +CONSTANT: KEY_END 0o550 /* end key */ +CONSTANT: KEY_EXIT 0o551 /* exit key */ +CONSTANT: KEY_FIND 0o552 /* find key */ +CONSTANT: KEY_HELP 0o553 /* help key */ +CONSTANT: KEY_MARK 0o554 /* mark key */ +CONSTANT: KEY_MESSAGE 0o555 /* message key */ +CONSTANT: KEY_MOVE 0o556 /* move key */ +CONSTANT: KEY_NEXT 0o557 /* next key */ +CONSTANT: KEY_OPEN 0o560 /* open key */ +CONSTANT: KEY_OPTIONS 0o561 /* options key */ +CONSTANT: KEY_PREVIOUS 0o562 /* previous key */ +CONSTANT: KEY_REDO 0o563 /* redo key */ +CONSTANT: KEY_REFERENCE 0o564 /* reference key */ +CONSTANT: KEY_REFRESH 0o565 /* refresh key */ +CONSTANT: KEY_REPLACE 0o566 /* replace key */ +CONSTANT: KEY_RESTART 0o567 /* restart key */ +CONSTANT: KEY_RESUME 0o570 /* resume key */ +CONSTANT: KEY_SAVE 0o571 /* save key */ +CONSTANT: KEY_SBEG 0o572 /* shifted begin key */ +CONSTANT: KEY_SCANCEL 0o573 /* shifted cancel key */ +CONSTANT: KEY_SCOMMAND 0o574 /* shifted command key */ +CONSTANT: KEY_SCOPY 0o575 /* shifted copy key */ +CONSTANT: KEY_SCREATE 0o576 /* shifted create key */ +CONSTANT: KEY_SDC 0o577 /* shifted delete-character key */ +CONSTANT: KEY_SDL 0o600 /* shifted delete-line key */ +CONSTANT: KEY_SELECT 0o601 /* select key */ +CONSTANT: KEY_SEND 0o602 /* shifted end key */ +CONSTANT: KEY_SEOL 0o603 /* shifted clear-to-end-of-line key */ +CONSTANT: KEY_SEXIT 0o604 /* shifted exit key */ +CONSTANT: KEY_SFIND 0o605 /* shifted find key */ +CONSTANT: KEY_SHELP 0o606 /* shifted help key */ +CONSTANT: KEY_SHOME 0o607 /* shifted home key */ +CONSTANT: KEY_SIC 0o610 /* shifted insert-character key */ +CONSTANT: KEY_SLEFT 0o611 /* shifted left-arrow key */ +CONSTANT: KEY_SMESSAGE 0o612 /* shifted message key */ +CONSTANT: KEY_SMOVE 0o613 /* shifted move key */ +CONSTANT: KEY_SNEXT 0o614 /* shifted next key */ +CONSTANT: KEY_SOPTIONS 0o615 /* shifted options key */ +CONSTANT: KEY_SPREVIOUS 0o616 /* shifted previous key */ +CONSTANT: KEY_SPRINT 0o617 /* shifted print key */ +CONSTANT: KEY_SREDO 0o620 /* shifted redo key */ +CONSTANT: KEY_SREPLACE 0o621 /* shifted replace key */ +CONSTANT: KEY_SRIGHT 0o622 /* shifted right-arrow key */ +CONSTANT: KEY_SRSUME 0o623 /* shifted resume key */ +CONSTANT: KEY_SSAVE 0o624 /* shifted save key */ +CONSTANT: KEY_SSUSPEND 0o625 /* shifted suspend key */ +CONSTANT: KEY_SUNDO 0o626 /* shifted undo key */ +CONSTANT: KEY_SUSPEND 0o627 /* suspend key */ +CONSTANT: KEY_UNDO 0o630 /* undo key */ +CONSTANT: KEY_MOUSE 0o631 /* Mouse event has occurred */ +CONSTANT: KEY_RESIZE 0o632 /* Terminal resize event */ +CONSTANT: KEY_EVENT 0o633 /* We were interrupted by an event */ +CONSTANT: KEY_MAX 0o777 /* Maximum key value is 0633 */ +CONSTANT: KEY_F0 0o410 /* Function keys. Space for 64 */ : KEY_F ( n -- code ) KEY_F0 + ; inline /* Value of function key n */ : BUTTON1_RELEASED ( -- mask ) 1 ffi:NCURSES_BUTTON_RELEASED ffi:NCURSES_MOUSE_MASK ; inline @@ -164,10 +164,10 @@ CONSTANT: KEY_F0 OCT: 410 /* Function keys. Space for 64 */ : BUTTON3_RESERVED_EVENT ( -- mask ) 3 ffi:NCURSES_RESERVED_EVENT ffi:NCURSES_MOUSE_MASK ; inline : BUTTON4_RESERVED_EVENT ( -- mask ) 4 ffi:NCURSES_RESERVED_EVENT ffi:NCURSES_MOUSE_MASK ; inline -: BUTTON_CTRL ( -- mask ) 5 OCT: 01 ffi:NCURSES_MOUSE_MASK ; inline -: BUTTON_SHIFT ( -- mask ) 5 OCT: 02 ffi:NCURSES_MOUSE_MASK ; inline -: BUTTON_ALT ( -- mask ) 5 OCT: 04 ffi:NCURSES_MOUSE_MASK ; inline -: REPORT_MOUSE_POSITION ( -- mask ) 5 OCT: 10 ffi:NCURSES_MOUSE_MASK ; inline +: BUTTON_CTRL ( -- mask ) 5 0o01 ffi:NCURSES_MOUSE_MASK ; inline +: BUTTON_SHIFT ( -- mask ) 5 0o02 ffi:NCURSES_MOUSE_MASK ; inline +: BUTTON_ALT ( -- mask ) 5 0o04 ffi:NCURSES_MOUSE_MASK ; inline +: REPORT_MOUSE_POSITION ( -- mask ) 5 0o10 ffi:NCURSES_MOUSE_MASK ; inline : ALL_MOUSE_EVENTS ( -- mask ) REPORT_MOUSE_POSITION 1 - ; inline diff --git a/extra/curses/ffi/ffi.factor b/extra/curses/ffi/ffi.factor index 9937c9797a..c3b0d42cd2 100644 --- a/extra/curses/ffi/ffi.factor +++ b/extra/curses/ffi/ffi.factor @@ -261,12 +261,12 @@ FUNCTION: int wattrset ( WINDOW* win, int attrs ) ; : NCURSES_MOUSE_MASK ( b m -- mask ) swap 1 - 6 * shift ; inline -CONSTANT: NCURSES_BUTTON_RELEASED OCT: 01 -CONSTANT: NCURSES_BUTTON_PRESSED OCT: 02 -CONSTANT: NCURSES_BUTTON_CLICKED OCT: 04 -CONSTANT: NCURSES_DOUBLE_CLICKED OCT: 10 -CONSTANT: NCURSES_TRIPLE_CLICKED OCT: 20 -CONSTANT: NCURSES_RESERVED_EVENT OCT: 40 +CONSTANT: NCURSES_BUTTON_RELEASED 0o01 +CONSTANT: NCURSES_BUTTON_PRESSED 0o02 +CONSTANT: NCURSES_BUTTON_CLICKED 0o04 +CONSTANT: NCURSES_DOUBLE_CLICKED 0o10 +CONSTANT: NCURSES_TRIPLE_CLICKED 0o20 +CONSTANT: NCURSES_RESERVED_EVENT 0o40 FUNCTION: int getmouse ( MEVENT* event ) ; FUNCTION: int ungetmouse ( MEVENT* event ) ; diff --git a/extra/dns/dns.factor b/extra/dns/dns.factor index 868ea1cacd..637c0ebbd1 100644 --- a/extra/dns/dns.factor +++ b/extra/dns/dns.factor @@ -114,14 +114,14 @@ CONSTRUCTOR: message ( query -- obj ) : header>message-parts ( n -- qr opcode aa tc rd ra z rcode ) { - [ -15 shift BIN: 1 bitand ] - [ -11 shift BIN: 111 bitand ] - [ -10 shift BIN: 1 bitand ] - [ -9 shift BIN: 1 bitand ] - [ -8 shift BIN: 1 bitand ] - [ -7 shift BIN: 1 bitand ] - [ -4 shift BIN: 111 bitand ] - [ BIN: 1111 bitand ] + [ -15 shift 0b1 bitand ] + [ -11 shift 0b111 bitand ] + [ -10 shift 0b1 bitand ] + [ -9 shift 0b1 bitand ] + [ -8 shift 0b1 bitand ] + [ -7 shift 0b1 bitand ] + [ -4 shift 0b111 bitand ] + [ 0b1111 bitand ] } cleave ; : byte-array>ipv4 ( byte-array -- string ) @@ -172,8 +172,8 @@ CONSTANT: ipv6-arpa-suffix ".ip6.arpa" : (parse-name) ( -- ) read1 [ - dup HEX: C0 mask? [ - 8 shift read1 bitor HEX: 3fff bitand + dup 0xC0 mask? [ + 8 shift read1 bitor 0x3fff bitand seek-absolute [ read1 parse-length-bytes , (parse-name) ] with-input-seek diff --git a/extra/dwarf/dwarf.factor b/extra/dwarf/dwarf.factor index f6c6c46b23..afa29ff3e4 100644 --- a/extra/dwarf/dwarf.factor +++ b/extra/dwarf/dwarf.factor @@ -3,722 +3,722 @@ USING: ; IN: dwarf -CONSTANT: DW_TAG_array_type HEX: 01 -CONSTANT: DW_TAG_class_type HEX: 02 -CONSTANT: DW_TAG_entry_point HEX: 03 -CONSTANT: DW_TAG_enumeration_type HEX: 04 -CONSTANT: DW_TAG_formal_parameter HEX: 05 -CONSTANT: DW_TAG_imported_declaration HEX: 08 -CONSTANT: DW_TAG_label HEX: 0a -CONSTANT: DW_TAG_lexical_block HEX: 0b -CONSTANT: DW_TAG_member HEX: 0d -CONSTANT: DW_TAG_pointer_type HEX: 0f -CONSTANT: DW_TAG_reference_type HEX: 10 -CONSTANT: DW_TAG_compile_unit HEX: 11 -CONSTANT: DW_TAG_string_type HEX: 12 -CONSTANT: DW_TAG_structure_type HEX: 13 -CONSTANT: DW_TAG_subroutine_type HEX: 15 -CONSTANT: DW_TAG_typedef HEX: 16 -CONSTANT: DW_TAG_union_type HEX: 17 -CONSTANT: DW_TAG_unspecified_parameters HEX: 18 -CONSTANT: DW_TAG_variant HEX: 19 -CONSTANT: DW_TAG_common_block HEX: 1a -CONSTANT: DW_TAG_common_inclusion HEX: 1b -CONSTANT: DW_TAG_inheritance HEX: 1c -CONSTANT: DW_TAG_inlined_subroutine HEX: 1d -CONSTANT: DW_TAG_module HEX: 1e -CONSTANT: DW_TAG_ptr_to_member_type HEX: 1f -CONSTANT: DW_TAG_set_type HEX: 20 -CONSTANT: DW_TAG_subrange_type HEX: 21 -CONSTANT: DW_TAG_with_stmt HEX: 22 -CONSTANT: DW_TAG_access_declaration HEX: 23 -CONSTANT: DW_TAG_base_type HEX: 24 -CONSTANT: DW_TAG_catch_block HEX: 25 -CONSTANT: DW_TAG_const_type HEX: 26 -CONSTANT: DW_TAG_constant HEX: 27 -CONSTANT: DW_TAG_enumerator HEX: 28 -CONSTANT: DW_TAG_file_type HEX: 29 -CONSTANT: DW_TAG_friend HEX: 2a -CONSTANT: DW_TAG_namelist HEX: 2b -CONSTANT: DW_TAG_namelist_item HEX: 2c -CONSTANT: DW_TAG_packed_type HEX: 2d -CONSTANT: DW_TAG_subprogram HEX: 2e -CONSTANT: DW_TAG_template_type_parameter HEX: 2f -CONSTANT: DW_TAG_template_value_parameter HEX: 30 -CONSTANT: DW_TAG_thrown_type HEX: 31 -CONSTANT: DW_TAG_try_block HEX: 32 -CONSTANT: DW_TAG_variant_part HEX: 33 -CONSTANT: DW_TAG_variable HEX: 34 -CONSTANT: DW_TAG_volatile_type HEX: 35 -CONSTANT: DW_TAG_dwarf_procedure HEX: 36 -CONSTANT: DW_TAG_restrict_type HEX: 37 -CONSTANT: DW_TAG_interface_type HEX: 38 -CONSTANT: DW_TAG_namespace HEX: 39 -CONSTANT: DW_TAG_imported_module HEX: 3a -CONSTANT: DW_TAG_unspecified_type HEX: 3b -CONSTANT: DW_TAG_partial_unit HEX: 3c -CONSTANT: DW_TAG_imported_unit HEX: 3d -CONSTANT: DW_TAG_condition HEX: 3f -CONSTANT: DW_TAG_shared_type HEX: 40 -CONSTANT: DW_TAG_type_unit HEX: 41 -CONSTANT: DW_TAG_rvalue_reference_type HEX: 42 -CONSTANT: DW_TAG_template_alias HEX: 43 - -CONSTANT: DW_TAG_lo_user HEX: 4080 - -CONSTANT: DW_TAG_MIPS_loop HEX: 4081 -CONSTANT: DW_TAG_HP_array_descriptor HEX: 4090 -CONSTANT: DW_TAG_format_label HEX: 4101 -CONSTANT: DW_TAG_function_template HEX: 4102 -CONSTANT: DW_TAG_class_template HEX: 4103 -CONSTANT: DW_TAG_GNU_BINCL HEX: 4104 -CONSTANT: DW_TAG_GNU_EINCL HEX: 4105 -CONSTANT: DW_TAG_GNU_template_template_parameter HEX: 4106 -CONSTANT: DW_TAG_GNU_template_parameter_pack HEX: 4107 -CONSTANT: DW_TAG_GNU_formal_parameter_pack HEX: 4108 -CONSTANT: DW_TAG_ALTIUM_circ_type HEX: 5101 -CONSTANT: DW_TAG_ALTIUM_mwa_circ_type HEX: 5102 -CONSTANT: DW_TAG_ALTIUM_rev_carry_type HEX: 5103 -CONSTANT: DW_TAG_ALTIUM_rom HEX: 5111 -CONSTANT: DW_TAG_upc_shared_type HEX: 8765 -CONSTANT: DW_TAG_upc_strict_type HEX: 8766 -CONSTANT: DW_TAG_upc_relaxed_type HEX: 8767 -CONSTANT: DW_TAG_PGI_kanji_type HEX: a000 -CONSTANT: DW_TAG_PGI_interface_block HEX: a020 -CONSTANT: DW_TAG_SUN_function_template HEX: 4201 -CONSTANT: DW_TAG_SUN_class_template HEX: 4202 -CONSTANT: DW_TAG_SUN_struct_template HEX: 4203 -CONSTANT: DW_TAG_SUN_union_template HEX: 4204 -CONSTANT: DW_TAG_SUN_indirect_inheritance HEX: 4205 -CONSTANT: DW_TAG_SUN_codeflags HEX: 4206 -CONSTANT: DW_TAG_SUN_memop_info HEX: 4207 -CONSTANT: DW_TAG_SUN_omp_child_func HEX: 4208 -CONSTANT: DW_TAG_SUN_rtti_descriptor HEX: 4209 -CONSTANT: DW_TAG_SUN_dtor_info HEX: 420a -CONSTANT: DW_TAG_SUN_dtor HEX: 420b -CONSTANT: DW_TAG_SUN_f90_interface HEX: 420c -CONSTANT: DW_TAG_SUN_fortran_vax_structure HEX: 420d -CONSTANT: DW_TAG_SUN_hi HEX: 42ff +CONSTANT: DW_TAG_array_type 0x01 +CONSTANT: DW_TAG_class_type 0x02 +CONSTANT: DW_TAG_entry_point 0x03 +CONSTANT: DW_TAG_enumeration_type 0x04 +CONSTANT: DW_TAG_formal_parameter 0x05 +CONSTANT: DW_TAG_imported_declaration 0x08 +CONSTANT: DW_TAG_label 0x0a +CONSTANT: DW_TAG_lexical_block 0x0b +CONSTANT: DW_TAG_member 0x0d +CONSTANT: DW_TAG_pointer_type 0x0f +CONSTANT: DW_TAG_reference_type 0x10 +CONSTANT: DW_TAG_compile_unit 0x11 +CONSTANT: DW_TAG_string_type 0x12 +CONSTANT: DW_TAG_structure_type 0x13 +CONSTANT: DW_TAG_subroutine_type 0x15 +CONSTANT: DW_TAG_typedef 0x16 +CONSTANT: DW_TAG_union_type 0x17 +CONSTANT: DW_TAG_unspecified_parameters 0x18 +CONSTANT: DW_TAG_variant 0x19 +CONSTANT: DW_TAG_common_block 0x1a +CONSTANT: DW_TAG_common_inclusion 0x1b +CONSTANT: DW_TAG_inheritance 0x1c +CONSTANT: DW_TAG_inlined_subroutine 0x1d +CONSTANT: DW_TAG_module 0x1e +CONSTANT: DW_TAG_ptr_to_member_type 0x1f +CONSTANT: DW_TAG_set_type 0x20 +CONSTANT: DW_TAG_subrange_type 0x21 +CONSTANT: DW_TAG_with_stmt 0x22 +CONSTANT: DW_TAG_access_declaration 0x23 +CONSTANT: DW_TAG_base_type 0x24 +CONSTANT: DW_TAG_catch_block 0x25 +CONSTANT: DW_TAG_const_type 0x26 +CONSTANT: DW_TAG_constant 0x27 +CONSTANT: DW_TAG_enumerator 0x28 +CONSTANT: DW_TAG_file_type 0x29 +CONSTANT: DW_TAG_friend 0x2a +CONSTANT: DW_TAG_namelist 0x2b +CONSTANT: DW_TAG_namelist_item 0x2c +CONSTANT: DW_TAG_packed_type 0x2d +CONSTANT: DW_TAG_subprogram 0x2e +CONSTANT: DW_TAG_template_type_parameter 0x2f +CONSTANT: DW_TAG_template_value_parameter 0x30 +CONSTANT: DW_TAG_thrown_type 0x31 +CONSTANT: DW_TAG_try_block 0x32 +CONSTANT: DW_TAG_variant_part 0x33 +CONSTANT: DW_TAG_variable 0x34 +CONSTANT: DW_TAG_volatile_type 0x35 +CONSTANT: DW_TAG_dwarf_procedure 0x36 +CONSTANT: DW_TAG_restrict_type 0x37 +CONSTANT: DW_TAG_interface_type 0x38 +CONSTANT: DW_TAG_namespace 0x39 +CONSTANT: DW_TAG_imported_module 0x3a +CONSTANT: DW_TAG_unspecified_type 0x3b +CONSTANT: DW_TAG_partial_unit 0x3c +CONSTANT: DW_TAG_imported_unit 0x3d +CONSTANT: DW_TAG_condition 0x3f +CONSTANT: DW_TAG_shared_type 0x40 +CONSTANT: DW_TAG_type_unit 0x41 +CONSTANT: DW_TAG_rvalue_reference_type 0x42 +CONSTANT: DW_TAG_template_alias 0x43 + +CONSTANT: DW_TAG_lo_user 0x4080 + +CONSTANT: DW_TAG_MIPS_loop 0x4081 +CONSTANT: DW_TAG_HP_array_descriptor 0x4090 +CONSTANT: DW_TAG_format_label 0x4101 +CONSTANT: DW_TAG_function_template 0x4102 +CONSTANT: DW_TAG_class_template 0x4103 +CONSTANT: DW_TAG_GNU_BINCL 0x4104 +CONSTANT: DW_TAG_GNU_EINCL 0x4105 +CONSTANT: DW_TAG_GNU_template_template_parameter 0x4106 +CONSTANT: DW_TAG_GNU_template_parameter_pack 0x4107 +CONSTANT: DW_TAG_GNU_formal_parameter_pack 0x4108 +CONSTANT: DW_TAG_ALTIUM_circ_type 0x5101 +CONSTANT: DW_TAG_ALTIUM_mwa_circ_type 0x5102 +CONSTANT: DW_TAG_ALTIUM_rev_carry_type 0x5103 +CONSTANT: DW_TAG_ALTIUM_rom 0x5111 +CONSTANT: DW_TAG_upc_shared_type 0x8765 +CONSTANT: DW_TAG_upc_strict_type 0x8766 +CONSTANT: DW_TAG_upc_relaxed_type 0x8767 +CONSTANT: DW_TAG_PGI_kanji_type 0xa000 +CONSTANT: DW_TAG_PGI_interface_block 0xa020 +CONSTANT: DW_TAG_SUN_function_template 0x4201 +CONSTANT: DW_TAG_SUN_class_template 0x4202 +CONSTANT: DW_TAG_SUN_struct_template 0x4203 +CONSTANT: DW_TAG_SUN_union_template 0x4204 +CONSTANT: DW_TAG_SUN_indirect_inheritance 0x4205 +CONSTANT: DW_TAG_SUN_codeflags 0x4206 +CONSTANT: DW_TAG_SUN_memop_info 0x4207 +CONSTANT: DW_TAG_SUN_omp_child_func 0x4208 +CONSTANT: DW_TAG_SUN_rtti_descriptor 0x4209 +CONSTANT: DW_TAG_SUN_dtor_info 0x420a +CONSTANT: DW_TAG_SUN_dtor 0x420b +CONSTANT: DW_TAG_SUN_f90_interface 0x420c +CONSTANT: DW_TAG_SUN_fortran_vax_structure 0x420d +CONSTANT: DW_TAG_SUN_hi 0x42ff -CONSTANT: DW_TAG_hi_user HEX: ffff +CONSTANT: DW_TAG_hi_user 0xffff CONSTANT: DW_children_no 0 CONSTANT: DW_children_yes 1 -CONSTANT: DW_FORM_addr HEX: 01 -CONSTANT: DW_FORM_block2 HEX: 03 -CONSTANT: DW_FORM_block4 HEX: 04 -CONSTANT: DW_FORM_data2 HEX: 05 -CONSTANT: DW_FORM_data4 HEX: 06 -CONSTANT: DW_FORM_data8 HEX: 07 -CONSTANT: DW_FORM_string HEX: 08 -CONSTANT: DW_FORM_block HEX: 09 -CONSTANT: DW_FORM_block1 HEX: 0a -CONSTANT: DW_FORM_data1 HEX: 0b -CONSTANT: DW_FORM_flag HEX: 0c -CONSTANT: DW_FORM_sdata HEX: 0d -CONSTANT: DW_FORM_strp HEX: 0e -CONSTANT: DW_FORM_udata HEX: 0f -CONSTANT: DW_FORM_ref_addr HEX: 10 -CONSTANT: DW_FORM_ref1 HEX: 11 -CONSTANT: DW_FORM_ref2 HEX: 12 -CONSTANT: DW_FORM_ref4 HEX: 13 -CONSTANT: DW_FORM_ref8 HEX: 14 -CONSTANT: DW_FORM_ref_udata HEX: 15 -CONSTANT: DW_FORM_indirect HEX: 16 -CONSTANT: DW_FORM_sec_offset HEX: 17 -CONSTANT: DW_FORM_exprloc HEX: 18 -CONSTANT: DW_FORM_flag_present HEX: 19 -CONSTANT: DW_FORM_ref_sig8 HEX: 20 - -CONSTANT: DW_AT_sibling HEX: 01 -CONSTANT: DW_AT_location HEX: 02 -CONSTANT: DW_AT_name HEX: 03 -CONSTANT: DW_AT_ordering HEX: 09 -CONSTANT: DW_AT_subscr_data HEX: 0a -CONSTANT: DW_AT_byte_size HEX: 0b -CONSTANT: DW_AT_bit_offset HEX: 0c -CONSTANT: DW_AT_bit_size HEX: 0d -CONSTANT: DW_AT_element_list HEX: 0f -CONSTANT: DW_AT_stmt_list HEX: 10 -CONSTANT: DW_AT_low_pc HEX: 11 -CONSTANT: DW_AT_high_pc HEX: 12 -CONSTANT: DW_AT_language HEX: 13 -CONSTANT: DW_AT_member HEX: 14 -CONSTANT: DW_AT_discr HEX: 15 -CONSTANT: DW_AT_discr_value HEX: 16 -CONSTANT: DW_AT_visibility HEX: 17 -CONSTANT: DW_AT_import HEX: 18 -CONSTANT: DW_AT_string_length HEX: 19 -CONSTANT: DW_AT_common_reference HEX: 1a -CONSTANT: DW_AT_comp_dir HEX: 1b -CONSTANT: DW_AT_const_value HEX: 1c -CONSTANT: DW_AT_containing_type HEX: 1d -CONSTANT: DW_AT_default_value HEX: 1e -CONSTANT: DW_AT_inline HEX: 20 -CONSTANT: DW_AT_is_optional HEX: 21 -CONSTANT: DW_AT_lower_bound HEX: 22 -CONSTANT: DW_AT_producer HEX: 25 -CONSTANT: DW_AT_prototyped HEX: 27 -CONSTANT: DW_AT_return_addr HEX: 2a -CONSTANT: DW_AT_start_scope HEX: 2c -CONSTANT: DW_AT_bit_stride HEX: 2e -CONSTANT: DW_AT_upper_bound HEX: 2f -CONSTANT: DW_AT_abstract_origin HEX: 31 -CONSTANT: DW_AT_accessibility HEX: 32 -CONSTANT: DW_AT_address_class HEX: 33 -CONSTANT: DW_AT_artificial HEX: 34 -CONSTANT: DW_AT_base_types HEX: 35 -CONSTANT: DW_AT_calling_convention HEX: 36 -CONSTANT: DW_AT_count HEX: 37 -CONSTANT: DW_AT_data_member_location HEX: 38 -CONSTANT: DW_AT_decl_column HEX: 39 -CONSTANT: DW_AT_decl_file HEX: 3a -CONSTANT: DW_AT_decl_line HEX: 3b -CONSTANT: DW_AT_declaration HEX: 3c -CONSTANT: DW_AT_discr_list HEX: 3d -CONSTANT: DW_AT_encoding HEX: 3e -CONSTANT: DW_AT_external HEX: 3f -CONSTANT: DW_AT_frame_base HEX: 40 -CONSTANT: DW_AT_friend HEX: 41 -CONSTANT: DW_AT_identifier_case HEX: 42 -CONSTANT: DW_AT_macro_info HEX: 43 -CONSTANT: DW_AT_namelist_item HEX: 44 -CONSTANT: DW_AT_priority HEX: 45 -CONSTANT: DW_AT_segment HEX: 46 -CONSTANT: DW_AT_specification HEX: 47 -CONSTANT: DW_AT_static_link HEX: 48 -CONSTANT: DW_AT_type HEX: 49 -CONSTANT: DW_AT_use_location HEX: 4a -CONSTANT: DW_AT_variable_parameter HEX: 4b -CONSTANT: DW_AT_virtuality HEX: 4c -CONSTANT: DW_AT_vtable_elem_location HEX: 4d -CONSTANT: DW_AT_allocated HEX: 4e -CONSTANT: DW_AT_associated HEX: 4f -CONSTANT: DW_AT_data_location HEX: 50 -CONSTANT: DW_AT_byte_stride HEX: 51 -CONSTANT: DW_AT_entry_pc HEX: 52 -CONSTANT: DW_AT_use_UTF8 HEX: 53 -CONSTANT: DW_AT_extension HEX: 54 -CONSTANT: DW_AT_ranges HEX: 55 -CONSTANT: DW_AT_trampoline HEX: 56 -CONSTANT: DW_AT_call_column HEX: 57 -CONSTANT: DW_AT_call_file HEX: 58 -CONSTANT: DW_AT_call_line HEX: 59 -CONSTANT: DW_AT_description HEX: 5a -CONSTANT: DW_AT_binary_scale HEX: 5b -CONSTANT: DW_AT_decimal_scale HEX: 5c -CONSTANT: DW_AT_small HEX: 5d -CONSTANT: DW_AT_decimal_sign HEX: 5e -CONSTANT: DW_AT_digit_count HEX: 5f -CONSTANT: DW_AT_picture_string HEX: 60 -CONSTANT: DW_AT_mutable HEX: 61 -CONSTANT: DW_AT_threads_scaled HEX: 62 -CONSTANT: DW_AT_explicit HEX: 63 -CONSTANT: DW_AT_object_pointer HEX: 64 -CONSTANT: DW_AT_endianity HEX: 65 -CONSTANT: DW_AT_elemental HEX: 66 -CONSTANT: DW_AT_pure HEX: 67 -CONSTANT: DW_AT_recursive HEX: 68 -CONSTANT: DW_AT_signature HEX: 69 -CONSTANT: DW_AT_main_subprogram HEX: 6a -CONSTANT: DW_AT_data_bit_offset HEX: 6b -CONSTANT: DW_AT_const_expr HEX: 6c -CONSTANT: DW_AT_enum_class HEX: 6d -CONSTANT: DW_AT_linkage_name HEX: 6e - -CONSTANT: DW_AT_HP_block_index HEX: 2000 - -CONSTANT: DW_AT_lo_user HEX: 2000 - -CONSTANT: DW_AT_MIPS_fde HEX: 2001 -CONSTANT: DW_AT_MIPS_loop_begin HEX: 2002 -CONSTANT: DW_AT_MIPS_tail_loop_begin HEX: 2003 -CONSTANT: DW_AT_MIPS_epilog_begin HEX: 2004 -CONSTANT: DW_AT_MIPS_loop_unroll_factor HEX: 2005 -CONSTANT: DW_AT_MIPS_software_pipeline_depth HEX: 2006 -CONSTANT: DW_AT_MIPS_linkage_name HEX: 2007 -CONSTANT: DW_AT_MIPS_stride HEX: 2008 -CONSTANT: DW_AT_MIPS_abstract_name HEX: 2009 -CONSTANT: DW_AT_MIPS_clone_origin HEX: 200a -CONSTANT: DW_AT_MIPS_has_inlines HEX: 200b -CONSTANT: DW_AT_MIPS_stride_byte HEX: 200c -CONSTANT: DW_AT_MIPS_stride_elem HEX: 200d -CONSTANT: DW_AT_MIPS_ptr_dopetype HEX: 200e -CONSTANT: DW_AT_MIPS_allocatable_dopetype HEX: 200f -CONSTANT: DW_AT_MIPS_assumed_shape_dopetype HEX: 2010 -CONSTANT: DW_AT_MIPS_assumed_size HEX: 2011 - -CONSTANT: DW_AT_HP_unmodifiable HEX: 2001 -CONSTANT: DW_AT_HP_actuals_stmt_list HEX: 2010 -CONSTANT: DW_AT_HP_proc_per_section HEX: 2011 -CONSTANT: DW_AT_HP_raw_data_ptr HEX: 2012 -CONSTANT: DW_AT_HP_pass_by_reference HEX: 2013 -CONSTANT: DW_AT_HP_opt_level HEX: 2014 -CONSTANT: DW_AT_HP_prof_version_id HEX: 2015 -CONSTANT: DW_AT_HP_opt_flags HEX: 2016 -CONSTANT: DW_AT_HP_cold_region_low_pc HEX: 2017 -CONSTANT: DW_AT_HP_cold_region_high_pc HEX: 2018 -CONSTANT: DW_AT_HP_all_variables_modifiable HEX: 2019 -CONSTANT: DW_AT_HP_linkage_name HEX: 201a -CONSTANT: DW_AT_HP_prof_flags HEX: 201b - -CONSTANT: DW_AT_CPQ_discontig_ranges HEX: 2001 -CONSTANT: DW_AT_CPQ_semantic_events HEX: 2002 -CONSTANT: DW_AT_CPQ_split_lifetimes_var HEX: 2003 -CONSTANT: DW_AT_CPQ_split_lifetimes_rtn HEX: 2004 -CONSTANT: DW_AT_CPQ_prologue_length HEX: 2005 - -CONSTANT: DW_AT_INTEL_other_endian HEX: 2026 - -CONSTANT: DW_AT_sf_names HEX: 2101 -CONSTANT: DW_AT_src_info HEX: 2102 -CONSTANT: DW_AT_mac_info HEX: 2103 -CONSTANT: DW_AT_src_coords HEX: 2104 -CONSTANT: DW_AT_body_begin HEX: 2105 -CONSTANT: DW_AT_body_end HEX: 2106 -CONSTANT: DW_AT_GNU_vector HEX: 2107 -CONSTANT: DW_AT_GNU_template_name HEX: 2108 - -CONSTANT: DW_AT_ALTIUM_loclist HEX: 2300 - -CONSTANT: DW_AT_SUN_template HEX: 2201 -CONSTANT: DW_AT_VMS_rtnbeg_pd_address HEX: 2201 -CONSTANT: DW_AT_SUN_alignment HEX: 2202 -CONSTANT: DW_AT_SUN_vtable HEX: 2203 -CONSTANT: DW_AT_SUN_count_guarantee HEX: 2204 -CONSTANT: DW_AT_SUN_command_line HEX: 2205 -CONSTANT: DW_AT_SUN_vbase HEX: 2206 -CONSTANT: DW_AT_SUN_compile_options HEX: 2207 -CONSTANT: DW_AT_SUN_language HEX: 2208 -CONSTANT: DW_AT_SUN_browser_file HEX: 2209 -CONSTANT: DW_AT_SUN_vtable_abi HEX: 2210 -CONSTANT: DW_AT_SUN_func_offsets HEX: 2211 -CONSTANT: DW_AT_SUN_cf_kind HEX: 2212 -CONSTANT: DW_AT_SUN_vtable_index HEX: 2213 -CONSTANT: DW_AT_SUN_omp_tpriv_addr HEX: 2214 -CONSTANT: DW_AT_SUN_omp_child_func HEX: 2215 -CONSTANT: DW_AT_SUN_func_offset HEX: 2216 -CONSTANT: DW_AT_SUN_memop_type_ref HEX: 2217 -CONSTANT: DW_AT_SUN_profile_id HEX: 2218 -CONSTANT: DW_AT_SUN_memop_signature HEX: 2219 -CONSTANT: DW_AT_SUN_obj_dir HEX: 2220 -CONSTANT: DW_AT_SUN_obj_file HEX: 2221 -CONSTANT: DW_AT_SUN_original_name HEX: 2222 -CONSTANT: DW_AT_SUN_hwcprof_signature HEX: 2223 -CONSTANT: DW_AT_SUN_amd64_parmdump HEX: 2224 -CONSTANT: DW_AT_SUN_part_link_name HEX: 2225 -CONSTANT: DW_AT_SUN_link_name HEX: 2226 -CONSTANT: DW_AT_SUN_pass_with_const HEX: 2227 -CONSTANT: DW_AT_SUN_return_with_const HEX: 2228 -CONSTANT: DW_AT_SUN_import_by_name HEX: 2229 -CONSTANT: DW_AT_SUN_f90_pointer HEX: 222a -CONSTANT: DW_AT_SUN_pass_by_ref HEX: 222b -CONSTANT: DW_AT_SUN_f90_allocatable HEX: 222c -CONSTANT: DW_AT_SUN_f90_assumed_shape_array HEX: 222d -CONSTANT: DW_AT_SUN_c_vla HEX: 222e -CONSTANT: DW_AT_SUN_return_value_ptr HEX: 2230 -CONSTANT: DW_AT_SUN_dtor_start HEX: 2231 -CONSTANT: DW_AT_SUN_dtor_length HEX: 2232 -CONSTANT: DW_AT_SUN_dtor_state_initial HEX: 2233 -CONSTANT: DW_AT_SUN_dtor_state_final HEX: 2234 -CONSTANT: DW_AT_SUN_dtor_state_deltas HEX: 2235 -CONSTANT: DW_AT_SUN_import_by_lname HEX: 2236 -CONSTANT: DW_AT_SUN_f90_use_only HEX: 2237 -CONSTANT: DW_AT_SUN_namelist_spec HEX: 2238 -CONSTANT: DW_AT_SUN_is_omp_child_func HEX: 2239 -CONSTANT: DW_AT_SUN_fortran_main_alias HEX: 223a -CONSTANT: DW_AT_SUN_fortran_based HEX: 223b - -CONSTANT: DW_AT_upc_threads_scaled HEX: 3210 - -CONSTANT: DW_AT_PGI_lbase HEX: 3a00 -CONSTANT: DW_AT_PGI_soffset HEX: 3a01 -CONSTANT: DW_AT_PGI_lstride HEX: 3a02 - -CONSTANT: DW_AT_APPLE_closure HEX: 3fe4 -CONSTANT: DW_AT_APPLE_major_runtime_vers HEX: 3fe5 -CONSTANT: DW_AT_APPLE_runtime_class HEX: 3fe6 - -CONSTANT: DW_AT_hi_user HEX: 3fff - -CONSTANT: DW_OP_addr HEX: 03 -CONSTANT: DW_OP_deref HEX: 06 -CONSTANT: DW_OP_const1u HEX: 08 -CONSTANT: DW_OP_const1s HEX: 09 -CONSTANT: DW_OP_const2u HEX: 0a -CONSTANT: DW_OP_const2s HEX: 0b -CONSTANT: DW_OP_const4u HEX: 0c -CONSTANT: DW_OP_const4s HEX: 0d -CONSTANT: DW_OP_const8u HEX: 0e -CONSTANT: DW_OP_const8s HEX: 0f -CONSTANT: DW_OP_constu HEX: 10 -CONSTANT: DW_OP_consts HEX: 11 -CONSTANT: DW_OP_dup HEX: 12 -CONSTANT: DW_OP_drop HEX: 13 -CONSTANT: DW_OP_over HEX: 14 -CONSTANT: DW_OP_pick HEX: 15 -CONSTANT: DW_OP_swap HEX: 16 -CONSTANT: DW_OP_rot HEX: 17 -CONSTANT: DW_OP_xderef HEX: 18 -CONSTANT: DW_OP_abs HEX: 19 -CONSTANT: DW_OP_and HEX: 1a -CONSTANT: DW_OP_div HEX: 1b -CONSTANT: DW_OP_minus HEX: 1c -CONSTANT: DW_OP_mod HEX: 1d -CONSTANT: DW_OP_mul HEX: 1e -CONSTANT: DW_OP_neg HEX: 1f -CONSTANT: DW_OP_not HEX: 20 -CONSTANT: DW_OP_or HEX: 21 -CONSTANT: DW_OP_plus HEX: 22 -CONSTANT: DW_OP_plus_uconst HEX: 23 -CONSTANT: DW_OP_shl HEX: 24 -CONSTANT: DW_OP_shr HEX: 25 -CONSTANT: DW_OP_shra HEX: 26 -CONSTANT: DW_OP_xor HEX: 27 -CONSTANT: DW_OP_bra HEX: 28 -CONSTANT: DW_OP_eq HEX: 29 -CONSTANT: DW_OP_ge HEX: 2a -CONSTANT: DW_OP_gt HEX: 2b -CONSTANT: DW_OP_le HEX: 2c -CONSTANT: DW_OP_lt HEX: 2d -CONSTANT: DW_OP_ne HEX: 2e -CONSTANT: DW_OP_skip HEX: 2f -CONSTANT: DW_OP_lit0 HEX: 30 -CONSTANT: DW_OP_lit1 HEX: 31 -CONSTANT: DW_OP_lit2 HEX: 32 -CONSTANT: DW_OP_lit3 HEX: 33 -CONSTANT: DW_OP_lit4 HEX: 34 -CONSTANT: DW_OP_lit5 HEX: 35 -CONSTANT: DW_OP_lit6 HEX: 36 -CONSTANT: DW_OP_lit7 HEX: 37 -CONSTANT: DW_OP_lit8 HEX: 38 -CONSTANT: DW_OP_lit9 HEX: 39 -CONSTANT: DW_OP_lit10 HEX: 3a -CONSTANT: DW_OP_lit11 HEX: 3b -CONSTANT: DW_OP_lit12 HEX: 3c -CONSTANT: DW_OP_lit13 HEX: 3d -CONSTANT: DW_OP_lit14 HEX: 3e -CONSTANT: DW_OP_lit15 HEX: 3f -CONSTANT: DW_OP_lit16 HEX: 40 -CONSTANT: DW_OP_lit17 HEX: 41 -CONSTANT: DW_OP_lit18 HEX: 42 -CONSTANT: DW_OP_lit19 HEX: 43 -CONSTANT: DW_OP_lit20 HEX: 44 -CONSTANT: DW_OP_lit21 HEX: 45 -CONSTANT: DW_OP_lit22 HEX: 46 -CONSTANT: DW_OP_lit23 HEX: 47 -CONSTANT: DW_OP_lit24 HEX: 48 -CONSTANT: DW_OP_lit25 HEX: 49 -CONSTANT: DW_OP_lit26 HEX: 4a -CONSTANT: DW_OP_lit27 HEX: 4b -CONSTANT: DW_OP_lit28 HEX: 4c -CONSTANT: DW_OP_lit29 HEX: 4d -CONSTANT: DW_OP_lit30 HEX: 4e -CONSTANT: DW_OP_lit31 HEX: 4f -CONSTANT: DW_OP_reg0 HEX: 50 -CONSTANT: DW_OP_reg1 HEX: 51 -CONSTANT: DW_OP_reg2 HEX: 52 -CONSTANT: DW_OP_reg3 HEX: 53 -CONSTANT: DW_OP_reg4 HEX: 54 -CONSTANT: DW_OP_reg5 HEX: 55 -CONSTANT: DW_OP_reg6 HEX: 56 -CONSTANT: DW_OP_reg7 HEX: 57 -CONSTANT: DW_OP_reg8 HEX: 58 -CONSTANT: DW_OP_reg9 HEX: 59 -CONSTANT: DW_OP_reg10 HEX: 5a -CONSTANT: DW_OP_reg11 HEX: 5b -CONSTANT: DW_OP_reg12 HEX: 5c -CONSTANT: DW_OP_reg13 HEX: 5d -CONSTANT: DW_OP_reg14 HEX: 5e -CONSTANT: DW_OP_reg15 HEX: 5f -CONSTANT: DW_OP_reg16 HEX: 60 -CONSTANT: DW_OP_reg17 HEX: 61 -CONSTANT: DW_OP_reg18 HEX: 62 -CONSTANT: DW_OP_reg19 HEX: 63 -CONSTANT: DW_OP_reg20 HEX: 64 -CONSTANT: DW_OP_reg21 HEX: 65 -CONSTANT: DW_OP_reg22 HEX: 66 -CONSTANT: DW_OP_reg23 HEX: 67 -CONSTANT: DW_OP_reg24 HEX: 68 -CONSTANT: DW_OP_reg25 HEX: 69 -CONSTANT: DW_OP_reg26 HEX: 6a -CONSTANT: DW_OP_reg27 HEX: 6b -CONSTANT: DW_OP_reg28 HEX: 6c -CONSTANT: DW_OP_reg29 HEX: 6d -CONSTANT: DW_OP_reg30 HEX: 6e -CONSTANT: DW_OP_reg31 HEX: 6f -CONSTANT: DW_OP_breg0 HEX: 70 -CONSTANT: DW_OP_breg1 HEX: 71 -CONSTANT: DW_OP_breg2 HEX: 72 -CONSTANT: DW_OP_breg3 HEX: 73 -CONSTANT: DW_OP_breg4 HEX: 74 -CONSTANT: DW_OP_breg5 HEX: 75 -CONSTANT: DW_OP_breg6 HEX: 76 -CONSTANT: DW_OP_breg7 HEX: 77 -CONSTANT: DW_OP_breg8 HEX: 78 -CONSTANT: DW_OP_breg9 HEX: 79 -CONSTANT: DW_OP_breg10 HEX: 7a -CONSTANT: DW_OP_breg11 HEX: 7b -CONSTANT: DW_OP_breg12 HEX: 7c -CONSTANT: DW_OP_breg13 HEX: 7d -CONSTANT: DW_OP_breg14 HEX: 7e -CONSTANT: DW_OP_breg15 HEX: 7f -CONSTANT: DW_OP_breg16 HEX: 80 -CONSTANT: DW_OP_breg17 HEX: 81 -CONSTANT: DW_OP_breg18 HEX: 82 -CONSTANT: DW_OP_breg19 HEX: 83 -CONSTANT: DW_OP_breg20 HEX: 84 -CONSTANT: DW_OP_breg21 HEX: 85 -CONSTANT: DW_OP_breg22 HEX: 86 -CONSTANT: DW_OP_breg23 HEX: 87 -CONSTANT: DW_OP_breg24 HEX: 88 -CONSTANT: DW_OP_breg25 HEX: 89 -CONSTANT: DW_OP_breg26 HEX: 8a -CONSTANT: DW_OP_breg27 HEX: 8b -CONSTANT: DW_OP_breg28 HEX: 8c -CONSTANT: DW_OP_breg29 HEX: 8d -CONSTANT: DW_OP_breg30 HEX: 8e -CONSTANT: DW_OP_breg31 HEX: 8f -CONSTANT: DW_OP_regx HEX: 90 -CONSTANT: DW_OP_fbreg HEX: 91 -CONSTANT: DW_OP_bregx HEX: 92 -CONSTANT: DW_OP_piece HEX: 93 -CONSTANT: DW_OP_deref_size HEX: 94 -CONSTANT: DW_OP_xderef_size HEX: 95 -CONSTANT: DW_OP_nop HEX: 96 -CONSTANT: DW_OP_push_object_address HEX: 97 -CONSTANT: DW_OP_call2 HEX: 98 -CONSTANT: DW_OP_call4 HEX: 99 -CONSTANT: DW_OP_call_ref HEX: 9a -CONSTANT: DW_OP_form_tls_address HEX: 9b -CONSTANT: DW_OP_call_frame_cfa HEX: 9c -CONSTANT: DW_OP_bit_piece HEX: 9d -CONSTANT: DW_OP_implicit_value HEX: 9e -CONSTANT: DW_OP_stack_value HEX: 9f - - -CONSTANT: DW_OP_lo_user HEX: e0 -CONSTANT: DW_OP_GNU_push_tls_address HEX: e0 -CONSTANT: DW_OP_HP_unknown HEX: e0 -CONSTANT: DW_OP_HP_is_value HEX: e1 -CONSTANT: DW_OP_HP_fltconst4 HEX: e2 -CONSTANT: DW_OP_HP_fltconst8 HEX: e3 -CONSTANT: DW_OP_HP_mod_range HEX: e4 -CONSTANT: DW_OP_HP_unmod_range HEX: e5 -CONSTANT: DW_OP_HP_tls HEX: e6 -CONSTANT: DW_OP_INTEL_bit_piece HEX: e8 -CONSTANT: DW_OP_APPLE_uninit HEX: f0 -CONSTANT: DW_OP_hi_user HEX: ff - -CONSTANT: DW_ATE_address HEX: 1 -CONSTANT: DW_ATE_boolean HEX: 2 -CONSTANT: DW_ATE_complex_float HEX: 3 -CONSTANT: DW_ATE_float HEX: 4 -CONSTANT: DW_ATE_signed HEX: 5 -CONSTANT: DW_ATE_signed_char HEX: 6 -CONSTANT: DW_ATE_unsigned HEX: 7 -CONSTANT: DW_ATE_unsigned_char HEX: 8 -CONSTANT: DW_ATE_imaginary_float HEX: 9 -CONSTANT: DW_ATE_packed_decimal HEX: a -CONSTANT: DW_ATE_numeric_string HEX: b -CONSTANT: DW_ATE_edited HEX: c -CONSTANT: DW_ATE_signed_fixed HEX: d -CONSTANT: DW_ATE_unsigned_fixed HEX: e -CONSTANT: DW_ATE_decimal_float HEX: f - -CONSTANT: DW_ATE_lo_user HEX: 80 -CONSTANT: DW_ATE_ALTIUM_fract HEX: 80 -CONSTANT: DW_ATE_ALTIUM_accum HEX: 81 -CONSTANT: DW_ATE_HP_float80 HEX: 80 -CONSTANT: DW_ATE_HP_complex_float80 HEX: 81 -CONSTANT: DW_ATE_HP_float128 HEX: 82 -CONSTANT: DW_ATE_HP_complex_float128 HEX: 83 -CONSTANT: DW_ATE_HP_floathpintel HEX: 84 -CONSTANT: DW_ATE_HP_imaginary_float80 HEX: 85 -CONSTANT: DW_ATE_HP_imaginary_float128 HEX: 86 -CONSTANT: DW_ATE_SUN_interval_float HEX: 91 -CONSTANT: DW_ATE_SUN_imaginary_float HEX: 92 -CONSTANT: DW_ATE_hi_user HEX: ff - -CONSTANT: DW_DS_unsigned HEX: 01 -CONSTANT: DW_DS_leading_overpunch HEX: 02 -CONSTANT: DW_DS_trailing_overpunch HEX: 03 -CONSTANT: DW_DS_leading_separate HEX: 04 -CONSTANT: DW_DS_trailing_separate HEX: 05 - -CONSTANT: DW_END_default HEX: 00 -CONSTANT: DW_END_big HEX: 01 -CONSTANT: DW_END_little HEX: 02 -CONSTANT: DW_END_lo_user HEX: 40 -CONSTANT: DW_END_hi_user HEX: ff - -CONSTANT: DW_ATCF_lo_user HEX: 40 -CONSTANT: DW_ATCF_SUN_mop_bitfield HEX: 41 -CONSTANT: DW_ATCF_SUN_mop_spill HEX: 42 -CONSTANT: DW_ATCF_SUN_mop_scopy HEX: 43 -CONSTANT: DW_ATCF_SUN_func_start HEX: 44 -CONSTANT: DW_ATCF_SUN_end_ctors HEX: 45 -CONSTANT: DW_ATCF_SUN_branch_target HEX: 46 -CONSTANT: DW_ATCF_SUN_mop_stack_probe HEX: 47 -CONSTANT: DW_ATCF_SUN_func_epilog HEX: 48 -CONSTANT: DW_ATCF_hi_user HEX: ff - -CONSTANT: DW_ACCESS_public HEX: 01 -CONSTANT: DW_ACCESS_protected HEX: 02 -CONSTANT: DW_ACCESS_private HEX: 03 - -CONSTANT: DW_VIS_local HEX: 01 -CONSTANT: DW_VIS_exported HEX: 02 -CONSTANT: DW_VIS_qualified HEX: 03 - -CONSTANT: DW_VIRTUALITY_none HEX: 00 -CONSTANT: DW_VIRTUALITY_virtual HEX: 01 -CONSTANT: DW_VIRTUALITY_pure_virtual HEX: 02 - -CONSTANT: DW_LANG_C89 HEX: 0001 -CONSTANT: DW_LANG_C HEX: 0002 -CONSTANT: DW_LANG_Ada83 HEX: 0003 -CONSTANT: DW_LANG_C_plus_plus HEX: 0004 -CONSTANT: DW_LANG_Cobol74 HEX: 0005 -CONSTANT: DW_LANG_Cobol85 HEX: 0006 -CONSTANT: DW_LANG_Fortran77 HEX: 0007 -CONSTANT: DW_LANG_Fortran90 HEX: 0008 -CONSTANT: DW_LANG_Pascal83 HEX: 0009 -CONSTANT: DW_LANG_Modula2 HEX: 000a -CONSTANT: DW_LANG_Java HEX: 000b -CONSTANT: DW_LANG_C99 HEX: 000c -CONSTANT: DW_LANG_Ada95 HEX: 000d -CONSTANT: DW_LANG_Fortran95 HEX: 000e -CONSTANT: DW_LANG_PLI HEX: 000f -CONSTANT: DW_LANG_ObjC HEX: 0010 -CONSTANT: DW_LANG_ObjC_plus_plus HEX: 0011 -CONSTANT: DW_LANG_UPC HEX: 0012 -CONSTANT: DW_LANG_D HEX: 0013 -CONSTANT: DW_LANG_Python HEX: 0014 -CONSTANT: DW_LANG_lo_user HEX: 8000 -CONSTANT: DW_LANG_Mips_Assembler HEX: 8001 -CONSTANT: DW_LANG_Upc HEX: 8765 -CONSTANT: DW_LANG_ALTIUM_Assembler HEX: 9101 -CONSTANT: DW_LANG_SUN_Assembler HEX: 9001 -CONSTANT: DW_LANG_hi_user HEX: ffff - -CONSTANT: DW_ID_case_sensitive HEX: 00 -CONSTANT: DW_ID_up_case HEX: 01 -CONSTANT: DW_ID_down_case HEX: 02 -CONSTANT: DW_ID_case_insensitive HEX: 03 - -CONSTANT: DW_CC_normal HEX: 01 -CONSTANT: DW_CC_program HEX: 02 -CONSTANT: DW_CC_nocall HEX: 03 - -CONSTANT: DW_CC_lo_user HEX: 40 -CONSTANT: DW_CC_ALTIUM_interrupt HEX: 65 -CONSTANT: DW_CC_ALTIUM_near_system_stack HEX: 66 -CONSTANT: DW_CC_ALTIUM_near_user_stack HEX: 67 -CONSTANT: DW_CC_ALTIUM_huge_user_stack HEX: 68 -CONSTANT: DW_CC_hi_user HEX: ff - -CONSTANT: DW_INL_not_inlined HEX: 00 -CONSTANT: DW_INL_inlined HEX: 01 -CONSTANT: DW_INL_declared_not_inlined HEX: 02 -CONSTANT: DW_INL_declared_inlined HEX: 03 - -CONSTANT: DW_ORD_row_major HEX: 00 -CONSTANT: DW_ORD_col_major HEX: 01 - -CONSTANT: DW_DSC_label HEX: 00 -CONSTANT: DW_DSC_range HEX: 01 - -CONSTANT: DW_LNS_copy HEX: 01 -CONSTANT: DW_LNS_advance_pc HEX: 02 -CONSTANT: DW_LNS_advance_line HEX: 03 -CONSTANT: DW_LNS_set_file HEX: 04 -CONSTANT: DW_LNS_set_column HEX: 05 -CONSTANT: DW_LNS_negate_stmt HEX: 06 -CONSTANT: DW_LNS_set_basic_block HEX: 07 -CONSTANT: DW_LNS_const_add_pc HEX: 08 -CONSTANT: DW_LNS_fixed_advance_pc HEX: 09 -CONSTANT: DW_LNS_set_prologue_end HEX: 0a -CONSTANT: DW_LNS_set_epilogue_begin HEX: 0b -CONSTANT: DW_LNS_set_isa HEX: 0c - -CONSTANT: DW_LNE_end_sequence HEX: 01 -CONSTANT: DW_LNE_set_address HEX: 02 -CONSTANT: DW_LNE_define_file HEX: 03 -CONSTANT: DW_LNE_set_discriminator HEX: 04 - -CONSTANT: DW_LNE_HP_negate_is_UV_update HEX: 11 -CONSTANT: DW_LNE_HP_push_context HEX: 12 -CONSTANT: DW_LNE_HP_pop_context HEX: 13 -CONSTANT: DW_LNE_HP_set_file_line_column HEX: 14 -CONSTANT: DW_LNE_HP_set_routine_name HEX: 15 -CONSTANT: DW_LNE_HP_set_sequence HEX: 16 -CONSTANT: DW_LNE_HP_negate_post_semantics HEX: 17 -CONSTANT: DW_LNE_HP_negate_function_exit HEX: 18 -CONSTANT: DW_LNE_HP_negate_front_end_logical HEX: 19 -CONSTANT: DW_LNE_HP_define_proc HEX: 20 - -CONSTANT: DW_LNE_lo_user HEX: 80 -CONSTANT: DW_LNE_hi_user HEX: ff - -CONSTANT: DW_MACINFO_define HEX: 01 -CONSTANT: DW_MACINFO_undef HEX: 02 -CONSTANT: DW_MACINFO_start_file HEX: 03 -CONSTANT: DW_MACINFO_end_file HEX: 04 -CONSTANT: DW_MACINFO_vendor_ext HEX: ff - -CONSTANT: DW_CFA_advance_loc HEX: 40 -CONSTANT: DW_CFA_offset HEX: 80 -CONSTANT: DW_CFA_restore HEX: c0 -CONSTANT: DW_CFA_extended HEX: 00 - -CONSTANT: DW_CFA_nop HEX: 00 -CONSTANT: DW_CFA_set_loc HEX: 01 -CONSTANT: DW_CFA_advance_loc1 HEX: 02 -CONSTANT: DW_CFA_advance_loc2 HEX: 03 -CONSTANT: DW_CFA_advance_loc4 HEX: 04 -CONSTANT: DW_CFA_offset_extended HEX: 05 -CONSTANT: DW_CFA_restore_extended HEX: 06 -CONSTANT: DW_CFA_undefined HEX: 07 -CONSTANT: DW_CFA_same_value HEX: 08 -CONSTANT: DW_CFA_register HEX: 09 -CONSTANT: DW_CFA_remember_state HEX: 0a -CONSTANT: DW_CFA_restore_state HEX: 0b -CONSTANT: DW_CFA_def_cfa HEX: 0c -CONSTANT: DW_CFA_def_cfa_register HEX: 0d -CONSTANT: DW_CFA_def_cfa_offset HEX: 0e -CONSTANT: DW_CFA_def_cfa_expression HEX: 0f -CONSTANT: DW_CFA_expression HEX: 10 -CONSTANT: DW_CFA_offset_extended_sf HEX: 11 -CONSTANT: DW_CFA_def_cfa_sf HEX: 12 -CONSTANT: DW_CFA_def_cfa_offset_sf HEX: 13 -CONSTANT: DW_CFA_val_offset HEX: 14 -CONSTANT: DW_CFA_val_offset_sf HEX: 15 -CONSTANT: DW_CFA_val_expression HEX: 16 - -CONSTANT: DW_CFA_lo_user HEX: 1c -CONSTANT: DW_CFA_MIPS_advance_loc8 HEX: 1d -CONSTANT: DW_CFA_GNU_window_save HEX: 2d -CONSTANT: DW_CFA_GNU_args_size HEX: 2e -CONSTANT: DW_CFA_GNU_negative_offset_extended HEX: 2f -CONSTANT: DW_CFA_high_user HEX: 3f - -CONSTANT: DW_EH_PE_absptr HEX: 00 -CONSTANT: DW_EH_PE_uleb128 HEX: 01 -CONSTANT: DW_EH_PE_udata2 HEX: 02 -CONSTANT: DW_EH_PE_udata4 HEX: 03 -CONSTANT: DW_EH_PE_udata8 HEX: 04 -CONSTANT: DW_EH_PE_sleb128 HEX: 09 -CONSTANT: DW_EH_PE_sdata2 HEX: 0A -CONSTANT: DW_EH_PE_sdata4 HEX: 0B -CONSTANT: DW_EH_PE_sdata8 HEX: 0C -CONSTANT: DW_EH_PE_pcrel HEX: 10 -CONSTANT: DW_EH_PE_textrel HEX: 20 -CONSTANT: DW_EH_PE_datarel HEX: 30 -CONSTANT: DW_EH_PE_funcrel HEX: 40 -CONSTANT: DW_EH_PE_aligned HEX: 50 -CONSTANT: DW_EH_PE_omit HEX: ff +CONSTANT: DW_FORM_addr 0x01 +CONSTANT: DW_FORM_block2 0x03 +CONSTANT: DW_FORM_block4 0x04 +CONSTANT: DW_FORM_data2 0x05 +CONSTANT: DW_FORM_data4 0x06 +CONSTANT: DW_FORM_data8 0x07 +CONSTANT: DW_FORM_string 0x08 +CONSTANT: DW_FORM_block 0x09 +CONSTANT: DW_FORM_block1 0x0a +CONSTANT: DW_FORM_data1 0x0b +CONSTANT: DW_FORM_flag 0x0c +CONSTANT: DW_FORM_sdata 0x0d +CONSTANT: DW_FORM_strp 0x0e +CONSTANT: DW_FORM_udata 0x0f +CONSTANT: DW_FORM_ref_addr 0x10 +CONSTANT: DW_FORM_ref1 0x11 +CONSTANT: DW_FORM_ref2 0x12 +CONSTANT: DW_FORM_ref4 0x13 +CONSTANT: DW_FORM_ref8 0x14 +CONSTANT: DW_FORM_ref_udata 0x15 +CONSTANT: DW_FORM_indirect 0x16 +CONSTANT: DW_FORM_sec_offset 0x17 +CONSTANT: DW_FORM_exprloc 0x18 +CONSTANT: DW_FORM_flag_present 0x19 +CONSTANT: DW_FORM_ref_sig8 0x20 + +CONSTANT: DW_AT_sibling 0x01 +CONSTANT: DW_AT_location 0x02 +CONSTANT: DW_AT_name 0x03 +CONSTANT: DW_AT_ordering 0x09 +CONSTANT: DW_AT_subscr_data 0x0a +CONSTANT: DW_AT_byte_size 0x0b +CONSTANT: DW_AT_bit_offset 0x0c +CONSTANT: DW_AT_bit_size 0x0d +CONSTANT: DW_AT_element_list 0x0f +CONSTANT: DW_AT_stmt_list 0x10 +CONSTANT: DW_AT_low_pc 0x11 +CONSTANT: DW_AT_high_pc 0x12 +CONSTANT: DW_AT_language 0x13 +CONSTANT: DW_AT_member 0x14 +CONSTANT: DW_AT_discr 0x15 +CONSTANT: DW_AT_discr_value 0x16 +CONSTANT: DW_AT_visibility 0x17 +CONSTANT: DW_AT_import 0x18 +CONSTANT: DW_AT_string_length 0x19 +CONSTANT: DW_AT_common_reference 0x1a +CONSTANT: DW_AT_comp_dir 0x1b +CONSTANT: DW_AT_const_value 0x1c +CONSTANT: DW_AT_containing_type 0x1d +CONSTANT: DW_AT_default_value 0x1e +CONSTANT: DW_AT_inline 0x20 +CONSTANT: DW_AT_is_optional 0x21 +CONSTANT: DW_AT_lower_bound 0x22 +CONSTANT: DW_AT_producer 0x25 +CONSTANT: DW_AT_prototyped 0x27 +CONSTANT: DW_AT_return_addr 0x2a +CONSTANT: DW_AT_start_scope 0x2c +CONSTANT: DW_AT_bit_stride 0x2e +CONSTANT: DW_AT_upper_bound 0x2f +CONSTANT: DW_AT_abstract_origin 0x31 +CONSTANT: DW_AT_accessibility 0x32 +CONSTANT: DW_AT_address_class 0x33 +CONSTANT: DW_AT_artificial 0x34 +CONSTANT: DW_AT_base_types 0x35 +CONSTANT: DW_AT_calling_convention 0x36 +CONSTANT: DW_AT_count 0x37 +CONSTANT: DW_AT_data_member_location 0x38 +CONSTANT: DW_AT_decl_column 0x39 +CONSTANT: DW_AT_decl_file 0x3a +CONSTANT: DW_AT_decl_line 0x3b +CONSTANT: DW_AT_declaration 0x3c +CONSTANT: DW_AT_discr_list 0x3d +CONSTANT: DW_AT_encoding 0x3e +CONSTANT: DW_AT_external 0x3f +CONSTANT: DW_AT_frame_base 0x40 +CONSTANT: DW_AT_friend 0x41 +CONSTANT: DW_AT_identifier_case 0x42 +CONSTANT: DW_AT_macro_info 0x43 +CONSTANT: DW_AT_namelist_item 0x44 +CONSTANT: DW_AT_priority 0x45 +CONSTANT: DW_AT_segment 0x46 +CONSTANT: DW_AT_specification 0x47 +CONSTANT: DW_AT_static_link 0x48 +CONSTANT: DW_AT_type 0x49 +CONSTANT: DW_AT_use_location 0x4a +CONSTANT: DW_AT_variable_parameter 0x4b +CONSTANT: DW_AT_virtuality 0x4c +CONSTANT: DW_AT_vtable_elem_location 0x4d +CONSTANT: DW_AT_allocated 0x4e +CONSTANT: DW_AT_associated 0x4f +CONSTANT: DW_AT_data_location 0x50 +CONSTANT: DW_AT_byte_stride 0x51 +CONSTANT: DW_AT_entry_pc 0x52 +CONSTANT: DW_AT_use_UTF8 0x53 +CONSTANT: DW_AT_extension 0x54 +CONSTANT: DW_AT_ranges 0x55 +CONSTANT: DW_AT_trampoline 0x56 +CONSTANT: DW_AT_call_column 0x57 +CONSTANT: DW_AT_call_file 0x58 +CONSTANT: DW_AT_call_line 0x59 +CONSTANT: DW_AT_description 0x5a +CONSTANT: DW_AT_binary_scale 0x5b +CONSTANT: DW_AT_decimal_scale 0x5c +CONSTANT: DW_AT_small 0x5d +CONSTANT: DW_AT_decimal_sign 0x5e +CONSTANT: DW_AT_digit_count 0x5f +CONSTANT: DW_AT_picture_string 0x60 +CONSTANT: DW_AT_mutable 0x61 +CONSTANT: DW_AT_threads_scaled 0x62 +CONSTANT: DW_AT_explicit 0x63 +CONSTANT: DW_AT_object_pointer 0x64 +CONSTANT: DW_AT_endianity 0x65 +CONSTANT: DW_AT_elemental 0x66 +CONSTANT: DW_AT_pure 0x67 +CONSTANT: DW_AT_recursive 0x68 +CONSTANT: DW_AT_signature 0x69 +CONSTANT: DW_AT_main_subprogram 0x6a +CONSTANT: DW_AT_data_bit_offset 0x6b +CONSTANT: DW_AT_const_expr 0x6c +CONSTANT: DW_AT_enum_class 0x6d +CONSTANT: DW_AT_linkage_name 0x6e + +CONSTANT: DW_AT_HP_block_index 0x2000 + +CONSTANT: DW_AT_lo_user 0x2000 + +CONSTANT: DW_AT_MIPS_fde 0x2001 +CONSTANT: DW_AT_MIPS_loop_begin 0x2002 +CONSTANT: DW_AT_MIPS_tail_loop_begin 0x2003 +CONSTANT: DW_AT_MIPS_epilog_begin 0x2004 +CONSTANT: DW_AT_MIPS_loop_unroll_factor 0x2005 +CONSTANT: DW_AT_MIPS_software_pipeline_depth 0x2006 +CONSTANT: DW_AT_MIPS_linkage_name 0x2007 +CONSTANT: DW_AT_MIPS_stride 0x2008 +CONSTANT: DW_AT_MIPS_abstract_name 0x2009 +CONSTANT: DW_AT_MIPS_clone_origin 0x200a +CONSTANT: DW_AT_MIPS_has_inlines 0x200b +CONSTANT: DW_AT_MIPS_stride_byte 0x200c +CONSTANT: DW_AT_MIPS_stride_elem 0x200d +CONSTANT: DW_AT_MIPS_ptr_dopetype 0x200e +CONSTANT: DW_AT_MIPS_allocatable_dopetype 0x200f +CONSTANT: DW_AT_MIPS_assumed_shape_dopetype 0x2010 +CONSTANT: DW_AT_MIPS_assumed_size 0x2011 + +CONSTANT: DW_AT_HP_unmodifiable 0x2001 +CONSTANT: DW_AT_HP_actuals_stmt_list 0x2010 +CONSTANT: DW_AT_HP_proc_per_section 0x2011 +CONSTANT: DW_AT_HP_raw_data_ptr 0x2012 +CONSTANT: DW_AT_HP_pass_by_reference 0x2013 +CONSTANT: DW_AT_HP_opt_level 0x2014 +CONSTANT: DW_AT_HP_prof_version_id 0x2015 +CONSTANT: DW_AT_HP_opt_flags 0x2016 +CONSTANT: DW_AT_HP_cold_region_low_pc 0x2017 +CONSTANT: DW_AT_HP_cold_region_high_pc 0x2018 +CONSTANT: DW_AT_HP_all_variables_modifiable 0x2019 +CONSTANT: DW_AT_HP_linkage_name 0x201a +CONSTANT: DW_AT_HP_prof_flags 0x201b + +CONSTANT: DW_AT_CPQ_discontig_ranges 0x2001 +CONSTANT: DW_AT_CPQ_semantic_events 0x2002 +CONSTANT: DW_AT_CPQ_split_lifetimes_var 0x2003 +CONSTANT: DW_AT_CPQ_split_lifetimes_rtn 0x2004 +CONSTANT: DW_AT_CPQ_prologue_length 0x2005 + +CONSTANT: DW_AT_INTEL_other_endian 0x2026 + +CONSTANT: DW_AT_sf_names 0x2101 +CONSTANT: DW_AT_src_info 0x2102 +CONSTANT: DW_AT_mac_info 0x2103 +CONSTANT: DW_AT_src_coords 0x2104 +CONSTANT: DW_AT_body_begin 0x2105 +CONSTANT: DW_AT_body_end 0x2106 +CONSTANT: DW_AT_GNU_vector 0x2107 +CONSTANT: DW_AT_GNU_template_name 0x2108 + +CONSTANT: DW_AT_ALTIUM_loclist 0x2300 + +CONSTANT: DW_AT_SUN_template 0x2201 +CONSTANT: DW_AT_VMS_rtnbeg_pd_address 0x2201 +CONSTANT: DW_AT_SUN_alignment 0x2202 +CONSTANT: DW_AT_SUN_vtable 0x2203 +CONSTANT: DW_AT_SUN_count_guarantee 0x2204 +CONSTANT: DW_AT_SUN_command_line 0x2205 +CONSTANT: DW_AT_SUN_vbase 0x2206 +CONSTANT: DW_AT_SUN_compile_options 0x2207 +CONSTANT: DW_AT_SUN_language 0x2208 +CONSTANT: DW_AT_SUN_browser_file 0x2209 +CONSTANT: DW_AT_SUN_vtable_abi 0x2210 +CONSTANT: DW_AT_SUN_func_offsets 0x2211 +CONSTANT: DW_AT_SUN_cf_kind 0x2212 +CONSTANT: DW_AT_SUN_vtable_index 0x2213 +CONSTANT: DW_AT_SUN_omp_tpriv_addr 0x2214 +CONSTANT: DW_AT_SUN_omp_child_func 0x2215 +CONSTANT: DW_AT_SUN_func_offset 0x2216 +CONSTANT: DW_AT_SUN_memop_type_ref 0x2217 +CONSTANT: DW_AT_SUN_profile_id 0x2218 +CONSTANT: DW_AT_SUN_memop_signature 0x2219 +CONSTANT: DW_AT_SUN_obj_dir 0x2220 +CONSTANT: DW_AT_SUN_obj_file 0x2221 +CONSTANT: DW_AT_SUN_original_name 0x2222 +CONSTANT: DW_AT_SUN_hwcprof_signature 0x2223 +CONSTANT: DW_AT_SUN_amd64_parmdump 0x2224 +CONSTANT: DW_AT_SUN_part_link_name 0x2225 +CONSTANT: DW_AT_SUN_link_name 0x2226 +CONSTANT: DW_AT_SUN_pass_with_const 0x2227 +CONSTANT: DW_AT_SUN_return_with_const 0x2228 +CONSTANT: DW_AT_SUN_import_by_name 0x2229 +CONSTANT: DW_AT_SUN_f90_pointer 0x222a +CONSTANT: DW_AT_SUN_pass_by_ref 0x222b +CONSTANT: DW_AT_SUN_f90_allocatable 0x222c +CONSTANT: DW_AT_SUN_f90_assumed_shape_array 0x222d +CONSTANT: DW_AT_SUN_c_vla 0x222e +CONSTANT: DW_AT_SUN_return_value_ptr 0x2230 +CONSTANT: DW_AT_SUN_dtor_start 0x2231 +CONSTANT: DW_AT_SUN_dtor_length 0x2232 +CONSTANT: DW_AT_SUN_dtor_state_initial 0x2233 +CONSTANT: DW_AT_SUN_dtor_state_final 0x2234 +CONSTANT: DW_AT_SUN_dtor_state_deltas 0x2235 +CONSTANT: DW_AT_SUN_import_by_lname 0x2236 +CONSTANT: DW_AT_SUN_f90_use_only 0x2237 +CONSTANT: DW_AT_SUN_namelist_spec 0x2238 +CONSTANT: DW_AT_SUN_is_omp_child_func 0x2239 +CONSTANT: DW_AT_SUN_fortran_main_alias 0x223a +CONSTANT: DW_AT_SUN_fortran_based 0x223b + +CONSTANT: DW_AT_upc_threads_scaled 0x3210 + +CONSTANT: DW_AT_PGI_lbase 0x3a00 +CONSTANT: DW_AT_PGI_soffset 0x3a01 +CONSTANT: DW_AT_PGI_lstride 0x3a02 + +CONSTANT: DW_AT_APPLE_closure 0x3fe4 +CONSTANT: DW_AT_APPLE_major_runtime_vers 0x3fe5 +CONSTANT: DW_AT_APPLE_runtime_class 0x3fe6 + +CONSTANT: DW_AT_hi_user 0x3fff + +CONSTANT: DW_OP_addr 0x03 +CONSTANT: DW_OP_deref 0x06 +CONSTANT: DW_OP_const1u 0x08 +CONSTANT: DW_OP_const1s 0x09 +CONSTANT: DW_OP_const2u 0x0a +CONSTANT: DW_OP_const2s 0x0b +CONSTANT: DW_OP_const4u 0x0c +CONSTANT: DW_OP_const4s 0x0d +CONSTANT: DW_OP_const8u 0x0e +CONSTANT: DW_OP_const8s 0x0f +CONSTANT: DW_OP_constu 0x10 +CONSTANT: DW_OP_consts 0x11 +CONSTANT: DW_OP_dup 0x12 +CONSTANT: DW_OP_drop 0x13 +CONSTANT: DW_OP_over 0x14 +CONSTANT: DW_OP_pick 0x15 +CONSTANT: DW_OP_swap 0x16 +CONSTANT: DW_OP_rot 0x17 +CONSTANT: DW_OP_xderef 0x18 +CONSTANT: DW_OP_abs 0x19 +CONSTANT: DW_OP_and 0x1a +CONSTANT: DW_OP_div 0x1b +CONSTANT: DW_OP_minus 0x1c +CONSTANT: DW_OP_mod 0x1d +CONSTANT: DW_OP_mul 0x1e +CONSTANT: DW_OP_neg 0x1f +CONSTANT: DW_OP_not 0x20 +CONSTANT: DW_OP_or 0x21 +CONSTANT: DW_OP_plus 0x22 +CONSTANT: DW_OP_plus_uconst 0x23 +CONSTANT: DW_OP_shl 0x24 +CONSTANT: DW_OP_shr 0x25 +CONSTANT: DW_OP_shra 0x26 +CONSTANT: DW_OP_xor 0x27 +CONSTANT: DW_OP_bra 0x28 +CONSTANT: DW_OP_eq 0x29 +CONSTANT: DW_OP_ge 0x2a +CONSTANT: DW_OP_gt 0x2b +CONSTANT: DW_OP_le 0x2c +CONSTANT: DW_OP_lt 0x2d +CONSTANT: DW_OP_ne 0x2e +CONSTANT: DW_OP_skip 0x2f +CONSTANT: DW_OP_lit0 0x30 +CONSTANT: DW_OP_lit1 0x31 +CONSTANT: DW_OP_lit2 0x32 +CONSTANT: DW_OP_lit3 0x33 +CONSTANT: DW_OP_lit4 0x34 +CONSTANT: DW_OP_lit5 0x35 +CONSTANT: DW_OP_lit6 0x36 +CONSTANT: DW_OP_lit7 0x37 +CONSTANT: DW_OP_lit8 0x38 +CONSTANT: DW_OP_lit9 0x39 +CONSTANT: DW_OP_lit10 0x3a +CONSTANT: DW_OP_lit11 0x3b +CONSTANT: DW_OP_lit12 0x3c +CONSTANT: DW_OP_lit13 0x3d +CONSTANT: DW_OP_lit14 0x3e +CONSTANT: DW_OP_lit15 0x3f +CONSTANT: DW_OP_lit16 0x40 +CONSTANT: DW_OP_lit17 0x41 +CONSTANT: DW_OP_lit18 0x42 +CONSTANT: DW_OP_lit19 0x43 +CONSTANT: DW_OP_lit20 0x44 +CONSTANT: DW_OP_lit21 0x45 +CONSTANT: DW_OP_lit22 0x46 +CONSTANT: DW_OP_lit23 0x47 +CONSTANT: DW_OP_lit24 0x48 +CONSTANT: DW_OP_lit25 0x49 +CONSTANT: DW_OP_lit26 0x4a +CONSTANT: DW_OP_lit27 0x4b +CONSTANT: DW_OP_lit28 0x4c +CONSTANT: DW_OP_lit29 0x4d +CONSTANT: DW_OP_lit30 0x4e +CONSTANT: DW_OP_lit31 0x4f +CONSTANT: DW_OP_reg0 0x50 +CONSTANT: DW_OP_reg1 0x51 +CONSTANT: DW_OP_reg2 0x52 +CONSTANT: DW_OP_reg3 0x53 +CONSTANT: DW_OP_reg4 0x54 +CONSTANT: DW_OP_reg5 0x55 +CONSTANT: DW_OP_reg6 0x56 +CONSTANT: DW_OP_reg7 0x57 +CONSTANT: DW_OP_reg8 0x58 +CONSTANT: DW_OP_reg9 0x59 +CONSTANT: DW_OP_reg10 0x5a +CONSTANT: DW_OP_reg11 0x5b +CONSTANT: DW_OP_reg12 0x5c +CONSTANT: DW_OP_reg13 0x5d +CONSTANT: DW_OP_reg14 0x5e +CONSTANT: DW_OP_reg15 0x5f +CONSTANT: DW_OP_reg16 0x60 +CONSTANT: DW_OP_reg17 0x61 +CONSTANT: DW_OP_reg18 0x62 +CONSTANT: DW_OP_reg19 0x63 +CONSTANT: DW_OP_reg20 0x64 +CONSTANT: DW_OP_reg21 0x65 +CONSTANT: DW_OP_reg22 0x66 +CONSTANT: DW_OP_reg23 0x67 +CONSTANT: DW_OP_reg24 0x68 +CONSTANT: DW_OP_reg25 0x69 +CONSTANT: DW_OP_reg26 0x6a +CONSTANT: DW_OP_reg27 0x6b +CONSTANT: DW_OP_reg28 0x6c +CONSTANT: DW_OP_reg29 0x6d +CONSTANT: DW_OP_reg30 0x6e +CONSTANT: DW_OP_reg31 0x6f +CONSTANT: DW_OP_breg0 0x70 +CONSTANT: DW_OP_breg1 0x71 +CONSTANT: DW_OP_breg2 0x72 +CONSTANT: DW_OP_breg3 0x73 +CONSTANT: DW_OP_breg4 0x74 +CONSTANT: DW_OP_breg5 0x75 +CONSTANT: DW_OP_breg6 0x76 +CONSTANT: DW_OP_breg7 0x77 +CONSTANT: DW_OP_breg8 0x78 +CONSTANT: DW_OP_breg9 0x79 +CONSTANT: DW_OP_breg10 0x7a +CONSTANT: DW_OP_breg11 0x7b +CONSTANT: DW_OP_breg12 0x7c +CONSTANT: DW_OP_breg13 0x7d +CONSTANT: DW_OP_breg14 0x7e +CONSTANT: DW_OP_breg15 0x7f +CONSTANT: DW_OP_breg16 0x80 +CONSTANT: DW_OP_breg17 0x81 +CONSTANT: DW_OP_breg18 0x82 +CONSTANT: DW_OP_breg19 0x83 +CONSTANT: DW_OP_breg20 0x84 +CONSTANT: DW_OP_breg21 0x85 +CONSTANT: DW_OP_breg22 0x86 +CONSTANT: DW_OP_breg23 0x87 +CONSTANT: DW_OP_breg24 0x88 +CONSTANT: DW_OP_breg25 0x89 +CONSTANT: DW_OP_breg26 0x8a +CONSTANT: DW_OP_breg27 0x8b +CONSTANT: DW_OP_breg28 0x8c +CONSTANT: DW_OP_breg29 0x8d +CONSTANT: DW_OP_breg30 0x8e +CONSTANT: DW_OP_breg31 0x8f +CONSTANT: DW_OP_regx 0x90 +CONSTANT: DW_OP_fbreg 0x91 +CONSTANT: DW_OP_bregx 0x92 +CONSTANT: DW_OP_piece 0x93 +CONSTANT: DW_OP_deref_size 0x94 +CONSTANT: DW_OP_xderef_size 0x95 +CONSTANT: DW_OP_nop 0x96 +CONSTANT: DW_OP_push_object_address 0x97 +CONSTANT: DW_OP_call2 0x98 +CONSTANT: DW_OP_call4 0x99 +CONSTANT: DW_OP_call_ref 0x9a +CONSTANT: DW_OP_form_tls_address 0x9b +CONSTANT: DW_OP_call_frame_cfa 0x9c +CONSTANT: DW_OP_bit_piece 0x9d +CONSTANT: DW_OP_implicit_value 0x9e +CONSTANT: DW_OP_stack_value 0x9f + + +CONSTANT: DW_OP_lo_user 0xe0 +CONSTANT: DW_OP_GNU_push_tls_address 0xe0 +CONSTANT: DW_OP_HP_unknown 0xe0 +CONSTANT: DW_OP_HP_is_value 0xe1 +CONSTANT: DW_OP_HP_fltconst4 0xe2 +CONSTANT: DW_OP_HP_fltconst8 0xe3 +CONSTANT: DW_OP_HP_mod_range 0xe4 +CONSTANT: DW_OP_HP_unmod_range 0xe5 +CONSTANT: DW_OP_HP_tls 0xe6 +CONSTANT: DW_OP_INTEL_bit_piece 0xe8 +CONSTANT: DW_OP_APPLE_uninit 0xf0 +CONSTANT: DW_OP_hi_user 0xff + +CONSTANT: DW_ATE_address 0x1 +CONSTANT: DW_ATE_boolean 0x2 +CONSTANT: DW_ATE_complex_float 0x3 +CONSTANT: DW_ATE_float 0x4 +CONSTANT: DW_ATE_signed 0x5 +CONSTANT: DW_ATE_signed_char 0x6 +CONSTANT: DW_ATE_unsigned 0x7 +CONSTANT: DW_ATE_unsigned_char 0x8 +CONSTANT: DW_ATE_imaginary_float 0x9 +CONSTANT: DW_ATE_packed_decimal 0xa +CONSTANT: DW_ATE_numeric_string 0xb +CONSTANT: DW_ATE_edited 0xc +CONSTANT: DW_ATE_signed_fixed 0xd +CONSTANT: DW_ATE_unsigned_fixed 0xe +CONSTANT: DW_ATE_decimal_float 0xf + +CONSTANT: DW_ATE_lo_user 0x80 +CONSTANT: DW_ATE_ALTIUM_fract 0x80 +CONSTANT: DW_ATE_ALTIUM_accum 0x81 +CONSTANT: DW_ATE_HP_float80 0x80 +CONSTANT: DW_ATE_HP_complex_float80 0x81 +CONSTANT: DW_ATE_HP_float128 0x82 +CONSTANT: DW_ATE_HP_complex_float128 0x83 +CONSTANT: DW_ATE_HP_floathpintel 0x84 +CONSTANT: DW_ATE_HP_imaginary_float80 0x85 +CONSTANT: DW_ATE_HP_imaginary_float128 0x86 +CONSTANT: DW_ATE_SUN_interval_float 0x91 +CONSTANT: DW_ATE_SUN_imaginary_float 0x92 +CONSTANT: DW_ATE_hi_user 0xff + +CONSTANT: DW_DS_unsigned 0x01 +CONSTANT: DW_DS_leading_overpunch 0x02 +CONSTANT: DW_DS_trailing_overpunch 0x03 +CONSTANT: DW_DS_leading_separate 0x04 +CONSTANT: DW_DS_trailing_separate 0x05 + +CONSTANT: DW_END_default 0x00 +CONSTANT: DW_END_big 0x01 +CONSTANT: DW_END_little 0x02 +CONSTANT: DW_END_lo_user 0x40 +CONSTANT: DW_END_hi_user 0xff + +CONSTANT: DW_ATCF_lo_user 0x40 +CONSTANT: DW_ATCF_SUN_mop_bitfield 0x41 +CONSTANT: DW_ATCF_SUN_mop_spill 0x42 +CONSTANT: DW_ATCF_SUN_mop_scopy 0x43 +CONSTANT: DW_ATCF_SUN_func_start 0x44 +CONSTANT: DW_ATCF_SUN_end_ctors 0x45 +CONSTANT: DW_ATCF_SUN_branch_target 0x46 +CONSTANT: DW_ATCF_SUN_mop_stack_probe 0x47 +CONSTANT: DW_ATCF_SUN_func_epilog 0x48 +CONSTANT: DW_ATCF_hi_user 0xff + +CONSTANT: DW_ACCESS_public 0x01 +CONSTANT: DW_ACCESS_protected 0x02 +CONSTANT: DW_ACCESS_private 0x03 + +CONSTANT: DW_VIS_local 0x01 +CONSTANT: DW_VIS_exported 0x02 +CONSTANT: DW_VIS_qualified 0x03 + +CONSTANT: DW_VIRTUALITY_none 0x00 +CONSTANT: DW_VIRTUALITY_virtual 0x01 +CONSTANT: DW_VIRTUALITY_pure_virtual 0x02 + +CONSTANT: DW_LANG_C89 0x0001 +CONSTANT: DW_LANG_C 0x0002 +CONSTANT: DW_LANG_Ada83 0x0003 +CONSTANT: DW_LANG_C_plus_plus 0x0004 +CONSTANT: DW_LANG_Cobol74 0x0005 +CONSTANT: DW_LANG_Cobol85 0x0006 +CONSTANT: DW_LANG_Fortran77 0x0007 +CONSTANT: DW_LANG_Fortran90 0x0008 +CONSTANT: DW_LANG_Pascal83 0x0009 +CONSTANT: DW_LANG_Modula2 0x000a +CONSTANT: DW_LANG_Java 0x000b +CONSTANT: DW_LANG_C99 0x000c +CONSTANT: DW_LANG_Ada95 0x000d +CONSTANT: DW_LANG_Fortran95 0x000e +CONSTANT: DW_LANG_PLI 0x000f +CONSTANT: DW_LANG_ObjC 0x0010 +CONSTANT: DW_LANG_ObjC_plus_plus 0x0011 +CONSTANT: DW_LANG_UPC 0x0012 +CONSTANT: DW_LANG_D 0x0013 +CONSTANT: DW_LANG_Python 0x0014 +CONSTANT: DW_LANG_lo_user 0x8000 +CONSTANT: DW_LANG_Mips_Assembler 0x8001 +CONSTANT: DW_LANG_Upc 0x8765 +CONSTANT: DW_LANG_ALTIUM_Assembler 0x9101 +CONSTANT: DW_LANG_SUN_Assembler 0x9001 +CONSTANT: DW_LANG_hi_user 0xffff + +CONSTANT: DW_ID_case_sensitive 0x00 +CONSTANT: DW_ID_up_case 0x01 +CONSTANT: DW_ID_down_case 0x02 +CONSTANT: DW_ID_case_insensitive 0x03 + +CONSTANT: DW_CC_normal 0x01 +CONSTANT: DW_CC_program 0x02 +CONSTANT: DW_CC_nocall 0x03 + +CONSTANT: DW_CC_lo_user 0x40 +CONSTANT: DW_CC_ALTIUM_interrupt 0x65 +CONSTANT: DW_CC_ALTIUM_near_system_stack 0x66 +CONSTANT: DW_CC_ALTIUM_near_user_stack 0x67 +CONSTANT: DW_CC_ALTIUM_huge_user_stack 0x68 +CONSTANT: DW_CC_hi_user 0xff + +CONSTANT: DW_INL_not_inlined 0x00 +CONSTANT: DW_INL_inlined 0x01 +CONSTANT: DW_INL_declared_not_inlined 0x02 +CONSTANT: DW_INL_declared_inlined 0x03 + +CONSTANT: DW_ORD_row_major 0x00 +CONSTANT: DW_ORD_col_major 0x01 + +CONSTANT: DW_DSC_label 0x00 +CONSTANT: DW_DSC_range 0x01 + +CONSTANT: DW_LNS_copy 0x01 +CONSTANT: DW_LNS_advance_pc 0x02 +CONSTANT: DW_LNS_advance_line 0x03 +CONSTANT: DW_LNS_set_file 0x04 +CONSTANT: DW_LNS_set_column 0x05 +CONSTANT: DW_LNS_negate_stmt 0x06 +CONSTANT: DW_LNS_set_basic_block 0x07 +CONSTANT: DW_LNS_const_add_pc 0x08 +CONSTANT: DW_LNS_fixed_advance_pc 0x09 +CONSTANT: DW_LNS_set_prologue_end 0x0a +CONSTANT: DW_LNS_set_epilogue_begin 0x0b +CONSTANT: DW_LNS_set_isa 0x0c + +CONSTANT: DW_LNE_end_sequence 0x01 +CONSTANT: DW_LNE_set_address 0x02 +CONSTANT: DW_LNE_define_file 0x03 +CONSTANT: DW_LNE_set_discriminator 0x04 + +CONSTANT: DW_LNE_HP_negate_is_UV_update 0x11 +CONSTANT: DW_LNE_HP_push_context 0x12 +CONSTANT: DW_LNE_HP_pop_context 0x13 +CONSTANT: DW_LNE_HP_set_file_line_column 0x14 +CONSTANT: DW_LNE_HP_set_routine_name 0x15 +CONSTANT: DW_LNE_HP_set_sequence 0x16 +CONSTANT: DW_LNE_HP_negate_post_semantics 0x17 +CONSTANT: DW_LNE_HP_negate_function_exit 0x18 +CONSTANT: DW_LNE_HP_negate_front_end_logical 0x19 +CONSTANT: DW_LNE_HP_define_proc 0x20 + +CONSTANT: DW_LNE_lo_user 0x80 +CONSTANT: DW_LNE_hi_user 0xff + +CONSTANT: DW_MACINFO_define 0x01 +CONSTANT: DW_MACINFO_undef 0x02 +CONSTANT: DW_MACINFO_start_file 0x03 +CONSTANT: DW_MACINFO_end_file 0x04 +CONSTANT: DW_MACINFO_vendor_ext 0xff + +CONSTANT: DW_CFA_advance_loc 0x40 +CONSTANT: DW_CFA_offset 0x80 +CONSTANT: DW_CFA_restore 0xc0 +CONSTANT: DW_CFA_extended 0x00 + +CONSTANT: DW_CFA_nop 0x00 +CONSTANT: DW_CFA_set_loc 0x01 +CONSTANT: DW_CFA_advance_loc1 0x02 +CONSTANT: DW_CFA_advance_loc2 0x03 +CONSTANT: DW_CFA_advance_loc4 0x04 +CONSTANT: DW_CFA_offset_extended 0x05 +CONSTANT: DW_CFA_restore_extended 0x06 +CONSTANT: DW_CFA_undefined 0x07 +CONSTANT: DW_CFA_same_value 0x08 +CONSTANT: DW_CFA_register 0x09 +CONSTANT: DW_CFA_remember_state 0x0a +CONSTANT: DW_CFA_restore_state 0x0b +CONSTANT: DW_CFA_def_cfa 0x0c +CONSTANT: DW_CFA_def_cfa_register 0x0d +CONSTANT: DW_CFA_def_cfa_offset 0x0e +CONSTANT: DW_CFA_def_cfa_expression 0x0f +CONSTANT: DW_CFA_expression 0x10 +CONSTANT: DW_CFA_offset_extended_sf 0x11 +CONSTANT: DW_CFA_def_cfa_sf 0x12 +CONSTANT: DW_CFA_def_cfa_offset_sf 0x13 +CONSTANT: DW_CFA_val_offset 0x14 +CONSTANT: DW_CFA_val_offset_sf 0x15 +CONSTANT: DW_CFA_val_expression 0x16 + +CONSTANT: DW_CFA_lo_user 0x1c +CONSTANT: DW_CFA_MIPS_advance_loc8 0x1d +CONSTANT: DW_CFA_GNU_window_save 0x2d +CONSTANT: DW_CFA_GNU_args_size 0x2e +CONSTANT: DW_CFA_GNU_negative_offset_extended 0x2f +CONSTANT: DW_CFA_high_user 0x3f + +CONSTANT: DW_EH_PE_absptr 0x00 +CONSTANT: DW_EH_PE_uleb128 0x01 +CONSTANT: DW_EH_PE_udata2 0x02 +CONSTANT: DW_EH_PE_udata4 0x03 +CONSTANT: DW_EH_PE_udata8 0x04 +CONSTANT: DW_EH_PE_sleb128 0x09 +CONSTANT: DW_EH_PE_sdata2 0x0A +CONSTANT: DW_EH_PE_sdata4 0x0B +CONSTANT: DW_EH_PE_sdata8 0x0C +CONSTANT: DW_EH_PE_pcrel 0x10 +CONSTANT: DW_EH_PE_textrel 0x20 +CONSTANT: DW_EH_PE_datarel 0x30 +CONSTANT: DW_EH_PE_funcrel 0x40 +CONSTANT: DW_EH_PE_aligned 0x50 +CONSTANT: DW_EH_PE_omit 0xff CONSTANT: DW_FRAME_CFA_COL 0 @@ -786,6 +786,6 @@ CONSTANT: DW_FRAME_FREG29 61 CONSTANT: DW_FRAME_FREG30 62 CONSTANT: DW_FRAME_FREG31 63 -CONSTANT: DW_CHILDREN_no HEX: 00 -CONSTANT: DW_CHILDREN_yes HEX: 01 -CONSTANT: DW_ADDR_none HEX: 00 +CONSTANT: DW_CHILDREN_no 0x00 +CONSTANT: DW_CHILDREN_yes 0x01 +CONSTANT: DW_ADDR_none 0x00 diff --git a/extra/elf/elf.factor b/extra/elf/elf.factor index 775e98ab23..d7c1524f4c 100644 --- a/extra/elf/elf.factor +++ b/extra/elf/elf.factor @@ -19,10 +19,10 @@ CONSTANT: EI_OSABI 7 CONSTANT: EI_ABIVERSION 8 CONSTANT: EI_PAD 9 -CONSTANT: ELFMAG0 HEX: 7f -CONSTANT: ELFMAG1 HEX: 45 -CONSTANT: ELFMAG2 HEX: 4c -CONSTANT: ELFMAG3 HEX: 46 +CONSTANT: ELFMAG0 0x7f +CONSTANT: ELFMAG1 0x45 +CONSTANT: ELFMAG2 0x4c +CONSTANT: ELFMAG3 0x46 CONSTANT: ELFCLASS32 1 CONSTANT: ELFCLASS64 2 @@ -53,10 +53,10 @@ CONSTANT: ET_REL 1 CONSTANT: ET_EXEC 2 CONSTANT: ET_DYN 3 CONSTANT: ET_CORE 4 -CONSTANT: ET_LOOS HEX: FE00 -CONSTANT: ET_HIOS HEX: FEFF -CONSTANT: ET_LOPROC HEX: FF00 -CONSTANT: ET_HIPROC HEX: FFFF +CONSTANT: ET_LOOS 0xFE00 +CONSTANT: ET_HIOS 0xFEFF +CONSTANT: ET_LOPROC 0xFF00 +CONSTANT: ET_HIPROC 0xFFFF CONSTANT: EM_NONE 0 CONSTANT: EM_M32 1 @@ -155,16 +155,16 @@ CONSTANT: EM_UNICORE 110 CONSTANT: EV_NONE 0 CONSTANT: EV_CURRENT 1 -CONSTANT: EF_ARM_EABIMASK HEX: ff000000 -CONSTANT: EF_ARM_BE8 HEX: 00800000 +CONSTANT: EF_ARM_EABIMASK 0xff000000 +CONSTANT: EF_ARM_BE8 0x00800000 -CONSTANT: SHN_UNDEF HEX: 0000 -CONSTANT: SHN_LOPROC HEX: FF00 -CONSTANT: SHN_HIPROC HEX: FF1F -CONSTANT: SHN_LOOS HEX: FF20 -CONSTANT: SHN_HIOS HEX: FF3F -CONSTANT: SHN_ABS HEX: FFF1 -CONSTANT: SHN_COMMON HEX: FFF2 +CONSTANT: SHN_UNDEF 0x0000 +CONSTANT: SHN_LOPROC 0xFF00 +CONSTANT: SHN_HIPROC 0xFF1F +CONSTANT: SHN_LOOS 0xFF20 +CONSTANT: SHN_HIOS 0xFF3F +CONSTANT: SHN_ABS 0xFFF1 +CONSTANT: SHN_COMMON 0xFFF2 CONSTANT: SHT_NULL 0 CONSTANT: SHT_PROGBITS 1 @@ -178,27 +178,27 @@ CONSTANT: SHT_NOBITS 8 CONSTANT: SHT_REL 9 CONSTANT: SHT_SHLIB 10 CONSTANT: SHT_DYNSYM 11 -CONSTANT: SHT_LOOS HEX: 60000000 -CONSTANT: SHT_GNU_LIBLIST HEX: 6ffffff7 -CONSTANT: SHT_CHECKSUM HEX: 6ffffff8 -CONSTANT: SHT_LOSUNW HEX: 6ffffffa -CONSTANT: SHT_SUNW_move HEX: 6ffffffa -CONSTANT: SHT_SUNW_COMDAT HEX: 6ffffffb -CONSTANT: SHT_SUNW_syminfo HEX: 6ffffffc -CONSTANT: SHT_GNU_verdef HEX: 6ffffffd -CONSTANT: SHT_GNU_verneed HEX: 6ffffffe -CONSTANT: SHT_GNU_versym HEX: 6fffffff -CONSTANT: SHT_HISUNW HEX: 6fffffff -CONSTANT: SHT_HIOS HEX: 6fffffff -CONSTANT: SHT_LOPROC HEX: 70000000 -CONSTANT: SHT_ARM_EXIDX HEX: 70000001 -CONSTANT: SHT_ARM_PREEMPTMAP HEX: 70000002 -CONSTANT: SHT_ARM_ATTRIBUTES HEX: 70000003 -CONSTANT: SHT_ARM_DEBUGOVERLAY HEX: 70000004 -CONSTANT: SHT_ARM_OVERLAYSECTION HEX: 70000005 -CONSTANT: SHT_HIPROC HEX: 7fffffff -CONSTANT: SHT_LOUSER HEX: 80000000 -CONSTANT: SHT_HIUSER HEX: 8fffffff +CONSTANT: SHT_LOOS 0x60000000 +CONSTANT: SHT_GNU_LIBLIST 0x6ffffff7 +CONSTANT: SHT_CHECKSUM 0x6ffffff8 +CONSTANT: SHT_LOSUNW 0x6ffffffa +CONSTANT: SHT_SUNW_move 0x6ffffffa +CONSTANT: SHT_SUNW_COMDAT 0x6ffffffb +CONSTANT: SHT_SUNW_syminfo 0x6ffffffc +CONSTANT: SHT_GNU_verdef 0x6ffffffd +CONSTANT: SHT_GNU_verneed 0x6ffffffe +CONSTANT: SHT_GNU_versym 0x6fffffff +CONSTANT: SHT_HISUNW 0x6fffffff +CONSTANT: SHT_HIOS 0x6fffffff +CONSTANT: SHT_LOPROC 0x70000000 +CONSTANT: SHT_ARM_EXIDX 0x70000001 +CONSTANT: SHT_ARM_PREEMPTMAP 0x70000002 +CONSTANT: SHT_ARM_ATTRIBUTES 0x70000003 +CONSTANT: SHT_ARM_DEBUGOVERLAY 0x70000004 +CONSTANT: SHT_ARM_OVERLAYSECTION 0x70000005 +CONSTANT: SHT_HIPROC 0x7fffffff +CONSTANT: SHT_LOUSER 0x80000000 +CONSTANT: SHT_HIUSER 0x8fffffff CONSTANT: SHF_WRITE 1 CONSTANT: SHF_ALLOC 2 @@ -210,8 +210,8 @@ CONSTANT: SHF_LINK_ORDER 128 CONSTANT: SHF_OS_NONCONFORMING 256 CONSTANT: SHF_GROUP 512 CONSTANT: SHF_TLS 1024 -CONSTANT: SHF_MASKOS HEX: 0f000000 -CONSTANT: SHF_MASKPROC HEX: f0000000 +CONSTANT: SHF_MASKOS 0x0f000000 +CONSTANT: SHF_MASKPROC 0xf0000000 CONSTANT: STB_LOCAL 0 CONSTANT: STB_GLOBAL 1 @@ -248,45 +248,45 @@ CONSTANT: PT_NOTE 4 CONSTANT: PT_SHLIB 5 CONSTANT: PT_PHDR 6 CONSTANT: PT_TLS 7 -CONSTANT: PT_LOOS HEX: 60000000 -CONSTANT: PT_HIOS HEX: 6fffffff -CONSTANT: PT_LOPROC HEX: 70000000 -CONSTANT: PT_ARM_ARCHEXT HEX: 70000000 -CONSTANT: PT_ARM_EXIDX HEX: 70000001 -CONSTANT: PT_ARM_UNWIND HEX: 70000001 -CONSTANT: PT_HIPROC HEX: 7fffffff - -CONSTANT: PT_ARM_ARCHEXT_FMTMSK HEX: ff000000 -CONSTANT: PT_ARM_ARCHEXT_PROFMSK HEX: 00ff0000 -CONSTANT: PT_ARM_ARCHEXT_ARCHMSK HEX: 000000ff -CONSTANT: PT_ARM_ARCHEXT_FMT_OS HEX: 00000000 -CONSTANT: PT_ARM_ARCHEXT_FMT_ABI HEX: 01000000 -CONSTANT: PT_ARM_ARCHEXT_PROF_NONE HEX: 00000000 -CONSTANT: PT_ARM_ARCHEXT_PROF_ARM HEX: 00410000 -CONSTANT: PT_ARM_ARCHEXT_PROF_RT HEX: 00520000 -CONSTANT: PT_ARM_ARCHEXT_PROF_MC HEX: 004d0000 -CONSTANT: PT_ARM_ARCHEXT_PROF_CLASSIC HEX: 00530000 - -CONSTANT: PT_ARM_ARCHEXT_ARCH_UNKN HEX: 00 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv4 HEX: 01 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv4T HEX: 02 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv5T HEX: 03 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv5TE HEX: 04 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv5TEJ HEX: 05 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6 HEX: 06 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6KZ HEX: 07 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6T2 HEX: 08 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6K HEX: 09 -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv7 HEX: 0A -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6M HEX: 0B -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6SM HEX: 0C -CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv7EM HEX: 0D +CONSTANT: PT_LOOS 0x60000000 +CONSTANT: PT_HIOS 0x6fffffff +CONSTANT: PT_LOPROC 0x70000000 +CONSTANT: PT_ARM_ARCHEXT 0x70000000 +CONSTANT: PT_ARM_EXIDX 0x70000001 +CONSTANT: PT_ARM_UNWIND 0x70000001 +CONSTANT: PT_HIPROC 0x7fffffff + +CONSTANT: PT_ARM_ARCHEXT_FMTMSK 0xff000000 +CONSTANT: PT_ARM_ARCHEXT_PROFMSK 0x00ff0000 +CONSTANT: PT_ARM_ARCHEXT_ARCHMSK 0x000000ff +CONSTANT: PT_ARM_ARCHEXT_FMT_OS 0x00000000 +CONSTANT: PT_ARM_ARCHEXT_FMT_ABI 0x01000000 +CONSTANT: PT_ARM_ARCHEXT_PROF_NONE 0x00000000 +CONSTANT: PT_ARM_ARCHEXT_PROF_ARM 0x00410000 +CONSTANT: PT_ARM_ARCHEXT_PROF_RT 0x00520000 +CONSTANT: PT_ARM_ARCHEXT_PROF_MC 0x004d0000 +CONSTANT: PT_ARM_ARCHEXT_PROF_CLASSIC 0x00530000 + +CONSTANT: PT_ARM_ARCHEXT_ARCH_UNKN 0x00 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv4 0x01 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv4T 0x02 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv5T 0x03 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv5TE 0x04 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv5TEJ 0x05 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6 0x06 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6KZ 0x07 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6T2 0x08 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6K 0x09 +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv7 0x0A +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6M 0x0B +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv6SM 0x0C +CONSTANT: PT_ARM_ARCHEXT_ARCH_ARCHv7EM 0x0D CONSTANT: PF_X 1 CONSTANT: PF_W 2 CONSTANT: PF_R 4 -CONSTANT: PF_MASKOS HEX: 00ff0000 -CONSTANT: PF_MASKPROC HEX: ff000000 +CONSTANT: PF_MASKOS 0x00ff0000 +CONSTANT: PF_MASKPROC 0xff000000 CONSTANT: DT_NULL 0 CONSTANT: DT_NEEDED 1 @@ -322,14 +322,14 @@ CONSTANT: DT_FLAGS 30 CONSTANT: DT_ENCODING 32 CONSTANT: DT_PREINIT_ARRAY 32 CONSTANT: DT_PREINIT_ARRAYSZ 33 -CONSTANT: DT_LOOS HEX: 60000000 -CONSTANT: DT_HIOS HEX: 6fffffff -CONSTANT: DT_LOPROC HEX: 70000000 -CONSTANT: DT_ARM_RESERVED1 HEX: 70000000 -CONSTANT: DT_ARM_SYMTABSZ HEX: 70000001 -CONSTANT: DT_ARM_PREEMPTYMAP HEX: 70000002 -CONSTANT: DT_ARM_RESERVED2 HEX: 70000003 -CONSTANT: DT_HIPROC HEX: 7fffffff +CONSTANT: DT_LOOS 0x60000000 +CONSTANT: DT_HIOS 0x6fffffff +CONSTANT: DT_LOPROC 0x70000000 +CONSTANT: DT_ARM_RESERVED1 0x70000000 +CONSTANT: DT_ARM_SYMTABSZ 0x70000001 +CONSTANT: DT_ARM_PREEMPTYMAP 0x70000002 +CONSTANT: DT_ARM_RESERVED2 0x70000003 +CONSTANT: DT_HIPROC 0x7fffffff TYPEDEF: ushort Elf32_Half TYPEDEF: uint Elf32_Word diff --git a/extra/gdbm/ffi/ffi.factor b/extra/gdbm/ffi/ffi.factor index 0283431d5c..2fac072195 100755 --- a/extra/gdbm/ffi/ffi.factor +++ b/extra/gdbm/ffi/ffi.factor @@ -14,8 +14,8 @@ LIBRARY: libgdbm C-GLOBAL: c-string gdbm_version -CONSTANT: GDBM_SYNC HEX: 20 -CONSTANT: GDBM_NOLOCK HEX: 40 +CONSTANT: GDBM_SYNC 0x20 +CONSTANT: GDBM_NOLOCK 0x40 CONSTANT: GDBM_INSERT 0 CONSTANT: GDBM_REPLACE 1 diff --git a/extra/gdbm/gdbm.factor b/extra/gdbm/gdbm.factor index 9e620fa793..a69809f4e3 100644 --- a/extra/gdbm/gdbm.factor +++ b/extra/gdbm/gdbm.factor @@ -14,7 +14,7 @@ TUPLE: gdbm { role initial: wrcreat } { sync boolean } { nolock boolean } - { mode integer initial: OCT: 644 } ; + { mode integer initial: 0o644 } ; : ( -- gdbm ) gdbm new ; diff --git a/extra/geo-ip/geo-ip.factor b/extra/geo-ip/geo-ip.factor index e9e0902e48..c0011dd276 100644 --- a/extra/geo-ip/geo-ip.factor +++ b/extra/geo-ip/geo-ip.factor @@ -50,7 +50,7 @@ GENERIC: lookup-ip ( ip -- ip-entry ) M: string lookup-ip "." split [ string>number ] map - { HEX: 1000000 HEX: 10000 HEX: 100 HEX: 1 } v. + { 0x1000000 0x10000 0x100 0x1 } v. lookup-ip ; M: integer lookup-ip ip-intervals interval-at ; diff --git a/extra/gpu/state/state.factor b/extra/gpu/state/state.factor index d92a04d308..0f2ce7cb46 100755 --- a/extra/gpu/state/state.factor +++ b/extra/gpu/state/state.factor @@ -36,7 +36,7 @@ VARIANT: stencil-op TUPLE: stencil-mode { value integer initial: 0 read-only } - { mask integer initial: HEX: FFFFFFFF read-only } + { mask integer initial: 0xFFFFFFFF read-only } { comparison comparison initial: cmp-always read-only } { stencil-fail-op stencil-op initial: op-keep read-only } { depth-fail-op stencil-op initial: op-keep read-only } @@ -88,8 +88,8 @@ C: blend-state TUPLE: mask-state { color sequence initial: { t t t t } read-only } { depth boolean initial: t read-only } - { stencil-front integer initial: HEX: FFFFFFFF read-only } - { stencil-back integer initial: HEX: FFFFFFFF read-only } ; + { stencil-front integer initial: 0xFFFFFFFF read-only } + { stencil-back integer initial: 0xFFFFFFFF read-only } ; C: mask-state VARIANT: triangle-face diff --git a/extra/icfp/2006/2006.factor b/extra/icfp/2006/2006.factor index 819154f509..e50fa59617 100644 --- a/extra/icfp/2006/2006.factor +++ b/extra/icfp/2006/2006.factor @@ -21,26 +21,26 @@ SYMBOL: open-arrays arrays get nth set-nth ; : get-op ( num -- op ) - -28 shift BIN: 1111 bitand ; + -28 shift 0b1111 bitand ; : get-value ( platter -- register ) - HEX: 1ffffff bitand ; + 0x1ffffff bitand ; -: >32bit ( m -- n ) HEX: ffffffff bitand ; inline +: >32bit ( m -- n ) 0xffffffff bitand ; inline : get-a ( platter -- register ) - -6 shift BIN: 111 bitand ; inline + -6 shift 0b111 bitand ; inline : get-b ( platter -- register ) - -3 shift BIN: 111 bitand ; inline + -3 shift 0b111 bitand ; inline : get-c ( platter -- register ) - BIN: 111 bitand ; inline + 0b111 bitand ; inline : get-cb ( platter -- b c ) [ get-c ] keep get-b ; : get-cba ( platter -- c b a ) [ get-cb ] keep get-a ; : get-special ( platter -- register ) - -25 shift BIN: 111 bitand ; inline + -25 shift 0b111 bitand ; inline : op0 ( opcode -- ? ) get-cba rot reg-val zero? [ @@ -70,7 +70,7 @@ SYMBOL: open-arrays [ /i ] binary-op ; : op6 ( opcode -- ? ) - [ bitand HEX: ffffffff swap - ] binary-op ; + [ bitand 0xffffffff swap - ] binary-op ; : new-array ( size location -- ) [ 0 ] dip arrays get set-nth ; diff --git a/extra/id3/id3.factor b/extra/id3/id3.factor index 9c25c2cb57..f1ee221061 100644 --- a/extra/id3/id3.factor +++ b/extra/id3/id3.factor @@ -106,7 +106,7 @@ CONSTANT: id3v1+-length 227 : synchsafe>seq ( n -- seq ) dup 1 + log2 1 + 7 / ceiling - [ [ -7 shift ] keep HEX: 7f bitand ] replicate nip reverse ; + [ [ -7 shift ] keep 0x7f bitand ] replicate nip reverse ; : filter-text-data ( data -- filtered ) [ printable? ] filter ; @@ -119,7 +119,7 @@ CONSTANT: id3v1+-length 227 : decode-text ( string -- string' ) dup 2 short head - { { HEX: ff HEX: fe } { HEX: fe HEX: ff } } member? + { { 0xff 0xfe } { 0xfe 0xff } } member? utf16 ascii ? decode ; : (read-frame) ( seq -- frame ) diff --git a/extra/images/bitmap/bitmap.factor b/extra/images/bitmap/bitmap.factor index b2fa51745d..92b81fc051 100644 --- a/extra/images/bitmap/bitmap.factor +++ b/extra/images/bitmap/bitmap.factor @@ -283,9 +283,9 @@ ERROR: bmp-not-supported n ; ! ushort cast-array 2 group [ le> ] map ! 5 6 5 - ! { HEX: f800 HEX: 7e0 HEX: 1f } uncompress-bitfield + ! { 0xf800 0x7e0 0x1f } uncompress-bitfield ! 5 5 5 - { HEX: 7c00 HEX: 3e0 HEX: 1f } uncompress-bitfield + { 0x7c00 0x3e0 0x1f } uncompress-bitfield ] change-color-index color-index>> ] } @@ -298,7 +298,7 @@ ERROR: bmp-not-supported n ; : set-bitfield-widths ( loading-bitmap -- loading-bitmap' ) dup header>> bit-count>> { { 16 [ dup color-palette>> 4 group [ le> ] map ] } - { 32 [ { HEX: ff0000 HEX: ff00 HEX: ff } ] } + { 32 [ { 0xff0000 0xff00 0xff } ] } } case reverse >>bitfields ; ERROR: unsupported-bitfield-widths n ; diff --git a/extra/images/gif/gif.factor b/extra/images/gif/gif.factor index 8d4b118d16..acdb5687e7 100644 --- a/extra/images/gif/gif.factor +++ b/extra/images/gif/gif.factor @@ -55,16 +55,16 @@ introducer label comment-data ; TUPLE: trailer byte ; CONSTRUCTOR: trailer ( byte -- obj ) ; -CONSTANT: image-descriptor HEX: 2c +CONSTANT: image-descriptor 0x2c ! Extensions -CONSTANT: extension-identifier HEX: 21 -CONSTANT: plain-text-extension HEX: 01 -CONSTANT: graphic-control-extension HEX: f9 -CONSTANT: comment-extension HEX: fe -CONSTANT: application-extension HEX: ff -CONSTANT: trailer HEX: 3b -CONSTANT: graphic-control-extension-block-size HEX: 04 -CONSTANT: block-terminator HEX: 00 +CONSTANT: extension-identifier 0x21 +CONSTANT: plain-text-extension 0x01 +CONSTANT: graphic-control-extension 0xf9 +CONSTANT: comment-extension 0xfe +CONSTANT: application-extension 0xff +CONSTANT: trailer 0x3b +CONSTANT: graphic-control-extension-block-size 0x04 +CONSTANT: block-terminator 0x00 : ( -- loading-gif ) \ loading-gif new diff --git a/extra/images/png/png.factor b/extra/images/png/png.factor index 2c4ff948f9..f98eeedd77 100644 --- a/extra/images/png/png.factor +++ b/extra/images/png/png.factor @@ -50,7 +50,7 @@ TUPLE: png-chunk length type data ; png-chunk new ; inline CONSTANT: png-header - B{ HEX: 89 HEX: 50 HEX: 4e HEX: 47 HEX: 0d HEX: 0a HEX: 1a HEX: 0a } + B{ 0x89 0x50 0x4e 0x47 0x0d 0x0a 0x1a 0x0a } ERROR: bad-png-header header ; diff --git a/extra/ini-file/ini-file.factor b/extra/ini-file/ini-file.factor index 51a309b121..6a4a537784 100644 --- a/extra/ini-file/ini-file.factor +++ b/extra/ini-file/ini-file.factor @@ -12,12 +12,12 @@ IN: ini-file : escape ( ch -- ch' ) H{ { CHAR: a CHAR: \a } - { CHAR: b HEX: 08 } ! \b - { CHAR: f HEX: 0c } ! \f + { CHAR: b 0x08 } ! \b + { CHAR: f 0x0c } ! \f { CHAR: n CHAR: \n } { CHAR: r CHAR: \r } { CHAR: t CHAR: \t } - { CHAR: v HEX: 0b } ! \v + { CHAR: v 0x0b } ! \v { CHAR: ' CHAR: ' } { CHAR: " CHAR: " } { CHAR: \\ CHAR: \\ } @@ -43,12 +43,12 @@ USE: xml.entities : escape-string ( str -- str' ) H{ { CHAR: \a "\\a" } - { HEX: 08 "\\b" } - { HEX: 0c "\\f" } + { 0x08 "\\b" } + { 0x0c "\\f" } { CHAR: \n "\\n" } { CHAR: \r "\\r" } { CHAR: \t "\\t" } - { HEX: 0b "\\v" } + { 0x0b "\\v" } { CHAR: ' "\\'" } { CHAR: " "\\\"" } { CHAR: \\ "\\\\" } @@ -65,8 +65,8 @@ USE: xml.entities [ CHAR: \t = ] [ CHAR: \n = ] [ CHAR: \r = ] - [ HEX: 0c = ] ! \f - [ HEX: 0b = ] ! \v + [ 0x0c = ] ! \f + [ 0x0b = ] ! \v } 1|| ; : unspace ( str -- str' ) diff --git a/extra/io/binary/fast/fast-tests.factor b/extra/io/binary/fast/fast-tests.factor index ce2ff093b9..575c13012a 100644 --- a/extra/io/binary/fast/fast-tests.factor +++ b/extra/io/binary/fast/fast-tests.factor @@ -3,11 +3,11 @@ USING: tools.test io.binary.fast ; IN: io.binary.fast.tests -[ HEX: 0102 ] [ B{ 01 02 } 2be> ] unit-test -[ HEX: 01020304 ] [ B{ 01 02 03 04 } 4be> ] unit-test -[ HEX: 0102030405060708 ] [ B{ 01 02 03 04 05 06 07 08 } 8be> ] unit-test +[ 0x0102 ] [ B{ 01 02 } 2be> ] unit-test +[ 0x01020304 ] [ B{ 01 02 03 04 } 4be> ] unit-test +[ 0x0102030405060708 ] [ B{ 01 02 03 04 05 06 07 08 } 8be> ] unit-test -[ HEX: 0102 ] [ B{ 02 01 } 2le> ] unit-test -[ HEX: 01020304 ] [ B{ 04 03 02 01 } 4le> ] unit-test -[ HEX: 0102030405060708 ] [ B{ 08 07 06 05 04 03 02 01 } 8le> ] unit-test +[ 0x0102 ] [ B{ 02 01 } 2le> ] unit-test +[ 0x01020304 ] [ B{ 04 03 02 01 } 4le> ] unit-test +[ 0x0102030405060708 ] [ B{ 08 07 06 05 04 03 02 01 } 8le> ] unit-test diff --git a/extra/io/files/trash/macosx/macosx.factor b/extra/io/files/trash/macosx/macosx.factor index 42a1509993..61bd4812f9 100644 --- a/extra/io/files/trash/macosx/macosx.factor +++ b/extra/io/files/trash/macosx/macosx.factor @@ -17,14 +17,14 @@ TYPEDEF: UInt32 OptionBits CONSTANT: noErr 0 -CONSTANT: kFSFileOperationDefaultOptions HEX: 00 -CONSTANT: kFSFileOperationOverwrite HEX: 01 -CONSTANT: kFSFileOperationSkipSourcePermissionErrors HEX: 02 -CONSTANT: kFSFileOperationDoNotMoveAcrossVolumes HEX: 04 -CONSTANT: kFSFileOperationSkipPreflight HEX: 08 - -CONSTANT: kFSPathMakeRefDefaultOptions HEX: 00 -CONSTANT: kFSPathMakeRefDoNotFollowLeafSymlink HEX: 01 +CONSTANT: kFSFileOperationDefaultOptions 0x00 +CONSTANT: kFSFileOperationOverwrite 0x01 +CONSTANT: kFSFileOperationSkipSourcePermissionErrors 0x02 +CONSTANT: kFSFileOperationDoNotMoveAcrossVolumes 0x04 +CONSTANT: kFSFileOperationSkipPreflight 0x08 + +CONSTANT: kFSPathMakeRefDefaultOptions 0x00 +CONSTANT: kFSPathMakeRefDoNotFollowLeafSymlink 0x01 FUNCTION: OSStatus FSMoveObjectToTrashSync ( FSRef* source, diff --git a/extra/io/files/trash/unix/unix.factor b/extra/io/files/trash/unix/unix.factor index e8b8489cdb..f451891311 100644 --- a/extra/io/files/trash/unix/unix.factor +++ b/extra/io/files/trash/unix/unix.factor @@ -21,7 +21,7 @@ IN: io.files.trash.unix [ dup top-directory? not ] [ ".." append-path ] while ; : make-user-directory ( path -- ) - [ make-directories ] [ OCT: 700 set-file-permissions ] bi ; + [ make-directories ] [ 0o700 set-file-permissions ] bi ; : check-trash-path ( path -- ) { diff --git a/extra/io/files/trash/windows/windows.factor b/extra/io/files/trash/windows/windows.factor index ce14cfa6c2..1e198d3c9a 100644 --- a/extra/io/files/trash/windows/windows.factor +++ b/extra/io/files/trash/windows/windows.factor @@ -26,27 +26,27 @@ PACKED-STRUCT: SHFILEOPSTRUCTW FUNCTION: int SHFileOperationW ( SHFILEOPSTRUCTW* lpFileOp ) ; -CONSTANT: FO_MOVE HEX: 0001 -CONSTANT: FO_COPY HEX: 0002 -CONSTANT: FO_DELETE HEX: 0003 -CONSTANT: FO_RENAME HEX: 0004 - -CONSTANT: FOF_MULTIDESTFILES HEX: 0001 -CONSTANT: FOF_CONFIRMMOUSE HEX: 0002 -CONSTANT: FOF_SILENT HEX: 0004 -CONSTANT: FOF_RENAMEONCOLLISION HEX: 0008 -CONSTANT: FOF_NOCONFIRMATION HEX: 0010 -CONSTANT: FOF_WANTMAPPINGHANDLE HEX: 0020 -CONSTANT: FOF_ALLOWUNDO HEX: 0040 -CONSTANT: FOF_FILESONLY HEX: 0080 -CONSTANT: FOF_SIMPLEPROGRESS HEX: 0100 -CONSTANT: FOF_NOCONFIRMMKDIR HEX: 0200 -CONSTANT: FOF_NOERRORUI HEX: 0400 -CONSTANT: FOF_NOCOPYSECURITYATTRIBS HEX: 0800 -CONSTANT: FOF_NORECURSION HEX: 1000 -CONSTANT: FOF_NO_CONNECTED_ELEMENTS HEX: 2000 -CONSTANT: FOF_WANTNUKEWARNING HEX: 4000 -CONSTANT: FOF_NORECURSEREPARSE HEX: 8000 +CONSTANT: FO_MOVE 0x0001 +CONSTANT: FO_COPY 0x0002 +CONSTANT: FO_DELETE 0x0003 +CONSTANT: FO_RENAME 0x0004 + +CONSTANT: FOF_MULTIDESTFILES 0x0001 +CONSTANT: FOF_CONFIRMMOUSE 0x0002 +CONSTANT: FOF_SILENT 0x0004 +CONSTANT: FOF_RENAMEONCOLLISION 0x0008 +CONSTANT: FOF_NOCONFIRMATION 0x0010 +CONSTANT: FOF_WANTMAPPINGHANDLE 0x0020 +CONSTANT: FOF_ALLOWUNDO 0x0040 +CONSTANT: FOF_FILESONLY 0x0080 +CONSTANT: FOF_SIMPLEPROGRESS 0x0100 +CONSTANT: FOF_NOCONFIRMMKDIR 0x0200 +CONSTANT: FOF_NOERRORUI 0x0400 +CONSTANT: FOF_NOCOPYSECURITYATTRIBS 0x0800 +CONSTANT: FOF_NORECURSION 0x1000 +CONSTANT: FOF_NO_CONNECTED_ELEMENTS 0x2000 +CONSTANT: FOF_WANTNUKEWARNING 0x4000 +CONSTANT: FOF_NORECURSEREPARSE 0x8000 PRIVATE> diff --git a/extra/io/serial/linux/ffi/ffi.factor b/extra/io/serial/linux/ffi/ffi.factor index bcd0b02be9..158f38aa12 100644 --- a/extra/io/serial/linux/ffi/ffi.factor +++ b/extra/io/serial/linux/ffi/ffi.factor @@ -47,115 +47,115 @@ CONSTANT: TCIOFF 2 CONSTANT: TCION 3 ! iflag -CONSTANT: IGNBRK OCT: 0000001 -CONSTANT: BRKINT OCT: 0000002 -CONSTANT: IGNPAR OCT: 0000004 -CONSTANT: PARMRK OCT: 0000010 -CONSTANT: INPCK OCT: 0000020 -CONSTANT: ISTRIP OCT: 0000040 -CONSTANT: INLCR OCT: 0000100 -CONSTANT: IGNCR OCT: 0000200 -CONSTANT: ICRNL OCT: 0000400 -CONSTANT: IUCLC OCT: 0001000 -CONSTANT: IXON OCT: 0002000 -CONSTANT: IXANY OCT: 0004000 -CONSTANT: IXOFF OCT: 0010000 -CONSTANT: IMAXBEL OCT: 0020000 -CONSTANT: IUTF8 OCT: 0040000 +CONSTANT: IGNBRK 0o0000001 +CONSTANT: BRKINT 0o0000002 +CONSTANT: IGNPAR 0o0000004 +CONSTANT: PARMRK 0o0000010 +CONSTANT: INPCK 0o0000020 +CONSTANT: ISTRIP 0o0000040 +CONSTANT: INLCR 0o0000100 +CONSTANT: IGNCR 0o0000200 +CONSTANT: ICRNL 0o0000400 +CONSTANT: IUCLC 0o0001000 +CONSTANT: IXON 0o0002000 +CONSTANT: IXANY 0o0004000 +CONSTANT: IXOFF 0o0010000 +CONSTANT: IMAXBEL 0o0020000 +CONSTANT: IUTF8 0o0040000 ! oflag -CONSTANT: OPOST OCT: 0000001 -CONSTANT: OLCUC OCT: 0000002 -CONSTANT: ONLCR OCT: 0000004 -CONSTANT: OCRNL OCT: 0000010 -CONSTANT: ONOCR OCT: 0000020 -CONSTANT: ONLRET OCT: 0000040 -CONSTANT: OFILL OCT: 0000100 -CONSTANT: OFDEL OCT: 0000200 -CONSTANT: NLDLY OCT: 0000400 -CONSTANT: NL0 OCT: 0000000 -CONSTANT: NL1 OCT: 0000400 -CONSTANT: CRDLY OCT: 0003000 -CONSTANT: CR0 OCT: 0000000 -CONSTANT: CR1 OCT: 0001000 -CONSTANT: CR2 OCT: 0002000 -CONSTANT: CR3 OCT: 0003000 -CONSTANT: TABDLY OCT: 0014000 -CONSTANT: TAB0 OCT: 0000000 -CONSTANT: TAB1 OCT: 0004000 -CONSTANT: TAB2 OCT: 0010000 -CONSTANT: TAB3 OCT: 0014000 -CONSTANT: BSDLY OCT: 0020000 -CONSTANT: BS0 OCT: 0000000 -CONSTANT: BS1 OCT: 0020000 -CONSTANT: FFDLY OCT: 0100000 -CONSTANT: FF0 OCT: 0000000 -CONSTANT: FF1 OCT: 0100000 +CONSTANT: OPOST 0o0000001 +CONSTANT: OLCUC 0o0000002 +CONSTANT: ONLCR 0o0000004 +CONSTANT: OCRNL 0o0000010 +CONSTANT: ONOCR 0o0000020 +CONSTANT: ONLRET 0o0000040 +CONSTANT: OFILL 0o0000100 +CONSTANT: OFDEL 0o0000200 +CONSTANT: NLDLY 0o0000400 +CONSTANT: NL0 0o0000000 +CONSTANT: NL1 0o0000400 +CONSTANT: CRDLY 0o0003000 +CONSTANT: CR0 0o0000000 +CONSTANT: CR1 0o0001000 +CONSTANT: CR2 0o0002000 +CONSTANT: CR3 0o0003000 +CONSTANT: TABDLY 0o0014000 +CONSTANT: TAB0 0o0000000 +CONSTANT: TAB1 0o0004000 +CONSTANT: TAB2 0o0010000 +CONSTANT: TAB3 0o0014000 +CONSTANT: BSDLY 0o0020000 +CONSTANT: BS0 0o0000000 +CONSTANT: BS1 0o0020000 +CONSTANT: FFDLY 0o0100000 +CONSTANT: FF0 0o0000000 +CONSTANT: FF1 0o0100000 ! cflags -CONSTANT: CSIZE OCT: 0000060 -CONSTANT: CS5 OCT: 0000000 -CONSTANT: CS6 OCT: 0000020 -CONSTANT: CS7 OCT: 0000040 -CONSTANT: CS8 OCT: 0000060 -CONSTANT: CSTOPB OCT: 0000100 -CONSTANT: CREAD OCT: 0000200 -CONSTANT: PARENB OCT: 0000400 -CONSTANT: PARODD OCT: 0001000 -CONSTANT: HUPCL OCT: 0002000 -CONSTANT: CLOCAL OCT: 0004000 -CONSTANT: CIBAUD OCT: 002003600000 -CONSTANT: CRTSCTS OCT: 020000000000 +CONSTANT: CSIZE 0o0000060 +CONSTANT: CS5 0o0000000 +CONSTANT: CS6 0o0000020 +CONSTANT: CS7 0o0000040 +CONSTANT: CS8 0o0000060 +CONSTANT: CSTOPB 0o0000100 +CONSTANT: CREAD 0o0000200 +CONSTANT: PARENB 0o0000400 +CONSTANT: PARODD 0o0001000 +CONSTANT: HUPCL 0o0002000 +CONSTANT: CLOCAL 0o0004000 +CONSTANT: CIBAUD 0o002003600000 +CONSTANT: CRTSCTS 0o020000000000 ! lflags -CONSTANT: ISIG OCT: 0000001 -CONSTANT: ICANON OCT: 0000002 -CONSTANT: XCASE OCT: 0000004 -CONSTANT: ECHO OCT: 0000010 -CONSTANT: ECHOE OCT: 0000020 -CONSTANT: ECHOK OCT: 0000040 -CONSTANT: ECHONL OCT: 0000100 -CONSTANT: NOFLSH OCT: 0000200 -CONSTANT: TOSTOP OCT: 0000400 -CONSTANT: ECHOCTL OCT: 0001000 -CONSTANT: ECHOPRT OCT: 0002000 -CONSTANT: ECHOKE OCT: 0004000 -CONSTANT: FLUSHO OCT: 0010000 -CONSTANT: PENDIN OCT: 0040000 -CONSTANT: IEXTEN OCT: 0100000 +CONSTANT: ISIG 0o0000001 +CONSTANT: ICANON 0o0000002 +CONSTANT: XCASE 0o0000004 +CONSTANT: ECHO 0o0000010 +CONSTANT: ECHOE 0o0000020 +CONSTANT: ECHOK 0o0000040 +CONSTANT: ECHONL 0o0000100 +CONSTANT: NOFLSH 0o0000200 +CONSTANT: TOSTOP 0o0000400 +CONSTANT: ECHOCTL 0o0001000 +CONSTANT: ECHOPRT 0o0002000 +CONSTANT: ECHOKE 0o0004000 +CONSTANT: FLUSHO 0o0010000 +CONSTANT: PENDIN 0o0040000 +CONSTANT: IEXTEN 0o0100000 M: linux lookup-baud ( n -- n ) H{ - { 0 OCT: 0000000 } - { 50 OCT: 0000001 } - { 75 OCT: 0000002 } - { 110 OCT: 0000003 } - { 134 OCT: 0000004 } - { 150 OCT: 0000005 } - { 200 OCT: 0000006 } - { 300 OCT: 0000007 } - { 600 OCT: 0000010 } - { 1200 OCT: 0000011 } - { 1800 OCT: 0000012 } - { 2400 OCT: 0000013 } - { 4800 OCT: 0000014 } - { 9600 OCT: 0000015 } - { 19200 OCT: 0000016 } - { 38400 OCT: 0000017 } - { 57600 OCT: 0010001 } - { 115200 OCT: 0010002 } - { 230400 OCT: 0010003 } - { 460800 OCT: 0010004 } - { 500000 OCT: 0010005 } - { 576000 OCT: 0010006 } - { 921600 OCT: 0010007 } - { 1000000 OCT: 0010010 } - { 1152000 OCT: 0010011 } - { 1500000 OCT: 0010012 } - { 2000000 OCT: 0010013 } - { 2500000 OCT: 0010014 } - { 3000000 OCT: 0010015 } - { 3500000 OCT: 0010016 } - { 4000000 OCT: 0010017 } + { 0 0o0000000 } + { 50 0o0000001 } + { 75 0o0000002 } + { 110 0o0000003 } + { 134 0o0000004 } + { 150 0o0000005 } + { 200 0o0000006 } + { 300 0o0000007 } + { 600 0o0000010 } + { 1200 0o0000011 } + { 1800 0o0000012 } + { 2400 0o0000013 } + { 4800 0o0000014 } + { 9600 0o0000015 } + { 19200 0o0000016 } + { 38400 0o0000017 } + { 57600 0o0010001 } + { 115200 0o0010002 } + { 230400 0o0010003 } + { 460800 0o0010004 } + { 500000 0o0010005 } + { 576000 0o0010006 } + { 921600 0o0010007 } + { 1000000 0o0010010 } + { 1152000 0o0010011 } + { 1500000 0o0010012 } + { 2000000 0o0010013 } + { 2500000 0o0010014 } + { 3000000 0o0010015 } + { 3500000 0o0010016 } + { 4000000 0o0010017 } } ?at [ invalid-baud ] unless ; diff --git a/extra/libusb/libusb.factor b/extra/libusb/libusb.factor index 4d6202cad0..0dd1831444 100644 --- a/extra/libusb/libusb.factor +++ b/extra/libusb/libusb.factor @@ -29,18 +29,18 @@ ENUM: libusb_class_code { LIBUSB_CLASS_MASS_STORAGE 8 } { LIBUSB_CLASS_HUB 9 } { LIBUSB_CLASS_DATA 10 } - { LIBUSB_CLASS_VENDOR_SPEC HEX: ff } ; + { LIBUSB_CLASS_VENDOR_SPEC 0xff } ; ENUM: libusb_descriptor_type - { LIBUSB_DT_DEVICE HEX: 01 } - { LIBUSB_DT_CONFIG HEX: 02 } - { LIBUSB_DT_STRING HEX: 03 } - { LIBUSB_DT_INTERFACE HEX: 04 } - { LIBUSB_DT_ENDPOINT HEX: 05 } - { LIBUSB_DT_HID HEX: 21 } - { LIBUSB_DT_REPORT HEX: 22 } - { LIBUSB_DT_PHYSICAL HEX: 23 } - { LIBUSB_DT_HUB HEX: 29 } ; + { LIBUSB_DT_DEVICE 0x01 } + { LIBUSB_DT_CONFIG 0x02 } + { LIBUSB_DT_STRING 0x03 } + { LIBUSB_DT_INTERFACE 0x04 } + { LIBUSB_DT_ENDPOINT 0x05 } + { LIBUSB_DT_HID 0x21 } + { LIBUSB_DT_REPORT 0x22 } + { LIBUSB_DT_PHYSICAL 0x23 } + { LIBUSB_DT_HUB 0x29 } ; CONSTANT: LIBUSB_DT_DEVICE_SIZE 18 CONSTANT: LIBUSB_DT_CONFIG_SIZE 9 @@ -49,14 +49,14 @@ CONSTANT: LIBUSB_DT_ENDPOINT_SIZE 7 CONSTANT: LIBUSB_DT_ENDPOINT_AUDIO_SIZE 9 CONSTANT: LIBUSB_DT_HUB_NONVAR_SIZE 7 -CONSTANT: LIBUSB_ENDPOINT_ADDRESS_MASK HEX: 0f -CONSTANT: LIBUSB_ENDPOINT_DIR_MASK HEX: 80 +CONSTANT: LIBUSB_ENDPOINT_ADDRESS_MASK 0x0f +CONSTANT: LIBUSB_ENDPOINT_DIR_MASK 0x80 ENUM: libusb_endpoint_direction - { LIBUSB_ENDPOINT_IN HEX: 80 } - { LIBUSB_ENDPOINT_OUT HEX: 00 } ; + { LIBUSB_ENDPOINT_IN 0x80 } + { LIBUSB_ENDPOINT_OUT 0x00 } ; -CONSTANT: LIBUSB_TRANSFER_TYPE_MASK HEX: 03 +CONSTANT: LIBUSB_TRANSFER_TYPE_MASK 0x03 ENUM: libusb_transfer_type { LIBUSB_TRANSFER_TYPE_CONTROL 0 } @@ -65,31 +65,31 @@ ENUM: libusb_transfer_type { LIBUSB_TRANSFER_TYPE_INTERRUPT 3 } ; ENUM: libusb_standard_request - { LIBUSB_REQUEST_GET_STATUS HEX: 00 } - { LIBUSB_REQUEST_CLEAR_FEATURE HEX: 01 } - { LIBUSB_REQUEST_SET_FEATURE HEX: 03 } - { LIBUSB_REQUEST_SET_ADDRESS HEX: 05 } - { LIBUSB_REQUEST_GET_DESCRIPTOR HEX: 06 } - { LIBUSB_REQUEST_SET_DESCRIPTOR HEX: 07 } - { LIBUSB_REQUEST_GET_CONFIGURATION HEX: 08 } - { LIBUSB_REQUEST_SET_CONFIGURATION HEX: 09 } - { LIBUSB_REQUEST_GET_INTERFACE HEX: 0A } - { LIBUSB_REQUEST_SET_INTERFACE HEX: 0B } - { LIBUSB_REQUEST_SYNCH_FRAME HEX: 0C } ; + { LIBUSB_REQUEST_GET_STATUS 0x00 } + { LIBUSB_REQUEST_CLEAR_FEATURE 0x01 } + { LIBUSB_REQUEST_SET_FEATURE 0x03 } + { LIBUSB_REQUEST_SET_ADDRESS 0x05 } + { LIBUSB_REQUEST_GET_DESCRIPTOR 0x06 } + { LIBUSB_REQUEST_SET_DESCRIPTOR 0x07 } + { LIBUSB_REQUEST_GET_CONFIGURATION 0x08 } + { LIBUSB_REQUEST_SET_CONFIGURATION 0x09 } + { LIBUSB_REQUEST_GET_INTERFACE 0x0A } + { LIBUSB_REQUEST_SET_INTERFACE 0x0B } + { LIBUSB_REQUEST_SYNCH_FRAME 0x0C } ; ENUM: libusb_request_type - { LIBUSB_REQUEST_TYPE_STANDARD HEX: 00 } - { LIBUSB_REQUEST_TYPE_CLASS HEX: 20 } - { LIBUSB_REQUEST_TYPE_VENDOR HEX: 40 } - { LIBUSB_REQUEST_TYPE_RESERVED HEX: 60 } ; + { LIBUSB_REQUEST_TYPE_STANDARD 0x00 } + { LIBUSB_REQUEST_TYPE_CLASS 0x20 } + { LIBUSB_REQUEST_TYPE_VENDOR 0x40 } + { LIBUSB_REQUEST_TYPE_RESERVED 0x60 } ; ENUM: libusb_request_recipient - { LIBUSB_RECIPIENT_DEVICE HEX: 00 } - { LIBUSB_RECIPIENT_INTERFACE HEX: 01 } - { LIBUSB_RECIPIENT_ENDPOINT HEX: 02 } - { LIBUSB_RECIPIENT_OTHER HEX: 03 } ; + { LIBUSB_RECIPIENT_DEVICE 0x00 } + { LIBUSB_RECIPIENT_INTERFACE 0x01 } + { LIBUSB_RECIPIENT_ENDPOINT 0x02 } + { LIBUSB_RECIPIENT_OTHER 0x03 } ; -CONSTANT: LIBUSB_ISO_SYNC_TYPE_MASK HEX: 0C +CONSTANT: LIBUSB_ISO_SYNC_TYPE_MASK 0x0C ENUM: libusb_iso_sync_type { LIBUSB_ISO_SYNC_TYPE_NONE 0 } @@ -97,7 +97,7 @@ ENUM: libusb_iso_sync_type { LIBUSB_ISO_SYNC_TYPE_ADAPTIVE 2 } { LIBUSB_ISO_SYNC_TYPE_SYNC 3 } ; -CONSTANT: LIBUSB_ISO_USAGE_TYPE_MASK HEX: 30 +CONSTANT: LIBUSB_ISO_USAGE_TYPE_MASK 0x30 ENUM: libusb_iso_usage_type { LIBUSB_ISO_USAGE_TYPE_DATA 0 } diff --git a/extra/llvm/clang/ffi/ffi.factor b/extra/llvm/clang/ffi/ffi.factor index 78c0407a9e..e9a83ba67e 100644 --- a/extra/llvm/clang/ffi/ffi.factor +++ b/extra/llvm/clang/ffi/ffi.factor @@ -97,12 +97,12 @@ FUNCTION: CXDiagnostic clang_getDiagnostic ( CXTranslationUnit Unit, FUNCTION: void clang_disposeDiagnostic ( CXDiagnostic Diagnostic ) ; ENUM: CXDiagnosticDisplayOptions - { CXDiagnostic_DisplaySourceLocation HEX: 01 } - { CXDiagnostic_DisplayColumn HEX: 02 } - { CXDiagnostic_DisplaySourceRanges HEX: 04 } - { CXDiagnostic_DisplayOption HEX: 08 } - { CXDiagnostic_DisplayCategoryId HEX: 10 } - { CXDiagnostic_DisplayCategoryName HEX: 20 } ; + { CXDiagnostic_DisplaySourceLocation 0x01 } + { CXDiagnostic_DisplayColumn 0x02 } + { CXDiagnostic_DisplaySourceRanges 0x04 } + { CXDiagnostic_DisplayOption 0x08 } + { CXDiagnostic_DisplayCategoryId 0x10 } + { CXDiagnostic_DisplayCategoryName 0x20 } ; FUNCTION: CXString clang_formatDiagnostic ( CXDiagnostic Diagnostic, uint Options ) ; @@ -130,14 +130,14 @@ FUNCTION: CXTranslationUnit clang_createTranslationUnitFromSourceFile ( CXIndex FUNCTION: CXTranslationUnit clang_createTranslationUnit ( CXIndex CIdx, c-string ast_filename ) ; ENUM: CXTranslationUnit_Flags - { CXTranslationUnit_None HEX: 00 } - { CXTranslationUnit_DetailedPreprocessingRecord HEX: 01 } - { CXTranslationUnit_Incomplete HEX: 02 } - { CXTranslationUnit_PrecompiledPreamble HEX: 04 } - { CXTranslationUnit_CacheCompletionResults HEX: 08 } - { CXTranslationUnit_CXXPrecompiledPreamble HEX: 10 } - { CXTranslationUnit_CXXChainedPCH HEX: 20 } - { CXTranslationUnit_NestedMacroInstantiations HEX: 40 } ; + { CXTranslationUnit_None 0x00 } + { CXTranslationUnit_DetailedPreprocessingRecord 0x01 } + { CXTranslationUnit_Incomplete 0x02 } + { CXTranslationUnit_PrecompiledPreamble 0x04 } + { CXTranslationUnit_CacheCompletionResults 0x08 } + { CXTranslationUnit_CXXPrecompiledPreamble 0x10 } + { CXTranslationUnit_CXXChainedPCH 0x20 } + { CXTranslationUnit_NestedMacroInstantiations 0x40 } ; FUNCTION: uint clang_defaultEditingTranslationUnitOptions ( ) ; FUNCTION: CXTranslationUnit clang_parseTranslationUnit ( CXIndex CIdx, diff --git a/extra/llvm/core/core.factor b/extra/llvm/core/core.factor index 4b20655ed4..1fafe05190 100644 --- a/extra/llvm/core/core.factor +++ b/extra/llvm/core/core.factor @@ -29,17 +29,17 @@ TYPEDEF: uint unsigned TYPEDEF: unsigned enum ENUM: LLVMAttribute - { LLVMZExtAttribute BIN: 1 } - { LLVMSExtAttribute BIN: 10 } - { LLVMNoReturnAttribute BIN: 100 } - { LLVMInRegAttribute BIN: 1000 } - { LLVMStructRetAttribute BIN: 10000 } - { LLVMNoUnwindAttribute BIN: 100000 } - { LLVMNoAliasAttribute BIN: 1000000 } - { LLVMByValAttribute BIN: 10000000 } - { LLVMNestAttribute BIN: 100000000 } - { LLVMReadNoneAttribute BIN: 1000000000 } - { LLVMReadOnlyAttribute BIN: 10000000000 } ; + { LLVMZExtAttribute 0b1 } + { LLVMSExtAttribute 0b10 } + { LLVMNoReturnAttribute 0b100 } + { LLVMInRegAttribute 0b1000 } + { LLVMStructRetAttribute 0b10000 } + { LLVMNoUnwindAttribute 0b100000 } + { LLVMNoAliasAttribute 0b1000000 } + { LLVMByValAttribute 0b10000000 } + { LLVMNestAttribute 0b100000000 } + { LLVMReadNoneAttribute 0b1000000000 } + { LLVMReadOnlyAttribute 0b10000000000 } ; ENUM: LLVMTypeKind LLVMVoidTypeKind diff --git a/extra/lunar-rescue/lunar-rescue.factor b/extra/lunar-rescue/lunar-rescue.factor index 1b7ef6bb69..9d267a78ce 100644 --- a/extra/lunar-rescue/lunar-rescue.factor +++ b/extra/lunar-rescue/lunar-rescue.factor @@ -17,12 +17,12 @@ TUPLE: lunar-rescue < space-invaders ; lunar-rescue new cpu-init ; CONSTANT: rom-info { - { HEX: 0000 "lrescue/lrescue.1" } - { HEX: 0800 "lrescue/lrescue.2" } - { HEX: 1000 "lrescue/lrescue.3" } - { HEX: 1800 "lrescue/lrescue.4" } - { HEX: 4000 "lrescue/lrescue.5" } - { HEX: 4800 "lrescue/lrescue.6" } + { 0x0000 "lrescue/lrescue.1" } + { 0x0800 "lrescue/lrescue.2" } + { 0x1000 "lrescue/lrescue.3" } + { 0x1800 "lrescue/lrescue.4" } + { 0x4000 "lrescue/lrescue.5" } + { 0x4800 "lrescue/lrescue.6" } } : run-lunar ( -- ) diff --git a/extra/macho/macho.factor b/extra/macho/macho.factor index 943f816c2c..ec18389e11 100644 --- a/extra/macho/macho.factor +++ b/extra/macho/macho.factor @@ -15,15 +15,15 @@ TYPEDEF: integer_t cpu_type_t TYPEDEF: integer_t cpu_subtype_t TYPEDEF: integer_t cpu_threadtype_t -CONSTANT: VM_PROT_NONE HEX: 00 -CONSTANT: VM_PROT_READ HEX: 01 -CONSTANT: VM_PROT_WRITE HEX: 02 -CONSTANT: VM_PROT_EXECUTE HEX: 04 -CONSTANT: VM_PROT_DEFAULT HEX: 03 -CONSTANT: VM_PROT_ALL HEX: 07 -CONSTANT: VM_PROT_NO_CHANGE HEX: 08 -CONSTANT: VM_PROT_COPY HEX: 10 -CONSTANT: VM_PROT_WANTS_COPY HEX: 10 +CONSTANT: VM_PROT_NONE 0x00 +CONSTANT: VM_PROT_READ 0x01 +CONSTANT: VM_PROT_WRITE 0x02 +CONSTANT: VM_PROT_EXECUTE 0x04 +CONSTANT: VM_PROT_DEFAULT 0x03 +CONSTANT: VM_PROT_ALL 0x07 +CONSTANT: VM_PROT_NO_CHANGE 0x08 +CONSTANT: VM_PROT_COPY 0x10 +CONSTANT: VM_PROT_WANTS_COPY 0x10 ! loader.h STRUCT: mach_header @@ -35,8 +35,8 @@ STRUCT: mach_header { sizeofcmds uint } { flags uint } ; -CONSTANT: MH_MAGIC HEX: feedface -CONSTANT: MH_CIGAM HEX: cefaedfe +CONSTANT: MH_MAGIC 0xfeedface +CONSTANT: MH_CIGAM 0xcefaedfe STRUCT: mach_header_64 { magic uint } @@ -48,86 +48,86 @@ STRUCT: mach_header_64 { flags uint } { reserved uint } ; -CONSTANT: MH_MAGIC_64 HEX: feedfacf -CONSTANT: MH_CIGAM_64 HEX: cffaedfe - -CONSTANT: MH_OBJECT HEX: 1 -CONSTANT: MH_EXECUTE HEX: 2 -CONSTANT: MH_FVMLIB HEX: 3 -CONSTANT: MH_CORE HEX: 4 -CONSTANT: MH_PRELOAD HEX: 5 -CONSTANT: MH_DYLIB HEX: 6 -CONSTANT: MH_DYLINKER HEX: 7 -CONSTANT: MH_BUNDLE HEX: 8 -CONSTANT: MH_DYLIB_STUB HEX: 9 -CONSTANT: MH_DSYM HEX: a -CONSTANT: MH_KEXT_BUNDLE HEX: b - -CONSTANT: MH_NOUNDEFS HEX: 1 -CONSTANT: MH_INCRLINK HEX: 2 -CONSTANT: MH_DYLDLINK HEX: 4 -CONSTANT: MH_BINDATLOAD HEX: 8 -CONSTANT: MH_PREBOUND HEX: 10 -CONSTANT: MH_SPLIT_SEGS HEX: 20 -CONSTANT: MH_LAZY_INIT HEX: 40 -CONSTANT: MH_TWOLEVEL HEX: 80 -CONSTANT: MH_FORCE_FLAT HEX: 100 -CONSTANT: MH_NOMULTIDEFS HEX: 200 -CONSTANT: MH_NOFIXPREBINDING HEX: 400 -CONSTANT: MH_PREBINDABLE HEX: 800 -CONSTANT: MH_ALLMODSBOUND HEX: 1000 -CONSTANT: MH_SUBSECTIONS_VIA_SYMBOLS HEX: 2000 -CONSTANT: MH_CANONICAL HEX: 4000 -CONSTANT: MH_WEAK_DEFINES HEX: 8000 -CONSTANT: MH_BINDS_TO_WEAK HEX: 10000 -CONSTANT: MH_ALLOW_STACK_EXECUTION HEX: 20000 -CONSTANT: MH_DEAD_STRIPPABLE_DYLIB HEX: 400000 -CONSTANT: MH_ROOT_SAFE HEX: 40000 -CONSTANT: MH_SETUID_SAFE HEX: 80000 -CONSTANT: MH_NO_REEXPORTED_DYLIBS HEX: 100000 -CONSTANT: MH_PIE HEX: 200000 +CONSTANT: MH_MAGIC_64 0xfeedfacf +CONSTANT: MH_CIGAM_64 0xcffaedfe + +CONSTANT: MH_OBJECT 0x1 +CONSTANT: MH_EXECUTE 0x2 +CONSTANT: MH_FVMLIB 0x3 +CONSTANT: MH_CORE 0x4 +CONSTANT: MH_PRELOAD 0x5 +CONSTANT: MH_DYLIB 0x6 +CONSTANT: MH_DYLINKER 0x7 +CONSTANT: MH_BUNDLE 0x8 +CONSTANT: MH_DYLIB_STUB 0x9 +CONSTANT: MH_DSYM 0xa +CONSTANT: MH_KEXT_BUNDLE 0xb + +CONSTANT: MH_NOUNDEFS 0x1 +CONSTANT: MH_INCRLINK 0x2 +CONSTANT: MH_DYLDLINK 0x4 +CONSTANT: MH_BINDATLOAD 0x8 +CONSTANT: MH_PREBOUND 0x10 +CONSTANT: MH_SPLIT_SEGS 0x20 +CONSTANT: MH_LAZY_INIT 0x40 +CONSTANT: MH_TWOLEVEL 0x80 +CONSTANT: MH_FORCE_FLAT 0x100 +CONSTANT: MH_NOMULTIDEFS 0x200 +CONSTANT: MH_NOFIXPREBINDING 0x400 +CONSTANT: MH_PREBINDABLE 0x800 +CONSTANT: MH_ALLMODSBOUND 0x1000 +CONSTANT: MH_SUBSECTIONS_VIA_SYMBOLS 0x2000 +CONSTANT: MH_CANONICAL 0x4000 +CONSTANT: MH_WEAK_DEFINES 0x8000 +CONSTANT: MH_BINDS_TO_WEAK 0x10000 +CONSTANT: MH_ALLOW_STACK_EXECUTION 0x20000 +CONSTANT: MH_DEAD_STRIPPABLE_DYLIB 0x400000 +CONSTANT: MH_ROOT_SAFE 0x40000 +CONSTANT: MH_SETUID_SAFE 0x80000 +CONSTANT: MH_NO_REEXPORTED_DYLIBS 0x100000 +CONSTANT: MH_PIE 0x200000 STRUCT: load_command { cmd uint } { cmdsize uint } ; -CONSTANT: LC_REQ_DYLD HEX: 80000000 - -CONSTANT: LC_SEGMENT HEX: 1 -CONSTANT: LC_SYMTAB HEX: 2 -CONSTANT: LC_SYMSEG HEX: 3 -CONSTANT: LC_THREAD HEX: 4 -CONSTANT: LC_UNIXTHREAD HEX: 5 -CONSTANT: LC_LOADFVMLIB HEX: 6 -CONSTANT: LC_IDFVMLIB HEX: 7 -CONSTANT: LC_IDENT HEX: 8 -CONSTANT: LC_FVMFILE HEX: 9 -CONSTANT: LC_PREPAGE HEX: a -CONSTANT: LC_DYSYMTAB HEX: b -CONSTANT: LC_LOAD_DYLIB HEX: c -CONSTANT: LC_ID_DYLIB HEX: d -CONSTANT: LC_LOAD_DYLINKER HEX: e -CONSTANT: LC_ID_DYLINKER HEX: f -CONSTANT: LC_PREBOUND_DYLIB HEX: 10 -CONSTANT: LC_ROUTINES HEX: 11 -CONSTANT: LC_SUB_FRAMEWORK HEX: 12 -CONSTANT: LC_SUB_UMBRELLA HEX: 13 -CONSTANT: LC_SUB_CLIENT HEX: 14 -CONSTANT: LC_SUB_LIBRARY HEX: 15 -CONSTANT: LC_TWOLEVEL_HINTS HEX: 16 -CONSTANT: LC_PREBIND_CKSUM HEX: 17 -CONSTANT: LC_LOAD_WEAK_DYLIB HEX: 80000018 -CONSTANT: LC_SEGMENT_64 HEX: 19 -CONSTANT: LC_ROUTINES_64 HEX: 1a -CONSTANT: LC_UUID HEX: 1b -CONSTANT: LC_RPATH HEX: 8000001c -CONSTANT: LC_CODE_SIGNATURE HEX: 1d -CONSTANT: LC_SEGMENT_SPLIT_INFO HEX: 1e -CONSTANT: LC_REEXPORT_DYLIB HEX: 8000001f -CONSTANT: LC_LAZY_LOAD_DYLIB HEX: 20 -CONSTANT: LC_ENCRYPTION_INFO HEX: 21 -CONSTANT: LC_DYLD_INFO HEX: 22 -CONSTANT: LC_DYLD_INFO_ONLY HEX: 80000022 +CONSTANT: LC_REQ_DYLD 0x80000000 + +CONSTANT: LC_SEGMENT 0x1 +CONSTANT: LC_SYMTAB 0x2 +CONSTANT: LC_SYMSEG 0x3 +CONSTANT: LC_THREAD 0x4 +CONSTANT: LC_UNIXTHREAD 0x5 +CONSTANT: LC_LOADFVMLIB 0x6 +CONSTANT: LC_IDFVMLIB 0x7 +CONSTANT: LC_IDENT 0x8 +CONSTANT: LC_FVMFILE 0x9 +CONSTANT: LC_PREPAGE 0xa +CONSTANT: LC_DYSYMTAB 0xb +CONSTANT: LC_LOAD_DYLIB 0xc +CONSTANT: LC_ID_DYLIB 0xd +CONSTANT: LC_LOAD_DYLINKER 0xe +CONSTANT: LC_ID_DYLINKER 0xf +CONSTANT: LC_PREBOUND_DYLIB 0x10 +CONSTANT: LC_ROUTINES 0x11 +CONSTANT: LC_SUB_FRAMEWORK 0x12 +CONSTANT: LC_SUB_UMBRELLA 0x13 +CONSTANT: LC_SUB_CLIENT 0x14 +CONSTANT: LC_SUB_LIBRARY 0x15 +CONSTANT: LC_TWOLEVEL_HINTS 0x16 +CONSTANT: LC_PREBIND_CKSUM 0x17 +CONSTANT: LC_LOAD_WEAK_DYLIB 0x80000018 +CONSTANT: LC_SEGMENT_64 0x19 +CONSTANT: LC_ROUTINES_64 0x1a +CONSTANT: LC_UUID 0x1b +CONSTANT: LC_RPATH 0x8000001c +CONSTANT: LC_CODE_SIGNATURE 0x1d +CONSTANT: LC_SEGMENT_SPLIT_INFO 0x1e +CONSTANT: LC_REEXPORT_DYLIB 0x8000001f +CONSTANT: LC_LAZY_LOAD_DYLIB 0x20 +CONSTANT: LC_ENCRYPTION_INFO 0x21 +CONSTANT: LC_DYLD_INFO 0x22 +CONSTANT: LC_DYLD_INFO_ONLY 0x80000022 UNION-STRUCT: lc_str { offset uint } @@ -159,10 +159,10 @@ STRUCT: segment_command_64 { nsects uint } { flags uint } ; -CONSTANT: SG_HIGHVM HEX: 1 -CONSTANT: SG_FVMLIB HEX: 2 -CONSTANT: SG_NORELOC HEX: 4 -CONSTANT: SG_PROTECTED_VERSION_1 HEX: 8 +CONSTANT: SG_HIGHVM 0x1 +CONSTANT: SG_FVMLIB 0x2 +CONSTANT: SG_NORELOC 0x4 +CONSTANT: SG_PROTECTED_VERSION_1 0x8 STRUCT: section { sectname char[16] } @@ -191,39 +191,39 @@ STRUCT: section_64 { reserved2 uint } { reserved3 uint } ; -CONSTANT: SECTION_TYPE HEX: 000000ff -CONSTANT: SECTION_ATTRIBUTES HEX: ffffff00 - -CONSTANT: S_REGULAR HEX: 0 -CONSTANT: S_ZEROFILL HEX: 1 -CONSTANT: S_CSTRING_LITERALS HEX: 2 -CONSTANT: S_4BYTE_LITERALS HEX: 3 -CONSTANT: S_8BYTE_LITERALS HEX: 4 -CONSTANT: S_LITERAL_POINTERS HEX: 5 -CONSTANT: S_NON_LAZY_SYMBOL_POINTERS HEX: 6 -CONSTANT: S_LAZY_SYMBOL_POINTERS HEX: 7 -CONSTANT: S_SYMBOL_STUBS HEX: 8 -CONSTANT: S_MOD_INIT_FUNC_POINTERS HEX: 9 -CONSTANT: S_MOD_TERM_FUNC_POINTERS HEX: a -CONSTANT: S_COALESCED HEX: b -CONSTANT: S_GB_ZEROFILL HEX: c -CONSTANT: S_INTERPOSING HEX: d -CONSTANT: S_16BYTE_LITERALS HEX: e -CONSTANT: S_DTRACE_DOF HEX: f -CONSTANT: S_LAZY_DYLIB_SYMBOL_POINTERS HEX: 10 - -CONSTANT: SECTION_ATTRIBUTES_USR HEX: ff000000 -CONSTANT: S_ATTR_PURE_INSTRUCTIONS HEX: 80000000 -CONSTANT: S_ATTR_NO_TOC HEX: 40000000 -CONSTANT: S_ATTR_STRIP_STATIC_SYMS HEX: 20000000 -CONSTANT: S_ATTR_NO_DEAD_STRIP HEX: 10000000 -CONSTANT: S_ATTR_LIVE_SUPPORT HEX: 08000000 -CONSTANT: S_ATTR_SELF_MODIFYING_CODE HEX: 04000000 -CONSTANT: S_ATTR_DEBUG HEX: 02000000 -CONSTANT: SECTION_ATTRIBUTES_SYS HEX: 00ffff00 -CONSTANT: S_ATTR_SOME_INSTRUCTIONS HEX: 00000400 -CONSTANT: S_ATTR_EXT_RELOC HEX: 00000200 -CONSTANT: S_ATTR_LOC_RELOC HEX: 00000100 +CONSTANT: SECTION_TYPE 0x000000ff +CONSTANT: SECTION_ATTRIBUTES 0xffffff00 + +CONSTANT: S_REGULAR 0x0 +CONSTANT: S_ZEROFILL 0x1 +CONSTANT: S_CSTRING_LITERALS 0x2 +CONSTANT: S_4BYTE_LITERALS 0x3 +CONSTANT: S_8BYTE_LITERALS 0x4 +CONSTANT: S_LITERAL_POINTERS 0x5 +CONSTANT: S_NON_LAZY_SYMBOL_POINTERS 0x6 +CONSTANT: S_LAZY_SYMBOL_POINTERS 0x7 +CONSTANT: S_SYMBOL_STUBS 0x8 +CONSTANT: S_MOD_INIT_FUNC_POINTERS 0x9 +CONSTANT: S_MOD_TERM_FUNC_POINTERS 0xa +CONSTANT: S_COALESCED 0xb +CONSTANT: S_GB_ZEROFILL 0xc +CONSTANT: S_INTERPOSING 0xd +CONSTANT: S_16BYTE_LITERALS 0xe +CONSTANT: S_DTRACE_DOF 0xf +CONSTANT: S_LAZY_DYLIB_SYMBOL_POINTERS 0x10 + +CONSTANT: SECTION_ATTRIBUTES_USR 0xff000000 +CONSTANT: S_ATTR_PURE_INSTRUCTIONS 0x80000000 +CONSTANT: S_ATTR_NO_TOC 0x40000000 +CONSTANT: S_ATTR_STRIP_STATIC_SYMS 0x20000000 +CONSTANT: S_ATTR_NO_DEAD_STRIP 0x10000000 +CONSTANT: S_ATTR_LIVE_SUPPORT 0x08000000 +CONSTANT: S_ATTR_SELF_MODIFYING_CODE 0x04000000 +CONSTANT: S_ATTR_DEBUG 0x02000000 +CONSTANT: SECTION_ATTRIBUTES_SYS 0x00ffff00 +CONSTANT: S_ATTR_SOME_INSTRUCTIONS 0x00000400 +CONSTANT: S_ATTR_EXT_RELOC 0x00000200 +CONSTANT: S_ATTR_LOC_RELOC 0x00000100 CONSTANT: SEG_PAGEZERO "__PAGEZERO" CONSTANT: SEG_TEXT "__TEXT" @@ -357,8 +357,8 @@ STRUCT: dysymtab_command { locreloff uint } { nlocrel uint } ; -CONSTANT: INDIRECT_SYMBOL_LOCAL HEX: 80000000 -CONSTANT: INDIRECT_SYMBOL_ABS HEX: 40000000 +CONSTANT: INDIRECT_SYMBOL_LOCAL 0x80000000 +CONSTANT: INDIRECT_SYMBOL_ABS 0x40000000 STRUCT: dylib_table_of_contents { symbol_index uint } @@ -452,17 +452,17 @@ CONSTANT: REBASE_TYPE_POINTER 1 CONSTANT: REBASE_TYPE_TEXT_ABSOLUTE32 2 CONSTANT: REBASE_TYPE_TEXT_PCREL32 3 -CONSTANT: REBASE_OPCODE_MASK HEX: F0 -CONSTANT: REBASE_IMMEDIATE_MASK HEX: 0F -CONSTANT: REBASE_OPCODE_DONE HEX: 00 -CONSTANT: REBASE_OPCODE_SET_TYPE_IMM HEX: 10 -CONSTANT: REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB HEX: 20 -CONSTANT: REBASE_OPCODE_ADD_ADDR_ULEB HEX: 30 -CONSTANT: REBASE_OPCODE_ADD_ADDR_IMM_SCALED HEX: 40 -CONSTANT: REBASE_OPCODE_DO_REBASE_IMM_TIMES HEX: 50 -CONSTANT: REBASE_OPCODE_DO_REBASE_ULEB_TIMES HEX: 60 -CONSTANT: REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB HEX: 70 -CONSTANT: REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB HEX: 80 +CONSTANT: REBASE_OPCODE_MASK 0xF0 +CONSTANT: REBASE_IMMEDIATE_MASK 0x0F +CONSTANT: REBASE_OPCODE_DONE 0x00 +CONSTANT: REBASE_OPCODE_SET_TYPE_IMM 0x10 +CONSTANT: REBASE_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB 0x20 +CONSTANT: REBASE_OPCODE_ADD_ADDR_ULEB 0x30 +CONSTANT: REBASE_OPCODE_ADD_ADDR_IMM_SCALED 0x40 +CONSTANT: REBASE_OPCODE_DO_REBASE_IMM_TIMES 0x50 +CONSTANT: REBASE_OPCODE_DO_REBASE_ULEB_TIMES 0x60 +CONSTANT: REBASE_OPCODE_DO_REBASE_ADD_ADDR_ULEB 0x70 +CONSTANT: REBASE_OPCODE_DO_REBASE_ULEB_TIMES_SKIPPING_ULEB 0x80 CONSTANT: BIND_TYPE_POINTER 1 CONSTANT: BIND_TYPE_TEXT_ABSOLUTE32 2 @@ -472,31 +472,31 @@ CONSTANT: BIND_SPECIAL_DYLIB_SELF 0 CONSTANT: BIND_SPECIAL_DYLIB_MAIN_EXECUTABLE -1 CONSTANT: BIND_SPECIAL_DYLIB_FLAT_LOOKUP -2 -CONSTANT: BIND_SYMBOL_FLAGS_WEAK_IMPORT HEX: 1 -CONSTANT: BIND_SYMBOL_FLAGS_NON_WEAK_DEFINITION HEX: 8 - -CONSTANT: BIND_OPCODE_MASK HEX: F0 -CONSTANT: BIND_IMMEDIATE_MASK HEX: 0F -CONSTANT: BIND_OPCODE_DONE HEX: 00 -CONSTANT: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM HEX: 10 -CONSTANT: BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB HEX: 20 -CONSTANT: BIND_OPCODE_SET_DYLIB_SPECIAL_IMM HEX: 30 -CONSTANT: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM HEX: 40 -CONSTANT: BIND_OPCODE_SET_TYPE_IMM HEX: 50 -CONSTANT: BIND_OPCODE_SET_ADDEND_SLEB HEX: 60 -CONSTANT: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB HEX: 70 -CONSTANT: BIND_OPCODE_ADD_ADDR_ULEB HEX: 80 -CONSTANT: BIND_OPCODE_DO_BIND HEX: 90 -CONSTANT: BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB HEX: A0 -CONSTANT: BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED HEX: B0 -CONSTANT: BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB HEX: C0 - -CONSTANT: EXPORT_SYMBOL_FLAGS_KIND_MASK HEX: 03 -CONSTANT: EXPORT_SYMBOL_FLAGS_KIND_REGULAR HEX: 00 -CONSTANT: EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL HEX: 01 -CONSTANT: EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION HEX: 04 -CONSTANT: EXPORT_SYMBOL_FLAGS_INDIRECT_DEFINITION HEX: 08 -CONSTANT: EXPORT_SYMBOL_FLAGS_HAS_SPECIALIZATIONS HEX: 10 +CONSTANT: BIND_SYMBOL_FLAGS_WEAK_IMPORT 0x1 +CONSTANT: BIND_SYMBOL_FLAGS_NON_WEAK_DEFINITION 0x8 + +CONSTANT: BIND_OPCODE_MASK 0xF0 +CONSTANT: BIND_IMMEDIATE_MASK 0x0F +CONSTANT: BIND_OPCODE_DONE 0x00 +CONSTANT: BIND_OPCODE_SET_DYLIB_ORDINAL_IMM 0x10 +CONSTANT: BIND_OPCODE_SET_DYLIB_ORDINAL_ULEB 0x20 +CONSTANT: BIND_OPCODE_SET_DYLIB_SPECIAL_IMM 0x30 +CONSTANT: BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM 0x40 +CONSTANT: BIND_OPCODE_SET_TYPE_IMM 0x50 +CONSTANT: BIND_OPCODE_SET_ADDEND_SLEB 0x60 +CONSTANT: BIND_OPCODE_SET_SEGMENT_AND_OFFSET_ULEB 0x70 +CONSTANT: BIND_OPCODE_ADD_ADDR_ULEB 0x80 +CONSTANT: BIND_OPCODE_DO_BIND 0x90 +CONSTANT: BIND_OPCODE_DO_BIND_ADD_ADDR_ULEB 0xA0 +CONSTANT: BIND_OPCODE_DO_BIND_ADD_ADDR_IMM_SCALED 0xB0 +CONSTANT: BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB 0xC0 + +CONSTANT: EXPORT_SYMBOL_FLAGS_KIND_MASK 0x03 +CONSTANT: EXPORT_SYMBOL_FLAGS_KIND_REGULAR 0x00 +CONSTANT: EXPORT_SYMBOL_FLAGS_KIND_THREAD_LOCAL 0x01 +CONSTANT: EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION 0x04 +CONSTANT: EXPORT_SYMBOL_FLAGS_INDIRECT_DEFINITION 0x08 +CONSTANT: EXPORT_SYMBOL_FLAGS_HAS_SPECIALIZATIONS 0x10 STRUCT: symseg_command { cmd uint } @@ -521,8 +521,8 @@ CONSTANT: CPU_STATE_SYSTEM 1 CONSTANT: CPU_STATE_IDLE 2 CONSTANT: CPU_STATE_NICE 3 -CONSTANT: CPU_ARCH_MASK HEX: ff000000 -CONSTANT: CPU_ARCH_ABI64 HEX: 01000000 +CONSTANT: CPU_ARCH_MASK 0xff000000 +CONSTANT: CPU_ARCH_ABI64 0x01000000 CONSTANT: CPU_TYPE_ANY -1 CONSTANT: CPU_TYPE_VAX 1 @@ -539,8 +539,8 @@ CONSTANT: CPU_TYPE_I860 15 CONSTANT: CPU_TYPE_POWERPC 18 CONSTANT: CPU_TYPE_POWERPC64 flags{ CPU_TYPE_POWERPC CPU_ARCH_ABI64 } -CONSTANT: CPU_SUBTYPE_MASK HEX: ff000000 -CONSTANT: CPU_SUBTYPE_LIB64 HEX: 80000000 +CONSTANT: CPU_SUBTYPE_MASK 0xff000000 +CONSTANT: CPU_SUBTYPE_LIB64 0x80000000 CONSTANT: CPU_SUBTYPE_MULTIPLE -1 CONSTANT: CPU_SUBTYPE_LITTLE_ENDIAN 0 @@ -650,18 +650,18 @@ CONSTANT: CPU_SUBTYPE_ARM_XSCALE 8 CONSTANT: CPU_SUBTYPE_ARM_V7 9 CONSTANT: CPUFAMILY_UNKNOWN 0 -CONSTANT: CPUFAMILY_POWERPC_G3 HEX: cee41549 -CONSTANT: CPUFAMILY_POWERPC_G4 HEX: 77c184ae -CONSTANT: CPUFAMILY_POWERPC_G5 HEX: ed76d8aa -CONSTANT: CPUFAMILY_INTEL_6_13 HEX: aa33392b -CONSTANT: CPUFAMILY_INTEL_6_14 HEX: 73d67300 -CONSTANT: CPUFAMILY_INTEL_6_15 HEX: 426f69ef -CONSTANT: CPUFAMILY_INTEL_6_23 HEX: 78ea4fbc -CONSTANT: CPUFAMILY_INTEL_6_26 HEX: 6b5a4cd2 -CONSTANT: CPUFAMILY_ARM_9 HEX: e73283ae -CONSTANT: CPUFAMILY_ARM_11 HEX: 8ff620d8 -CONSTANT: CPUFAMILY_ARM_XSCALE HEX: 53b005f5 -CONSTANT: CPUFAMILY_ARM_13 HEX: 0cc90e64 +CONSTANT: CPUFAMILY_POWERPC_G3 0xcee41549 +CONSTANT: CPUFAMILY_POWERPC_G4 0x77c184ae +CONSTANT: CPUFAMILY_POWERPC_G5 0xed76d8aa +CONSTANT: CPUFAMILY_INTEL_6_13 0xaa33392b +CONSTANT: CPUFAMILY_INTEL_6_14 0x73d67300 +CONSTANT: CPUFAMILY_INTEL_6_15 0x426f69ef +CONSTANT: CPUFAMILY_INTEL_6_23 0x78ea4fbc +CONSTANT: CPUFAMILY_INTEL_6_26 0x6b5a4cd2 +CONSTANT: CPUFAMILY_ARM_9 0xe73283ae +CONSTANT: CPUFAMILY_ARM_11 0x8ff620d8 +CONSTANT: CPUFAMILY_ARM_XSCALE 0x53b005f5 +CONSTANT: CPUFAMILY_ARM_13 0x0cc90e64 ALIAS: CPUFAMILY_INTEL_YONAH CPUFAMILY_INTEL_6_14 ALIAS: CPUFAMILY_INTEL_MEROM CPUFAMILY_INTEL_6_15 @@ -672,8 +672,8 @@ ALIAS: CPUFAMILY_INTEL_CORE CPUFAMILY_INTEL_6_14 ALIAS: CPUFAMILY_INTEL_CORE2 CPUFAMILY_INTEL_6_15 ! fat.h -CONSTANT: FAT_MAGIC HEX: cafebabe -CONSTANT: FAT_CIGAM HEX: bebafeca +CONSTANT: FAT_MAGIC 0xcafebabe +CONSTANT: FAT_CIGAM 0xbebafeca STRUCT: fat_header { magic uint } @@ -701,26 +701,26 @@ STRUCT: nlist_64 { n_desc ushort } { n_value ulonglong } ; -CONSTANT: N_STAB HEX: e0 -CONSTANT: N_PEXT HEX: 10 -CONSTANT: N_TYPE HEX: 0e -CONSTANT: N_EXT HEX: 01 +CONSTANT: N_STAB 0xe0 +CONSTANT: N_PEXT 0x10 +CONSTANT: N_TYPE 0x0e +CONSTANT: N_EXT 0x01 -CONSTANT: N_UNDF HEX: 0 -CONSTANT: N_ABS HEX: 2 -CONSTANT: N_SECT HEX: e -CONSTANT: N_PBUD HEX: c -CONSTANT: N_INDR HEX: a +CONSTANT: N_UNDF 0x0 +CONSTANT: N_ABS 0x2 +CONSTANT: N_SECT 0xe +CONSTANT: N_PBUD 0xc +CONSTANT: N_INDR 0xa CONSTANT: NO_SECT 0 CONSTANT: MAX_SECT 255 : GET_COMM_ALIGN ( n_desc -- align ) - -8 shift HEX: 0f bitand ; inline + -8 shift 0x0f bitand ; inline : SET_COMM_ALIGN ( n_desc align -- n_desc ) - [ HEX: f0ff bitand ] - [ HEX: 000f bitand 8 shift ] bi* bitor ; inline + [ 0xf0ff bitand ] + [ 0x000f bitand 8 shift ] bi* bitor ; inline CONSTANT: REFERENCE_TYPE 7 CONSTANT: REFERENCE_FLAG_UNDEFINED_NON_LAZY 0 @@ -730,26 +730,26 @@ CONSTANT: REFERENCE_FLAG_PRIVATE_DEFINED 3 CONSTANT: REFERENCE_FLAG_PRIVATE_UNDEFINED_NON_LAZY 4 CONSTANT: REFERENCE_FLAG_PRIVATE_UNDEFINED_LAZY 5 -CONSTANT: REFERENCED_DYNAMICALLY HEX: 0010 +CONSTANT: REFERENCED_DYNAMICALLY 0x0010 : GET_LIBRARY_ORDINAL ( n_desc -- ordinal ) - -8 shift HEX: ff bitand ; inline + -8 shift 0xff bitand ; inline : SET_LIBRARY_ORDINAL ( n_desc ordinal -- n_desc ) - [ HEX: 00ff bitand ] - [ HEX: 00ff bitand 8 shift ] bi* bitor ; inline + [ 0x00ff bitand ] + [ 0x00ff bitand 8 shift ] bi* bitor ; inline -CONSTANT: SELF_LIBRARY_ORDINAL HEX: 0 -CONSTANT: MAX_LIBRARY_ORDINAL HEX: fd -CONSTANT: DYNAMIC_LOOKUP_ORDINAL HEX: fe -CONSTANT: EXECUTABLE_ORDINAL HEX: ff +CONSTANT: SELF_LIBRARY_ORDINAL 0x0 +CONSTANT: MAX_LIBRARY_ORDINAL 0xfd +CONSTANT: DYNAMIC_LOOKUP_ORDINAL 0xfe +CONSTANT: EXECUTABLE_ORDINAL 0xff -CONSTANT: N_NO_DEAD_STRIP HEX: 0020 -CONSTANT: N_DESC_DISCARDED HEX: 0020 -CONSTANT: N_WEAK_REF HEX: 0040 -CONSTANT: N_WEAK_DEF HEX: 0080 -CONSTANT: N_REF_TO_WEAK HEX: 0080 -CONSTANT: N_ARM_THUMB_DEF HEX: 0008 +CONSTANT: N_NO_DEAD_STRIP 0x0020 +CONSTANT: N_DESC_DISCARDED 0x0020 +CONSTANT: N_WEAK_REF 0x0040 +CONSTANT: N_WEAK_DEF 0x0080 +CONSTANT: N_REF_TO_WEAK 0x0080 +CONSTANT: N_ARM_THUMB_DEF 0x0008 ! ranlib.h CONSTANT: SYMDEF "__.SYMDEF" @@ -765,7 +765,7 @@ STRUCT: relocation_info { r_symbolnum_pcrel_length_extern_type uint } ; CONSTANT: R_ABS 0 -CONSTANT: R_SCATTERED HEX: 80000000 +CONSTANT: R_SCATTERED 0x80000000 STRUCT: scattered_relocation_info_big_endian { r_scattered_pcrel_length_type_address uint } diff --git a/extra/memcached/memcached.factor b/extra/memcached/memcached.factor index 5604332f11..6a8350f316 100644 --- a/extra/memcached/memcached.factor +++ b/extra/memcached/memcached.factor @@ -33,43 +33,43 @@ ERROR: out-of-memory ; byte-array write ] unless-empty ; @@ -108,7 +108,7 @@ TUPLE: request cmd key val extra opaque cas ; "CCSCCSIIQ" [ packed-length read ] [ unpack-be ] bi ; : check-magic ( header -- ) - first HEX: 81 = [ "bad magic" throw ] unless ; + first 0x81 = [ "bad magic" throw ] unless ; : check-status ( header -- ) [ 5 ] dip nth { diff --git a/extra/model-viewer/model-viewer.factor b/extra/model-viewer/model-viewer.factor index 44a086a9e6..72d603540d 100644 --- a/extra/model-viewer/model-viewer.factor +++ b/extra/model-viewer/model-viewer.factor @@ -168,7 +168,7 @@ TUPLE: vbo : clear-screen ( -- ) 0 0 0 0 glClearColor 1 glClearDepth - HEX: ffffffff glClearStencil + 0xffffffff glClearStencil flags{ GL_COLOR_BUFFER_BIT GL_DEPTH_BUFFER_BIT GL_STENCIL_BUFFER_BIT } glClear ; diff --git a/extra/ntp/ntp.factor b/extra/ntp/ntp.factor index 064d1e1daf..ab100ab88e 100644 --- a/extra/ntp/ntp.factor +++ b/extra/ntp/ntp.factor @@ -9,7 +9,7 @@ IN: ntp ckf ; " " split [ >ckf ] map ; : flush? ( cards -- ? ) - HEX: F000 [ bitand ] reduce 0 = not ; + 0xF000 [ bitand ] reduce 0 = not ; : rank-bits ( cards -- q ) 0 [ bitor ] reduce -16 shift ; @@ -132,16 +132,16 @@ M: integer >ckf ; [ 1 ] 2dip [ dip * ] curry [ swap ] prepose each ; inline : prime-bits ( cards -- q ) - [ HEX: FF bitand ] map-product ; + [ 0xFF bitand ] map-product ; : perfect-hash-find ( q -- value ) #! magic to convert a hand's unique identifying bits to the #! proper index for fast lookup in a table of hand values - HEX: E91AAA35 + + 0xE91AAA35 + dup -16 shift bitxor dup 8 shift w+ dup -4 shift bitxor - [ -8 shift HEX: 1FF bitand adjustments-table nth ] + [ -8 shift 0x1FF bitand adjustments-table nth ] [ dup 2 shift w+ -19 shift ] bi bitxor values-table nth ; @@ -153,7 +153,7 @@ M: integer >ckf ; ] if ; : >card-rank ( card -- string ) - -8 shift HEX: F bitand RANK_STR nth ; + -8 shift 0xF bitand RANK_STR nth ; : >card-suit ( card -- string ) { diff --git a/extra/readline/ffi/ffi.factor b/extra/readline/ffi/ffi.factor index 8bf1da4a5e..c40c1e3127 100644 --- a/extra/readline/ffi/ffi.factor +++ b/extra/readline/ffi/ffi.factor @@ -593,32 +593,32 @@ CONSTANT: NO_MATCH 0 CONSTANT: SINGLE_MATCH 1 CONSTANT: MULT_MATCH 2 -CONSTANT: RL_STATE_NONE HEX: 0000000 -CONSTANT: RL_STATE_INITIALIZING HEX: 0000001 -CONSTANT: RL_STATE_INITIALIZED HEX: 0000002 -CONSTANT: RL_STATE_TERMPREPPED HEX: 0000004 -CONSTANT: RL_STATE_READCMD HEX: 0000008 -CONSTANT: RL_STATE_METANEXT HEX: 0000010 -CONSTANT: RL_STATE_DISPATCHING HEX: 0000020 -CONSTANT: RL_STATE_MOREINPUT HEX: 0000040 -CONSTANT: RL_STATE_ISEARCH HEX: 0000080 -CONSTANT: RL_STATE_NSEARCH HEX: 0000100 -CONSTANT: RL_STATE_SEARCH HEX: 0000200 -CONSTANT: RL_STATE_NUMERICARG HEX: 0000400 -CONSTANT: RL_STATE_MACROINPUT HEX: 0000800 -CONSTANT: RL_STATE_MACRODEF HEX: 0001000 -CONSTANT: RL_STATE_OVERWRITE HEX: 0002000 -CONSTANT: RL_STATE_COMPLETING HEX: 0004000 -CONSTANT: RL_STATE_SIGHANDLER HEX: 0008000 -CONSTANT: RL_STATE_UNDOING HEX: 0010000 -CONSTANT: RL_STATE_INPUTPENDING HEX: 0020000 -CONSTANT: RL_STATE_TTYCSAVED HEX: 0040000 -CONSTANT: RL_STATE_CALLBACK HEX: 0080000 -CONSTANT: RL_STATE_VIMOTION HEX: 0100000 -CONSTANT: RL_STATE_MULTIKEY HEX: 0200000 -CONSTANT: RL_STATE_VICMDONCE HEX: 0400000 -CONSTANT: RL_STATE_REDISPLAYING HEX: 0800000 -CONSTANT: RL_STATE_DONE HEX: 1000000 +CONSTANT: RL_STATE_NONE 0x0000000 +CONSTANT: RL_STATE_INITIALIZING 0x0000001 +CONSTANT: RL_STATE_INITIALIZED 0x0000002 +CONSTANT: RL_STATE_TERMPREPPED 0x0000004 +CONSTANT: RL_STATE_READCMD 0x0000008 +CONSTANT: RL_STATE_METANEXT 0x0000010 +CONSTANT: RL_STATE_DISPATCHING 0x0000020 +CONSTANT: RL_STATE_MOREINPUT 0x0000040 +CONSTANT: RL_STATE_ISEARCH 0x0000080 +CONSTANT: RL_STATE_NSEARCH 0x0000100 +CONSTANT: RL_STATE_SEARCH 0x0000200 +CONSTANT: RL_STATE_NUMERICARG 0x0000400 +CONSTANT: RL_STATE_MACROINPUT 0x0000800 +CONSTANT: RL_STATE_MACRODEF 0x0001000 +CONSTANT: RL_STATE_OVERWRITE 0x0002000 +CONSTANT: RL_STATE_COMPLETING 0x0004000 +CONSTANT: RL_STATE_SIGHANDLER 0x0008000 +CONSTANT: RL_STATE_UNDOING 0x0010000 +CONSTANT: RL_STATE_INPUTPENDING 0x0020000 +CONSTANT: RL_STATE_TTYCSAVED 0x0040000 +CONSTANT: RL_STATE_CALLBACK 0x0080000 +CONSTANT: RL_STATE_VIMOTION 0x0100000 +CONSTANT: RL_STATE_MULTIKEY 0x0200000 +CONSTANT: RL_STATE_VICMDONCE 0x0400000 +CONSTANT: RL_STATE_REDISPLAYING 0x0800000 +CONSTANT: RL_STATE_DONE 0x1000000 : RL_SETSTATE ( x -- ) rl_readline_state get bitor rl_readline_state set ; inline : RL_UNSETSTATE ( x -- ) not rl_readline_state get bitand rl_readline_state set ; inline diff --git a/extra/smalltalk/parser/parser-tests.factor b/extra/smalltalk/parser/parser-tests.factor index 9027290e6a..932fda7810 100644 --- a/extra/smalltalk/parser/parser-tests.factor +++ b/extra/smalltalk/parser/parser-tests.factor @@ -33,7 +33,7 @@ test = [ nil ] [ "nil" test-Literal ] unit-test [ 123 ] [ "123" test-Literal ] unit-test -[ HEX: deadbeef ] [ "16rdeadbeef" test-Literal ] unit-test +[ 0xdeadbeef ] [ "16rdeadbeef" test-Literal ] unit-test [ -123 ] [ "-123" test-Literal ] unit-test [ 1.2 ] [ "1.2" test-Literal ] unit-test [ -1.24 ] [ "-1.24" test-Literal ] unit-test diff --git a/extra/space-invaders/space-invaders.factor b/extra/space-invaders/space-invaders.factor index a287c419d3..599964b9fd 100755 --- a/extra/space-invaders/space-invaders.factor +++ b/extra/space-invaders/space-invaders.factor @@ -107,7 +107,7 @@ CONSTANT: SOUND-UFO-HIT 8 #! Bit 4 = player one fire #! Bit 5 = player one left #! Bit 6 = player one right - [ port1>> dup HEX: FE bitand ] keep + [ port1>> dup 0xFE bitand ] keep port1<< ; : read-port2 ( cpu -- byte ) @@ -118,14 +118,14 @@ CONSTANT: SOUND-UFO-HIT 8 #! Bit 5 = player two left #! Bit 6 = player two right #! Bit 7 = show or hide coin info - [ port2i>> HEX: 8F bitand ] keep - port1>> HEX: 70 bitand bitor ; + [ port2i>> 0x8F bitand ] keep + port1>> 0x70 bitand bitor ; : read-port3 ( cpu -- byte ) #! Used to compute a special formula [ port4hi>> 8 shift ] keep [ port4lo>> bitor ] keep - port2o>> shift -8 shift HEX: FF bitand ; + port2o>> shift -8 shift 0xFF bitand ; M: space-invaders read-port ( port cpu -- byte ) #! Read a byte from the hardware port. 'port' should @@ -218,7 +218,7 @@ M: space-invaders reset ( cpu -- ) [ read-instruction ] keep ! n cpu over get-cycles over inc-cycles [ swap instructions nth call( cpu -- ) ] keep - [ pc>> HEX: FFFF bitand ] keep + [ pc>> 0xFFFF bitand ] keep pc<< ; : gui-frame/2 ( cpu -- ) @@ -228,10 +228,10 @@ M: space-invaders reset ( cpu -- ) nip gui-frame/2 ] [ [ [ 16667 - ] dip cycles<< ] keep - dup last-interrupt>> HEX: 10 = [ - HEX: 08 over last-interrupt<< HEX: 08 swap interrupt + dup last-interrupt>> 0x10 = [ + 0x08 over last-interrupt<< 0x08 swap interrupt ] [ - HEX: 10 over last-interrupt<< HEX: 10 swap interrupt + 0x10 over last-interrupt<< 0x10 swap interrupt ] if ] if ; @@ -257,22 +257,22 @@ M: space-invaders reset ( cpu -- ) [ port1>> 255 2 - bitand ] keep port1<< ; : fire-down ( cpu -- ) - [ port1>> HEX: 10 bitor ] keep port1<< ; + [ port1>> 0x10 bitor ] keep port1<< ; : fire-up ( cpu -- ) - [ port1>> 255 HEX: 10 - bitand ] keep port1<< ; + [ port1>> 255 0x10 - bitand ] keep port1<< ; : left-down ( cpu -- ) - [ port1>> HEX: 20 bitor ] keep port1<< ; + [ port1>> 0x20 bitor ] keep port1<< ; : left-up ( cpu -- ) - [ port1>> 255 HEX: 20 - bitand ] keep port1<< ; + [ port1>> 255 0x20 - bitand ] keep port1<< ; : right-down ( cpu -- ) - [ port1>> HEX: 40 bitor ] keep port1<< ; + [ port1>> 0x40 bitor ] keep port1<< ; : right-up ( cpu -- ) - [ port1>> 255 HEX: 40 - bitand ] keep port1<< ; + [ port1>> 255 0x40 - bitand ] keep port1<< ; TUPLE: invaders-gadget < gadget cpu quit? windowed? ; @@ -313,8 +313,8 @@ CONSTANT: red { 255 0 0 } : addr>xy ( addr -- point ) #! Convert video RAM address to base X Y value. point is a {x y}. - HEX: 2400 - ! n - dup HEX: 1f bitand 8 * 255 swap - ! n y + 0x2400 - ! n + dup 0x1f bitand 8 * 255 swap - ! n y swap -5 shift swap 2array ; : plot-bitmap-pixel ( bitmap point color -- ) @@ -351,7 +351,7 @@ CONSTANT: red { 255 0 0 } 7 plot-bitmap-bits ; M: space-invaders update-video ( value addr cpu -- ) - over HEX: 2400 >= [ + over 0x2400 >= [ bitmap>> -rot do-bitmap-update ] [ 3drop @@ -388,10 +388,10 @@ M: invaders-gadget ungraft* ( gadget -- ) over load-rom* t >>windowed? swap open-window ; CONSTANT: rom-info { - { HEX: 0000 "invaders/invaders.h" } - { HEX: 0800 "invaders/invaders.g" } - { HEX: 1000 "invaders/invaders.f" } - { HEX: 1800 "invaders/invaders.e" } + { 0x0000 "invaders/invaders.h" } + { 0x0800 "invaders/invaders.g" } + { 0x1000 "invaders/invaders.f" } + { 0x1800 "invaders/invaders.e" } } : run-invaders ( -- ) diff --git a/unmaintained/arm/architecture/architecture.factor b/unmaintained/arm/architecture/architecture.factor index 563dd10bc4..3e102fe84b 100644 --- a/unmaintained/arm/architecture/architecture.factor +++ b/unmaintained/arm/architecture/architecture.factor @@ -306,7 +306,7 @@ M: arm-backend %callback-value ( ctype -- ) M: arm-backend %cleanup ( alien-node -- ) drop ; -: %untag ( dest src -- ) BIN: 111 BIC ; +: %untag ( dest src -- ) 0b111 BIC ; : %untag-fixnum ( dest src -- ) tag-bits get MOV ; diff --git a/unmaintained/cryptlib/libcl/libcl.factor b/unmaintained/cryptlib/libcl/libcl.factor index e2b13e8cb1..634d766cf6 100644 --- a/unmaintained/cryptlib/libcl/libcl.factor +++ b/unmaintained/cryptlib/libcl/libcl.factor @@ -624,17 +624,17 @@ TYPEDEF: int CRYPT_ATTRIBUTE_TYPE ! =============================================== ! Flags for the X.509 keyUsage extension -: CRYPT_KEYUSAGE_NONE HEX: 000 ; inline -: CRYPT_KEYUSAGE_DIGITALSIGNATURE HEX: 001 ; inline -: CRYPT_KEYUSAGE_NONREPUDIATION HEX: 002 ; inline -: CRYPT_KEYUSAGE_KEYENCIPHERMENT HEX: 004 ; inline -: CRYPT_KEYUSAGE_DATAENCIPHERMENT HEX: 008 ; inline -: CRYPT_KEYUSAGE_KEYAGREEMENT HEX: 010 ; inline -: CRYPT_KEYUSAGE_KEYCERTSIGN HEX: 020 ; inline -: CRYPT_KEYUSAGE_CRLSIGN HEX: 040 ; inline -: CRYPT_KEYUSAGE_ENCIPHERONLY HEX: 080 ; inline -: CRYPT_KEYUSAGE_DECIPHERONLY HEX: 100 ; inline -: CRYPT_KEYUSAGE_LAST HEX: 200 ; inline ! Last possible value +: CRYPT_KEYUSAGE_NONE 0x000 ; inline +: CRYPT_KEYUSAGE_DIGITALSIGNATURE 0x001 ; inline +: CRYPT_KEYUSAGE_NONREPUDIATION 0x002 ; inline +: CRYPT_KEYUSAGE_KEYENCIPHERMENT 0x004 ; inline +: CRYPT_KEYUSAGE_DATAENCIPHERMENT 0x008 ; inline +: CRYPT_KEYUSAGE_KEYAGREEMENT 0x010 ; inline +: CRYPT_KEYUSAGE_KEYCERTSIGN 0x020 ; inline +: CRYPT_KEYUSAGE_CRLSIGN 0x040 ; inline +: CRYPT_KEYUSAGE_ENCIPHERONLY 0x080 ; inline +: CRYPT_KEYUSAGE_DECIPHERONLY 0x100 ; inline +: CRYPT_KEYUSAGE_LAST 0x200 ; inline ! Last possible value ! X.509 cRLReason and cryptlib cRLExtReason codes : CRYPT_CRLREASON_UNSPECIFIED 0 ; inline @@ -655,14 +655,14 @@ TYPEDEF: int CRYPT_ATTRIBUTE_TYPE ! codes but allow for multiple reasons to be specified. Note that these ! don't follow the X.509 naming since in that scheme the enumerated types ! and bitflags have the same names -: CRYPT_CRLREASONFLAG_UNUSED HEX: 001 ; inline -: CRYPT_CRLREASONFLAG_KEYCOMPROMISE HEX: 002 ; inline -: CRYPT_CRLREASONFLAG_CACOMPROMISE HEX: 004 ; inline -: CRYPT_CRLREASONFLAG_AFFILIATIONCHANGED HEX: 008 ; inline -: CRYPT_CRLREASONFLAG_SUPERSEDED HEX: 010 ; inline -: CRYPT_CRLREASONFLAG_CESSATIONOFOPERATION HEX: 020 ; inline -: CRYPT_CRLREASONFLAG_CERTIFICATEHOLD HEX: 040 ; inline -: CRYPT_CRLREASONFLAG_LAST HEX: 080 ; inline ! Last poss.value +: CRYPT_CRLREASONFLAG_UNUSED 0x001 ; inline +: CRYPT_CRLREASONFLAG_KEYCOMPROMISE 0x002 ; inline +: CRYPT_CRLREASONFLAG_CACOMPROMISE 0x004 ; inline +: CRYPT_CRLREASONFLAG_AFFILIATIONCHANGED 0x008 ; inline +: CRYPT_CRLREASONFLAG_SUPERSEDED 0x010 ; inline +: CRYPT_CRLREASONFLAG_CESSATIONOFOPERATION 0x020 ; inline +: CRYPT_CRLREASONFLAG_CERTIFICATEHOLD 0x040 ; inline +: CRYPT_CRLREASONFLAG_LAST 0x080 ; inline ! Last poss.value ! X.509 CRL holdInstruction codes : CRYPT_HOLDINSTRUCTION_NONE 0 ; inline @@ -680,28 +680,28 @@ TYPEDEF: int CRYPT_ATTRIBUTE_TYPE : CRYPT_COMPLIANCELEVEL_LAST 5 ; inline ! Flags for the Netscape netscape-cert-type extension -: CRYPT_NS_CERTTYPE_SSLCLIENT HEX: 001 ; inline -: CRYPT_NS_CERTTYPE_SSLSERVER HEX: 002 ; inline -: CRYPT_NS_CERTTYPE_SMIME HEX: 004 ; inline -: CRYPT_NS_CERTTYPE_OBJECTSIGNING HEX: 008 ; inline -: CRYPT_NS_CERTTYPE_RESERVED HEX: 010 ; inline -: CRYPT_NS_CERTTYPE_SSLCA HEX: 020 ; inline -: CRYPT_NS_CERTTYPE_SMIMECA HEX: 040 ; inline -: CRYPT_NS_CERTTYPE_OBJECTSIGNINGCA HEX: 080 ; inline -: CRYPT_NS_CERTTYPE_LAST HEX: 100 ; inline ! Last possible value +: CRYPT_NS_CERTTYPE_SSLCLIENT 0x001 ; inline +: CRYPT_NS_CERTTYPE_SSLSERVER 0x002 ; inline +: CRYPT_NS_CERTTYPE_SMIME 0x004 ; inline +: CRYPT_NS_CERTTYPE_OBJECTSIGNING 0x008 ; inline +: CRYPT_NS_CERTTYPE_RESERVED 0x010 ; inline +: CRYPT_NS_CERTTYPE_SSLCA 0x020 ; inline +: CRYPT_NS_CERTTYPE_SMIMECA 0x040 ; inline +: CRYPT_NS_CERTTYPE_OBJECTSIGNINGCA 0x080 ; inline +: CRYPT_NS_CERTTYPE_LAST 0x100 ; inline ! Last possible value ! Flags for the SET certificate-type extension -: CRYPT_SET_CERTTYPE_CARD HEX: 001 ; inline -: CRYPT_SET_CERTTYPE_MER HEX: 002 ; inline -: CRYPT_SET_CERTTYPE_PGWY HEX: 004 ; inline -: CRYPT_SET_CERTTYPE_CCA HEX: 008 ; inline -: CRYPT_SET_CERTTYPE_MCA HEX: 010 ; inline -: CRYPT_SET_CERTTYPE_PCA HEX: 020 ; inline -: CRYPT_SET_CERTTYPE_GCA HEX: 040 ; inline -: CRYPT_SET_CERTTYPE_BCA HEX: 080 ; inline -: CRYPT_SET_CERTTYPE_RCA HEX: 100 ; inline -: CRYPT_SET_CERTTYPE_ACQ HEX: 200 ; inline -: CRYPT_SET_CERTTYPE_LAST HEX: 400 ; inline ! Last possible value +: CRYPT_SET_CERTTYPE_CARD 0x001 ; inline +: CRYPT_SET_CERTTYPE_MER 0x002 ; inline +: CRYPT_SET_CERTTYPE_PGWY 0x004 ; inline +: CRYPT_SET_CERTTYPE_CCA 0x008 ; inline +: CRYPT_SET_CERTTYPE_MCA 0x010 ; inline +: CRYPT_SET_CERTTYPE_PCA 0x020 ; inline +: CRYPT_SET_CERTTYPE_GCA 0x040 ; inline +: CRYPT_SET_CERTTYPE_BCA 0x080 ; inline +: CRYPT_SET_CERTTYPE_RCA 0x100 ; inline +: CRYPT_SET_CERTTYPE_ACQ 0x200 ; inline +: CRYPT_SET_CERTTYPE_LAST 0x400 ; inline ! Last possible value ! CMS contentType values ! CRYPT_CONTENT_TYPE diff --git a/unmaintained/dns/dns.factor b/unmaintained/dns/dns.factor index ae46e3cd7a..a51347f282 100644 --- a/unmaintained/dns/dns.factor +++ b/unmaintained/dns/dns.factor @@ -265,9 +265,9 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED : bit-test ( a b -- ? ) bitand 0 = not ; -: pointer? ( ba i -- ? ) get-single BIN: 11000000 bit-test ; +: pointer? ( ba i -- ? ) get-single 0b11000000 bit-test ; -: pointer ( ba i -- val ) get-double BIN: 0011111111111111 bitand ; +: pointer ( ba i -- val ) get-double 0b0011111111111111 bitand ; ! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @@ -392,14 +392,14 @@ SYMBOLS: NO-ERROR FORMAT-ERROR SERVER-FAILURE NAME-ERROR NOT-IMPLEMENTED : get-header-bits ( ba i -- qr opcode aa tc rd ra z rcode ) get-double { - [ 15 >> BIN: 1 bitand ] - [ 11 >> BIN: 111 bitand opcode-table value-at ] - [ 10 >> BIN: 1 bitand ] - [ 9 >> BIN: 1 bitand ] - [ 8 >> BIN: 1 bitand ] - [ 7 >> BIN: 1 bitand ] - [ 4 >> BIN: 111 bitand ] - [ BIN: 1111 bitand rcode-table value-at ] + [ 15 >> 0b1 bitand ] + [ 11 >> 0b111 bitand opcode-table value-at ] + [ 10 >> 0b1 bitand ] + [ 9 >> 0b1 bitand ] + [ 8 >> 0b1 bitand ] + [ 7 >> 0b1 bitand ] + [ 4 >> 0b111 bitand ] + [ 0b1111 bitand rcode-table value-at ] } cleave ; diff --git a/unmaintained/dragdrop-listener/dragdrop-listener.factor b/unmaintained/dragdrop-listener/dragdrop-listener.factor index 3ed2256c7d..650c9bef24 100644 --- a/unmaintained/dragdrop-listener/dragdrop-listener.factor +++ b/unmaintained/dragdrop-listener/dragdrop-listener.factor @@ -7,7 +7,7 @@ SPECIALIZED-ARRAY: WCHAR IN: windows.dragdrop-listener : filenames-from-hdrop ( hdrop -- filenames ) - dup HEX: FFFFFFFF f 0 DragQueryFile ! get count of files + dup 0xFFFFFFFF f 0 DragQueryFile ! get count of files [ 2dup f 0 DragQueryFile 1 + ! get size of filename buffer dup WCHAR diff --git a/unmaintained/headers/headers.factor b/unmaintained/headers/headers.factor index 7ae9265220..a228e7741a 100644 --- a/unmaintained/headers/headers.factor +++ b/unmaintained/headers/headers.factor @@ -36,14 +36,14 @@ C-STRUCT: iph iph-hl|v -4 shift ; : iph-v ( iph -- n ) - iph-hl|v HEX: 0f bitand ; + iph-hl|v 0x0f bitand ; : set-iph-hl ( n iph -- ) - [ iph-hl|v HEX: 0f bitand >r 4 shift r> bitor ] keep + [ iph-hl|v 0x0f bitand >r 4 shift r> bitor ] keep set-iph-hl|v ; : set-iph-v ( n iph -- ) - [ iph-hl|v HEX: f0 bitand bitor ] keep + [ iph-hl|v 0xf0 bitand bitor ] keep set-iph-hl|v ; C-STRUCT: icmph @@ -74,13 +74,13 @@ C-STRUCT: tcph tcph-x2|off -4 shift ; : tcph-off ( iph -- n ) - tcph-x2|off HEX: 0f bitand ; + tcph-x2|off 0x0f bitand ; : set-tcph-x2 ( n iph -- ) - [ tcph-x2|off HEX: 0f bitand >r 4 shift r> bitor ] keep + [ tcph-x2|off 0x0f bitand >r 4 shift r> bitor ] keep set-tcph-x2|off ; : set-tcph-off ( n iph -- ) - [ tcph-x2|off HEX: 0f bitand bitor ] keep + [ tcph-x2|off 0x0f bitand bitor ] keep set-tcph-x2|off ; diff --git a/unmaintained/images/jpeg/jpeg.factor b/unmaintained/images/jpeg/jpeg.factor index 227aab21cd..d18412e0c1 100644 --- a/unmaintained/images/jpeg/jpeg.factor +++ b/unmaintained/images/jpeg/jpeg.factor @@ -36,26 +36,26 @@ APP JPG COM TEM RES ; :: >marker ( byte -- marker ) byte { - { [ dup HEX: CC = ] [ { DAC } ] } - { [ dup HEX: C4 = ] [ { DHT } ] } - { [ dup HEX: C9 = ] [ { JPG } ] } - { [ dup -4 shift HEX: C = ] [ SOF byte 4 bits 2array ] } - - { [ dup HEX: D8 = ] [ { SOI } ] } - { [ dup HEX: D9 = ] [ { EOI } ] } - { [ dup HEX: DA = ] [ { SOS } ] } - { [ dup HEX: DB = ] [ { DQT } ] } - { [ dup HEX: DC = ] [ { DNL } ] } - { [ dup HEX: DD = ] [ { DRI } ] } - { [ dup HEX: DE = ] [ { DHP } ] } - { [ dup HEX: DF = ] [ { EXP } ] } - { [ dup -4 shift HEX: D = ] [ RST byte 4 bits 2array ] } - - { [ dup -4 shift HEX: E = ] [ APP byte 4 bits 2array ] } - { [ dup HEX: FE = ] [ { COM } ] } - { [ dup -4 shift HEX: F = ] [ JPG byte 4 bits 2array ] } - - { [ dup HEX: 01 = ] [ { TEM } ] } + { [ dup 0xCC = ] [ { DAC } ] } + { [ dup 0xC4 = ] [ { DHT } ] } + { [ dup 0xC9 = ] [ { JPG } ] } + { [ dup -4 shift 0xC = ] [ SOF byte 4 bits 2array ] } + + { [ dup 0xD8 = ] [ { SOI } ] } + { [ dup 0xD9 = ] [ { EOI } ] } + { [ dup 0xDA = ] [ { SOS } ] } + { [ dup 0xDB = ] [ { DQT } ] } + { [ dup 0xDC = ] [ { DNL } ] } + { [ dup 0xDD = ] [ { DRI } ] } + { [ dup 0xDE = ] [ { DHP } ] } + { [ dup 0xDF = ] [ { EXP } ] } + { [ dup -4 shift 0xD = ] [ RST byte 4 bits 2array ] } + + { [ dup -4 shift 0xE = ] [ APP byte 4 bits 2array ] } + { [ dup 0xFE = ] [ { COM } ] } + { [ dup -4 shift 0xF = ] [ JPG byte 4 bits 2array ] } + + { [ dup 0x01 = ] [ { TEM } ] } [ { RES } ] } cond nip ; @@ -161,7 +161,7 @@ ERROR: not-a-baseline-jpeg-image ; } cleave ; : parse-marker ( -- marker ) - read1 HEX: FF assert= + read1 0xFF assert= read1 >marker ; : parse-headers ( -- chunks ) @@ -289,13 +289,13 @@ MEMO: dct-matrix-blas ( -- m ) dct-matrix >float-blas-matrix ; : cleanup-bitstream ( bytes -- bytes' ) binary [ [ - { HEX: FF } read-until - read1 [ HEX: 00 = and ] keep swap + { 0xFF } read-until + read1 [ 0x00 = and ] keep swap ] [ drop ] produce swap >marker { EOI } assert= swap suffix - { HEX: FF } join + { 0xFF } join ] with-byte-reader ; : setup-bitmap ( image -- ) diff --git a/unmaintained/javascriptcore/ffi/hack/hack.factor b/unmaintained/javascriptcore/ffi/hack/hack.factor index 1656cb17f6..30ba881c72 100644 --- a/unmaintained/javascriptcore/ffi/hack/hack.factor +++ b/unmaintained/javascriptcore/ffi/hack/hack.factor @@ -9,14 +9,14 @@ HOOK: set-callstack-bounds os ( -- ) HOOK: macosx-callstack-start-offset cpu ( -- address ) HOOK: macosx-callstack-size-offset cpu ( -- address ) -M: ppc macosx-callstack-start-offset HEX: 188 ; -M: ppc macosx-callstack-size-offset HEX: 18c ; +M: ppc macosx-callstack-start-offset 0x188 ; +M: ppc macosx-callstack-size-offset 0x18c ; -M: x86.32 macosx-callstack-start-offset HEX: c48 ; -M: x86.32 macosx-callstack-size-offset HEX: c4c ; +M: x86.32 macosx-callstack-start-offset 0xc48 ; +M: x86.32 macosx-callstack-size-offset 0xc4c ; -M: x86.64 macosx-callstack-start-offset HEX: 1860 ; -M: x86.64 macosx-callstack-size-offset HEX: 1868 ; +M: x86.64 macosx-callstack-start-offset 0x1860 ; +M: x86.64 macosx-callstack-size-offset 0x1868 ; M: object set-callstack-bounds ; diff --git a/unmaintained/jni/jni-internals.factor b/unmaintained/jni/jni-internals.factor index d809d899de..9be4a53f70 100644 --- a/unmaintained/jni/jni-internals.factor +++ b/unmaintained/jni/jni-internals.factor @@ -283,7 +283,7 @@ FUNCTION: jint JNI_GetDefaultJavaVMInitArgs ( jdk-init-args* args ) ; FUNCTION: jint JNI_CreateJavaVM ( void** pvm, void** penv, void* args ) ; : ( -- jdk-init-args ) - "jdk-init-args" HEX: 00010004 over set-jdk-init-args-version ; + "jdk-init-args" 0x00010004 over set-jdk-init-args-version ; : jni1 ( -- init-args int ) dup JNI_GetDefaultJavaVMInitArgs ; diff --git a/unmaintained/ldap/libldap/libldap.factor b/unmaintained/ldap/libldap/libldap.factor index 9b7dd36a69..ee1ad279a1 100644 --- a/unmaintained/ldap/libldap/libldap.factor +++ b/unmaintained/ldap/libldap/libldap.factor @@ -26,13 +26,13 @@ IN: ldap.libldap : LDAP_PORT 389 ; inline ! ldap:/// default LDAP port : LDAPS_PORT 636 ; inline ! ldaps:/// default LDAP over TLS port -: LDAP_SCOPE_BASE HEX: 0000 ; inline +: LDAP_SCOPE_BASE 0x0000 ; inline : LDAP_SCOPE_BASEOBJECT LDAP_SCOPE_BASE ; inline -: LDAP_SCOPE_ONELEVEL HEX: 0001 ; inline +: LDAP_SCOPE_ONELEVEL 0x0001 ; inline : LDAP_SCOPE_ONE LDAP_SCOPE_ONELEVEL ; inline -: LDAP_SCOPE_SUBTREE HEX: 0002 ; inline +: LDAP_SCOPE_SUBTREE 0x0002 ; inline : LDAP_SCOPE_SUB LDAP_SCOPE_SUBTREE ; inline -: LDAP_SCOPE_SUBORDINATE HEX: 0003 ; inline ! OpenLDAP extension +: LDAP_SCOPE_SUBORDINATE 0x0003 ; inline ! OpenLDAP extension : LDAP_SCOPE_CHILDREN LDAP_SCOPE_SUBORDINATE ; inline : LDAP_SCOPE_DEFAULT -1 ; inline ! OpenLDAP extension @@ -40,38 +40,38 @@ IN: ldap.libldap : LDAP_RES_UNSOLICITED 0 ; inline ! how many messages to retrieve results for -: LDAP_MSG_ONE HEX: 00 ; inline -: LDAP_MSG_ALL HEX: 01 ; inline -: LDAP_MSG_RECEIVED HEX: 02 ; inline +: LDAP_MSG_ONE 0x00 ; inline +: LDAP_MSG_ALL 0x01 ; inline +: LDAP_MSG_RECEIVED 0x02 ; inline ! the possible result types returned -: LDAP_RES_BIND HEX: 61 ; inline -: LDAP_RES_SEARCH_ENTRY HEX: 64 ; inline -: LDAP_RES_SEARCH_REFERENCE HEX: 73 ; inline -: LDAP_RES_SEARCH_RESULT HEX: 65 ; inline -: LDAP_RES_MODIFY HEX: 67 ; inline -: LDAP_RES_ADD HEX: 69 ; inline -: LDAP_RES_DELETE HEX: 6b ; inline -: LDAP_RES_MODDN HEX: 6d ; inline -: LDAP_RES_COMPARE HEX: 6f ; inline -: LDAP_RES_EXTENDED HEX: 78 ; inline -: LDAP_RES_EXTENDED_PARTIAL HEX: 79 ; inline +: LDAP_RES_BIND 0x61 ; inline +: LDAP_RES_SEARCH_ENTRY 0x64 ; inline +: LDAP_RES_SEARCH_REFERENCE 0x73 ; inline +: LDAP_RES_SEARCH_RESULT 0x65 ; inline +: LDAP_RES_MODIFY 0x67 ; inline +: LDAP_RES_ADD 0x69 ; inline +: LDAP_RES_DELETE 0x6b ; inline +: LDAP_RES_MODDN 0x6d ; inline +: LDAP_RES_COMPARE 0x6f ; inline +: LDAP_RES_EXTENDED 0x78 ; inline +: LDAP_RES_EXTENDED_PARTIAL 0x79 ; inline : result-types ( -- seq ) { - { HEX: 61 "LDAP_RES_BIND" } - { HEX: 64 "LDAP_RES_SEARCH_ENTRY" } - { HEX: 73 "LDAP_RES_SEARCH_REFERENCE" } - { HEX: 65 "LDAP_RES_SEARCH_RESULT" } - { HEX: 67 "LDAP_RES_MODIFY" } - { HEX: 69 "LDAP_RES_ADD" } - { HEX: 6b "LDAP_RES_DELETE" } - { HEX: 6d "LDAP_RES_MODDN" } - { HEX: 6f "LDAP_RES_COMPARE" } - { HEX: 78 "LDAP_RES_EXTENDED" } - { HEX: 79 "LDAP_RES_EXTENDED_PARTIAL" } + { 0x61 "LDAP_RES_BIND" } + { 0x64 "LDAP_RES_SEARCH_ENTRY" } + { 0x73 "LDAP_RES_SEARCH_REFERENCE" } + { 0x65 "LDAP_RES_SEARCH_RESULT" } + { 0x67 "LDAP_RES_MODIFY" } + { 0x69 "LDAP_RES_ADD" } + { 0x6b "LDAP_RES_DELETE" } + { 0x6d "LDAP_RES_MODDN" } + { 0x6f "LDAP_RES_COMPARE" } + { 0x78 "LDAP_RES_EXTENDED" } + { 0x79 "LDAP_RES_EXTENDED_PARTIAL" } } ; -: LDAP_OPT_PROTOCOL_VERSION HEX: 0011 ; inline +: LDAP_OPT_PROTOCOL_VERSION 0x0011 ; inline C-STRUCT: ldap { "char" "ld_lberoptions" } diff --git a/unmaintained/math/derivatives/derivatives.factor b/unmaintained/math/derivatives/derivatives.factor index 7922a48a6b..95fd51cf75 100644 --- a/unmaintained/math/derivatives/derivatives.factor +++ b/unmaintained/math/derivatives/derivatives.factor @@ -6,7 +6,7 @@ IN: math.derivatives TUPLE: state x func h err i j errt fac hh ans a done ; -: largest-float ( -- x ) HEX: 7fefffffffffffff bits>double ; foldable +: largest-float ( -- x ) 0x7fefffffffffffff bits>double ; foldable : ntab ( -- val ) 8 ; inline : con ( -- val ) 1.6 ; inline : con2 ( -- val ) con con * ; inline diff --git a/unmaintained/oracle/liboci/liboci.factor b/unmaintained/oracle/liboci/liboci.factor index 4e8ebfc860..52f09cbd84 100644 --- a/unmaintained/oracle/liboci/liboci.factor +++ b/unmaintained/oracle/liboci/liboci.factor @@ -28,15 +28,15 @@ IN: oracle.liboci ! Various Modes ! =============================================== -: OCI_DEFAULT HEX: 00 ; inline ! default value for parameters and attributes -: OCI_THREADED HEX: 01 ; inline ! appl. in threaded environment -: OCI_OBJECT HEX: 02 ; inline ! application in object environment +: OCI_DEFAULT 0x00 ; inline ! default value for parameters and attributes +: OCI_THREADED 0x01 ; inline ! appl. in threaded environment +: OCI_OBJECT 0x02 ; inline ! application in object environment ! =============================================== ! Execution Modes ! =============================================== -: OCI_DESCRIBE_ONLY HEX: 10 ; inline ! only describe the statement +: OCI_DESCRIBE_ONLY 0x10 ; inline ! only describe the statement ! =============================================== ! Credential Types @@ -73,14 +73,14 @@ IN: oracle.liboci ! (and default) orientation is OCI_FETCH_NEXT ! =============================================== -: OCI_FETCH_CURRENT HEX: 01 ; inline ! refetching current position -: OCI_FETCH_NEXT HEX: 02 ; inline ! next row -: OCI_FETCH_FIRST HEX: 04 ; inline ! first row of the result set -: OCI_FETCH_LAST HEX: 08 ; inline ! the last row of the result set -: OCI_FETCH_PRIOR HEX: 10 ; inline ! the previous row relative to current -: OCI_FETCH_ABSOLUTE HEX: 20 ; inline ! absolute offset from first -: OCI_FETCH_RELATIVE HEX: 40 ; inline ! offset relative to current -: OCI_FETCH_RESERVED_1 HEX: 80 ; inline ! reserved +: OCI_FETCH_CURRENT 0x01 ; inline ! refetching current position +: OCI_FETCH_NEXT 0x02 ; inline ! next row +: OCI_FETCH_FIRST 0x04 ; inline ! first row of the result set +: OCI_FETCH_LAST 0x08 ; inline ! the last row of the result set +: OCI_FETCH_PRIOR 0x10 ; inline ! the previous row relative to current +: OCI_FETCH_ABSOLUTE 0x20 ; inline ! absolute offset from first +: OCI_FETCH_RELATIVE 0x40 ; inline ! offset relative to current +: OCI_FETCH_RESERVED_1 0x80 ; inline ! reserved ! =============================================== ! Handle Types diff --git a/unmaintained/pdf/libhpdf/libhpdf.factor b/unmaintained/pdf/libhpdf/libhpdf.factor index 49e02d4f8f..a0d9ca3bb3 100644 --- a/unmaintained/pdf/libhpdf/libhpdf.factor +++ b/unmaintained/pdf/libhpdf/libhpdf.factor @@ -16,12 +16,12 @@ IN: pdf.libhpdf } cond add-library >> ! compression mode -: HPDF_COMP_NONE HEX: 00 ; inline ! No contents are compressed -: HPDF_COMP_TEXT HEX: 01 ; inline ! Compress contents stream of page -: HPDF_COMP_IMAGE HEX: 02 ; inline ! Compress streams of image objects -: HPDF_COMP_METADATA HEX: 04 ; inline ! Compress other data (fonts, cmaps...) -: HPDF_COMP_ALL HEX: 0F ; inline ! All stream data are compressed -: HPDF_COMP_MASK HEX: FF ; inline +: HPDF_COMP_NONE 0x00 ; inline ! No contents are compressed +: HPDF_COMP_TEXT 0x01 ; inline ! Compress contents stream of page +: HPDF_COMP_IMAGE 0x02 ; inline ! Compress streams of image objects +: HPDF_COMP_METADATA 0x04 ; inline ! Compress other data (fonts, cmaps...) +: HPDF_COMP_ALL 0x0F ; inline ! All stream data are compressed +: HPDF_COMP_MASK 0xFF ; inline ! page mode CONSTANT: HPDF_PAGE_MODE_USE_NONE 0 @@ -31,102 +31,102 @@ CONSTANT: HPDF_PAGE_MODE_FULL_SCREEN 3 CONSTANT: HPDF_PAGE_MODE_EOF 4 : error-code ( -- seq ) { - { HEX: 1001 "HPDF_ARRAY_COUNT_ERR\nInternal error. The consistency of the data was lost." } - { HEX: 1002 "HPDF_ARRAY_ITEM_NOT_FOUND\nInternal error. The consistency of the data was lost." } - { HEX: 1003 "HPDF_ARRAY_ITEM_UNEXPECTED_TYPE\nInternal error. The consistency of the data was lost." } - { HEX: 1004 "HPDF_BINARY_LENGTH_ERR\nThe length of the data exceeds HPDF_LIMIT_MAX_STRING_LEN." } - { HEX: 1005 "HPDF_CANNOT_GET_PALLET\nCannot get a pallet data from PNG image." } - { HEX: 1007 "HPDF_DICT_COUNT_ERR\nThe count of elements of a dictionary exceeds HPDF_LIMIT_MAX_DICT_ELEMENT" } - { HEX: 1008 "HPDF_DICT_ITEM_NOT_FOUND\nInternal error. The consistency of the data was lost." } - { HEX: 1009 "HPDF_DICT_ITEM_UNEXPECTED_TYPE\nInternal error. The consistency of the data was lost." } - { HEX: 100A "HPDF_DICT_STREAM_LENGTH_NOT_FOUND\nInternal error. The consistency of the data was lost." } - { HEX: 100B "HPDF_DOC_ENCRYPTDICT_NOT_FOUND\nHPDF_SetPermission() OR HPDF_SetEncryptMode() was called before a password is set." } - { HEX: 100C "HPDF_DOC_INVALID_OBJECT\nInternal error. The consistency of the data was lost." } - { HEX: 100E "HPDF_DUPLICATE_REGISTRATION\nTried to register a font that has been registered." } - { HEX: 100F "HPDF_EXCEED_JWW_CODE_NUM_LIMIT\nCannot register a character to the japanese word wrap characters list." } - { HEX: 1011 "HPDF_ENCRYPT_INVALID_PASSWORD\nTried to set the owner password to NULL. owner password and user password is the same." } - { HEX: 1013 "HPDF_ERR_UNKNOWN_CLASS\nInternal error. The consistency of the data was lost." } - { HEX: 1014 "HPDF_EXCEED_GSTATE_LIMIT\nThe depth of the stack exceeded HPDF_LIMIT_MAX_GSTATE." } - { HEX: 1015 "HPDF_FAILED_TO_ALLOC_MEM\nMemory allocation failed." } - { HEX: 1016 "HPDF_FILE_IO_ERROR\nFile processing failed. (A detailed code is set.)" } - { HEX: 1017 "HPDF_FILE_OPEN_ERROR\nCannot open a file. (A detailed code is set.)" } - { HEX: 1019 "HPDF_FONT_EXISTS\nTried to load a font that has already been registered." } - { HEX: 101A "HPDF_FONT_INVALID_WIDTHS_TABLE\nThe format of a font-file is invalid . Internal error. The consistency of the data was lost." } - { HEX: 101B "HPDF_INVALID_AFM_HEADER\nCannot recognize a header of an afm file." } - { HEX: 101C "HPDF_INVALID_ANNOTATION\nThe specified annotation handle is invalid." } - { HEX: 101E "HPDF_INVALID_BIT_PER_COMPONENT\nBit-per-component of a image which was set as mask-image is invalid." } - { HEX: 101F "HPDF_INVALID_CHAR_MATRICS_DATA\nCannot recognize char-matrics-data of an afm file." } - { HEX: 1020 "HPDF_INVALID_COLOR_SPACE\n1. The color_space parameter of HPDF_LoadRawImage is invalid.\n2. Color-space of a image which was set as mask-image is invalid.\n3. The function which is invalid in the present color-space was invoked." } - { HEX: 1021 "HPDF_INVALID_COMPRESSION_MODE\nInvalid value was set when invoking HPDF_SetCommpressionMode()." } - { HEX: 1022 "HPDF_INVALID_DATE_TIME\nAn invalid date-time value was set." } - { HEX: 1023 "HPDF_INVALID_DESTINATION\nAn invalid destination handle was set." } - { HEX: 1025 "HPDF_INVALID_DOCUMENT\nAn invalid document handle is set." } - { HEX: 1026 "HPDF_INVALID_DOCUMENT_STATE\nThe function which is invalid in the present state was invoked." } - { HEX: 1027 "HPDF_INVALID_ENCODER\nAn invalid encoder handle was set." } - { HEX: 1028 "HPDF_INVALID_ENCODER_TYPE\nA combination between font and encoder is wrong." } - { HEX: 102B "HPDF_INVALID_ENCODING_NAME\nAn Invalid encoding name is specified." } - { HEX: 102C "HPDF_INVALID_ENCRYPT_KEY_LEN\nThe lengh of the key of encryption is invalid." } - { HEX: 102D "HPDF_INVALID_FONTDEF_DATA\n1. An invalid font handle was set.\n2. Unsupported font format." } - { HEX: 102E "HPDF_INVALID_FONTDEF_TYPE\nInternal error. The consistency of the data was lost." } - { HEX: 102F "HPDF_INVALID_FONT_NAME\nA font which has the specified name is not found." } - { HEX: 1030 "HPDF_INVALID_IMAGE\nUnsupported image format." } - { HEX: 1031 "HPDF_INVALID_JPEG_DATA\nUnsupported image format." } - { HEX: 1032 "HPDF_INVALID_N_DATA\nCannot read a postscript-name from an afm file." } - { HEX: 1033 "HPDF_INVALID_OBJECT\n1. An invalid object is set.\n2. Internal error. The consistency of the data was lost." } - { HEX: 1034 "HPDF_INVALID_OBJ_ID\nInternal error. The consistency of the data was lost." } - { HEX: 1035 "HPDF_INVALID_OPERATION\nInvoked HPDF_Image_SetColorMask() against the image-object which was set a mask-image." } - { HEX: 1036 "HPDF_INVALID_OUTLINE\nAn invalid outline-handle was specified." } - { HEX: 1037 "HPDF_INVALID_PAGE\nAn invalid page-handle was specified." } - { HEX: 1038 "HPDF_INVALID_PAGES\nAn invalid pages-handle was specified. (internal error)" } - { HEX: 1039 "HPDF_INVALID_PARAMETER\nAn invalid value is set." } - { HEX: 103B "HPDF_INVALID_PNG_IMAGE\nInvalid PNG image format." } - { HEX: 103C "HPDF_INVALID_STREAM\nInternal error. The consistency of the data was lost." } - { HEX: 103D "HPDF_MISSING_FILE_NAME_ENTRY\nInternal error. The \"_FILE_NAME\" entry for delayed loading is missing." } - { HEX: 103F "HPDF_INVALID_TTC_FILE\nInvalid .TTC file format." } - { HEX: 1040 "HPDF_INVALID_TTC_INDEX\nThe index parameter was exceed the number of included fonts" } - { HEX: 1041 "HPDF_INVALID_WX_DATA\nCannot read a width-data from an afm file." } - { HEX: 1042 "HPDF_ITEM_NOT_FOUND\nInternal error. The consistency of the data was lost." } - { HEX: 1043 "HPDF_LIBPNG_ERROR\nAn error has returned from PNGLIB while loading an image." } - { HEX: 1044 "HPDF_NAME_INVALID_VALUE\nInternal error. The consistency of the data was lost." } - { HEX: 1045 "HPDF_NAME_OUT_OF_RANGE\nInternal error. The consistency of the data was lost." } - { HEX: 1049 "HPDF_PAGES_MISSING_KIDS_ENTRY\nInternal error. The consistency of the data was lost." } - { HEX: 104A "HPDF_PAGE_CANNOT_FIND_OBJECT\nInternal error. The consistency of the data was lost." } - { HEX: 104B "HPDF_PAGE_CANNOT_GET_ROOT_PAGES\nInternal error. The consistency of the data was lost." } - { HEX: 104C "HPDF_PAGE_CANNOT_RESTORE_GSTATE\nThere are no graphics-states to be restored." } - { HEX: 104D "HPDF_PAGE_CANNOT_SET_PARENT\nInternal error. The consistency of the data was lost." } - { HEX: 104E "HPDF_PAGE_FONT_NOT_FOUND\nThe current font is not set." } - { HEX: 104F "HPDF_PAGE_INVALID_FONT\nAn invalid font-handle was specified." } - { HEX: 1050 "HPDF_PAGE_INVALID_FONT_SIZE\nAn invalid font-size was set." } - { HEX: 1051 "HPDF_PAGE_INVALID_GMODE\nSee Graphics mode." } - { HEX: 1052 "HPDF_PAGE_INVALID_INDEX\nInternal error. The consistency of the data was lost." } - { HEX: 1053 "HPDF_PAGE_INVALID_ROTATE_VALUE\nThe specified value is not a multiple of 90." } - { HEX: 1054 "HPDF_PAGE_INVALID_SIZE\nAn invalid page-size was set." } - { HEX: 1055 "HPDF_PAGE_INVALID_XOBJECT\nAn invalid image-handle was set." } - { HEX: 1056 "HPDF_PAGE_OUT_OF_RANGE\nThe specified value is out of range." } - { HEX: 1057 "HPDF_REAL_OUT_OF_RANGE\nThe specified value is out of range." } - { HEX: 1058 "HPDF_STREAM_EOF\nUnexpected EOF marker was detected." } - { HEX: 1059 "HPDF_STREAM_READLN_CONTINUE\nInternal error. The consistency of the data was lost." } - { HEX: 105B "HPDF_STRING_OUT_OF_RANGE\nThe length of the specified text is too long." } - { HEX: 105C "HPDF_THIS_FUNC_WAS_SKIPPED\nThe execution of a function was skipped because of other errors." } - { HEX: 105D "HPDF_TTF_CANNOT_EMBEDDING_FONT\nThis font cannot be embedded. (restricted by license.)" } - { HEX: 105E "HPDF_TTF_INVALID_CMAP\nUnsupported ttf format. (cannot find unicode cmap.)" } - { HEX: 105F "HPDF_TTF_INVALID_FOMAT\nUnsupported ttf format." } - { HEX: 1060 "HPDF_TTF_MISSING_TABLE\nUnsupported ttf format. (cannot find a necessary table.)" } - { HEX: 1061 "HPDF_UNSUPPORTED_FONT_TYPE\nInternal error. The consistency of the data was lost." } - { HEX: 1062 "HPDF_UNSUPPORTED_FUNC\n1. The library is not configured to use PNGLIB.\n2. Internal error. The consistency of the data was lost." } - { HEX: 1063 "HPDF_UNSUPPORTED_JPEG_FORMAT\nUnsupported Jpeg format." } - { HEX: 1064 "HPDF_UNSUPPORTED_TYPE1_FONT\nFailed to parse .PFB file." } - { HEX: 1065 "HPDF_XREF_COUNT_ERR\nInternal error. The consistency of the data was lost." } - { HEX: 1066 "HPDF_ZLIB_ERROR\nAn error has occurred while executing a function of Zlib." } - { HEX: 1067 "HPDF_INVALID_PAGE_INDEX\nAn error returned from Zlib." } - { HEX: 1068 "HPDF_INVALID_URI\nAn invalid URI was set." } - { HEX: 1069 "HPDF_PAGELAYOUT_OUT_OF_RANGE\nAn invalid page-layout was set." } - { HEX: 1070 "HPDF_PAGEMODE_OUT_OF_RANGE\nAn invalid page-mode was set." } - { HEX: 1071 "HPDF_PAGENUM_STYLE_OUT_OF_RANGE\nAn invalid page-num-style was set." } - { HEX: 1072 "HPDF_ANNOT_INVALID_ICON\nAn invalid icon was set." } - { HEX: 1073 "HPDF_ANNOT_INVALID_BORDER_STYLE\nAn invalid border-style was set." } - { HEX: 1074 "HPDF_PAGE_INVALID_DIRECTION\nAn invalid page-direction was set." } - { HEX: 1075 "HPDF_INVALID_FONT\nAn invalid font-handle was specified." } + { 0x1001 "HPDF_ARRAY_COUNT_ERR\nInternal error. The consistency of the data was lost." } + { 0x1002 "HPDF_ARRAY_ITEM_NOT_FOUND\nInternal error. The consistency of the data was lost." } + { 0x1003 "HPDF_ARRAY_ITEM_UNEXPECTED_TYPE\nInternal error. The consistency of the data was lost." } + { 0x1004 "HPDF_BINARY_LENGTH_ERR\nThe length of the data exceeds HPDF_LIMIT_MAX_STRING_LEN." } + { 0x1005 "HPDF_CANNOT_GET_PALLET\nCannot get a pallet data from PNG image." } + { 0x1007 "HPDF_DICT_COUNT_ERR\nThe count of elements of a dictionary exceeds HPDF_LIMIT_MAX_DICT_ELEMENT" } + { 0x1008 "HPDF_DICT_ITEM_NOT_FOUND\nInternal error. The consistency of the data was lost." } + { 0x1009 "HPDF_DICT_ITEM_UNEXPECTED_TYPE\nInternal error. The consistency of the data was lost." } + { 0x100A "HPDF_DICT_STREAM_LENGTH_NOT_FOUND\nInternal error. The consistency of the data was lost." } + { 0x100B "HPDF_DOC_ENCRYPTDICT_NOT_FOUND\nHPDF_SetPermission() OR HPDF_SetEncryptMode() was called before a password is set." } + { 0x100C "HPDF_DOC_INVALID_OBJECT\nInternal error. The consistency of the data was lost." } + { 0x100E "HPDF_DUPLICATE_REGISTRATION\nTried to register a font that has been registered." } + { 0x100F "HPDF_EXCEED_JWW_CODE_NUM_LIMIT\nCannot register a character to the japanese word wrap characters list." } + { 0x1011 "HPDF_ENCRYPT_INVALID_PASSWORD\nTried to set the owner password to NULL. owner password and user password is the same." } + { 0x1013 "HPDF_ERR_UNKNOWN_CLASS\nInternal error. The consistency of the data was lost." } + { 0x1014 "HPDF_EXCEED_GSTATE_LIMIT\nThe depth of the stack exceeded HPDF_LIMIT_MAX_GSTATE." } + { 0x1015 "HPDF_FAILED_TO_ALLOC_MEM\nMemory allocation failed." } + { 0x1016 "HPDF_FILE_IO_ERROR\nFile processing failed. (A detailed code is set.)" } + { 0x1017 "HPDF_FILE_OPEN_ERROR\nCannot open a file. (A detailed code is set.)" } + { 0x1019 "HPDF_FONT_EXISTS\nTried to load a font that has already been registered." } + { 0x101A "HPDF_FONT_INVALID_WIDTHS_TABLE\nThe format of a font-file is invalid . Internal error. The consistency of the data was lost." } + { 0x101B "HPDF_INVALID_AFM_HEADER\nCannot recognize a header of an afm file." } + { 0x101C "HPDF_INVALID_ANNOTATION\nThe specified annotation handle is invalid." } + { 0x101E "HPDF_INVALID_BIT_PER_COMPONENT\nBit-per-component of a image which was set as mask-image is invalid." } + { 0x101F "HPDF_INVALID_CHAR_MATRICS_DATA\nCannot recognize char-matrics-data of an afm file." } + { 0x1020 "HPDF_INVALID_COLOR_SPACE\n1. The color_space parameter of HPDF_LoadRawImage is invalid.\n2. Color-space of a image which was set as mask-image is invalid.\n3. The function which is invalid in the present color-space was invoked." } + { 0x1021 "HPDF_INVALID_COMPRESSION_MODE\nInvalid value was set when invoking HPDF_SetCommpressionMode()." } + { 0x1022 "HPDF_INVALID_DATE_TIME\nAn invalid date-time value was set." } + { 0x1023 "HPDF_INVALID_DESTINATION\nAn invalid destination handle was set." } + { 0x1025 "HPDF_INVALID_DOCUMENT\nAn invalid document handle is set." } + { 0x1026 "HPDF_INVALID_DOCUMENT_STATE\nThe function which is invalid in the present state was invoked." } + { 0x1027 "HPDF_INVALID_ENCODER\nAn invalid encoder handle was set." } + { 0x1028 "HPDF_INVALID_ENCODER_TYPE\nA combination between font and encoder is wrong." } + { 0x102B "HPDF_INVALID_ENCODING_NAME\nAn Invalid encoding name is specified." } + { 0x102C "HPDF_INVALID_ENCRYPT_KEY_LEN\nThe lengh of the key of encryption is invalid." } + { 0x102D "HPDF_INVALID_FONTDEF_DATA\n1. An invalid font handle was set.\n2. Unsupported font format." } + { 0x102E "HPDF_INVALID_FONTDEF_TYPE\nInternal error. The consistency of the data was lost." } + { 0x102F "HPDF_INVALID_FONT_NAME\nA font which has the specified name is not found." } + { 0x1030 "HPDF_INVALID_IMAGE\nUnsupported image format." } + { 0x1031 "HPDF_INVALID_JPEG_DATA\nUnsupported image format." } + { 0x1032 "HPDF_INVALID_N_DATA\nCannot read a postscript-name from an afm file." } + { 0x1033 "HPDF_INVALID_OBJECT\n1. An invalid object is set.\n2. Internal error. The consistency of the data was lost." } + { 0x1034 "HPDF_INVALID_OBJ_ID\nInternal error. The consistency of the data was lost." } + { 0x1035 "HPDF_INVALID_OPERATION\nInvoked HPDF_Image_SetColorMask() against the image-object which was set a mask-image." } + { 0x1036 "HPDF_INVALID_OUTLINE\nAn invalid outline-handle was specified." } + { 0x1037 "HPDF_INVALID_PAGE\nAn invalid page-handle was specified." } + { 0x1038 "HPDF_INVALID_PAGES\nAn invalid pages-handle was specified. (internal error)" } + { 0x1039 "HPDF_INVALID_PARAMETER\nAn invalid value is set." } + { 0x103B "HPDF_INVALID_PNG_IMAGE\nInvalid PNG image format." } + { 0x103C "HPDF_INVALID_STREAM\nInternal error. The consistency of the data was lost." } + { 0x103D "HPDF_MISSING_FILE_NAME_ENTRY\nInternal error. The \"_FILE_NAME\" entry for delayed loading is missing." } + { 0x103F "HPDF_INVALID_TTC_FILE\nInvalid .TTC file format." } + { 0x1040 "HPDF_INVALID_TTC_INDEX\nThe index parameter was exceed the number of included fonts" } + { 0x1041 "HPDF_INVALID_WX_DATA\nCannot read a width-data from an afm file." } + { 0x1042 "HPDF_ITEM_NOT_FOUND\nInternal error. The consistency of the data was lost." } + { 0x1043 "HPDF_LIBPNG_ERROR\nAn error has returned from PNGLIB while loading an image." } + { 0x1044 "HPDF_NAME_INVALID_VALUE\nInternal error. The consistency of the data was lost." } + { 0x1045 "HPDF_NAME_OUT_OF_RANGE\nInternal error. The consistency of the data was lost." } + { 0x1049 "HPDF_PAGES_MISSING_KIDS_ENTRY\nInternal error. The consistency of the data was lost." } + { 0x104A "HPDF_PAGE_CANNOT_FIND_OBJECT\nInternal error. The consistency of the data was lost." } + { 0x104B "HPDF_PAGE_CANNOT_GET_ROOT_PAGES\nInternal error. The consistency of the data was lost." } + { 0x104C "HPDF_PAGE_CANNOT_RESTORE_GSTATE\nThere are no graphics-states to be restored." } + { 0x104D "HPDF_PAGE_CANNOT_SET_PARENT\nInternal error. The consistency of the data was lost." } + { 0x104E "HPDF_PAGE_FONT_NOT_FOUND\nThe current font is not set." } + { 0x104F "HPDF_PAGE_INVALID_FONT\nAn invalid font-handle was specified." } + { 0x1050 "HPDF_PAGE_INVALID_FONT_SIZE\nAn invalid font-size was set." } + { 0x1051 "HPDF_PAGE_INVALID_GMODE\nSee Graphics mode." } + { 0x1052 "HPDF_PAGE_INVALID_INDEX\nInternal error. The consistency of the data was lost." } + { 0x1053 "HPDF_PAGE_INVALID_ROTATE_VALUE\nThe specified value is not a multiple of 90." } + { 0x1054 "HPDF_PAGE_INVALID_SIZE\nAn invalid page-size was set." } + { 0x1055 "HPDF_PAGE_INVALID_XOBJECT\nAn invalid image-handle was set." } + { 0x1056 "HPDF_PAGE_OUT_OF_RANGE\nThe specified value is out of range." } + { 0x1057 "HPDF_REAL_OUT_OF_RANGE\nThe specified value is out of range." } + { 0x1058 "HPDF_STREAM_EOF\nUnexpected EOF marker was detected." } + { 0x1059 "HPDF_STREAM_READLN_CONTINUE\nInternal error. The consistency of the data was lost." } + { 0x105B "HPDF_STRING_OUT_OF_RANGE\nThe length of the specified text is too long." } + { 0x105C "HPDF_THIS_FUNC_WAS_SKIPPED\nThe execution of a function was skipped because of other errors." } + { 0x105D "HPDF_TTF_CANNOT_EMBEDDING_FONT\nThis font cannot be embedded. (restricted by license.)" } + { 0x105E "HPDF_TTF_INVALID_CMAP\nUnsupported ttf format. (cannot find unicode cmap.)" } + { 0x105F "HPDF_TTF_INVALID_FOMAT\nUnsupported ttf format." } + { 0x1060 "HPDF_TTF_MISSING_TABLE\nUnsupported ttf format. (cannot find a necessary table.)" } + { 0x1061 "HPDF_UNSUPPORTED_FONT_TYPE\nInternal error. The consistency of the data was lost." } + { 0x1062 "HPDF_UNSUPPORTED_FUNC\n1. The library is not configured to use PNGLIB.\n2. Internal error. The consistency of the data was lost." } + { 0x1063 "HPDF_UNSUPPORTED_JPEG_FORMAT\nUnsupported Jpeg format." } + { 0x1064 "HPDF_UNSUPPORTED_TYPE1_FONT\nFailed to parse .PFB file." } + { 0x1065 "HPDF_XREF_COUNT_ERR\nInternal error. The consistency of the data was lost." } + { 0x1066 "HPDF_ZLIB_ERROR\nAn error has occurred while executing a function of Zlib." } + { 0x1067 "HPDF_INVALID_PAGE_INDEX\nAn error returned from Zlib." } + { 0x1068 "HPDF_INVALID_URI\nAn invalid URI was set." } + { 0x1069 "HPDF_PAGELAYOUT_OUT_OF_RANGE\nAn invalid page-layout was set." } + { 0x1070 "HPDF_PAGEMODE_OUT_OF_RANGE\nAn invalid page-mode was set." } + { 0x1071 "HPDF_PAGENUM_STYLE_OUT_OF_RANGE\nAn invalid page-num-style was set." } + { 0x1072 "HPDF_ANNOT_INVALID_ICON\nAn invalid icon was set." } + { 0x1073 "HPDF_ANNOT_INVALID_BORDER_STYLE\nAn invalid border-style was set." } + { 0x1074 "HPDF_PAGE_INVALID_DIRECTION\nAn invalid page-direction was set." } + { 0x1075 "HPDF_INVALID_FONT\nAn invalid font-handle was specified." } } ; LIBRARY: libhpdf diff --git a/unmaintained/sniffer/io/bsd/bsd.factor b/unmaintained/sniffer/io/bsd/bsd.factor index 5f82b21069..f20469c14d 100644 --- a/unmaintained/sniffer/io/bsd/bsd.factor +++ b/unmaintained/sniffer/io/bsd/bsd.factor @@ -16,13 +16,13 @@ TUPLE: sniffer-spec path ifname ; C: sniffer-spec -: IOCPARM_MASK HEX: 1fff ; inline +: IOCPARM_MASK 0x1fff ; inline : IOCPARM_MAX IOCPARM_MASK 1+ ; inline -: IOC_VOID HEX: 20000000 ; inline -: IOC_OUT HEX: 40000000 ; inline -: IOC_IN HEX: 80000000 ; inline +: IOC_VOID 0x20000000 ; inline +: IOC_OUT 0x40000000 ; inline +: IOC_IN 0x80000000 ; inline : IOC_INOUT IOC_IN IOC_OUT bitor ; inline -: IOC_DIRMASK HEX: e0000000 ; inline +: IOC_DIRMASK 0xe0000000 ; inline :: ioc ( inout group num len -- n ) group first 8 shift num bitor diff --git a/unmaintained/sniffer/io/filter/backend/backend.factor b/unmaintained/sniffer/io/filter/backend/backend.factor index dade8bdebf..2e0415c5a6 100644 --- a/unmaintained/sniffer/io/filter/backend/backend.factor +++ b/unmaintained/sniffer/io/filter/backend/backend.factor @@ -11,7 +11,7 @@ HOOK: packet. io-backend ( string -- ) "--Ethernet Header--" print dup etherneth. dup etherneth-type { - ! HEX: 800 [ ] ! IP - ! HEX: 806 [ ] ! ARP + ! 0x800 [ ] ! IP + ! 0x806 [ ] ! ARP [ "Unknown type: " write .h ] } case 2drop ; -- 2.34.1