Created an interface from the original GBinContent object.

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

4 files changed, 0 insertions, 348 deletions

diff --git a/plugins/pychrysa/glibext/Makefile.am b/plugins/pychrysa/glibext/Makefile.am
index 0a61da2..74def8a 100644
--- a/plugins/pychrysa/glibext/Makefile.am
+++ b/plugins/pychrysa/glibext/Makefile.am
@@ -2,7 +2,6 @@
 noinst_LTLIBRARIES = libpychrysaglibext.la
 
 libpychrysaglibext_la_SOURCES =			\
-	bincontent.h bincontent.c			\
 	bufferline.h bufferline.c			\
 	codebuffer.h codebuffer.c			\
 	configuration.h configuration.c		\
diff --git a/plugins/pychrysa/glibext/bincontent.c b/plugins/pychrysa/glibext/bincontent.c
deleted file mode 100644
index 085c9af..0000000
--- a/plugins/pychrysa/glibext/bincontent.c
+++ /dev/null
@@ -1,303 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * bincontent.c - prototypes pour l'équivalent Python du fichier "glibext/gbincontent.c"
- *
- * Copyright (C) 2015 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  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 "bincontent.h"
-
-
-#include <pygobject.h>
-
-
-#include <glibext/gbincontent.h>
-
-
-#include "../arch/vmpa.h"
-
-
-/* Crée un nouvel objet Python de type 'BinContent'. */
-static PyObject *py_binary_content_new(PyTypeObject *, PyObject *, PyObject *);
-
-/* Fournit une empreinte unique (SHA256) pour les données. */
-static PyObject *py_binary_content_get_checksum(PyObject *, PyObject *);
-
-/* Détermine le nombre d'octets lisibles. */
-static PyObject *py_binary_content_compute_size(PyObject *, PyObject *);
-
-/* Lit un nombre non signé sur un octet. */
-static PyObject *py_binary_content_read_u8(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 'BinContent'.            *
-*                                                                             *
-*  Retour      : Instance Python mise en place.                               *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static PyObject *py_binary_content_new(PyTypeObject *type, 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     */
-
-    ret = PyArg_ParseTuple(args, "s", &filename);
-    if (!ret) Py_RETURN_NONE;
-
-    content = g_binary_content_new_from_file(filename);
-
-    result = pygobject_new(G_OBJECT(content));
-    g_object_unref(content);
-
-    return result;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : self = contenu binaire à manipuler.                          *
-*                args = non utilisé ici.                                      *
-*                                                                             *
-*  Description : Fournit une empreinte unique (SHA256) pour les données.      *
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static PyObject *py_binary_content_get_checksum(PyObject *self, PyObject *args)
-{
-    PyObject *result;                       /* Instance à retourner        */
-    GBinContent *content;                   /* Version GLib du format      */
-    const gchar *checksum;                  /* Empreinte fournie           */
-
-    content = G_BIN_CONTENT(pygobject_get(self));
-
-    checksum = g_binary_content_get_cheksum(content);
-
-    result = PyUnicode_FromString(checksum);
-
-    return result;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : self = contenu binaire à manipuler.                          *
-*                args = non utilisé ici.                                      *
-*                                                                             *
-*  Description : Détermine le nombre d'octets lisibles.                       *
-*                                                                             *
-*  Retour      : Quantité représentée.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static PyObject *py_binary_content_compute_size(PyObject *self, PyObject *args)
-{
-    PyObject *result;                       /* Instance à retourner        */
-    GBinContent *content;                   /* Version GLib du format      */
-    phys_t size;                            /* Quantité d'octets dispos.   */
-
-    content = G_BIN_CONTENT(pygobject_get(self));
-
-    size = g_binary_content_compute_size(content);
-
-    result = PyLong_FromUnsignedLongLong(size);
-
-    return result;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : self = contenu binaire à manipuler.                          *
-*                args = non utilisé ici.                                      *
-*                                                                             *
-*  Description : Lit un nombre non signé sur un octet.                        *
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static PyObject *py_binary_content_read_u8(PyObject *self, PyObject *args)
-{
-    PyObject *result;                       /* Instance à retourner        */
-    GBinContent *content;                   /* Version GLib du format      */
-    int ret;                                /* Bilan de lecture des args.  */
-    PyObject *addr_obj;                     /* Objet pour une position     */
-    vmpa2t *addr;                           /* Position interne associée   */
-    uint8_t val;                            /* Valeur lue à faire suivre   */
-    bool status;                            /* Bilan de l'opération        */
-
-    content = G_BIN_CONTENT(pygobject_get(self));
-
-    //printf("Passage\n");
-
-    ret = PyArg_ParseTuple(args, "O", &addr_obj);
-
-    //printf("ret == %d\n", ret);
-
-    if (!ret) return NULL;
-
-    addr = get_internal_vmpa(addr_obj);
-    if (addr == NULL) /* ... */;
-
-    status = g_binary_content_read_u8(content, addr, &val);
-    if (!status) return NULL;
-
-    //printf("val :: 0x%02hhx\n", val);
-
-    result = PyBytes_FromStringAndSize((char *)&val, 1);;
-    //Py_INCREF(result);
-
-    return 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_binary_content_type(void)
-{
-    static PyMethodDef py_binary_content_methods[] = {
-        { "get_cheksum", py_binary_content_get_checksum,
-          METH_NOARGS,
-          "get_cheksum($self, /)\n--\n\nCompute a SHA256 hash as chechsum of handled data."
-        },
-        { "compute_size", py_binary_content_compute_size,
-          METH_NOARGS,
-          "compute_size($self, /)\n--\n\nCompute the quantity of readable bytes."
-        },
-        { "read_u8", py_binary_content_read_u8,
-          METH_VARARGS,
-          "read_u8($self, addr, /)\n--\n\nRead an unsigned byte from a given position."
-        },
-        { NULL }
-    };
-
-    static PyGetSetDef py_binary_content_getseters[] = {
-        { NULL }
-    };
-
-    static PyTypeObject py_binary_content_type = {
-
-        PyVarObject_HEAD_INIT(NULL, 0)
-
-        .tp_name        = "pychrysalide.glibext.BinContent",
-        .tp_basicsize   = sizeof(PyGObject),
-
-        .tp_flags       = Py_TPFLAGS_DEFAULT,
-
-        .tp_doc         = "PyChrysalide binary content",
-
-        .tp_methods     = py_binary_content_methods,
-        .tp_getset      = py_binary_content_getseters,
-        .tp_new         = (newfunc)py_binary_content_new
-
-    };
-
-    return &py_binary_content_type;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
-*  Paramètres  : module = module dont la définition est à compléter.          *
-*                                                                             *
-*  Description : Prend en charge l'objet 'pychrysalide.glibext.BinContent'.   *
-*                                                                             *
-*  Retour      : Bilan de l'opération.                                        *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-bool register_python_binary_content(PyObject *module)
-{
-    PyTypeObject *py_binary_content_type;   /* Type Python 'BinContent'    */
-    int ret;                                /* Bilan d'un appel            */
-    PyObject *dict;                         /* Dictionnaire du module      */
-
-    py_binary_content_type = get_python_binary_content_type();
-
-    py_binary_content_type->tp_base = &PyGObject_Type;
-    py_binary_content_type->tp_basicsize = py_binary_content_type->tp_base->tp_basicsize;
-
-    if (PyType_Ready(py_binary_content_type) != 0)
-        return false;
-
-    Py_INCREF(py_binary_content_type);
-    ret = PyModule_AddObject(module, "BinContent", (PyObject *)py_binary_content_type);
-    if (ret != 0) return false;
-
-    dict = PyModule_GetDict(module);
-    pygobject_register_class(dict, "BinContent", G_TYPE_BIN_CONTENT, py_binary_content_type,
-                             Py_BuildValue("(O)", py_binary_content_type->tp_base));
-
-    return true;
-
-}
diff --git a/plugins/pychrysa/glibext/bincontent.h b/plugins/pychrysa/glibext/bincontent.h
deleted file mode 100644
index b6ae9a5..0000000
--- a/plugins/pychrysa/glibext/bincontent.h
+++ /dev/null
@@ -1,42 +0,0 @@
-
-/* Chrysalide - Outil d'analyse de fichiers binaires
- * bincontent.h - prototypes pour l'équivalent Python du fichier "glibext/gbincontent.h"
- *
- * Copyright (C) 2015 Cyrille Bagard
- *
- *  This file is part of Chrysalide.
- *
- *  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_GLIBEXT_BINCONTENT_H
-#define _PLUGINS_PYCHRYSA_GLIBEXT_BINCONTENT_H
-
-
-#include <Python.h>
-#include <stdbool.h>
-
-
-
-/* Fournit un accès à une définition de type à diffuser. */
-PyTypeObject *get_python_binary_content_type(void);
-
-/* Prend en charge l'objet 'pychrysalide.glibext.BinContent'. */
-bool register_python_binary_content(PyObject *);
-
-
-
-#endif  /* _PLUGINS_PYCHRYSA_GLIBEXT_BINCONTENT_H */
diff --git a/plugins/pychrysa/glibext/module.c b/plugins/pychrysa/glibext/module.c
index 0cb96a7..b34b91e 100644
--- a/plugins/pychrysa/glibext/module.c
+++ b/plugins/pychrysa/glibext/module.c
@@ -28,7 +28,6 @@
 #include <assert.h>
 
 
-#include "bincontent.h"
 #include "bufferline.h"
 #include "codebuffer.h"
 #include "configuration.h"
@@ -81,7 +80,6 @@ bool add_glibext_module_to_python_module(PyObject *super)
 
     result = true;
 
-    result &= register_python_binary_content(module);
     result &= register_python_buffer_line(module);
     result &= register_python_code_buffer(module);
     result &= register_python_config_param(module);