svn commit: samba r8614 - in branches/SAMBA_4_0/source: build/pidl/Parse/Pidl librpc/idl librpc/ndr

[jelmer at samba.org]

Author: jelmer
Date: 2005-07-19 19:21:40 +0000 (Tue, 19 Jul 2005)
New Revision: 8614

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8614

Log:
Add COMRESULT/HRESULT scalar type

Modified:
   branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Typelist.pm
   branches/SAMBA_4_0/source/librpc/idl/orpc.idl
   branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h


Changeset:
Modified: branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Typelist.pm
===================================================================
--- branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Typelist.pm	2005-07-19 19:04:54 UTC (rev 8613)
+++ branches/SAMBA_4_0/source/build/pidl/Parse/Pidl/Typelist.pm	2005-07-19 19:21:40 UTC (rev 8614)
@@ -137,6 +137,11 @@
 				IS_REFERENCE	=> 0,
 				NDR_ALIGN	=> 4
 			},
+	"COMRESULT" => { 
+				"C_TYPE"	=> "COMRESULT",
+				IS_REFERENCE => 0,
+				NDR_ALIGN => 4
+			},
 
 	# special types
 	"nbt_string"	=> {
@@ -244,7 +249,8 @@
 	"char" => "uint8",
 	"long" => "int32",
 	"short" => "int16",
-	"HYPER_T" => "hyper"
+	"HYPER_T" => "hyper",
+	"HRESULT" => "COMRESULT",
 };
 
 sub RegisterAliases()

Modified: branches/SAMBA_4_0/source/librpc/idl/orpc.idl
===================================================================
--- branches/SAMBA_4_0/source/librpc/idl/orpc.idl	2005-07-19 19:04:54 UTC (rev 8613)
+++ branches/SAMBA_4_0/source/librpc/idl/orpc.idl	2005-07-19 19:21:40 UTC (rev 8614)
@@ -200,4 +200,18 @@
 		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;
 }

Modified: branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h
===================================================================
--- branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h	2005-07-19 19:04:54 UTC (rev 8613)
+++ branches/SAMBA_4_0/source/librpc/ndr/ndr_orpc.h	2005-07-19 19:21:40 UTC (rev 8614)
@@ -23,6 +23,8 @@
 #ifndef __NDR_ORPC_H__
 #define __NDR_ORPC_H__
 
+typedef enum COMRESULT COMRESULT;
+
 struct STRINGARRAY
 {
 	struct STRINGBINDING **stringbindings;