diff options
author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-11-12 00:42:03 +0000 |
---|---|---|
committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2005-11-12 00:42:03 +0000 |
commit | 3b72ad5449ec66ea177f384e31d9654bc00e7e90 (patch) | |
tree | 0b7fcec572db2be8a0c8327750204a372d39e510 /tools/pidl | |
parent | 80c4b55bb783ced4a6a3c6b38b9bd75f3111b34e (diff) |
Update to samba 11691:
------------------------------------------------------------------------
r11535 | jelmer | 2005-11-06 14:53:37 +0100 (Sun, 06 Nov 2005) | 2 lines
Changed paths:
M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/Template.pm
Support void functions when generating templates.
------------------------------------------------------------------------
r11539 | jelmer | 2005-11-06 15:31:01 +0100 (Sun, 06 Nov 2005) | 4 lines
Changed paths:
M /branches/SAMBA_4_0/source/pidl/TODO
M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/NDR.pm
M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm
M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm
M /branches/SAMBA_4_0/source/pidl/lib/Parse/Pidl/Samba/Template.pm
Fix indentation in templates. Always generate lower-case
UUID strings as GUID_from_string seems to have trouble with
uppercased ones.
------------------------------------------------------------------------
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@16479 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'tools/pidl')
-rw-r--r-- | tools/pidl/TODO | 2 | ||||
-rw-r--r-- | tools/pidl/lib/Parse/Pidl/NDR.pm | 2 | ||||
-rw-r--r-- | tools/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm | 2 | ||||
-rw-r--r-- | tools/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm | 2 | ||||
-rw-r--r-- | tools/pidl/lib/Parse/Pidl/Samba/Template.pm | 12 |
5 files changed, 15 insertions, 5 deletions
diff --git a/tools/pidl/TODO b/tools/pidl/TODO index e7ff518e36..f1174024bf 100644 --- a/tools/pidl/TODO +++ b/tools/pidl/TODO @@ -1,3 +1,5 @@ +- allow more then one identifier for types (unsigned char, struct foo) + - true multiple dimension array / strings in arrays support - compatibility mode for generating MIDL-readable data: diff --git a/tools/pidl/lib/Parse/Pidl/NDR.pm b/tools/pidl/lib/Parse/Pidl/NDR.pm index 8405873589..882ebeccb5 100644 --- a/tools/pidl/lib/Parse/Pidl/NDR.pm +++ b/tools/pidl/lib/Parse/Pidl/NDR.pm @@ -610,7 +610,7 @@ sub ParseInterface($) return { NAME => $idl->{NAME}, - UUID => has_property($idl, "uuid"), + UUID => lc(has_property($idl, "uuid")), VERSION => $version, TYPE => "INTERFACE", PROPERTIES => $idl->{PROPERTIES}, diff --git a/tools/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm b/tools/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm index daf7ba0238..dd1848152e 100644 --- a/tools/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm +++ b/tools/pidl/lib/Parse/Pidl/Samba/NDR/Header.pm @@ -99,7 +99,7 @@ sub HeaderInterface($) if (defined $interface->{PROPERTIES}->{uuid}) { my $name = uc $interface->{NAME}; pidl "#define DCERPC_$name\_UUID " . - Parse::Pidl::Util::make_str($interface->{PROPERTIES}->{uuid}) . "\n"; + Parse::Pidl::Util::make_str(lc($interface->{PROPERTIES}->{uuid})) . "\n"; if(!defined $interface->{PROPERTIES}->{version}) { $interface->{PROPERTIES}->{version} = "0.0"; } pidl "#define DCERPC_$name\_VERSION $interface->{PROPERTIES}->{version}\n"; diff --git a/tools/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm b/tools/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm index 99982e4ad1..1ee497e206 100644 --- a/tools/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm +++ b/tools/pidl/lib/Parse/Pidl/Samba/NDR/Server.pm @@ -76,7 +76,7 @@ sub Boilerplate_Iface($) my($interface) = shift; my $name = $interface->{NAME}; my $uname = uc $name; - my $uuid = Parse::Pidl::Util::make_str($interface->{PROPERTIES}->{uuid}); + my $uuid = Parse::Pidl::Util::make_str(lc($interface->{PROPERTIES}->{uuid})); my $if_version = $interface->{PROPERTIES}->{version}; pidl " diff --git a/tools/pidl/lib/Parse/Pidl/Samba/Template.pm b/tools/pidl/lib/Parse/Pidl/Samba/Template.pm index fea4b47dee..52bc2b2d3d 100644 --- a/tools/pidl/lib/Parse/Pidl/Samba/Template.pm +++ b/tools/pidl/lib/Parse/Pidl/Samba/Template.pm @@ -46,6 +46,7 @@ sub Template($) #include \"includes.h\" #include \"rpc_server/dcerpc_server.h\" #include \"librpc/gen_ndr/ndr_$name.h\" +#include \"rpc_server/common/common.h\" "; @@ -60,8 +61,15 @@ sub Template($) static $d->{RETURN_TYPE} $fname(struct dcesrv_call_state *dce_call, TALLOC_CTX *mem_ctx, struct $fname *r) { - DCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR); -} +"; + + if ($d->{RETURN_TYPE} eq "void") { + $res .= "\tDCESRV_FAULT_VOID(DCERPC_FAULT_OP_RNG_ERROR);\n"; + } else { + $res .= "\tDCESRV_FAULT(DCERPC_FAULT_OP_RNG_ERROR);\n"; + } + + $res .= "} "; } |