diff options
| -rw-r--r-- | source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm | 30 | ||||
| -rw-r--r-- | source4/pidl/tests/Util.pm | 2 | ||||
| -rw-r--r-- | source4/pidl/tests/ndr_represent.pl | 11 |
3 files changed, 35 insertions, 8 deletions
diff --git a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm index 81e30e1053..feab825a3f 100644 --- a/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm +++ b/source4/pidl/lib/Parse/Pidl/Samba4/NDR/Parser.pm @@ -676,8 +676,12 @@ sub ParseElementPush($$$$$$) # Representation type is different from transmit_as if ($e->{REPRESENTATION_TYPE}) { - pidl "/* FIXME: Convert from $e->{REPRESENTATION_TYPE} to $e->{TYPE} */"; - pidl "NDR_CHECK(ndr_$e->{REPRESENTATION_TYPE}_to_$e->{TYPE}(FIXME, FIXME));"; + pidl "{"; + indent; + my $transmit_name = "_transmit_$e->{NAME}"; + pidl mapType($e->{TYPE}) ." $transmit_name;"; + pidl "NDR_CHECK(ndr_$e->{REPRESENTATION_TYPE}_to_$e->{TYPE}($var_name, $transmit_name));"; + $var_name = $transmit_name; } start_flags($e); @@ -690,6 +694,10 @@ sub ParseElementPush($$$$$$) end_flags($e); + if ($e->{REPRESENTATION_TYPE}) { + deindent; + pidl "}"; + } } ##################################################################### @@ -1064,11 +1072,20 @@ sub ParseElementPull($$$$$$) my($e,$ndr,$var_prefix,$env,$primitives,$deferred) = @_; my $var_name = $var_prefix.$e->{NAME}; - - $var_name = append_prefix($e, $var_name); + my $represent_name; return unless $primitives or ($deferred and ContainsDeferred($e, $e->{LEVELS}[0])); + if ($e->{REPRESENTATION_TYPE}) { + pidl "{"; + indent; + $represent_name = $var_name; + $var_name = "_transmit_$e->{NAME}"; + pidl mapType($e->{TYPE})." $var_name;"; + } + + $var_name = append_prefix($e, $var_name); + start_flags($e); ParseElementPullLevel($e,$e->{LEVELS}[0],$ndr,$var_name,$env,$primitives,$deferred); @@ -1077,8 +1094,9 @@ sub ParseElementPull($$$$$$) # Representation type is different from transmit_as if ($e->{REPRESENTATION_TYPE}) { - pidl "/* FIXME: Convert from $e->{TYPE} to $e->{REPRESENTATION_TYPE} */"; - pidl "NDR_CHECK(ndr_$e->{TYPE}_to_$e->{REPRESENTATION_TYPE}(FIXME, FIXME));"; + pidl "NDR_CHECK(ndr_$e->{TYPE}_to_$e->{REPRESENTATION_TYPE}($var_name, $represent_name));"; + deindent; + pidl "}"; } } diff --git a/source4/pidl/tests/Util.pm b/source4/pidl/tests/Util.pm index bb633f6e32..fde92c2a77 100644 --- a/source4/pidl/tests/Util.pm +++ b/source4/pidl/tests/Util.pm @@ -57,8 +57,8 @@ SKIP: { print CC "#include <stdarg.h>\n"; print CC $header; print CC $ndrheader; - print CC $ndrparser; print CC $extra if ($extra); + print CC $ndrparser; print CC "int main(int argc, const char **argv) { TALLOC_CTX *mem_ctx = talloc_init(NULL); diff --git a/source4/pidl/tests/ndr_represent.pl b/source4/pidl/tests/ndr_represent.pl index 772df2b94e..e72fcf6a50 100644 --- a/source4/pidl/tests/ndr_represent.pl +++ b/source4/pidl/tests/ndr_represent.pl @@ -29,7 +29,16 @@ test_samba4_ndr('represent_as-simple', return 2; ', ' -NTSTATUS ndr_uint8_to_foo(uint8 from, foo *to) +#include <core/nterr.h> +typedef int foo; + +NTSTATUS ndr_uint8_to_foo(uint8_t from, foo *to) +{ + *to = from; + return NT_STATUS_OK; +} + +NTSTATUS ndr_foo_to_uint8(foo from, uint8_t *to) { *to = from; return NT_STATUS_OK; |