r5490: The big (D)COM commit! :-) Contains most of the changes described in the

DCOM paper in lorikeet. This is the result of 1.5 months work (mainly
figuring out how things *really* work) at the end of 2004.

In general:
- Clearer distinction between COM and DCOM. DCOM is now merely
  the glue between DCE/RPC+ORPC and COM. COM can also work without
  DCOM now. This makes the code a lot clearer.
- Clearer distinction between NDR and DCOM. Before, NDR had a couple of
  "if"s to cope with DCOM, which are now gone.
- Use "real" arguments rather then structures for function arguments in
  COM, mainly because most of these calls are local so packing/unpacking
  data for every call is too much overhead (both speed- and code-wise)
- Support several mechanisms to load class objects:
  - from memory (e.g. part of the current executable, registered at start-up)
  - from shared object files
  - remotely
- Most things are now also named COM rather then DCOM because that's what it
  really is. After an object is created, it no longer matters whether it
  was created locally or remotely.

There is a very simple example class that contains
both a class factory and a class that implements the IStream interface.
It can be tested (locally only, remotely is broken at the moment)
by running the COM-SIMPLE smbtorture test.

Still to-do:
 - Autogenerate parts of the class implementation code (using the coclass definitions in IDL)
 - Test server-side
 - Implement some of the common classes, add definitions for common interfaces.
(This used to be commit 71fd3e5c3aac5f0002001ab29d2248e6c6842d6f)

3 files changed, 5 insertions, 16 deletions

diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index 855fbfce8f..b4ce03e5aa 100644
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/librpc/idl/dcom.idl
@@ -159,10 +159,10 @@ interface IRemUnknown : IUnknown
 	interface ISystemActivator : IClassActivator
 {
 	WERROR ISystemActivatorRemoteCreateInstance([in] hyper unknown1,  /* OXID ? */
-											  [in] MInterfacePointer iface,
+											  [in] MInterfacePointer iface1,
 											  [in] hyper unknown2,
 											  [out] uint32 unknown3, 
-											  [out] MInterfacePointer iface);
+											  [out] MInterfacePointer iface2);
 }
 
 
@@ -270,7 +270,7 @@ object,
 	object
 ] interface ICoffeeMachine : IUnknown
 {
-	[helpstring("method MakeCoffee")] WERROR MakeCoffee(BSTR *flavor);
+	[helpstring("method MakeCoffee")] WERROR MakeCoffee(unistr *flavor);
 }
 
 [
diff --git a/source4/librpc/idl/rot.idl b/source4/librpc/idl/rot.idl
index 28aae60036..aa257dcf2f 100644
--- a/source4/librpc/idl/rot.idl
+++ b/source4/librpc/idl/rot.idl
@@ -4,6 +4,7 @@
 	uuid("b9e79e60-3d52-11ce-aaa1-00006901293f"),
 	version(0.2),
     pointer_default(unique),
+	depends(orpc),
  	endpoint("ncacn_np:[\\pipe\\epmapper]", "ncacn_ip_tcp:[135]", 
 		  "ncalrpc:[EPMAPPER]", "ncacn_unix_stream:[/tmp/epmapper]")
 ] interface rot
@@ -42,16 +43,3 @@
 					   [out] MInterfacePointer *EnumMoniker
 					   );
 }
-
-/*
-[
-	object,
-] interface IRotData : IUnknown
-{
-	WERROR irotdata_getdata(
-							[out,size_is(max),length_is(ret)] uint8 *data, 
-							[in] uint32 max,
-							[out] uint32 ret
-						   );
-}
-*/
diff --git a/source4/librpc/ndr/ndr_orpc.c b/source4/librpc/ndr/ndr_orpc.c
index 2a28db4178..ccfd48e099 100644
--- a/source4/librpc/ndr/ndr_orpc.c
+++ b/source4/librpc/ndr/ndr_orpc.c
@@ -22,6 +22,7 @@
 
 
 #include "includes.h"
+#include "librpc/gen_ndr/ndr_orpc.h"
 
 NTSTATUS ndr_pull_DUALSTRINGARRAY(struct ndr_pull *ndr, int ndr_flags, struct DUALSTRINGARRAY *ar)
 {