summaryrefslogtreecommitdiff
path: root/source4/pidl
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-11 20:37:08 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-14 19:53:03 +0100
commit8986f3ee6f46c354fed2cce5e434dda060e6318b (patch)
tree26d87f150bc96e90dd29c65fa309a38da6d409e8 /source4/pidl
parentf71df735556947f70c6a14bf9588988d0f6adfe3 (diff)
downloadsamba-8986f3ee6f46c354fed2cce5e434dda060e6318b.tar.gz
samba-8986f3ee6f46c354fed2cce5e434dda060e6318b.tar.bz2
samba-8986f3ee6f46c354fed2cce5e434dda060e6318b.zip
pidl/python: Convert some Python objects back to C, return proper tuples in client calls.
(This used to be commit 1ab617296943dc1d270cbf999dedcfb3073d3d20)
Diffstat (limited to 'source4/pidl')
-rw-r--r--source4/pidl/lib/Parse/Pidl/Samba4/Python.pm47
1 files changed, 40 insertions, 7 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm b/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm
index 6b4b41f74f..4454eeefd7 100644
--- a/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/source4/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -1,6 +1,6 @@
###################################################
# Python function wrapper generator
-# Copyright jelmer@samba.org 2007
+# Copyright jelmer@samba.org 2007-2008
# released under the GNU GPL
package Parse::Pidl::Samba4::Python;
@@ -11,6 +11,7 @@ use Exporter;
use strict;
use Parse::Pidl::Typelist qw(hasType getType mapTypeName);
use Parse::Pidl::Util qw(has_property ParseExpr);
+use Parse::Pidl::CUtil qw(get_value_of get_pointer_of);
use vars qw($VERSION);
$VERSION = '0.01';
@@ -220,12 +221,19 @@ sub PythonFunction($$$)
$self->pidl("NTSTATUS status;");
$self->pidl("TALLOC_CTX *mem_ctx = talloc_new(NULL);");
$self->pidl("struct dcerpc_$fn->{NAME} r;");
- $self->pidl("PyObject *result = Py_None;");
+ $self->pidl("PyObject *result;");
+ my $result_size = 0;
+
foreach my $e (@{$fn->{ELEMENTS}}) {
- $self->pidl("PyObject *py_$e->{NAME};");
+ if (grep(/in/,@{$e->{DIRECTION}})) {
+ $self->pidl("PyObject *py_$e->{NAME};");
+ }
+ if (grep(/out/,@{$e->{DIRECTION}})) {
+ $result_size++;
+ }
}
if ($fn->{RETURN_TYPE}) {
- $self->pidl("PyObject *py_result;");
+ $result_size++;
}
$self->pidl("");
$self->pidl("ZERO_STRUCT(r.out);");
@@ -238,14 +246,20 @@ sub PythonFunction($$$)
$self->pidl("status = dcerpc_$fn->{NAME}(iface->pipe, mem_ctx, &r);");
$self->handle_ntstatus("status", "NULL", "mem_ctx");
+ $self->pidl("result = PyTuple_New($result_size);");
+
+ my $i = 0;
+
foreach my $e (@{$fn->{ELEMENTS}}) {
if (grep(/out/,@{$e->{DIRECTION}})) {
- $self->pidl("py_$e->{NAME} = " . $self->ConvertObjectToPython($e->{TYPE}, "r.out.$e->{NAME}") . ";");
+ $self->pidl("PyTuple_SetItem(result, $i, " . $self->ConvertObjectToPython($e->{TYPE}, "r.out.$e->{NAME}") . ");");
+
+ $i++;
}
}
if ($fn->{RETURN_TYPE}) {
- $self->pidl("py_result = " . $self->ConvertObjectToPython($fn->{RETURN_TYPE}, "r.out.result") . ";");
+ $self->pidl("PyTuple_SetItem(result, $i, " . $self->ConvertObjectToPython($fn->{RETURN_TYPE}, "r.out.result") . ");");
}
$self->pidl("talloc_free(mem_ctx);");
@@ -304,7 +318,7 @@ sub PythonType($$$)
}
if ($actual_ctype->{TYPE} eq "UNION" or $actual_ctype->{TYPE} eq "STRUCT") {
- $self->pidl("PyObject *py_import_$d->{NAME}(" .mapTypeName($d) . "*in)");
+ $self->pidl("PyObject *py_import_$d->{NAME}(" .mapTypeName($d) . " *in)");
$self->pidl("{");
$self->indent;
$self->FromStructToPythonFunction($d) if ($actual_ctype->{TYPE} eq "STRUCT");
@@ -447,6 +461,21 @@ sub ConvertObjectFromPython($$$)
{
my ($self, $ctype, $cvar) = @_;
+ if (ref($ctype) ne "HASH") {
+ $ctype = getType($ctype);
+ }
+
+ my $actual_ctype = $ctype;
+ if ($ctype->{TYPE} eq "TYPEDEF") {
+ $actual_ctype = $ctype->{DATA};
+ }
+
+ if ($actual_ctype->{TYPE} eq "ENUM" or $actual_ctype->{TYPE} eq "BITMAP" or
+ $actual_ctype->{TYPE} eq "SCALAR" and (
+ $actual_ctype->{NAME} =~ /^(uint[0-9]+|hyper)$/)) {
+ return "PyInt_AsLong($cvar)";
+ }
+
return "FIXME($cvar)";
}
@@ -484,6 +513,10 @@ sub ConvertObjectToPython($$$)
return "py_import_$ctype->{TYPE}_$ctype->{NAME}($cvar)";
}
+ if ($actual_ctype->{TYPE} eq "SCALAR" and $actual_ctype->{NAME} eq "NTSTATUS") {
+ return "PyInt_FromLong($cvar->v)";
+ }
+
die("unknown type ".mapTypeName($ctype) . ": $cvar");
}