pidl: Base new objects off of talloc object.

[samba.git] / pidl / lib / Parse / Pidl / Samba4 / Python.pm

diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index f79981e317eb1aefd5eefa0d5dff71482f3fdb83..b0b8e53f44f68a22fad9cce4effc9ac208b1eb71 100644 (file)
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -321,22 +321,22 @@ sub PythonStruct($$$$$$)
        $self->indent;
        $self->pidl("PyObject_HEAD_INIT(NULL) 0,");
        $self->pidl(".tp_name = \"$modulename.$prettyname\",");
-       $self->pidl(".tp_basicsize = sizeof(py_talloc_Object),");
-       $self->pidl(".tp_dealloc = py_talloc_dealloc,");
        $self->pidl(".tp_getset = $getsetters,");
-       $self->pidl(".tp_repr = py_talloc_default_repr,");
-       $self->pidl(".tp_compare = py_talloc_default_cmp,");
        if ($docstring) {
                $self->pidl(".tp_doc = $docstring,");
        }
        $self->pidl(".tp_methods = $py_methods,");
        $self->pidl(".tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,");
+       $self->pidl(".tp_basicsize = sizeof(py_talloc_Object),");
        $self->pidl(".tp_new = py_$name\_new,");
        $self->deindent;
        $self->pidl("};");
 
        $self->pidl("");
 
+       my $talloc_typename = $self->import_type_variable("talloc", "Object");
+       $self->register_module_prereadycode(["$name\_Type.tp_base = $talloc_typename;", ""]);
+
        return "&$typeobject";
 }
 
@@ -824,7 +824,8 @@ sub assign($$$)
        if ($dest =~ /^\&/ and $src eq "NULL") {
                $self->pidl("memset($dest, 0, sizeof(" . get_value_of($dest) . "));");
        } elsif ($dest =~ /^\&/) {
-               $self->pidl("memmove($dest, $src, sizeof(" . get_value_of($dest) . "));");
+               my $destvar = get_value_of($dest);
+               $self->pidl("$destvar = *$src;");
        } else {
                $self->pidl("$dest = $src;");
        }
@@ -1047,7 +1048,8 @@ sub ConvertObjectFromPythonLevel($$$$$$$$)
                my $switch_ptr = "$e->{NAME}_switch_$l->{LEVEL_INDEX}";
                $self->pidl("{");
                $self->indent;
-               $self->pidl("void *$switch_ptr;");
+               my $union_type = mapTypeName(GetNextLevel($e, $l)->{DATA_TYPE});
+               $self->pidl("$union_type *$switch_ptr;");
                $self->pidl("$switch_ptr = py_export_" . GetNextLevel($e, $l)->{DATA_TYPE} . "($mem_ctx, $switch, $py_var);");
                $self->pidl("if ($switch_ptr == NULL) { $fail }");
                $self->assign($var_name, "$switch_ptr");