diff options
Diffstat (limited to 'plugins/pychrysa')
22 files changed, 211 insertions, 365 deletions
diff --git a/plugins/pychrysa/Makefile.am b/plugins/pychrysa/Makefile.am index fe23e99..e8c2bed 100644 --- a/plugins/pychrysa/Makefile.am +++ b/plugins/pychrysa/Makefile.am @@ -4,6 +4,7 @@ pkglib_LTLIBRARIES = pychrysalide.la libdir = $(pluginsdir) pychrysalide_la_SOURCES = \ + access.h access.c \ helpers.h helpers.c \ plugin.h plugin.c \ pychrysa.h pychrysa.c \ diff --git a/plugins/pychrysa/access.c b/plugins/pychrysa/access.c new file mode 100644 index 0000000..21ff68f --- /dev/null +++ b/plugins/pychrysa/access.c @@ -0,0 +1,137 @@ + +/* Chrysalide - Outil d'analyse de fichiers binaires + * access.c - accès aux modules Python en cours d'enregistrement + * + * Copyright (C) 2017 Cyrille Bagard + * + * This file is part of Chrysalide. + * + * Chrysalide 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. + * + * Chrysalide 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 Foobar. If not, see <http://www.gnu.org/licenses/>. + */ + + +#include "access.h" + + +#include <stdlib.h> +#include <string.h> + + +#include <common/sort.h> + + + +/* Lien entre un module et sa désignation */ +typedef struct _module_access +{ + const char *path; /* Chemin d'accès */ + PyObject *mod; /* Module Python en place */ + +} module_access; + + +/* Conservation de tous les accès */ +static module_access *_pychrysalide_modules = NULL; +static size_t _pychrysalide_count = 0; + + +/* Effectue la comparaison entre deux accès à des modules. */ +static int compare_python_module_accesses(const module_access *, const module_access *); + + + +/****************************************************************************** +* * +* Paramètres : a = premier accès à analyser. * +* b = second accès à analyser. * +* * +* Description : Effectue la comparaison entre deux accès à des modules. * +* * +* Retour : Bilan de la comparaison. * +* * +* Remarques : - * +* * +******************************************************************************/ + +static int compare_python_module_accesses(const module_access *a, const module_access *b) +{ + int result; /* Bilan à retourner */ + + result = strcmp(a->path, b->path); + + return result; + +} + + +/****************************************************************************** +* * +* Paramètres : path = chemin d'accès à un module Python. * +* mod = module Python en question. * +* * +* Description : Enregistre une référence à un module Python en chargement. * +* * +* Retour : - * +* * +* Remarques : - * +* * +******************************************************************************/ + +void register_access_to_python_module(const char *path, PyObject *mod) +{ + module_access access; /* Nouvel enregistrement */ + + access.path = path; + access.mod = mod; + + Py_INCREF(mod); + + _pychrysalide_modules = qinsert(_pychrysalide_modules, &_pychrysalide_count, + sizeof(module_access), (__compar_fn_t)compare_python_module_accesses, + &access); + +} + + +/****************************************************************************** +* * +* Paramètres : path = chemin d'accès à un module Python. * +* * +* Description : Fournit la référence à un module Python défini. * +* * +* Retour : Module Python correspondant, ou NULL si aucun de trouvé. * +* * +* Remarques : - * +* * +******************************************************************************/ + +PyObject *get_access_to_python_module(const char *path) +{ + PyObject *result; /* Référence à renvoyer */ + module_access key; /* Définition à retrouver */ + module_access *access; /* Accès trouvé à consulter */ + + key.path = path; + + access = bsearch(&key, _pychrysalide_modules, _pychrysalide_count, + sizeof(module_access), (__compar_fn_t)compare_python_module_accesses); + + if (access != NULL) + result = access->mod; + else + result = NULL; + + return result; + +} diff --git a/plugins/pychrysa/format/elf/module.h b/plugins/pychrysa/access.h index 998674f..52883ec 100644 --- a/plugins/pychrysa/format/elf/module.h +++ b/plugins/pychrysa/access.h @@ -1,8 +1,8 @@ /* Chrysalide - Outil d'analyse de fichiers binaires - * module.h - prototypes pour l'intégration du répertoire elf en tant que module + * access.h - prototypes pour l'accès aux modules Python en cours d'enregistrement * - * Copyright (C) 2013-2017 Cyrille Bagard + * Copyright (C) 2017 Cyrille Bagard * * This file is part of Chrysalide. * @@ -17,23 +17,24 @@ * 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 + * along with Foobar. If not, see <http://www.gnu.org/licenses/>. */ -#ifndef _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H -#define _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H +#ifndef _PLUGINS_PYCHRYSA_ACCESS_H +#define _PLUGINS_PYCHRYSA_ACCESS_H #include <Python.h> -#include <stdbool.h> -/* Ajoute le module 'format.elf' au module Python. */ -bool add_format_elf_module_to_python_module(PyObject *); +/* Enregistre une référence à un module Python en chargement. */ +void register_access_to_python_module(const char *, PyObject *); +/* Fournit la référence à un module Python défini. */ +PyObject *get_access_to_python_module(const char *path); -#endif /* _PLUGINS_PYCHRYSA_FORMAT_ELF_MODULE_H */ + +#endif /* _PLUGINS_PYCHRYSA_ACCESS_H */ diff --git a/plugins/pychrysa/analysis/contents/module.c b/plugins/pychrysa/analysis/contents/module.c index d504534..2daa62c 100644 --- a/plugins/pychrysa/analysis/contents/module.c +++ b/plugins/pychrysa/analysis/contents/module.c @@ -30,6 +30,7 @@ #include "file.h" #include "restricted.h" +#include "../../access.h" @@ -84,6 +85,9 @@ bool add_analysis_contents_module_to_python_module(PyObject *super) result &= register_python_file_content(module); result &= register_python_restricted_content(module); + if (result) + register_access_to_python_module("pychrysalide.analysis.contents", module); + loading_failed: assert(result); diff --git a/plugins/pychrysa/analysis/db/items/module.c b/plugins/pychrysa/analysis/db/items/module.c index 73ea3d3..cf0fe56 100644 --- a/plugins/pychrysa/analysis/db/items/module.c +++ b/plugins/pychrysa/analysis/db/items/module.c @@ -29,6 +29,7 @@ #include "comment.h" +#include "../../../access.h" @@ -80,6 +81,9 @@ bool add_analysis_db_items_module_to_python_module(PyObject *super) result &= register_python_db_comment(module); + if (result) + register_access_to_python_module("pychrysalide.analysis.db.items", module); + loading_failed: assert(result); diff --git a/plugins/pychrysa/analysis/db/module.c b/plugins/pychrysa/analysis/db/module.c index eac3641..1c4da25 100644 --- a/plugins/pychrysa/analysis/db/module.c +++ b/plugins/pychrysa/analysis/db/module.c @@ -32,6 +32,7 @@ #include "collection.h" #include "item.h" #include "items/module.h" +#include "../../access.h" @@ -87,6 +88,9 @@ bool add_analysis_db_module_to_python_module(PyObject *super) result &= add_analysis_db_items_module_to_python_module(module); + if (result) + register_access_to_python_module("pychrysalide.analysis.db", module); + loading_failed: assert(result); diff --git a/plugins/pychrysa/analysis/module.c b/plugins/pychrysa/analysis/module.c index ecae63c..253fe76 100644 --- a/plugins/pychrysa/analysis/module.c +++ b/plugins/pychrysa/analysis/module.c @@ -34,6 +34,7 @@ #include "routine.h" #include "contents/module.h" #include "db/module.h" +#include "../access.h" @@ -91,6 +92,9 @@ bool add_analysis_module_to_python_module(PyObject *super) result &= add_analysis_contents_module_to_python_module(module); result &= add_analysis_db_module_to_python_module(module); + if (result) + register_access_to_python_module("pychrysalide.analysis", module); + loading_failed: assert(result); diff --git a/plugins/pychrysa/arch/module.c b/plugins/pychrysa/arch/module.c index d9eabed..ae90b5d 100644 --- a/plugins/pychrysa/arch/module.c +++ b/plugins/pychrysa/arch/module.c @@ -39,6 +39,7 @@ #include "raw.h" #include "vmpa.h" #include "arm/module.h" +#include "../access.h" #include "../helpers.h" @@ -155,6 +156,9 @@ bool add_arch_module_to_python_module(PyObject *super) result &= add_arch_arm_module_to_python_module(module); + if (result) + register_access_to_python_module("pychrysalide.arch", module); + loading_failed: assert(result); diff --git a/plugins/pychrysa/common/module.c b/plugins/pychrysa/common/module.c index cc2623a..7ff7528 100644 --- a/plugins/pychrysa/common/module.c +++ b/plugins/pychrysa/common/module.c @@ -28,6 +28,7 @@ #include "bits.h" #include "fnv1a.h" #include "pathname.h" +#include "../access.h" @@ -81,6 +82,9 @@ bool add_common_module_to_python_module(PyObject *super) result &= register_python_fnv1a(module); result &= register_python_pathname(module); + if (result) + register_access_to_python_module("pychrysalide.common", module); + acmtpm_exit: if (!result) diff --git a/plugins/pychrysa/core/module.c b/plugins/pychrysa/core/module.c index f42f08f..6c44197 100644 --- a/plugins/pychrysa/core/module.c +++ b/plugins/pychrysa/core/module.c @@ -30,6 +30,7 @@ #include "formats.h" #include "params.h" +#include "../access.h" @@ -82,6 +83,9 @@ bool add_core_module_to_python_module(PyObject *super) result &= register_python_formats(module); result &= register_python_params(module); + if (result) + register_access_to_python_module("pychrysalide.core", module); + loading_failed: assert(result); diff --git a/plugins/pychrysa/debug/module.c b/plugins/pychrysa/debug/module.c index db33a13..ea586be 100644 --- a/plugins/pychrysa/debug/module.c +++ b/plugins/pychrysa/debug/module.c @@ -27,6 +27,7 @@ #include "debugger.h" #include "gdbrsp/module.h" +#include "../access.h" @@ -80,6 +81,9 @@ bool add_debug_module_to_python_module(PyObject *super) result &= add_debug_gdbrsp_module_to_python_module(module); + if (result) + register_access_to_python_module("pychrysalide.debug", module); + loading_failed: assert(result); diff --git a/plugins/pychrysa/format/Makefile.am b/plugins/pychrysa/format/Makefile.am index bef87ca..71f0022 100644 --- a/plugins/pychrysa/format/Makefile.am +++ b/plugins/pychrysa/format/Makefile.am @@ -8,8 +8,7 @@ libpychrysaformat_la_SOURCES = \ symbol.h symbol.c libpychrysaformat_la_LIBADD = \ - dex/libpychrysaformatdex.la \ - elf/libpychrysaformatelf.la + dex/libpychrysaformatdex.la libpychrysaformat_la_LDFLAGS = @@ -19,4 +18,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJE AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -SUBDIRS = dex elf +SUBDIRS = dex diff --git a/plugins/pychrysa/format/elf/Makefile.am b/plugins/pychrysa/format/elf/Makefile.am deleted file mode 100644 index b8f9074..0000000 --- a/plugins/pychrysa/format/elf/Makefile.am +++ /dev/null @@ -1,15 +0,0 @@ - -noinst_LTLIBRARIES = libpychrysaformatelf.la - -libpychrysaformatelf_la_SOURCES = \ - elf.h elf.c \ - module.h module.c - - -libpychrysaformatelf_la_LDFLAGS = - - -AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ - -I../../../../src - -AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysa/format/elf/elf.c b/plugins/pychrysa/format/elf/elf.c deleted file mode 100644 index 102c60d..0000000 --- a/plugins/pychrysa/format/elf/elf.c +++ /dev/null @@ -1,206 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * elf.c - équivalent Python du fichier "format/elf/elf.c" - * - * Copyright (C) 2013-2017 Cyrille Bagard - * - * This file is part of Chrysalide. - * - * Chrysalide 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. - * - * Chrysalide 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 "elf.h" - - -#include <pygobject.h> - - -#include <i18n.h> - - -#include <format/elf/elf.h> - - -#include "../executable.h" -#include "../../analysis/content.h" -#include "../../helpers.h" - - - -/* Crée un nouvel objet Python de type 'ElfFormat'. */ -static PyObject *py_elf_format_new(PyTypeObject *, 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 'ElfFormat'. * -* * -* Retour : Instance Python mise en place. * -* * -* Remarques : - * -* * -******************************************************************************/ - -static PyObject *py_elf_format_new(PyTypeObject *type, PyObject *args, PyObject *kwds) -{ - PyObject *result; /* Instance à retourner */ - PyObject *content_obj; /* Objet pour le contenu */ - PyObject *parent_obj; /* Objet pour le parent */ - PyObject *status_obj; /* Objet pour la progression */ - int ret; /* Bilan de lecture des args. */ - GBinContent *content; /* Instance GLib du contenu */ - GExeFormat *parent; /* Instance GLib du parent */ - GtkStatusStack *status; /* Instance GTK de suivi */ - GBinFormat *format; /* Création GLib à transmettre */ - - - ret = PyArg_ParseTuple(args, "OOO", &content_obj, &parent_obj, &status_obj); - if (!ret) return NULL; - - ret = PyObject_IsInstance(content_obj, (PyObject *)get_python_binary_content_type()); - if (!ret) - { - PyErr_SetString(PyExc_TypeError, _("The first argument must be an instance of BinContent.")); - return NULL; - } - - content = G_BIN_CONTENT(pygobject_get(content_obj)); - - if (parent_obj == Py_None) - parent = NULL; - - else - { - ret = PyObject_IsInstance(parent_obj, (PyObject *)get_python_executable_format_type()); - if (!ret) - { - PyErr_SetString(PyExc_TypeError, _("The second argument must be a container format or None.")); - return NULL; - } - - parent = G_EXE_FORMAT(pygobject_get(parent_obj)); - - } - - if (status_obj == Py_None) - status = NULL; - - else - { - ret = PyObject_IsInstance(status_obj, (PyObject *)get_python_binary_content_type()); - if (!ret) - { - PyErr_SetString(PyExc_TypeError, _("The third argument must be a status bar object or None.")); - return NULL; - } - - status = GTK_STATUS_STACK(pygobject_get(status_obj)); - - } - - format = g_elf_format_new(content, parent, status); - if (format == NULL) - { - PyErr_SetString(PyExc_RuntimeError, _("Unable to load the ELF format.")); - return NULL; - } - - result = pygobject_new(G_OBJECT(format)); - - g_object_unref(format); - - return (PyObject *)result; - -} - - -/****************************************************************************** -* * -* Paramètres : - * -* * -* Description : Fournit un accès à une définition de type à diffuser. * -* * -* Retour : Définition d'objet pour Python. * -* * -* Remarques : - * -* * -******************************************************************************/ - -PyTypeObject *get_python_elf_format_type(void) -{ - static PyMethodDef py_elf_format_methods[] = { - { NULL } - }; - - static PyGetSetDef py_elf_format_getseters[] = { - { NULL } - }; - - static PyTypeObject py_elf_format_type = { - - PyVarObject_HEAD_INIT(NULL, 0) - - .tp_name = "pychrysalide.format.elf.ElfFormat", - .tp_basicsize = sizeof(PyGObject), - - .tp_flags = Py_TPFLAGS_DEFAULT, - - .tp_doc = "PyChrysalide Elf format", - - .tp_methods = py_elf_format_methods, - .tp_getset = py_elf_format_getseters, - .tp_new = (newfunc)py_elf_format_new - - }; - - return &py_elf_format_type; - -} - - -/****************************************************************************** -* * -* Paramètres : module = module dont la définition est à compléter. * -* * -* Description : Prend en charge l'objet 'pychrysalide.format.elf.ElfFormat'. * -* * -* Retour : Bilan de l'opération. * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool register_python_elf_format(PyObject *module) -{ - PyTypeObject *py_elf_format_type; /* Type Python 'ElfFormat' */ - PyObject *dict; /* Dictionnaire du module */ - - py_elf_format_type = get_python_elf_format_type(); - - dict = PyModule_GetDict(module); - - if (!register_class_for_pygobject(dict, G_TYPE_ELF_FORMAT, - py_elf_format_type, get_python_executable_format_type())) - return false; - - return true; - -} diff --git a/plugins/pychrysa/format/elf/elf.h b/plugins/pychrysa/format/elf/elf.h deleted file mode 100644 index cf6a706..0000000 --- a/plugins/pychrysa/format/elf/elf.h +++ /dev/null @@ -1,42 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * elf.h - prototypes pour l'équivalent Python du fichier "format/elf/elf.h" - * - * Copyright (C) 2013-2017 Cyrille Bagard - * - * This file is part of Chrysalide. - * - * Chrysalide 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. - * - * Chrysalide 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_FORMAT_ELF_ELF_H -#define _PLUGINS_PYCHRYSA_FORMAT_ELF_ELF_H - - -#include <Python.h> -#include <stdbool.h> - - - -/* Fournit un accès à une définition de type à diffuser. */ -PyTypeObject *get_python_elf_format_type(void); - -/* Prend en charge l'objet 'pychrysalide.format.elf.ElfFormat'. */ -bool register_python_elf_format(PyObject *); - - - -#endif /* _PLUGINS_PYCHRYSA_FORMAT_ELF_ELF_H */ diff --git a/plugins/pychrysa/format/elf/module.c b/plugins/pychrysa/format/elf/module.c deleted file mode 100644 index 421e4d2..0000000 --- a/plugins/pychrysa/format/elf/module.c +++ /dev/null @@ -1,84 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * module.c - intégration du répertoire elf en tant que module - * - * Copyright (C) 2013-2017 Cyrille Bagard - * - * This file is part of Chrysalide. - * - * Chrysalide 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. - * - * Chrysalide 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 "elf.h" - - - -/****************************************************************************** -* * -* Paramètres : module = module dont la définition est à compléter. * -* * -* Description : Ajoute le module 'format.elf' au module Python. * -* * -* Retour : - * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool add_format_elf_module_to_python_module(PyObject *super) -{ - bool result; /* Bilan à retourner */ - PyObject *module; /* Sous-module mis en place */ - int ret; /* Bilan d'un appel */ - - static PyModuleDef py_chrysalide_elf_module = { - - .m_base = PyModuleDef_HEAD_INIT, - - .m_name = "pychrysalide.format.elf", - .m_doc = "Python module for Chrysalide.format.elf", - - .m_size = -1, - - }; - - result = false; - - module = PyModule_Create(&py_chrysalide_elf_module); - if (module == NULL) return false; - - ret = PyState_AddModule(super, &py_chrysalide_elf_module); - if (ret != 0) goto loading_failed; - - ret = _PyImport_FixupBuiltin(module, "pychrysalide.format.elf"); - if (ret != 0) goto loading_failed; - - Py_INCREF(module); - ret = PyModule_AddObject(super, "elf", module); - if (ret != 0) goto loading_failed; - - result = true; - - result &= register_python_elf_format(module); - - loading_failed: - - return result; - -} diff --git a/plugins/pychrysa/format/module.c b/plugins/pychrysa/format/module.c index 29170b1..d15fea8 100644 --- a/plugins/pychrysa/format/module.c +++ b/plugins/pychrysa/format/module.c @@ -32,7 +32,7 @@ #include "format.h" #include "symbol.h" #include "dex/module.h" -#include "elf/module.h" +#include "../access.h" @@ -88,7 +88,9 @@ bool add_format_module_to_python_module(PyObject *super) result &= register_python_binary_symbol(module); result &= add_format_dex_module_to_python_module(module); - result &= add_format_elf_module_to_python_module(module); + + if (result) + register_access_to_python_module("pychrysalide.format", module); loading_failed: diff --git a/plugins/pychrysa/glibext/module.c b/plugins/pychrysa/glibext/module.c index f62b17b..01a2cc8 100644 --- a/plugins/pychrysa/glibext/module.c +++ b/plugins/pychrysa/glibext/module.c @@ -32,6 +32,7 @@ #include "bufferline.h" #include "configuration.h" #include "linegen.h" +#include "../access.h" @@ -88,6 +89,9 @@ bool add_glibext_module_to_python_module(PyObject *super) result &= register_python_generic_config(module); result &= register_python_line_generator(module); + if (result) + register_access_to_python_module("pychrysalide.glibext", module); + agmtpm_exit: assert(result); diff --git a/plugins/pychrysa/gui/module.c b/plugins/pychrysa/gui/module.c index 6a55151..192b1e6 100644 --- a/plugins/pychrysa/gui/module.c +++ b/plugins/pychrysa/gui/module.c @@ -31,6 +31,7 @@ #include "editem.h" #include "panels/module.h" +#include "../access.h" @@ -84,6 +85,9 @@ bool add_gui_module_to_python_module(PyObject *super) result &= add_gui_panels_module_to_python_module(module); + if (result) + register_access_to_python_module("pychrysalide.gui", module); + loading_failed: assert(result); diff --git a/plugins/pychrysa/gui/panels/module.c b/plugins/pychrysa/gui/panels/module.c index ea0e234..d5040e3 100644 --- a/plugins/pychrysa/gui/panels/module.c +++ b/plugins/pychrysa/gui/panels/module.c @@ -30,6 +30,7 @@ #include "log.h" #include "panel.h" +#include "../../access.h" @@ -82,6 +83,9 @@ bool add_gui_panels_module_to_python_module(PyObject *super) result &= register_python_panel_item(module); result &= register_python_log_panel(module); + if (result) + register_access_to_python_module("pychrysalide.gui.panels", module); + loading_failed: assert(result); diff --git a/plugins/pychrysa/helpers.h b/plugins/pychrysa/helpers.h index 3eee6a0..295ec28 100644 --- a/plugins/pychrysa/helpers.h +++ b/plugins/pychrysa/helpers.h @@ -21,8 +21,8 @@ */ -#ifndef _PLUGINS_HELPERS_H -#define _PLUGINS_HELPERS_H +#ifndef _PLUGINS_PYCHRYSA_HELPERS_H +#define _PLUGINS_PYCHRYSA_HELPERS_H #include <glib-object.h> @@ -90,4 +90,4 @@ bool _register_class_for_pygobject(PyObject *, GType, PyTypeObject *, PyTypeObje -#endif /* _PLUGINS_HELPERS_H */ +#endif /* _PLUGINS_PYCHRYSA_HELPERS_H */ diff --git a/plugins/pychrysa/pychrysa.c b/plugins/pychrysa/pychrysa.c index 4d32ee1..7c082d6 100644 --- a/plugins/pychrysa/pychrysa.c +++ b/plugins/pychrysa/pychrysa.c @@ -59,6 +59,10 @@ DEFINE_CHRYSALIDE_ACTIVE_PLUGIN("PyChrysalide", "Provides bindings to Python", "0.1.0", PGA_PLUGIN_INIT); +/* Note la nature du chargement */ +static bool _standalone = true; + + /* Fournit la révision du programme global. */ static PyObject *py_chrysalide_revision(PyObject *, PyObject *); @@ -395,6 +399,9 @@ PyMODINIT_FUNC PyInit_pychrysalide(void) return NULL; } + if (_standalone) + init_all_plugins(); + return result; } @@ -533,6 +540,8 @@ G_MODULE_EXPORT bool chrysalide_plugin_init(GPluginModule *plugin) /* Chargement du module pour Python */ + _standalone = false; + ret = PyImport_AppendInittab("pychrysalide", &PyInit_pychrysalide); if (ret == -1) |