From 0515f728e64dde0c197aee6180dce79ad281d5f8 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 18 Feb 2007 18:44:56 +0000 Subject: r21433: Get rid of the COM support code - it's not used and unmaintained. We can always bring it back if we need to. This code was getting in the way while refactoring. Add some tests for TDR. Get rid of typedef in lib/registry/tdr_regf.idl and fix the TDR code to be able to deal with it. (This used to be commit 1ad0f99a439f0d52a735b391bf9900d50171aca5) --- source4/librpc/idl/dcom.idl | 299 ------------------------------------ source4/librpc/idl/oxidresolver.idl | 2 +- source4/librpc/idl/remact.idl | 2 +- 3 files changed, 2 insertions(+), 301 deletions(-) delete mode 100644 source4/librpc/idl/dcom.idl (limited to 'source4/librpc/idl') diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl deleted file mode 100644 index 75430f7624..0000000000 --- a/source4/librpc/idl/dcom.idl +++ /dev/null @@ -1,299 +0,0 @@ -/** - DCOM interfaces - http://www.ietf.org/internet-drafts/draft-brown-dcom-v1-spec-04.txt - */ - -[ - uuid("18f70770-8e64-11cf-9af1-0020af6e72f4"), - pointer_default(unique), - version(0.0) -] interface dcom_Unknown -{ - void UseProtSeq(); - void GetCustomProtseqInfo(); - void UpdateResolverBindings(); -} - -[ - object, - uuid("00000000-0000-0000-C000-000000000046"), - pointer_default(unique), - helpstring("Base interface for all COM interfaces") -] -interface IUnknown -{ - /*****************/ - /* Function 0x00 */ - /* Returns the interface with the specified IID - if implemented by this object */ - [local] WERROR QueryInterface([in,unique] GUID *iid, - [out,iid_is(riid)] IUnknown **data); - - /*****************/ - /* Function 0x01 */ - [local] uint32 AddRef(); - - /*****************/ - /* Function 0x02 */ - [local] uint32 Release(); -} - - -[ - object, - uuid("00000001-0000-0000-C000-000000000046"), - pointer_default(unique) -] interface IClassFactory : IUnknown -{ - [local] WERROR CreateInstance([in,unique] MInterfacePointer *pUnknown, - [in,unique] GUID *iid, - [out, iid_is(riid)] MInterfacePointer **ppv); - - [call_as(CreateInstance)] WERROR RemoteCreateInstance(); - - /* Set lock to TRUE when you want to do a lock - and set it to FALSE when you want to unlock */ - [local] WERROR LockServer([in] uint8 lock); - - [call_as(LockServer)] WERROR RemoteLockServer(); -} - -/* The remote version of IUnknown. This interface exists on every */ -/* OXID (whether an OXID represents either a thread or a process is */ -/* implementation specific). It is used by clients to query for new */ -/* interfaces, get additional references (for marshaling), and release */ -/* outstanding references. */ -/* This interface is passed along during OXID resolution. */ -/* */ -[ - uuid("00000131-0000-0000-C000-000000000046"), - object, - pointer_default(unique), - helpstring("Remote version of IUnknown") -] -interface IRemUnknown : IUnknown -{ - typedef [public] struct - { - WERROR hResult; /* result of call */ - STDOBJREF std; /* data for returned interface */ - } - REMQIRESULT; - - [call_as(QueryInterface)] WERROR RemQueryInterface ( - [in,unique] GUID *ripid, /* interface to QI on */ - [in] uint32 cRefs, /* count of AddRefs requested */ - [in] uint16 cIids, /* count of IIDs that follow */ - [in, unique, size_is(cIids)] GUID *iids, /* IIDs to QI for */ - [out, size_is(cIids)] MInterfacePointer **ip - ); - - typedef struct - { - GUID ipid; /* ipid to AddRef/Release */ - uint32 cPublicRefs; - uint32 cPrivateRefs; - } REMINTERFACEREF; - - [call_as(AddRef)] WERROR RemAddRef ( - [in] uint16 cInterfaceRefs, - [in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[], - [out, size_is(cInterfaceRefs)] WERROR **pResults - ); - - [call_as(Release)] WERROR RemRelease ( - [in] uint16 cInterfaceRefs, - [in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[] - ); -} - -[ - uuid("00000140-0000-0000-c000-000000000046"), - pointer_default(unique), - object -] interface IClassActivator : IUnknown -{ - void GetClassObject([in] GUID clsid, - [in] uint32 context, - [in] uint32 locale, - [in] GUID iid, - [out, iid_is(iid)] MInterfacePointer *data); -} - -[ - uuid("00000136-0000-0000-c000-000000000046"), - pointer_default(unique), - object -] interface ISCMLocalActivator : IClassActivator -{ - WERROR ISCMLocalActivator_CreateInstance( ); -} - -[ - pointer_default(unique), - uuid("c6f3ee72-ce7e-11d1-b71e-00c04fc3111a") -] interface IMachineLocalActivator -{ - WERROR IMachineLocalActivator_foo(); -} - -[ - pointer_default(unique), - uuid("e60c73e6-88f9-11cf-9af1-0020af6e72f4") -] interface ILocalObjectExporter -{ - WERROR ILocalObjectExporter_Foo(); -} - -/* Looks like this is the equivalent of .NET's - System.Activator class */ -[ - uuid("000001a0-0000-0000-c000-000000000046"), - pointer_default(unique), - object -] - interface ISystemActivator : IClassActivator -{ - WERROR ISystemActivatorRemoteCreateInstance([in] hyper unknown1, /* OXID ? */ - [in] MInterfacePointer iface1, - [in] hyper unknown2, - [out,ref] uint32 *unknown3, - [out,ref] MInterfacePointer *iface2); -} - - - -/* Derived from IRemUnknown, this interface supports Remote Query interface */ -/* for objects that supply additional data beyond the STDOBJREF in their */ -/* marshaled interface packets. */ -[ - object, - pointer_default(unique), - uuid("00000143-0000-0000-C000-000000000046") -] - -interface IRemUnknown2 : IRemUnknown -{ - [call_as(QueryInterface2)] WERROR RemQueryInterface2 ( - [in, unique] GUID *ripid, - [in] uint16 cIids, - [in, size_is(cIids)] GUID **iids, - [out, size_is(cIids)] WERROR **phr, - [out, size_is(cIids)] MInterfacePointer **ppMIF - ); -} - -[ - object, - pointer_default(unique), - uuid("00020400-0000-0000-C000-000000000046") -] interface IDispatch : IUnknown -{ - /*****************/ - /* Function 0x03 */ - WERROR GetTypeInfoCount([out] uint16 *pctinfo); - - typedef struct { - } REF_ITypeInfo; - - /*****************/ - /* Function 0x04 */ - WERROR GetTypeInfo ( - [in] uint16 iTInfo, - [in] uint32 lcid, - [out] REF_ITypeInfo **ppTInfo); - - /*****************/ - /* Function 0x05 */ - WERROR GetIDsOfNames( - [in, unique] GUID *riid, - /*FIXME[in,size_is(cNames)] OLESTR *rgszNames[], */ - [in] uint16 cNames, - [in] uint32 lcid, - [out,size_is(cNames)] uint32 **rgDispId); - - typedef struct { - uint16 vartype; - uint16 unknown /* FIXME */; - } VARIANT; - - typedef struct { - uint16 unknown /* FIXME */; - } DISPPARAMS; - - /* Exception ? */ - typedef struct { - uint16 unknown /* FIXME */; - } EXCEPINFO; - - /*****************/ - /* Function 0x06 */ - WERROR Invoke( - [in] uint32 dispIdMember, - [in, unique] GUID *riid, - [in] uint32 lcid, - [in] uint16 wFlags, - [out,in, unique] DISPPARAMS *pDispParams, - [out] VARIANT **pVarResult, - [out] EXCEPINFO **pExcepInfo, - [out] uint16 **puArgErr); -} - -[ - object, - local, - uuid("00000003-0000-0000-C000-000000000046") -] interface IMarshal : IUnknown -{ - WERROR MarshalInterface(); - WERROR UnMarshalInterface(); -} - -[ - uuid(DA23F6DB-6F45-466C-9EED-0B65286F2D78), - helpstring("ICoffeeMachine Interface"), - pointer_default(unique), - object -] interface ICoffeeMachine : IUnknown -{ - WERROR MakeCoffee([in,string,charset(UTF16)] uint16 *flavor); -} - -[ - uuid("db7c21f8-fe33-4c11-aea5-ceb56f076fbb"), - helpstring("coffeemachine class") -] coclass coffeemachine -{ - interface icoffeemachine; -} - -[ - object, - pointer_default(unique), - uuid("0000000C-0000-0000-C000-000000000046"), - helpstring("Stream") -] -interface IStream : IUnknown -{ - WERROR Read( - [out, size_is(num_requested), length_is(*num_read)] uint8 pv[], - [in] uint32 num_requested, - [in, unique] uint32 *num_readx, - [out,ref] uint32 *num_read - ); - - WERROR Write( - [in,size_is(num_requested),unique] uint8 *data, - [in] uint32 num_requested, - [out,ref] uint32 *num_written); -} - -[ - uuid("5e9ddec7-5767-11cf-beab-00aa006c3606"), - progid("Samba.Simple"), - helpstring("simple class"), - internal -] coclass simple -{ - interface IStream; -} diff --git a/source4/librpc/idl/oxidresolver.idl b/source4/librpc/idl/oxidresolver.idl index 872a01d544..ac028cec29 100644 --- a/source4/librpc/idl/oxidresolver.idl +++ b/source4/librpc/idl/oxidresolver.idl @@ -10,7 +10,7 @@ (used by DCOM) */ -import "dcom.idl", "orpc.idl"; +import "orpc.idl"; [ uuid("99fcfec4-5260-101b-bbcb-00aa0021347a"), diff --git a/source4/librpc/idl/remact.idl b/source4/librpc/idl/remact.idl index 57a8d14fa2..58d976e078 100644 --- a/source4/librpc/idl/remact.idl +++ b/source4/librpc/idl/remact.idl @@ -3,7 +3,7 @@ http://www.grimes.demon.co.uk/DCOM/DCOMSpec.htm */ -import "dcom.idl", "orpc.idl"; +import "orpc.idl"; [ uuid("4d9f4ab8-7d1c-11cf-861e-0020af6e7c57"), -- cgit