From 5062d4c16a67f0b41ea18db39af755cdcca1d57b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 16 Sep 2008 07:22:53 +0200
Subject: Fix more WMI compilation issues.

---
 source4/lib/com/dcom/dcom.h        | 10 ++++++++++
 source4/lib/com/dcom/main.c        |  2 +-
 source4/librpc/idl/wmi.idl         |  5 ++---
 source4/pidl/lib/Parse/Pidl/ODL.pm |  2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/source4/lib/com/dcom/dcom.h b/source4/lib/com/dcom/dcom.h
index 0d8c145d7e..56d6eac93c 100644
--- a/source4/lib/com/dcom/dcom.h
+++ b/source4/lib/com/dcom/dcom.h
@@ -72,4 +72,14 @@ struct composite_context *dcom_release_send(struct IUnknown *d, TALLOC_CTX *mem_
 marshal_fn dcom_marshal_by_clsid(struct GUID *clsid);
 unmarshal_fn dcom_unmarshal_by_clsid(struct GUID *clsid);
 
+struct dcom_proxy_async_call_state {
+	struct IUnknown *d;
+	const struct ndr_interface_table *table;
+	uint32_t opnum;
+	void (*continuation)(struct rpc_request *);
+	TALLOC_CTX *mem_ctx;
+	void *r;
+};
+
+
 #endif /* _DCOM_H */
diff --git a/source4/lib/com/dcom/main.c b/source4/lib/com/dcom/main.c
index 2770897ca3..3d2c13587d 100644
--- a/source4/lib/com/dcom/main.c
+++ b/source4/lib/com/dcom/main.c
@@ -576,7 +576,7 @@ enum ndr_err_code dcom_IUnknown_from_OBJREF(struct com_context *ctx, struct IUnk
 		/* FIXME: Do the custom unmarshaling call */
 	
 		*_p = p;
-		return NT_STATUS_NOT_SUPPORTED;
+		return NDR_ERR_BAD_SWITCH;
 		
 	case OBJREF_CUSTOM:
 		p = talloc_zero(ctx, struct IUnknown);
diff --git a/source4/librpc/idl/wmi.idl b/source4/librpc/idl/wmi.idl
index 3a65345c72..1f7b5ca1cf 100644
--- a/source4/librpc/idl/wmi.idl
+++ b/source4/librpc/idl/wmi.idl
@@ -649,11 +649,10 @@ coclass WbemClassObject
 		[in,ref] GUID *gEWCO,
 		[in] uint32 lTimeOut,
 		[in] uint32 uCount,
-		//	  [in] uint32 unknown,
-		//	  [in,ref] GUID *gWCO,
+		[in] uint32 unknown,
+		[in,ref] GUID *gWCO,
 		[out,ref] uint32 *puReturned,
 		[out,ref] uint32 *pSize,
-		//	  [out,ref] WBEMDATA0 **pData
 		[out,ref,noprint,size_is(,*pSize)] uint8 **pData
 		);
 }
diff --git a/source4/pidl/lib/Parse/Pidl/ODL.pm b/source4/pidl/lib/Parse/Pidl/ODL.pm
index 5c2cc8bfbf..ad8c76f622 100644
--- a/source4/pidl/lib/Parse/Pidl/ODL.pm
+++ b/source4/pidl/lib/Parse/Pidl/ODL.pm
@@ -37,7 +37,7 @@ sub FunctionAddObjArgs($)
 
 sub ReplaceInterfacePointers($)
 {
-	my $e = shift;
+	my ($e) = @_;
 	foreach my $x (@{$e->{ELEMENTS}}) {
 		next unless (hasType($x->{TYPE}));
 		next unless getType($x->{TYPE})->{DATA}->{TYPE} eq "INTERFACE";
-- 
cgit