diff options
Diffstat (limited to 'plugins/pychrysa/analysis/blocks/virtual.c')
| -rw-r--r-- | plugins/pychrysa/analysis/blocks/virtual.c | 74 |
1 files changed, 43 insertions, 31 deletions
diff --git a/plugins/pychrysa/analysis/blocks/virtual.c b/plugins/pychrysa/analysis/blocks/virtual.c index 4f15371..bdc81b0 100644 --- a/plugins/pychrysa/analysis/blocks/virtual.c +++ b/plugins/pychrysa/analysis/blocks/virtual.c @@ -31,35 +31,24 @@ #include <analysis/blocks/virtual.h> - - - - - - - - - +#include "../block.h" /****************************************************************************** * * -* Paramètres : module = module dont la définition est à compléter. * +* Paramètres : - * * * -* Description : Prend en charge l'objet 'pychrysalide.....VirtualBlock'. * +* Description : Fournit un accès à une définition de type à diffuser. * * * -* Retour : Bilan de l'opération. * +* Retour : Définition d'objet pour Python. * * * * Remarques : - * * * ******************************************************************************/ -bool register_python_virtual_block(PyObject *module) +PyTypeObject *get_python_virtual_block_type(void) { - PyObject *parent_mod; /* Module de la classe parente */ - int ret; /* Bilan d'un appel */ - static PyMethodDef py_virtual_block_methods[] = { { NULL } }; @@ -70,35 +59,58 @@ bool register_python_virtual_block(PyObject *module) static PyTypeObject py_virtual_block_type = { - PyObject_HEAD_INIT(NULL) + PyVarObject_HEAD_INIT(NULL, 0) .tp_name = "pychrysalide.analysis.blocks.VirtualBlock", - .tp_basicsize = sizeof(PyGObject), - .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + .tp_flags = Py_TPFLAGS_DEFAULT, - .tp_doc = "PyChrysalide basic virtual block", + .tp_doc = "PyChrysalide virtual block", .tp_methods = py_virtual_block_methods, - .tp_getset = py_virtual_block_getseters + .tp_getset = py_virtual_block_getseters, }; - parent_mod = PyImport_ImportModule("pychrysalide.analysis"); - if (parent_mod == NULL) return false; + return &py_virtual_block_type; + +} + + +/****************************************************************************** +* * +* Paramètres : module = module dont la définition est à compléter. * +* * +* Description : Prend en charge l'objet 'pychrysalide...blocks.VirtualBlock'.* +* * +* Retour : Bilan de l'opération. * +* * +* Remarques : - * +* * +******************************************************************************/ + +bool register_python_virtual_block(PyObject *module) +{ + PyTypeObject *py_virtual_block_type; /* Type Python 'VirtualBlock' */ + int ret; /* Bilan d'un appel */ + PyObject *dict; /* Dictionnaire du module */ + + py_virtual_block_type = get_python_virtual_block_type(); - py_virtual_block_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(parent_mod, "InstrBlock"); - Py_DECREF(parent_mod); + py_virtual_block_type->tp_base = get_python_instr_block_type(); + py_virtual_block_type->tp_basicsize = py_virtual_block_type->tp_base->tp_basicsize; - if (PyType_Ready(&py_virtual_block_type) < 0) + if (PyType_Ready(py_virtual_block_type) != 0) return false; - Py_INCREF(&py_virtual_block_type); - ret = PyModule_AddObject(module, "VirtualBlock", (PyObject *)&py_virtual_block_type); + Py_INCREF(py_virtual_block_type); + ret = PyModule_AddObject(module, "VirtualBlock", (PyObject *)py_virtual_block_type); + if (ret != 0) return false; - pygobject_register_class(module, "GVirtualBlock", G_TYPE_VIRTUAL_BLOCK, &py_virtual_block_type, - Py_BuildValue("(O)", py_virtual_block_type.tp_base)); + dict = PyModule_GetDict(module); + pygobject_register_class(dict, "VirtualBlock", G_TYPE_VIRTUAL_BLOCK, py_virtual_block_type, + Py_BuildValue("(O)", py_virtual_block_type->tp_base)); - return (ret == 0); + return true; } |