r19836: Fix warnings in some IDL files.

(This used to be commit bd48f78b1d6dba73e44630ad930fd6089d2076b2)

4 files changed, 18 insertions, 19 deletions

diff --git a/source4/gtk/tools/gwcrontab.c b/source4/gtk/tools/gwcrontab.c
index fd08f6ef07..8b31ea12bf 100644
--- a/source4/gtk/tools/gwcrontab.c
+++ b/source4/gtk/tools/gwcrontab.c
@@ -134,7 +134,7 @@ void on_new_activate (GtkMenuItem *menuitem, gpointer user_data)
 	talloc_free(mem_ctx);
 	gtk_widget_destroy(d);
 	
-	d = gtk_message_dialog_new (GTK_WINDOW(mainwin), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Job Id: %d", r.out.job_id);
+	d = gtk_message_dialog_new (GTK_WINDOW(mainwin), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "Job Id: %d", *r.out.job_id);
 	gtk_dialog_run(GTK_DIALOG(d));
 	gtk_widget_destroy(d);
 	update_joblist();
diff --git a/source4/librpc/idl/atsvc.idl b/source4/librpc/idl/atsvc.idl
index d58a719651..e86d48a8cd 100644
--- a/source4/librpc/idl/atsvc.idl
+++ b/source4/librpc/idl/atsvc.idl
@@ -74,7 +74,7 @@
 	NTSTATUS atsvc_JobAdd(
 		[in,unique,string,charset(UTF16)] uint16 *servername,
 		[in] atsvc_JobInfo *job_info,
-		[out]	 uint32 job_id
+		[out,ref]	 uint32 *job_id
 	);
 
 	/******************/
@@ -105,7 +105,7 @@
 		[in,unique,string,charset(UTF16)] uint16 *servername,
 		[in,out] 	 atsvc_enum_ctr *ctr,
 		[in]	     uint32 preferred_max_len,
-		[out]	     uint32 total_entries,
+		[out,ref]	     uint32 *total_entries,
 		[in,out,unique]     uint32 *resume_handle
 	);
 
@@ -114,6 +114,6 @@
 	[public] NTSTATUS atsvc_JobGetInfo(
 		[in,unique,string,charset(UTF16)]	uint16 *servername,
 		[in]	uint32 job_id,
-		[out,unique]	atsvc_JobInfo *job_info
+		[out]	atsvc_JobInfo **job_info
 	);
 }
diff --git a/source4/librpc/idl/dcom.idl b/source4/librpc/idl/dcom.idl
index 88039914ab..75430f7624 100644
--- a/source4/librpc/idl/dcom.idl
+++ b/source4/librpc/idl/dcom.idl
@@ -47,7 +47,7 @@ interface IUnknown
 {
 	[local] WERROR CreateInstance([in,unique] MInterfacePointer *pUnknown, 
 			       [in,unique] GUID *iid,
-			       [out, iid_is(riid),unique] MInterfacePointer *ppv);
+			       [out, iid_is(riid)] MInterfacePointer **ppv);
 
 	[call_as(CreateInstance)] WERROR RemoteCreateInstance();
 
@@ -85,7 +85,7 @@ interface IRemUnknown : IUnknown
 		[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), unique] MInterfacePointer *ip
+		[out, size_is(cIids)] MInterfacePointer **ip
 		);
 
 	typedef struct 
@@ -98,7 +98,7 @@ interface IRemUnknown : IUnknown
 	[call_as(AddRef)] WERROR RemAddRef (
 		 [in] uint16 cInterfaceRefs,
 		 [in, size_is(cInterfaceRefs)] REMINTERFACEREF InterfaceRefs[],
-		 [out, size_is(cInterfaceRefs), unique] WERROR *pResults
+		 [out, size_is(cInterfaceRefs)] WERROR **pResults
 		);
 
 	[call_as(Release)] WERROR RemRelease (
@@ -177,9 +177,9 @@ interface IRemUnknown2 : IRemUnknown
 	[call_as(QueryInterface2)] WERROR RemQueryInterface2 (
 		 [in, unique] GUID *ripid,
 		 [in] uint16 cIids,
-		 [in, size_is(cIids), unique] GUID *iids,
-		 [out, size_is(cIids), unique] WERROR *phr,
-		 [out, size_is(cIids), unique] MInterfacePointer *ppMIF
+		 [in, size_is(cIids)] GUID **iids,
+		 [out, size_is(cIids)] WERROR **phr,
+		 [out, size_is(cIids)] MInterfacePointer **ppMIF
 		);
 }
 
@@ -191,8 +191,7 @@ interface IRemUnknown2 : IRemUnknown
 {
 	/*****************/
 	/* Function 0x03 */
-	WERROR GetTypeInfoCount(
-			[out, unique] uint16 *pctinfo);
+	WERROR GetTypeInfoCount([out] uint16 *pctinfo);
 
 	typedef struct {
 	} REF_ITypeInfo;
@@ -202,7 +201,7 @@ interface IRemUnknown2 : IRemUnknown
 	WERROR GetTypeInfo (
 			[in] uint16 iTInfo,
 			[in] uint32 lcid,
-			[out, unique] REF_ITypeInfo *ppTInfo);
+			[out] REF_ITypeInfo **ppTInfo);
 
 	/*****************/
 	/* Function 0x05 */
@@ -211,7 +210,7 @@ interface IRemUnknown2 : IRemUnknown
 			/*FIXME[in,size_is(cNames)] OLESTR *rgszNames[], */
 			[in] uint16 cNames,
 			[in] uint32 lcid,
-			[out,size_is(cNames), unique] uint32 *rgDispId);
+			[out,size_is(cNames)] uint32 **rgDispId);
 
 	typedef struct {
 		uint16 vartype;
@@ -235,9 +234,9 @@ interface IRemUnknown2 : IRemUnknown
 			[in] uint32 lcid,
 			[in] uint16 wFlags,
 			[out,in, unique] DISPPARAMS *pDispParams,
-			[out, unique] VARIANT *pVarResult,
-			[out, unique] EXCEPINFO *pExcepInfo,
-			[out, unique] uint16 *puArgErr);
+			[out] VARIANT **pVarResult,
+			[out] EXCEPINFO **pExcepInfo,
+			[out] uint16 **puArgErr);
 }
 
 [
diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index 227e56a85b..eaaac2005b 100644
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -108,11 +108,11 @@ static bool test_JobAdd(struct torture_context *tctx, struct dcerpc_pipe *p)
 		return false;
 	}
 
-	if (!test_JobGetInfo(p, tctx, r.out.job_id)) {
+	if (!test_JobGetInfo(p, tctx, *r.out.job_id)) {
 		return false;
 	}
 
-	if (!test_JobDel(p, tctx, r.out.job_id, r.out.job_id)) {
+	if (!test_JobDel(p, tctx, *r.out.job_id, *r.out.job_id)) {
 		return false;
 	}