From ce9fde439b2d35ad0ba5c21a7796d05c0cf49c14 Mon Sep 17 00:00:00 2001
From: Günther Deschner <gd@samba.org>
Date: Thu, 29 Apr 2010 02:41:51 +0200
Subject: rap: fill in rap_PrintQueue2 IDL.

Guenther
---
 librpc/idl/rap.idl | 154 +++++++++++++++++++++++++++--------------------------
 1 file changed, 78 insertions(+), 76 deletions(-)

(limited to 'librpc/idl')

diff --git a/librpc/idl/rap.idl b/librpc/idl/rap.idl
index 4ddb1a6f8d..c35dcd754e 100644
--- a/librpc/idl/rap.idl
+++ b/librpc/idl/rap.idl
@@ -386,82 +386,6 @@ interface rap
 		[out,switch_is(level)] rap_server_info info
 	);
 
-	typedef [public] enum {
-		PRQ_ACTIVE	= 0x0000,
-		PRQ_PAUSE	= 0x0001,
-		PRQ_ERROR	= 0x0002,
-		PRQ_PENDING	= 0x0003
-	} rap_PrintQStatusCode;
-
-	typedef struct {
-		uint8 PrintQName[13];
-	} rap_PrintQueue0;
-
-	typedef struct {
-		uint8 PrintQName[13];
-		uint8 Pad1;
-		uint16 Priority;
-		uint16 StartTime;
-		uint16 UntilTime;
-		[relative_short] [string,charset(DOS)] uint8 *SeparatorPageFilename;
-		uint16 SeparatorPageFilenameHigh;
-		[relative_short] [string,charset(DOS)] uint8 *PrintProcessorDllName;
-		uint16 PrintProcessorDllNameHigh;
-		[relative_short] [string,charset(DOS)] uint8 *PrintDestinationsName;
-		uint16 PrintDestinationsNameHigh;
-		[relative_short] [string,charset(DOS)] uint8 *PrintParameterString;
-		uint16 PrintParameterStringHigh;
-		[relative_short] [string,charset(DOS)] uint8 *CommentString;
-		uint16 CommentStringHigh;
-		rap_PrintQStatusCode PrintQStatus;
-		uint16 PrintJobCount;
-	} rap_PrintQueue1;
-
-	typedef struct {
-	} rap_PrintQueue2;
-
-	typedef struct {
-		[relative_short] [string,charset(DOS)] uint8 *PrintQueueName;
-		uint16 PrintQueueNameHigh;
-		uint16 Priority;
-		uint16 StartTime;
-		uint16 UntilTime;
-		uint16 Pad;
-		[relative_short] [string,charset(DOS)] uint8 *SeparatorPageFilename;
-		uint16 SeparatorPageFilenameHigh;
-		[relative_short] [string,charset(DOS)] uint8 *PrintProcessorDllName;
-		uint16 PrintProcessorDllNameHigh;
-		[relative_short] [string,charset(DOS)] uint8 *PrintParameterString;
-		uint16 PrintParameterStringHigh;
-		[relative_short] [string,charset(DOS)] uint8 *CommentString;
-		uint16 CommentStringHigh;
-		rap_PrintQStatusCode PrintQStatus;
-		uint16 PrintJobCount;
-		[relative_short] [string,charset(DOS)] uint8 *Printers;
-		uint16 PrintersHigh;
-		[relative_short] [string,charset(DOS)] uint8 *DriverName;
-		uint16 DriverNameHigh;
-		[relative_short] [string,charset(DOS)] uint8 *PrintDriverData;
-		uint16 PrintDriverDataHigh;
-	} rap_PrintQueue3;
-
-	typedef struct {
-	} rap_PrintQueue4;
-
-	typedef struct {
-		[relative_short] [string,charset(DOS)] uint8 *PrintQueueName;
-		uint16 PrintQueueNameHigh;
-	} rap_PrintQueue5;
-
-	typedef [nodiscriminant] union {
-		[case(0)] rap_PrintQueue0 info0;
-		[case(1)] rap_PrintQueue1 info1;
-		[case(2)] rap_PrintQueue2 info2;
-		[case(3)] rap_PrintQueue3 info3;
-		[case(4)] rap_PrintQueue4 info4;
-		[case(5)] rap_PrintQueue5 info5;
-	} rap_printq_info;
-
 	typedef [public] enum {
 		PRJ_QS_QUEUED	= 0x0000,
 		PRJ_QS_PAUSED	= 0x0001,
@@ -542,6 +466,84 @@ interface rap
 		uint16 PrinterNameOffsetHigh;
 	} rap_PrintJobInfo3;
 
