s3: re-run make samba3-idl.
[jra/samba/.git] / librpc / gen_ndr / spoolss.h
index 2c9aa21bd9d90f6111f04c0dd85606cd3d620171..a77516e4b7ffe099928c7a7c7c1c17ac68dc2549 100644 (file)
@@ -2,21 +2,26 @@
 
 #include <stdint.h>
 
+#include "libcli/util/ntstatus.h"
+
 #include "librpc/gen_ndr/misc.h"
 #include "librpc/gen_ndr/security.h"
 #include "librpc/gen_ndr/winreg.h"
 #ifndef _HEADER_spoolss
 #define _HEADER_spoolss
 
+#define PRINTER_STATUS_OK      ( 0x00000000 )
+#define JOB_STATUS_QUEUED      ( 0x0000 )
 #define PRINTER_ENUM_ICONMASK  ( (PRINTER_ENUM_ICON1|PRINTER_ENUM_ICON2|PRINTER_ENUM_ICON3|PRINTER_ENUM_ICON4|PRINTER_ENUM_ICON5|PRINTER_ENUM_ICON6|PRINTER_ENUM_ICON7|PRINTER_ENUM_ICON8) )
 #define SPOOLSS_ARCHITECTURE_NT_X86    ( "Windows NT x86" )
-#define PRINTER_CHANGE_PRINTER ( (PRINTER_CHANGE_ADD_PRINTER|PRINTER_CHANGE_SET_PRINTER|PRINTER_CHANGE_DELETE_PRINTER|PRINTER_CHANGE_FAILED_CONNECTION_PRINTER) )
-#define PRINTER_CHANGE_JOB     ( (PRINTER_CHANGE_ADD_JOB|PRINTER_CHANGE_SET_JOB|PRINTER_CHANGE_DELETE_JOB|PRINTER_CHANGE_WRITE_JOB) )
+#define SPOOLSS_DEFAULT_SERVER_PATH    ( "C:\\WINDOWS\\system32\\spool" )
+#define PRINTER_CHANGE_PRINTER ( 0x000000FF )
+#define PRINTER_CHANGE_JOB     ( 0x0000FF00 )
 #define PRINTER_CHANGE_FORM    ( (PRINTER_CHANGE_ADD_FORM|PRINTER_CHANGE_SET_FORM|PRINTER_CHANGE_DELETE_FORM) )
 #define PRINTER_CHANGE_PORT    ( (PRINTER_CHANGE_ADD_PORT|PRINTER_CHANGE_CONFIGURE_PORT|PRINTER_CHANGE_DELETE_PORT) )
-#define PRINTER_CHANGE_PRINT_PROCESSOR ( (PRINTER_CHANGE_ADD_PRINT_PROCESSOR|PRINTER_CHANGE_DELETE_PRINT_PROCESSOR) )
+#define PRINTER_CHANGE_PRINT_PROCESSOR ( 0x07000000 )
 #define PRINTER_CHANGE_PRINTER_DRIVER  ( (PRINTER_CHANGE_ADD_PRINTER_DRIVER|PRINTER_CHANGE_SET_PRINTER_DRIVER|PRINTER_CHANGE_DELETE_PRINTER_DRIVER) )
-#define PRINTER_CHANGE_ALL     ( (PRINTER_CHANGE_JOB|PRINTER_CHANGE_FORM|PRINTER_CHANGE_PORT|PRINTER_CHANGE_PRINT_PROCESSOR|PRINTER_CHANGE_PRINTER_DRIVER) )
+#define PRINTER_CHANGE_ALL     ( (PRINTER_CHANGE_PRINTER|PRINTER_CHANGE_JOB|PRINTER_CHANGE_FORM|PRINTER_CHANGE_PORT|PRINTER_CHANGE_PRINT_PROCESSOR|PRINTER_CHANGE_PRINTER_DRIVER) )
 #define SERVER_ALL_ACCESS      ( SEC_STD_REQUIRED|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE )
 #define SERVER_READ    ( SEC_STD_READ_CONTROL|SERVER_ACCESS_ENUMERATE )
 #define SERVER_WRITE   ( STANDARD_RIGHTS_WRITE_ACCESS|SERVER_ACCESS_ADMINISTER|SERVER_ACCESS_ENUMERATE )
@@ -116,6 +121,48 @@ enum spoolss_MinorVersion
 #endif
 ;
 
