diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-07-19 19:21:40 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:29:44 -0500 |
| commit | 4f3d66b0dfe49d5485eafce52f3abf4c6581bf57 (patch) | |
| tree | 449a97550743787963164c4515082568f2439b86 | |
| parent | 728033178b74cbda9574ccdfe2329bae45312a60 (diff) | |
| download | samba-4f3d66b0dfe49d5485eafce52f3abf4c6581bf57.tar.gz samba-4f3d66b0dfe49d5485eafce52f3abf4c6581bf57.tar.xz samba-4f3d66b0dfe49d5485eafce52f3abf4c6581bf57.zip | |
r8614: Add COMRESULT/HRESULT scalar type
(This used to be commit 8637a85e6a349cce15a298154500921e9a0183a3)
| -rw-r--r-- | source4/build/pidl/Parse/Pidl/Typelist.pm | 8 | ||||
| -rw-r--r-- | source4/librpc/idl/orpc.idl | 14 | ||||
| -rw-r--r-- | source4/librpc/ndr/ndr_orpc.h | 2 |
3 files changed, 23 insertions, 1 deletions
diff --git a/source4/build/pidl/Parse/Pidl/Typelist.pm b/source4/build/pidl/Parse/Pidl/Typelist.pm index 60b6e7905b..ab5df0fc52 100644 --- a/source4/build/pidl/Parse/Pidl/Typelist.pm +++ b/source4/build/pidl/Parse/Pidl/Typelist.pm @@ -137,6 +137,11 @@ my $scalars = { IS_REFERENCE => 0, NDR_ALIGN => 4 }, + "COMRESULT" => { + "C_TYPE" => "COMRESULT", + IS_REFERENCE => 0, + NDR_ALIGN => 4 + }, # special types "nbt_string" => { @@ -244,7 +249,8 @@ my $aliases = { "char" => "uint8", "long" => "int32", "short" => "int16", - "HYPER_T" => "hyper" + "HYPER_T" => "hyper", + "HRESULT" => "COMRESULT", }; sub RegisterAliases() diff --git a/source4/librpc/idl/orpc.idl b/source4/librpc/idl/orpc.idl index 1934a3cbed..377f71b34f 100644 --- a/source4/librpc/idl/orpc.idl +++ b/source4/librpc/idl/orpc.idl @@ -200,4 +200,18 @@ interface ObjectRpcBaseTypes uint32 size; [subcontext(4)] OBJREF obj; } MInterfacePointer; + + typedef [v1_enum,public] enum + { + COM_OK = 0x00000000, + COM_OUTOFMEMORY = 0x80000002, + COM_INVALIDARG = 0x80000003, + COM_NOINTERFACE = 0x80000004, + COM_ACCESSDENIED = 0x80000005, + COM_INVALID_OXID = 0x80070776, + COM_INVALID_OID = 0x80070777, + COM_INVALID_SET = 0x80070778, + COM_UNEXPECTED = 0x8000FFFF, + COM_CLSNOTFOUND = 0x80040154 + } COMRESULT; } diff --git a/source4/librpc/ndr/ndr_orpc.h b/source4/librpc/ndr/ndr_orpc.h index d1817969a4..ab91432aec 100644 --- a/source4/librpc/ndr/ndr_orpc.h +++ b/source4/librpc/ndr/ndr_orpc.h @@ -23,6 +23,8 @@ #ifndef __NDR_ORPC_H__ #define __NDR_ORPC_H__ +typedef enum COMRESULT COMRESULT; + struct STRINGARRAY { struct STRINGBINDING **stringbindings; |