spoolss: move up printer and job status codes.

Guenther

1 files changed, 52 insertions, 50 deletions

diff --git a/librpc/idl/spoolss.idl b/librpc/idl/spoolss.idl
index 1326278936..f9ca4c1476 100644
--- a/librpc/idl/spoolss.idl
+++ b/librpc/idl/spoolss.idl
@@ -66,6 +66,56 @@ import "misc.idl", "security.idl", "winreg.idl";
 		SPOOLSS_MINOR_VERSION_ME		= 0x0000005a
 	} spoolss_MinorVersion;
 
+	const int PRINTER_STATUS_OK		= 0x00000000;
+
+	typedef bitmap {
+		PRINTER_STATUS_PAUSED		= 0x00000001,
+		PRINTER_STATUS_ERROR		= 0x00000002,
+		PRINTER_STATUS_PENDING_DELETION	= 0x00000004,
+		PRINTER_STATUS_PAPER_JAM	= 0x00000008,
+		PRINTER_STATUS_PAPER_OUT	= 0x00000010,
+		PRINTER_STATUS_MANUAL_FEED	= 0x00000020,
+		PRINTER_STATUS_PAPER_PROBLEM	= 0x00000040,
+		PRINTER_STATUS_OFFLINE		= 0x00000080,
+		PRINTER_STATUS_IO_ACTIVE	= 0x00000100,
+		PRINTER_STATUS_BUSY		= 0x00000200,
+		PRINTER_STATUS_PRINTING		= 0x00000400,
+		PRINTER_STATUS_OUTPUT_BIN_FULL	= 0x00000800,
+		PRINTER_STATUS_NOT_AVAILABLE	= 0x00001000,
+		PRINTER_STATUS_WAITING		= 0x00002000,
+		PRINTER_STATUS_PROCESSING	= 0x00004000,
+		PRINTER_STATUS_INITIALIZING	= 0x00008000,
+		PRINTER_STATUS_WARMING_UP	= 0x00010000,
+		PRINTER_STATUS_TONER_LOW	= 0x00020000,
+		PRINTER_STATUS_NO_TONER		= 0x00040000,
+		PRINTER_STATUS_PAGE_PUNT	= 0x00080000,
+		PRINTER_STATUS_USER_INTERVENTION= 0x00100000,
+		PRINTER_STATUS_OUT_OF_MEMORY	= 0x00200000,
+		PRINTER_STATUS_DOOR_OPEN	= 0x00400000,
+		PRINTER_STATUS_SERVER_UNKNOWN	= 0x00800000,
+		PRINTER_STATUS_POWER_SAVE	= 0x01000000
+	} spoolss_PrinterStatus;
+
+	/* JOB status codes. */
+
+	const int JOB_STATUS_QUEUED = 0x0000;
+
+	typedef [bitmap32bit] bitmap {
+		JOB_STATUS_PAUSED		= 0x00000001,
+		JOB_STATUS_ERROR		= 0x00000002,
+		JOB_STATUS_DELETING		= 0x00000004,
+		JOB_STATUS_SPOOLING		= 0x00000008,
+		JOB_STATUS_PRINTING		= 0x00000010,
+		JOB_STATUS_OFFLINE		= 0x00000020,
+		JOB_STATUS_PAPEROUT		= 0x00000040,
+		JOB_STATUS_PRINTED		= 0x00000080,
+		JOB_STATUS_DELETED		= 0x00000100,
+		JOB_STATUS_BLOCKED_DEVQ		= 0x00000200,
+		JOB_STATUS_USER_INTERVENTION	= 0x00000400,
+		JOB_STATUS_RESTART		= 0x00000800,
+		JOB_STATUS_COMPLETE		= 0x00001000
+	} spoolss_JobStatus;
+
 	typedef struct {
 		[relative] nstring *printername;
 		[relative] nstring *servername;
@@ -82,13 +132,13 @@ import "misc.idl", "security.idl", "winreg.idl";
 		uint32 session_counter;
 		uint32 num_error_out_of_paper;
 		uint32 num_error_not_ready;
-		uint32 job_error;
+		spoolss_JobStatus job_error;
 		uint32 number_of_processors;
 		spoolss_ProcessorType processor_type;
 		uint32 high_part_total_bytes;
 		uint32 change_id;
 		WERROR last_error;
-		uint32 status;
+		spoolss_PrinterStatus status;
 		uint32 enumerate_network_printers;
 		uint32 c_setprinter;
 		spoolss_ProcessorArchitecture processor_architecture;
@@ -224,34 +274,6 @@ import "misc.idl", "security.idl", "winreg.idl";
 		PRINTER_ATTRIBUTE_TS			= 0x00008000
 	} spoolss_PrinterAttributes;
 
