diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2018-12-13 21:53:43 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2018-12-13 21:53:43 (GMT) |
commit | ccf90bf696a0852ef34ac2a86137b34e92827ec0 (patch) | |
tree | d43c65faf4316d8a55d67c74f363f3f4371068cd /plugins/pychrysalide | |
parent | 0c6e15aa59918b7d3a1e63258e3f6792266d62e0 (diff) |
Renamed the function registering C constant values into Python objects.
Diffstat (limited to 'plugins/pychrysalide')
-rw-r--r-- | plugins/pychrysalide/analysis/type.c | 10 | ||||
-rw-r--r-- | plugins/pychrysalide/analysis/types/basic.c | 58 | ||||
-rw-r--r-- | plugins/pychrysalide/analysis/types/cse.c | 18 | ||||
-rw-r--r-- | plugins/pychrysalide/analysis/types/encaps.c | 12 | ||||
-rw-r--r-- | plugins/pychrysalide/arch/immediate.c | 12 | ||||
-rw-r--r-- | plugins/pychrysalide/arch/instruction.c | 18 | ||||
-rw-r--r-- | plugins/pychrysalide/arch/module.c | 46 | ||||
-rw-r--r-- | plugins/pychrysalide/arch/processor.c | 4 | ||||
-rw-r--r-- | plugins/pychrysalide/arch/vmpa.c | 4 | ||||
-rw-r--r-- | plugins/pychrysalide/core/logs.c | 14 | ||||
-rw-r--r-- | plugins/pychrysalide/format/format.c | 4 | ||||
-rw-r--r-- | plugins/pychrysalide/format/strsym.c | 8 | ||||
-rw-r--r-- | plugins/pychrysalide/format/symbol.c | 26 | ||||
-rw-r--r-- | plugins/pychrysalide/glibext/bufferline.c | 34 | ||||
-rw-r--r-- | plugins/pychrysalide/glibext/loadedpanel.c | 8 | ||||
-rw-r--r-- | plugins/pychrysalide/gui/panels/panel.c | 10 | ||||
-rw-r--r-- | plugins/pychrysalide/helpers.c | 2 | ||||
-rw-r--r-- | plugins/pychrysalide/helpers.h | 4 | ||||
-rw-r--r-- | plugins/pychrysalide/plugin.c | 56 |
19 files changed, 174 insertions, 174 deletions
diff --git a/plugins/pychrysalide/analysis/type.c b/plugins/pychrysalide/analysis/type.c index ea81642..0134b0a 100644 --- a/plugins/pychrysalide/analysis/type.c +++ b/plugins/pychrysalide/analysis/type.c @@ -406,12 +406,12 @@ static bool py_data_type_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, TQF_NONE); - result &= PyDict_AddIntMacro(obj_type, TQF_RESTRICT); - result &= PyDict_AddIntMacro(obj_type, TQF_VOLATILE); - result &= PyDict_AddIntMacro(obj_type, TQF_CONST); + result &= PyDict_AddULongMacro(obj_type, TQF_NONE); + result &= PyDict_AddULongMacro(obj_type, TQF_RESTRICT); + result &= PyDict_AddULongMacro(obj_type, TQF_VOLATILE); + result &= PyDict_AddULongMacro(obj_type, TQF_CONST); - result &= PyDict_AddIntMacro(obj_type, TQF_ALL); + result &= PyDict_AddULongMacro(obj_type, TQF_ALL); return result; diff --git a/plugins/pychrysalide/analysis/types/basic.c b/plugins/pychrysalide/analysis/types/basic.c index 1bb294b..e421389 100644 --- a/plugins/pychrysalide/analysis/types/basic.c +++ b/plugins/pychrysalide/analysis/types/basic.c @@ -184,35 +184,35 @@ static bool py_basic_type_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, BTP_VOID); - result &= PyDict_AddIntMacro(obj_type, BTP_WCHAR_T); - result &= PyDict_AddIntMacro(obj_type, BTP_BOOL); - result &= PyDict_AddIntMacro(obj_type, BTP_CHAR); - result &= PyDict_AddIntMacro(obj_type, BTP_SCHAR); - result &= PyDict_AddIntMacro(obj_type, BTP_UCHAR); - result &= PyDict_AddIntMacro(obj_type, BTP_SHORT); - result &= PyDict_AddIntMacro(obj_type, BTP_USHORT); - result &= PyDict_AddIntMacro(obj_type, BTP_INT); - result &= PyDict_AddIntMacro(obj_type, BTP_UINT); - result &= PyDict_AddIntMacro(obj_type, BTP_LONG); - result &= PyDict_AddIntMacro(obj_type, BTP_ULONG); - result &= PyDict_AddIntMacro(obj_type, BTP_LONG_LONG); - result &= PyDict_AddIntMacro(obj_type, BTP_ULONG_LONG); - result &= PyDict_AddIntMacro(obj_type, BTP_INT128); - result &= PyDict_AddIntMacro(obj_type, BTP_UINT128); - result &= PyDict_AddIntMacro(obj_type, BTP_FLOAT); - result &= PyDict_AddIntMacro(obj_type, BTP_DOUBLE); - result &= PyDict_AddIntMacro(obj_type, BTP_LONG_DOUBLE); - result &= PyDict_AddIntMacro(obj_type, BTP_FLOAT128); - result &= PyDict_AddIntMacro(obj_type, BTP_ELLIPSIS); - result &= PyDict_AddIntMacro(obj_type, BTP_754R_64); - result &= PyDict_AddIntMacro(obj_type, BTP_754R_128); - result &= PyDict_AddIntMacro(obj_type, BTP_754R_32); - result &= PyDict_AddIntMacro(obj_type, BTP_754R_16); - result &= PyDict_AddIntMacro(obj_type, BTP_CHAR32_T); - result &= PyDict_AddIntMacro(obj_type, BTP_CHAR16_T); - - result &= PyDict_AddIntMacro(obj_type, BTP_INVALID); + result &= PyDict_AddULongMacro(obj_type, BTP_VOID); + result &= PyDict_AddULongMacro(obj_type, BTP_WCHAR_T); + result &= PyDict_AddULongMacro(obj_type, BTP_BOOL); + result &= PyDict_AddULongMacro(obj_type, BTP_CHAR); + result &= PyDict_AddULongMacro(obj_type, BTP_SCHAR); + result &= PyDict_AddULongMacro(obj_type, BTP_UCHAR); + result &= PyDict_AddULongMacro(obj_type, BTP_SHORT); + result &= PyDict_AddULongMacro(obj_type, BTP_USHORT); + result &= PyDict_AddULongMacro(obj_type, BTP_INT); + result &= PyDict_AddULongMacro(obj_type, BTP_UINT); + result &= PyDict_AddULongMacro(obj_type, BTP_LONG); + result &= PyDict_AddULongMacro(obj_type, BTP_ULONG); + result &= PyDict_AddULongMacro(obj_type, BTP_LONG_LONG); + result &= PyDict_AddULongMacro(obj_type, BTP_ULONG_LONG); + result &= PyDict_AddULongMacro(obj_type, BTP_INT128); + result &= PyDict_AddULongMacro(obj_type, BTP_UINT128); + result &= PyDict_AddULongMacro(obj_type, BTP_FLOAT); + result &= PyDict_AddULongMacro(obj_type, BTP_DOUBLE); + result &= PyDict_AddULongMacro(obj_type, BTP_LONG_DOUBLE); + result &= PyDict_AddULongMacro(obj_type, BTP_FLOAT128); + result &= PyDict_AddULongMacro(obj_type, BTP_ELLIPSIS); + result &= PyDict_AddULongMacro(obj_type, BTP_754R_64); + result &= PyDict_AddULongMacro(obj_type, BTP_754R_128); + result &= PyDict_AddULongMacro(obj_type, BTP_754R_32); + result &= PyDict_AddULongMacro(obj_type, BTP_754R_16); + result &= PyDict_AddULongMacro(obj_type, BTP_CHAR32_T); + result &= PyDict_AddULongMacro(obj_type, BTP_CHAR16_T); + + result &= PyDict_AddULongMacro(obj_type, BTP_INVALID); return result; diff --git a/plugins/pychrysalide/analysis/types/cse.c b/plugins/pychrysalide/analysis/types/cse.c index 4643a8d..5f0bb0a 100644 --- a/plugins/pychrysalide/analysis/types/cse.c +++ b/plugins/pychrysalide/analysis/types/cse.c @@ -222,15 +222,15 @@ static bool py_class_enum_type_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, CET_UNKNOWN); - result &= PyDict_AddIntMacro(obj_type, CET_STRUCT); - result &= PyDict_AddIntMacro(obj_type, CET_ENUM); - result &= PyDict_AddIntMacro(obj_type, CET_CLASS); - result &= PyDict_AddIntMacro(obj_type, CET_NAMESPACE); - result &= PyDict_AddIntMacro(obj_type, CET_VIRTUAL_TABLE); - result &= PyDict_AddIntMacro(obj_type, CET_VIRTUAL_STRUCT); - - result &= PyDict_AddIntMacro(obj_type, CET_COUNT); + result &= PyDict_AddULongMacro(obj_type, CET_UNKNOWN); + result &= PyDict_AddULongMacro(obj_type, CET_STRUCT); + result &= PyDict_AddULongMacro(obj_type, CET_ENUM); + result &= PyDict_AddULongMacro(obj_type, CET_CLASS); + result &= PyDict_AddULongMacro(obj_type, CET_NAMESPACE); + result &= PyDict_AddULongMacro(obj_type, CET_VIRTUAL_TABLE); + result &= PyDict_AddULongMacro(obj_type, CET_VIRTUAL_STRUCT); + + result &= PyDict_AddULongMacro(obj_type, CET_COUNT); return result; diff --git a/plugins/pychrysalide/analysis/types/encaps.c b/plugins/pychrysalide/analysis/types/encaps.c index 2961853..c2d435c 100644 --- a/plugins/pychrysalide/analysis/types/encaps.c +++ b/plugins/pychrysalide/analysis/types/encaps.c @@ -217,13 +217,13 @@ static bool py_encapsulated_type_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, ECT_POINTER); - result &= PyDict_AddIntMacro(obj_type, ECT_REFERENCE); - result &= PyDict_AddIntMacro(obj_type, ECT_RVALUE_REF); - result &= PyDict_AddIntMacro(obj_type, ECT_COMPLEX); - result &= PyDict_AddIntMacro(obj_type, ECT_IMAGINARY); + result &= PyDict_AddULongMacro(obj_type, ECT_POINTER); + result &= PyDict_AddULongMacro(obj_type, ECT_REFERENCE); + result &= PyDict_AddULongMacro(obj_type, ECT_RVALUE_REF); + result &= PyDict_AddULongMacro(obj_type, ECT_COMPLEX); + result &= PyDict_AddULongMacro(obj_type, ECT_IMAGINARY); - result &= PyDict_AddIntMacro(obj_type, ECT_COUNT); + result &= PyDict_AddULongMacro(obj_type, ECT_COUNT); return result; diff --git a/plugins/pychrysalide/arch/immediate.c b/plugins/pychrysalide/arch/immediate.c index 5ee2d41..4c538e4 100644 --- a/plugins/pychrysalide/arch/immediate.c +++ b/plugins/pychrysalide/arch/immediate.c @@ -579,12 +579,12 @@ static bool py_imm_operand_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, IOD_BIN); - result &= PyDict_AddIntMacro(obj_type, IOD_OCT); - result &= PyDict_AddIntMacro(obj_type, IOD_DEC); - result &= PyDict_AddIntMacro(obj_type, IOD_HEX); - result &= PyDict_AddIntMacro(obj_type, IOD_CHAR); - result &= PyDict_AddIntMacro(obj_type, IOD_COUNT); + result &= PyDict_AddULongMacro(obj_type, IOD_BIN); + result &= PyDict_AddULongMacro(obj_type, IOD_OCT); + result &= PyDict_AddULongMacro(obj_type, IOD_DEC); + result &= PyDict_AddULongMacro(obj_type, IOD_HEX); + result &= PyDict_AddULongMacro(obj_type, IOD_CHAR); + result &= PyDict_AddULongMacro(obj_type, IOD_COUNT); return result; diff --git a/plugins/pychrysalide/arch/instruction.c b/plugins/pychrysalide/arch/instruction.c index 6399d63..ce554ee 100644 --- a/plugins/pychrysalide/arch/instruction.c +++ b/plugins/pychrysalide/arch/instruction.c @@ -443,15 +443,15 @@ static bool py_arch_instruction_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, ILT_EXEC_FLOW); - result &= PyDict_AddIntMacro(obj_type, ILT_JUMP); - result &= PyDict_AddIntMacro(obj_type, ILT_CASE_JUMP); - result &= PyDict_AddIntMacro(obj_type, ILT_JUMP_IF_TRUE); - result &= PyDict_AddIntMacro(obj_type, ILT_JUMP_IF_FALSE); - result &= PyDict_AddIntMacro(obj_type, ILT_LOOP); - result &= PyDict_AddIntMacro(obj_type, ILT_CALL); - result &= PyDict_AddIntMacro(obj_type, ILT_CATCH_EXCEPTION); - result &= PyDict_AddIntMacro(obj_type, ILT_REF); + result &= PyDict_AddULongMacro(obj_type, ILT_EXEC_FLOW); + result &= PyDict_AddULongMacro(obj_type, ILT_JUMP); + result &= PyDict_AddULongMacro(obj_type, ILT_CASE_JUMP); + result &= PyDict_AddULongMacro(obj_type, ILT_JUMP_IF_TRUE); + result &= PyDict_AddULongMacro(obj_type, ILT_JUMP_IF_FALSE); + result &= PyDict_AddULongMacro(obj_type, ILT_LOOP); + result &= PyDict_AddULongMacro(obj_type, ILT_CALL); + result &= PyDict_AddULongMacro(obj_type, ILT_CATCH_EXCEPTION); + result &= PyDict_AddULongMacro(obj_type, ILT_REF); return result; diff --git a/plugins/pychrysalide/arch/module.c b/plugins/pychrysalide/arch/module.c index db514ef..40b8d71 100644 --- a/plugins/pychrysalide/arch/module.c +++ b/plugins/pychrysalide/arch/module.c @@ -69,25 +69,25 @@ static bool py_base_define_constants(PyTypeObject *obj_type) result = true; - if (result) result = PyDict_AddIntMacro(obj_type, MDS_UNDEFINED); - - if (result) result = PyDict_AddIntMacro(obj_type, MDS_4_BITS_UNSIGNED); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_8_BITS_UNSIGNED); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_16_BITS_UNSIGNED); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_32_BITS_UNSIGNED); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_64_BITS_UNSIGNED); - - if (result) result = PyDict_AddIntMacro(obj_type, MDS_4_BITS_SIGNED); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_8_BITS_SIGNED); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_16_BITS_SIGNED); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_32_BITS_SIGNED); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_64_BITS_SIGNED); - - if (result) result = PyDict_AddIntMacro(obj_type, MDS_4_BITS); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_8_BITS); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_16_BITS); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_32_BITS); - if (result) result = PyDict_AddIntMacro(obj_type, MDS_64_BITS); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_UNDEFINED); + + if (result) result = PyDict_AddULongMacro(obj_type, MDS_4_BITS_UNSIGNED); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_8_BITS_UNSIGNED); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_16_BITS_UNSIGNED); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_32_BITS_UNSIGNED); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_64_BITS_UNSIGNED); + + if (result) result = PyDict_AddULongMacro(obj_type, MDS_4_BITS_SIGNED); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_8_BITS_SIGNED); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_16_BITS_SIGNED); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_32_BITS_SIGNED); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_64_BITS_SIGNED); + + if (result) result = PyDict_AddULongMacro(obj_type, MDS_4_BITS); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_8_BITS); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_16_BITS); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_32_BITS); + if (result) result = PyDict_AddULongMacro(obj_type, MDS_64_BITS); /** * Comme il existe déjà le module struct, de nouvelles primitives de @@ -97,10 +97,10 @@ static bool py_base_define_constants(PyTypeObject *obj_type) * pour exporter les constantes suivantes. */ - if (result) result = PyDict_AddIntMacro(obj_type, SRE_LITTLE); - if (result) result = PyDict_AddIntMacro(obj_type, SRE_LITTLE_WORD); - if (result) result = PyDict_AddIntMacro(obj_type, SRE_BIG_WORD); - if (result) result = PyDict_AddIntMacro(obj_type, SRE_BIG); + if (result) result = PyDict_AddULongMacro(obj_type, SRE_LITTLE); + if (result) result = PyDict_AddULongMacro(obj_type, SRE_LITTLE_WORD); + if (result) result = PyDict_AddULongMacro(obj_type, SRE_BIG_WORD); + if (result) result = PyDict_AddULongMacro(obj_type, SRE_BIG); return result; diff --git a/plugins/pychrysalide/arch/processor.c b/plugins/pychrysalide/arch/processor.c index 2ecf6b8..115f980 100644 --- a/plugins/pychrysalide/arch/processor.c +++ b/plugins/pychrysalide/arch/processor.c @@ -850,8 +850,8 @@ static bool define_python_arch_processor_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, APE_DISASSEMBLY); - result &= PyDict_AddIntMacro(obj_type, APE_LABEL); + result &= PyDict_AddULongMacro(obj_type, APE_DISASSEMBLY); + result &= PyDict_AddULongMacro(obj_type, APE_LABEL); return result; diff --git a/plugins/pychrysalide/arch/vmpa.c b/plugins/pychrysalide/arch/vmpa.c index f2450bb..b89c3d7 100644 --- a/plugins/pychrysalide/arch/vmpa.c +++ b/plugins/pychrysalide/arch/vmpa.c @@ -535,8 +535,8 @@ static bool py_vmpa_define_constants(PyTypeObject *obj_type) result = true; - if (result) result = PyDict_AddIntMacro(obj_type, VMPA_NO_PHYSICAL); - if (result) result = PyDict_AddIntMacro(obj_type, VMPA_NO_VIRTUAL); + if (result) result = PyDict_AddULongMacro(obj_type, VMPA_NO_PHYSICAL); + if (result) result = PyDict_AddULongMacro(obj_type, VMPA_NO_VIRTUAL); return result; diff --git a/plugins/pychrysalide/core/logs.c b/plugins/pychrysalide/core/logs.c index 589315e..38084c4 100644 --- a/plugins/pychrysalide/core/logs.c +++ b/plugins/pychrysalide/core/logs.c @@ -233,13 +233,13 @@ static bool define_python_log_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, LMT_INFO); - result &= PyDict_AddIntMacro(obj_type, LMT_PROCESS); - result &= PyDict_AddIntMacro(obj_type, LMT_WARNING); - result &= PyDict_AddIntMacro(obj_type, LMT_BAD_BINARY); - result &= PyDict_AddIntMacro(obj_type, LMT_ERROR); - result &= PyDict_AddIntMacro(obj_type, LMT_EXT_ERROR); - result &= PyDict_AddIntMacro(obj_type, LMT_COUNT); + result &= PyDict_AddULongMacro(obj_type, LMT_INFO); + result &= PyDict_AddULongMacro(obj_type, LMT_PROCESS); + result &= PyDict_AddULongMacro(obj_type, LMT_WARNING); + result &= PyDict_AddULongMacro(obj_type, LMT_BAD_BINARY); + result &= PyDict_AddULongMacro(obj_type, LMT_ERROR); + result &= PyDict_AddULongMacro(obj_type, LMT_EXT_ERROR); + result &= PyDict_AddULongMacro(obj_type, LMT_COUNT); return result; diff --git a/plugins/pychrysalide/format/format.c b/plugins/pychrysalide/format/format.c index 154bef3..2affeba 100644 --- a/plugins/pychrysalide/format/format.c +++ b/plugins/pychrysalide/format/format.c @@ -614,8 +614,8 @@ static bool define_python_binary_format_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, BFE_SPECIFICATION); - result &= PyDict_AddIntMacro(obj_type, BFE_STRUCTURE); + result &= PyDict_AddULongMacro(obj_type, BFE_SPECIFICATION); + result &= PyDict_AddULongMacro(obj_type, BFE_STRUCTURE); return result; diff --git a/plugins/pychrysalide/format/strsym.c b/plugins/pychrysalide/format/strsym.c index f0f47d0..30224f8 100644 --- a/plugins/pychrysalide/format/strsym.c +++ b/plugins/pychrysalide/format/strsym.c @@ -161,11 +161,11 @@ static bool py_string_symbol_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, SET_ASCII); - result &= PyDict_AddIntMacro(obj_type, SET_UTF_8); - result &= PyDict_AddIntMacro(obj_type, SET_MUTF_8); + result &= PyDict_AddULongMacro(obj_type, SET_ASCII); + result &= PyDict_AddULongMacro(obj_type, SET_UTF_8); + result &= PyDict_AddULongMacro(obj_type, SET_MUTF_8); - result &= PyDict_AddIntMacro(obj_type, SET_GUESS); + result &= PyDict_AddULongMacro(obj_type, SET_GUESS); return result; diff --git a/plugins/pychrysalide/format/symbol.c b/plugins/pychrysalide/format/symbol.c index f75f762..c948423 100644 --- a/plugins/pychrysalide/format/symbol.c +++ b/plugins/pychrysalide/format/symbol.c @@ -339,19 +339,19 @@ static bool py_binary_symbol_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, STP_DATA); - result &= PyDict_AddIntMacro(obj_type, STP_ROUTINE); - result &= PyDict_AddIntMacro(obj_type, STP_CODE_LABEL); - result &= PyDict_AddIntMacro(obj_type, STP_OBJECT); - result &= PyDict_AddIntMacro(obj_type, STP_ENTRY_POINT); - result &= PyDict_AddIntMacro(obj_type, STP_RO_STRING); - result &= PyDict_AddIntMacro(obj_type, STP_DYN_STRING); - result &= PyDict_AddIntMacro(obj_type, STP_COUNT); - - result &= PyDict_AddIntMacro(obj_type, SSS_INTERNAL); - result &= PyDict_AddIntMacro(obj_type, SSS_EXPORTED); - result &= PyDict_AddIntMacro(obj_type, SSS_IMPORTED); - result &= PyDict_AddIntMacro(obj_type, SSS_DYNAMIC); + result &= PyDict_AddULongMacro(obj_type, STP_DATA); + result &= PyDict_AddULongMacro(obj_type, STP_ROUTINE); + result &= PyDict_AddULongMacro(obj_type, STP_CODE_LABEL); + result &= PyDict_AddULongMacro(obj_type, STP_OBJECT); + result &= PyDict_AddULongMacro(obj_type, STP_ENTRY_POINT); + result &= PyDict_AddULongMacro(obj_type, STP_RO_STRING); + result &= PyDict_AddULongMacro(obj_type, STP_DYN_STRING); + result &= PyDict_AddULongMacro(obj_type, STP_COUNT); + + result &= PyDict_AddULongMacro(obj_type, SSS_INTERNAL); + result &= PyDict_AddULongMacro(obj_type, SSS_EXPORTED); + result &= PyDict_AddULongMacro(obj_type, SSS_IMPORTED); + result &= PyDict_AddULongMacro(obj_type, SSS_DYNAMIC); return result; diff --git a/plugins/pychrysalide/glibext/bufferline.c b/plugins/pychrysalide/glibext/bufferline.c index 5bc8449..40bbcbf 100644 --- a/plugins/pychrysalide/glibext/bufferline.c +++ b/plugins/pychrysalide/glibext/bufferline.c @@ -253,23 +253,23 @@ static bool py_buffer_line_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, BLC_PHYSICAL); - result &= PyDict_AddIntMacro(obj_type, BLC_VIRTUAL); - result &= PyDict_AddIntMacro(obj_type, BLC_BINARY); - result &= PyDict_AddIntMacro(obj_type, BLC_ASSEMBLY_HEAD); - result &= PyDict_AddIntMacro(obj_type, BLC_ASSEMBLY); - result &= PyDict_AddIntMacro(obj_type, BLC_COMMENTS); - result &= PyDict_AddIntMacro(obj_type, BLC_COUNT); - result &= PyDict_AddIntMacro(obj_type, BLC_LAST_USED); - result &= PyDict_AddIntMacro(obj_type, BLC_INVALID); - result &= PyDict_AddIntMacro(obj_type, BLC_MAIN); - result &= PyDict_AddIntMacro(obj_type, BLC_FIRST); - result &= PyDict_AddIntMacro(obj_type, BLC_DISPLAY); - - result &= PyDict_AddIntMacro(obj_type, BLF_NONE); - result &= PyDict_AddIntMacro(obj_type, BLF_HAS_CODE); - result &= PyDict_AddIntMacro(obj_type, BLF_ENTRYPOINT); - result &= PyDict_AddIntMacro(obj_type, BLF_BOOKMARK); + result &= PyDict_AddULongMacro(obj_type, BLC_PHYSICAL); + result &= PyDict_AddULongMacro(obj_type, BLC_VIRTUAL); + result &= PyDict_AddULongMacro(obj_type, BLC_BINARY); + result &= PyDict_AddULongMacro(obj_type, BLC_ASSEMBLY_HEAD); + result &= PyDict_AddULongMacro(obj_type, BLC_ASSEMBLY); + result &= PyDict_AddULongMacro(obj_type, BLC_COMMENTS); + result &= PyDict_AddULongMacro(obj_type, BLC_COUNT); + result &= PyDict_AddULongMacro(obj_type, BLC_LAST_USED); + result &= PyDict_AddULongMacro(obj_type, BLC_INVALID); + result &= PyDict_AddULongMacro(obj_type, BLC_MAIN); + result &= PyDict_AddULongMacro(obj_type, BLC_FIRST); + result &= PyDict_AddULongMacro(obj_type, BLC_DISPLAY); + + result &= PyDict_AddULongMacro(obj_type, BLF_NONE); + result &= PyDict_AddULongMacro(obj_type, BLF_HAS_CODE); + result &= PyDict_AddULongMacro(obj_type, BLF_ENTRYPOINT); + result &= PyDict_AddULongMacro(obj_type, BLF_BOOKMARK); return result; diff --git a/plugins/pychrysalide/glibext/loadedpanel.c b/plugins/pychrysalide/glibext/loadedpanel.c index 4dfb5c2..ce94b27 100644 --- a/plugins/pychrysalide/glibext/loadedpanel.c +++ b/plugins/pychrysalide/glibext/loadedpanel.c @@ -160,10 +160,10 @@ static bool py_loaded_panel_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, SPT_RAW); - result &= PyDict_AddIntMacro(obj_type, SPT_TOP); - result &= PyDict_AddIntMacro(obj_type, SPT_CENTER); - result &= PyDict_AddIntMacro(obj_type, SPT_BOTTOM); + result &= PyDict_AddULongMacro(obj_type, SPT_RAW); + result &= PyDict_AddULongMacro(obj_type, SPT_TOP); + result &= PyDict_AddULongMacro(obj_type, SPT_CENTER); + result &= PyDict_AddULongMacro(obj_type, SPT_BOTTOM); return result; diff --git a/plugins/pychrysalide/gui/panels/panel.c b/plugins/pychrysalide/gui/panels/panel.c index 1721780..37b682f 100644 --- a/plugins/pychrysalide/gui/panels/panel.c +++ b/plugins/pychrysalide/gui/panels/panel.c @@ -199,13 +199,13 @@ static bool py_panel_item_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, PIP_INVALID); + result &= PyDict_AddULongMacro(obj_type, PIP_INVALID); - result &= PyDict_AddIntMacro(obj_type, PIP_SINGLETON); - result &= PyDict_AddIntMacro(obj_type, PIP_BINARY_VIEW); - result &= PyDict_AddIntMacro(obj_type, PIP_OTHER); + result &= PyDict_AddULongMacro(obj_type, PIP_SINGLETON); + result &= PyDict_AddULongMacro(obj_type, PIP_BINARY_VIEW); + result &= PyDict_AddULongMacro(obj_type, PIP_OTHER); - result &= PyDict_AddIntMacro(obj_type, PIP_COUNT); + result &= PyDict_AddULongMacro(obj_type, PIP_COUNT); return result; diff --git a/plugins/pychrysalide/helpers.c b/plugins/pychrysalide/helpers.c index dae2aea..ce3d0f4 100644 --- a/plugins/pychrysalide/helpers.c +++ b/plugins/pychrysalide/helpers.c @@ -217,7 +217,7 @@ PyObject *run_python_method(PyObject *module, const char *method, PyObject *args * * ******************************************************************************/ -bool PyDict_AddIntConstant(PyTypeObject *obj_type, const char *key, long value) +bool PyDict_AddULongConstant(PyTypeObject *obj_type, const char *key, unsigned long value) { bool result; /* Bilan à retourner */ PyObject *item; /* Nouvel élément à insérer */ diff --git a/plugins/pychrysalide/helpers.h b/plugins/pychrysalide/helpers.h index 9f02daa..c31c7ad 100644 --- a/plugins/pychrysalide/helpers.h +++ b/plugins/pychrysalide/helpers.h @@ -47,13 +47,13 @@ PyObject *_run_python_method(PyObject *, PyObject *); PyObject *run_python_method(PyObject *, const char *, PyObject *); /* Ajoute une constante au dictionnaire d'un type Python donné. */ -bool PyDict_AddIntConstant(PyTypeObject *, const char *, long); +bool PyDict_AddULongConstant(PyTypeObject *, const char *, unsigned long); /* Ajoute une constante au dictionnaire d'un type Python donné. */ bool PyDict_AddStringConstant(PyTypeObject *, const char *, const char *); -#define PyDict_AddIntMacro(tp, c) PyDict_AddIntConstant(tp, #c, c) +#define PyDict_AddULongMacro(tp, c) PyDict_AddULongConstant(tp, #c, c) #define PyDict_AddStringMacro(tp, c) PyDict_AddStringConstant(tp, #c, c) diff --git a/plugins/pychrysalide/plugin.c b/plugins/pychrysalide/plugin.c index fb2044d..6b6060d 100644 --- a/plugins/pychrysalide/plugin.c +++ b/plugins/pychrysalide/plugin.c @@ -742,34 +742,34 @@ static bool py_plugin_module_define_constants(PyTypeObject *obj_type) result = true; - result &= PyDict_AddIntMacro(obj_type, PGA_BASIC_NONE); - - result &= PyDict_AddIntMacro(obj_type, PGA_PLUGIN_INIT); - result &= PyDict_AddIntMacro(obj_type, PGA_PLUGIN_EXIT); - - result &= PyDict_AddIntMacro(obj_type, PGA_CONTENT_EXPLORER); - result &= PyDict_AddIntMacro(obj_type, PGA_CONTENT_RESOLVER); - result &= PyDict_AddIntMacro(obj_type, PGA_CONTENT_ANALYZED); - - result &= PyDict_AddIntMacro(obj_type, PGA_FORMAT_ANALYSIS_STARTED); - result &= PyDict_AddIntMacro(obj_type, PGA_FORMAT_PRELOAD); - result &= PyDict_AddIntMacro(obj_type, PGA_FORMAT_ATTACH_DEBUG); - result &= PyDict_AddIntMacro(obj_type, PGA_FORMAT_ANALYSIS_ENDED); - result &= PyDict_AddIntMacro(obj_type, PGA_FORMAT_POST_ANALYSIS_STARTED); - result &= PyDict_AddIntMacro(obj_type, PGA_FORMAT_POST_ANALYSIS_ENDED); - - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_STARTED); - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_RAW); - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_HOOKED_LINK); - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_HOOKED_POST); - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_LIMITED); - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_LOOPS); - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_LINKED); - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_GROUPED); - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_RANKED); - result &= PyDict_AddIntMacro(obj_type, PGA_DISASSEMBLY_ENDED); - - result &= PyDict_AddIntMacro(obj_type, PGA_DETECTION_OBFUSCATORS); + result &= PyDict_AddULongMacro(obj_type, PGA_BASIC_NONE); + + result &= PyDict_AddULongMacro(obj_type, PGA_PLUGIN_INIT); + result &= PyDict_AddULongMacro(obj_type, PGA_PLUGIN_EXIT); + + result &= PyDict_AddULongMacro(obj_type, PGA_CONTENT_EXPLORER); + result &= PyDict_AddULongMacro(obj_type, PGA_CONTENT_RESOLVER); + result &= PyDict_AddULongMacro(obj_type, PGA_CONTENT_ANALYZED); + + result &= PyDict_AddULongMacro(obj_type, PGA_FORMAT_ANALYSIS_STARTED); + result &= PyDict_AddULongMacro(obj_type, PGA_FORMAT_PRELOAD); + result &= PyDict_AddULongMacro(obj_type, PGA_FORMAT_ATTACH_DEBUG); + result &= PyDict_AddULongMacro(obj_type, PGA_FORMAT_ANALYSIS_ENDED); + result &= PyDict_AddULongMacro(obj_type, PGA_FORMAT_POST_ANALYSIS_STARTED); + result &= PyDict_AddULongMacro(obj_type, PGA_FORMAT_POST_ANALYSIS_ENDED); + + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_STARTED); + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_RAW); + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_HOOKED_LINK); + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_HOOKED_POST); + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_LIMITED); + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_LOOPS); + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_LINKED); + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_GROUPED); + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_RANKED); + result &= PyDict_AddULongMacro(obj_type, PGA_DISASSEMBLY_ENDED); + + result &= PyDict_AddULongMacro(obj_type, PGA_DETECTION_OBFUSCATORS); return result; |