Handled Dalvik exception handlers in the graphic view.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@285 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

14 files changed, 911 insertions, 4 deletions

diff --git a/plugins/pychrysa/analysis/binary.c b/plugins/pychrysa/analysis/binary.c
index 93db685..e8158a2 100644
--- a/plugins/pychrysa/analysis/binary.c
+++ b/plugins/pychrysa/analysis/binary.c
@@ -33,6 +33,7 @@
 
 #include "../quirks.h"
 #include "../arch/instruction.h"
+#include "../format/executable.h"
 #include "../glibext/codebuffer.h"
 
 
@@ -43,6 +44,9 @@ static PyObject *py_loaded_binary_new(PyTypeObject *, PyObject *, PyObject *);
 /* Fournit le fichier correspondant à l'élément binaire. */
 static PyObject *py_loaded_binary_get_filename(PyObject *self, PyObject *args);
 
+/* Fournit le format de fichier reconnu dans le contenu binaire. */
+static PyObject *py_loaded_binary_get_format(PyObject *, PyObject *);
+
 /* Fournit les instructions issues du désassemblage. */
 static PyObject *py_loaded_binary_get_instructions(PyObject *, PyObject *);
 
@@ -151,6 +155,35 @@ static PyObject *py_loaded_binary_get_filename(PyObject *self, PyObject *args)
 *  Paramètres  : self = classe représentant un binaire.                       *
 *                args = arguments fournis à l'appel.                          *
 *                                                                             *
+*  Description : Fournit le format de fichier reconnu dans le contenu binaire.*
+*                                                                             *
+*  Retour      : Nom de fichier avec chemin absolu.                           *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_loaded_binary_get_format(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Trouvailles à retourner     */
+    GLoadedBinary *binary;                  /* Version native              */
+    GExeFormat *format;                     /* Format du binaire physique  */
+
+    binary = G_LOADED_BINARY(pygobject_get(self));
+    format = g_loaded_binary_get_format(binary);
+
+    result = py_executable_format_from_c(format);
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = classe représentant un binaire.                       *
+*                args = arguments fournis à l'appel.                          *
+*                                                                             *
 *  Description : Fournit les instructions issues du désassemblage.            *
 *                                                                             *
 *  Retour      : Instructions issues du désassemblage.                        *
@@ -239,11 +272,15 @@ bool register_python_loaded_binary(PyObject *module)
             "Provide the filename of the loaded binary."
         },
         {
+            "get_format", (PyCFunction)py_loaded_binary_get_format,
+            METH_NOARGS,
+            "Provide the file format recognized in the binary content."
+        },
+        {
             "get_instructions", (PyCFunction)py_loaded_binary_get_instructions,
             METH_NOARGS,
             "Give access to all disassembled instructions."
         },
-
         { NULL }
     };
 
diff --git a/plugins/pychrysa/format/Makefile.am b/plugins/pychrysa/format/Makefile.am
index a890385..9a48749 100644
--- a/plugins/pychrysa/format/Makefile.am
+++ b/plugins/pychrysa/format/Makefile.am
@@ -3,14 +3,21 @@ noinst_LTLIBRARIES = libpychrysaformat.la
 
 libpychrysaformat_la_SOURCES =			\
 	executable.h executable.c			\
+	format.h format.c					\
 	module.h module.c
 
+libpychrysaformat_la_LIBADD =			\
+	dex/libpychrysaformatdex.la
+
 
 libpychrysaformat_la_LDFLAGS = 
 
 
-INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) -I../../../src
+INCLUDES = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \
+	-I../../../src
 
 AM_CPPFLAGS = 
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
+
+SUBDIRS = dex
diff --git a/plugins/pychrysa/format/dex/Makefile.am b/plugins/pychrysa/format/dex/Makefile.am
new file mode 100644
index 0000000..79b5322
--- /dev/null
+++ b/plugins/pychrysa/format/dex/Makefile.am
@@ -0,0 +1,18 @@
+
+noinst_LTLIBRARIES = libpychrysaformatdex.la
+
+libpychrysaformatdex_la_SOURCES =		\
+	class.h class.c						\
+	dex.h dex.c							\
+	module.h module.c
+
+
+libpychrysaformatdex_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/format/dex/class.c b/plugins/pychrysa/format/dex/class.c
new file mode 100644
index 0000000..97c1968
--- /dev/null
+++ b/plugins/pychrysa/format/dex/class.c
@@ -0,0 +1,157 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * class.c - équivalent Python du fichier "format/dex/class.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 "class.h"
+
+
+#include <pygobject.h>
+
+
+#include "../../quirks.h"
+
+
+
+/* Crée un nouvel objet Python de type 'DexClass'. */
+static PyObject *py_dex_class_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 'DexClass'.             *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_dex_class_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    return Py_None;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : item = instance existante GLib.                              *
+*                                                                             *
+*  Description : Crée un nouvel objet Python de type 'DexClass'.              *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyObject *py_dex_class_from_c(GDexClass *class)
+{
+    PyObject *module;                       /* Module d'appartenance       */
+    PyTypeObject *type;                     /* Type Python correspondant   */
+
+    module = PyImport_ImportModule("pychrysalide.format.dex");
+    type = (PyTypeObject *)PyObject_GetAttrString(module, "DexClass");
+    Py_DECREF(module);
+
+    pychrysalide_set_instance_data(G_OBJECT(class), type);
+
+    return pygobject_new(G_OBJECT(class));
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.format.dex.DexClass'.  *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_dex_class(PyObject *module)
+{
+    PyObject *pygobj_mod;                   /* Module Python-GObject       */
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyMethodDef py_dex_class_methods[] = {
+        { NULL }
+    };
+
+    static PyGetSetDef py_dex_class_getseters[] = {
+        { NULL }
+    };
+
+    static PyTypeObject py_dex_class_type = {
+
+        PyObject_HEAD_INIT(NULL)
+
+        .tp_name        = "pychrysalide.format.dex.DexClass",
+        .tp_basicsize   = sizeof(PyGObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide Dex class",
+
+        .tp_methods     = py_dex_class_methods,
+        .tp_getset      = py_dex_class_getseters,
+        .tp_new         = (newfunc)py_dex_class_new
+
+    };
+
+    pygobj_mod = PyImport_ImportModule("gobject");
+    if (pygobj_mod == NULL) return false;
+
+    py_dex_class_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(pygobj_mod, "GObject");
+    Py_DECREF(pygobj_mod);
+
+    if (PyType_Ready(&py_dex_class_type) < 0)
+        return false;
+
+    Py_INCREF(&py_dex_class_type);
+    ret = PyModule_AddObject(module, "DexClass", (PyObject *)&py_dex_class_type);
+
+    return (ret == 0);
+
+}
diff --git a/plugins/pychrysa/format/dex/class.h b/plugins/pychrysa/format/dex/class.h
new file mode 100644
index 0000000..addf7ca
--- /dev/null
+++ b/plugins/pychrysa/format/dex/class.h
@@ -0,0 +1,44 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * class.h - prototypes pour l'équivalent Python du fichier "format/dex/class.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_FORMAT_DEX_CLASS_H
+#define _PLUGINS_PYCHRYSA_FORMAT_DEX_CLASS_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+#include <format/dex/class.h>
+
+
+
+/* Crée un nouvel objet Python de type 'DexClass'. */
+PyObject *py_dex_class_from_c(GDexClass *);
+
+/* Prend en charge l'objet 'pychrysalide.format.dex.DexClass'. */
+bool register_python_dex_class(PyObject *module);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_FORMAT_DEX_CLASS_H */
diff --git a/plugins/pychrysa/format/dex/dex.c b/plugins/pychrysa/format/dex/dex.c
new file mode 100644
index 0000000..2df8d1b
--- /dev/null
+++ b/plugins/pychrysa/format/dex/dex.c
@@ -0,0 +1,250 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * dex.c - équivalent Python du fichier "format/dex/dex.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 "dex.h"
+
+
+#include <pygobject.h>
+
+#include <format/dex/dex-int.h>
+
+
+#include "class.h"
+#include "../../quirks.h"
+
+
+
+/* Crée un nouvel objet Python de type 'DexFormat'. */
+static PyObject *py_dex_format_new(PyTypeObject *, PyObject *, PyObject *);
+
+/* Dénombre le nombre de classes trouvées. */
+static PyObject *py_dex_format_count_classes(PyObject *, PyObject *);
+
+/* Fournit une classe du format chargée en mémoire. */
+static PyObject *py_dex_format_get_class(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 'DexFormat'.             *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_dex_format_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    PyObject *result;                       /* Instance à retourner        */
+    const bin_t *content;                   /* Données binaires            */
+    int length;                           /* Quantité de ces données     */
+    int ret;                                /* Bilan de lecture des args.  */
+    GBinFormat *format;                     /* Version GLib du format      */
+
+    ret = PyArg_ParseTuple(args, "s#", &content, &length);
+    if (!ret) return Py_None;
+
+    format = g_dex_format_new(content, length);
+    if (format == NULL) return Py_None;
+
+    result = py_dex_format_from_c(G_DEX_FORMAT(format));
+    g_object_unref(format);
+
+    return (PyObject *)result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : item = instance existante GLib.                              *
+*                                                                             *
+*  Description : Crée un nouvel objet Python de type 'DexFormat'.             *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyObject *py_dex_format_from_c(GDexFormat *format)
+{
+    PyObject *module;                       /* Module d'appartenance       */
+    PyTypeObject *type;                     /* Type Python correspondant   */
+
+    module = PyImport_ImportModule("pychrysalide.format.dex");
+    type = (PyTypeObject *)PyObject_GetAttrString(module, "DexFormat");
+    Py_DECREF(module);
+
+    pychrysalide_set_instance_data(G_OBJECT(format), type);
+
+    return pygobject_new(G_OBJECT(format));
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = classe représentant un binaire.                       *
+*                args = arguments fournis à l'appel.                          *
+*                                                                             *
+*  Description : Dénombre le nombre de classes trouvées.                      *
+*                                                                             *
+*  Retour      : Quantité de classes présentes.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_dex_format_count_classes(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Trouvailles à retourner     */
+    GDexFormat *format;                     /* Version native              */
+    size_t count;                           /* Quantité à retourner        */
+
+    format = G_DEX_FORMAT(pygobject_get(self));
+
+    count = g_dex_format_count_classes(format);
+
+    result = PyLong_FromLong(count);
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = classe représentant un binaire.                       *
+*                args = arguments fournis à l'appel.                          *
+*                                                                             *
+*  Description : Fournit une classe du format chargée en mémoire.             *
+*                                                                             *
+*  Retour      : Instance représentant une classe chargée.                    *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_dex_format_get_class(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Trouvailles à retourner     */
+    int ret;                                /* Bilan de lecture des args.  */
+    int index;                              /* Indice de la classe         */
+    GDexFormat *format;                     /* Version native              */
+    GDexClass *class;                       /* Classe à communiquer        */
+
+    ret = PyArg_ParseTuple(args, "i", &index);
+    if (!ret) return Py_None;
+
+    format = G_DEX_FORMAT(pygobject_get(self));
+
+    class = g_dex_format_get_class(format, index);
+    if (class == NULL) return Py_None;
+
+    result = py_dex_class_from_c(class);
+
+    return result;
+
+}
+
+
+
+
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.format.dex.DexFormat'. *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_dex_format(PyObject *module)
+{
+    PyObject *pygobj_mod;                   /* Module Python-GObject       */
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyMethodDef py_dex_format_methods[] = {
+        {
+            "count_classes", (PyCFunction)py_dex_format_count_classes,
+            METH_NOARGS,
+            "Count the quantity of loaded Dex classes."
+        },
+        {
+            "get_class", (PyCFunction)py_dex_format_get_class,
+            METH_VARARGS,
+            "Provide a given loaded Dex class."
+        },
+        { NULL }
+    };
+
+    static PyGetSetDef py_dex_format_getseters[] = {
+        { NULL }
+    };
+
+    static PyTypeObject py_dex_format_type = {
+
+        PyObject_HEAD_INIT(NULL)
+
+        .tp_name        = "pychrysalide.format.dex.DexFormat",
+        .tp_basicsize   = sizeof(PyGObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide Dex format",
+
+        .tp_methods     = py_dex_format_methods,
+        .tp_getset      = py_dex_format_getseters,
+        .tp_new         = (newfunc)py_dex_format_new
+
+    };
+
+    pygobj_mod = PyImport_ImportModule("gobject");
+    if (pygobj_mod == NULL) return false;
+
+    py_dex_format_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(pygobj_mod, "GObject");
+    Py_DECREF(pygobj_mod);
+
+    if (PyType_Ready(&py_dex_format_type) < 0)
+        return false;
+
+    Py_INCREF(&py_dex_format_type);
+    ret = PyModule_AddObject(module, "DexFormat", (PyObject *)&py_dex_format_type);
+
+    return (ret == 0);
+
+}
diff --git a/plugins/pychrysa/format/dex/dex.h b/plugins/pychrysa/format/dex/dex.h
new file mode 100644
index 0000000..65eec0d
--- /dev/null
+++ b/plugins/pychrysa/format/dex/dex.h
@@ -0,0 +1,44 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * dex.h - prototypes pour l'équivalent Python du fichier "format/dex/dex.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_FORMAT_DEX_DEX_H
+#define _PLUGINS_PYCHRYSA_FORMAT_DEX_DEX_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+#include <format/dex/dex.h>
+
+
+
+/* Crée un nouvel objet Python de type 'DexFormat'. */
+PyObject *py_dex_format_from_c(GDexFormat *);
+
+/* Prend en charge l'objet 'pychrysalide.format.dex.DexFormat'. */
+bool register_python_dex_format(PyObject *module);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_FORMAT_DEX_DEX_H */
diff --git a/plugins/pychrysa/format/dex/module.c b/plugins/pychrysa/format/dex/module.c
new file mode 100644
index 0000000..cea0702
--- /dev/null
+++ b/plugins/pychrysa/format/dex/module.c
@@ -0,0 +1,70 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * module.c - intégration du répertoire dex 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 "class.h"
+#include "dex.h"
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Ajoute le module 'format.dex' au module Python.              *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool add_format_dex_module_to_python_module(PyObject *super)
+{
+    bool result;
+    PyObject *module;
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyMethodDef py_format_dex_methods[] = {
+        { NULL }
+    };
+
+    module = Py_InitModule("pychrysalide.format.dex", py_format_dex_methods);
+    if (module == NULL) return false;
+
+    Py_INCREF(module);
+    ret = PyModule_AddObject(super, "pychrysalide.format.dex", module);
+
+    result = (ret != 0);
+
+    if (ret != 0) /* ... */;
+
+    result &= register_python_dex_class(module);
+    result &= register_python_dex_format(module);
+
+    return true;
+
+}
diff --git a/plugins/pychrysa/format/dex/module.h b/plugins/pychrysa/format/dex/module.h
new file mode 100644
index 0000000..de79edb
--- /dev/null
+++ b/plugins/pychrysa/format/dex/module.h
@@ -0,0 +1,39 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * module.h - prototypes pour l'intégration du répertoire dex 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_FORMAT_DEX_MODULE_H
+#define _PLUGINS_PYCHRYSA_FORMAT_DEX_MODULE_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Ajoute le module 'format.dex' au module Python. */
+bool add_format_dex_module_to_python_module(PyObject *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_FORMAT_DEX_MODULE_H */
diff --git a/plugins/pychrysa/format/executable.c b/plugins/pychrysa/format/executable.c
index 2f10f71..7cdc855 100644
--- a/plugins/pychrysa/format/executable.c
+++ b/plugins/pychrysa/format/executable.c
@@ -25,6 +25,35 @@
 #include "executable.h"
 
 
+#include "format.h"
+
+
+
+
+
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : format = instance existante GLib.                            *
+*                                                                             *
+*  Description : Crée un nouvel objet Python de type 'ExeFormat'.             *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyObject *py_executable_format_from_c(GExeFormat *format)
+{
+    return py_binary_format_from_c(G_BIN_FORMAT(format));
+
+}
+
+
+
 
 
 
diff --git a/plugins/pychrysa/format/executable.h b/plugins/pychrysa/format/executable.h
index 577d1f9..4109784 100644
--- a/plugins/pychrysa/format/executable.h
+++ b/plugins/pychrysa/format/executable.h
@@ -33,6 +33,12 @@
 
 
 
+/* Crée un nouvel objet Python de type 'ExeFormat'. */
+PyObject *py_executable_format_from_c(GExeFormat *);
+
+
+
+
 /* Convertit une instance GLib en objet Python 'py_executable'. */
 PyObject *py_executable_convert(GExeFormat *);
 
diff --git a/plugins/pychrysa/format/format.c b/plugins/pychrysa/format/format.c
new file mode 100644
index 0000000..ea556ba
--- /dev/null
+++ b/plugins/pychrysa/format/format.c
@@ -0,0 +1,159 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * format.c - équivalent Python du fichier "format/format.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 "format.h"
+
+
+#include <pygobject.h>
+
+
+#include "dex/dex.h"
+#include "../quirks.h"
+
+
+
+/* Crée un nouvel objet Python de type 'BinFormat'. */
+static PyObject *py_binary_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 'BinFormat'.             *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_binary_format_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+{
+    return Py_None;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : format = instance existante GLib.                            *
+*                                                                             *
+*  Description : Crée un nouvel objet Python de type 'BinFormat'.             *
+*                                                                             *
+*  Retour      : Instance Python mise en place.                               *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+PyObject *py_binary_format_from_c(GBinFormat *format)
+{
+    PyObject *result;                       /* Conversion à retourner      */
+    GType type;                             /* Type réel du format         */
+
+    type = G_OBJECT_TYPE(G_OBJECT(format));
+
+    if (type == G_TYPE_DEX_FORMAT)
+        result = py_dex_format_from_c(G_DEX_FORMAT(format));
+    else
+        result = Py_None;
+
+    return result;
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.gui.panels.BinFormat'. *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_binary_format(PyObject *module)
+{
+    PyObject *pygobj_mod;                   /* Module Python-GObject       */
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyMethodDef py_binary_format_methods[] = {
+        { NULL }
+    };
+
+    static PyGetSetDef py_binary_format_getseters[] = {
+        { NULL }
+    };
+
+    static PyTypeObject py_binary_format_type = {
+
+        PyObject_HEAD_INIT(NULL)
+
+        .tp_name        = "pychrysalide.format.BinFormat",
+        .tp_basicsize   = sizeof(PyGObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide binary format",
+
+        .tp_methods     = py_binary_format_methods,
+        .tp_getset      = py_binary_format_getseters,
+        .tp_new         = (newfunc)py_binary_format_new
+
+    };
+
+    pygobj_mod = PyImport_ImportModule("gobject");
+    if (pygobj_mod == NULL) return false;
+
+    py_binary_format_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(pygobj_mod, "GObject");
+    Py_DECREF(pygobj_mod);
+
+    if (PyType_Ready(&py_binary_format_type) < 0)
+        return false;
+
+    Py_INCREF(&py_binary_format_type);
+    ret = PyModule_AddObject(module, "BinFormat", (PyObject *)&py_binary_format_type);
+
+    return (ret == 0);
+
+}
diff --git a/plugins/pychrysa/format/format.h b/plugins/pychrysa/format/format.h
new file mode 100644
index 0000000..8f38408
--- /dev/null
+++ b/plugins/pychrysa/format/format.h
@@ -0,0 +1,44 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * format.h - prototypes pour l'équivalent Python du fichier "format/format.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_FORMAT_FORMAT_H
+#define _PLUGINS_PYCHRYSA_FORMAT_FORMAT_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+#include <format/format.h>
+
+
+
+/* Crée un nouvel objet Python de type 'BinFormat'. */
+PyObject *py_binary_format_from_c(GBinFormat *);
+
+/* Prend en charge l'objet 'pychrysalide.format.BinFormat'. */
+bool register_python_binary_format(PyObject *module);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_FORMAT_FORMAT_H */
diff --git a/plugins/pychrysa/format/module.c b/plugins/pychrysa/format/module.c
index 1f15d50..d3e863f 100644
--- a/plugins/pychrysa/format/module.c
+++ b/plugins/pychrysa/format/module.c
@@ -26,6 +26,7 @@
 
 
 #include "executable.h"
+#include "dex/module.h"
 
 
 
@@ -53,16 +54,18 @@ bool add_format_module_to_python_module(PyObject *super)
         { NULL }
     };
 
-    module = Py_InitModule("pyoida.format", py_format_methods);
+    module = Py_InitModule("pychrysalide.format", py_format_methods);
     if (module == NULL) return false;
 
     Py_INCREF(module);
-    ret = PyModule_AddObject(super, "pyoida.format", module);
+    ret = PyModule_AddObject(super, "pychrysalide.format", module);
 
     result = (ret != 0);
 
     result &= add_format_executable_to_python_module(module);
 
+    result &= add_format_dex_module_to_python_module(module);
+
     return result;
 
 }