-	typedef bitmap {
-		PRINTER_STATUS_PAUSED		= 0x00000001,
-		PRINTER_STATUS_ERROR		= 0x00000002,
-		PRINTER_STATUS_PENDING_DELETION	= 0x00000004,
-		PRINTER_STATUS_PAPER_JAM	= 0x00000008,
-		PRINTER_STATUS_PAPER_OUT	= 0x00000010,
-		PRINTER_STATUS_MANUAL_FEED	= 0x00000020,
-		PRINTER_STATUS_PAPER_PROBLEM	= 0x00000040,
-		PRINTER_STATUS_OFFLINE		= 0x00000080,
-		PRINTER_STATUS_IO_ACTIVE	= 0x00000100,
-		PRINTER_STATUS_BUSY		= 0x00000200,
-		PRINTER_STATUS_PRINTING		= 0x00000400,
-		PRINTER_STATUS_OUTPUT_BIN_FULL	= 0x00000800,
-		PRINTER_STATUS_NOT_AVAILABLE	= 0x00001000,
-		PRINTER_STATUS_WAITING		= 0x00002000,
-		PRINTER_STATUS_PROCESSING	= 0x00004000,
-		PRINTER_STATUS_INITIALIZING	= 0x00008000,
-		PRINTER_STATUS_WARMING_UP	= 0x00010000,
-		PRINTER_STATUS_TONER_LOW	= 0x00020000,
-		PRINTER_STATUS_NO_TONER		= 0x00040000,
-		PRINTER_STATUS_PAGE_PUNT	= 0x00080000,
-		PRINTER_STATUS_USER_INTERVENTION= 0x00100000,
-		PRINTER_STATUS_OUT_OF_MEMORY	= 0x00200000,
-		PRINTER_STATUS_DOOR_OPEN	= 0x00400000,
-		PRINTER_STATUS_SERVER_UNKNOWN	= 0x00800000,
-		PRINTER_STATUS_POWER_SAVE	= 0x01000000
-	} spoolss_PrinterStatus;
-
 	typedef struct {
 		[relative] nstring *servername;
 		[relative] nstring *printername;
@@ -379,26 +401,6 @@ import "misc.idl", "security.idl", "winreg.idl";
 	/******************/
 	/* Function: 0x02 */
 
-	/* JOB status codes. */
-
-	const int JOB_STATUS_QUEUED = 0x0000;
-
-	typedef [bitmap32bit] bitmap {
-		JOB_STATUS_PAUSED		= 0x00000001,
-		JOB_STATUS_ERROR		= 0x00000002,
-		JOB_STATUS_DELETING		= 0x00000004,
-		JOB_STATUS_SPOOLING		= 0x00000008,
-		JOB_STATUS_PRINTING		= 0x00000010,
-		JOB_STATUS_OFFLINE		= 0x00000020,
-		JOB_STATUS_PAPEROUT		= 0x00000040,
-		JOB_STATUS_PRINTED		= 0x00000080,
-		JOB_STATUS_DELETED		= 0x00000100,
-		JOB_STATUS_BLOCKED_DEVQ		= 0x00000200,
-		JOB_STATUS_USER_INTERVENTION	= 0x00000400,
-		JOB_STATUS_RESTART		= 0x00000800,
-		JOB_STATUS_COMPLETE		= 0x00001000
-	} spoolss_JobStatus;
-
 	typedef struct {
 		uint32 job_id;
 		[relative] nstring *printer_name;