r7574: - seperate [in] and [out] buffers and buf_sizes

- use the same names as etherel (offered,needed) for the buffer sizes
  (and they are really independently used)

metze
(This used to be commit f5532a5b74e972f44ed8aa19ee9c5851a4b40f65)

1 files changed, 94 insertions, 64 deletions

diff --git a/source4/librpc/idl/spoolss.idl b/source4/librpc/idl/spoolss.idl
index 3a3921b261..2b557d25d2 100644
--- a/source4/librpc/idl/spoolss.idl
+++ b/source4/librpc/idl/spoolss.idl
@@ -254,8 +254,10 @@
 		[in] spoolss_EnumPrinterFlags flags,
 		[in] unistr *server,
 		[in] uint32 level,
-		[in,out] DATA_BLOB *buffer,
-		[in,out,ref] uint32 *buf_size,
+		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
+		[out] DATA_BLOB *info,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 	[public,noopnum,noprint] void __spoolss_EnumPrinters(
@@ -268,11 +270,12 @@
 		[in] unistr *server,
 		[in] uint32 level,
 		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
 		/* what we have here is a subcontext containing an array of no discriminant unions
 		 * and the array has no size in front
 		 */
 		[out,switch_is(level),size_is(count)] spoolss_PrinterInfo *info,
-		[in,out,ref] uint32 *buf_size,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 
@@ -342,23 +345,26 @@
 	/* Function: 0x03 */
 	WERROR spoolss_GetJob(
 		[in,ref] policy_handle *handle,
-		[in] uint32 job_id,
-		[in] uint32 level,
-		[in] DATA_BLOB *buffer,
+		[in] 	 uint32 job_id,
+		[in] 	 uint32 level,
+		[in] 	 DATA_BLOB *buffer,
+		[in] 	 uint32 offered,
 		[out,subcontext(4),switch_is(level)] spoolss_JobInfo *info,
-		[in,out,ref] uint32 *buf_size
+		[out] 	 uint32 needed
 	);
 
 	/******************/
 	/* Function: 0x04 */
 	[public,noopnum,noprint] WERROR _spoolss_EnumJobs(
 		[in,ref] policy_handle *handle,
-		[in]	 uint32 firstjob,
-		[in]	 uint32 numjobs,
-		[in]	 uint32 level,
-		[in,out]     DATA_BLOB *buffer,
-		[in,out,ref] uint32 *buf_size,
-		[out]	 uint32 count
+		[in] 	 uint32 firstjob,
+		[in] 	 uint32 numjobs,
+		[in] 	 uint32 level,
+		[in] 	 DATA_BLOB *buffer,
+		[in] 	 uint32 offered,
+		[out] 	 DATA_BLOB *info,
+		[out] 	 uint32 needed,
+		[out] 	 uint32 count
 	);
 	[public,noopnum,noprint] void __spoolss_EnumJobs(
 		[in] uint32 level,
@@ -371,8 +377,9 @@
 		[in]	 uint32 numjobs,
 		[in]	 uint32 level,
 		[in]     DATA_BLOB *buffer,
+		[in] 	 uint32 offered,
 		[out,switch_is(level),size_is(count)] spoolss_JobInfo *info,
-		[in,out,ref] uint32 *buf_size,
+		[out] 	 uint32 needed,
 		[out]	 uint32 count
 	);
 
@@ -429,11 +436,12 @@
 	/******************/
 	/* Function: 0x08 */
 	WERROR spoolss_GetPrinter(
-		[in,ref]     policy_handle *handle,
-		[in]	     uint32 level,
-		[in]         DATA_BLOB *buffer,
+		[in,ref] policy_handle *handle,
+		[in] 	 uint32 level,
+		[in] 	 DATA_BLOB *buffer,
+		[in] 	 uint32 offered,
 		[out,subcontext(4),switch_is(level)] spoolss_PrinterInfo *info,
-		[in,out,ref] uint32 *buf_size
+		[out] 	 uint32 needed
 	);
 
 	/******************/
@@ -536,8 +544,10 @@
 		[in] unistr *server,
 		[in] unistr *environment,
 		[in] uint32 level,
-		[in,out] DATA_BLOB *buffer,
-		[in,out,ref] uint32 *buf_size,
+		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
+		[out] DATA_BLOB *info,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 	[public,noopnum,noprint] void __spoolss_EnumPrinterDrivers(
@@ -550,8 +560,9 @@
 		[in] unistr *environment,
 		[in] uint32 level,
 		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
 		[out,switch_is(level),size_is(count)] spoolss_DriverInfo *info,
-		[in,out,ref] uint32 *buf_size,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 
@@ -594,8 +605,10 @@
 		[in] unistr *servername,
 		[in] unistr *environment,
 		[in] uint32 level,
-		[in,out] DATA_BLOB *buffer,
-		[in,out,ref] uint32 *buf_size,
+		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
+		[out] DATA_BLOB *info,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 	[public,noopnum,noprint] void __spoolss_EnumPrintProcessors(
@@ -608,8 +621,9 @@
 		[in] unistr *environment,
 		[in] uint32 level,
 		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
 		[out,switch_is(level),size_is(count)] spoolss_PrintProcessorInfo *info,
-		[in,out,ref] uint32 *buf_size,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 
@@ -712,9 +726,10 @@
 	[noopnum,nopush,noprint,public] WERROR _spoolss_GetPrinterData(
 		[in,ref] policy_handle *handle,
 		[in] unistr value_name,
+		[in] uint32 offered,
 		[out] spoolss_PrinterDataType type,
 		[out] DATA_BLOB data,
-		[in,out,ref] uint32 *buf_size
+		[out] uint32 needed
 	);
 	[noopnum,nopush,noprint,public] void __spoolss_GetPrinterData(
 		[in] spoolss_PrinterDataType type,
@@ -723,9 +738,10 @@
 	[nopull] WERROR spoolss_GetPrinterData(
 		[in,ref] policy_handle *handle,
 		[in] unistr value_name,
+		[in] uint32 offered,
 		[out] spoolss_PrinterDataType type,
 		[out,subcontext(4),switch_is(type)] spoolss_PrinterData data,
-		[in,out,ref] uint32 *buf_size
+		[out] uint32 needed
 	);
 
 	/******************/
@@ -735,7 +751,7 @@
 		[in] unistr value_name,
 		[in] spoolss_PrinterDataType type,
 		[in] DATA_BLOB data,
-		[in] uint32 _buf_size
+		[in] uint32 _offered
 	);
 	[noopnum,nopull,noprint,public] void __spoolss_SetPrinterData(
 		[in] spoolss_PrinterDataType type,
@@ -746,7 +762,7 @@
 		[in] unistr value_name,
 		[in] spoolss_PrinterDataType type,
 		[in,subcontext(4),switch_is(type)] spoolss_PrinterData data,
-		[in,value(ndr_size_spoolss_PrinterData(&data,type,flags))] uint32 _buf_size
+		[in,value(ndr_size_spoolss_PrinterData(&data,type,flags))] uint32 _offered
 	);
 
 	/******************/
@@ -818,8 +834,9 @@
 		[in] unistr form_name,
 		[in] uint32 level,
 		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
 		[out,subcontext(4),switch_is(level)] spoolss_FormInfo *info,
-		[in,out,ref] uint32 *buf_size
+		[out] uint32 needed
 	);
 
 	typedef struct {
@@ -851,10 +868,12 @@
 	/* Function: 0x22 */
 	[public,noopnum,noprint] WERROR _spoolss_EnumForms(
 		[in,ref] policy_handle *handle,
-		[in] uint32 level,
-		[in,out] DATA_BLOB *buffer,
-		[in,out,ref] uint32 *buf_size,
-		[out] uint32 count
+		[in] 	 uint32 level,
+		[in] 	 DATA_BLOB *buffer,
+		[in] 	 uint32 offered,
+		[out]	 DATA_BLOB *info,
+		[out]	 uint32 needed,
+		[out]	 uint32 count
 	);
 	[public,noopnum,noprint] void __spoolss_EnumForms(
 		[in] uint32 level,
@@ -863,10 +882,11 @@
 	);
 	[nopull,nopush] WERROR spoolss_EnumForms(
 		[in,ref] policy_handle *handle,
-		[in] uint32 level,
-		[in] DATA_BLOB *buffer,
+		[in] 	 uint32 level,
+		[in] 	 DATA_BLOB *buffer,
+		[in] 	 uint32 offered,
 		[out,switch_is(level),size_is(count)] spoolss_FormInfo *info,
-		[in,out,ref] uint32 *buf_size,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 
@@ -901,8 +921,10 @@
 	[public,noopnum,noprint] WERROR _spoolss_EnumPorts(
 		[in] unistr *servername,
 		[in] uint32 level,
-		[in,out] DATA_BLOB *buffer,
-		[in,out,ref] uint32 *buf_size,
+		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
+		[out] DATA_BLOB *info,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 	[public,noopnum,noprint] void __spoolss_EnumPorts(
@@ -914,8 +936,9 @@
 		[in] unistr *servername,
 		[in] uint32 level,
 		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
 		[out,switch_is(level),size_is(count)] spoolss_PortInfo *info,
-		[in,out,ref] uint32 *buf_size,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 
@@ -940,8 +963,10 @@
 	[public,noopnum,noprint] WERROR _spoolss_EnumMonitors(
 		[in] unistr *servername,
 		[in] uint32 level,
-		[in,out] DATA_BLOB *buffer,
-		[in,out,ref] uint32 *buf_size,
+		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
+		[out] DATA_BLOB *info,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 	[public,noopnum,noprint] void __spoolss_EnumMonitors(
@@ -953,8 +978,9 @@
 		[in] unistr *servername,
 		[in] uint32 level,
 		[in] DATA_BLOB *buffer,
+		[in] uint32 offered,
 		[out,switch_is(level),size_is(count)] spoolss_MonitorInfo *info,
-		[in,out,ref] uint32 *buf_size,
+		[out] uint32 needed,
 		[out] uint32 count
 	);
 
@@ -1047,14 +1073,16 @@
 	/* Function: 0x35 */
 	WERROR spoolss_GetPrinterDriver2(
 		[in,ref] policy_handle *handle,
-		[in] unistr *architecture,
-		[in] uint32 level,
-		[in,out] DATA_BLOB *buffer,
-		[in,out,ref] uint32 *buf_size,
-		[in] uint32 client_major_version,
-		[in] uint32 client_minor_version,
-		[out] uint32 server_major_version,
-		[out] uint32 server_minor_version
+		[in] 	 unistr *architecture,
+		[in] 	 uint32 level,
+		[in] 	 DATA_BLOB *buffer,
+		[in] 	 uint32 offered,
+		[in] 	 uint32 client_major_version,
+		[in] 	 uint32 client_minor_version,
+		[out] 	 DATA_BLOB *info,
+		[out] 	 uint32 needed,
+		[out] 	 uint32 server_major_version,
+		[out] 	 uint32 server_minor_version
 	);
 
 	/******************/
@@ -1236,32 +1264,34 @@
 	/* Function: 0x4d */
 	WERROR spoolss_SetPrinterDataEx(
 		[in,ref] policy_handle *handle,
-		[in] unistr key_name,
-		[in] unistr value_name,
-		[in] uint32 type,
-		[in] DATA_BLOB buffer,
-		[in,out,ref] uint32 *buf_size
+		[in] 	 unistr key_name,
+		[in] 	 unistr value_name,
+		[in] 	 uint32 type,
+		[in] 	 DATA_BLOB buffer,
+		[in] 	 uint32 offered
 	);
 
 	/******************/
 	/* Function: 0x4e */
 	WERROR spoolss_GetPrinterDataEx(
 		[in,ref] policy_handle *handle,
-		[in] unistr key_name,
-		[in] unistr value_name,
-		[out] uint32 type,
-		[out] DATA_BLOB buffer,
-		[in,out,ref] uint32 *buf_size
+		[in] 	 unistr key_name,
+		[in] 	 unistr value_name,
+		[in] 	 uint32 offered,
+		[out] 	 uint32 type,
+		[out] 	 DATA_BLOB buffer,
+		[out] 	 uint32 needed
 	);
 
 	/******************/
 	/* Function: 0x4f */
 	WERROR spoolss_EnumPrinterDataEx(
 		[in,ref] policy_handle *handle,
-		[in] unistr key_name,
-		[out] DATA_BLOB buffer,
-		[in,out] uint32 buf_size,
-		[out] uint32 count
+		[in] 	 unistr key_name,
+		[in] 	 uint32 offered,
+		[out] 	 DATA_BLOB buffer,
+		[out] 	 uint32 needed,
+		[out] 	 uint32 count
 	);
 
 	/******************/