+	typedef [public] enum {
+		PRQ_ACTIVE	= 0x0000,
+		PRQ_PAUSE	= 0x0001,
+		PRQ_ERROR	= 0x0002,
+		PRQ_PENDING	= 0x0003
+	} rap_PrintQStatusCode;
+
+	typedef struct {
+		uint8 PrintQName[13];
+	} rap_PrintQueue0;
+
+	typedef struct {
+		uint8 PrintQName[13];
+		uint8 Pad1;
+		uint16 Priority;
+		uint16 StartTime;
+		uint16 UntilTime;
+		[relative_short] [string,charset(DOS)] uint8 *SeparatorPageFilename;
+		uint16 SeparatorPageFilenameHigh;
+		[relative_short] [string,charset(DOS)] uint8 *PrintProcessorDllName;
+		uint16 PrintProcessorDllNameHigh;
+		[relative_short] [string,charset(DOS)] uint8 *PrintDestinationsName;
+		uint16 PrintDestinationsNameHigh;
+		[relative_short] [string,charset(DOS)] uint8 *PrintParameterString;
+		uint16 PrintParameterStringHigh;
+		[relative_short] [string,charset(DOS)] uint8 *CommentString;
+		uint16 CommentStringHigh;
+		rap_PrintQStatusCode PrintQStatus;
+		uint16 PrintJobCount;
+	} rap_PrintQueue1;
+
+	typedef struct {
+		rap_PrintQueue1 queue;
+		rap_PrintJobInfo1 job;
+	} rap_PrintQueue2;
+
+	typedef struct {
+		[relative_short] [string,charset(DOS)] uint8 *PrintQueueName;
+		uint16 PrintQueueNameHigh;
+		uint16 Priority;
+		uint16 StartTime;
+		uint16 UntilTime;
+		uint16 Pad;
+		[relative_short] [string,charset(DOS)] uint8 *SeparatorPageFilename;
+		uint16 SeparatorPageFilenameHigh;
+		[relative_short] [string,charset(DOS)] uint8 *PrintProcessorDllName;
+		uint16 PrintProcessorDllNameHigh;
+		[relative_short] [string,charset(DOS)] uint8 *PrintParameterString;
+		uint16 PrintParameterStringHigh;
+		[relative_short] [string,charset(DOS)] uint8 *CommentString;
+		uint16 CommentStringHigh;
+		rap_PrintQStatusCode PrintQStatus;
+		uint16 PrintJobCount;
+		[relative_short] [string,charset(DOS)] uint8 *Printers;
+		uint16 PrintersHigh;
+		[relative_short] [string,charset(DOS)] uint8 *DriverName;
+		uint16 DriverNameHigh;
+		[relative_short] [string,charset(DOS)] uint8 *PrintDriverData;
+		uint16 PrintDriverDataHigh;
+	} rap_PrintQueue3;
+
+	typedef struct {
+	} rap_PrintQueue4;
+
+	typedef struct {
+		[relative_short] [string,charset(DOS)] uint8 *PrintQueueName;
+		uint16 PrintQueueNameHigh;
+	} rap_PrintQueue5;
+
+	typedef [nodiscriminant] union {
+		[case(0)] rap_PrintQueue0 info0;
+		[case(1)] rap_PrintQueue1 info1;
+		[case(2)] rap_PrintQueue2 info2;
+		[case(3)] rap_PrintQueue3 info3;
+		[case(4)] rap_PrintQueue4 info4;
+		[case(5)] rap_PrintQueue5 info5;
+	} rap_printq_info;
+
 	[public,noprint] void rap_NetPrintQEnum(
 		[in] uint16 level,
 		[in] uint16 bufsize,
-- 
cgit