Fix more WMI compilation issues.

diff --git a/source4/lib/com/dcom/dcom.h b/source4/lib/com/dcom/dcom.h
index 0d8c145d7e9d7a571228657e8ba7a491330c30ca..56d6eac93ccce585094e60edbaa2d5506277dca4 100644 (file)
--- 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 2770897ca33eace182f1fb53dc4cea6848fc41cc..3d2c13587d8fa1ca5e8b9ee5b03a1300c80a64fb 100644 (file)
--- 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 3a65345c72030a9a186f2feb5deb3d56a3876c0d..1f7b5ca1cf648c50decdf332f896ceb496444367 100644 (file)
--- 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 5c2cc8bfbf09b6456d81374e558db3f40df8ba43..ad8c76f62263634ca92836551fee72488e939629 100644 (file)
--- 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";