+/* bitmap spoolss_PrinterStatus */
+#define PRINTER_STATUS_PAUSED ( 0x00000001 )
+#define PRINTER_STATUS_ERROR ( 0x00000002 )
+#define PRINTER_STATUS_PENDING_DELETION ( 0x00000004 )
+#define PRINTER_STATUS_PAPER_JAM ( 0x00000008 )
+#define PRINTER_STATUS_PAPER_OUT ( 0x00000010 )
+#define PRINTER_STATUS_MANUAL_FEED ( 0x00000020 )
+#define PRINTER_STATUS_PAPER_PROBLEM ( 0x00000040 )
+#define PRINTER_STATUS_OFFLINE ( 0x00000080 )
+#define PRINTER_STATUS_IO_ACTIVE ( 0x00000100 )
+#define PRINTER_STATUS_BUSY ( 0x00000200 )
+#define PRINTER_STATUS_PRINTING ( 0x00000400 )
+#define PRINTER_STATUS_OUTPUT_BIN_FULL ( 0x00000800 )
+#define PRINTER_STATUS_NOT_AVAILABLE ( 0x00001000 )
+#define PRINTER_STATUS_WAITING ( 0x00002000 )
+#define PRINTER_STATUS_PROCESSING ( 0x00004000 )
+#define PRINTER_STATUS_INITIALIZING ( 0x00008000 )
+#define PRINTER_STATUS_WARMING_UP ( 0x00010000 )
+#define PRINTER_STATUS_TONER_LOW ( 0x00020000 )
+#define PRINTER_STATUS_NO_TONER ( 0x00040000 )
+#define PRINTER_STATUS_PAGE_PUNT ( 0x00080000 )
+#define PRINTER_STATUS_USER_INTERVENTION ( 0x00100000 )
+#define PRINTER_STATUS_OUT_OF_MEMORY ( 0x00200000 )
+#define PRINTER_STATUS_DOOR_OPEN ( 0x00400000 )
+#define PRINTER_STATUS_SERVER_UNKNOWN ( 0x00800000 )
+#define PRINTER_STATUS_POWER_SAVE ( 0x01000000 )
+
+/* bitmap spoolss_JobStatus */
+#define JOB_STATUS_PAUSED ( 0x00000001 )
+#define JOB_STATUS_ERROR ( 0x00000002 )
+#define JOB_STATUS_DELETING ( 0x00000004 )
+#define JOB_STATUS_SPOOLING ( 0x00000008 )
+#define JOB_STATUS_PRINTING ( 0x00000010 )
+#define JOB_STATUS_OFFLINE ( 0x00000020 )
+#define JOB_STATUS_PAPEROUT ( 0x00000040 )
+#define JOB_STATUS_PRINTED ( 0x00000080 )
+#define JOB_STATUS_DELETED ( 0x00000100 )
+#define JOB_STATUS_BLOCKED_DEVQ ( 0x00000200 )
+#define JOB_STATUS_USER_INTERVENTION ( 0x00000400 )
+#define JOB_STATUS_RESTART ( 0x00000800 )
+#define JOB_STATUS_COMPLETE ( 0x00001000 )
+
 struct spoolss_PrinterInfo0 {
        const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -262,33 +309,6 @@ struct spoolss_PrinterInfo1 {
 #define PRINTER_ATTRIBUTE_FAX ( 0x00004000 )
 #define PRINTER_ATTRIBUTE_TS ( 0x00008000 )
 
-/* bitmap spoolss_PrinterStatus */
-#define PRINTER_STATUS_PAUSED ( 0x00000001 )
-#define PRINTER_STATUS_ERROR ( 0x00000002 )
-#define PRINTER_STATUS_PENDING_DELETION ( 0x00000004 )
-#define PRINTER_STATUS_PAPER_JAM ( 0x00000008 )
-#define PRINTER_STATUS_PAPER_OUT ( 0x00000010 )
-#define PRINTER_STATUS_MANUAL_FEED ( 0x00000020 )
-#define PRINTER_STATUS_PAPER_PROBLEM ( 0x00000040 )
-#define PRINTER_STATUS_OFFLINE ( 0x00000080 )
-#define PRINTER_STATUS_IO_ACTIVE ( 0x00000100 )
-#define PRINTER_STATUS_BUSY ( 0x00000200 )
-#define PRINTER_STATUS_PRINTING ( 0x00000400 )
-#define PRINTER_STATUS_OUTPUT_BIN_FULL ( 0x00000800 )
-#define PRINTER_STATUS_NOT_AVAILABLE ( 0x00001000 )
-#define PRINTER_STATUS_WAITING ( 0x00002000 )
-#define PRINTER_STATUS_PROCESSING ( 0x00004000 )
-#define PRINTER_STATUS_INITIALIZING ( 0x00008000 )
-#define PRINTER_STATUS_WARMING_UP ( 0x00010000 )
-#define PRINTER_STATUS_TONER_LOW ( 0x00020000 )
-#define PRINTER_STATUS_NO_TONER ( 0x00040000 )
-#define PRINTER_STATUS_PAGE_PUNT ( 0x00080000 )
-#define PRINTER_STATUS_USER_INTERVENTION ( 0x00100000 )
-#define PRINTER_STATUS_OUT_OF_MEMORY ( 0x00200000 )
-#define PRINTER_STATUS_DOOR_OPEN ( 0x00400000 )
-#define PRINTER_STATUS_SERVER_UNKNOWN ( 0x00800000 )
-#define PRINTER_STATUS_POWER_SAVE ( 0x01000000 )
-
 struct spoolss_PrinterInfo2 {
        const char * servername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * printername;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -382,16 +402,154 @@ struct spoolss_JobInfo1 {
        uint32_t position;
        uint32_t total_pages;
        uint32_t pages_printed;
-       struct spoolss_Time time;
+       struct spoolss_Time submitted;
+};
+
+struct spoolss_JobInfo2 {
+       uint32_t job_id;
+       const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct spoolss_DeviceMode *devmode;/* [relative] */
+       const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct security_descriptor *secdesc;/* [relative] */
+       uint32_t status;
+       uint32_t priority;
+       uint32_t position;
+       uint32_t start_time;
+       uint32_t until_time;
+       uint32_t total_pages;
+       uint32_t size;
+       struct spoolss_Time submitted;
+       uint32_t time;
+       uint32_t pages_printed;
+};
+
+struct spoolss_JobInfo3 {
+       uint32_t job_id;
+       uint32_t next_job_id;
+       uint32_t reserved;
+};
+
+struct spoolss_JobInfo4 {
+       uint32_t job_id;
+       const char * printer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * server_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * user_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * document_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * notify_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * data_type;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * print_processor;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * parameters;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct spoolss_DeviceMode *devmode;/* [relative] */
+       const char * text_status;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct security_descriptor *secdesc;/* [relative] */
+       uint32_t status;
+       uint32_t priority;
+       uint32_t position;
+       uint32_t start_time;
+       uint32_t until_time;
+       uint32_t total_pages;
+       uint32_t size;
+       struct spoolss_Time submitted;
+       uint32_t time;
+       uint32_t pages_printed;
+       uint32_t size_high;
 };
 
 union spoolss_JobInfo {
        struct spoolss_JobInfo1 info1;/* [case] */
+       struct spoolss_JobInfo2 info2;/* [case(2)] */
+       struct spoolss_JobInfo3 info3;/* [case(3)] */
+       struct spoolss_JobInfo4 info4;/* [case(4)] */
 }/* [relative_base,nodiscriminant,public] */;
 
+struct spoolss_SetJobInfo1 {
+       uint32_t job_id;
+       const char *printer_name;/* [unique,charset(UTF16)] */
+       const char *server_name;/* [unique,charset(UTF16)] */
+       const char *user_name;/* [unique,charset(UTF16)] */
+       const char *document_name;/* [unique,charset(UTF16)] */
+       const char *data_type;/* [unique,charset(UTF16)] */
+       const char *text_status;/* [unique,charset(UTF16)] */
+       uint32_t status;
+       uint32_t priority;
+       uint32_t position;
+       uint32_t total_pages;
+       uint32_t pages_printed;
+       struct spoolss_Time submitted;
+};
+
+struct spoolss_SetJobInfo2 {
+       uint32_t job_id;
+       const char *printer_name;/* [unique,charset(UTF16)] */
+       const char *server_name;/* [unique,charset(UTF16)] */
+       const char *user_name;/* [unique,charset(UTF16)] */
+       const char *document_name;/* [unique,charset(UTF16)] */
+       const char *notify_name;/* [unique,charset(UTF16)] */
+       const char *data_type;/* [unique,charset(UTF16)] */
+       const char *print_processor;/* [unique,charset(UTF16)] */
+       const char *parameters;/* [unique,charset(UTF16)] */
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       uint32_t _devmode_ptr;
+       const char *text_status;/* [unique,charset(UTF16)] */
+       uint32_t _secdesc_ptr;
+       uint32_t status;
+       uint32_t priority;
+       uint32_t position;
+       uint32_t start_time;
+       uint32_t until_time;
+       uint32_t total_pages;
+       uint32_t size;
+       struct spoolss_Time submitted;
+       uint32_t time;
+       uint32_t pages_printed;
+};
+
+struct spoolss_SetJobInfo4 {
+       uint32_t job_id;
+       const char *printer_name;/* [unique,charset(UTF16)] */
+       const char *server_name;/* [unique,charset(UTF16)] */
+       const char *user_name;/* [unique,charset(UTF16)] */
+       const char *document_name;/* [unique,charset(UTF16)] */
+       const char *notify_name;/* [unique,charset(UTF16)] */
+       const char *data_type;/* [unique,charset(UTF16)] */
+       const char *print_processor;/* [unique,charset(UTF16)] */
+       const char *parameters;/* [unique,charset(UTF16)] */
+       const char *driver_name;/* [unique,charset(UTF16)] */
+       uint32_t _devmode_ptr;
+       const char *text_status;/* [unique,charset(UTF16)] */
+       uint32_t _secdesc_ptr;
+       uint32_t status;
+       uint32_t priority;
+       uint32_t position;
+       uint32_t start_time;
+       uint32_t until_time;
+       uint32_t total_pages;
+       uint32_t size;
+       struct spoolss_Time submitted;
+       uint32_t time;
+       uint32_t pages_printed;
+       uint32_t size_high;
+};
+
+union spoolss_SetJobInfo {
+       struct spoolss_SetJobInfo1 *info1;/* [unique,case] */
+       struct spoolss_SetJobInfo2 *info2;/* [unique,case(2)] */
+       struct spoolss_JobInfo3 *info3;/* [unique,case(3)] */
+       struct spoolss_SetJobInfo4 *info4;/* [unique,case(4)] */
+}/* [public] */;
+
 struct spoolss_JobInfoContainer {
        uint32_t level;
-       union spoolss_JobInfo info;/* [switch_is(level)] */
+       union spoolss_SetJobInfo info;/* [switch_is(level)] */
 };
 
 enum spoolss_JobControl
@@ -403,7 +561,9 @@ enum spoolss_JobControl
        SPOOLSS_JOB_CONTROL_RESTART=4,
        SPOOLSS_JOB_CONTROL_DELETE=5,
        SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER=6,
-       SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED=7
+       SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED=7,
+       SPOOLSS_JOB_CONTROL_RETAIN=8,
+       SPOOLSS_JOB_CONTROL_RELEASE=9
 }
 #else
  { __donnot_use_enum_spoolss_JobControl=0x7FFFFFFF}
@@ -414,6 +574,8 @@ enum spoolss_JobControl
 #define SPOOLSS_JOB_CONTROL_DELETE ( 5 )
 #define SPOOLSS_JOB_CONTROL_SEND_TO_PRINTER ( 6 )
 #define SPOOLSS_JOB_CONTROL_LAST_PAGE_EJECTED ( 7 )
+#define SPOOLSS_JOB_CONTROL_RETAIN ( 8 )
+#define SPOOLSS_JOB_CONTROL_RELEASE ( 9 )
 #endif
 ;
 
@@ -500,7 +662,7 @@ struct spoolss_SetPrinterInfo2 {
 };
 
 struct spoolss_SetPrinterInfo3 {
-       struct security_descriptor *secdesc;/* [unique] */
+       uint32_t sec_desc_ptr;
 };
 
 struct spoolss_SetPrinterInfo4 {
@@ -547,7 +709,7 @@ struct spoolss_SetPrinterInfoCtr {
 struct spoolss_StringArray {
        uint32_t _ndr_size;/* [value((ndr_size_spoolss_StringArray(r,ndr->iconv_convenience,ndr->flags)-4)/2)] */
        const char ** string;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
-}/* [gensize,public] */;
+}/* [public] */;
 
 struct spoolss_AddDriverInfo1 {
        const char *driver_name;/* [unique,charset(UTF16)] */
@@ -635,7 +797,7 @@ struct spoolss_AddDriverInfo6 {
        struct spoolss_StringArray *dependent_files;/* [unique] */
        uint32_t _ndr_size_previous_names;/* [value(((ndr_size_spoolss_StringArray(previous_names,ndr->iconv_convenience,ndr->flags)-4)/2))] */
        struct spoolss_StringArray *previous_names;/* [unique] */
-       NTTIME driver_data;
+       NTTIME driver_date;
        uint64_t driver_version;
        const char *manufacturer_name;/* [unique,charset(UTF16)] */
        const char *manufacturer_url;/* [unique,charset(UTF16)] */
@@ -657,7 +819,7 @@ struct spoolss_AddDriverInfo8 {
        struct spoolss_StringArray *dependent_files;/* [unique] */
        uint32_t _ndr_size_previous_names;/* [value(((ndr_size_spoolss_StringArray(previous_names,ndr->iconv_convenience,ndr->flags)-4)/2))] */
        struct spoolss_StringArray *previous_names;/* [unique] */
-       NTTIME driver_data;
+       NTTIME driver_date;
        uint64_t driver_version;
        const char *manufacturer_name;/* [unique,charset(UTF16)] */
        const char *manufacturer_url;/* [unique,charset(UTF16)] */
@@ -691,7 +853,7 @@ struct spoolss_AddDriverInfoCtr {
 
 struct spoolss_DriverInfo1 {
        const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo2 {
        enum spoolss_DriverOSVersion version;
@@ -700,7 +862,7 @@ struct spoolss_DriverInfo2 {
        const char * driver_path;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * data_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * config_file;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo3 {
        enum spoolss_DriverOSVersion version;
@@ -713,7 +875,7 @@ struct spoolss_DriverInfo3 {
        const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo4 {
        enum spoolss_DriverOSVersion version;
@@ -727,7 +889,7 @@ struct spoolss_DriverInfo4 {
        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo5 {
        enum spoolss_DriverOSVersion version;
@@ -739,7 +901,7 @@ struct spoolss_DriverInfo5 {
        uint32_t driver_attributes;
        uint32_t config_version;
        uint32_t driver_version;
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo6 {
        enum spoolss_DriverOSVersion version;
@@ -753,13 +915,13 @@ struct spoolss_DriverInfo6 {
        const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       NTTIME driver_data;
+       NTTIME driver_date;
        uint64_t driver_version;
        const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 struct spoolss_DriverInfo8 {
        enum spoolss_DriverOSVersion version;
@@ -773,7 +935,7 @@ struct spoolss_DriverInfo8 {
        const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char ** dependent_files;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-       NTTIME driver_data;
+       NTTIME driver_date;
        uint64_t driver_version;
        const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
@@ -787,7 +949,49 @@ struct spoolss_DriverInfo8 {
        const char ** core_driver_dependencies;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        NTTIME min_inbox_driver_ver_date;
        uint64_t min_inbox_driver_ver_version;
-};
+}/* [gensize,public] */;
+
+enum spoolss_DriverFileType
+#ifndef USE_UINT_ENUMS
+ {
+       SPOOLSS_DRIVER_FILE_TYPE_RENDERING=0x00000000,
+       SPOOLSS_DRIVER_FILE_TYPE_CONFIGURATION=0x00000001,
+       SPOOLSS_DRIVER_FILE_TYPE_DATA=0x00000002,
+       SPOOLSS_DRIVER_FILE_TYPE_HELP=0x00000003,
+       SPOOLSS_DRIVER_FILE_TYPE_OTHER=0x00000004
+}
+#else
+ { __donnot_use_enum_spoolss_DriverFileType=0x7FFFFFFF}
+#define SPOOLSS_DRIVER_FILE_TYPE_RENDERING ( 0x00000000 )
+#define SPOOLSS_DRIVER_FILE_TYPE_CONFIGURATION ( 0x00000001 )
+#define SPOOLSS_DRIVER_FILE_TYPE_DATA ( 0x00000002 )
+#define SPOOLSS_DRIVER_FILE_TYPE_HELP ( 0x00000003 )
+#define SPOOLSS_DRIVER_FILE_TYPE_OTHER ( 0x00000004 )
+#endif
+;
+
+struct spoolss_DriverFileInfo {
+       const char * file_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       enum spoolss_DriverFileType file_type;
+       uint32_t file_version;
+}/* [public] */;
+
+struct spoolss_DriverInfo101 {
+       enum spoolss_DriverOSVersion version;
+       const char * driver_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * architecture;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct spoolss_DriverFileInfo *file_info;/* [relative,size_is(file_count)] */
+       uint32_t file_count;
+       const char * monitor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * default_datatype;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char ** previous_names;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       NTTIME driver_date;
+       uint64_t driver_version;
+       const char * manufacturer_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * manufacturer_url;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * hardware_id;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       const char * provider;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [gensize,nopush,public,nopull] */;
 
 union spoolss_DriverInfo {
        struct spoolss_DriverInfo1 info1;/* [case] */
@@ -797,11 +1001,12 @@ union spoolss_DriverInfo {
        struct spoolss_DriverInfo5 info5;/* [case(5)] */
        struct spoolss_DriverInfo6 info6;/* [case(6)] */
        struct spoolss_DriverInfo8 info8;/* [case(8)] */
+       struct spoolss_DriverInfo101 info101;/* [case(101)] */
 }/* [relative_base,nodiscriminant,public] */;
 
 struct spoolss_DriverDirectoryInfo1 {
        const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 union spoolss_DriverDirectoryInfo {
        struct spoolss_DriverDirectoryInfo1 info1;/* [case] */
@@ -809,12 +1014,20 @@ union spoolss_DriverDirectoryInfo {
 
 struct spoolss_PrintProcessorInfo1 {
        const char * print_processor_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
-};
+}/* [gensize,public] */;
 
 union spoolss_PrintProcessorInfo {
        struct spoolss_PrintProcessorInfo1 info1;/* [case] */
 }/* [relative_base,nodiscriminant,public] */;
 
+struct spoolss_PrintProcessorDirectoryInfo1 {
+       const char * directory_name;/* [flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [gensize,public] */;
+
+union spoolss_PrintProcessorDirectoryInfo {
+       struct spoolss_PrintProcessorDirectoryInfo1 info1;/* [case] */
+}/* [gensize,relative_base,nodiscriminant,public] */;
+
 struct spoolss_DocumentInfo1 {
        const char *document_name;/* [unique,charset(UTF16)] */
        const char *output_file;/* [unique,charset(UTF16)] */
@@ -904,10 +1117,29 @@ struct spoolss_FormInfo1 {
        const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
        struct spoolss_FormSize size;
        struct spoolss_FormArea area;
-};
+}/* [gensize,public] */;
+
+/* bitmap spoolss_FormStringType */
+#define SPOOLSS_FORM_STRING_TYPE_NONE ( 0x00000001 )
+#define SPOOLSS_FORM_STRING_TYPE_MUI_DLL ( 0x00000002 )
+#define SPOOLSS_FORM_STRING_TYPE_LANG_PAIR ( 0x00000004 )
+
+struct spoolss_FormInfo2 {
+       enum spoolss_FormFlags flags;
+       const char * form_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       struct spoolss_FormSize size;
+       struct spoolss_FormArea area;
+       const char * keyword;/* [relative,flag(LIBNDR_FLAG_STR_ASCII|LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t string_type;
+       const char * mui_dll;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t ressource_id;
+       const char * display_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       uint32_t lang_id;
+}/* [gensize,public] */;
 
 union spoolss_FormInfo {
        struct spoolss_FormInfo1 info1;/* [case] */
+       struct spoolss_FormInfo2 info2;/* [case(2)] */
 }/* [relative_base,gensize,public,nodiscriminant] */;
 
 struct spoolss_AddFormInfo1 {
@@ -917,8 +1149,22 @@ struct spoolss_AddFormInfo1 {
        struct spoolss_FormArea area;
 };
 
+struct spoolss_AddFormInfo2 {
+       enum spoolss_FormFlags flags;
+       const char *form_name;/* [unique,charset(UTF16)] */
+       struct spoolss_FormSize size;
+       struct spoolss_FormArea area;
+       const char *keyword;/* [unique,charset(DOS)] */
+       uint32_t string_type;
+       const char *mui_dll;/* [unique,charset(UTF16)] */
+       uint32_t ressource_id;
+       const char *display_name;/* [unique,charset(UTF16)] */
+       uint32_t lang_id;
+};
+
 union spoolss_AddFormInfo {
        struct spoolss_AddFormInfo1 *info1;/* [unique,case] */
+       struct spoolss_AddFormInfo2 *info2;/* [unique,case(2)] */
 }/* [switch_type(uint32)] */;
 
 struct spoolss_PortInfo1 {
@@ -939,9 +1185,72 @@ struct spoolss_PortInfo2 {
        uint32_t reserved;
 };
 
+enum spoolss_PortStatus
+#ifndef USE_UINT_ENUMS
+ {
+       PORT_STATUS_CLEAR=0x00000000,
+       PORT_STATUS_OFFLINE=0x00000001,
+       PORT_STATUS_PAPER_JAM=0x00000002,
+       PORT_STATUS_PAPER_OUT=0x00000003,
+       PORT_STATUS_OUTPUT_BIN_FULL=0x00000004,
+       PORT_STATUS_PAPER_PROBLEM=0x00000005,
+       PORT_STATUS_NO_TONER=0x00000006,
+       PORT_STATUS_DOOR_OPEN=0x00000007,
+       PORT_STATUS_USER_INTERVENTION=0x00000008,
+       PORT_STATUS_OUT_OF_MEMORY=0x00000009,
+       PORT_STATUS_TONER_LOW=0x0000000A,
+       PORT_STATUS_WARMING_UP=0x0000000B,
+       PORT_STATUS_POWER_SAVE=0x0000000C
+}
+#else
+ { __donnot_use_enum_spoolss_PortStatus=0x7FFFFFFF}
+#define PORT_STATUS_CLEAR ( 0x00000000 )
+#define PORT_STATUS_OFFLINE ( 0x00000001 )
+#define PORT_STATUS_PAPER_JAM ( 0x00000002 )
+#define PORT_STATUS_PAPER_OUT ( 0x00000003 )
+#define PORT_STATUS_OUTPUT_BIN_FULL ( 0x00000004 )
+#define PORT_STATUS_PAPER_PROBLEM ( 0x00000005 )
+#define PORT_STATUS_NO_TONER ( 0x00000006 )
+#define PORT_STATUS_DOOR_OPEN ( 0x00000007 )
+#define PORT_STATUS_USER_INTERVENTION ( 0x00000008 )
+#define PORT_STATUS_OUT_OF_MEMORY ( 0x00000009 )
+#define PORT_STATUS_TONER_LOW ( 0x0000000A )
+#define PORT_STATUS_WARMING_UP ( 0x0000000B )
+#define PORT_STATUS_POWER_SAVE ( 0x0000000C )
+#endif
+;
+
+enum spoolss_PortSeverity
+#ifndef USE_UINT_ENUMS
+ {
+       PORT_STATUS_TYPE_ERROR=0x00000001,
+       PORT_STATUS_TYPE_WARNING=0x00000002,
+       PORT_STATUS_TYPE_INFO=0x00000003
+}
+#else
+ { __donnot_use_enum_spoolss_PortSeverity=0x7FFFFFFF}
+#define PORT_STATUS_TYPE_ERROR ( 0x00000001 )
+#define PORT_STATUS_TYPE_WARNING ( 0x00000002 )
+#define PORT_STATUS_TYPE_INFO ( 0x00000003 )
+#endif
+;
+
+struct spoolss_PortInfo3 {
+       enum spoolss_PortStatus status;
+       const char * status_string;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       enum spoolss_PortSeverity severity;
+};
+
+struct spoolss_PortInfoFF {
+       const char * port_name;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+       DATA_BLOB monitor_data;
+};
+
 union spoolss_PortInfo {
        struct spoolss_PortInfo1 info1;/* [case] */
        struct spoolss_PortInfo2 info2;/* [case(2)] */
+       struct spoolss_PortInfo3 info3;/* [case(3)] */
+       struct spoolss_PortInfoFF infoFF;/* [case(0xff)] */
 }/* [relative_base,nodiscriminant,public] */;
 
 struct spoolss_MonitorInfo1 {
@@ -959,6 +1268,14 @@ union spoolss_MonitorInfo {
        struct spoolss_MonitorInfo2 info2;/* [case(2)] */
 }/* [relative_base,nodiscriminant,public] */;
 
+struct spoolss_PrintProcDataTypesInfo1 {
+       const char * name_array;/* [relative,flag(LIBNDR_FLAG_STR_NULLTERM)] */
+}/* [gensize,public] */;
+
+union spoolss_PrintProcDataTypesInfo {
+       struct spoolss_PrintProcDataTypesInfo1 info1;/* [case] */
+}/* [relative_base,nodiscriminant,public] */;
+
 /* bitmap spoolss_PrinterChangeFlags */
 #define PRINTER_CHANGE_ADD_PRINTER ( 0x00000001 )
 #define PRINTER_CHANGE_SET_PRINTER ( 0x00000002 )
@@ -976,6 +1293,7 @@ union spoolss_MonitorInfo {
 #define PRINTER_CHANGE_DELETE_PORT ( 0x00400000 )
 #define PRINTER_CHANGE_ADD_PRINT_PROCESSOR ( 0x01000000 )
 #define PRINTER_CHANGE_DELETE_PRINT_PROCESSOR ( 0x04000000 )
+#define PRINTER_CHANGE_SERVER ( 0x08000000 )
 #define PRINTER_CHANGE_ADD_PRINTER_DRIVER ( 0x10000000 )
 #define PRINTER_CHANGE_SET_PRINTER_DRIVER ( 0x20000000 )
 #define PRINTER_CHANGE_DELETE_PRINTER_DRIVER ( 0x40000000 )
@@ -1064,6 +1382,9 @@ struct spoolss_NotifyOptionType {
        enum spoolss_Field *fields;/* [unique,size_is(count)] */
 };
 
+/* bitmap spoolssNotifyOptionFlags */
+#define PRINTER_NOTIFY_OPTIONS_REFRESH ( 0x00000001 )
+
 struct spoolss_NotifyOption {
        uint32_t version;/* [value(2)] */
        uint32_t flags;
@@ -1098,7 +1419,7 @@ enum spoolss_NotifyTable
 union spoolss_NotifyData {
        uint32_t integer[2];/* [case] */
        struct spoolss_NotifyString string;/* [case(2)] */
-       struct spoolss_DeviceMode *devmode;/* [unique,case(3)] */
+       struct spoolss_DevmodeContainer devmode;/* [case(3)] */
        struct spoolss_TimeCtr time;/* [case(4)] */
        struct sec_desc_buf sd;/* [case(5)] */
 }/* [switch_type(uint32)] */;
@@ -1171,6 +1492,7 @@ struct spoolss_UserLevelCtr {
 #define PRINTER_ACCESS_ADMINISTER ( 0x00000004 )
 #define PRINTER_ACCESS_USE ( 0x00000008 )
 #define JOB_ACCESS_ADMINISTER ( 0x00000010 )
+#define JOB_ACCESS_READ ( 0x00000020 )
 
 /* bitmap spoolss_DeleteDriverFlags */
 #define DPD_DELETE_UNUSED_FILES ( 0x00000001 )
@@ -1283,7 +1605,7 @@ struct spoolss_EnumPrinters {
 
        struct {
                uint32_t *count;/* [ref] */
-               union spoolss_PrinterInfo *info;/* [unique,switch_is(level),size_is(*count)] */
+               union spoolss_PrinterInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -1385,7 +1707,7 @@ struct spoolss_EnumJobs {
 
        struct {
                uint32_t *count;/* [ref] */
-               union spoolss_JobInfo *info;/* [unique,switch_is(level),size_is(*count)] */
+               union spoolss_JobInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -1502,7 +1824,7 @@ struct spoolss_EnumPrinterDrivers {
 
        struct {
                uint32_t *count;/* [ref] */
-               union spoolss_DriverInfo *info;/* [unique,switch_is(level),size_is(*count)] */
+               union spoolss_DriverInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -1608,7 +1930,7 @@ struct spoolss_EnumPrintProcessors {
 
        struct {
                uint32_t *count;/* [ref] */
-               union spoolss_PrintProcessorInfo *info;/* [unique,switch_is(level),size_is(*count)] */
+               union spoolss_PrintProcessorInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -1618,6 +1940,16 @@ struct spoolss_EnumPrintProcessors {
 
 struct spoolss_GetPrintProcessorDirectory {
        struct {
+               const char *server;/* [unique,charset(UTF16)] */
+               const char *environment;/* [unique,charset(UTF16)] */
+               uint32_t level;
+               DATA_BLOB *buffer;/* [unique] */
+               uint32_t offered;
+       } in;
+
+       struct {
+               union spoolss_PrintProcessorDirectoryInfo *info;/* [unique,subcontext_size(offered),subcontext(4),switch_is(level)] */
+               uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
 
@@ -1959,7 +2291,7 @@ struct spoolss_EnumForms {
 
        struct {
                uint32_t *count;/* [ref] */
-               union spoolss_FormInfo *info;/* [unique,switch_is(level),size_is(*count)] */
+               union spoolss_FormInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -2008,7 +2340,7 @@ struct spoolss_EnumPorts {
 
        struct {
                uint32_t *count;/* [ref] */
-               union spoolss_PortInfo *info;/* [unique,switch_is(level),size_is(*count)] */
+               union spoolss_PortInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -2057,7 +2389,7 @@ struct spoolss_EnumMonitors {
 
        struct {
                uint32_t *count;/* [ref] */
-               union spoolss_MonitorInfo *info;/* [unique,switch_is(level),size_is(*count)] */
+               union spoolss_MonitorInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
                uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
@@ -2183,8 +2515,51 @@ struct spoolss_DeletePrintProvidor {
 };
 
 
+struct _spoolss_EnumPrintProcDataTypes {
+       struct {
+               const char *servername;/* [unique,charset(UTF16)] */
+               const char *print_processor_name;/* [unique,charset(UTF16)] */
+               uint32_t level;
+               DATA_BLOB *buffer;/* [unique] */
+               uint32_t offered;
+       } in;
+
+       struct {
+               DATA_BLOB *info;/* [unique] */
+               uint32_t *needed;/* [ref] */
+               uint32_t *count;/* [ref] */
+               WERROR result;
+       } out;
+
+};
+
+
+struct __spoolss_EnumPrintProcDataTypes {
+       struct {
+               uint32_t level;
+               uint32_t count;
+       } in;
+
+       struct {
+               union spoolss_PrintProcDataTypesInfo *info;/* [switch_is(level)] */
+       } out;
+
+};
+
+
 struct spoolss_EnumPrintProcDataTypes {
        struct {
+               const char *servername;/* [unique,charset(UTF16)] */
+               const char *print_processor_name;/* [unique,charset(UTF16)] */
+               uint32_t level;
+               DATA_BLOB *buffer;/* [unique] */
+               uint32_t offered;
+       } in;
+
+       struct {
+               uint32_t *count;/* [ref] */
+               union spoolss_PrintProcDataTypesInfo **info;/* [ref,switch_is(level),size_is(,*count)] */
+               uint32_t *needed;/* [ref] */
                WERROR result;
        } out;
 
@@ -2217,7 +2592,7 @@ struct spoolss_GetPrinterDriver2 {
        } in;
 
        struct {
-               DATA_BLOB *info;/* [unique] */
+               union spoolss_DriverInfo *info;/* [unique,subcontext_size(offered),subcontext(4),switch_is(level)] */
                uint32_t *needed;/* [ref] */
                uint32_t *server_major_version;/* [ref] */
                uint32_t *server_minor_version;/* [ref] */