r8614: Add COMRESULT/HRESULT scalar type

diff --git a/source/build/pidl/Parse/Pidl/Typelist.pm b/source/build/pidl/Parse/Pidl/Typelist.pm
index 60b6e7905b51bcb3b7cb4c035acf44c67a153f7b..ab5df0fc52ce6d711b2f2b81d385ea7f2038a182 100644 (file)
--- a/source/build/pidl/Parse/Pidl/Typelist.pm
+++ b/source/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/source/librpc/idl/orpc.idl b/source/librpc/idl/orpc.idl
index 1934a3cbed7f4076b36a0832ed44365830940ba2..377f71b34f35a294289a60ba3dc72c87b289e74c 100644 (file)
--- a/source/librpc/idl/orpc.idl
+++ b/source/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/source/librpc/ndr/ndr_orpc.h b/source/librpc/ndr/ndr_orpc.h
index d1817969a48287bdaf75c0d7b157f63fc3142b96..ab91432aecdb8ae573403e909df087c9d1b93773 100644 (file)
--- a/source/librpc/ndr/ndr_orpc.h
+++ b/source/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;