Author: jelmer Date: 2004-11-04 23:57:49 +0000 (Thu, 04 Nov 2004) New Revision: 3536
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=3536 Log: Some minor IDL updates/fixes/additions Modified: branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl branches/SAMBA_4_0/source/librpc/idl/dcom.idl Changeset: Modified: branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl =================================================================== --- branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl 2004-11-04 23:56:23 UTC (rev 3535) +++ branches/SAMBA_4_0/source/librpc/idl/dcerpc.idl 2004-11-04 23:57:49 UTC (rev 3536) @@ -113,6 +113,7 @@ const uint8 DCERPC_AUTH_TYPE_SCHANNEL = 68; const uint8 DCERPC_AUTH_TYPE_MSMQ = 100; + const uint8 DCERPC_AUTH_LEVEL_DEFAULT = DCERPC_AUTH_LEVEL_CONNECT; const uint8 DCERPC_AUTH_LEVEL_NONE = 1; const uint8 DCERPC_AUTH_LEVEL_CONNECT = 2; const uint8 DCERPC_AUTH_LEVEL_CALL = 3; Modified: branches/SAMBA_4_0/source/librpc/idl/dcom.idl =================================================================== --- branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2004-11-04 23:56:23 UTC (rev 3535) +++ branches/SAMBA_4_0/source/librpc/idl/dcom.idl 2004-11-04 23:57:49 UTC (rev 3536) @@ -365,13 +365,21 @@ object ] interface IClassActivator : IUnknown { - void RemoteGetClassObject([in] GUID clsid, - [in] uint32 context, - [in] LCID locale, - [in] GUID iid, - [out, iid_is(iid)] MInterfacePointer data); + void GetClassObject([in] GUID clsid, + [in] uint32 context, + [in] LCID locale, + [in] GUID iid, + [out, iid_is(iid)] MInterfacePointer data); } +[ + uuid("00000136-0000-0000-c000-000000000046"), + object +] interface ISCMLocalActivator : IClassActivator +{ + WERROR ISCMLocalActivator_CreateInstance( ); +} + /* Looks like this is the equivalent of .NET's System.Activator class */ [ @@ -380,7 +388,7 @@ ] interface ISystemActivator : IClassActivator { - WERROR ISystemActivatorRemoteCreateInstance([in] HYPER_T unknown1, /* IPID ? */ + WERROR ISystemActivatorRemoteCreateInstance([in] HYPER_T unknown1, /* OXID ? */ [in] MInterfacePointer iface, [in] HYPER_T unknown2, [out] uint32 unknown3, @@ -411,9 +419,8 @@ [ object, uuid("00000136-0000-0000-C000-000000000046") - ] interface ISCMActivator : IUnknown + ] interface ISCMActivator : IClassActivator { - WERROR SCMActivator_GetClassObject(); WERROR SCMActivator_CreateInstance(); } @@ -428,11 +435,6 @@ [out] uint16 *pctinfo); typedef struct { - uint8 FIXME; - } ITypeInfo; - - typedef struct { - ITypeInfo *pTInfo; } REF_ITypeInfo; /*****************/ @@ -480,6 +482,7 @@ [ object, + local, uuid("00000003-0000-0000-C000-000000000046") ] interface IMarshal : IUnknown { @@ -487,7 +490,6 @@ WERROR UnMarshalInterface(); } - [ uuid(DB7C21F8-FE33-4C11-AEA5-CEB56F076FBB), helpstring("CoffeeMachine Class")
