diff options
Diffstat (limited to 'plugins/pychrysa')
| -rw-r--r-- | plugins/pychrysa/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/pychrysa/arch/instruction.c | 36 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/Makefile.am | 20 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/module.c | 68 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/module.h | 39 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/panels/Makefile.am | 17 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/panels/module.c | 68 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/panels/module.h | 39 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/panels/panel.c | 213 | ||||
| -rw-r--r-- | plugins/pychrysa/gui/panels/panel.h | 44 | ||||
| -rw-r--r-- | plugins/pychrysa/pychrysa.c | 3 | ||||
| -rw-r--r-- | plugins/pychrysa/quirks.c | 32 | ||||
| -rw-r--r-- | plugins/pychrysa/quirks.h | 7 |
13 files changed, 588 insertions, 5 deletions
diff --git a/plugins/pychrysa/Makefile.am b/plugins/pychrysa/Makefile.am index f8c08db..d57c9f5 100644 --- a/plugins/pychrysa/Makefile.am +++ b/plugins/pychrysa/Makefile.am @@ -12,11 +12,12 @@ pychrysa_la_LIBADD = \ arch/libpychrysaarch.la \ debug/libpychrysadebug.la \ format/libpychrysaformat.la \ - glibext/libpychrysaglibext.la + glibext/libpychrysaglibext.la \ + gui/libpychrysagui.la pychrysa_la_LDFLAGS = -module -avoid-version $(LIBGTK_LIBS) $(LIBXML_LIBS) $(LIBPYTHON_LIBS) \ $(LIBPYGOBJECT_LIBS) \ - -L../../src/panels/ -lpanels -L../../src/.libs -loidadisass -loidagtkext \ + -L../../src/panels/ -lpanels -L../../src/.libs -L../../src/gui/.libs -lchrysagui -lchrysadisass -lchrysagtkext \ -L../../src/plugins/.libs -lplugins @@ -26,4 +27,4 @@ AM_CPPFLAGS = AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -SUBDIRS = analysis arch debug format glibext +SUBDIRS = analysis arch debug format glibext gui diff --git a/plugins/pychrysa/arch/instruction.c b/plugins/pychrysa/arch/instruction.c index 80cc4ee..bed937b 100644 --- a/plugins/pychrysa/arch/instruction.c +++ b/plugins/pychrysa/arch/instruction.c @@ -72,6 +72,9 @@ static PyObject *py_arch_instruction_get_iter(PyObject *); /* Fournit la valeur associée à une propriété donnée. */ static PyObject *py_arch_instruction_get_location(PyObject *, char *); +/* Fournit le nom humain de l'instruction manipulée. */ +static PyObject *py_arch_instruction_get_keyword(PyObject *, void *); + /* ---------------------------------------------------------------------------------- */ @@ -347,6 +350,35 @@ static PyObject *py_arch_instruction_get_location(PyObject *self, char *name) /****************************************************************************** * * +* Paramètres : self = classe représentant une instruction. * +* unused = adresse non utilisée ici. * +* * +* Description : Fournit le nom humain de l'instruction manipulée. * +* * +* Retour : Valeur associée à la propriété consultée. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static PyObject *py_arch_instruction_get_keyword(PyObject *self, void *unused) +{ + PyObject *result; /* Trouvailles à retourner */ + GArchInstruction *instr; /* Version native */ + const char *kw; /* Valeur récupérée */ + + instr = G_ARCH_INSTRUCTION(pygobject_get(self)); + kw = g_arch_instruction_get_keyword(instr); + + result = PyString_FromString(kw); + + return result; + +} + + +/****************************************************************************** +* * * Paramètres : module = module dont la définition est à compléter. * * * * Description : Prend en charge l'objet 'pychrysalide.arch.ArchInstruction'. * @@ -379,6 +411,10 @@ bool register_python_arch_instruction(PyObject *module) "address", (getter)py_arch_instruction_get_location, (setter)NULL, "Provide the location of the instruction in memory.", "address" }, + { + "keyword", (getter)py_arch_instruction_get_keyword, (setter)NULL, + "Give le name of the assembly instruction.", NULL + }, { NULL } }; diff --git a/plugins/pychrysa/gui/Makefile.am b/plugins/pychrysa/gui/Makefile.am new file mode 100644 index 0000000..48fde30 --- /dev/null +++ b/plugins/pychrysa/gui/Makefile.am @@ -0,0 +1,20 @@ + +noinst_LTLIBRARIES = libpychrysagui.la + +libpychrysagui_la_SOURCES = \ + module.h module.c + +libpychrysagui_la_LIBADD = \ + panels/libpychrysaguipanels.la + +libpychrysagui_la_LDFLAGS = + + +INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ + -I../../../src + +AM_CPPFLAGS = + +AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) + +SUBDIRS = panels diff --git a/plugins/pychrysa/gui/module.c b/plugins/pychrysa/gui/module.c new file mode 100644 index 0000000..bee46df --- /dev/null +++ b/plugins/pychrysa/gui/module.c @@ -0,0 +1,68 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * module.c - intégration du répertoire gui en tant que module + * + * Copyright (C) 2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "module.h" + + +#include "panels/module.h" + + + +/****************************************************************************** +* * +* Paramètres : module = module dont la définition est à compléter. * +* * +* Description : Ajoute le module 'gui' au module Python. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +bool add_gui_module_to_python_module(PyObject *super) +{ + bool result; + PyObject *module; + int ret; /* Bilan d'un appel */ + + static PyMethodDef py_gui_methods[] = { + { NULL } + }; + + module = Py_InitModule("pychrysalide.gui", py_gui_methods); + if (module == NULL) return false; + + Py_INCREF(module); + ret = PyModule_AddObject(super, "pychrysalide.gui", module); + + result = (ret != 0); + + if (ret != 0) /* ... */; + + result &= add_gui_panels_module_to_python_module(module); + + return true; + +} diff --git a/plugins/pychrysa/gui/module.h b/plugins/pychrysa/gui/module.h new file mode 100644 index 0000000..0c909d3 --- /dev/null +++ b/plugins/pychrysa/gui/module.h @@ -0,0 +1,39 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * module.h - prototypes pour l'intégration du répertoire gui en tant que module + * + * Copyright (C) 2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _PLUGINS_PYCHRYSA_GUI_MODULE_H +#define _PLUGINS_PYCHRYSA_GUI_MODULE_H + + +#include <Python.h> +#include <stdbool.h> + + + +/* Ajoute le module 'gui' au module Python. */ +bool add_gui_module_to_python_module(PyObject *); + + + +#endif /* _PLUGINS_PYCHRYSA_GUI_MODULE_H */ diff --git a/plugins/pychrysa/gui/panels/Makefile.am b/plugins/pychrysa/gui/panels/Makefile.am new file mode 100644 index 0000000..b383293 --- /dev/null +++ b/plugins/pychrysa/gui/panels/Makefile.am @@ -0,0 +1,17 @@ + +noinst_LTLIBRARIES = libpychrysaguipanels.la + +libpychrysaguipanels_la_SOURCES = \ + module.h module.c \ + panel.h panel.c + + +libpychrysaguipanels_la_LDFLAGS = + + +INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ + -I../../../../src + +AM_CPPFLAGS = + +AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/gui/panels/module.c b/plugins/pychrysa/gui/panels/module.c new file mode 100644 index 0000000..7c26dac --- /dev/null +++ b/plugins/pychrysa/gui/panels/module.c @@ -0,0 +1,68 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * module.c - intégration du répertoire arch en tant que module + * + * Copyright (C) 2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "module.h" + + +#include "panel.h" + + + +/****************************************************************************** +* * +* Paramètres : module = module dont la définition est à compléter. * +* * +* Description : Ajoute le module 'gui.panels' au module Python. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +bool add_gui_panels_module_to_python_module(PyObject *super) +{ + bool result; + PyObject *module; + int ret; /* Bilan d'un appel */ + + static PyMethodDef py_gui_panels_methods[] = { + { NULL } + }; + + module = Py_InitModule("pychrysalide.gui.panels", py_gui_panels_methods); + if (module == NULL) return false; + + Py_INCREF(module); + ret = PyModule_AddObject(super, "pychrysalide.gui.panels", module); + + result = (ret != 0); + + if (ret != 0) /* ... */; + + result &= register_python_panel_item(module); + + return true; + +} diff --git a/plugins/pychrysa/gui/panels/module.h b/plugins/pychrysa/gui/panels/module.h new file mode 100644 index 0000000..6d7415c --- /dev/null +++ b/plugins/pychrysa/gui/panels/module.h @@ -0,0 +1,39 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * module.h - prototypes pour l'intégration du répertoire gui.panels en tant que module + * + * Copyright (C) 2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _PLUGINS_PYCHRYSA_GUI_PANELS_MODULE_H +#define _PLUGINS_PYCHRYSA_GUI_PANELS_MODULE_H + + +#include <Python.h> +#include <stdbool.h> + + + +/* Ajoute le module 'gui.panels' au module Python. */ +bool add_gui_panels_module_to_python_module(PyObject *); + + + +#endif /* _PLUGINS_PYCHRYSA_GUI_PANELS_MODULE_H */ diff --git a/plugins/pychrysa/gui/panels/panel.c b/plugins/pychrysa/gui/panels/panel.c new file mode 100644 index 0000000..c35e9a0 --- /dev/null +++ b/plugins/pychrysa/gui/panels/panel.c @@ -0,0 +1,213 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * panel.c - équivalent Python du fichier "gui/panels/panel.c" + * + * Copyright (C) 2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#include "panel.h" + + +#include <pygobject.h> + + +#include "../../quirks.h" + + + +/* Crée un nouvel objet Python de type 'PanelItem'. */ +static PyObject *py_panel_item_new(PyTypeObject *, PyObject *, PyObject *); + +/* Place un panneau dans l'ensemble affiché. */ +static PyObject *py_panel_item_dock(PyObject *, PyObject *); + + + + +/****************************************************************************** +* * +* Paramètres : type = type de l'objet à instancier. * +* args = arguments fournis à l'appel. * +* kwds = arguments de type key=val fournis. * +* * +* Description : Crée un nouvel objet Python de type 'PanelItem'. * +* * +* Retour : Instance Python mise en place. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static PyObject *py_panel_item_new(PyTypeObject *type, PyObject *args, PyObject *kwds) +{ + PyObject *result; /* Instance à retourner */ + const char *name; /* Désignation humaine */ + const char *lname; /* Nom version longue */ + PyGObject *widget; /* Composant visuel du panneau */ + const char *path; /* Placement à l'affichage */ + int ret; /* Bilan de lecture des args. */ + GEditorItem *item; /* Version GLib du format */ + + ret = PyArg_ParseTupleAndKeywords(args, kwds, "ssOs", + (char *[]) { "name", "lname", "widget", "path", NULL }, + &name, &lname, &widget, &path); + if (!ret) return Py_None; + + item = g_panel_item_new(get_internal_ref(), name, lname, + GTK_WIDGET(pygobject_get(widget)), path); + + result = py_panel_item_from_c(G_PANEL_ITEM(item)); + g_object_unref(item); + + return (PyObject *)result; + +} + + +/****************************************************************************** +* * +* Paramètres : item = instance existante GLib. * +* * +* Description : Crée un nouvel objet Python de type 'PanelItem'. * +* * +* Retour : Instance Python mise en place. * +* * +* Remarques : - * +* * +******************************************************************************/ + +PyObject *py_panel_item_from_c(GPanelItem *item) +{ + PyObject *module; /* Module d'appartenance */ + PyTypeObject *type; /* Type Python correspondant */ + + module = PyImport_ImportModule("pychrysalide.gui.panels"); + type = (PyTypeObject *)PyObject_GetAttrString(module, "PanelItem"); + Py_DECREF(module); + + pychrysalide_set_instance_data(G_OBJECT(item), type); + + return pygobject_new(G_OBJECT(item)); + +} + + +/****************************************************************************** +* * +* Paramètres : self = classe représentant un binaire. * +* args = arguments fournis à l'appel. * +* * +* Description : Place un panneau dans l'ensemble affiché. * +* * +* Retour : Py_None. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static PyObject *py_panel_item_dock(PyObject *self, PyObject *args) +{ + GPanelItem *item; /* Panneau à manipuler */ + + item = G_PANEL_ITEM(pygobject_get(self)); + + g_panel_item_dock(item); + + return Py_None; + +} + + + + + + + + + + + + + + + + +/****************************************************************************** +* * +* Paramètres : module = module dont la définition est à compléter. * +* * +* Description : Prend en charge l'objet 'pychrysalide.gui.panels.PanelItem'. * +* * +* Retour : Bilan de l'opération. * +* * +* Remarques : - * +* * +******************************************************************************/ + +bool register_python_panel_item(PyObject *module) +{ + PyObject *pygobj_mod; /* Module Python-GObject */ + int ret; /* Bilan d'un appel */ + + static PyMethodDef py_panel_item_methods[] = { + { + "dock", (PyCFunction)py_panel_item_dock, + METH_NOARGS, + "DIsplay the panel item in the right place." + }, + { NULL } + }; + + static PyGetSetDef py_panel_item_getseters[] = { + { NULL } + }; + + static PyTypeObject py_panel_item_type = { + + PyObject_HEAD_INIT(NULL) + + .tp_name = "pychrysalide.gui.panels.PanelItem", + .tp_basicsize = sizeof(PyGObject), + + .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, + + .tp_doc = "PyChrysalide panel item", + + .tp_methods = py_panel_item_methods, + .tp_getset = py_panel_item_getseters, + .tp_new = (newfunc)py_panel_item_new + + }; + + pygobj_mod = PyImport_ImportModule("gobject"); + if (pygobj_mod == NULL) return false; + + py_panel_item_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(pygobj_mod, "GObject"); + Py_DECREF(pygobj_mod); + + if (PyType_Ready(&py_panel_item_type) < 0) + return false; + + Py_INCREF(&py_panel_item_type); + ret = PyModule_AddObject(module, "PanelItem", (PyObject *)&py_panel_item_type); + + return (ret == 0); + +} diff --git a/plugins/pychrysa/gui/panels/panel.h b/plugins/pychrysa/gui/panels/panel.h new file mode 100644 index 0000000..8d06094 --- /dev/null +++ b/plugins/pychrysa/gui/panels/panel.h @@ -0,0 +1,44 @@ + +/* OpenIDA - Outil d'analyse de fichiers binaires + * panel.h - prototypes pour l'équivalent Python du fichier "gui/panels/panel.h" + * + * Copyright (C) 2012 Cyrille Bagard + * + * This file is part of OpenIDA. + * + * OpenIDA is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * OpenIDA is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + + +#ifndef _PLUGINS_PYCHRYSA_GUI_PANELS_PANEL_H +#define _PLUGINS_PYCHRYSA_GUI_PANELS_PANEL_H + + +#include <Python.h> +#include <stdbool.h> + +#include <gui/panels/panel.h> + + + +/* Crée un nouvel objet Python de type 'PanelItem'. */ +PyObject *py_panel_item_from_c(GPanelItem *); + +/* Prend en charge l'objet 'pychrysalide.gui.panels.PanelItem'. */ +bool register_python_panel_item(PyObject *module); + + + +#endif /* _PLUGINS_PYCHRYSA_GUI_PANELS_PANEL_H */ diff --git a/plugins/pychrysa/pychrysa.c b/plugins/pychrysa/pychrysa.c index 8b9fc50..0aa6175 100644 --- a/plugins/pychrysa/pychrysa.c +++ b/plugins/pychrysa/pychrysa.c @@ -38,6 +38,7 @@ #include "debug/module.h" #include "format/module.h" #include "glibext/module.h" +#include "gui/module.h" /* #include "analysis/py_binary.h" @@ -123,6 +124,7 @@ bool init_plugin(GPluginModule *plugin, GObject *ref) //return false; + define_internal_ref(ref); Py_Initialize(); @@ -267,6 +269,7 @@ PyMODINIT_FUNC initpychrysa(void) add_debug_module_to_python_module(module); add_format_module_to_python_module(module); add_glibext_module_to_python_module(module); + add_gui_module_to_python_module(module); add_log_to_python_module(module); add_plugin_to_python_module(module); diff --git a/plugins/pychrysa/quirks.c b/plugins/pychrysa/quirks.c index 4dcae2c..0e35f57 100644 --- a/plugins/pychrysa/quirks.c +++ b/plugins/pychrysa/quirks.c @@ -55,7 +55,7 @@ static void pygobject_data_free_fake(PyGObjectData_fake *data) PyGILState_STATE state; /* Etat interne de Python */ GSList *iter; /* Boucle de parcours */ - state = pyglib_gil_state_ensure(); + //state = pyglib_gil_state_ensure(); Py_DECREF(data->type); @@ -77,7 +77,7 @@ static void pygobject_data_free_fake(PyGObjectData_fake *data) g_free(data); - pyglib_gil_state_release(state); + //pyglib_gil_state_release(state); } @@ -94,6 +94,9 @@ static PyGObjectData_fake *pygobject_data_new_fake(void) } +static GObject *_ref = NULL; + + /****************************************************************************** * * @@ -146,3 +149,28 @@ void pychrysalide_set_instance_data(GObject *obj, PyTypeObject *type) } } + + +/****************************************************************************** +* * +* Paramètres : ref = espace de référencement global à utiliser. * +* * +* Description : Evite à Python d'avoir à manipuler les références internes. * +* * +* Retour : Adresse de l'espace de référencement global. * +* * +* Remarques : - * +* * +******************************************************************************/ + +GObject *_get_internal_ref(GObject *ref) +{ + if (ref != NULL) + { + g_object_ref(ref); + _ref = ref; + } + + return _ref; + +} diff --git a/plugins/pychrysa/quirks.h b/plugins/pychrysa/quirks.h index 70e036e..f9c53dc 100644 --- a/plugins/pychrysa/quirks.h +++ b/plugins/pychrysa/quirks.h @@ -37,6 +37,13 @@ void pychrysalide_init_quirks(void); /* Crée l'association précise attendue par Python-GObject. */ void pychrysalide_set_instance_data(GObject *, PyTypeObject *); +/* Evite à Python d'avoir à manipuler les références internes. */ +GObject *_get_internal_ref(GObject *); + + +#define define_internal_ref(r) _get_internal_ref(r) +#define get_internal_ref() _get_internal_ref(NULL) + #endif /* _PLUGINS_PYOIDA_QUIRKS_H */ |