Replace interface by inheritance for binary content objects.

8 files changed, 183 insertions, 108 deletions

diff --git a/plugins/dalvik/context.c b/plugins/dalvik/context.c
index b08678c..9cf878b 100644
--- a/plugins/dalvik/context.c
+++ b/plugins/dalvik/context.c
@@ -373,7 +373,7 @@ bool g_dalvik_context_register_array_data_padding(GDalvikContext *ctx, const vmp
 *                                                                             *
 ******************************************************************************/
 
-GArchInstruction *g_dalvik_context_get_raw_data(GDalvikContext *ctx, const GBinContent *content, vmpa2t *pos)
+GArchInstruction *g_dalvik_context_get_raw_data(GDalvikContext *ctx, GBinContent *content, vmpa2t *pos)
 {
     GArchInstruction *result;               /* Instruction à retourner     */
     raw_data_area *found;                   /* Zone de couverture trouvée  */
@@ -390,7 +390,7 @@ GArchInstruction *g_dalvik_context_get_raw_data(GDalvikContext *ctx, const GBinC
 
     if (found)
     {
-        restricted = g_restricted_content_new_ro(content, &found->range);
+        restricted = g_restricted_content_new(content, &found->range);
 
         length = get_mrange_length(&found->range);
         count = length / found->item_len;
diff --git a/plugins/dalvik/context.h b/plugins/dalvik/context.h
index bfa2757..f09cfa6 100644
--- a/plugins/dalvik/context.h
+++ b/plugins/dalvik/context.h
@@ -67,7 +67,7 @@ bool g_dalvik_context_register_array_data(GDalvikContext *, const vmpa2t *, uint
 bool g_dalvik_context_register_array_data_padding(GDalvikContext *, const vmpa2t *);
 
 /* Place une donnée en tant qu'instruction si besoin est. */
-GArchInstruction *g_dalvik_context_get_raw_data(GDalvikContext *, const GBinContent *, vmpa2t *);
+GArchInstruction *g_dalvik_context_get_raw_data(GDalvikContext *, GBinContent *, vmpa2t *);
 
 
 
diff --git a/plugins/kaitai/parsers/attribute.c b/plugins/kaitai/parsers/attribute.c
index c61fe99..3eb406a 100644
--- a/plugins/kaitai/parsers/attribute.c
+++ b/plugins/kaitai/parsers/attribute.c
@@ -1538,7 +1538,7 @@ static bool _g_kaitai_attribute_parse_content(GKaitaiAttribute *attrib, kaitai_s
             goto exit;
 
         init_mrange(&work_range, pos, diff);
-        work_area = g_restricted_content_new_ro(content, &work_range);
+        work_area = g_restricted_content_new(content, &work_range);
 
         has_empty_size = (diff == 0);
 
diff --git a/plugins/pychrysalide/analysis/content.c b/plugins/pychrysalide/analysis/content.c
index f94e3f7..a4f2b99 100644
--- a/plugins/pychrysalide/analysis/content.c
+++ b/plugins/pychrysalide/analysis/content.c
@@ -40,6 +40,7 @@
 
 #include "cattribs.h"
 #include "constants.h"
+#include "storage/serialize.h"
 #include "../access.h"
 #include "../helpers.h"
 #include "../arch/vmpa.h"
@@ -49,8 +50,13 @@
 /* ------------------------ GLUE POUR CREATION DEPUIS PYTHON ------------------------ */
 
 
-/* Procède à l'initialisation de l'interface de génération. */
-static void py_binary_content_interface_init(GBinContentIface *, gpointer *);
+/* Initialise la classe générique des contenus de binaire. */
+static void py_binary_content_init_gclass(GBinContentClass *, gpointer);
+
+CREATE_DYN_ABSTRACT_CONSTRUCTOR(binary_content, G_TYPE_BIN_CONTENT, py_binary_content_init_gclass);
+
+/* Initialise une instance sur la base du dérivé de GObject. */
+static int py_binary_content_init(PyObject *, PyObject *, PyObject *);
 
 /* Fournit le nom associé au contenu binaire. */
 static char *py_binary_content_describe_wrapper(const GBinContent *, bool);
@@ -126,10 +132,10 @@ static PyObject *py_binary_content_get_data(PyObject *, void *);
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : iface  = interface GLib à initialiser.                       *
-*                unused = adresse non utilisée ici.                           *
+*  Paramètres  : class  = classe à initialiser.                               *
+*                unused = données non utilisées ici.                          *
 *                                                                             *
-*  Description : Procède à l'initialisation de l'interface de génération.     *
+*  Description : Initialise la classe générique des contenus de binaire.      *
 *                                                                             *
 *  Retour      : -                                                            *
 *                                                                             *
@@ -137,9 +143,38 @@ static PyObject *py_binary_content_get_data(PyObject *, void *);
 *                                                                             *
 ******************************************************************************/
 
-static void py_binary_content_interface_init(GBinContentIface *iface, gpointer *unused)
+static void py_binary_content_init_gclass(GBinContentClass *class, gpointer unused)
 {
-#define BINARY_CONTENT_DOC                                                  \
+    class->describe = py_binary_content_describe_wrapper;
+
+    class->read_raw = py_binary_content_read_raw_wrapper;
+    class->read_u8 = py_binary_content_read_u8_wrapper;
+    class->read_u16 = py_binary_content_read_u16_wrapper;
+    class->read_u32 = py_binary_content_read_u32_wrapper;
+    class->read_u64 = py_binary_content_read_u64_wrapper;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = objet à initialiser (théoriquement).                  *
+*                args = arguments fournis à l'appel.                          *
+*                kwds = arguments de type key=val fournis.                    *
+*                                                                             *
+*  Description : Initialise une instance sur la base du dérivé de GObject.    *
+*                                                                             *
+*  Retour      : 0.                                                           *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static int py_binary_content_init(PyObject *self, PyObject *args, PyObject *kwds)
+{
+    int ret;                                /* Bilan de lecture des args.  */
+
+#define BINARY_CONTENT_DOC                                              \
     "The BinContent is an interface which handles access to a given binary" \
     " content.\n"                                                           \
     "\n"                                                                    \
@@ -161,13 +196,12 @@ static void py_binary_content_interface_init(GBinContentIface *iface, gpointer *
     "* pychrysalide.analysis.BinContent._read_u32();\n"                     \
     "* pychrysalide.analysis.BinContent._read_u64();\n"
 
-    iface->describe = py_binary_content_describe_wrapper;
+    /* Initialisation d'un objet GLib */
+
+    ret = forward_pygobjet_init(self);
+    if (ret == -1) return -1;
 
-    iface->read_raw = py_binary_content_read_raw_wrapper;
-    iface->read_u8 = py_binary_content_read_u8_wrapper;
-    iface->read_u16 = py_binary_content_read_u16_wrapper;
-    iface->read_u32 = py_binary_content_read_u32_wrapper;
-    iface->read_u64 = py_binary_content_read_u64_wrapper;
+    return 0;
 
 }
 
@@ -1406,14 +1440,17 @@ PyTypeObject *get_python_binary_content_type(void)
         PyVarObject_HEAD_INIT(NULL, 0)
 
         .tp_name        = "pychrysalide.analysis.BinContent",
-        .tp_basicsize   = sizeof(PyObject),
+        .tp_basicsize   = sizeof(PyGObject),
 
         .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
 
         .tp_doc         = BINARY_CONTENT_DOC,
 
         .tp_methods     = py_binary_content_methods,
-        .tp_getset      = py_binary_content_getseters
+        .tp_getset      = py_binary_content_getseters,
+
+        .tp_init        = py_binary_content_init,
+        .tp_new         = py_binary_content_new,
 
     };
 
@@ -1440,23 +1477,18 @@ bool ensure_python_binary_content_is_registered(void)
     PyObject *module;                       /* Module à recompléter        */
     PyObject *dict;                         /* Dictionnaire du module      */
 
-    static GInterfaceInfo info = {          /* Paramètres d'inscription    */
-
-        .interface_init = (GInterfaceInitFunc)py_binary_content_interface_init,
-        .interface_finalize = NULL,
-        .interface_data = NULL,
-
-    };
-
     type = get_python_binary_content_type();
 
     if (!PyType_HasFeature(type, Py_TPFLAGS_READY))
     {
+        if (!ensure_python_serializable_object_is_registered())
+            return false;
+
         module = get_access_to_python_module("pychrysalide.analysis");
 
         dict = PyModule_GetDict(module);
 
-        if (!register_interface_for_pygobject(dict, G_TYPE_BIN_CONTENT, type, &info))
+        if (!register_class_for_pygobject(dict, G_TYPE_BIN_CONTENT, type))
             return false;
 
         if (!define_analysis_content_constants(type))
diff --git a/plugins/pychrysalide/analysis/contents/encapsulated.c b/plugins/pychrysalide/analysis/contents/encapsulated.c
index a818bab..e9583e6 100644
--- a/plugins/pychrysalide/analysis/contents/encapsulated.c
+++ b/plugins/pychrysalide/analysis/contents/encapsulated.c
@@ -28,18 +28,20 @@
 #include <pygobject.h>
 
 
-#include <analysis/contents/encapsulated.h>
+#include <i18n.h>
+#include <analysis/contents/encapsulated-int.h>
 
 
 #include "../content.h"
-#include "../storage/serialize.h"
 #include "../../access.h"
 #include "../../helpers.h"
 
 
 
-/* Crée un nouvel objet Python de type 'BinContent'. */
-static PyObject *py_encaps_content_new(PyTypeObject *, PyObject *, PyObject *);
+CREATE_DYN_CONSTRUCTOR(encaps_content, G_TYPE_ENCAPS_CONTENT);
+
+/* Initialise une instance sur la base du dérivé de GObject. */
+static int py_encaps_content_init(PyObject *, PyObject *, PyObject *);
 
 /* Indique la base d'un contenu binaire encapsulé. */
 static PyObject *py_encaps_content_get_base(PyObject *, void *);
@@ -54,26 +56,25 @@ static PyObject *py_encaps_content_get_endpoint(PyObject *, void *);
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : type = type de l'objet à instancier.                         *
+*  Paramètres  : self = objet à initialiser (théoriquement).                  *
 *                args = arguments fournis à l'appel.                          *
 *                kwds = arguments de type key=val fournis.                    *
 *                                                                             *
-*  Description : Crée un nouvel objet Python de type 'BinContent'.            *
+*  Description : Initialise une instance sur la base du dérivé de GObject.    *
 *                                                                             *
-*  Retour      : Instance Python mise en place.                               *
+*  Retour      : 0.                                                           *
 *                                                                             *
 *  Remarques   : -                                                            *
 *                                                                             *
 ******************************************************************************/
 
-static PyObject *py_encaps_content_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+static int py_encaps_content_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
-    PyObject *result;                       /* Instance à retourner        */
     GBinContent *base;                      /* Base de l'extraction        */
     const char *path;                       /* Chemin vers le contenu final*/
     GBinContent *endpoint;                  /* Contenu accessible au final */
     int ret;                                /* Bilan de lecture des args.  */
-    GBinContent *content;                   /* Version GLib du contenu     */
+    GEncapsContent *content;                /* Version GLib du contenu     */
 
 #define ENCAPS_CONTENT_DOC                                                  \
     "EncapsulatedContent gathers items relative to a binary encapsulated"   \
@@ -94,20 +95,30 @@ static PyObject *py_encaps_content_new(PyTypeObject *type, PyObject *args, PyObj
     " pychrysalide.analysis.BinContent instances and the access path must"  \
     " be provided as a string."
 
+    /* Récupération des paramètres */
+
     ret = PyArg_ParseTuple(args, "O&sO&",
                            convert_to_binary_content, &base,
                            &path,
                            convert_to_binary_content, &endpoint);
-    if (!ret) return NULL;
+    if (!ret) return -1;
 
-    content = g_encaps_content_new(base, path, endpoint);
+    /* Initialisation d'un objet GLib */
 
-    result = pygobject_new(G_OBJECT(content));
+    ret = forward_pygobjet_init(self);
+    if (ret == -1) return -1;
 
-    if (content != NULL)
-        g_object_unref(content);
+    /* Eléments de base */
 
-    return result;
+    content = G_ENCAPS_CONTENT(pygobject_get(self));
+
+    if (!g_encaps_content_create(content, base, path, endpoint))
+    {
+        PyErr_SetString(PyExc_ValueError, _("Unable to create encapsulated content."));
+        return -1;
+    }
+
+    return 0;
 
 }
 
@@ -276,7 +287,9 @@ PyTypeObject *get_python_encaps_content_type(void)
 
         .tp_methods     = py_encaps_content_methods,
         .tp_getset      = py_encaps_content_getseters,
-        .tp_new         = py_encaps_content_new
+
+        .tp_init        = py_encaps_content_init,
+        .tp_new         = py_encaps_content_new,
 
     };
 
@@ -311,9 +324,6 @@ bool ensure_python_encaps_content_is_registered(void)
 
         dict = PyModule_GetDict(module);
 
-        if (!ensure_python_serializable_object_is_registered())
-            return false;
-
         if (!ensure_python_binary_content_is_registered())
             return false;
 
diff --git a/plugins/pychrysalide/analysis/contents/file.c b/plugins/pychrysalide/analysis/contents/file.c
index 9552b6c..5bef069 100644
--- a/plugins/pychrysalide/analysis/contents/file.c
+++ b/plugins/pychrysalide/analysis/contents/file.c
@@ -28,18 +28,20 @@
 #include <pygobject.h>
 
 
-#include <analysis/contents/file.h>
+#include <i18n.h>
+#include <analysis/contents/file-int.h>
 
 
 #include "memory.h"
-#include "../storage/serialize.h"
 #include "../../access.h"
 #include "../../helpers.h"
 
 
 
-/* Crée un nouvel objet Python de type 'BinContent'. */
-static PyObject *py_file_content_new(PyTypeObject *, PyObject *, PyObject *);
+CREATE_DYN_CONSTRUCTOR(file_content, G_TYPE_FILE_CONTENT);
+
+/* Initialise une instance sur la base du dérivé de GObject. */
+static int py_file_content_init(PyObject *, PyObject *, PyObject *);
 
 /* Fournit le nom de fichier associé au contenu binaire. */
 static PyObject *py_file_content_get_filename(PyObject *, void *);
@@ -48,24 +50,23 @@ static PyObject *py_file_content_get_filename(PyObject *, void *);
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : type = type de l'objet à instancier.                         *
+*  Paramètres  : self = objet à initialiser (théoriquement).                  *
 *                args = arguments fournis à l'appel.                          *
 *                kwds = arguments de type key=val fournis.                    *
 *                                                                             *
-*  Description : Crée un nouvel objet Python de type 'BinContent'.            *
+*  Description : Initialise une instance sur la base du dérivé de GObject.    *
 *                                                                             *
-*  Retour      : Instance Python mise en place.                               *
+*  Retour      : 0.                                                           *
 *                                                                             *
 *  Remarques   : -                                                            *
 *                                                                             *
 ******************************************************************************/
 
-static PyObject *py_file_content_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+static int py_file_content_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
-    PyObject *result;                       /* Instance à retourner        */
     const char *filename;                   /* Nom du fichier à charger    */
     int ret;                                /* Bilan de lecture des args.  */
-    GBinContent *content;                   /* Version GLib du contenu     */
+    GFileContent *content;                  /* Version GLib du contenu     */
 
 #define FILE_CONTENT_DOC                                                    \
     "FileContent handles binary content loaded from a file.\n"              \
@@ -76,17 +77,27 @@ static PyObject *py_file_content_new(PyTypeObject *type, PyObject *args, PyObjec
     "\n"                                                                    \
     "Where filename is a path to an existing file."
 
+    /* Récupération des paramètres */
+
     ret = PyArg_ParseTuple(args, "s", &filename);
-    if (!ret) return NULL;
+    if (!ret) return -1;
 
-    content = g_file_content_new(filename);
+    /* Initialisation d'un objet GLib */
 
-    result = pygobject_new(G_OBJECT(content));
+    ret = forward_pygobjet_init(self);
+    if (ret == -1) return -1;
 
-    if (content != NULL)
-        g_object_unref(content);
+    /* Eléments de base */
 
-    return result;
+    content = G_FILE_CONTENT(pygobject_get(self));
+
+    if (!g_file_content_create(content, filename))
+    {
+        PyErr_SetString(PyExc_ValueError, _("Unable to create file content."));
+        return -1;
+    }
+
+    return 0;
 
 }
 
@@ -163,7 +174,9 @@ PyTypeObject *get_python_file_content_type(void)
 
         .tp_methods     = py_file_content_methods,
         .tp_getset      = py_file_content_getseters,
-        .tp_new         = py_file_content_new
+
+        .tp_init        = py_file_content_init,
+        .tp_new         = py_file_content_new,
 
     };
 
@@ -201,9 +214,6 @@ bool ensure_python_file_content_is_registered(void)
         if (!ensure_python_memory_content_is_registered())
             return false;
 
-        if (!ensure_python_serializable_object_is_registered())
-            return false;
-
         if (!register_class_for_pygobject(dict, G_TYPE_FILE_CONTENT, type))
             return false;
 
diff --git a/plugins/pychrysalide/analysis/contents/memory.c b/plugins/pychrysalide/analysis/contents/memory.c
index b5448f0..7464779 100644
--- a/plugins/pychrysalide/analysis/contents/memory.c
+++ b/plugins/pychrysalide/analysis/contents/memory.c
@@ -28,42 +28,43 @@
 #include <pygobject.h>
 
 
-#include <analysis/contents/memory.h>
+#include <i18n.h>
+#include <analysis/contents/memory-int.h>
 
 
 #include "../content.h"
-#include "../storage/serialize.h"
 #include "../../access.h"
 #include "../../helpers.h"
 
 
 
-/* Crée un nouvel objet Python de type 'BinContent'. */
-static PyObject *py_memory_content_new(PyTypeObject *, PyObject *, PyObject *);
+CREATE_DYN_CONSTRUCTOR(memory_content, G_TYPE_MEMORY_CONTENT);
+
+/* Initialise une instance sur la base du dérivé de GObject. */
+static int py_memory_content_init(PyObject *, PyObject *, PyObject *);
 
 
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : type = type de l'objet à instancier.                         *
+*  Paramètres  : self = objet à initialiser (théoriquement).                  *
 *                args = arguments fournis à l'appel.                          *
 *                kwds = arguments de type key=val fournis.                    *
 *                                                                             *
-*  Description : Crée un nouvel objet Python de type 'BinContent'.            *
+*  Description : Initialise une instance sur la base du dérivé de GObject.    *
 *                                                                             *
-*  Retour      : Instance Python mise en place.                               *
+*  Retour      : 0.                                                           *
 *                                                                             *
 *  Remarques   : -                                                            *
 *                                                                             *
 ******************************************************************************/
 
-static PyObject *py_memory_content_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+static int py_memory_content_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
-    PyObject *result;                       /* Instance à retourner        */
     const char *data;                       /* Tampon interne de Python    */
     Py_ssize_t length;                      /* Taille utilisé de ce tampon */
     int ret;                                /* Bilan de lecture des args.  */
-    GBinContent *content;                   /* Version GLib du contenu     */
+    GMemoryContent *content;                /* Version GLib du contenu     */
 
 #define MEMORY_CONTENT_DOC                                                  \
     "MemoryContent builds a binary content from memory data only."          \
@@ -76,22 +77,32 @@ static PyObject *py_memory_content_new(PyTypeObject *type, PyObject *args, PyObj
     "Where data is provided as string or read-only bytes-like object."      \
     " The string may contain embedded null bytes."
 
+    /* Récupération des paramètres */
+
     /**
      * La taille doit être de type 'int' et non 'Py_ssize_t', sinon les 32 bits
      * de poids fort ne sont pas initialisés !
      */
 
     ret = PyArg_ParseTuple(args, "s#", &data, &length);
-    if (!ret) return NULL;
+    if (!ret) return -1;
+
+    /* Initialisation d'un objet GLib */
 
-    content = g_memory_content_new((const bin_t *)data, length);
+    ret = forward_pygobjet_init(self);
+    if (ret == -1) return -1;
 
-    result = pygobject_new(G_OBJECT(content));
+    /* Eléments de base */
 
-    if (content != NULL)
-        g_object_unref(content);
+    content = G_MEMORY_CONTENT(pygobject_get(self));
 
-    return result;
+    if (!g_memory_content_create(content, (const bin_t *)data, length))
+    {
+        PyErr_SetString(PyExc_ValueError, _("Unable to create memory content."));
+        return -1;
+    }
+
+    return 0;
 
 }
 
@@ -131,7 +142,9 @@ PyTypeObject *get_python_memory_content_type(void)
 
         .tp_methods     = py_memory_content_methods,
         .tp_getset      = py_memory_content_getseters,
-        .tp_new         = py_memory_content_new
+
+        .tp_init        = py_memory_content_init,
+        .tp_new         = py_memory_content_new,
 
     };
 
@@ -166,9 +179,6 @@ bool ensure_python_memory_content_is_registered(void)
 
         dict = PyModule_GetDict(module);
 
-        if (!ensure_python_serializable_object_is_registered())
-            return false;
-
         if (!ensure_python_binary_content_is_registered())
             return false;
 
diff --git a/plugins/pychrysalide/analysis/contents/restricted.c b/plugins/pychrysalide/analysis/contents/restricted.c
index 2609bb4..4521578 100644
--- a/plugins/pychrysalide/analysis/contents/restricted.c
+++ b/plugins/pychrysalide/analysis/contents/restricted.c
@@ -31,19 +31,21 @@
 #include <i18n.h>
 
 
-#include <analysis/contents/restricted.h>
+#include <i18n.h>
+#include <analysis/contents/restricted-int.h>
 
 
 #include "../content.h"
-#include "../storage/serialize.h"
 #include "../../access.h"
 #include "../../helpers.h"
 #include "../../arch/vmpa.h"
 
 
 
-/* Crée un nouvel objet Python de type 'BinContent'. */
-static PyObject *py_restricted_content_new(PyTypeObject *, PyObject *, PyObject *);
+CREATE_DYN_CONSTRUCTOR(restricted_content, G_TYPE_RESTRICTED_CONTENT);
+
+/* Initialise une instance sur la base du dérivé de GObject. */
+static int py_restricted_content_init(PyObject *, PyObject *, PyObject *);
 
 /* Indique l'espace de restriction appliqué à un contenu. */
 static PyObject *py_restricted_content_get_range(PyObject *, void *);
@@ -52,25 +54,24 @@ static PyObject *py_restricted_content_get_range(PyObject *, void *);
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : type = type de l'objet à instancier.                         *
+*  Paramètres  : self = objet à initialiser (théoriquement).                  *
 *                args = arguments fournis à l'appel.                          *
 *                kwds = arguments de type key=val fournis.                    *
 *                                                                             *
-*  Description : Crée un nouvel objet Python de type 'BinContent'.            *
+*  Description : Initialise une instance sur la base du dérivé de GObject.    *
 *                                                                             *
-*  Retour      : Instance Python mise en place.                               *
+*  Retour      : 0.                                                           *
 *                                                                             *
 *  Remarques   : -                                                            *
 *                                                                             *
 ******************************************************************************/
 
-static PyObject *py_restricted_content_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
+static int py_restricted_content_init(PyObject *self, PyObject *args, PyObject *kwds)
 {
-    PyObject *result;                       /* Instance à retourner        */
-    GBinContent *content;                   /* Instance GLib correspondante*/
+    GBinContent *internal;                  /* Instance GLib correspondante*/
     mrange_t range;                         /* Restriction à appliquer     */
     int ret;                                /* Bilan de lecture des args.  */
-    GBinContent *restricted;                /* Création GLib à transmettre */
+    GRestrictedContent *content;            /* Version GLib du contenu     */
 
 #define RESTRICTED_CONTENT_DOC                                                  \
     "RestrictedContent restricts access to a given area for a binary content."  \
@@ -82,14 +83,27 @@ static PyObject *py_restricted_content_new(PyTypeObject *type, PyObject *args, P
     "Where content is a pychrysalide.analysis.BinContent instance and range"    \
     " a Python object which can be converted into pychrysalide.arch.mrange."
 
-    ret = PyArg_ParseTuple(args, "O&O&", convert_to_binary_content, &content, convert_any_to_mrange, &range);
-    if (!ret) return NULL;
+    /* Récupération des paramètres */
 
-    restricted = g_restricted_content_new(content, &range);
+    ret = PyArg_ParseTuple(args, "O&O&", convert_to_binary_content, &internal, convert_any_to_mrange, &range);
+    if (!ret) return -1;
 
-    result = pygobject_new(G_OBJECT(restricted));
+    /* Initialisation d'un objet GLib */
 
-    return result;
+    ret = forward_pygobjet_init(self);
+    if (ret == -1) return -1;
+
+    /* Eléments de base */
+
+    content = G_RESTRICTED_CONTENT(pygobject_get(self));
+
+    if (!g_restricted_content_create(content, internal, &range))
+    {
+        PyErr_SetString(PyExc_ValueError, _("Unable to create restricted content."));
+        return -1;
+    }
+
+    return 0;
 
 }
 
@@ -166,7 +180,9 @@ PyTypeObject *get_python_restricted_content_type(void)
 
         .tp_methods     = py_restricted_content_methods,
         .tp_getset      = py_restricted_content_getseters,
-        .tp_new         = py_restricted_content_new
+
+        .tp_init        = py_restricted_content_init,
+        .tp_new         = py_restricted_content_new,
 
     };
 
@@ -201,9 +217,6 @@ bool ensure_python_restricted_content_is_registered(void)
 
         dict = PyModule_GetDict(module);
 
-        if (!ensure_python_serializable_object_is_registered())
-            return false;
-
         if (!ensure_python_binary_content_is_registered())
             return false;